deps: update archs files for OpenSSL-1.1.1e

After an OpenSSL source update, all the config files need to be
regenerated and comitted by:
    $ cd deps/openssl/config
    $ make
    $ git add deps/openssl/config/archs
    $ git add deps/openssl/include

PR-URL: https://github.com/nodejs/node/pull/32328
Fixes: https://github.com/nodejs/node/issues/32210
Reviewed-By: Sam Roberts <vieuxtech@gmail.com>
Reviewed-By: James M Snell <jasnell@gmail.com>

699 files changed, 9699 insertions, 148712 deletions

diff --git a/deps/openssl/config/archs/BSD-x86/asm/configdata.pm b/deps/openssl/config/archs/BSD-x86/asm/configdata.pm
index 60838a7aa0..765ef97df0 100644
--- a/deps/openssl/config/archs/BSD-x86/asm/configdata.pm
+++ b/deps/openssl/config/archs/BSD-x86/asm/configdata.pm
@@ -48,14 +48,14 @@ our %config = (
   export_var_as_fn => "0",
   includes => [  ],
   lflags => [  ],
-  lib_defines => [ "OPENSSL_PIC", "OPENSSL_CPUID_OBJ", "OPENSSL_BN_ASM_PART_WORDS", "OPENSSL_IA32_SSE2", "OPENSSL_BN_ASM_MONT", "OPENSSL_BN_ASM_GF2m", "SHA1_ASM", "SHA256_ASM", "SHA512_ASM", "RC4_ASM", "MD5_ASM", "RMD160_ASM", "VPAES_ASM", "WHIRLPOOL_ASM", "GHASH_ASM", "ECP_NISTZ256_ASM", "POLY1305_ASM" ],
+  lib_defines => [ "OPENSSL_PIC", "OPENSSL_CPUID_OBJ", "OPENSSL_BN_ASM_PART_WORDS", "OPENSSL_IA32_SSE2", "OPENSSL_BN_ASM_MONT", "OPENSSL_BN_ASM_GF2m", "SHA1_ASM", "SHA256_ASM", "SHA512_ASM", "RC4_ASM", "MD5_ASM", "RMD160_ASM", "AESNI_ASM", "VPAES_ASM", "WHIRLPOOL_ASM", "GHASH_ASM", "ECP_NISTZ256_ASM", "POLY1305_ASM" ],
   libdir => "",
   major => "1",
   makedepprog => "\$(CROSS_COMPILE)gcc",
   minor => "1.1",
   openssl_algorithm_defines => [ "OPENSSL_NO_COMP", "OPENSSL_NO_MD2", "OPENSSL_NO_RC5" ],
   openssl_api_defines => [  ],
-  openssl_other_defines => [ "OPENSSL_RAND_SEED_OS", "OPENSSL_NO_AFALGENG", "OPENSSL_NO_ASAN", "OPENSSL_NO_CRYPTO_MDEBUG", "OPENSSL_NO_CRYPTO_MDEBUG_BACKTRACE", "OPENSSL_NO_EC_NISTP_64_GCC_128", "OPENSSL_NO_EGD", "OPENSSL_NO_EXTERNAL_TESTS", "OPENSSL_NO_FUZZ_AFL", "OPENSSL_NO_FUZZ_LIBFUZZER", "OPENSSL_NO_HEARTBEATS", "OPENSSL_NO_MSAN", "OPENSSL_NO_SCTP", "OPENSSL_NO_SSL3", "OPENSSL_NO_SSL3_METHOD", "OPENSSL_NO_UBSAN", "OPENSSL_NO_UNIT_TEST", "OPENSSL_NO_WEAK_SSL_CIPHERS", "OPENSSL_NO_DYNAMIC_ENGINE", "OPENSSL_NO_AFALGENG" ],
+  openssl_other_defines => [ "OPENSSL_RAND_SEED_OS", "OPENSSL_NO_AFALGENG", "OPENSSL_NO_ASAN", "OPENSSL_NO_CRYPTO_MDEBUG", "OPENSSL_NO_CRYPTO_MDEBUG_BACKTRACE", "OPENSSL_NO_EC_NISTP_64_GCC_128", "OPENSSL_NO_EGD", "OPENSSL_NO_EXTERNAL_TESTS", "OPENSSL_NO_FUZZ_AFL", "OPENSSL_NO_FUZZ_LIBFUZZER", "OPENSSL_NO_HEARTBEATS", "OPENSSL_NO_MSAN", "OPENSSL_NO_SCTP", "OPENSSL_NO_SSL3", "OPENSSL_NO_SSL3_METHOD", "OPENSSL_NO_UBSAN", "OPENSSL_NO_UNIT_TEST", "OPENSSL_NO_WEAK_SSL_CIPHERS", "OPENSSL_NO_DYNAMIC_ENGINE" ],
   openssl_sys_defines => [  ],
   openssl_thread_defines => [ "OPENSSL_THREADS" ],
   openssldir => "",
@@ -111,8 +111,8 @@ our %config = (
   sourcedir => ".",
   target => "BSD-x86",
   tdirs => [ "ossl_shim" ],
-  version => "1.1.1d",
-  version_num => "0x1010104fL",
+  version => "1.1.1e",
+  version_num => "0x1010105fL",
 );
 
 our %target = (
@@ -235,6 +235,7 @@ our @disablables = (
   "dgram",
   "dh",
   "dsa",
+  "dso",
   "dtls",
   "dynamic-engine",
   "ec",
@@ -351,8 +352,8 @@ our %unified_info = (
         {
             "" =>
                 [
-                    "crypto/include/internal/bn_conf.h",
-                    "crypto/include/internal/dso_conf.h",
+                    "include/crypto/bn_conf.h",
+                    "include/crypto/dso_conf.h",
                     "include/openssl/opensslconf.h",
                 ],
             "apps/asn1pars.o" =>
@@ -620,14 +621,6 @@ our %unified_info = (
                     "crypto/perlasm/cbc.pl",
                     "crypto/perlasm/x86asm.pl",
                 ],
-            "crypto/include/internal/bn_conf.h" =>
-                [
-                    "configdata.pm",
-                ],
-            "crypto/include/internal/dso_conf.h" =>
-                [
-                    "configdata.pm",
-                ],
             "crypto/rc4/rc4-586.s" =>
                 [
                     "crypto/perlasm/x86asm.pl",
@@ -703,6 +696,14 @@ our %unified_info = (
                 [
                     "libcrypto",
                 ],
+            "include/crypto/bn_conf.h" =>
+                [
+                    "configdata.pm",
+                ],
+            "include/crypto/dso_conf.h" =>
+                [
+                    "configdata.pm",
+                ],
             "include/openssl/opensslconf.h" =>
                 [
                     "configdata.pm",
@@ -1492,6 +1493,12 @@ our %unified_info = (
                     "libcrypto",
                     "test/libtestutil.a",
                 ],
+            "test/ssl_ctx_test" =>
+                [
+                    "libcrypto",
+                    "libssl",
+                    "test/libtestutil.a",
+                ],
             "test/ssl_test" =>
                 [
                     "libcrypto",
@@ -3224,7 +3231,6 @@ our %unified_info = (
                             "test/testutil/cb.o",
                             "test/testutil/driver.o",
                             "test/testutil/format_output.o",
-                            "test/testutil/init.o",
                             "test/testutil/main.o",
                             "test/testutil/output_helpers.o",
                             "test/testutil/random.o",
@@ -3232,6 +3238,7 @@ our %unified_info = (
                             "test/testutil/tap_bio.o",
                             "test/testutil/test_cleanup.o",
                             "test/testutil/tests.o",
+                            "test/testutil/testutil_init.o",
                         ],
                     "products" =>
                         {
@@ -3730,14 +3737,6 @@ our %unified_info = (
                 [
                     "crypto/ia64cpuid.S",
                 ],
-            "crypto/include/internal/bn_conf.h" =>
-                [
-                    "crypto/include/internal/bn_conf.h.in",
-                ],
-            "crypto/include/internal/dso_conf.h" =>
-                [
-                    "crypto/include/internal/dso_conf.h.in",
-                ],
             "crypto/md5/md5-586.s" =>
                 [
                     "crypto/md5/asm/md5-586.pl",
@@ -4178,6 +4177,14 @@ our %unified_info = (
                     "engines/asm/e_padlock-x86_64.pl",
                     "\$(PERLASM_SCHEME)",
                 ],
+            "include/crypto/bn_conf.h" =>
+                [
+                    "include/crypto/bn_conf.h.in",
+                ],
+            "include/crypto/dso_conf.h" =>
+                [
+                    "include/crypto/dso_conf.h.in",
+                ],
             "include/openssl/opensslconf.h" =>
                 [
                     "include/openssl/opensslconf.h.in",
@@ -4860,49 +4867,41 @@ our %unified_info = (
             "crypto/aes/aes_cbc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/aes/aes_cfb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/aes/aes_core.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/aes/aes_ecb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/aes/aes_ige.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/aes/aes_misc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/aes/aes_ofb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/aes/aes_wrap.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/aes/aesfx-sparcv9.o" =>
@@ -4912,7 +4911,6 @@ our %unified_info = (
             "crypto/aes/aesni-x86.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/aes/aest4-sparcv9.o" =>
@@ -4930,13 +4928,11 @@ our %unified_info = (
             "crypto/aes/vpaes-x86.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/aria/aria.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/arm64cpuid.o" =>
@@ -4950,613 +4946,511 @@ our %unified_info = (
             "crypto/asn1/a_bitstr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_d2i_fp.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_digest.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_dup.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_gentm.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_i2d_fp.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_int.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_mbstr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_object.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_octet.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_print.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_sign.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_strex.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_strnid.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_time.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_type.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_utctm.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_utf8.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_verify.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/ameth_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/asn1_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/asn1_gen.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/asn1_item_list.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/asn1_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/asn1_par.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/asn_mime.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/asn_moid.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/asn_mstbl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/asn_pack.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/bio_asn1.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/bio_ndef.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/d2i_pr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/d2i_pu.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/evp_asn1.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/f_int.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/f_string.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/i2d_pr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/i2d_pu.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/n_pkey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/nsseq.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/p5_pbe.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/p5_pbev2.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/p5_scrypt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/p8_pkey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/t_bitst.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/t_pkey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/t_spki.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/tasn_dec.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/tasn_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/tasn_fre.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/tasn_new.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/tasn_prn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/tasn_scn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/tasn_typ.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/tasn_utl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/x_algor.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/x_bignum.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/x_info.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/x_int64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/x_long.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/x_pkey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/x_sig.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/x_spki.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/x_val.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/async/arch/async_null.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/async/arch/async_posix.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/async/arch/async_win.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/async/async.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/async/async_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/async/async_wait.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bf/bf-586.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bf/bf_cfb64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bf/bf_ecb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bf/bf_ofb64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bf/bf_skey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/b_addr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/b_dump.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/b_print.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/b_sock.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/b_sock2.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bf_buff.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bf_lbuf.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bf_nbio.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bf_null.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bio_cb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bio_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bio_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bio_meth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bss_acpt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bss_bio.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bss_conn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bss_dgram.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bss_fd.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bss_file.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bss_log.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bss_mem.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bss_null.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bss_sock.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/blake2/blake2b.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/blake2/blake2s.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/blake2/m_blake2b.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/blake2/m_blake2s.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/armv4-gf2m.o" =>
@@ -5570,7 +5464,6 @@ our %unified_info = (
             "crypto/bn/bn-586.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn-mips.o" =>
@@ -5580,188 +5473,157 @@ our %unified_info = (
             "crypto/bn/bn_add.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_blind.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_const.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_ctx.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_depr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_dh.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_div.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_exp.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto",
                 ],
             "crypto/bn/bn_exp2.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_gcd.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_gf2m.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_intern.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_kron.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_mod.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_mont.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_mpi.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_mul.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_nist.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_prime.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_print.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_rand.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_recp.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_shift.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_sqr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_sqrt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_srp.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_word.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_x931p.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/co-586.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/mips-mont.o" =>
@@ -5791,25 +5653,21 @@ our %unified_info = (
             "crypto/bn/x86-gf2m.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/x86-mont.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/buffer/buf_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/buffer/buffer.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/buildinf.h" =>
@@ -5819,31 +5677,26 @@ our %unified_info = (
             "crypto/camellia/cmll-x86.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/camellia/cmll_cfb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/camellia/cmll_ctr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/camellia/cmll_ecb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/camellia/cmll_ofb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/camellia/cmllt4-sparcv9.o" =>
@@ -5853,31 +5706,26 @@ our %unified_info = (
             "crypto/cast/c_cfb64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cast/c_ecb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cast/c_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cast/c_ofb64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cast/c_skey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/chacha/chacha-armv4.o" =>
@@ -5895,284 +5743,237 @@ our %unified_info = (
             "crypto/chacha/chacha-x86.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cmac/cm_ameth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cmac/cm_pmeth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cmac/cmac.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_asn1.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_att.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_cd.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_dd.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_env.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_ess.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_io.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_kari.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_pwri.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_sd.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_smime.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/conf/conf_api.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/conf/conf_def.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/conf/conf_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/conf/conf_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/conf/conf_mall.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/conf/conf_mod.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/conf/conf_sap.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/conf/conf_ssl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cpt_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cryptlib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ct/ct_b64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ct/ct_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ct/ct_log.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ct/ct_oct.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ct/ct_policy.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ct/ct_prn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ct/ct_sct.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ct/ct_sct_ctx.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ct/ct_vfy.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ct/ct_x509v3.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ctype.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cversion.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto",
                 ],
             "crypto/des/cbc_cksm.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/cbc_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/cfb64ede.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/cfb64enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/cfb_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/crypt586.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/des-586.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/dest4-sparcv9.o" =>
@@ -6182,295 +5983,246 @@ our %unified_info = (
             "crypto/des/ecb3_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/ecb_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/fcrypt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/ofb64ede.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/ofb64enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/ofb_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/pcbc_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/qud_cksm.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/rand_key.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/set_key.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/str2key.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/xcbc_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_ameth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_asn1.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_check.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_depr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_gen.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_kdf.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_key.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_meth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_pmeth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_prn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_rfc5114.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_rfc7919.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dsa/dsa_ameth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dsa/dsa_asn1.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dsa/dsa_depr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dsa/dsa_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dsa/dsa_gen.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dsa/dsa_key.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dsa/dsa_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dsa/dsa_meth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dsa/dsa_ossl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dsa/dsa_pmeth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dsa/dsa_prn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dsa/dsa_sign.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dsa/dsa_vrf.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dso/dso_dl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dso/dso_dlfcn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dso/dso_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dso/dso_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dso/dso_openssl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dso/dso_vms.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dso/dso_win32.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ebcdic.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/curve25519.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/curve448/arch_32/f_impl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto/ec/curve448/arch_32",
                     "crypto/ec/curve448",
@@ -6478,7 +6230,6 @@ our %unified_info = (
             "crypto/ec/curve448/curve448.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto/ec/curve448/arch_32",
                     "crypto/ec/curve448",
@@ -6486,7 +6237,6 @@ our %unified_info = (
             "crypto/ec/curve448/curve448_tables.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto/ec/curve448/arch_32",
                     "crypto/ec/curve448",
@@ -6494,7 +6244,6 @@ our %unified_info = (
             "crypto/ec/curve448/eddsa.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto/ec/curve448/arch_32",
                     "crypto/ec/curve448",
@@ -6502,7 +6251,6 @@ our %unified_info = (
             "crypto/ec/curve448/f_generic.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto/ec/curve448/arch_32",
                     "crypto/ec/curve448",
@@ -6510,7 +6258,6 @@ our %unified_info = (
             "crypto/ec/curve448/scalar.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto/ec/curve448/arch_32",
                     "crypto/ec/curve448",
@@ -6518,163 +6265,136 @@ our %unified_info = (
             "crypto/ec/ec2_oct.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec2_smpl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec_ameth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec_asn1.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec_check.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec_curve.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec_cvt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec_key.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec_kmeth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec_mult.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec_oct.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec_pmeth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec_print.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecdh_kdf.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecdh_ossl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecdsa_ossl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecdsa_sign.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecdsa_vrf.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/eck_prn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecp_mont.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecp_nist.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecp_nistp224.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecp_nistp256.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecp_nistp521.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecp_nistputil.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecp_nistz256-armv4.o" =>
@@ -6692,241 +6412,201 @@ our %unified_info = (
             "crypto/ec/ecp_nistz256-x86.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecp_nistz256.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecp_oct.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecp_smpl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecx_meth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/eng_all.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/eng_cnf.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/eng_ctrl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/eng_devcrypto.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/eng_dyn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/eng_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/eng_fat.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/eng_init.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/eng_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/eng_list.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/eng_openssl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/eng_pkey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/eng_rdrand.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/eng_table.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/tb_asnmth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/tb_cipher.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/tb_dh.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/tb_digest.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/tb_dsa.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/tb_eckey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/tb_pkmeth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/tb_rand.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/tb_rsa.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/err/err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/err/err_all.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/err/err_prn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/bio_b64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/bio_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/bio_md.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/bio_ok.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/c_allc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/c_alld.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/cmeth_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/digest.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/e_aes.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto",
                     "crypto/modes",
@@ -6934,21 +6614,18 @@ our %unified_info = (
             "crypto/evp/e_aes_cbc_hmac_sha1.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto/modes",
                 ],
             "crypto/evp/e_aes_cbc_hmac_sha256.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto/modes",
                 ],
             "crypto/evp/e_aria.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto",
                     "crypto/modes",
@@ -6956,13 +6633,11 @@ our %unified_info = (
             "crypto/evp/e_bf.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/e_camellia.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto",
                     "crypto/modes",
@@ -6970,81 +6645,68 @@ our %unified_info = (
             "crypto/evp/e_cast.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/e_chacha20_poly1305.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/e_des.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto",
                 ],
             "crypto/evp/e_des3.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto",
                 ],
             "crypto/evp/e_idea.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/e_null.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/e_old.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/e_rc2.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/e_rc4.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/e_rc4_hmac_md5.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/e_rc5.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/e_seed.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/e_sm4.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto",
                     "crypto/modes",
@@ -7052,334 +6714,272 @@ our %unified_info = (
             "crypto/evp/e_xcbc_d.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/encode.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/evp_cnf.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/evp_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/evp_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/evp_key.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/evp_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/evp_pbe.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/evp_pkey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/m_md2.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/m_md4.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/m_md5.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/m_md5_sha1.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/m_mdc2.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/m_null.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/m_ripemd.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/m_sha1.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/m_sha3.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto",
                 ],
             "crypto/evp/m_sigver.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/m_wp.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/names.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/p5_crpt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/p5_crpt2.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/p_dec.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/p_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/p_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/p_open.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/p_seal.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/p_sign.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/p_verify.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/pbe_scrypt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/pmeth_fn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/pmeth_gn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/pmeth_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ex_data.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/getenv.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/hmac/hm_ameth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/hmac/hm_pmeth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/hmac/hmac.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/idea/i_cbc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/idea/i_cfb64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/idea/i_ecb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/idea/i_ofb64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/idea/i_skey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
-            "crypto/include/internal/bn_conf.h" =>
-                [
-                    ".",
-                ],
-            "crypto/include/internal/dso_conf.h" =>
-                [
-                    ".",
-                ],
             "crypto/init.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/kdf/hkdf.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/kdf/kdf_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/kdf/scrypt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/kdf/tls1_prf.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/lhash/lh_stats.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/lhash/lhash.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/md4/md4_dgst.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/md4/md4_one.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/md5/md5-586.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/md5/md5-sparcv9.o" =>
@@ -7389,79 +6989,66 @@ our %unified_info = (
             "crypto/md5/md5_dgst.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/md5/md5_one.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/mdc2/mdc2_one.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/mdc2/mdc2dgst.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/mem.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/mem_dbg.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/mem_sec.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/modes/cbc128.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/modes/ccm128.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/modes/cfb128.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/modes/ctr128.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/modes/cts128.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/modes/gcm128.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto",
                 ],
@@ -7480,7 +7067,6 @@ our %unified_info = (
             "crypto/modes/ghash-x86.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/modes/ghashv8-armx.o" =>
@@ -7490,361 +7076,301 @@ our %unified_info = (
             "crypto/modes/ocb128.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/modes/ofb128.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/modes/wrap128.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/modes/xts128.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/o_dir.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/o_fips.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/o_fopen.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/o_init.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/o_str.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/o_time.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/objects/o_names.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/objects/obj_dat.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/objects/obj_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/objects/obj_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/objects/obj_xref.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ocsp/ocsp_asn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ocsp/ocsp_cl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ocsp/ocsp_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ocsp/ocsp_ext.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ocsp/ocsp_ht.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ocsp/ocsp_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ocsp/ocsp_prn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ocsp/ocsp_srv.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ocsp/ocsp_vfy.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ocsp/v3_ocsp.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pem/pem_all.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pem/pem_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pem/pem_info.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pem/pem_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pem/pem_oth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pem/pem_pk8.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pem/pem_pkey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pem/pem_sign.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pem/pem_x509.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pem/pem_xaux.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pem/pvkfmt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_add.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_asn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_attr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_crpt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_crt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_decr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_init.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_key.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_kiss.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_mutl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_npas.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_p8d.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_p8e.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_sbag.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_utl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/pk12err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs7/bio_pk7.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs7/pk7_asn1.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs7/pk7_attr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs7/pk7_doit.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs7/pk7_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs7/pk7_mime.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs7/pk7_smime.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs7/pkcs7err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/poly1305/poly1305-armv4.o" =>
@@ -7866,265 +7392,221 @@ our %unified_info = (
             "crypto/poly1305/poly1305-x86.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/poly1305/poly1305.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/poly1305/poly1305_ameth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/poly1305/poly1305_pmeth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rand/drbg_ctr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rand/drbg_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rand/rand_egd.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rand/rand_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rand/rand_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rand/rand_unix.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rand/rand_vms.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rand/rand_win.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rand/randfile.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rc2/rc2_cbc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rc2/rc2_ecb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rc2/rc2_skey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rc2/rc2cfb64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rc2/rc2ofb64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rc4/rc4-586.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ripemd/rmd-586.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ripemd/rmd_dgst.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ripemd/rmd_one.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_ameth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_asn1.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_chk.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_crpt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_depr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_gen.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_meth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_mp.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_none.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_oaep.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_ossl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_pk1.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_pmeth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_prn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_pss.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_saos.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_sign.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_ssl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_x931.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_x931g.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/s390xcpuid.o" =>
@@ -8134,31 +7616,26 @@ our %unified_info = (
             "crypto/seed/seed.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/seed/seed_cbc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/seed/seed_cfb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/seed/seed_ecb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/seed/seed_ofb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sha/keccak1600-armv4.o" =>
@@ -8168,13 +7645,11 @@ our %unified_info = (
             "crypto/sha/keccak1600.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sha/sha1-586.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sha/sha1-armv4-large.o" =>
@@ -8200,19 +7675,16 @@ our %unified_info = (
             "crypto/sha/sha1_one.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sha/sha1dgst.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sha/sha256-586.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sha/sha256-armv4.o" =>
@@ -8238,13 +7710,11 @@ our %unified_info = (
             "crypto/sha/sha256.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sha/sha512-586.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sha/sha512-armv4.o" =>
@@ -8270,727 +7740,606 @@ our %unified_info = (
             "crypto/sha/sha512.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/siphash/siphash.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/siphash/siphash_ameth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/siphash/siphash_pmeth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sm2/sm2_crypt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sm2/sm2_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sm2/sm2_pmeth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sm2/sm2_sign.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sm3/m_sm3.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sm3/sm3.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sm4/sm4.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/srp/srp_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/srp/srp_vfy.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/stack/stack.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/store/loader_file.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/store/store_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/store/store_init.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/store/store_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/store/store_register.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/store/store_strings.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/threads_none.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/threads_pthread.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/threads_win.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ts/ts_asn1.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ts/ts_conf.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ts/ts_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ts/ts_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ts/ts_req_print.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ts/ts_req_utils.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ts/ts_rsp_print.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ts/ts_rsp_sign.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ts/ts_rsp_utils.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ts/ts_rsp_verify.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ts/ts_verify_ctx.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/txt_db/txt_db.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ui/ui_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ui/ui_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ui/ui_null.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ui/ui_openssl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ui/ui_util.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/uid.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/whrlpool/wp-mmx.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/whrlpool/wp_block.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/whrlpool/wp_dgst.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/by_dir.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/by_file.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/t_crl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/t_req.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/t_x509.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_att.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_cmp.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_d2.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_def.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_ext.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_lu.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_meth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_obj.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_r2x.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_req.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_set.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_trs.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_txt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_v3.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_vfy.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_vpm.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509cset.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509name.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509rset.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509spki.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509type.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x_all.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x_attrib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x_crl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x_exten.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x_name.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x_pubkey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x_req.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x_x509.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x_x509a.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/pcy_cache.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/pcy_data.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/pcy_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/pcy_map.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/pcy_node.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/pcy_tree.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_addr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_admis.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_akey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_akeya.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_alt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_asid.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_bcons.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_bitst.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_conf.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_cpols.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_crld.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_enum.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_extku.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_genn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_ia5.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_info.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_int.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_ncons.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_pci.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_pcia.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_pcons.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_pku.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_pmaps.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_prn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_purp.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_skey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_sxnet.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_tlsf.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_utl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x86cpuid.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "engines/e_capi.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "engines/e_padlock-x86.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "engines/e_padlock.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "fuzz/asn1.o" =>
@@ -9041,6 +8390,14 @@ our %unified_info = (
                 [
                     "include",
                 ],
+            "include/crypto/bn_conf.h" =>
+                [
+                    ".",
+                ],
+            "include/crypto/dso_conf.h" =>
+                [
+                    ".",
+                ],
             "include/openssl/opensslconf.h" =>
                 [
                     ".",
@@ -9285,7 +8642,6 @@ our %unified_info = (
                 [
                     ".",
                     "include",
-                    "crypto/include",
                 ],
             "test/asn1_string_table_test.o" =>
                 [
@@ -9611,7 +8967,6 @@ our %unified_info = (
                 [
                     ".",
                     "include",
-                    "crypto/include",
                 ],
             "test/cipher_overhead_test.o" =>
                 [
@@ -9657,7 +9012,6 @@ our %unified_info = (
             "test/ctype_internal_test.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "test/curve448_internal_test.o" =>
@@ -9723,7 +9077,6 @@ our %unified_info = (
                 [
                     "include",
                     "crypto/ec",
-                    "crypto/include",
                 ],
             "test/ecdsatest.o" =>
                 [
@@ -9748,7 +9101,6 @@ our %unified_info = (
             "test/evp_extra_test.o" =>
                 [
                     "include",
-                    "crypto/include",
                 ],
             "test/evp_test.o" =>
                 [
@@ -9846,7 +9198,6 @@ our %unified_info = (
                 [
                     ".",
                     "include",
-                    "crypto/include",
                 ],
             "test/rc2test.o" =>
                 [
@@ -9896,18 +9247,15 @@ our %unified_info = (
                 [
                     ".",
                     "include",
-                    "crypto/include",
                 ],
             "test/sm2_internal_test.o" =>
                 [
                     "include",
-                    "crypto/include",
                 ],
             "test/sm4_internal_test.o" =>
                 [
                     ".",
                     "include",
-                    "crypto/include",
                 ],
             "test/srptest.o" =>
                 [
@@ -9918,6 +9266,10 @@ our %unified_info = (
                     ".",
                     "include",
                 ],
+            "test/ssl_ctx_test.o" =>
+                [
+                    "include",
+                ],
             "test/ssl_test.o" =>
                 [
                     "include",
@@ -9981,10 +9333,6 @@ our %unified_info = (
                 [
                     "include",
                 ],
-            "test/testutil/init.o" =>
-                [
-                    "include",
-                ],
             "test/testutil/main.o" =>
                 [
                     "include",
@@ -10013,6 +9361,10 @@ our %unified_info = (
                 [
                     "include",
                 ],
+            "test/testutil/testutil_init.o" =>
+                [
+                    "include",
+                ],
             "test/threadstest.o" =>
                 [
                     "include",
@@ -10277,6 +9629,7 @@ our %unified_info = (
             "test/sm4_internal_test",
             "test/srptest",
             "test/ssl_cert_table_internal_test",
+            "test/ssl_ctx_test",
             "test/ssl_test",
             "test/ssl_test_ctx_test",
             "test/sslapitest",
@@ -15237,7 +14590,6 @@ our %unified_info = (
                     "test/testutil/cb.o",
                     "test/testutil/driver.o",
                     "test/testutil/format_output.o",
-                    "test/testutil/init.o",
                     "test/testutil/main.o",
                     "test/testutil/output_helpers.o",
                     "test/testutil/random.o",
@@ -15245,6 +14597,7 @@ our %unified_info = (
                     "test/testutil/tap_bio.o",
                     "test/testutil/test_cleanup.o",
                     "test/testutil/tests.o",
+                    "test/testutil/testutil_init.o",
                 ],
             "test/md2test" =>
                 [
@@ -15472,6 +14825,14 @@ our %unified_info = (
                 [
                     "test/ssl_cert_table_internal_test.c",
                 ],
+            "test/ssl_ctx_test" =>
+                [
+                    "test/ssl_ctx_test.o",
+                ],
+            "test/ssl_ctx_test.o" =>
+                [
+                    "test/ssl_ctx_test.c",
+                ],
             "test/ssl_test" =>
                 [
                     "test/handshake_helper.o",
@@ -15574,10 +14935,6 @@ our %unified_info = (
                 [
                     "test/testutil/format_output.c",
                 ],
-            "test/testutil/init.o" =>
-                [
-                    "test/testutil/init.c",
-                ],
             "test/testutil/main.o" =>
                 [
                     "test/testutil/main.c",
@@ -15606,6 +14963,10 @@ our %unified_info = (
                 [
                     "test/testutil/tests.c",
                 ],
+            "test/testutil/testutil_init.o" =>
+                [
+                    "test/testutil/testutil_init.c",
+                ],
             "test/threadstest" =>
                 [
                     "test/threadstest.o",
diff --git a/deps/openssl/config/archs/BSD-x86/asm/crypto/aes/aes-586.s b/deps/openssl/config/archs/BSD-x86/asm/crypto/aes/aes-586.s
deleted file mode 100644
index 1ac5376af2..0000000000
--- a/deps/openssl/config/archs/BSD-x86/asm/crypto/aes/aes-586.s
+++ /dev/null
@@ -1,3218 +0,0 @@
-.text
-.type	__x86_AES_encrypt_compact,@function
-.align	4
-__x86_AES_encrypt_compact:
-	movl	%edi,20(%esp)
-	xorl	(%edi),%eax
-	xorl	4(%edi),%ebx
-	xorl	8(%edi),%ecx
-	xorl	12(%edi),%edx
-	movl	240(%edi),%esi
-	leal	-2(%esi,%esi,1),%esi
-	leal	(%edi,%esi,8),%esi
-	movl	%esi,24(%esp)
-	movl	-128(%ebp),%edi
-	movl	-96(%ebp),%esi
-	movl	-64(%ebp),%edi
-	movl	-32(%ebp),%esi
-	movl	(%ebp),%edi
-	movl	32(%ebp),%esi
-	movl	64(%ebp),%edi
-	movl	96(%ebp),%esi
-.align	4,0x90
-L000loop:
-	movl	%eax,%esi
-	andl	$255,%esi
-	movzbl	-128(%ebp,%esi,1),%esi
-	movzbl	%bh,%edi
-	movzbl	-128(%ebp,%edi,1),%edi
-	shll	$8,%edi
-	xorl	%edi,%esi
-	movl	%ecx,%edi
-	shrl	$16,%edi
-	andl	$255,%edi
-	movzbl	-128(%ebp,%edi,1),%edi
-	shll	$16,%edi
-	xorl	%edi,%esi
-	movl	%edx,%edi
-	shrl	$24,%edi
-	movzbl	-128(%ebp,%edi,1),%edi
-	shll	$24,%edi
-	xorl	%edi,%esi
-	movl	%esi,4(%esp)
-	movl	%ebx,%esi
-	andl	$255,%esi
-	shrl	$16,%ebx
-	movzbl	-128(%ebp,%esi,1),%esi
-	movzbl	%ch,%edi
-	movzbl	-128(%ebp,%edi,1),%edi
-	shll	$8,%edi
-	xorl	%edi,%esi
-	movl	%edx,%edi
-	shrl	$16,%edi
-	andl	$255,%edi
-	movzbl	-128(%ebp,%edi,1),%edi
-	shll	$16,%edi
-	xorl	%edi,%esi
-	movl	%eax,%edi
-	shrl	$24,%edi
-	movzbl	-128(%ebp,%edi,1),%edi
-	shll	$24,%edi
-	xorl	%edi,%esi
-	movl	%esi,8(%esp)
-	movl	%ecx,%esi
-	andl	$255,%esi
-	shrl	$24,%ecx
-	movzbl	-128(%ebp,%esi,1),%esi
-	movzbl	%dh,%edi
-	movzbl	-128(%ebp,%edi,1),%edi
-	shll	$8,%edi
-	xorl	%edi,%esi
-	movl	%eax,%edi
-	shrl	$16,%edi
-	andl	$255,%edx
-	andl	$255,%edi
-	movzbl	-128(%ebp,%edi,1),%edi
-	shll	$16,%edi
-	xorl	%edi,%esi
-	movzbl	%bh,%edi
-	movzbl	-128(%ebp,%edi,1),%edi
-	shll	$24,%edi
-	xorl	%edi,%esi
-	andl	$255,%edx
-	movzbl	-128(%ebp,%edx,1),%edx
-	movzbl	%ah,%eax
-	movzbl	-128(%ebp,%eax,1),%eax
-	shll	$8,%eax
-	xorl	%eax,%edx
-	movl	4(%esp),%eax
-	andl	$255,%ebx
-	movzbl	-128(%ebp,%ebx,1),%ebx
-	shll	$16,%ebx
-	xorl	%ebx,%edx
-	movl	8(%esp),%ebx
-	movzbl	-128(%ebp,%ecx,1),%ecx
-	shll	$24,%ecx
-	xorl	%ecx,%edx
-	movl	%esi,%ecx
-	movl	$2155905152,%ebp
-	andl	%ecx,%ebp
-	leal	(%ecx,%ecx,1),%edi
-	movl	%ebp,%esi
-	shrl	$7,%ebp
-	andl	$4278124286,%edi
-	subl	%ebp,%esi
-	movl	%ecx,%ebp
-	andl	$454761243,%esi
-	rorl	$16,%ebp
-	xorl	%edi,%esi
-	movl	%ecx,%edi
-	xorl	%esi,%ecx
-	rorl	$24,%edi
-	xorl	%ebp,%esi
-	roll	$24,%ecx
-	xorl	%edi,%esi
-	movl	$2155905152,%ebp
-	xorl	%esi,%ecx
-	andl	%edx,%ebp
-	leal	(%edx,%edx,1),%edi
-	movl	%ebp,%esi
-	shrl	$7,%ebp
-	andl	$4278124286,%edi
-	subl	%ebp,%esi
-	movl	%edx,%ebp
-	andl	$454761243,%esi
-	rorl	$16,%ebp
-	xorl	%edi,%esi
-	movl	%edx,%edi
-	xorl	%esi,%edx
-	rorl	$24,%edi
-	xorl	%ebp,%esi
-	roll	$24,%edx
-	xorl	%edi,%esi
-	movl	$2155905152,%ebp
-	xorl	%esi,%edx
-	andl	%eax,%ebp
-	leal	(%eax,%eax,1),%edi
-	movl	%ebp,%esi
-	shrl	$7,%ebp
-	andl	$4278124286,%edi
-	subl	%ebp,%esi
-	movl	%eax,%ebp
-	andl	$454761243,%esi
-	rorl	$16,%ebp
-	xorl	%edi,%esi
-	movl	%eax,%edi
-	xorl	%esi,%eax
-	rorl	$24,%edi
-	xorl	%ebp,%esi
-	roll	$24,%eax
-	xorl	%edi,%esi
-	movl	$2155905152,%ebp
-	xorl	%esi,%eax
-	andl	%ebx,%ebp
-	leal	(%ebx,%ebx,1),%edi
-	movl	%ebp,%esi
-	shrl	$7,%ebp
-	andl	$4278124286,%edi
-	subl	%ebp,%esi
-	movl	%ebx,%ebp
-	andl	$454761243,%esi
-	rorl	$16,%ebp
-	xorl	%edi,%esi
-	movl	%ebx,%edi
-	xorl	%esi,%ebx
-	rorl	$24,%edi
-	xorl	%ebp,%esi
-	roll	$24,%ebx
-	xorl	%edi,%esi
-	xorl	%esi,%ebx
-	movl	20(%esp),%edi
-	movl	28(%esp),%ebp
-	addl	$16,%edi
-	xorl	(%edi),%eax
-	xorl	4(%edi),%ebx
-	xorl	8(%edi),%ecx
-	xorl	12(%edi),%edx
-	cmpl	24(%esp),%edi
-	movl	%edi,20(%esp)
-	jb	L000loop
-	movl	%eax,%esi
-	andl	$255,%esi
-	movzbl	-128(%ebp,%esi,1),%esi
-	movzbl	%bh,%edi
-	movzbl	-128(%ebp,%edi,1),%edi
-	shll	$8,%edi
-	xorl	%edi,%esi
-	movl	%ecx,%edi
-	shrl	$16,%edi
-	andl	$255,%edi
-	movzbl	-128(%ebp,%edi,1),%edi
-	shll	$16,%edi
-	xorl	%edi,%esi
-	movl	%edx,%edi
-	shrl	$24,%edi
-	movzbl	-128(%ebp,%edi,1),%edi
-	shll	$24,%edi
-	xorl	%edi,%esi
-	movl	%esi,4(%esp)
-	movl	%ebx,%esi
-	andl	$255,%esi
-	shrl	$16,%ebx
-	movzbl	-128(%ebp,%esi,1),%esi
-	movzbl	%ch,%edi
-	movzbl	-128(%ebp,%edi,1),%edi
-	shll	$8,%edi
-	xorl	%edi,%esi
-	movl	%edx,%edi
-	shrl	$16,%edi
-	andl	$255,%edi
-	movzbl	-128(%ebp,%edi,1),%edi
-	shll	$16,%edi
-	xorl	%edi,%esi
-	movl	%eax,%edi
-	shrl	$24,%edi
-	movzbl	-128(%ebp,%edi,1),%edi
-	shll	$24,%edi
-	xorl	%edi,%esi
-	movl	%esi,8(%esp)
-	movl	%ecx,%esi
-	andl	$255,%esi
-	shrl	$24,%ecx
-	movzbl	-128(%ebp,%esi,1),%esi
-	movzbl	%dh,%edi
-	movzbl	-128(%ebp,%edi,1),%edi
-	shll	$8,%edi
-	xorl	%edi,%esi
-	movl	%eax,%edi
-	shrl	$16,%edi
-	andl	$255,%edx
-	andl	$255,%edi
-	movzbl	-128(%ebp,%edi,1),%edi
-	shll	$16,%edi
-	xorl	%edi,%esi
-	movzbl	%bh,%edi
-	movzbl	-128(%ebp,%edi,1),%edi
-	shll	$24,%edi
-	xorl	%edi,%esi
-	movl	20(%esp),%edi
-	andl	$255,%edx
-	movzbl	-128(%ebp,%edx,1),%edx
-	movzbl	%ah,%eax
-	movzbl	-128(%ebp,%eax,1),%eax
-	shll	$8,%eax
-	xorl	%eax,%edx
-	movl	4(%esp),%eax
-	andl	$255,%ebx
-	movzbl	-128(%ebp,%ebx,1),%ebx
-	shll	$16,%ebx
-	xorl	%ebx,%edx
-	movl	8(%esp),%ebx
-	movzbl	-128(%ebp,%ecx,1),%ecx
-	shll	$24,%ecx
-	xorl	%ecx,%edx
-	movl	%esi,%ecx
-	xorl	16(%edi),%eax
-	xorl	20(%edi),%ebx
-	xorl	24(%edi),%ecx
-	xorl	28(%edi),%edx
-	ret
-.type	__sse_AES_encrypt_compact,@function
-.align	4
-__sse_AES_encrypt_compact:
-	pxor	(%edi),%mm0
-	pxor	8(%edi),%mm4
-	movl	240(%edi),%esi
-	leal	-2(%esi,%esi,1),%esi
-	leal	(%edi,%esi,8),%esi
-	movl	%esi,24(%esp)
-	movl	$454761243,%eax
-	movl	%eax,8(%esp)
-	movl	%eax,12(%esp)
-	movl	-128(%ebp),%eax
-	movl	-96(%ebp),%ebx
-	movl	-64(%ebp),%ecx
-	movl	-32(%ebp),%edx
-	movl	(%ebp),%eax
-	movl	32(%ebp),%ebx
-	movl	64(%ebp),%ecx
-	movl	96(%ebp),%edx
-.align	4,0x90
-L001loop:
-	pshufw	$8,%mm0,%mm1
-	pshufw	$13,%mm4,%mm5
-	movd	%mm1,%eax
-	movd	%mm5,%ebx
-	movl	%edi,20(%esp)
-	movzbl	%al,%esi
-	movzbl	%ah,%edx
-	pshufw	$13,%mm0,%mm2
-	movzbl	-128(%ebp,%esi,1),%ecx
-	movzbl	%bl,%edi
-	movzbl	-128(%ebp,%edx,1),%edx
-	shrl	$16,%eax
-	shll	$8,%edx
-	movzbl	-128(%ebp,%edi,1),%esi
-	movzbl	%bh,%edi
-	shll	$16,%esi
-	pshufw	$8,%mm4,%mm6
-	orl	%esi,%ecx
-	movzbl	-128(%ebp,%edi,1),%esi
-	movzbl	%ah,%edi
-	shll	$24,%esi
-	shrl	$16,%ebx
-	orl	%esi,%edx
-	movzbl	-128(%ebp,%edi,1),%esi
-	movzbl	%bh,%edi
-	shll	$8,%esi
-	orl	%esi,%ecx
-	movzbl	-128(%ebp,%edi,1),%esi
-	movzbl	%al,%edi
-	shll	$24,%esi
-	orl	%esi,%ecx
-	movzbl	-128(%ebp,%edi,1),%esi
-	movzbl	%bl,%edi
-	movd	%mm2,%eax
-	movd	%ecx,%mm0
-	movzbl	-128(%ebp,%edi,1),%ecx
-	movzbl	%ah,%edi
-	shll	$16,%ecx
-	movd	%mm6,%ebx
-	orl	%esi,%ecx
-	movzbl	-128(%ebp,%edi,1),%esi
-	movzbl	%bh,%edi
-	shll	$24,%esi
-	orl	%esi,%ecx
-	movzbl	-128(%ebp,%edi,1),%esi
-	movzbl	%bl,%edi
-	shll	$8,%esi
-	shrl	$16,%ebx
-	orl	%esi,%ecx
-	movzbl	-128(%ebp,%edi,1),%esi
-	movzbl	%al,%edi
-	shrl	$16,%eax
-	movd	%ecx,%mm1
-	movzbl	-128(%ebp,%edi,1),%ecx
-	movzbl	%ah,%edi
-	shll	$16,%ecx
-	andl	$255,%eax
-	orl	%esi,%ecx
-	punpckldq	%mm1,%mm0
-	movzbl	-128(%ebp,%edi,1),%esi
-	movzbl	%bh,%edi
-	shll	$24,%esi
-	andl	$255,%ebx
-	movzbl	-128(%ebp,%eax,1),%eax
-	orl	%esi,%ecx
-	shll	$16,%eax
-	movzbl	-128(%ebp,%edi,1),%esi
-	orl	%eax,%edx
-	shll	$8,%esi
-	movzbl	-128(%ebp,%ebx,1),%ebx
-	orl	%esi,%ecx
-	orl	%ebx,%edx
-	movl	20(%esp),%edi
-	movd	%ecx,%mm4
-	movd	%edx,%mm5
-	punpckldq	%mm5,%mm4
-	addl	$16,%edi
-	cmpl	24(%esp),%edi
-	ja	L002out
-	movq	8(%esp),%mm2
-	pxor	%mm3,%mm3
-	pxor	%mm7,%mm7
-	movq	%mm0,%mm1
-	movq	%mm4,%mm5
-	pcmpgtb	%mm0,%mm3
-	pcmpgtb	%mm4,%mm7
-	pand	%mm2,%mm3
-	pand	%mm2,%mm7
-	pshufw	$177,%mm0,%mm2
-	pshufw	$177,%mm4,%mm6
-	paddb	%mm0,%mm0
-	paddb	%mm4,%mm4
-	pxor	%mm3,%mm0
-	pxor	%mm7,%mm4
-	pshufw	$177,%mm2,%mm3
-	pshufw	$177,%mm6,%mm7
-	pxor	%mm0,%mm1
-	pxor	%mm4,%mm5
-	pxor	%mm2,%mm0
-	pxor	%mm6,%mm4
-	movq	%mm3,%mm2
-	movq	%mm7,%mm6
-	pslld	$8,%mm3
-	pslld	$8,%mm7
-	psrld	$24,%mm2
-	psrld	$24,%mm6
-	pxor	%mm3,%mm0
-	pxor	%mm7,%mm4
-	pxor	%mm2,%mm0
-	pxor	%mm6,%mm4
-	movq	%mm1,%mm3
-	movq	%mm5,%mm7
-	movq	(%edi),%mm2
-	movq	8(%edi),%mm6
-	psrld	$8,%mm1
-	psrld	$8,%mm5
-	movl	-128(%ebp),%eax
-	pslld	$24,%mm3
-	pslld	$24,%mm7
-	movl	-64(%ebp),%ebx
-	pxor	%mm1,%mm0
-	pxor	%mm5,%mm4
-	movl	(%ebp),%ecx
-	pxor	%mm3,%mm0
-	pxor	%mm7,%mm4
-	movl	64(%ebp),%edx
-	pxor	%mm2,%mm0
-	pxor	%mm6,%mm4
-	jmp	L001loop
-.align	4,0x90
-L002out:
-	pxor	(%edi),%mm0
-	pxor	8(%edi),%mm4
-	ret
-.type	__x86_AES_encrypt,@function
-.align	4
-__x86_AES_encrypt:
-	movl	%edi,20(%esp)
-	xorl	(%edi),%eax
-	xorl	4(%edi),%ebx
-	xorl	8(%edi),%ecx
-	xorl	12(%edi),%edx
-	movl	240(%edi),%esi
-	leal	-2(%esi,%esi,1),%esi
-	leal	(%edi,%esi,8),%esi
-	movl	%esi,24(%esp)
-.align	4,0x90
-L003loop:
-	movl	%eax,%esi
-	andl	$255,%esi
-	movl	(%ebp,%esi,8),%esi
-	movzbl	%bh,%edi
-	xorl	3(%ebp,%edi,8),%esi
-	movl	%ecx,%edi
-	shrl	$16,%edi
-	andl	$255,%edi
-	xorl	2(%ebp,%edi,8),%esi
-	movl	%edx,%edi
-	shrl	$24,%edi
-	xorl	1(%ebp,%edi,8),%esi
-	movl	%esi,4(%esp)
-	movl	%ebx,%esi
-	andl	$255,%esi
-	shrl	$16,%ebx
-	movl	(%ebp,%esi,8),%esi
-	movzbl	%ch,%edi
-	xorl	3(%ebp,%edi,8),%esi
-	movl	%edx,%edi
-	shrl	$16,%edi
-	andl	$255,%edi
-	xorl	2(%ebp,%edi,8),%esi
-	movl	%eax,%edi
-	shrl	$24,%edi
-	xorl	1(%ebp,%edi,8),%esi
-	movl	%esi,8(%esp)
-	movl	%ecx,%esi
-	andl	$255,%esi
-	shrl	$24,%ecx
-	movl	(%ebp,%esi,8),%esi
-	movzbl	%dh,%edi
-	xorl	3(%ebp,%edi,8),%esi
-	movl	%eax,%edi
-	shrl	$16,%edi
-	andl	$255,%edx
-	andl	$255,%edi
-	xorl	2(%ebp,%edi,8),%esi
-	movzbl	%bh,%edi
-	xorl	1(%ebp,%edi,8),%esi
-	movl	20(%esp),%edi
-	movl	(%ebp,%edx,8),%edx
-	movzbl	%ah,%eax
-	xorl	3(%ebp,%eax,8),%edx
-	movl	4(%esp),%eax
-	andl	$255,%ebx
-	xorl	2(%ebp,%ebx,8),%edx
-	movl	8(%esp),%ebx
-	xorl	1(%ebp,%ecx,8),%edx
-	movl	%esi,%ecx
-	addl	$16,%edi
-	xorl	(%edi),%eax
-	xorl	4(%edi),%ebx
-	xorl	8(%edi),%ecx
-	xorl	12(%edi),%edx
-	cmpl	24(%esp),%edi
-	movl	%edi,20(%esp)
-	jb	L003loop
-	movl	%eax,%esi
-	andl	$255,%esi
-	movl	2(%ebp,%esi,8),%esi
-	andl	$255,%esi
-	movzbl	%bh,%edi
-	movl	(%ebp,%edi,8),%edi
-	andl	$65280,%edi
-	xorl	%edi,%esi
-	movl	%ecx,%edi
-	shrl	$16,%edi
-	andl	$255,%edi
-	movl	(%ebp,%edi,8),%edi
-	andl	$16711680,%edi
-	xorl	%edi,%esi
-	movl	%edx,%edi
-	shrl	$24,%edi
-	movl	2(%ebp,%edi,8),%edi
-	andl	$4278190080,%edi
-	xorl	%edi,%esi
-	movl	%esi,4(%esp)
-	movl	%ebx,%esi
-	andl	$255,%esi
-	shrl	$16,%ebx
-	movl	2(%ebp,%esi,8),%esi
-	andl	$255,%esi
-	movzbl	%ch,%edi
-	movl	(%ebp,%edi,8),%edi
-	andl	$65280,%edi
-	xorl	%edi,%esi
-	movl	%edx,%edi
-	shrl	$16,%edi
-	andl	$255,%edi
-	movl	(%ebp,%edi,8),%edi
-	andl	$16711680,%edi
-	xorl	%edi,%esi
-	movl	%eax,%edi
-	shrl	$24,%edi
-	movl	2(%ebp,%edi,8),%edi
-	andl	$4278190080,%edi
-	xorl	%edi,%esi
-	movl	%esi,8(%esp)
-	movl	%ecx,%esi
-	andl	$255,%esi
-	shrl	$24,%ecx
-	movl	2(%ebp,%esi,8),%esi
-	andl	$255,%esi
-	movzbl	%dh,%edi
-	movl	(%ebp,%edi,8),%edi
-	andl	$65280,%edi
-	xorl	%edi,%esi
-	movl	%eax,%edi
-	shrl	$16,%edi
-	andl	$255,%edx
-	andl	$255,%edi
-	movl	(%ebp,%edi,8),%edi
-	andl	$16711680,%edi
-	xorl	%edi,%esi
-	movzbl	%bh,%edi
-	movl	2(%ebp,%edi,8),%edi
-	andl	$4278190080,%edi
-	xorl	%edi,%esi
-	movl	20(%esp),%edi
-	andl	$255,%edx
-	movl	2(%ebp,%edx,8),%edx
-	andl	$255,%edx
-	movzbl	%ah,%eax
-	movl	(%ebp,%eax,8),%eax
-	andl	$65280,%eax
-	xorl	%eax,%edx
-	movl	4(%esp),%eax
-	andl	$255,%ebx
-	movl	(%ebp,%ebx,8),%ebx
-	andl	$16711680,%ebx
-	xorl	%ebx,%edx
-	movl	8(%esp),%ebx
-	movl	2(%ebp,%ecx,8),%ecx
-	andl	$4278190080,%ecx
-	xorl	%ecx,%edx
-	movl	%esi,%ecx
-	addl	$16,%edi
-	xorl	(%edi),%eax
-	xorl	4(%edi),%ebx
-	xorl	8(%edi),%ecx
-	xorl	12(%edi),%edx
-	ret
-.align	6,0x90
-LAES_Te:
-.long	2774754246,2774754246
-.long	2222750968,2222750968
-.long	2574743534,2574743534
-.long	2373680118,2373680118
-.long	234025727,234025727
-.long	3177933782,3177933782
-.long	2976870366,2976870366
-.long	1422247313,1422247313
-.long	1345335392,1345335392
-.long	50397442,50397442
-.long	2842126286,2842126286
-.long	2099981142,2099981142
-.long	436141799,436141799
-.long	1658312629,1658312629
-.long	3870010189,3870010189
-.long	2591454956,2591454956
-.long	1170918031,1170918031
-.long	2642575903,2642575903
-.long	1086966153,1086966153
-.long	2273148410,2273148410
-.long	368769775,368769775
-.long	3948501426,3948501426
-.long	3376891790,3376891790
-.long	200339707,200339707
-.long	3970805057,3970805057
-.long	1742001331,1742001331
-.long	4255294047,4255294047
-.long	3937382213,3937382213
-.long	3214711843,3214711843
-.long	4154762323,4154762323
-.long	2524082916,2524082916
-.long	1539358875,1539358875
-.long	3266819957,3266819957
-.long	486407649,486407649
-.long	2928907069,2928907069
-.long	1780885068,1780885068
-.long	1513502316,1513502316
-.long	1094664062,1094664062
-.long	49805301,49805301
-.long	1338821763,1338821763
-.long	1546925160,1546925160
-.long	4104496465,4104496465
-.long	887481809,887481809
-.long	150073849,150073849
-.long	2473685474,2473685474
-.long	1943591083,1943591083
-.long	1395732834,1395732834
-.long	1058346282,1058346282
-.long	201589768,201589768
-.long	1388824469,1388824469
-.long	1696801606,1696801606
-.long	1589887901,1589887901
-.long	672667696,672667696
-.long	2711000631,2711000631
-.long	251987210,251987210
-.long	3046808111,3046808111
-.long	151455502,151455502
-.long	907153956,907153956
-.long	2608889883,2608889883
-.long	1038279391,1038279391
-.long	652995533,652995533
-.long	1764173646,1764173646
-.long	3451040383,3451040383
-.long	2675275242,2675275242
-.long	453576978,453576978
-.long	2659418909,2659418909
-.long	1949051992,1949051992
-.long	773462580,773462580
-.long	756751158,756751158
-.long	2993581788,2993581788
-.long	3998898868,3998898868
-.long	4221608027,4221608027
-.long	4132590244,4132590244
-.long	1295727478,1295727478
-.long	1641469623,1641469623
-.long	3467883389,3467883389
-.long	2066295122,2066295122
-.long	1055122397,1055122397
-.long	1898917726,1898917726
-.long	2542044179,2542044179
-.long	4115878822,4115878822
-.long	1758581177,1758581177
-.long	0,0
-.long	753790401,753790401
-.long	1612718144,1612718144
-.long	536673507,536673507
-.long	3367088505,3367088505
-.long	3982187446,3982187446
-.long	3194645204,3194645204
-.long	1187761037,1187761037
-.long	3653156455,3653156455
-.long	1262041458,1262041458
-.long	3729410708,3729410708
-.long	3561770136,3561770136
-.long	3898103984,3898103984
-.long	1255133061,1255133061
-.long	1808847035,1808847035
-.long	720367557,720367557
-.long	3853167183,3853167183
-.long	385612781,385612781
-.long	3309519750,3309519750
-.long	3612167578,3612167578
-.long	1429418854,1429418854
-.long	2491778321,2491778321
-.long	3477423498,3477423498
-.long	284817897,284817897
-.long	100794884,100794884
-.long	2172616702,2172616702
-.long	4031795360,4031795360
-.long	1144798328,1144798328
-.long	3131023141,3131023141
-.long	3819481163,3819481163
-.long	4082192802,4082192802
-.long	4272137053,4272137053
-.long	3225436288,3225436288
-.long	2324664069,2324664069
-.long	2912064063,2912064063
-.long	3164445985,3164445985
-.long	1211644016,1211644016
-.long	83228145,83228145
-.long	3753688163,3753688163
-.long	3249976951,3249976951
-.long	1977277103,1977277103
-.long	1663115586,1663115586
-.long	806359072,806359072
-.long	452984805,452984805
-.long	250868733,250868733
-.long	1842533055,1842533055
-.long	1288555905,1288555905
-.long	336333848,336333848
-.long	890442534,890442534
-.long	804056259,804056259
-.long	3781124030,3781124030
-.long	2727843637,2727843637
-.long	3427026056,3427026056
-.long	957814574,957814574
-.long	1472513171,1472513171
-.long	4071073621,4071073621
-.long	2189328124,2189328124
-.long	1195195770,1195195770
-.long	2892260552,2892260552
-.long	3881655738,3881655738
-.long	723065138,723065138
-.long	2507371494,2507371494
-.long	2690670784,2690670784
-.long	2558624025,2558624025
-.long	3511635870,3511635870
-.long	2145180835,2145180835
-.long	1713513028,1713513028
-.long	2116692564,2116692564
-.long	2878378043,2878378043
-.long	2206763019,2206763019
-.long	3393603212,3393603212
-.long	703524551,703524551
-.long	3552098411,3552098411
-.long	1007948840,1007948840
-.long	2044649127,2044649127
-.long	3797835452,3797835452
-.long	487262998,487262998
-.long	1994120109,1994120109
-.long	1004593371,1004593371
-.long	1446130276,1446130276
-.long	1312438900,1312438900
-.long	503974420,503974420
-.long	3679013266,3679013266
-.long	168166924,168166924
-.long	1814307912,1814307912
-.long	3831258296,3831258296
-.long	1573044895,1573044895
-.long	1859376061,1859376061
-.long	4021070915,4021070915
-.long	2791465668,2791465668
-.long	2828112185,2828112185
-.long	2761266481,2761266481
-.long	937747667,937747667
-.long	2339994098,2339994098
-.long	854058965,854058965
-.long	1137232011,1137232011
-.long	1496790894,1496790894
-.long	3077402074,3077402074
-.long	2358086913,2358086913
-.long	1691735473,1691735473
-.long	3528347292,3528347292
-.long	3769215305,3769215305
-.long	3027004632,3027004632
-.long	4199962284,4199962284
-.long	133494003,133494003
-.long	636152527,636152527
-.long	2942657994,2942657994
-.long	2390391540,2390391540
-.long	3920539207,3920539207
-.long	403179536,403179536
-.long	3585784431,3585784431
-.long	2289596656,2289596656
-.long	1864705354,1864705354
-.long	1915629148,1915629148
-.long	605822008,605822008
-.long	4054230615,4054230615
-.long	3350508659,3350508659
-.long	1371981463,1371981463
-.long	602466507,602466507
-.long	2094914977,2094914977
-.long	2624877800,2624877800
-.long	555687742,555687742
-.long	3712699286,3712699286
-.long	3703422305,3703422305
-.long	2257292045,2257292045
-.long	2240449039,2240449039
-.long	2423288032,2423288032
-.long	1111375484,1111375484
-.long	3300242801,3300242801
-.long	2858837708,2858837708
-.long	3628615824,3628615824
-.long	84083462,84083462
-.long	32962295,32962295
-.long	302911004,302911004
-.long	2741068226,2741068226
-.long	1597322602,1597322602
-.long	4183250862,4183250862
-.long	3501832553,3501832553
-.long	2441512471,2441512471
-.long	1489093017,1489093017
-.long	656219450,656219450
-.long	3114180135,3114180135
-.long	954327513,954327513
-.long	335083755,335083755
-.long	3013122091,3013122091
-.long	856756514,856756514
-.long	3144247762,3144247762
-.long	1893325225,1893325225
-.long	2307821063,2307821063
-.long	2811532339,2811532339
-.long	3063651117,3063651117
-.long	572399164,572399164
-.long	2458355477,2458355477
-.long	552200649,552200649
-.long	1238290055,1238290055
-.long	4283782570,4283782570
-.long	2015897680,2015897680
-.long	2061492133,2061492133
-.long	2408352771,2408352771
-.long	4171342169,4171342169
-.long	2156497161,2156497161
-.long	386731290,386731290
-.long	3669999461,3669999461
-.long	837215959,837215959
-.long	3326231172,3326231172
-.long	3093850320,3093850320
-.long	3275833730,3275833730
-.long	2962856233,2962856233
-.long	1999449434,1999449434
-.long	286199582,286199582
-.long	3417354363,3417354363
-.long	4233385128,4233385128
-.long	3602627437,3602627437
-.long	974525996,974525996
-.byte	99,124,119,123,242,107,111,197
-.byte	48,1,103,43,254,215,171,118
-.byte	202,130,201,125,250,89,71,240
-.byte	173,212,162,175,156,164,114,192
-.byte	183,253,147,38,54,63,247,204
-.byte	52,165,229,241,113,216,49,21
-.byte	4,199,35,195,24,150,5,154
-.byte	7,18,128,226,235,39,178,117
-.byte	9,131,44,26,27,110,90,160
-.byte	82,59,214,179,41,227,47,132
-.byte	83,209,0,237,32,252,177,91
-.byte	106,203,190,57,74,76,88,207
-.byte	208,239,170,251,67,77,51,133
-.byte	69,249,2,127,80,60,159,168
-.byte	81,163,64,143,146,157,56,245
-.byte	188,182,218,33,16,255,243,210
-.byte	205,12,19,236,95,151,68,23
-.byte	196,167,126,61,100,93,25,115
-.byte	96,129,79,220,34,42,144,136
-.byte	70,238,184,20,222,94,11,219
-.byte	224,50,58,10,73,6,36,92
-.byte	194,211,172,98,145,149,228,121
-.byte	231,200,55,109,141,213,78,169
-.byte	108,86,244,234,101,122,174,8
-.byte	186,120,37,46,28,166,180,198
-.byte	232,221,116,31,75,189,139,138
-.byte	112,62,181,102,72,3,246,14
-.byte	97,53,87,185,134,193,29,158
-.byte	225,248,152,17,105,217,142,148
-.byte	155,30,135,233,206,85,40,223
-.byte	140,161,137,13,191,230,66,104
-.byte	65,153,45,15,176,84,187,22
-.byte	99,124,119,123,242,107,111,197
-.byte	48,1,103,43,254,215,171,118
-.byte	202,130,201,125,250,89,71,240
-.byte	173,212,162,175,156,164,114,192
-.byte	183,253,147,38,54,63,247,204
-.byte	52,165,229,241,113,216,49,21
-.byte	4,199,35,195,24,150,5,154
-.byte	7,18,128,226,235,39,178,117
-.byte	9,131,44,26,27,110,90,160
-.byte	82,59,214,179,41,227,47,132
-.byte	83,209,0,237,32,252,177,91
-.byte	106,203,190,57,74,76,88,207
-.byte	208,239,170,251,67,77,51,133
-.byte	69,249,2,127,80,60,159,168
-.byte	81,163,64,143,146,157,56,245
-.byte	188,182,218,33,16,255,243,210
-.byte	205,12,19,236,95,151,68,23
-.byte	196,167,126,61,100,93,25,115
-.byte	96,129,79,220,34,42,144,136
-.byte	70,238,184,20,222,94,11,219
-.byte	224,50,58,10,73,6,36,92
-.byte	194,211,172,98,145,149,228,121
-.byte	231,200,55,109,141,213,78,169
-.byte	108,86,244,234,101,122,174,8
-.byte	186,120,37,46,28,166,180,198
-.byte	232,221,116,31,75,189,139,138
-.byte	112,62,181,102,72,3,246,14
-.byte	97,53,87,185,134,193,29,158
-.byte	225,248,152,17,105,217,142,148
-.byte	155,30,135,233,206,85,40,223
-.byte	140,161,137,13,191,230,66,104
-.byte	65,153,45,15,176,84,187,22
-.byte	99,124,119,123,242,107,111,197
-.byte	48,1,103,43,254,215,171,118
-.byte	202,130,201,125,250,89,71,240
-.byte	173,212,162,175,156,164,114,192
-.byte	183,253,147,38,54,63,247,204
-.byte	52,165,229,241,113,216,49,21
-.byte	4,199,35,195,24,150,5,154
-.byte	7,18,128,226,235,39,178,117
-.byte	9,131,44,26,27,110,90,160
-.byte	82,59,214,179,41,227,47,132
-.byte	83,209,0,237,32,252,177,91
-.byte	106,203,190,57,74,76,88,207
-.byte	208,239,170,251,67,77,51,133
-.byte	69,249,2,127,80,60,159,168
-.byte	81,163,64,143,146,157,56,245
-.byte	188,182,218,33,16,255,243,210
-.byte	205,12,19,236,95,151,68,23
-.byte	196,167,126,61,100,93,25,115
-.byte	96,129,79,220,34,42,144,136
-.byte	70,238,184,20,222,94,11,219
-.byte	224,50,58,10,73,6,36,92
-.byte	194,211,172,98,145,149,228,121
-.byte	231,200,55,109,141,213,78,169
-.byte	108,86,244,234,101,122,174,8
-.byte	186,120,37,46,28,166,180,198
-.byte	232,221,116,31,75,189,139,138
-.byte	112,62,181,102,72,3,246,14
-.byte	97,53,87,185,134,193,29,158
-.byte	225,248,152,17,105,217,142,148
-.byte	155,30,135,233,206,85,40,223
-.byte	140,161,137,13,191,230,66,104
-.byte	65,153,45,15,176,84,187,22
-.byte	99,124,119,123,242,107,111,197
-.byte	48,1,103,43,254,215,171,118
-.byte	202,130,201,125,250,89,71,240
-.byte	173,212,162,175,156,164,114,192
-.byte	183,253,147,38,54,63,247,204
-.byte	52,165,229,241,113,216,49,21
-.byte	4,199,35,195,24,150,5,154
-.byte	7,18,128,226,235,39,178,117
-.byte	9,131,44,26,27,110,90,160
-.byte	82,59,214,179,41,227,47,132
-.byte	83,209,0,237,32,252,177,91
-.byte	106,203,190,57,74,76,88,207
-.byte	208,239,170,251,67,77,51,133
-.byte	69,249,2,127,80,60,159,168
-.byte	81,163,64,143,146,157,56,245
-.byte	188,182,218,33,16,255,243,210
-.byte	205,12,19,236,95,151,68,23
-.byte	196,167,126,61,100,93,25,115
-.byte	96,129,79,220,34,42,144,136
-.byte	70,238,184,20,222,94,11,219
-.byte	224,50,58,10,73,6,36,92
-.byte	194,211,172,98,145,149,228,121
-.byte	231,200,55,109,141,213,78,169
-.byte	108,86,244,234,101,122,174,8
-.byte	186,120,37,46,28,166,180,198
-.byte	232,221,116,31,75,189,139,138
-.byte	112,62,181,102,72,3,246,14
-.byte	97,53,87,185,134,193,29,158
-.byte	225,248,152,17,105,217,142,148
-.byte	155,30,135,233,206,85,40,223
-.byte	140,161,137,13,191,230,66,104
-.byte	65,153,45,15,176,84,187,22
-.long	1,2,4,8
-.long	16,32,64,128
-.long	27,54,0,0
-.long	0,0,0,0
-.globl	_AES_encrypt
-.type	_AES_encrypt,@function
-.align	4
-_AES_encrypt:
-L_AES_encrypt_begin:
-	pushl	%ebp
-	pushl	%ebx
-	pushl	%esi
-	pushl	%edi
-	movl	20(%esp),%esi
-	movl	28(%esp),%edi
-	movl	%esp,%eax
-	subl	$36,%esp
-	andl	$-64,%esp
-	leal	-127(%edi),%ebx
-	subl	%esp,%ebx
-	negl	%ebx
-	andl	$960,%ebx
-	subl	%ebx,%esp
-	addl	$4,%esp
-	movl	%eax,28(%esp)
-	call	L004pic_point
-L004pic_point:
-	popl	%ebp
-	leal	__GLOBAL_OFFSET_TABLE_+[.-L004pic_point](%ebp),%eax
-	movl	_OPENSSL_ia32cap_P@GOT(%eax),%eax
-	leal	LAES_Te-L004pic_point(%ebp),%ebp
-	leal	764(%esp),%ebx
-	subl	%ebp,%ebx
-	andl	$768,%ebx
-	leal	2176(%ebp,%ebx,1),%ebp
-	btl	$25,(%eax)
-	jnc	L005x86
-	movq	(%esi),%mm0
-	movq	8(%esi),%mm4
-	call	__sse_AES_encrypt_compact
-	movl	28(%esp),%esp
-	movl	24(%esp),%esi
-	movq	%mm0,(%esi)
-	movq	%mm4,8(%esi)
-	emms
-	popl	%edi
-	popl	%esi
-	popl	%ebx
-	popl	%ebp
-	ret
-.align	4,0x90
-L005x86:
-	movl	%ebp,24(%esp)
-	movl	(%esi),%eax
-	movl	4(%esi),%ebx
-	movl	8(%esi),%ecx
-	movl	12(%esi),%edx
-	call	__x86_AES_encrypt_compact
-	movl	28(%esp),%esp
-	movl	24(%esp),%esi
-	movl	%eax,(%esi)
-	movl	%ebx,4(%esi)
-	movl	%ecx,8(%esi)
-	movl	%edx,12(%esi)
-	popl	%edi
-	popl	%esi
-	popl	%ebx
-	popl	%ebp
-	ret
-.type	__x86_AES_decrypt_compact,@function
-.align	4
-__x86_AES_decrypt_compact:
-	movl	%edi,20(%esp)
-	xorl	(%edi),%eax
-	xorl	4(%edi),%ebx
-	xorl	8(%edi),%ecx
-	xorl	12(%edi),%edx
-	movl	240(%edi),%esi
-	leal	-2(%esi,%esi,1),%esi
-	leal	(%edi,%esi,8),%esi
-	movl	%esi,24(%esp)
-	movl	-128(%ebp),%edi
-	movl	-96(%ebp),%esi
-	movl	-64(%ebp),%edi
-	movl	-32(%ebp),%esi
-	movl	(%ebp),%edi
-	movl	32(%ebp),%esi
-	movl	64(%ebp),%edi
-	movl	96(%ebp),%esi
-.align	4,0x90
-L006loop:
-	movl	%eax,%esi
-	andl	$255,%esi
-	movzbl	-128(%ebp,%esi,1),%esi
-	movzbl	%dh,%edi
-	movzbl	-128(%ebp,%edi,1),%edi
-	shll	$8,%edi
-	xorl	%edi,%esi
-	movl	%ecx,%edi
-	shrl	$16,%edi
-	andl	$255,%edi
-	movzbl	-128(%ebp,%edi,1),%edi
-	shll	$16,%edi
-	xorl	%edi,%esi
-	movl	%ebx,%edi
-	shrl	$24,%edi
-	movzbl	-128(%ebp,%edi,1),%edi
-	shll	$24,%edi
-	xorl	%edi,%esi
-	movl	%esi,4(%esp)
-	movl	%ebx,%esi
-	andl	$255,%esi
-	movzbl	-128(%ebp,%esi,1),%esi
-	movzbl	%ah,%edi
-	movzbl	-128(%ebp,%edi,1),%edi
-	shll	$8,%edi
-	xorl	%edi,%esi
-	movl	%edx,%edi
-	shrl	$16,%edi
-	andl	$255,%edi
-	movzbl	-128(%ebp,%edi,1),%edi
-	shll	$16,%edi
-	xorl	%edi,%esi
-	movl	%ecx,%edi
-	shrl	$24,%edi
-	movzbl	-128(%ebp,%edi,1),%edi
-	shll	$24,%edi
-	xorl	%edi,%esi
-	movl	%esi,8(%esp)
-	movl	%ecx,%esi
-	andl	$255,%esi
-	movzbl	-128(%ebp,%esi,1),%esi
-	movzbl	%bh,%edi
-	movzbl	-128(%ebp,%edi,1),%edi
-	shll	$8,%edi
-	xorl	%edi,%esi
-	movl	%eax,%edi
-	shrl	$16,%edi
-	andl	$255,%edi
-	movzbl	-128(%ebp,%edi,1),%edi
-	shll	$16,%edi
-	xorl	%edi,%esi
-	movl	%edx,%edi
-	shrl	$24,%edi
-	movzbl	-128(%ebp,%edi,1),%edi
-	shll	$24,%edi
-	xorl	%edi,%esi
-	andl	$255,%edx
-	movzbl	-128(%ebp,%edx,1),%edx
-	movzbl	%ch,%ecx
-	movzbl	-128(%ebp,%ecx,1),%ecx
-	shll	$8,%ecx
-	xorl	%ecx,%edx
-	movl	%esi,%ecx
-	shrl	$16,%ebx
-	andl	$255,%ebx
-	movzbl	-128(%ebp,%ebx,1),%ebx
-	shll	$16,%ebx
-	xorl	%ebx,%edx
-	shrl	$24,%eax
-	movzbl	-128(%ebp,%eax,1),%eax
-	shll	$24,%eax
-	xorl	%eax,%edx
-	movl	$2155905152,%edi
-	andl	%ecx,%edi
-	movl	%edi,%esi
-	shrl	$7,%edi
-	leal	(%ecx,%ecx,1),%eax
-	subl	%edi,%esi
-	andl	$4278124286,%eax
-	andl	$454761243,%esi
-	xorl	%esi,%eax
-	movl	$2155905152,%edi
-	andl	%eax,%edi
-	movl	%edi,%esi
-	shrl	$7,%edi
-	leal	(%eax,%eax,1),%ebx
-	subl	%edi,%esi
-	andl	$4278124286,%ebx
-	andl	$454761243,%esi
-	xorl	%ecx,%eax
-	xorl	%esi,%ebx
-	movl	$2155905152,%edi
-	andl	%ebx,%edi
-	movl	%edi,%esi
-	shrl	$7,%edi
-	leal	(%ebx,%ebx,1),%ebp
-	subl	%edi,%esi
-	andl	$4278124286,%ebp
-	andl	$454761243,%esi
-	xorl	%ecx,%ebx
-	roll	$8,%ecx
-	xorl	%esi,%ebp
-	xorl	%eax,%ecx
-	xorl	%ebp,%eax
-	xorl	%ebx,%ecx
-	xorl	%ebp,%ebx
-	roll	$24,%eax
-	xorl	%ebp,%ecx
-	roll	$16,%ebx
-	xorl	%eax,%ecx
-	roll	$8,%ebp
-	xorl	%ebx,%ecx
-	movl	4(%esp),%eax
-	xorl	%ebp,%ecx
-	movl	%ecx,12(%esp)
-	movl	$2155905152,%edi
-	andl	%edx,%edi
-	movl	%edi,%esi
-	shrl	$7,%edi
-	leal	(%edx,%edx,1),%ebx
-	subl	%edi,%esi
-	andl	$4278124286,%ebx
-	andl	$454761243,%esi
-	xorl	%esi,%ebx
-	movl	$2155905152,%edi
-	andl	%ebx,%edi
-	movl	%edi,%esi
-	shrl	$7,%edi
-	leal	(%ebx,%ebx,1),%ecx
-	subl	%edi,%esi
-	andl	$4278124286,%ecx
-	andl	$454761243,%esi
-	xorl	%edx,%ebx
-	xorl	%esi,%ecx
-	movl	$2155905152,%edi
-	andl	%ecx,%edi
-	movl	%edi,%esi
-	shrl	$7,%edi
-	leal	(%ecx,%ecx,1),%ebp
-	subl	%edi,%esi
-	andl	$4278124286,%ebp
-	andl	$454761243,%esi
-	xorl	%edx,%ecx
-	roll	$8,%edx
-	xorl	%esi,%ebp
-	xorl	%ebx,%edx
-	xorl	%ebp,%ebx
-	xorl	%ecx,%edx
-	xorl	%ebp,%ecx
-	roll	$24,%ebx
-	xorl	%ebp,%edx
-	roll	$16,%ecx
-	xorl	%ebx,%edx
-	roll	$8,%ebp
-	xorl	%ecx,%edx
-	movl	8(%esp),%ebx
-	xorl	%ebp,%edx
-	movl	%edx,16(%esp)
-	movl	$2155905152,%edi
-	andl	%eax,%edi
-	movl	%edi,%esi
-	shrl	$7,%edi
-	leal	(%eax,%eax,1),%ecx
-	subl	%edi,%esi
-	andl	$4278124286,%ecx
-	andl	$454761243,%esi
-	xorl	%esi,%ecx
-	movl	$2155905152,%edi
-	andl	%ecx,%edi
-	movl	%edi,%esi
-	shrl	$7,%edi
-	leal	(%ecx,%ecx,1),%edx
-	subl	%edi,%esi
-	andl	$4278124286,%edx
-	andl	$454761243,%esi
-	xorl	%eax,%ecx
-	xorl	%esi,%edx
-	movl	$2155905152,%edi
-	andl	%edx,%edi
-	movl	%edi,%esi
-	shrl	$7,%edi
-	leal	(%edx,%edx,1),%ebp
-	subl	%edi,%esi
-	andl	$4278124286,%ebp
-	andl	$454761243,%esi
-	xorl	%eax,%edx
-	roll	$8,%eax
-	xorl	%esi,%ebp
-	xorl	%ecx,%eax
-	xorl	%ebp,%ecx
-	xorl	%edx,%eax
-	xorl	%ebp,%edx
-	roll	$24,%ecx
-	xorl	%ebp,%eax
-	roll	$16,%edx
-	xorl	%ecx,%eax
-	roll	$8,%ebp
-	xorl	%edx,%eax
-	xorl	%ebp,%eax
-	movl	$2155905152,%edi
-	andl	%ebx,%edi
-	movl	%edi,%esi
-	shrl	$7,%edi
-	leal	(%ebx,%ebx,1),%ecx
-	subl	%edi,%esi
-	andl	$4278124286,%ecx
-	andl	$454761243,%esi
-	xorl	%esi,%ecx
-	movl	$2155905152,%edi
-	andl	%ecx,%edi
-	movl	%edi,%esi
-	shrl	$7,%edi
-	leal	(%ecx,%ecx,1),%edx
-	subl	%edi,%esi
-	andl	$4278124286,%edx
-	andl	$454761243,%esi
-	xorl	%ebx,%ecx
-	xorl	%esi,%edx
-	movl	$2155905152,%edi
-	andl	%edx,%edi
-	movl	%edi,%esi
-	shrl	$7,%edi
-	leal	(%edx,%edx,1),%ebp
-	subl	%edi,%esi
-	andl	$4278124286,%ebp
-	andl	$454761243,%esi
-	xorl	%ebx,%edx
-	roll	$8,%ebx
-	xorl	%esi,%ebp
-	xorl	%ecx,%ebx
-	xorl	%ebp,%ecx
-	xorl	%edx,%ebx
-	xorl	%ebp,%edx
-	roll	$24,%ecx
-	xorl	%ebp,%ebx
-	roll	$16,%edx
-	xorl	%ecx,%ebx
-	roll	$8,%ebp
-	xorl	%edx,%ebx
-	movl	12(%esp),%ecx
-	xorl	%ebp,%ebx
-	movl	16(%esp),%edx
-	movl	20(%esp),%edi
-	movl	28(%esp),%ebp
-	addl	$16,%edi
-	xorl	(%edi),%eax
-	xorl	4(%edi),%ebx
-	xorl	8(%edi),%ecx
-	xorl	12(%edi),%edx
-	cmpl	24(%esp),%edi
-	movl	%edi,20(%esp)
-	jb	L006loop
-	movl	%eax,%esi
-	andl	$255,%esi
-	movzbl	-128(%ebp,%esi,1),%esi
-	movzbl	%dh,%edi
-	movzbl	-128(%ebp,%edi,1),%edi
-	shll	$8,%edi
-	xorl	%edi,%esi
-	movl	%ecx,%edi
-	shrl	$16,%edi
-	andl	$255,%edi
-	movzbl	-128(%ebp,%edi,1),%edi
-	shll	$16,%edi
-	xorl	%edi,%esi
-	movl	%ebx,%edi
-	shrl	$24,%edi
-	movzbl	-128(%ebp,%edi,1),%edi
-	shll	$24,%edi
-	xorl	%edi,%esi
-	movl	%esi,4(%esp)
-	movl	%ebx,%esi
-	andl	$255,%esi
-	movzbl	-128(%ebp,%esi,1),%esi
-	movzbl	%ah,%edi
-	movzbl	-128(%ebp,%edi,1),%edi
-	shll	$8,%edi
-	xorl	%edi,%esi
-	movl	%edx,%edi
-	shrl	$16,%edi
-	andl	$255,%edi
-	movzbl	-128(%ebp,%edi,1),%edi
-	shll	$16,%edi
-	xorl	%edi,%esi
-	movl	%ecx,%edi
-	shrl	$24,%edi
-	movzbl	-128(%ebp,%edi,1),%edi
-	shll	$24,%edi
-	xorl	%edi,%esi
-	movl	%esi,8(%esp)
-	movl	%ecx,%esi
-	andl	$255,%esi
-	movzbl	-128(%ebp,%esi,1),%esi
-	movzbl	%bh,%edi
-	movzbl	-128(%ebp,%edi,1),%edi
-	shll	$8,%edi
-	xorl	%edi,%esi
-	movl	%eax,%edi
-	shrl	$16,%edi
-	andl	$255,%edi
-	movzbl	-128(%ebp,%edi,1),%edi
-	shll	$16,%edi
-	xorl	%edi,%esi
-	movl	%edx,%edi
-	shrl	$24,%edi
-	movzbl	-128(%ebp,%edi,1),%edi
-	shll	$24,%edi
-	xorl	%edi,%esi
-	movl	20(%esp),%edi
-	andl	$255,%edx
-	movzbl	-128(%ebp,%edx,1),%edx
-	movzbl	%ch,%ecx
-	movzbl	-128(%ebp,%ecx,1),%ecx
-	shll	$8,%ecx
-	xorl	%ecx,%edx
-	movl	%esi,%ecx
-	shrl	$16,%ebx
-	andl	$255,%ebx
-	movzbl	-128(%ebp,%ebx,1),%ebx
-	shll	$16,%ebx
-	xorl	%ebx,%edx
-	movl	8(%esp),%ebx
-	shrl	$24,%eax
-	movzbl	-128(%ebp,%eax,1),%eax
-	shll	$24,%eax
-	xorl	%eax,%edx
-	movl	4(%esp),%eax
-	xorl	16(%edi),%eax
-	xorl	20(%edi),%ebx
-	xorl	24(%edi),%ecx
-	xorl	28(%edi),%edx
-	ret
-.type	__sse_AES_decrypt_compact,@function
-.align	4
-__sse_AES_decrypt_compact:
-	pxor	(%edi),%mm0
-	pxor	8(%edi),%mm4
-	movl	240(%edi),%esi
-	leal	-2(%esi,%esi,1),%esi
-	leal	(%edi,%esi,8),%esi
-	movl	%esi,24(%esp)
-	movl	$454761243,%eax
-	movl	%eax,8(%esp)
-	movl	%eax,12(%esp)
-	movl	-128(%ebp),%eax
-	movl	-96(%ebp),%ebx
-	movl	-64(%ebp),%ecx
-	movl	-32(%ebp),%edx
-	movl	(%ebp),%eax
-	movl	32(%ebp),%ebx
-	movl	64(%ebp),%ecx
-	movl	96(%ebp),%edx
-.align	4,0x90
-L007loop:
-	pshufw	$12,%mm0,%mm1
-	pshufw	$9,%mm4,%mm5
-	movd	%mm1,%eax
-	movd	%mm5,%ebx
-	movl	%edi,20(%esp)
-	movzbl	%al,%esi
-	movzbl	%ah,%edx
-	pshufw	$6,%mm0,%mm2
-	movzbl	-128(%ebp,%esi,1),%ecx
-	movzbl	%bl,%edi
-	movzbl	-128(%ebp,%edx,1),%edx
-	shrl	$16,%eax
-	shll	$8,%edx
-	movzbl	-128(%ebp,%edi,1),%esi
-	movzbl	%bh,%edi
-	shll	$16,%esi
-	pshufw	$3,%mm4,%mm6
-	orl	%esi,%ecx
-	movzbl	-128(%ebp,%edi,1),%esi
-	movzbl	%ah,%edi
-	shll	$24,%esi
-	shrl	$16,%ebx
-	orl	%esi,%edx
-	movzbl	-128(%ebp,%edi,1),%esi
-	movzbl	%bh,%edi
-	shll	$24,%esi
-	orl	%esi,%ecx
-	movzbl	-128(%ebp,%edi,1),%esi
-	movzbl	%al,%edi
-	shll	$8,%esi
-	movd	%mm2,%eax
-	orl	%esi,%ecx
-	movzbl	-128(%ebp,%edi,1),%esi
-	movzbl	%bl,%edi
-	shll	$16,%esi
-	movd	%mm6,%ebx
-	movd	%ecx,%mm0
-	movzbl	-128(%ebp,%edi,1),%ecx
-	movzbl	%al,%edi
-	orl	%esi,%ecx
-	movzbl	-128(%ebp,%edi,1),%esi
-	movzbl	%bl,%edi
-	orl	%esi,%edx
-	movzbl	-128(%ebp,%edi,1),%esi
-	movzbl	%ah,%edi
-	shll	$16,%esi
-	shrl	$16,%eax
-	orl	%esi,%edx
-	movzbl	-128(%ebp,%edi,1),%esi
-	movzbl	%bh,%edi
-	shrl	$16,%ebx
-	shll	$8,%esi
-	movd	%edx,%mm1
-	movzbl	-128(%ebp,%edi,1),%edx
-	movzbl	%bh,%edi
-	shll	$24,%edx
-	andl	$255,%ebx
-	orl	%esi,%edx
-	punpckldq	%mm1,%mm0
-	movzbl	-128(%ebp,%edi,1),%esi
-	movzbl	%al,%edi
-	shll	$8,%esi
-	movzbl	%ah,%eax
-	movzbl	-128(%ebp,%ebx,1),%ebx
-	orl	%esi,%ecx
-	movzbl	-128(%ebp,%edi,1),%esi
-	orl	%ebx,%edx
-	shll	$16,%esi
-	movzbl	-128(%ebp,%eax,1),%eax
-	orl	%esi,%edx
-	shll	$24,%eax
-	orl	%eax,%ecx
-	movl	20(%esp),%edi
-	movd	%edx,%mm4
-	movd	%ecx,%mm5
-	punpckldq	%mm5,%mm4
-	addl	$16,%edi
-	cmpl	24(%esp),%edi
-	ja	L008out
-	movq	%mm0,%mm3
-	movq	%mm4,%mm7
-	pshufw	$228,%mm0,%mm2
-	pshufw	$228,%mm4,%mm6
-	movq	%mm0,%mm1
-	movq	%mm4,%mm5
-	pshufw	$177,%mm0,%mm0
-	pshufw	$177,%mm4,%mm4
-	pslld	$8,%mm2
-	pslld	$8,%mm6
-	psrld	$8,%mm3
-	psrld	$8,%mm7
-	pxor	%mm2,%mm0
-	pxor	%mm6,%mm4
-	pxor	%mm3,%mm0
-	pxor	%mm7,%mm4
-	pslld	$16,%mm2
-	pslld	$16,%mm6
-	psrld	$16,%mm3
-	psrld	$16,%mm7
-	pxor	%mm2,%mm0
-	pxor	%mm6,%mm4
-	pxor	%mm3,%mm0
-	pxor	%mm7,%mm4
-	movq	8(%esp),%mm3
-	pxor	%mm2,%mm2
-	pxor	%mm6,%mm6
-	pcmpgtb	%mm1,%mm2
-	pcmpgtb	%mm5,%mm6
-	pand	%mm3,%mm2
-	pand	%mm3,%mm6
-	paddb	%mm1,%mm1
-	paddb	%mm5,%mm5
-	pxor	%mm2,%mm1
-	pxor	%mm6,%mm5
-	movq	%mm1,%mm3
-	movq	%mm5,%mm7
-	movq	%mm1,%mm2
-	movq	%mm5,%mm6
-	pxor	%mm1,%mm0
-	pxor	%mm5,%mm4
-	pslld	$24,%mm3
-	pslld	$24,%mm7
-	psrld	$8,%mm2
-	psrld	$8,%mm6
-	pxor	%mm3,%mm0
-	pxor	%mm7,%mm4
-	pxor	%mm2,%mm0
-	pxor	%mm6,%mm4
-	movq	8(%esp),%mm2
-	pxor	%mm3,%mm3
-	pxor	%mm7,%mm7
-	pcmpgtb	%mm1,%mm3
-	pcmpgtb	%mm5,%mm7
-	pand	%mm2,%mm3
-	pand	%mm2,%mm7
-	paddb	%mm1,%mm1
-	paddb	%mm5,%mm5
-	pxor	%mm3,%mm1
-	pxor	%mm7,%mm5
-	pshufw	$177,%mm1,%mm3
-	pshufw	$177,%mm5,%mm7
-	pxor	%mm1,%mm0
-	pxor	%mm5,%mm4
-	pxor	%mm3,%mm0
-	pxor	%mm7,%mm4
-	pxor	%mm3,%mm3
-	pxor	%mm7,%mm7
-	pcmpgtb	%mm1,%mm3
-	pcmpgtb	%mm5,%mm7
-	pand	%mm2,%mm3
-	pand	%mm2,%mm7
-	paddb	%mm1,%mm1
-	paddb	%mm5,%mm5
-	pxor	%mm3,%mm1
-	pxor	%mm7,%mm5
-	pxor	%mm1,%mm0
-	pxor	%mm5,%mm4
-	movq	%mm1,%mm3
-	movq	%mm5,%mm7
-	pshufw	$177,%mm1,%mm2
-	pshufw	$177,%mm5,%mm6
-	pxor	%mm2,%mm0
-	pxor	%mm6,%mm4
-	pslld	$8,%mm1
-	pslld	$8,%mm5
-	psrld	$8,%mm3
-	psrld	$8,%mm7
-	movq	(%edi),%mm2
-	movq	8(%edi),%mm6
-	pxor	%mm1,%mm0
-	pxor	%mm5,%mm4
-	pxor	%mm3,%mm0
-	pxor	%mm7,%mm4
-	movl	-128(%ebp),%eax
-	pslld	$16,%mm1
-	pslld	$16,%mm5
-	movl	-64(%ebp),%ebx
-	psrld	$16,%mm3
-	psrld	$16,%mm7
-	movl	(%ebp),%ecx
-	pxor	%mm1,%mm0
-	pxor	%mm5,%mm4
-	movl	64(%ebp),%edx
-	pxor	%mm3,%mm0
-	pxor	%mm7,%mm4
-	pxor	%mm2,%mm0
-	pxor	%mm6,%mm4
-	jmp	L007loop
-.align	4,0x90
-L008out:
-	pxor	(%edi),%mm0
-	pxor	8(%edi),%mm4
-	ret
-.type	__x86_AES_decrypt,@function
-.align	4
-__x86_AES_decrypt:
-	movl	%edi,20(%esp)
-	xorl	(%edi),%eax
-	xorl	4(%edi),%ebx
-	xorl	8(%edi),%ecx
-	xorl	12(%edi),%edx
-	movl	240(%edi),%esi
-	leal	-2(%esi,%esi,1),%esi
-	leal	(%edi,%esi,8),%esi
-	movl	%esi,24(%esp)
-.align	4,0x90
-L009loop:
-	movl	%eax,%esi
-	andl	$255,%esi
-	movl	(%ebp,%esi,8),%esi
-	movzbl	%dh,%edi
-	xorl	3(%ebp,%edi,8),%esi
-	movl	%ecx,%edi
-	shrl	$16,%edi
-	andl	$255,%edi
-	xorl	2(%ebp,%edi,8),%esi
-	movl	%ebx,%edi
-	shrl	$24,%edi
-	xorl	1(%ebp,%edi,8),%esi
-	movl	%esi,4(%esp)
-	movl	%ebx,%esi
-	andl	$255,%esi
-	movl	(%ebp,%esi,8),%esi
-	movzbl	%ah,%edi
-	xorl	3(%ebp,%edi,8),%esi
-	movl	%edx,%edi
-	shrl	$16,%edi
-	andl	$255,%edi
-	xorl	2(%ebp,%edi,8),%esi
-	movl	%ecx,%edi
-	shrl	$24,%edi
-	xorl	1(%ebp,%edi,8),%esi
-	movl	%esi,8(%esp)
-	movl	%ecx,%esi
-	andl	$255,%esi
-	movl	(%ebp,%esi,8),%esi
-	movzbl	%bh,%edi
-	xorl	3(%ebp,%edi,8),%esi
-	movl	%eax,%edi
-	shrl	$16,%edi
-	andl	$255,%edi
-	xorl	2(%ebp,%edi,8),%esi
-	movl	%edx,%edi
-	shrl	$24,%edi
-	xorl	1(%ebp,%edi,8),%esi
-	movl	20(%esp),%edi
-	andl	$255,%edx
-	movl	(%ebp,%edx,8),%edx
-	movzbl	%ch,%ecx
-	xorl	3(%ebp,%ecx,8),%edx
-	movl	%esi,%ecx
-	shrl	$16,%ebx
-	andl	$255,%ebx
-	xorl	2(%ebp,%ebx,8),%edx
-	movl	8(%esp),%ebx
-	shrl	$24,%eax
-	xorl	1(%ebp,%eax,8),%edx
-	movl	4(%esp),%eax
-	addl	$16,%edi
-	xorl	(%edi),%eax
-	xorl	4(%edi),%ebx
-	xorl	8(%edi),%ecx
-	xorl	12(%edi),%edx
-	cmpl	24(%esp),%edi
-	movl	%edi,20(%esp)
-	jb	L009loop
-	leal	2176(%ebp),%ebp
-	movl	-128(%ebp),%edi
-	movl	-96(%ebp),%esi
-	movl	-64(%ebp),%edi
-	movl	-32(%ebp),%esi
-	movl	(%ebp),%edi
-	movl	32(%ebp),%esi
-	movl	64(%ebp),%edi
-	movl	96(%ebp),%esi
-	leal	-128(%ebp),%ebp
-	movl	%eax,%esi
-	andl	$255,%esi
-	movzbl	(%ebp,%esi,1),%esi
-	movzbl	%dh,%edi
-	movzbl	(%ebp,%edi,1),%edi
-	shll	$8,%edi
-	xorl	%edi,%esi
-	movl	%ecx,%edi
-	shrl	$16,%edi
-	andl	$255,%edi
-	movzbl	(%ebp,%edi,1),%edi
-	shll	$16,%edi
-	xorl	%edi,%esi
-	movl	%ebx,%edi
-	shrl	$24,%edi
-	movzbl	(%ebp,%edi,1),%edi
-	shll	$24,%edi
-	xorl	%edi,%esi
-	movl	%esi,4(%esp)
-	movl	%ebx,%esi
-	andl	$255,%esi
-	movzbl	(%ebp,%esi,1),%esi
-	movzbl	%ah,%edi
-	movzbl	(%ebp,%edi,1),%edi
-	shll	$8,%edi
-	xorl	%edi,%esi
-	movl	%edx,%edi
-	shrl	$16,%edi
-	andl	$255,%edi
-	movzbl	(%ebp,%edi,1),%edi
-	shll	$16,%edi
-	xorl	%edi,%esi
-	movl	%ecx,%edi
-	shrl	$24,%edi
-	movzbl	(%ebp,%edi,1),%edi
-	shll	$24,%edi
-	xorl	%edi,%esi
-	movl	%esi,8(%esp)
-	movl	%ecx,%esi
-	andl	$255,%esi
-	movzbl	(%ebp,%esi,1),%esi
-	movzbl	%bh,%edi
-	movzbl	(%ebp,%edi,1),%edi
-	shll	$8,%edi
-	xorl	%edi,%esi
-	movl	%eax,%edi
-	shrl	$16,%edi
-	andl	$255,%edi
-	movzbl	(%ebp,%edi,1),%edi
-	shll	$16,%edi
-	xorl	%edi,%esi
-	movl	%edx,%edi
-	shrl	$24,%edi
-	movzbl	(%ebp,%edi,1),%edi
-	shll	$24,%edi
-	xorl	%edi,%esi
-	movl	20(%esp),%edi
-	andl	$255,%edx
-	movzbl	(%ebp,%edx,1),%edx
-	movzbl	%ch,%ecx
-	movzbl	(%ebp,%ecx,1),%ecx
-	shll	$8,%ecx
-	xorl	%ecx,%edx
-	movl	%esi,%ecx
-	shrl	$16,%ebx
-	andl	$255,%ebx
-	movzbl	(%ebp,%ebx,1),%ebx
-	shll	$16,%ebx
-	xorl	%ebx,%edx
-	movl	8(%esp),%ebx
-	shrl	$24,%eax
-	movzbl	(%ebp,%eax,1),%eax
-	shll	$24,%eax
-	xorl	%eax,%edx
-	movl	4(%esp),%eax
-	leal	-2048(%ebp),%ebp
-	addl	$16,%edi
-	xorl	(%edi),%eax
-	xorl	4(%edi),%ebx
-	xorl	8(%edi),%ecx
-	xorl	12(%edi),%edx
-	ret
-.align	6,0x90
-LAES_Td:
-.long	1353184337,1353184337
-.long	1399144830,1399144830
-.long	3282310938,3282310938
-.long	2522752826,2522752826
-.long	3412831035,3412831035
-.long	4047871263,4047871263
-.long	2874735276,2874735276
-.long	2466505547,2466505547
-.long	1442459680,1442459680
-.long	4134368941,4134368941
-.long	2440481928,2440481928
-.long	625738485,625738485
-.long	4242007375,4242007375
-.long	3620416197,3620416197
-.long	2151953702,2151953702
-.long	2409849525,2409849525
-.long	1230680542,1230680542
-.long	1729870373,1729870373
-.long	2551114309,2551114309
-.long	3787521629,3787521629
-.long	41234371,41234371
-.long	317738113,317738113
-.long	2744600205,2744600205
-.long	3338261355,3338261355
-.long	3881799427,3881799427
-.long	2510066197,2510066197
-.long	3950669247,3950669247
-.long	3663286933,3663286933
-.long	763608788,763608788
-.long	3542185048,3542185048
-.long	694804553,694804553
-.long	1154009486,1154009486
-.long	1787413109,1787413109
-.long	2021232372,2021232372
-.long	1799248025,1799248025
-.long	3715217703,3715217703
-.long	3058688446,3058688446
-.long	397248752,397248752
-.long	1722556617,1722556617
-.long	3023752829,3023752829
-.long	407560035,407560035
-.long	2184256229,2184256229
-.long	1613975959,1613975959
-.long	1165972322,1165972322
-.long	3765920945,3765920945
-.long	2226023355,2226023355
-.long	480281086,480281086
-.long	2485848313,2485848313
-.long	1483229296,1483229296
-.long	436028815,436028815
-.long	2272059028,2272059028
-.long	3086515026,3086515026
-.long	601060267,601060267
-.long	3791801202,3791801202
-.long	1468997603,1468997603
-.long	715871590,715871590
-.long	120122290,120122290
-.long	63092015,63092015
-.long	2591802758,2591802758
-.long	2768779219,2768779219
-.long	4068943920,4068943920
-.long	2997206819,2997206819
-.long	3127509762,3127509762
-.long	1552029421,1552029421
-.long	723308426,723308426
-.long	2461301159,2461301159
-.long	4042393587,4042393587
-.long	2715969870,2715969870
-.long	3455375973,3455375973
-.long	3586000134,3586000134
-.long	526529745,526529745
-.long	2331944644,2331944644
-.long	2639474228,2639474228
-.long	2689987490,2689987490
-.long	853641733,853641733
-.long	1978398372,1978398372
-.long	971801355,971801355
-.long	2867814464,2867814464
-.long	111112542,111112542
-.long	1360031421,1360031421
-.long	4186579262,4186579262
-.long	1023860118,1023860118
-.long	2919579357,2919579357
-.long	1186850381,1186850381
-.long	3045938321,3045938321
-.long	90031217,90031217
-.long	1876166148,1876166148
-.long	4279586912,4279586912
-.long	620468249,620468249
-.long	2548678102,2548678102
-.long	3426959497,3426959497
-.long	2006899047,2006899047
-.long	3175278768,3175278768
-.long	2290845959,2290845959
-.long	945494503,945494503
-.long	3689859193,3689859193
-.long	1191869601,1191869601
-.long	3910091388,3910091388
-.long	3374220536,3374220536
-.long	0,0
-.long	2206629897,2206629897
-.long	1223502642,1223502642
-.long	2893025566,2893025566
-.long	1316117100,1316117100
-.long	4227796733,4227796733
-.long	1446544655,1446544655
-.long	517320253,517320253
-.long	658058550,658058550
-.long	1691946762,1691946762
-.long	564550760,564550760
-.long	3511966619,3511966619
-.long	976107044,976107044
-.long	2976320012,2976320012
-.long	266819475,266819475
-.long	3533106868,3533106868
-.long	2660342555,2660342555
-.long	1338359936,1338359936
-.long	2720062561,2720062561
-.long	1766553434,1766553434
-.long	370807324,370807324
-.long	179999714,179999714
-.long	3844776128,3844776128
-.long	1138762300,1138762300
-.long	488053522,488053522
-.long	185403662,185403662
-.long	2915535858,2915535858
-.long	3114841645,3114841645
-.long	3366526484,3366526484
-.long	2233069911,2233069911
-.long	1275557295,1275557295
-.long	3151862254,3151862254
-.long	4250959779,4250959779
-.long	2670068215,2670068215
-.long	3170202204,3170202204
-.long	3309004356,3309004356
-.long	880737115,880737115
-.long	1982415755,1982415755
-.long	3703972811,3703972811
-.long	1761406390,1761406390
-.long	1676797112,1676797112
-.long	3403428311,3403428311
-.long	277177154,277177154
-.long	1076008723,1076008723
-.long	538035844,538035844
-.long	2099530373,2099530373
-.long	4164795346,4164795346
-.long	288553390,288553390
-.long	1839278535,1839278535
-.long	1261411869,1261411869
-.long	4080055004,4080055004
-.long	3964831245,3964831245
-.long	3504587127,3504587127
-.long	1813426987,1813426987
-.long	2579067049,2579067049
-.long	4199060497,4199060497
-.long	577038663,577038663
-.long	3297574056,3297574056
-.long	440397984,440397984
-.long	3626794326,3626794326
-.long	4019204898,4019204898
-.long	3343796615,3343796615
-.long	3251714265,3251714265
-.long	4272081548,4272081548
-.long	906744984,906744984
-.long	3481400742,3481400742
-.long	685669029,685669029
-.long	646887386,646887386
-.long	2764025151,2764025151
-.long	3835509292,3835509292
-.long	227702864,227702864
-.long	2613862250,2613862250
-.long	1648787028,1648787028
-.long	3256061430,3256061430
-.long	3904428176,3904428176
-.long	1593260334,1593260334
-.long	4121936770,4121936770
-.long	3196083615,3196083615
-.long	2090061929,2090061929
-.long	2838353263,2838353263
-.long	3004310991,3004310991
-.long	999926984,999926984
-.long	2809993232,2809993232
-.long	1852021992,1852021992
-.long	2075868123,2075868123
-.long	158869197,158869197
-.long	4095236462,4095236462
-.long	28809964,28809964
-.long	2828685187,2828685187
-.long	1701746150,1701746150
-.long	2129067946,2129067946
-.long	147831841,147831841
-.long	3873969647,3873969647
-.long	3650873274,3650873274
-.long	3459673930,3459673930
-.long	3557400554,3557400554
-.long	3598495785,3598495785
-.long	2947720241,2947720241
-.long	824393514,824393514
-.long	815048134,815048134
-.long	3227951669,3227951669
-.long	935087732,935087732
-.long	2798289660,2798289660
-.long	2966458592,2966458592
-.long	366520115,366520115
-.long	1251476721,1251476721
-.long	4158319681,4158319681
-.long	240176511,240176511
-.long	804688151,804688151
-.long	2379631990,2379631990
-.long	1303441219,1303441219
-.long	1414376140,1414376140
-.long	3741619940,3741619940
-.long	3820343710,3820343710
-.long	461924940,461924940
-.long	3089050817,3089050817
-.long	2136040774,2136040774
-.long	82468509,82468509
-.long	1563790337,1563790337
-.long	1937016826,1937016826
-.long	776014843,776014843
-.long	1511876531,1511876531
-.long	1389550482,1389550482
-.long	861278441,861278441
-.long	323475053,323475053
-.long	2355222426,2355222426
-.long	2047648055,2047648055
-.long	2383738969,2383738969
-.long	2302415851,2302415851
-.long	3995576782,3995576782
-.long	902390199,902390199
-.long	3991215329,3991215329
-.long	1018251130,1018251130
-.long	1507840668,1507840668
-.long	1064563285,1064563285
-.long	2043548696,2043548696
-.long	3208103795,3208103795
-.long	3939366739,3939366739
-.long	1537932639,1537932639
-.long	342834655,342834655
-.long	2262516856,2262516856
-.long	2180231114,2180231114
-.long	1053059257,1053059257
-.long	741614648,741614648
-.long	1598071746,1598071746
-.long	1925389590,1925389590
-.long	203809468,203809468
-.long	2336832552,2336832552
-.long	1100287487,1100287487
-.long	1895934009,1895934009
-.long	3736275976,3736275976
-.long	2632234200,2632234200
-.long	2428589668,2428589668
-.long	1636092795,1636092795
-.long	1890988757,1890988757
-.long	1952214088,1952214088
-.long	1113045200,1113045200
-.byte	82,9,106,213,48,54,165,56
-.byte	191,64,163,158,129,243,215,251
-.byte	124,227,57,130,155,47,255,135
-.byte	52,142,67,68,196,222,233,203
-.byte	84,123,148,50,166,194,35,61
-.byte	238,76,149,11,66,250,195,78
-.byte	8,46,161,102,40,217,36,178
-.byte	118,91,162,73,109,139,209,37
-.byte	114,248,246,100,134,104,152,22
-.byte	212,164,92,204,93,101,182,146
-.byte	108,112,72,80,253,237,185,218
-.byte	94,21,70,87,167,141,157,132
-.byte	144,216,171,0,140,188,211,10
-.byte	247,228,88,5,184,179,69,6
-.byte	208,44,30,143,202,63,15,2
-.byte	193,175,189,3,1,19,138,107
-.byte	58,145,17,65,79,103,220,234
-.byte	151,242,207,206,240,180,230,115
-.byte	150,172,116,34,231,173,53,133
-.byte	226,249,55,232,28,117,223,110
-.byte	71,241,26,113,29,41,197,137
-.byte	111,183,98,14,170,24,190,27
-.byte	252,86,62,75,198,210,121,32
-.byte	154,219,192,254,120,205,90,244
-.byte	31,221,168,51,136,7,199,49
-.byte	177,18,16,89,39,128,236,95
-.byte	96,81,127,169,25,181,74,13
-.byte	45,229,122,159,147,201,156,239
-.byte	160,224,59,77,174,42,245,176
-.byte	200,235,187,60,131,83,153,97
-.byte	23,43,4,126,186,119,214,38
-.byte	225,105,20,99,85,33,12,125
-.byte	82,9,106,213,48,54,165,56
-.byte	191,64,163,158,129,243,215,251
-.byte	124,227,57,130,155,47,255,135
-.byte	52,142,67,68,196,222,233,203
-.byte	84,123,148,50,166,194,35,61
-.byte	238,76,149,11,66,250,195,78
-.byte	8,46,161,102,40,217,36,178
-.byte	118,91,162,73,109,139,209,37
-.byte	114,248,246,100,134,104,152,22
-.byte	212,164,92,204,93,101,182,146
-.byte	108,112,72,80,253,237,185,218
-.byte	94,21,70,87,167,141,157,132
-.byte	144,216,171,0,140,188,211,10
-.byte	247,228,88,5,184,179,69,6
-.byte	208,44,30,143,202,63,15,2
-.byte	193,175,189,3,1,19,138,107
-.byte	58,145,17,65,79,103,220,234
-.byte	151,242,207,206,240,180,230,115
-.byte	150,172,116,34,231,173,53,133
-.byte	226,249,55,232,28,117,223,110
-.byte	71,241,26,113,29,41,197,137
-.byte	111,183,98,14,170,24,190,27
-.byte	252,86,62,75,198,210,121,32
-.byte	154,219,192,254,120,205,90,244
-.byte	31,221,168,51,136,7,199,49
-.byte	177,18,16,89,39,128,236,95
-.byte	96,81,127,169,25,181,74,13
-.byte	45,229,122,159,147,201,156,239
-.byte	160,224,59,77,174,42,245,176
-.byte	200,235,187,60,131,83,153,97
-.byte	23,43,4,126,186,119,214,38
-.byte	225,105,20,99,85,33,12,125
-.byte	82,9,106,213,48,54,165,56
-.byte	191,64,163,158,129,243,215,251
-.byte	124,227,57,130,155,47,255,135
-.byte	52,142,67,68,196,222,233,203
-.byte	84,123,148,50,166,194,35,61
-.byte	238,76,149,11,66,250,195,78
-.byte	8,46,161,102,40,217,36,178
-.byte	118,91,162,73,109,139,209,37
-.byte	114,248,246,100,134,104,152,22
-.byte	212,164,92,204,93,101,182,146
-.byte	108,112,72,80,253,237,185,218
-.byte	94,21,70,87,167,141,157,132
-.byte	144,216,171,0,140,188,211,10
-.byte	247,228,88,5,184,179,69,6
-.byte	208,44,30,143,202,63,15,2
-.byte	193,175,189,3,1,19,138,107
-.byte	58,145,17,65,79,103,220,234
-.byte	151,242,207,206,240,180,230,115
-.byte	150,172,116,34,231,173,53,133
-.byte	226,249,55,232,28,117,223,110
-.byte	71,241,26,113,29,41,197,137
-.byte	111,183,98,14,170,24,190,27
-.byte	252,86,62,75,198,210,121,32
-.byte	154,219,192,254,120,205,90,244
-.byte	31,221,168,51,136,7,199,49
-.byte	177,18,16,89,39,128,236,95
-.byte	96,81,127,169,25,181,74,13
-.byte	45,229,122,159,147,201,156,239
-.byte	160,224,59,77,174,42,245,176
-.byte	200,235,187,60,131,83,153,97
-.byte	23,43,4,126,186,119,214,38
-.byte	225,105,20,99,85,33,12,125
-.byte	82,9,106,213,48,54,165,56
-.byte	191,64,163,158,129,243,215,251
-.byte	124,227,57,130,155,47,255,135
-.byte	52,142,67,68,196,222,233,203
-.byte	84,123,148,50,166,194,35,61
-.byte	238,76,149,11,66,250,195,78
-.byte	8,46,161,102,40,217,36,178
-.byte	118,91,162,73,109,139,209,37
-.byte	114,248,246,100,134,104,152,22
-.byte	212,164,92,204,93,101,182,146
-.byte	108,112,72,80,253,237,185,218
-.byte	94,21,70,87,167,141,157,132
-.byte	144,216,171,0,140,188,211,10
-.byte	247,228,88,5,184,179,69,6
-.byte	208,44,30,143,202,63,15,2
-.byte	193,175,189,3,1,19,138,107
-.byte	58,145,17,65,79,103,220,234
-.byte	151,242,207,206,240,180,230,115
-.byte	150,172,116,34,231,173,53,133
-.byte	226,249,55,232,28,117,223,110
-.byte	71,241,26,113,29,41,197,137
-.byte	111,183,98,14,170,24,190,27
-.byte	252,86,62,75,198,210,121,32
-.byte	154,219,192,254,120,205,90,244
-.byte	31,221,168,51,136,7,199,49
-.byte	177,18,16,89,39,128,236,95
-.byte	96,81,127,169,25,181,74,13
-.byte	45,229,122,159,147,201,156,239
-.byte	160,224,59,77,174,42,245,176
-.byte	200,235,187,60,131,83,153,97
-.byte	23,43,4,126,186,119,214,38
-.byte	225,105,20,99,85,33,12,125
-.globl	_AES_decrypt
-.type	_AES_decrypt,@function
-.align	4
-_AES_decrypt:
-L_AES_decrypt_begin:
-	pushl	%ebp
-	pushl	%ebx
-	pushl	%esi
-	pushl	%edi
-	movl	20(%esp),%esi
-	movl	28(%esp),%edi
-	movl	%esp,%eax
-	subl	$36,%esp
-	andl	$-64,%esp
-	leal	-127(%edi),%ebx
-	subl	%esp,%ebx
-	negl	%ebx
-	andl	$960,%ebx
-	subl	%ebx,%esp
-	addl	$4,%esp
-	movl	%eax,28(%esp)
-	call	L010pic_point
-L010pic_point:
-	popl	%ebp
-	leal	__GLOBAL_OFFSET_TABLE_+[.-L010pic_point](%ebp),%eax
-	movl	_OPENSSL_ia32cap_P@GOT(%eax),%eax
-	leal	LAES_Td-L010pic_point(%ebp),%ebp
-	leal	764(%esp),%ebx
-	subl	%ebp,%ebx
-	andl	$768,%ebx
-	leal	2176(%ebp,%ebx,1),%ebp
-	btl	$25,(%eax)
-	jnc	L011x86
-	movq	(%esi),%mm0
-	movq	8(%esi),%mm4
-	call	__sse_AES_decrypt_compact
-	movl	28(%esp),%esp
-	movl	24(%esp),%esi
-	movq	%mm0,(%esi)
-	movq	%mm4,8(%esi)
-	emms
-	popl	%edi
-	popl	%esi
-	popl	%ebx
-	popl	%ebp
-	ret
-.align	4,0x90
-L011x86:
-	movl	%ebp,24(%esp)
-	movl	(%esi),%eax
-	movl	4(%esi),%ebx
-	movl	8(%esi),%ecx
-	movl	12(%esi),%edx
-	call	__x86_AES_decrypt_compact
-	movl	28(%esp),%esp
-	movl	24(%esp),%esi
-	movl	%eax,(%esi)
-	movl	%ebx,4(%esi)
-	movl	%ecx,8(%esi)
-	movl	%edx,12(%esi)
-	popl	%edi
-	popl	%esi
-	popl	%ebx
-	popl	%ebp
-	ret
-.globl	_AES_cbc_encrypt
-.type	_AES_cbc_encrypt,@function
-.align	4
-_AES_cbc_encrypt:
-L_AES_cbc_encrypt_begin:
-	pushl	%ebp
-	pushl	%ebx
-	pushl	%esi
-	pushl	%edi
-	movl	28(%esp),%ecx
-	cmpl	$0,%ecx
-	je	L012drop_out
-	call	L013pic_point
-L013pic_point:
-	popl	%ebp
-	leal	__GLOBAL_OFFSET_TABLE_+[.-L013pic_point](%ebp),%eax
-	movl	_OPENSSL_ia32cap_P@GOT(%eax),%eax
-	cmpl	$0,40(%esp)
-	leal	LAES_Te-L013pic_point(%ebp),%ebp
-	jne	L014picked_te
-	leal	LAES_Td-LAES_Te(%ebp),%ebp
-L014picked_te:
-	pushfl
-	cld
-	cmpl	$512,%ecx
-	jb	L015slow_way
-	testl	$15,%ecx
-	jnz	L015slow_way
-	btl	$28,(%eax)
-	jc	L015slow_way
-	leal	-324(%esp),%esi
-	andl	$-64,%esi
-	movl	%ebp,%eax
-	leal	2304(%ebp),%ebx
-	movl	%esi,%edx
-	andl	$4095,%eax
-	andl	$4095,%ebx
-	andl	$4095,%edx
-	cmpl	%ebx,%edx
-	jb	L016tbl_break_out
-	subl	%ebx,%edx
-	subl	%edx,%esi
-	jmp	L017tbl_ok
-.align	2,0x90
-L016tbl_break_out:
-	subl	%eax,%edx
-	andl	$4095,%edx
-	addl	$384,%edx
-	subl	%edx,%esi
-.align	2,0x90
-L017tbl_ok:
-	leal	24(%esp),%edx
-	xchgl	%esi,%esp
-	addl	$4,%esp
-	movl	%ebp,24(%esp)
-	movl	%esi,28(%esp)
-	movl	(%edx),%eax
-	movl	4(%edx),%ebx
-	movl	12(%edx),%edi
-	movl	16(%edx),%esi
-	movl	20(%edx),%edx
-	movl	%eax,32(%esp)
-	movl	%ebx,36(%esp)
-	movl	%ecx,40(%esp)
-	movl	%edi,44(%esp)
-	movl	%esi,48(%esp)
-	movl	$0,316(%esp)
-	movl	%edi,%ebx
-	movl	$61,%ecx
-	subl	%ebp,%ebx
-	movl	%edi,%esi
-	andl	$4095,%ebx
-	leal	76(%esp),%edi
-	cmpl	$2304,%ebx
-	jb	L018do_copy
-	cmpl	$3852,%ebx
-	jb	L019skip_copy
-.align	2,0x90
-L018do_copy:
-	movl	%edi,44(%esp)
-.long	2784229001
-L019skip_copy:
-	movl	$16,%edi
-.align	2,0x90
-L020prefetch_tbl:
-	movl	(%ebp),%eax
-	movl	32(%ebp),%ebx
-	movl	64(%ebp),%ecx
-	movl	96(%ebp),%esi
-	leal	128(%ebp),%ebp
-	subl	$1,%edi
-	jnz	L020prefetch_tbl
-	subl	$2048,%ebp
-	movl	32(%esp),%esi
-	movl	48(%esp),%edi
-	cmpl	$0,%edx
-	je	L021fast_decrypt
-	movl	(%edi),%eax
-	movl	4(%edi),%ebx
-.align	4,0x90
-L022fast_enc_loop:
-	movl	8(%edi),%ecx
-	movl	12(%edi),%edx
-	xorl	(%esi),%eax
-	xorl	4(%esi),%ebx
-	xorl	8(%esi),%ecx
-	xorl	12(%esi),%edx
-	movl	44(%esp),%edi
-	call	__x86_AES_encrypt
-	movl	32(%esp),%esi
-	movl	36(%esp),%edi
-	movl	%eax,(%edi)
-	movl	%ebx,4(%edi)
-	movl	%ecx,8(%edi)
-	movl	%edx,12(%edi)
-	leal	16(%esi),%esi
-	movl	40(%esp),%ecx
-	movl	%esi,32(%esp)
-	leal	16(%edi),%edx
-	movl	%edx,36(%esp)
-	subl	$16,%ecx
-	movl	%ecx,40(%esp)
-	jnz	L022fast_enc_loop
-	movl	48(%esp),%esi
-	movl	8(%edi),%ecx
-	movl	12(%edi),%edx
-	movl	%eax,(%esi)
-	movl	%ebx,4(%esi)
-	movl	%ecx,8(%esi)
-	movl	%edx,12(%esi)
-	cmpl	$0,316(%esp)
-	movl	44(%esp),%edi
-	je	L023skip_ezero
-	movl	$60,%ecx
-	xorl	%eax,%eax
-.align	2,0x90
-.long	2884892297
-L023skip_ezero:
-	movl	28(%esp),%esp
-	popfl
-L012drop_out:
-	popl	%edi
-	popl	%esi
-	popl	%ebx
-	popl	%ebp
-	ret
-	pushfl
-.align	4,0x90
-L021fast_decrypt:
-	cmpl	36(%esp),%esi
-	je	L024fast_dec_in_place
-	movl	%edi,52(%esp)
-.align	2,0x90
-.align	4,0x90
-L025fast_dec_loop:
-	movl	(%esi),%eax
-	movl	4(%esi),%ebx
-	movl	8(%esi),%ecx
-	movl	12(%esi),%edx
-	movl	44(%esp),%edi
-	call	__x86_AES_decrypt
-	movl	52(%esp),%edi
-	movl	40(%esp),%esi
-	xorl	(%edi),%eax
-	xorl	4(%edi),%ebx
-	xorl	8(%edi),%ecx
-	xorl	12(%edi),%edx
-	movl	36(%esp),%edi
-	movl	32(%esp),%esi
-	movl	%eax,(%edi)
-	movl	%ebx,4(%edi)
-	movl	%ecx,8(%edi)
-	movl	%edx,12(%edi)
-	movl	40(%esp),%ecx
-	movl	%esi,52(%esp)
-	leal	16(%esi),%esi
-	movl	%esi,32(%esp)
-	leal	16(%edi),%edi
-	movl	%edi,36(%esp)
-	subl	$16,%ecx
-	movl	%ecx,40(%esp)
-	jnz	L025fast_dec_loop
-	movl	52(%esp),%edi
-	movl	48(%esp),%esi
-	movl	(%edi),%eax
-	movl	4(%edi),%ebx
-	movl	8(%edi),%ecx
-	movl	12(%edi),%edx
-	movl	%eax,(%esi)
-	movl	%ebx,4(%esi)
-	movl	%ecx,8(%esi)
-	movl	%edx,12(%esi)
-	jmp	L026fast_dec_out
-.align	4,0x90
-L024fast_dec_in_place:
-L027fast_dec_in_place_loop:
-	movl	(%esi),%eax
-	movl	4(%esi),%ebx
-	movl	8(%esi),%ecx
-	movl	12(%esi),%edx
-	leal	60(%esp),%edi
-	movl	%eax,(%edi)
-	movl	%ebx,4(%edi)
-	movl	%ecx,8(%edi)
-	movl	%edx,12(%edi)
-	movl	44(%esp),%edi
-	call	__x86_AES_decrypt
-	movl	48(%esp),%edi
-	movl	36(%esp),%esi
-	xorl	(%edi),%eax
-	xorl	4(%edi),%ebx
-	xorl	8(%edi),%ecx
-	xorl	12(%edi),%edx
-	movl	%eax,(%esi)
-	movl	%ebx,4(%esi)
-	movl	%ecx,8(%esi)
-	movl	%edx,12(%esi)
-	leal	16(%esi),%esi
-	movl	%esi,36(%esp)
-	leal	60(%esp),%esi
-	movl	(%esi),%eax
-	movl	4(%esi),%ebx
-	movl	8(%esi),%ecx
-	movl	12(%esi),%edx
-	movl	%eax,(%edi)
-	movl	%ebx,4(%edi)
-	movl	%ecx,8(%edi)
-	movl	%edx,12(%edi)
-	movl	32(%esp),%esi
-	movl	40(%esp),%ecx
-	leal	16(%esi),%esi
-	movl	%esi,32(%esp)
-	subl	$16,%ecx
-	movl	%ecx,40(%esp)
-	jnz	L027fast_dec_in_place_loop
-.align	2,0x90
-L026fast_dec_out:
-	cmpl	$0,316(%esp)
-	movl	44(%esp),%edi
-	je	L028skip_dzero
-	movl	$60,%ecx
-	xorl	%eax,%eax
-.align	2,0x90
-.long	2884892297
-L028skip_dzero:
-	movl	28(%esp),%esp
-	popfl
-	popl	%edi
-	popl	%esi
-	popl	%ebx
-	popl	%ebp
-	ret
-	pushfl
-.align	4,0x90
-L015slow_way:
-	movl	(%eax),%eax
-	movl	36(%esp),%edi
-	leal	-80(%esp),%esi
-	andl	$-64,%esi
-	leal	-143(%edi),%ebx
-	subl	%esi,%ebx
-	negl	%ebx
-	andl	$960,%ebx
-	subl	%ebx,%esi
-	leal	768(%esi),%ebx
-	subl	%ebp,%ebx
-	andl	$768,%ebx
-	leal	2176(%ebp,%ebx,1),%ebp
-	leal	24(%esp),%edx
-	xchgl	%esi,%esp
-	addl	$4,%esp
-	movl	%ebp,24(%esp)
-	movl	%esi,28(%esp)
-	movl	%eax,52(%esp)
-	movl	(%edx),%eax
-	movl	4(%edx),%ebx
-	movl	16(%edx),%esi
-	movl	20(%edx),%edx
-	movl	%eax,32(%esp)
-	movl	%ebx,36(%esp)
-	movl	%ecx,40(%esp)
-	movl	%edi,44(%esp)
-	movl	%esi,48(%esp)
-	movl	%esi,%edi
-	movl	%eax,%esi
-	cmpl	$0,%edx
-	je	L029slow_decrypt
-	cmpl	$16,%ecx
-	movl	%ebx,%edx
-	jb	L030slow_enc_tail
-	btl	$25,52(%esp)
-	jnc	L031slow_enc_x86
-	movq	(%edi),%mm0
-	movq	8(%edi),%mm4
-.align	4,0x90
-L032slow_enc_loop_sse:
-	pxor	(%esi),%mm0
-	pxor	8(%esi),%mm4
-	movl	44(%esp),%edi
-	call	__sse_AES_encrypt_compact
-	movl	32(%esp),%esi
-	movl	36(%esp),%edi
-	movl	40(%esp),%ecx
-	movq	%mm0,(%edi)
-	movq	%mm4,8(%edi)
-	leal	16(%esi),%esi
-	movl	%esi,32(%esp)
-	leal	16(%edi),%edx
-	movl	%edx,36(%esp)
-	subl	$16,%ecx
-	cmpl	$16,%ecx
-	movl	%ecx,40(%esp)
-	jae	L032slow_enc_loop_sse
-	testl	$15,%ecx
-	jnz	L030slow_enc_tail
-	movl	48(%esp),%esi
-	movq	%mm0,(%esi)
-	movq	%mm4,8(%esi)
-	emms
-	movl	28(%esp),%esp
-	popfl
-	popl	%edi
-	popl	%esi
-	popl	%ebx
-	popl	%ebp
-	ret
-	pushfl
-.align	4,0x90
-L031slow_enc_x86:
-	movl	(%edi),%eax
-	movl	4(%edi),%ebx
-.align	2,0x90
-L033slow_enc_loop_x86:
-	movl	8(%edi),%ecx
-	movl	12(%edi),%edx
-	xorl	(%esi),%eax
-	xorl	4(%esi),%ebx
-	xorl	8(%esi),%ecx
-	xorl	12(%esi),%edx
-	movl	44(%esp),%edi
-	call	__x86_AES_encrypt_compact
-	movl	32(%esp),%esi
-	movl	36(%esp),%edi
-	movl	%eax,(%edi)
-	movl	%ebx,4(%edi)
-	movl	%ecx,8(%edi)
-	movl	%edx,12(%edi)
-	movl	40(%esp),%ecx
-	leal	16(%esi),%esi
-	movl	%esi,32(%esp)
-	leal	16(%edi),%edx
-	movl	%edx,36(%esp)
-	subl	$16,%ecx
-	cmpl	$16,%ecx
-	movl	%ecx,40(%esp)
-	jae	L033slow_enc_loop_x86
-	testl	$15,%ecx
-	jnz	L030slow_enc_tail
-	movl	48(%esp),%esi
-	movl	8(%edi),%ecx
-	movl	12(%edi),%edx
-	movl	%eax,(%esi)
-	movl	%ebx,4(%esi)
-	movl	%ecx,8(%esi)
-	movl	%edx,12(%esi)
-	movl	28(%esp),%esp
-	popfl
-	popl	%edi
-	popl	%esi
-	popl	%ebx
-	popl	%ebp
-	ret
-	pushfl
-.align	4,0x90
-L030slow_enc_tail:
-	emms
-	movl	%edx,%edi
-	movl	$16,%ebx
-	subl	%ecx,%ebx
-	cmpl	%esi,%edi
-	je	L034enc_in_place
-.align	2,0x90
-.long	2767451785
-	jmp	L035enc_skip_in_place
-L034enc_in_place:
-	leal	(%edi,%ecx,1),%edi
-L035enc_skip_in_place:
-	movl	%ebx,%ecx
-	xorl	%eax,%eax
-.align	2,0x90
-.long	2868115081
-	movl	48(%esp),%edi
-	movl	%edx,%esi
-	movl	(%edi),%eax
-	movl	4(%edi),%ebx
-	movl	$16,40(%esp)
-	jmp	L033slow_enc_loop_x86
-.align	4,0x90
-L029slow_decrypt:
-	btl	$25,52(%esp)
-	jnc	L036slow_dec_loop_x86
-.align	2,0x90
-L037slow_dec_loop_sse:
-	movq	(%esi),%mm0
-	movq	8(%esi),%mm4
-	movl	44(%esp),%edi
-	call	__sse_AES_decrypt_compact
-	movl	32(%esp),%esi
-	leal	60(%esp),%eax
-	movl	36(%esp),%ebx
-	movl	40(%esp),%ecx
-	movl	48(%esp),%edi
-	movq	(%esi),%mm1
-	movq	8(%esi),%mm5
-	pxor	(%edi),%mm0
-	pxor	8(%edi),%mm4
-	movq	%mm1,(%edi)
-	movq	%mm5,8(%edi)
-	subl	$16,%ecx
-	jc	L038slow_dec_partial_sse
-	movq	%mm0,(%ebx)
-	movq	%mm4,8(%ebx)
-	leal	16(%ebx),%ebx
-	movl	%ebx,36(%esp)
-	leal	16(%esi),%esi
-	movl	%esi,32(%esp)
-	movl	%ecx,40(%esp)
-	jnz	L037slow_dec_loop_sse
-	emms
-	movl	28(%esp),%esp
-	popfl
-	popl	%edi
-	popl	%esi
-	popl	%ebx
-	popl	%ebp
-	ret
-	pushfl
-.align	4,0x90
-L038slow_dec_partial_sse:
-	movq	%mm0,(%eax)
-	movq	%mm4,8(%eax)
-	emms
-	addl	$16,%ecx
-	movl	%ebx,%edi
-	movl	%eax,%esi
-.align	2,0x90
-.long	2767451785
-	movl	28(%esp),%esp
-	popfl
-	popl	%edi
-	popl	%esi
-	popl	%ebx
-	popl	%ebp
-	ret
-	pushfl
-.align	4,0x90
-L036slow_dec_loop_x86:
-	movl	(%esi),%eax
-	movl	4(%esi),%ebx
-	movl	8(%esi),%ecx
-	movl	12(%esi),%edx
-	leal	60(%esp),%edi
-	movl	%eax,(%edi)
-	movl	%ebx,4(%edi)
-	movl	%ecx,8(%edi)
-	movl	%edx,12(%edi)
-	movl	44(%esp),%edi
-	call	__x86_AES_decrypt_compact
-	movl	48(%esp),%edi
-	movl	40(%esp),%esi
-	xorl	(%edi),%eax
-	xorl	4(%edi),%ebx
-	xorl	8(%edi),%ecx
-	xorl	12(%edi),%edx
-	subl	$16,%esi
-	jc	L039slow_dec_partial_x86
-	movl	%esi,40(%esp)
-	movl	36(%esp),%esi
-	movl	%eax,(%esi)
-	movl	%ebx,4(%esi)
-	movl	%ecx,8(%esi)
-	movl	%edx,12(%esi)
-	leal	16(%esi),%esi
-	movl	%esi,36(%esp)
-	leal	60(%esp),%esi
-	movl	(%esi),%eax
-	movl	4(%esi),%ebx
-	movl	8(%esi),%ecx
-	movl	12(%esi),%edx
-	movl	%eax,(%edi)
-	movl	%ebx,4(%edi)
-	movl	%ecx,8(%edi)
-	movl	%edx,12(%edi)
-	movl	32(%esp),%esi
-	leal	16(%esi),%esi
-	movl	%esi,32(%esp)
-	jnz	L036slow_dec_loop_x86
-	movl	28(%esp),%esp
-	popfl
-	popl	%edi
-	popl	%esi
-	popl	%ebx
-	popl	%ebp
-	ret
-	pushfl
-.align	4,0x90
-L039slow_dec_partial_x86:
-	leal	60(%esp),%esi
-	movl	%eax,(%esi)
-	movl	%ebx,4(%esi)
-	movl	%ecx,8(%esi)
-	movl	%edx,12(%esi)
-	movl	32(%esp),%esi
-	movl	(%esi),%eax
-	movl	4(%esi),%ebx
-	movl	8(%esi),%ecx
-	movl	12(%esi),%edx
-	movl	%eax,(%edi)
-	movl	%ebx,4(%edi)
-	movl	%ecx,8(%edi)
-	movl	%edx,12(%edi)
-	movl	40(%esp),%ecx
-	movl	36(%esp),%edi
-	leal	60(%esp),%esi
-.align	2,0x90
-.long	2767451785
-	movl	28(%esp),%esp
-	popfl
-	popl	%edi
-	popl	%esi
-	popl	%ebx
-	popl	%ebp
-	ret
-.type	__x86_AES_set_encrypt_key,@function
-.align	4
-__x86_AES_set_encrypt_key:
-	pushl	%ebp
-	pushl	%ebx
-	pushl	%esi
-	pushl	%edi
-	movl	24(%esp),%esi
-	movl	32(%esp),%edi
-	testl	$-1,%esi
-	jz	L040badpointer
-	testl	$-1,%edi
-	jz	L040badpointer
-	call	L041pic_point
-L041pic_point:
-	popl	%ebp
-	leal	LAES_Te-L041pic_point(%ebp),%ebp
-	leal	2176(%ebp),%ebp
-	movl	-128(%ebp),%eax
-	movl	-96(%ebp),%ebx
-	movl	-64(%ebp),%ecx
-	movl	-32(%ebp),%edx
-	movl	(%ebp),%eax
-	movl	32(%ebp),%ebx
-	movl	64(%ebp),%ecx
-	movl	96(%ebp),%edx
-	movl	28(%esp),%ecx
-	cmpl	$128,%ecx
-	je	L04210rounds
-	cmpl	$192,%ecx
-	je	L04312rounds
-	cmpl	$256,%ecx
-	je	L04414rounds
-	movl	$-2,%eax
-	jmp	L045exit
-L04210rounds:
-	movl	(%esi),%eax
-	movl	4(%esi),%ebx
-	movl	8(%esi),%ecx
-	movl	12(%esi),%edx
-	movl	%eax,(%edi)
-	movl	%ebx,4(%edi)
-	movl	%ecx,8(%edi)
-	movl	%edx,12(%edi)
-	xorl	%ecx,%ecx
-	jmp	L04610shortcut
-.align	2,0x90
-L04710loop:
-	movl	(%edi),%eax
-	movl	12(%edi),%edx
-L04610shortcut:
-	movzbl	%dl,%esi
-	movzbl	-128(%ebp,%esi,1),%ebx
-	movzbl	%dh,%esi
-	shll	$24,%ebx
-	xorl	%ebx,%eax
-	movzbl	-128(%ebp,%esi,1),%ebx
-	shrl	$16,%edx
-	movzbl	%dl,%esi
-	xorl	%ebx,%eax
-	movzbl	-128(%ebp,%esi,1),%ebx
-	movzbl	%dh,%esi
-	shll	$8,%ebx
-	xorl	%ebx,%eax
-	movzbl	-128(%ebp,%esi,1),%ebx
-	shll	$16,%ebx
-	xorl	%ebx,%eax
-	xorl	896(%ebp,%ecx,4),%eax
-	movl	%eax,16(%edi)
-	xorl	4(%edi),%eax
-	movl	%eax,20(%edi)
-	xorl	8(%edi),%eax
-	movl	%eax,24(%edi)
-	xorl	12(%edi),%eax
-	movl	%eax,28(%edi)
-	incl	%ecx
-	addl	$16,%edi
-	cmpl	$10,%ecx
-	jl	L04710loop
-	movl	$10,80(%edi)
-	xorl	%eax,%eax
-	jmp	L045exit
-L04312rounds:
-	movl	(%esi),%eax
-	movl	4(%esi),%ebx
-	movl	8(%esi),%ecx
-	movl	12(%esi),%edx
-	movl	%eax,(%edi)
-	movl	%ebx,4(%edi)
-	movl	%ecx,8(%edi)
-	movl	%edx,12(%edi)
-	movl	16(%esi),%ecx
-	movl	20(%esi),%edx
-	movl	%ecx,16(%edi)
-	movl	%edx,20(%edi)
-	xorl	%ecx,%ecx
-	jmp	L04812shortcut
-.align	2,0x90
-L04912loop:
-	movl	(%edi),%eax
-	movl	20(%edi),%edx
-L04812shortcut:
-	movzbl	%dl,%esi
-	movzbl	-128(%ebp,%esi,1),%ebx
-	movzbl	%dh,%esi
-	shll	$24,%ebx
-	xorl	%ebx,%eax
-	movzbl	-128(%ebp,%esi,1),%ebx
-	shrl	$16,%edx
-	movzbl	%dl,%esi
-	xorl	%ebx,%eax
-	movzbl	-128(%ebp,%esi,1),%ebx
-	movzbl	%dh,%esi
-	shll	$8,%ebx
-	xorl	%ebx,%eax
-	movzbl	-128(%ebp,%esi,1),%ebx
-	shll	$16,%ebx
-	xorl	%ebx,%eax
-	xorl	896(%ebp,%ecx,4),%eax
-	movl	%eax,24(%edi)
-	xorl	4(%edi),%eax
-	movl	%eax,28(%edi)
-	xorl	8(%edi),%eax
-	movl	%eax,32(%edi)
-	xorl	12(%edi),%eax
-	movl	%eax,36(%edi)
-	cmpl	$7,%ecx
-	je	L05012break
-	incl	%ecx
-	xorl	16(%edi),%eax
-	movl	%eax,40(%edi)
-	xorl	20(%edi),%eax
-	movl	%eax,44(%edi)
-	addl	$24,%edi
-	jmp	L04912loop
-L05012break:
-	movl	$12,72(%edi)
-	xorl	%eax,%eax
-	jmp	L045exit
-L04414rounds:
-	movl	(%esi),%eax
-	movl	4(%esi),%ebx
-	movl	8(%esi),%ecx
-	movl	12(%esi),%edx
-	movl	%eax,(%edi)
-	movl	%ebx,4(%edi)
-	movl	%ecx,8(%edi)
-	movl	%edx,12(%edi)
-	movl	16(%esi),%eax
-	movl	20(%esi),%ebx
-	movl	24(%esi),%ecx
-	movl	28(%esi),%edx
-	movl	%eax,16(%edi)
-	movl	%ebx,20(%edi)
-	movl	%ecx,24(%edi)
-	movl	%edx,28(%edi)
-	xorl	%ecx,%ecx
-	jmp	L05114shortcut
-.align	2,0x90
-L05214loop:
-	movl	28(%edi),%edx
-L05114shortcut:
-	movl	(%edi),%eax
-	movzbl	%dl,%esi
-	movzbl	-128(%ebp,%esi,1),%ebx
-	movzbl	%dh,%esi
-	shll	$24,%ebx
-	xorl	%ebx,%eax
-	movzbl	-128(%ebp,%esi,1),%ebx
-	shrl	$16,%edx
-	movzbl	%dl,%esi
-	xorl	%ebx,%eax
-	movzbl	-128(%ebp,%esi,1),%ebx
-	movzbl	%dh,%esi
-	shll	$8,%ebx
-	xorl	%ebx,%eax
-	movzbl	-128(%ebp,%esi,1),%ebx
-	shll	$16,%ebx
-	xorl	%ebx,%eax
-	xorl	896(%ebp,%ecx,4),%eax
-	movl	%eax,32(%edi)
-	xorl	4(%edi),%eax
-	movl	%eax,36(%edi)
-	xorl	8(%edi),%eax
-	movl	%eax,40(%edi)
-	xorl	12(%edi),%eax
-	movl	%eax,44(%edi)
-	cmpl	$6,%ecx
-	je	L05314break
-	incl	%ecx
-	movl	%eax,%edx
-	movl	16(%edi),%eax
-	movzbl	%dl,%esi
-	movzbl	-128(%ebp,%esi,1),%ebx
-	movzbl	%dh,%esi
-	xorl	%ebx,%eax
-	movzbl	-128(%ebp,%esi,1),%ebx
-	shrl	$16,%edx
-	shll	$8,%ebx
-	movzbl	%dl,%esi
-	xorl	%ebx,%eax
-	movzbl	-128(%ebp,%esi,1),%ebx
-	movzbl	%dh,%esi
-	shll	$16,%ebx
-	xorl	%ebx,%eax
-	movzbl	-128(%ebp,%esi,1),%ebx
-	shll	$24,%ebx
-	xorl	%ebx,%eax
-	movl	%eax,48(%edi)
-	xorl	20(%edi),%eax
-	movl	%eax,52(%edi)
-	xorl	24(%edi),%eax
-	movl	%eax,56(%edi)
-	xorl	28(%edi),%eax
-	movl	%eax,60(%edi)
-	addl	$32,%edi
-	jmp	L05214loop
-L05314break:
-	movl	$14,48(%edi)
-	xorl	%eax,%eax
-	jmp	L045exit
-L040badpointer:
-	movl	$-1,%eax
-L045exit:
-	popl	%edi
-	popl	%esi
-	popl	%ebx
-	popl	%ebp
-	ret
-.globl	_AES_set_encrypt_key
-.type	_AES_set_encrypt_key,@function
-.align	4
-_AES_set_encrypt_key:
-L_AES_set_encrypt_key_begin:
-	call	__x86_AES_set_encrypt_key
-	ret
-.globl	_AES_set_decrypt_key
-.type	_AES_set_decrypt_key,@function
-.align	4
-_AES_set_decrypt_key:
-L_AES_set_decrypt_key_begin:
-	call	__x86_AES_set_encrypt_key
-	cmpl	$0,%eax
-	je	L054proceed
-	ret
-L054proceed:
-	pushl	%ebp
-	pushl	%ebx
-	pushl	%esi
-	pushl	%edi
-	movl	28(%esp),%esi
-	movl	240(%esi),%ecx
-	leal	(,%ecx,4),%ecx
-	leal	(%esi,%ecx,4),%edi
-.align	2,0x90
-L055invert:
-	movl	(%esi),%eax
-	movl	4(%esi),%ebx
-	movl	(%edi),%ecx
-	movl	4(%edi),%edx
-	movl	%eax,(%edi)
-	movl	%ebx,4(%edi)
-	movl	%ecx,(%esi)
-	movl	%edx,4(%esi)
-	movl	8(%esi),%eax
-	movl	12(%esi),%ebx
-	movl	8(%edi),%ecx
-	movl	12(%edi),%edx
-	movl	%eax,8(%edi)
-	movl	%ebx,12(%edi)
-	movl	%ecx,8(%esi)
-	movl	%edx,12(%esi)
-	addl	$16,%esi
-	subl	$16,%edi
-	cmpl	%edi,%esi
-	jne	L055invert
-	movl	28(%esp),%edi
-	movl	240(%edi),%esi
-	leal	-2(%esi,%esi,1),%esi
-	leal	(%edi,%esi,8),%esi
-	movl	%esi,28(%esp)
-	movl	16(%edi),%eax
-.align	2,0x90
-L056permute:
-	addl	$16,%edi
-	movl	$2155905152,%ebp
-	andl	%eax,%ebp
-	leal	(%eax,%eax,1),%ebx
-	movl	%ebp,%esi
-	shrl	$7,%ebp
-	subl	%ebp,%esi
-	andl	$4278124286,%ebx
-	andl	$454761243,%esi
-	xorl	%esi,%ebx
-	movl	$2155905152,%ebp
-	andl	%ebx,%ebp
-	leal	(%ebx,%ebx,1),%ecx
-	movl	%ebp,%esi
-	shrl	$7,%ebp
-	subl	%ebp,%esi
-	andl	$4278124286,%ecx
-	andl	$454761243,%esi
-	xorl	%eax,%ebx
-	xorl	%esi,%ecx
-	movl	$2155905152,%ebp
-	andl	%ecx,%ebp
-	leal	(%ecx,%ecx,1),%edx
-	movl	%ebp,%esi
-	shrl	$7,%ebp
-	xorl	%eax,%ecx
-	subl	%ebp,%esi
-	andl	$4278124286,%edx
-	andl	$454761243,%esi
-	roll	$8,%eax
-	xorl	%esi,%edx
-	movl	4(%edi),%ebp
-	xorl	%ebx,%eax
-	xorl	%edx,%ebx
-	xorl	%ecx,%eax
-	roll	$24,%ebx
-	xorl	%edx,%ecx
-	xorl	%edx,%eax
-	roll	$16,%ecx
-	xorl	%ebx,%eax
-	roll	$8,%edx
-	xorl	%ecx,%eax
-	movl	%ebp,%ebx
-	xorl	%edx,%eax
-	movl	%eax,(%edi)
-	movl	$2155905152,%ebp
-	andl	%ebx,%ebp
-	leal	(%ebx,%ebx,1),%ecx
-	movl	%ebp,%esi
-	shrl	$7,%ebp
-	subl	%ebp,%esi
-	andl	$4278124286,%ecx
-	andl	$454761243,%esi
-	xorl	%esi,%ecx
-	movl	$2155905152,%ebp
-	andl	%ecx,%ebp
-	leal	(%ecx,%ecx,1),%edx
-	movl	%ebp,%esi
-	shrl	$7,%ebp
-	subl	%ebp,%esi
-	andl	$4278124286,%edx
-	andl	$454761243,%esi
-	xorl	%ebx,%ecx
-	xorl	%esi,%edx
-	movl	$2155905152,%ebp
-	andl	%edx,%ebp
-	leal	(%edx,%edx,1),%eax
-	movl	%ebp,%esi
-	shrl	$7,%ebp
-	xorl	%ebx,%edx
-	subl	%ebp,%esi
-	andl	$4278124286,%eax
-	andl	$454761243,%esi
-	roll	$8,%ebx
-	xorl	%esi,%eax
-	movl	8(%edi),%ebp
-	xorl	%ecx,%ebx
-	xorl	%eax,%ecx
-	xorl	%edx,%ebx
-	roll	$24,%ecx
-	xorl	%eax,%edx
-	xorl	%eax,%ebx
-	roll	$16,%edx
-	xorl	%ecx,%ebx
-	roll	$8,%eax
-	xorl	%edx,%ebx
-	movl	%ebp,%ecx
-	xorl	%eax,%ebx
-	movl	%ebx,4(%edi)
-	movl	$2155905152,%ebp
-	andl	%ecx,%ebp
-	leal	(%ecx,%ecx,1),%edx
-	movl	%ebp,%esi
-	shrl	$7,%ebp
-	subl	%ebp,%esi
-	andl	$4278124286,%edx
-	andl	$454761243,%esi
-	xorl	%esi,%edx
-	movl	$2155905152,%ebp
-	andl	%edx,%ebp
-	leal	(%edx,%edx,1),%eax
-	movl	%ebp,%esi
-	shrl	$7,%ebp
-	subl	%ebp,%esi
-	andl	$4278124286,%eax
-	andl	$454761243,%esi
-	xorl	%ecx,%edx
-	xorl	%esi,%eax
-	movl	$2155905152,%ebp
-	andl	%eax,%ebp
-	leal	(%eax,%eax,1),%ebx
-	movl	%ebp,%esi
-	shrl	$7,%ebp
-	xorl	%ecx,%eax
-	subl	%ebp,%esi
-	andl	$4278124286,%ebx
-	andl	$454761243,%esi
-	roll	$8,%ecx
-	xorl	%esi,%ebx
-	movl	12(%edi),%ebp
-	xorl	%edx,%ecx
-	xorl	%ebx,%edx
-	xorl	%eax,%ecx
-	roll	$24,%edx
-	xorl	%ebx,%eax
-	xorl	%ebx,%ecx
-	roll	$16,%eax
-	xorl	%edx,%ecx
-	roll	$8,%ebx
-	xorl	%eax,%ecx
-	movl	%ebp,%edx
-	xorl	%ebx,%ecx
-	movl	%ecx,8(%edi)
-	movl	$2155905152,%ebp
-	andl	%edx,%ebp
-	leal	(%edx,%edx,1),%eax
-	movl	%ebp,%esi
-	shrl	$7,%ebp
-	subl	%ebp,%esi
-	andl	$4278124286,%eax
-	andl	$454761243,%esi
-	xorl	%esi,%eax
-	movl	$2155905152,%ebp
-	andl	%eax,%ebp
-	leal	(%eax,%eax,1),%ebx
-	movl	%ebp,%esi
-	shrl	$7,%ebp
-	subl	%ebp,%esi
-	andl	$4278124286,%ebx
-	andl	$454761243,%esi
-	xorl	%edx,%eax
-	xorl	%esi,%ebx
-	movl	$2155905152,%ebp
-	andl	%ebx,%ebp
-	leal	(%ebx,%ebx,1),%ecx
-	movl	%ebp,%esi
-	shrl	$7,%ebp
-	xorl	%edx,%ebx
-	subl	%ebp,%esi
-	andl	$4278124286,%ecx
-	andl	$454761243,%esi
-	roll	$8,%edx
-	xorl	%esi,%ecx
-	movl	16(%edi),%ebp
-	xorl	%eax,%edx
-	xorl	%ecx,%eax
-	xorl	%ebx,%edx
-	roll	$24,%eax
-	xorl	%ecx,%ebx
-	xorl	%ecx,%edx
-	roll	$16,%ebx
-	xorl	%eax,%edx
-	roll	$8,%ecx
-	xorl	%ebx,%edx
-	movl	%ebp,%eax
-	xorl	%ecx,%edx
-	movl	%edx,12(%edi)
-	cmpl	28(%esp),%edi
-	jb	L056permute
-	xorl	%eax,%eax
-	popl	%edi
-	popl	%esi
-	popl	%ebx
-	popl	%ebp
-	ret
-.byte	65,69,83,32,102,111,114,32,120,56,54,44,32,67,82,89
-.byte	80,84,79,71,65,77,83,32,98,121,32,60,97,112,112,114
-.byte	111,64,111,112,101,110,115,115,108,46,111,114,103,62,0
-.comm	_OPENSSL_ia32cap_P,16
diff --git a/deps/openssl/config/archs/BSD-x86/asm/crypto/buildinf.h b/deps/openssl/config/archs/BSD-x86/asm/crypto/buildinf.h
index feabbb00ba..cc24d30a9b 100644
--- a/deps/openssl/config/archs/BSD-x86/asm/crypto/buildinf.h
+++ b/deps/openssl/config/archs/BSD-x86/asm/crypto/buildinf.h
@@ -11,7 +11,7 @@
  */
 
 #define PLATFORM "platform: BSD-x86"
-#define DATE "built on: Fri Sep 13 15:57:16 2019 UTC"
+#define DATE "built on: Wed Mar 18 21:04:48 2020 UTC"
 
 /*
  * Generate compiler_flags as an array of individual characters. This is a
@@ -36,12 +36,13 @@ static const char compiler_flags[] = {
     'M',' ','-','D','S','H','A','2','5','6','_','A','S','M',' ','-',
     'D','S','H','A','5','1','2','_','A','S','M',' ','-','D','R','C',
     '4','_','A','S','M',' ','-','D','M','D','5','_','A','S','M',' ',
-    '-','D','R','M','D','1','6','0','_','A','S','M',' ','-','D','V',
-    'P','A','E','S','_','A','S','M',' ','-','D','W','H','I','R','L',
-    'P','O','O','L','_','A','S','M',' ','-','D','G','H','A','S','H',
-    '_','A','S','M',' ','-','D','E','C','P','_','N','I','S','T','Z',
-    '2','5','6','_','A','S','M',' ','-','D','P','O','L','Y','1','3',
-    '0','5','_','A','S','M',' ','-','D','_','T','H','R','E','A','D',
-    '_','S','A','F','E',' ','-','D','_','R','E','E','N','T','R','A',
-    'N','T',' ','-','D','N','D','E','B','U','G','\0'
+    '-','D','R','M','D','1','6','0','_','A','S','M',' ','-','D','A',
+    'E','S','N','I','_','A','S','M',' ','-','D','V','P','A','E','S',
+    '_','A','S','M',' ','-','D','W','H','I','R','L','P','O','O','L',
+    '_','A','S','M',' ','-','D','G','H','A','S','H','_','A','S','M',
+    ' ','-','D','E','C','P','_','N','I','S','T','Z','2','5','6','_',
+    'A','S','M',' ','-','D','P','O','L','Y','1','3','0','5','_','A',
+    'S','M',' ','-','D','_','T','H','R','E','A','D','_','S','A','F',
+    'E',' ','-','D','_','R','E','E','N','T','R','A','N','T',' ','-',
+    'D','N','D','E','B','U','G','\0'
 };
diff --git a/deps/openssl/config/archs/BSD-x86/asm/crypto/ec/ecp_nistz256-x86.s b/deps/openssl/config/archs/BSD-x86/asm/crypto/ec/ecp_nistz256-x86.s
index 569a636888..5299520882 100644
--- a/deps/openssl/config/archs/BSD-x86/asm/crypto/ec/ecp_nistz256-x86.s
+++ b/deps/openssl/config/archs/BSD-x86/asm/crypto/ec/ecp_nistz256-x86.s
@@ -4405,19 +4405,15 @@ L009pic:
 	orl	4(%edi),%eax
 	orl	8(%edi),%eax
 	orl	12(%edi),%eax
+	movl	576(%esp),%ebx
+	notl	%ebx
+	orl	%ebx,%eax
+	movl	580(%esp),%ebx
+	notl	%ebx
+	orl	%ebx,%eax
+	orl	584(%esp),%eax
 .byte	62
 	jnz	L010add_proceed
-	movl	576(%esp),%eax
-	andl	580(%esp),%eax
-	movl	584(%esp),%ebx
-	jz	L010add_proceed
-	testl	%ebx,%ebx
-	jz	L011add_double
-	movl	616(%esp),%edi
-	xorl	%eax,%eax
-	movl	$24,%ecx
-.byte	252,243,171
-	jmp	L012add_done
 .align	4,0x90
 L011add_double:
 	movl	620(%esp),%esi
diff --git a/deps/openssl/config/archs/BSD-x86/asm/crypto/include/internal/bn_conf.h b/deps/openssl/config/archs/BSD-x86/asm/crypto/include/internal/bn_conf.h
index fb52156bd0..459055c96f 100644
--- a/deps/openssl/config/archs/BSD-x86/asm/crypto/include/internal/bn_conf.h
+++ b/deps/openssl/config/archs/BSD-x86/asm/crypto/include/internal/bn_conf.h
@@ -1,5 +1,5 @@
 /* WARNING: do not edit! */
-/* Generated by Makefile from crypto/include/internal/bn_conf.h.in */
+/* Generated by Makefile from include/crypto/bn_conf.h.in */
 /*
  * Copyright 2016 The OpenSSL Project Authors. All Rights Reserved.
  *
@@ -9,8 +9,8 @@
  * https://www.openssl.org/source/license.html
  */
 
-#ifndef HEADER_BN_CONF_H
-# define HEADER_BN_CONF_H
+#ifndef OSSL_CRYPTO_BN_CONF_H
+# define OSSL_CRYPTO_BN_CONF_H
 
 /*
  * The contents of this file are not used in the UEFI build, as
diff --git a/deps/openssl/config/archs/BSD-x86/asm/crypto/include/internal/dso_conf.h b/deps/openssl/config/archs/BSD-x86/asm/crypto/include/internal/dso_conf.h
index 252266ec2a..4b1167c3d8 100644
--- a/deps/openssl/config/archs/BSD-x86/asm/crypto/include/internal/dso_conf.h
+++ b/deps/openssl/config/archs/BSD-x86/asm/crypto/include/internal/dso_conf.h
@@ -1,5 +1,5 @@
 /* WARNING: do not edit! */
-/* Generated by Makefile from crypto/include/internal/dso_conf.h.in */
+/* Generated by Makefile from include/crypto/dso_conf.h.in */
 /*
  * Copyright 2016-2019 The OpenSSL Project Authors. All Rights Reserved.
  *
@@ -9,8 +9,8 @@
  * https://www.openssl.org/source/license.html
  */
 
-#ifndef HEADER_DSO_CONF_H
-# define HEADER_DSO_CONF_H
+#ifndef OSSL_CRYPTO_DSO_CONF_H
+# define OSSL_CRYPTO_DSO_CONF_H
 # define DSO_DLFCN
 # define HAVE_DLFCN_H
 # define DSO_EXTENSION ".so"
diff --git a/deps/openssl/config/archs/BSD-x86/asm/include/openssl/opensslconf.h b/deps/openssl/config/archs/BSD-x86/asm/include/openssl/opensslconf.h
index dbeaee16f1..febd51aca0 100644
--- a/deps/openssl/config/archs/BSD-x86/asm/include/openssl/opensslconf.h
+++ b/deps/openssl/config/archs/BSD-x86/asm/include/openssl/opensslconf.h
@@ -93,9 +93,6 @@ extern "C" {
 #ifndef OPENSSL_NO_DYNAMIC_ENGINE
 # define OPENSSL_NO_DYNAMIC_ENGINE
 #endif
-#ifndef OPENSSL_NO_AFALGENG
-# define OPENSSL_NO_AFALGENG
-#endif
 
 
 /*
diff --git a/deps/openssl/config/archs/BSD-x86/asm/include/progs.h b/deps/openssl/config/archs/BSD-x86/asm/include/progs.h
index 9b3d270e20..308c65601b 100644
--- a/deps/openssl/config/archs/BSD-x86/asm/include/progs.h
+++ b/deps/openssl/config/archs/BSD-x86/asm/include/progs.h
@@ -2,7 +2,7 @@
  * WARNING: do not edit!
  * Generated by apps/progs.pl
  *
- * Copyright 1995-2019 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 1995-2020 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
diff --git a/deps/openssl/config/archs/BSD-x86/asm/openssl-cl.gypi b/deps/openssl/config/archs/BSD-x86/asm/openssl-cl.gypi
index 96efa1c4bb..55742c5a7d 100644
--- a/deps/openssl/config/archs/BSD-x86/asm/openssl-cl.gypi
+++ b/deps/openssl/config/archs/BSD-x86/asm/openssl-cl.gypi
@@ -15,6 +15,7 @@
       'RC4_ASM',
       'MD5_ASM',
       'RMD160_ASM',
+      'AESNI_ASM',
       'VPAES_ASM',
       'WHIRLPOOL_ASM',
       'GHASH_ASM',
diff --git a/deps/openssl/config/archs/BSD-x86/asm/openssl.gypi b/deps/openssl/config/archs/BSD-x86/asm/openssl.gypi
index 5e6af39647..380077db34 100644
--- a/deps/openssl/config/archs/BSD-x86/asm/openssl.gypi
+++ b/deps/openssl/config/archs/BSD-x86/asm/openssl.gypi
@@ -713,6 +713,7 @@
       'RC4_ASM',
       'MD5_ASM',
       'RMD160_ASM',
+      'AESNI_ASM',
       'VPAES_ASM',
       'WHIRLPOOL_ASM',
       'GHASH_ASM',
diff --git a/deps/openssl/config/archs/BSD-x86/asm_avx2/configdata.pm b/deps/openssl/config/archs/BSD-x86/asm_avx2/configdata.pm
index 15ac34550b..08151c2b5b 100644
--- a/deps/openssl/config/archs/BSD-x86/asm_avx2/configdata.pm
+++ b/deps/openssl/config/archs/BSD-x86/asm_avx2/configdata.pm
@@ -48,14 +48,14 @@ our %config = (
   export_var_as_fn => "0",
   includes => [  ],
   lflags => [  ],
-  lib_defines => [ "OPENSSL_PIC", "OPENSSL_CPUID_OBJ", "OPENSSL_BN_ASM_PART_WORDS", "OPENSSL_IA32_SSE2", "OPENSSL_BN_ASM_MONT", "OPENSSL_BN_ASM_GF2m", "SHA1_ASM", "SHA256_ASM", "SHA512_ASM", "RC4_ASM", "MD5_ASM", "RMD160_ASM", "VPAES_ASM", "WHIRLPOOL_ASM", "GHASH_ASM", "ECP_NISTZ256_ASM", "POLY1305_ASM" ],
+  lib_defines => [ "OPENSSL_PIC", "OPENSSL_CPUID_OBJ", "OPENSSL_BN_ASM_PART_WORDS", "OPENSSL_IA32_SSE2", "OPENSSL_BN_ASM_MONT", "OPENSSL_BN_ASM_GF2m", "SHA1_ASM", "SHA256_ASM", "SHA512_ASM", "RC4_ASM", "MD5_ASM", "RMD160_ASM", "AESNI_ASM", "VPAES_ASM", "WHIRLPOOL_ASM", "GHASH_ASM", "ECP_NISTZ256_ASM", "POLY1305_ASM" ],
   libdir => "",
   major => "1",
   makedepprog => "\$(CROSS_COMPILE)../config/fake_gcc.pl",
   minor => "1.1",
   openssl_algorithm_defines => [ "OPENSSL_NO_COMP", "OPENSSL_NO_MD2", "OPENSSL_NO_RC5" ],
   openssl_api_defines => [  ],
-  openssl_other_defines => [ "OPENSSL_RAND_SEED_OS", "OPENSSL_NO_AFALGENG", "OPENSSL_NO_ASAN", "OPENSSL_NO_CRYPTO_MDEBUG", "OPENSSL_NO_CRYPTO_MDEBUG_BACKTRACE", "OPENSSL_NO_EC_NISTP_64_GCC_128", "OPENSSL_NO_EGD", "OPENSSL_NO_EXTERNAL_TESTS", "OPENSSL_NO_FUZZ_AFL", "OPENSSL_NO_FUZZ_LIBFUZZER", "OPENSSL_NO_HEARTBEATS", "OPENSSL_NO_MSAN", "OPENSSL_NO_SCTP", "OPENSSL_NO_SSL3", "OPENSSL_NO_SSL3_METHOD", "OPENSSL_NO_UBSAN", "OPENSSL_NO_UNIT_TEST", "OPENSSL_NO_WEAK_SSL_CIPHERS", "OPENSSL_NO_DYNAMIC_ENGINE", "OPENSSL_NO_AFALGENG" ],
+  openssl_other_defines => [ "OPENSSL_RAND_SEED_OS", "OPENSSL_NO_AFALGENG", "OPENSSL_NO_ASAN", "OPENSSL_NO_CRYPTO_MDEBUG", "OPENSSL_NO_CRYPTO_MDEBUG_BACKTRACE", "OPENSSL_NO_EC_NISTP_64_GCC_128", "OPENSSL_NO_EGD", "OPENSSL_NO_EXTERNAL_TESTS", "OPENSSL_NO_FUZZ_AFL", "OPENSSL_NO_FUZZ_LIBFUZZER", "OPENSSL_NO_HEARTBEATS", "OPENSSL_NO_MSAN", "OPENSSL_NO_SCTP", "OPENSSL_NO_SSL3", "OPENSSL_NO_SSL3_METHOD", "OPENSSL_NO_UBSAN", "OPENSSL_NO_UNIT_TEST", "OPENSSL_NO_WEAK_SSL_CIPHERS", "OPENSSL_NO_DYNAMIC_ENGINE" ],
   openssl_sys_defines => [  ],
   openssl_thread_defines => [ "OPENSSL_THREADS" ],
   openssldir => "",
@@ -111,8 +111,8 @@ our %config = (
   sourcedir => ".",
   target => "BSD-x86",
   tdirs => [ "ossl_shim" ],
-  version => "1.1.1d",
-  version_num => "0x1010104fL",
+  version => "1.1.1e",
+  version_num => "0x1010105fL",
 );
 
 our %target = (
@@ -235,6 +235,7 @@ our @disablables = (
   "dgram",
   "dh",
   "dsa",
+  "dso",
   "dtls",
   "dynamic-engine",
   "ec",
@@ -351,8 +352,8 @@ our %unified_info = (
         {
             "" =>
                 [
-                    "crypto/include/internal/bn_conf.h",
-                    "crypto/include/internal/dso_conf.h",
+                    "include/crypto/bn_conf.h",
+                    "include/crypto/dso_conf.h",
                     "include/openssl/opensslconf.h",
                 ],
             "apps/asn1pars.o" =>
@@ -620,14 +621,6 @@ our %unified_info = (
                     "crypto/perlasm/cbc.pl",
                     "crypto/perlasm/x86asm.pl",
                 ],
-            "crypto/include/internal/bn_conf.h" =>
-                [
-                    "configdata.pm",
-                ],
-            "crypto/include/internal/dso_conf.h" =>
-                [
-                    "configdata.pm",
-                ],
             "crypto/rc4/rc4-586.s" =>
                 [
                     "crypto/perlasm/x86asm.pl",
@@ -703,6 +696,14 @@ our %unified_info = (
                 [
                     "libcrypto",
                 ],
+            "include/crypto/bn_conf.h" =>
+                [
+                    "configdata.pm",
+                ],
+            "include/crypto/dso_conf.h" =>
+                [
+                    "configdata.pm",
+                ],
             "include/openssl/opensslconf.h" =>
                 [
                     "configdata.pm",
@@ -1492,6 +1493,12 @@ our %unified_info = (
                     "libcrypto",
                     "test/libtestutil.a",
                 ],
+            "test/ssl_ctx_test" =>
+                [
+                    "libcrypto",
+                    "libssl",
+                    "test/libtestutil.a",
+                ],
             "test/ssl_test" =>
                 [
                     "libcrypto",
@@ -3224,7 +3231,6 @@ our %unified_info = (
                             "test/testutil/cb.o",
                             "test/testutil/driver.o",
                             "test/testutil/format_output.o",
-                            "test/testutil/init.o",
                             "test/testutil/main.o",
                             "test/testutil/output_helpers.o",
                             "test/testutil/random.o",
@@ -3232,6 +3238,7 @@ our %unified_info = (
                             "test/testutil/tap_bio.o",
                             "test/testutil/test_cleanup.o",
                             "test/testutil/tests.o",
+                            "test/testutil/testutil_init.o",
                         ],
                     "products" =>
                         {
@@ -3730,14 +3737,6 @@ our %unified_info = (
                 [
                     "crypto/ia64cpuid.S",
                 ],
-            "crypto/include/internal/bn_conf.h" =>
-                [
-                    "crypto/include/internal/bn_conf.h.in",
-                ],
-            "crypto/include/internal/dso_conf.h" =>
-                [
-                    "crypto/include/internal/dso_conf.h.in",
-                ],
             "crypto/md5/md5-586.s" =>
                 [
                     "crypto/md5/asm/md5-586.pl",
@@ -4178,6 +4177,14 @@ our %unified_info = (
                     "engines/asm/e_padlock-x86_64.pl",
                     "\$(PERLASM_SCHEME)",
                 ],
+            "include/crypto/bn_conf.h" =>
+                [
+                    "include/crypto/bn_conf.h.in",
+                ],
+            "include/crypto/dso_conf.h" =>
+                [
+                    "include/crypto/dso_conf.h.in",
+                ],
             "include/openssl/opensslconf.h" =>
                 [
                     "include/openssl/opensslconf.h.in",
@@ -4860,49 +4867,41 @@ our %unified_info = (
             "crypto/aes/aes_cbc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/aes/aes_cfb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/aes/aes_core.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/aes/aes_ecb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/aes/aes_ige.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/aes/aes_misc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/aes/aes_ofb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/aes/aes_wrap.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/aes/aesfx-sparcv9.o" =>
@@ -4912,7 +4911,6 @@ our %unified_info = (
             "crypto/aes/aesni-x86.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/aes/aest4-sparcv9.o" =>
@@ -4930,13 +4928,11 @@ our %unified_info = (
             "crypto/aes/vpaes-x86.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/aria/aria.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/arm64cpuid.o" =>
@@ -4950,613 +4946,511 @@ our %unified_info = (
             "crypto/asn1/a_bitstr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_d2i_fp.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_digest.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_dup.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_gentm.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_i2d_fp.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_int.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_mbstr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_object.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_octet.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_print.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_sign.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_strex.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_strnid.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_time.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_type.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_utctm.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_utf8.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_verify.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/ameth_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/asn1_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/asn1_gen.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/asn1_item_list.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/asn1_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/asn1_par.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/asn_mime.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/asn_moid.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/asn_mstbl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/asn_pack.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/bio_asn1.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/bio_ndef.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/d2i_pr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/d2i_pu.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/evp_asn1.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/f_int.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/f_string.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/i2d_pr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/i2d_pu.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/n_pkey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/nsseq.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/p5_pbe.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/p5_pbev2.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/p5_scrypt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/p8_pkey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/t_bitst.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/t_pkey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/t_spki.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/tasn_dec.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/tasn_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/tasn_fre.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/tasn_new.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/tasn_prn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/tasn_scn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/tasn_typ.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/tasn_utl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/x_algor.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/x_bignum.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/x_info.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/x_int64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/x_long.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/x_pkey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/x_sig.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/x_spki.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/x_val.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/async/arch/async_null.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/async/arch/async_posix.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/async/arch/async_win.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/async/async.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/async/async_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/async/async_wait.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bf/bf-586.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bf/bf_cfb64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bf/bf_ecb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bf/bf_ofb64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bf/bf_skey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/b_addr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/b_dump.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/b_print.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/b_sock.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/b_sock2.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bf_buff.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bf_lbuf.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bf_nbio.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bf_null.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bio_cb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bio_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bio_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bio_meth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bss_acpt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bss_bio.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bss_conn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bss_dgram.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bss_fd.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bss_file.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bss_log.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bss_mem.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bss_null.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bss_sock.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/blake2/blake2b.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/blake2/blake2s.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/blake2/m_blake2b.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/blake2/m_blake2s.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/armv4-gf2m.o" =>
@@ -5570,7 +5464,6 @@ our %unified_info = (
             "crypto/bn/bn-586.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn-mips.o" =>
@@ -5580,188 +5473,157 @@ our %unified_info = (
             "crypto/bn/bn_add.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_blind.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_const.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_ctx.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_depr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_dh.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_div.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_exp.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto",
                 ],
             "crypto/bn/bn_exp2.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_gcd.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_gf2m.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_intern.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_kron.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_mod.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_mont.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_mpi.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_mul.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_nist.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_prime.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_print.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_rand.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_recp.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_shift.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_sqr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_sqrt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_srp.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_word.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_x931p.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/co-586.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/mips-mont.o" =>
@@ -5791,25 +5653,21 @@ our %unified_info = (
             "crypto/bn/x86-gf2m.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/x86-mont.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/buffer/buf_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/buffer/buffer.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/buildinf.h" =>
@@ -5819,31 +5677,26 @@ our %unified_info = (
             "crypto/camellia/cmll-x86.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/camellia/cmll_cfb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/camellia/cmll_ctr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/camellia/cmll_ecb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/camellia/cmll_ofb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/camellia/cmllt4-sparcv9.o" =>
@@ -5853,31 +5706,26 @@ our %unified_info = (
             "crypto/cast/c_cfb64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cast/c_ecb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cast/c_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cast/c_ofb64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cast/c_skey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/chacha/chacha-armv4.o" =>
@@ -5895,284 +5743,237 @@ our %unified_info = (
             "crypto/chacha/chacha-x86.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cmac/cm_ameth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cmac/cm_pmeth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cmac/cmac.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_asn1.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_att.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_cd.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_dd.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_env.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_ess.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_io.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_kari.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_pwri.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_sd.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_smime.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/conf/conf_api.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/conf/conf_def.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/conf/conf_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/conf/conf_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/conf/conf_mall.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/conf/conf_mod.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/conf/conf_sap.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/conf/conf_ssl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cpt_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cryptlib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ct/ct_b64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ct/ct_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ct/ct_log.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ct/ct_oct.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ct/ct_policy.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ct/ct_prn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ct/ct_sct.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ct/ct_sct_ctx.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ct/ct_vfy.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ct/ct_x509v3.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ctype.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cversion.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto",
                 ],
             "crypto/des/cbc_cksm.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/cbc_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/cfb64ede.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/cfb64enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/cfb_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/crypt586.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/des-586.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/dest4-sparcv9.o" =>
@@ -6182,295 +5983,246 @@ our %unified_info = (
             "crypto/des/ecb3_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/ecb_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/fcrypt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/ofb64ede.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/ofb64enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/ofb_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/pcbc_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/qud_cksm.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/rand_key.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/set_key.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/str2key.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/xcbc_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_ameth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_asn1.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_check.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_depr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_gen.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_kdf.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_key.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_meth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_pmeth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_prn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_rfc5114.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_rfc7919.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dsa/dsa_ameth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dsa/dsa_asn1.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dsa/dsa_depr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dsa/dsa_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dsa/dsa_gen.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dsa/dsa_key.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dsa/dsa_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dsa/dsa_meth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dsa/dsa_ossl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dsa/dsa_pmeth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dsa/dsa_prn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dsa/dsa_sign.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dsa/dsa_vrf.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dso/dso_dl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dso/dso_dlfcn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dso/dso_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dso/dso_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dso/dso_openssl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dso/dso_vms.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dso/dso_win32.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ebcdic.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/curve25519.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/curve448/arch_32/f_impl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto/ec/curve448/arch_32",
                     "crypto/ec/curve448",
@@ -6478,7 +6230,6 @@ our %unified_info = (
             "crypto/ec/curve448/curve448.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto/ec/curve448/arch_32",
                     "crypto/ec/curve448",
@@ -6486,7 +6237,6 @@ our %unified_info = (
             "crypto/ec/curve448/curve448_tables.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto/ec/curve448/arch_32",
                     "crypto/ec/curve448",
@@ -6494,7 +6244,6 @@ our %unified_info = (
             "crypto/ec/curve448/eddsa.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto/ec/curve448/arch_32",
                     "crypto/ec/curve448",
@@ -6502,7 +6251,6 @@ our %unified_info = (
             "crypto/ec/curve448/f_generic.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto/ec/curve448/arch_32",
                     "crypto/ec/curve448",
@@ -6510,7 +6258,6 @@ our %unified_info = (
             "crypto/ec/curve448/scalar.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto/ec/curve448/arch_32",
                     "crypto/ec/curve448",
@@ -6518,163 +6265,136 @@ our %unified_info = (
             "crypto/ec/ec2_oct.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec2_smpl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec_ameth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec_asn1.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec_check.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec_curve.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec_cvt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec_key.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec_kmeth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec_mult.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec_oct.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec_pmeth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec_print.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecdh_kdf.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecdh_ossl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecdsa_ossl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecdsa_sign.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecdsa_vrf.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/eck_prn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecp_mont.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecp_nist.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecp_nistp224.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecp_nistp256.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecp_nistp521.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecp_nistputil.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecp_nistz256-armv4.o" =>
@@ -6692,241 +6412,201 @@ our %unified_info = (
             "crypto/ec/ecp_nistz256-x86.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecp_nistz256.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecp_oct.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecp_smpl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecx_meth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/eng_all.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/eng_cnf.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/eng_ctrl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/eng_devcrypto.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/eng_dyn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/eng_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/eng_fat.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/eng_init.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/eng_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/eng_list.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/eng_openssl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/eng_pkey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/eng_rdrand.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/eng_table.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/tb_asnmth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/tb_cipher.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/tb_dh.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/tb_digest.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/tb_dsa.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/tb_eckey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/tb_pkmeth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/tb_rand.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/tb_rsa.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/err/err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/err/err_all.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/err/err_prn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/bio_b64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/bio_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/bio_md.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/bio_ok.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/c_allc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/c_alld.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/cmeth_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/digest.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/e_aes.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto",
                     "crypto/modes",
@@ -6934,21 +6614,18 @@ our %unified_info = (
             "crypto/evp/e_aes_cbc_hmac_sha1.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto/modes",
                 ],
             "crypto/evp/e_aes_cbc_hmac_sha256.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto/modes",
                 ],
             "crypto/evp/e_aria.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto",
                     "crypto/modes",
@@ -6956,13 +6633,11 @@ our %unified_info = (
             "crypto/evp/e_bf.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/e_camellia.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto",
                     "crypto/modes",
@@ -6970,81 +6645,68 @@ our %unified_info = (
             "crypto/evp/e_cast.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/e_chacha20_poly1305.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/e_des.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto",
                 ],
             "crypto/evp/e_des3.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto",
                 ],
             "crypto/evp/e_idea.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/e_null.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/e_old.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/e_rc2.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/e_rc4.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/e_rc4_hmac_md5.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/e_rc5.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/e_seed.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/e_sm4.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto",
                     "crypto/modes",
@@ -7052,334 +6714,272 @@ our %unified_info = (
             "crypto/evp/e_xcbc_d.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/encode.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/evp_cnf.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/evp_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/evp_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/evp_key.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/evp_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/evp_pbe.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/evp_pkey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/m_md2.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/m_md4.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/m_md5.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/m_md5_sha1.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/m_mdc2.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/m_null.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/m_ripemd.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/m_sha1.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/m_sha3.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto",
                 ],
             "crypto/evp/m_sigver.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/m_wp.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/names.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/p5_crpt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/p5_crpt2.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/p_dec.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/p_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/p_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/p_open.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/p_seal.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/p_sign.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/p_verify.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/pbe_scrypt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/pmeth_fn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/pmeth_gn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/pmeth_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ex_data.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/getenv.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/hmac/hm_ameth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/hmac/hm_pmeth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/hmac/hmac.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/idea/i_cbc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/idea/i_cfb64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/idea/i_ecb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/idea/i_ofb64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/idea/i_skey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
-            "crypto/include/internal/bn_conf.h" =>
-                [
-                    ".",
-                ],
-            "crypto/include/internal/dso_conf.h" =>
-                [
-                    ".",
-                ],
             "crypto/init.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/kdf/hkdf.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/kdf/kdf_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/kdf/scrypt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/kdf/tls1_prf.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/lhash/lh_stats.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/lhash/lhash.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/md4/md4_dgst.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/md4/md4_one.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/md5/md5-586.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/md5/md5-sparcv9.o" =>
@@ -7389,79 +6989,66 @@ our %unified_info = (
             "crypto/md5/md5_dgst.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/md5/md5_one.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/mdc2/mdc2_one.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/mdc2/mdc2dgst.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/mem.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/mem_dbg.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/mem_sec.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/modes/cbc128.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/modes/ccm128.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/modes/cfb128.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/modes/ctr128.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/modes/cts128.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/modes/gcm128.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto",
                 ],
@@ -7480,7 +7067,6 @@ our %unified_info = (
             "crypto/modes/ghash-x86.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/modes/ghashv8-armx.o" =>
@@ -7490,361 +7076,301 @@ our %unified_info = (
             "crypto/modes/ocb128.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/modes/ofb128.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/modes/wrap128.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/modes/xts128.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/o_dir.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/o_fips.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/o_fopen.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/o_init.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/o_str.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/o_time.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/objects/o_names.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/objects/obj_dat.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/objects/obj_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/objects/obj_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/objects/obj_xref.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ocsp/ocsp_asn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ocsp/ocsp_cl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ocsp/ocsp_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ocsp/ocsp_ext.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ocsp/ocsp_ht.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ocsp/ocsp_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ocsp/ocsp_prn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ocsp/ocsp_srv.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ocsp/ocsp_vfy.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ocsp/v3_ocsp.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pem/pem_all.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pem/pem_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pem/pem_info.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pem/pem_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pem/pem_oth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pem/pem_pk8.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pem/pem_pkey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pem/pem_sign.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pem/pem_x509.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pem/pem_xaux.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pem/pvkfmt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_add.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_asn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_attr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_crpt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_crt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_decr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_init.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_key.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_kiss.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_mutl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_npas.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_p8d.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_p8e.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_sbag.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_utl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/pk12err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs7/bio_pk7.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs7/pk7_asn1.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs7/pk7_attr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs7/pk7_doit.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs7/pk7_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs7/pk7_mime.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs7/pk7_smime.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs7/pkcs7err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/poly1305/poly1305-armv4.o" =>
@@ -7866,265 +7392,221 @@ our %unified_info = (
             "crypto/poly1305/poly1305-x86.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/poly1305/poly1305.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/poly1305/poly1305_ameth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/poly1305/poly1305_pmeth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rand/drbg_ctr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rand/drbg_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rand/rand_egd.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rand/rand_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rand/rand_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rand/rand_unix.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rand/rand_vms.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rand/rand_win.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rand/randfile.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rc2/rc2_cbc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rc2/rc2_ecb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rc2/rc2_skey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rc2/rc2cfb64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rc2/rc2ofb64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rc4/rc4-586.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ripemd/rmd-586.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ripemd/rmd_dgst.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ripemd/rmd_one.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_ameth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_asn1.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_chk.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_crpt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_depr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_gen.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_meth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_mp.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_none.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_oaep.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_ossl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_pk1.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_pmeth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_prn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_pss.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_saos.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_sign.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_ssl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_x931.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_x931g.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/s390xcpuid.o" =>
@@ -8134,31 +7616,26 @@ our %unified_info = (
             "crypto/seed/seed.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/seed/seed_cbc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/seed/seed_cfb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/seed/seed_ecb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/seed/seed_ofb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sha/keccak1600-armv4.o" =>
@@ -8168,13 +7645,11 @@ our %unified_info = (
             "crypto/sha/keccak1600.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sha/sha1-586.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sha/sha1-armv4-large.o" =>
@@ -8200,19 +7675,16 @@ our %unified_info = (
             "crypto/sha/sha1_one.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sha/sha1dgst.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sha/sha256-586.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sha/sha256-armv4.o" =>
@@ -8238,13 +7710,11 @@ our %unified_info = (
             "crypto/sha/sha256.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sha/sha512-586.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sha/sha512-armv4.o" =>
@@ -8270,727 +7740,606 @@ our %unified_info = (
             "crypto/sha/sha512.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/siphash/siphash.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/siphash/siphash_ameth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/siphash/siphash_pmeth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sm2/sm2_crypt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sm2/sm2_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sm2/sm2_pmeth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sm2/sm2_sign.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sm3/m_sm3.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sm3/sm3.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sm4/sm4.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/srp/srp_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/srp/srp_vfy.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/stack/stack.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/store/loader_file.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/store/store_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/store/store_init.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/store/store_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/store/store_register.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/store/store_strings.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/threads_none.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/threads_pthread.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/threads_win.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ts/ts_asn1.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ts/ts_conf.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ts/ts_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ts/ts_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ts/ts_req_print.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ts/ts_req_utils.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ts/ts_rsp_print.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ts/ts_rsp_sign.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ts/ts_rsp_utils.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ts/ts_rsp_verify.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ts/ts_verify_ctx.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/txt_db/txt_db.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ui/ui_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ui/ui_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ui/ui_null.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ui/ui_openssl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ui/ui_util.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/uid.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/whrlpool/wp-mmx.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/whrlpool/wp_block.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/whrlpool/wp_dgst.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/by_dir.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/by_file.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/t_crl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/t_req.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/t_x509.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_att.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_cmp.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_d2.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_def.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_ext.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_lu.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_meth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_obj.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_r2x.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_req.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_set.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_trs.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_txt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_v3.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_vfy.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_vpm.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509cset.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509name.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509rset.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509spki.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509type.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x_all.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x_attrib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x_crl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x_exten.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x_name.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x_pubkey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x_req.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x_x509.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x_x509a.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/pcy_cache.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/pcy_data.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/pcy_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/pcy_map.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/pcy_node.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/pcy_tree.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_addr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_admis.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_akey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_akeya.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_alt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_asid.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_bcons.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_bitst.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_conf.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_cpols.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_crld.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_enum.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_extku.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_genn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_ia5.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_info.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_int.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_ncons.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_pci.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_pcia.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_pcons.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_pku.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_pmaps.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_prn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_purp.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_skey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_sxnet.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_tlsf.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_utl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x86cpuid.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "engines/e_capi.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "engines/e_padlock-x86.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "engines/e_padlock.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "fuzz/asn1.o" =>
@@ -9041,6 +8390,14 @@ our %unified_info = (
                 [
                     "include",
                 ],
+            "include/crypto/bn_conf.h" =>
+                [
+                    ".",
+                ],
+            "include/crypto/dso_conf.h" =>
+                [
+                    ".",
+                ],
             "include/openssl/opensslconf.h" =>
                 [
                     ".",
@@ -9285,7 +8642,6 @@ our %unified_info = (
                 [
                     ".",
                     "include",
-                    "crypto/include",
                 ],
             "test/asn1_string_table_test.o" =>
                 [
@@ -9611,7 +8967,6 @@ our %unified_info = (
                 [
                     ".",
                     "include",
-                    "crypto/include",
                 ],
             "test/cipher_overhead_test.o" =>
                 [
@@ -9657,7 +9012,6 @@ our %unified_info = (
             "test/ctype_internal_test.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "test/curve448_internal_test.o" =>
@@ -9723,7 +9077,6 @@ our %unified_info = (
                 [
                     "include",
                     "crypto/ec",
-                    "crypto/include",
                 ],
             "test/ecdsatest.o" =>
                 [
@@ -9748,7 +9101,6 @@ our %unified_info = (
             "test/evp_extra_test.o" =>
                 [
                     "include",
-                    "crypto/include",
                 ],
             "test/evp_test.o" =>
                 [
@@ -9846,7 +9198,6 @@ our %unified_info = (
                 [
                     ".",
                     "include",
-                    "crypto/include",
                 ],
             "test/rc2test.o" =>
                 [
@@ -9896,18 +9247,15 @@ our %unified_info = (
                 [
                     ".",
                     "include",
-                    "crypto/include",
                 ],
             "test/sm2_internal_test.o" =>
                 [
                     "include",
-                    "crypto/include",
                 ],
             "test/sm4_internal_test.o" =>
                 [
                     ".",
                     "include",
-                    "crypto/include",
                 ],
             "test/srptest.o" =>
                 [
@@ -9918,6 +9266,10 @@ our %unified_info = (
                     ".",
                     "include",
                 ],
+            "test/ssl_ctx_test.o" =>
+                [
+                    "include",
+                ],
             "test/ssl_test.o" =>
                 [
                     "include",
@@ -9981,10 +9333,6 @@ our %unified_info = (
                 [
                     "include",
                 ],
-            "test/testutil/init.o" =>
-                [
-                    "include",
-                ],
             "test/testutil/main.o" =>
                 [
                     "include",
@@ -10013,6 +9361,10 @@ our %unified_info = (
                 [
                     "include",
                 ],
+            "test/testutil/testutil_init.o" =>
+                [
+                    "include",
+                ],
             "test/threadstest.o" =>
                 [
                     "include",
@@ -10277,6 +9629,7 @@ our %unified_info = (
             "test/sm4_internal_test",
             "test/srptest",
             "test/ssl_cert_table_internal_test",
+            "test/ssl_ctx_test",
             "test/ssl_test",
             "test/ssl_test_ctx_test",
             "test/sslapitest",
@@ -15237,7 +14590,6 @@ our %unified_info = (
                     "test/testutil/cb.o",
                     "test/testutil/driver.o",
                     "test/testutil/format_output.o",
-                    "test/testutil/init.o",
                     "test/testutil/main.o",
                     "test/testutil/output_helpers.o",
                     "test/testutil/random.o",
@@ -15245,6 +14597,7 @@ our %unified_info = (
                     "test/testutil/tap_bio.o",
                     "test/testutil/test_cleanup.o",
                     "test/testutil/tests.o",
+                    "test/testutil/testutil_init.o",
                 ],
             "test/md2test" =>
                 [
@@ -15472,6 +14825,14 @@ our %unified_info = (
                 [
                     "test/ssl_cert_table_internal_test.c",
                 ],
+            "test/ssl_ctx_test" =>
+                [
+                    "test/ssl_ctx_test.o",
+                ],
+            "test/ssl_ctx_test.o" =>
+                [
+                    "test/ssl_ctx_test.c",
+                ],
             "test/ssl_test" =>
                 [
                     "test/handshake_helper.o",
@@ -15574,10 +14935,6 @@ our %unified_info = (
                 [
                     "test/testutil/format_output.c",
                 ],
-            "test/testutil/init.o" =>
-                [
-                    "test/testutil/init.c",
-                ],
             "test/testutil/main.o" =>
                 [
                     "test/testutil/main.c",
@@ -15606,6 +14963,10 @@ our %unified_info = (
                 [
                     "test/testutil/tests.c",
                 ],
+            "test/testutil/testutil_init.o" =>
+                [
+                    "test/testutil/testutil_init.c",
+                ],
             "test/threadstest" =>
                 [
                     "test/threadstest.o",
diff --git a/deps/openssl/config/archs/BSD-x86/asm_avx2/crypto/aes/aes-586.s b/deps/openssl/config/archs/BSD-x86/asm_avx2/crypto/aes/aes-586.s
deleted file mode 100644
index 1ac5376af2..0000000000
--- a/deps/openssl/config/archs/BSD-x86/asm_avx2/crypto/aes/aes-586.s
+++ /dev/null
@@ -1,3218 +0,0 @@
-.text
-.type	__x86_AES_encrypt_compact,@function
-.align	4
-__x86_AES_encrypt_compact:
-	movl	%edi,20(%esp)
-	xorl	(%edi),%eax
-	xorl	4(%edi),%ebx
-	xorl	8(%edi),%ecx
-	xorl	12(%edi),%edx
-	movl	240(%edi),%esi
-	leal	-2(%esi,%esi,1),%esi
-	leal	(%edi,%esi,8),%esi
-	movl	%esi,24(%esp)
-	movl	-128(%ebp),%edi
-	movl	-96(%ebp),%esi
-	movl	-64(%ebp),%edi
-	movl	-32(%ebp),%esi
-	movl	(%ebp),%edi
-	movl	32(%ebp),%esi
-	movl	64(%ebp),%edi
-	movl	96(%ebp),%esi
-.align	4,0x90
-L000loop:
-	movl	%eax,%esi
-	andl	$255,%esi
-	movzbl	-128(%ebp,%esi,1),%esi
-	movzbl	%bh,%edi
-	movzbl	-128(%ebp,%edi,1),%edi
-	shll	$8,%edi
-	xorl	%edi,%esi
-	movl	%ecx,%edi
-	shrl	$16,%edi
-	andl	$255,%edi
-	movzbl	-128(%ebp,%edi,1),%edi
-	shll	$16,%edi
-	xorl	%edi,%esi
-	movl	%edx,%edi
-	shrl	$24,%edi
-	movzbl	-128(%ebp,%edi,1),%edi
-	shll	$24,%edi
-	xorl	%edi,%esi
-	movl	%esi,4(%esp)
-	movl	%ebx,%esi
-	andl	$255,%esi
-	shrl	$16,%ebx
-	movzbl	-128(%ebp,%esi,1),%esi
-	movzbl	%ch,%edi
-	movzbl	-128(%ebp,%edi,1),%edi
-	shll	$8,%edi
-	xorl	%edi,%esi
-	movl	%edx,%edi
-	shrl	$16,%edi
-	andl	$255,%edi
-	movzbl	-128(%ebp,%edi,1),%edi
-	shll	$16,%edi
-	xorl	%edi,%esi
-	movl	%eax,%edi
-	shrl	$24,%edi
-	movzbl	-128(%ebp,%edi,1),%edi
-	shll	$24,%edi
-	xorl	%edi,%esi
-	movl	%esi,8(%esp)
-	movl	%ecx,%esi
-	andl	$255,%esi
-	shrl	$24,%ecx
-	movzbl	-128(%ebp,%esi,1),%esi
-	movzbl	%dh,%edi
-	movzbl	-128(%ebp,%edi,1),%edi
-	shll	$8,%edi
-	xorl	%edi,%esi
-	movl	%eax,%edi
-	shrl	$16,%edi
-	andl	$255,%edx
-	andl	$255,%edi
-	movzbl	-128(%ebp,%edi,1),%edi
-	shll	$16,%edi
-	xorl	%edi,%esi
-	movzbl	%bh,%edi
-	movzbl	-128(%ebp,%edi,1),%edi
-	shll	$24,%edi
-	xorl	%edi,%esi
-	andl	$255,%edx
-	movzbl	-128(%ebp,%edx,1),%edx
-	movzbl	%ah,%eax
-	movzbl	-128(%ebp,%eax,1),%eax
-	shll	$8,%eax
-	xorl	%eax,%edx
-	movl	4(%esp),%eax
-	andl	$255,%ebx
-	movzbl	-128(%ebp,%ebx,1),%ebx
-	shll	$16,%ebx
-	xorl	%ebx,%edx
-	movl	8(%esp),%ebx
-	movzbl	-128(%ebp,%ecx,1),%ecx
-	shll	$24,%ecx
-	xorl	%ecx,%edx
-	movl	%esi,%ecx
-	movl	$2155905152,%ebp
-	andl	%ecx,%ebp
-	leal	(%ecx,%ecx,1),%edi
-	movl	%ebp,%esi
-	shrl	$7,%ebp
-	andl	$4278124286,%edi
-	subl	%ebp,%esi
-	movl	%ecx,%ebp
-	andl	$454761243,%esi
-	rorl	$16,%ebp
-	xorl	%edi,%esi
-	movl	%ecx,%edi
-	xorl	%esi,%ecx
-	rorl	$24,%edi
-	xorl	%ebp,%esi
-	roll	$24,%ecx
-	xorl	%edi,%esi
-	movl	$2155905152,%ebp
-	xorl	%esi,%ecx
-	andl	%edx,%ebp
-	leal	(%edx,%edx,1),%edi
-	movl	%ebp,%esi
-	shrl	$7,%ebp
-	andl	$4278124286,%edi
-	subl	%ebp,%esi
-	movl	%edx,%ebp
-	andl	$454761243,%esi
-	rorl	$16,%ebp
-	xorl	%edi,%esi
-	movl	%edx,%edi
-	xorl	%esi,%edx
-	rorl	$24,%edi
-	xorl	%ebp,%esi
-	roll	$24,%edx
-	xorl	%edi,%esi
-	movl	$2155905152,%ebp
-	xorl	%esi,%edx
-	andl	%eax,%ebp
-	leal	(%eax,%eax,1),%edi
-	movl	%ebp,%esi
-	shrl	$7,%ebp
-	andl	$4278124286,%edi
-	subl	%ebp,%esi
-	movl	%eax,%ebp
-	andl	$454761243,%esi
-	rorl	$16,%ebp
-	xorl	%edi,%esi
-	movl	%eax,%edi
-	xorl	%esi,%eax
-	rorl	$24,%edi
-	xorl	%ebp,%esi
-	roll	$24,%eax
-	xorl	%edi,%esi
-	movl	$2155905152,%ebp
-	xorl	%esi,%eax
-	andl	%ebx,%ebp
-	leal	(%ebx,%ebx,1),%edi
-	movl	%ebp,%esi
-	shrl	$7,%ebp
-	andl	$4278124286,%edi
-	subl	%ebp,%esi
-	movl	%ebx,%ebp
-	andl	$454761243,%esi
-	rorl	$16,%ebp
-	xorl	%edi,%esi
-	movl	%ebx,%edi
-	xorl	%esi,%ebx
-	rorl	$24,%edi
-	xorl	%ebp,%esi
-	roll	$24,%ebx
-	xorl	%edi,%esi
-	xorl	%esi,%ebx
-	movl	20(%esp),%edi
-	movl	28(%esp),%ebp
-	addl	$16,%edi
-	xorl	(%edi),%eax
-	xorl	4(%edi),%ebx
-	xorl	8(%edi),%ecx
-	xorl	12(%edi),%edx
-	cmpl	24(%esp),%edi
-	movl	%edi,20(%esp)
-	jb	L000loop
-	movl	%eax,%esi
-	andl	$255,%esi
-	movzbl	-128(%ebp,%esi,1),%esi
-	movzbl	%bh,%edi
-	movzbl	-128(%ebp,%edi,1),%edi
-	shll	$8,%edi
-	xorl	%edi,%esi
-	movl	%ecx,%edi
-	shrl	$16,%edi
-	andl	$255,%edi
-	movzbl	-128(%ebp,%edi,1),%edi
-	shll	$16,%edi
-	xorl	%edi,%esi
-	movl	%edx,%edi
-	shrl	$24,%edi
-	movzbl	-128(%ebp,%edi,1),%edi
-	shll	$24,%edi
-	xorl	%edi,%esi
-	movl	%esi,4(%esp)
-	movl	%ebx,%esi
-	andl	$255,%esi
-	shrl	$16,%ebx
-	movzbl	-128(%ebp,%esi,1),%esi
-	movzbl	%ch,%edi
-	movzbl	-128(%ebp,%edi,1),%edi
-	shll	$8,%edi
-	xorl	%edi,%esi
-	movl	%edx,%edi
-	shrl	$16,%edi
-	andl	$255,%edi
-	movzbl	-128(%ebp,%edi,1),%edi
-	shll	$16,%edi
-	xorl	%edi,%esi
-	movl	%eax,%edi
-	shrl	$24,%edi
-	movzbl	-128(%ebp,%edi,1),%edi
-	shll	$24,%edi
-	xorl	%edi,%esi
-	movl	%esi,8(%esp)
-	movl	%ecx,%esi
-	andl	$255,%esi
-	shrl	$24,%ecx
-	movzbl	-128(%ebp,%esi,1),%esi
-	movzbl	%dh,%edi
-	movzbl	-128(%ebp,%edi,1),%edi
-	shll	$8,%edi
-	xorl	%edi,%esi
-	movl	%eax,%edi
-	shrl	$16,%edi
-	andl	$255,%edx
-	andl	$255,%edi
-	movzbl	-128(%ebp,%edi,1),%edi
-	shll	$16,%edi
-	xorl	%edi,%esi
-	movzbl	%bh,%edi
-	movzbl	-128(%ebp,%edi,1),%edi
-	shll	$24,%edi
-	xorl	%edi,%esi
-	movl	20(%esp),%edi
-	andl	$255,%edx
-	movzbl	-128(%ebp,%edx,1),%edx
-	movzbl	%ah,%eax
-	movzbl	-128(%ebp,%eax,1),%eax
-	shll	$8,%eax
-	xorl	%eax,%edx
-	movl	4(%esp),%eax
-	andl	$255,%ebx
-	movzbl	-128(%ebp,%ebx,1),%ebx
-	shll	$16,%ebx
-	xorl	%ebx,%edx
-	movl	8(%esp),%ebx
-	movzbl	-128(%ebp,%ecx,1),%ecx
-	shll	$24,%ecx
-	xorl	%ecx,%edx
-	movl	%esi,%ecx
-	xorl	16(%edi),%eax
-	xorl	20(%edi),%ebx
-	xorl	24(%edi),%ecx
-	xorl	28(%edi),%edx
-	ret
-.type	__sse_AES_encrypt_compact,@function
-.align	4
-__sse_AES_encrypt_compact:
-	pxor	(%edi),%mm0
-	pxor	8(%edi),%mm4
-	movl	240(%edi),%esi
-	leal	-2(%esi,%esi,1),%esi
-	leal	(%edi,%esi,8),%esi
-	movl	%esi,24(%esp)
-	movl	$454761243,%eax
-	movl	%eax,8(%esp)
-	movl	%eax,12(%esp)
-	movl	-128(%ebp),%eax
-	movl	-96(%ebp),%ebx
-	movl	-64(%ebp),%ecx
-	movl	-32(%ebp),%edx
-	movl	(%ebp),%eax
-	movl	32(%ebp),%ebx
-	movl	64(%ebp),%ecx
-	movl	96(%ebp),%edx
-.align	4,0x90
-L001loop:
-	pshufw	$8,%mm0,%mm1
-	pshufw	$13,%mm4,%mm5
-	movd	%mm1,%eax
-	movd	%mm5,%ebx
-	movl	%edi,20(%esp)
-	movzbl	%al,%esi
-	movzbl	%ah,%edx
-	pshufw	$13,%mm0,%mm2
-	movzbl	-128(%ebp,%esi,1),%ecx
-	movzbl	%bl,%edi
-	movzbl	-128(%ebp,%edx,1),%edx
-	shrl	$16,%eax
-	shll	$8,%edx
-	movzbl	-128(%ebp,%edi,1),%esi
-	movzbl	%bh,%edi
-	shll	$16,%esi
-	pshufw	$8,%mm4,%mm6
-	orl	%esi,%ecx
-	movzbl	-128(%ebp,%edi,1),%esi
-	movzbl	%ah,%edi
-	shll	$24,%esi
-	shrl	$16,%ebx
-	orl	%esi,%edx
-	movzbl	-128(%ebp,%edi,1),%esi
-	movzbl	%bh,%edi
-	shll	$8,%esi
-	orl	%esi,%ecx
-	movzbl	-128(%ebp,%edi,1),%esi
-	movzbl	%al,%edi
-	shll	$24,%esi
-	orl	%esi,%ecx
-	movzbl	-128(%ebp,%edi,1),%esi
-	movzbl	%bl,%edi
-	movd	%mm2,%eax
-	movd	%ecx,%mm0
-	movzbl	-128(%ebp,%edi,1),%ecx
-	movzbl	%ah,%edi
-	shll	$16,%ecx
-	movd	%mm6,%ebx
-	orl	%esi,%ecx
-	movzbl	-128(%ebp,%edi,1),%esi
-	movzbl	%bh,%edi
-	shll	$24,%esi
-	orl	%esi,%ecx
-	movzbl	-128(%ebp,%edi,1),%esi
-	movzbl	%bl,%edi
-	shll	$8,%esi
-	shrl	$16,%ebx
-	orl	%esi,%ecx
-	movzbl	-128(%ebp,%edi,1),%esi
-	movzbl	%al,%edi
-	shrl	$16,%eax
-	movd	%ecx,%mm1
-	movzbl	-128(%ebp,%edi,1),%ecx
-	movzbl	%ah,%edi
-	shll	$16,%ecx
-	andl	$255,%eax
-	orl	%esi,%ecx
-	punpckldq	%mm1,%mm0
-	movzbl	-128(%ebp,%edi,1),%esi
-	movzbl	%bh,%edi
-	shll	$24,%esi
-	andl	$255,%ebx
-	movzbl	-128(%ebp,%eax,1),%eax
-	orl	%esi,%ecx
-	shll	$16,%eax
-	movzbl	-128(%ebp,%edi,1),%esi
-	orl	%eax,%edx
-	shll	$8,%esi
-	movzbl	-128(%ebp,%ebx,1),%ebx
-	orl	%esi,%ecx
-	orl	%ebx,%edx
-	movl	20(%esp),%edi
-	movd	%ecx,%mm4
-	movd	%edx,%mm5
-	punpckldq	%mm5,%mm4
-	addl	$16,%edi
-	cmpl	24(%esp),%edi
-	ja	L002out
-	movq	8(%esp),%mm2
-	pxor	%mm3,%mm3
-	pxor	%mm7,%mm7
-	movq	%mm0,%mm1
-	movq	%mm4,%mm5
-	pcmpgtb	%mm0,%mm3
-	pcmpgtb	%mm4,%mm7
-	pand	%mm2,%mm3
-	pand	%mm2,%mm7
-	pshufw	$177,%mm0,%mm2
-	pshufw	$177,%mm4,%mm6
-	paddb	%mm0,%mm0
-	paddb	%mm4,%mm4
-	pxor	%mm3,%mm0
-	pxor	%mm7,%mm4
-	pshufw	$177,%mm2,%mm3
-	pshufw	$177,%mm6,%mm7
-	pxor	%mm0,%mm1
-	pxor	%mm4,%mm5
-	pxor	%mm2,%mm0
-	pxor	%mm6,%mm4
-	movq	%mm3,%mm2
-	movq	%mm7,%mm6
-	pslld	$8,%mm3
-	pslld	$8,%mm7
-	psrld	$24,%mm2
-	psrld	$24,%mm6
-	pxor	%mm3,%mm0
-	pxor	%mm7,%mm4
-	pxor	%mm2,%mm0
-	pxor	%mm6,%mm4
-	movq	%mm1,%mm3
-	movq	%mm5,%mm7
-	movq	(%edi),%mm2
-	movq	8(%edi),%mm6
-	psrld	$8,%mm1
-	psrld	$8,%mm5
-	movl	-128(%ebp),%eax
-	pslld	$24,%mm3
-	pslld	$24,%mm7
-	movl	-64(%ebp),%ebx
-	pxor	%mm1,%mm0
-	pxor	%mm5,%mm4
-	movl	(%ebp),%ecx
-	pxor	%mm3,%mm0
-	pxor	%mm7,%mm4
-	movl	64(%ebp),%edx
-	pxor	%mm2,%mm0
-	pxor	%mm6,%mm4
-	jmp	L001loop
-.align	4,0x90
-L002out:
-	pxor	(%edi),%mm0
-	pxor	8(%edi),%mm4
-	ret
-.type	__x86_AES_encrypt,@function
-.align	4
-__x86_AES_encrypt:
-	movl	%edi,20(%esp)
-	xorl	(%edi),%eax
-	xorl	4(%edi),%ebx
-	xorl	8(%edi),%ecx
-	xorl	12(%edi),%edx
-	movl	240(%edi),%esi
-	leal	-2(%esi,%esi,1),%esi
-	leal	(%edi,%esi,8),%esi
-	movl	%esi,24(%esp)
-.align	4,0x90
-L003loop:
-	movl	%eax,%esi
-	andl	$255,%esi
-	movl	(%ebp,%esi,8),%esi
-	movzbl	%bh,%edi
-	xorl	3(%ebp,%edi,8),%esi
-	movl	%ecx,%edi
-	shrl	$16,%edi
-	andl	$255,%edi
-	xorl	2(%ebp,%edi,8),%esi
-	movl	%edx,%edi
-	shrl	$24,%edi
-	xorl	1(%ebp,%edi,8),%esi
-	movl	%esi,4(%esp)
-	movl	%ebx,%esi
-	andl	$255,%esi
-	shrl	$16,%ebx
-	movl	(%ebp,%esi,8),%esi
-	movzbl	%ch,%edi
-	xorl	3(%ebp,%edi,8),%esi
-	movl	%edx,%edi
-	shrl	$16,%edi
-	andl	$255,%edi
-	xorl	2(%ebp,%edi,8),%esi
-	movl	%eax,%edi
-	shrl	$24,%edi
-	xorl	1(%ebp,%edi,8),%esi
-	movl	%esi,8(%esp)
-	movl	%ecx,%esi
-	andl	$255,%esi
-	shrl	$24,%ecx
-	movl	(%ebp,%esi,8),%esi
-	movzbl	%dh,%edi
-	xorl	3(%ebp,%edi,8),%esi
-	movl	%eax,%edi
-	shrl	$16,%edi
-	andl	$255,%edx
-	andl	$255,%edi
-	xorl	2(%ebp,%edi,8),%esi
-	movzbl	%bh,%edi
-	xorl	1(%ebp,%edi,8),%esi
-	movl	20(%esp),%edi
-	movl	(%ebp,%edx,8),%edx
-	movzbl	%ah,%eax
-	xorl	3(%ebp,%eax,8),%edx
-	movl	4(%esp),%eax
-	andl	$255,%ebx
-	xorl	2(%ebp,%ebx,8),%edx
-	movl	8(%esp),%ebx
-	xorl	1(%ebp,%ecx,8),%edx
-	movl	%esi,%ecx
-	addl	$16,%edi
-	xorl	(%edi),%eax
-	xorl	4(%edi),%ebx
-	xorl	8(%edi),%ecx
-	xorl	12(%edi),%edx
-	cmpl	24(%esp),%edi
-	movl	%edi,20(%esp)
-	jb	L003loop
-	movl	%eax,%esi
-	andl	$255,%esi
-	movl	2(%ebp,%esi,8),%esi
-	andl	$255,%esi
-	movzbl	%bh,%edi
-	movl	(%ebp,%edi,8),%edi
-	andl	$65280,%edi
-	xorl	%edi,%esi
-	movl	%ecx,%edi
-	shrl	$16,%edi
-	andl	$255,%edi
-	movl	(%ebp,%edi,8),%edi
-	andl	$16711680,%edi
-	xorl	%edi,%esi
-	movl	%edx,%edi
-	shrl	$24,%edi
-	movl	2(%ebp,%edi,8),%edi
-	andl	$4278190080,%edi
-	xorl	%edi,%esi
-	movl	%esi,4(%esp)
-	movl	%ebx,%esi
-	andl	$255,%esi
-	shrl	$16,%ebx
-	movl	2(%ebp,%esi,8),%esi
-	andl	$255,%esi
-	movzbl	%ch,%edi
-	movl	(%ebp,%edi,8),%edi
-	andl	$65280,%edi
-	xorl	%edi,%esi
-	movl	%edx,%edi
-	shrl	$16,%edi
-	andl	$255,%edi
-	movl	(%ebp,%edi,8),%edi
-	andl	$16711680,%edi
-	xorl	%edi,%esi
-	movl	%eax,%edi
-	shrl	$24,%edi
-	movl	2(%ebp,%edi,8),%edi
-	andl	$4278190080,%edi
-	xorl	%edi,%esi
-	movl	%esi,8(%esp)
-	movl	%ecx,%esi
-	andl	$255,%esi
-	shrl	$24,%ecx
-	movl	2(%ebp,%esi,8),%esi
-	andl	$255,%esi
-	movzbl	%dh,%edi
-	movl	(%ebp,%edi,8),%edi
-	andl	$65280,%edi
-	xorl	%edi,%esi
-	movl	%eax,%edi
-	shrl	$16,%edi
-	andl	$255,%edx
-	andl	$255,%edi
-	movl	(%ebp,%edi,8),%edi
-	andl	$16711680,%edi
-	xorl	%edi,%esi
-	movzbl	%bh,%edi
-	movl	2(%ebp,%edi,8),%edi
-	andl	$4278190080,%edi
-	xorl	%edi,%esi
-	movl	20(%esp),%edi
-	andl	$255,%edx
-	movl	2(%ebp,%edx,8),%edx
-	andl	$255,%edx
-	movzbl	%ah,%eax
-	movl	(%ebp,%eax,8),%eax
-	andl	$65280,%eax
-	xorl	%eax,%edx
-	movl	4(%esp),%eax
-	andl	$255,%ebx
-	movl	(%ebp,%ebx,8),%ebx
-	andl	$16711680,%ebx
-	xorl	%ebx,%edx
-	movl	8(%esp),%ebx
-	movl	2(%ebp,%ecx,8),%ecx
-	andl	$4278190080,%ecx
-	xorl	%ecx,%edx
-	movl	%esi,%ecx
-	addl	$16,%edi
-	xorl	(%edi),%eax
-	xorl	4(%edi),%ebx
-	xorl	8(%edi),%ecx
-	xorl	12(%edi),%edx
-	ret
-.align	6,0x90
-LAES_Te:
-.long	2774754246,2774754246
-.long	2222750968,2222750968
-.long	2574743534,2574743534
-.long	2373680118,2373680118
-.long	234025727,234025727
-.long	3177933782,3177933782
-.long	2976870366,2976870366
-.long	1422247313,1422247313
-.long	1345335392,1345335392
-.long	50397442,50397442
-.long	2842126286,2842126286
-.long	2099981142,2099981142
-.long	436141799,436141799
-.long	1658312629,1658312629
-.long	3870010189,3870010189
-.long	2591454956,2591454956
-.long	1170918031,1170918031
-.long	2642575903,2642575903
-.long	1086966153,1086966153
-.long	2273148410,2273148410
-.long	368769775,368769775
-.long	3948501426,3948501426
-.long	3376891790,3376891790
-.long	200339707,200339707
-.long	3970805057,3970805057
-.long	1742001331,1742001331
-.long	4255294047,4255294047
-.long	3937382213,3937382213
-.long	3214711843,3214711843
-.long	4154762323,4154762323
-.long	2524082916,2524082916
-.long	1539358875,1539358875
-.long	3266819957,3266819957
-.long	486407649,486407649
-.long	2928907069,2928907069
-.long	1780885068,1780885068
-.long	1513502316,1513502316
-.long	1094664062,1094664062
-.long	49805301,49805301
-.long	1338821763,1338821763
-.long	1546925160,1546925160
-.long	4104496465,4104496465
-.long	887481809,887481809
-.long	150073849,150073849
-.long	2473685474,2473685474
-.long	1943591083,1943591083
-.long	1395732834,1395732834
-.long	1058346282,1058346282
-.long	201589768,201589768
-.long	1388824469,1388824469
-.long	1696801606,1696801606
-.long	1589887901,1589887901
-.long	672667696,672667696
-.long	2711000631,2711000631
-.long	251987210,251987210
-.long	3046808111,3046808111
-.long	151455502,151455502
-.long	907153956,907153956
-.long	2608889883,2608889883
-.long	1038279391,1038279391
-.long	652995533,652995533
-.long	1764173646,1764173646
-.long	3451040383,3451040383
-.long	2675275242,2675275242
-.long	453576978,453576978
-.long	2659418909,2659418909
-.long	1949051992,1949051992
-.long	773462580,773462580
-.long	756751158,756751158
-.long	2993581788,2993581788
-.long	3998898868,3998898868
-.long	4221608027,4221608027
-.long	4132590244,4132590244
-.long	1295727478,1295727478
-.long	1641469623,1641469623
-.long	3467883389,3467883389
-.long	2066295122,2066295122
-.long	1055122397,1055122397
-.long	1898917726,1898917726
-.long	2542044179,2542044179
-.long	4115878822,4115878822
-.long	1758581177,1758581177
-.long	0,0
-.long	753790401,753790401
-.long	1612718144,1612718144
-.long	536673507,536673507
-.long	3367088505,3367088505
-.long	3982187446,3982187446
-.long	3194645204,3194645204
-.long	1187761037,1187761037
-.long	3653156455,3653156455
-.long	1262041458,1262041458
-.long	3729410708,3729410708
-.long	3561770136,3561770136
-.long	3898103984,3898103984
-.long	1255133061,1255133061
-.long	1808847035,1808847035
-.long	720367557,720367557
-.long	3853167183,3853167183
-.long	385612781,385612781
-.long	3309519750,3309519750
-.long	3612167578,3612167578
-.long	1429418854,1429418854
-.long	2491778321,2491778321
-.long	3477423498,3477423498
-.long	284817897,284817897
-.long	100794884,100794884
-.long	2172616702,2172616702
-.long	4031795360,4031795360
-.long	1144798328,1144798328
-.long	3131023141,3131023141
-.long	3819481163,3819481163
-.long	4082192802,4082192802
-.long	4272137053,4272137053
-.long	3225436288,3225436288
-.long	2324664069,2324664069
-.long	2912064063,2912064063
-.long	3164445985,3164445985
-.long	1211644016,1211644016
-.long	83228145,83228145
-.long	3753688163,3753688163
-.long	3249976951,3249976951
-.long	1977277103,1977277103
-.long	1663115586,1663115586
-.long	806359072,806359072
-.long	452984805,452984805
-.long	250868733,250868733
-.long	1842533055,1842533055
-.long	1288555905,1288555905
-.long	336333848,336333848
-.long	890442534,890442534
-.long	804056259,804056259
-.long	3781124030,3781124030
-.long	2727843637,2727843637
-.long	3427026056,3427026056
-.long	957814574,957814574
-.long	1472513171,1472513171
-.long	4071073621,4071073621
-.long	2189328124,2189328124
-.long	1195195770,1195195770
-.long	2892260552,2892260552
-.long	3881655738,3881655738
-.long	723065138,723065138
-.long	2507371494,2507371494
-.long	2690670784,2690670784
-.long	2558624025,2558624025
-.long	3511635870,3511635870
-.long	2145180835,2145180835
-.long	1713513028,1713513028
-.long	2116692564,2116692564
-.long	2878378043,2878378043
-.long	2206763019,2206763019
-.long	3393603212,3393603212
-.long	703524551,703524551
-.long	3552098411,3552098411
-.long	1007948840,1007948840
-.long	2044649127,2044649127
-.long	3797835452,3797835452
-.long	487262998,487262998
-.long	1994120109,1994120109
-.long	1004593371,1004593371
-.long	1446130276,1446130276
-.long	1312438900,1312438900
-.long	503974420,503974420
-.long	3679013266,3679013266
-.long	168166924,168166924
-.long	1814307912,1814307912
-.long	3831258296,3831258296
-.long	1573044895,1573044895
-.long	1859376061,1859376061
-.long	4021070915,4021070915
-.long	2791465668,2791465668
-.long	2828112185,2828112185
-.long	2761266481,2761266481
-.long	937747667,937747667
-.long	2339994098,2339994098
-.long	854058965,854058965
-.long	1137232011,1137232011
-.long	1496790894,1496790894
-.long	3077402074,3077402074
-.long	2358086913,2358086913
-.long	1691735473,1691735473
-.long	3528347292,3528347292
-.long	3769215305,3769215305
-.long	3027004632,3027004632
-.long	4199962284,4199962284
-.long	133494003,133494003
-.long	636152527,636152527
-.long	2942657994,2942657994
-.long	2390391540,2390391540
-.long	3920539207,3920539207
-.long	403179536,403179536
-.long	3585784431,3585784431
-.long	2289596656,2289596656
-.long	1864705354,1864705354
-.long	1915629148,1915629148
-.long	605822008,605822008
-.long	4054230615,4054230615
-.long	3350508659,3350508659
-.long	1371981463,1371981463
-.long	602466507,602466507
-.long	2094914977,2094914977
-.long	2624877800,2624877800
-.long	555687742,555687742
-.long	3712699286,3712699286
-.long	3703422305,3703422305
-.long	2257292045,2257292045
-.long	2240449039,2240449039
-.long	2423288032,2423288032
-.long	1111375484,1111375484
-.long	3300242801,3300242801
-.long	2858837708,2858837708
-.long	3628615824,3628615824
-.long	84083462,84083462
-.long	32962295,32962295
-.long	302911004,302911004
-.long	2741068226,2741068226
-.long	1597322602,1597322602
-.long	4183250862,4183250862
-.long	3501832553,3501832553
-.long	2441512471,2441512471
-.long	1489093017,1489093017
-.long	656219450,656219450
-.long	3114180135,3114180135
-.long	954327513,954327513
-.long	335083755,335083755
-.long	3013122091,3013122091
-.long	856756514,856756514
-.long	3144247762,3144247762
-.long	1893325225,1893325225
-.long	2307821063,2307821063
-.long	2811532339,2811532339
-.long	3063651117,3063651117
-.long	572399164,572399164
-.long	2458355477,2458355477
-.long	552200649,552200649
-.long	1238290055,1238290055
-.long	4283782570,4283782570
-.long	2015897680,2015897680
-.long	2061492133,2061492133
-.long	2408352771,2408352771
-.long	4171342169,4171342169
-.long	2156497161,2156497161
-.long	386731290,386731290
-.long	3669999461,3669999461
-.long	837215959,837215959
-.long	3326231172,3326231172
-.long	3093850320,3093850320
-.long	3275833730,3275833730
-.long	2962856233,2962856233
-.long	1999449434,1999449434
-.long	286199582,286199582
-.long	3417354363,3417354363
-.long	4233385128,4233385128
-.long	3602627437,3602627437
-.long	974525996,974525996
-.byte	99,124,119,123,242,107,111,197
-.byte	48,1,103,43,254,215,171,118
-.byte	202,130,201,125,250,89,71,240
-.byte	173,212,162,175,156,164,114,192
-.byte	183,253,147,38,54,63,247,204
-.byte	52,165,229,241,113,216,49,21
-.byte	4,199,35,195,24,150,5,154
-.byte	7,18,128,226,235,39,178,117
-.byte	9,131,44,26,27,110,90,160
-.byte	82,59,214,179,41,227,47,132
-.byte	83,209,0,237,32,252,177,91
-.byte	106,203,190,57,74,76,88,207
-.byte	208,239,170,251,67,77,51,133
-.byte	69,249,2,127,80,60,159,168
-.byte	81,163,64,143,146,157,56,245
-.byte	188,182,218,33,16,255,243,210
-.byte	205,12,19,236,95,151,68,23
-.byte	196,167,126,61,100,93,25,115
-.byte	96,129,79,220,34,42,144,136
-.byte	70,238,184,20,222,94,11,219
-.byte	224,50,58,10,73,6,36,92
-.byte	194,211,172,98,145,149,228,121
-.byte	231,200,55,109,141,213,78,169
-.byte	108,86,244,234,101,122,174,8
-.byte	186,120,37,46,28,166,180,198
-.byte	232,221,116,31,75,189,139,138
-.byte	112,62,181,102,72,3,246,14
-.byte	97,53,87,185,134,193,29,158
-.byte	225,248,152,17,105,217,142,148
-.byte	155,30,135,233,206,85,40,223
-.byte	140,161,137,13,191,230,66,104
-.byte	65,153,45,15,176,84,187,22
-.byte	99,124,119,123,242,107,111,197
-.byte	48,1,103,43,254,215,171,118
-.byte	202,130,201,125,250,89,71,240
-.byte	173,212,162,175,156,164,114,192
-.byte	183,253,147,38,54,63,247,204
-.byte	52,165,229,241,113,216,49,21
-.byte	4,199,35,195,24,150,5,154
-.byte	7,18,128,226,235,39,178,117
-.byte	9,131,44,26,27,110,90,160
-.byte	82,59,214,179,41,227,47,132
-.byte	83,209,0,237,32,252,177,91
-.byte	106,203,190,57,74,76,88,207
-.byte	208,239,170,251,67,77,51,133
-.byte	69,249,2,127,80,60,159,168
-.byte	81,163,64,143,146,157,56,245
-.byte	188,182,218,33,16,255,243,210
-.byte	205,12,19,236,95,151,68,23
-.byte	196,167,126,61,100,93,25,115
-.byte	96,129,79,220,34,42,144,136
-.byte	70,238,184,20,222,94,11,219
-.byte	224,50,58,10,73,6,36,92
-.byte	194,211,172,98,145,149,228,121
-.byte	231,200,55,109,141,213,78,169
-.byte	108,86,244,234,101,122,174,8
-.byte	186,120,37,46,28,166,180,198
-.byte	232,221,116,31,75,189,139,138
-.byte	112,62,181,102,72,3,246,14
-.byte	97,53,87,185,134,193,29,158
-.byte	225,248,152,17,105,217,142,148
-.byte	155,30,135,233,206,85,40,223
-.byte	140,161,137,13,191,230,66,104
-.byte	65,153,45,15,176,84,187,22
-.byte	99,124,119,123,242,107,111,197
-.byte	48,1,103,43,254,215,171,118
-.byte	202,130,201,125,250,89,71,240
-.byte	173,212,162,175,156,164,114,192
-.byte	183,253,147,38,54,63,247,204
-.byte	52,165,229,241,113,216,49,21
-.byte	4,199,35,195,24,150,5,154
-.byte	7,18,128,226,235,39,178,117
-.byte	9,131,44,26,27,110,90,160
-.byte	82,59,214,179,41,227,47,132
-.byte	83,209,0,237,32,252,177,91
-.byte	106,203,190,57,74,76,88,207
-.byte	208,239,170,251,67,77,51,133
-.byte	69,249,2,127,80,60,159,168
-.byte	81,163,64,143,146,157,56,245
-.byte	188,182,218,33,16,255,243,210
-.byte	205,12,19,236,95,151,68,23
-.byte	196,167,126,61,100,93,25,115
-.byte	96,129,79,220,34,42,144,136
-.byte	70,238,184,20,222,94,11,219
-.byte	224,50,58,10,73,6,36,92
-.byte	194,211,172,98,145,149,228,121
-.byte	231,200,55,109,141,213,78,169
-.byte	108,86,244,234,101,122,174,8
-.byte	186,120,37,46,28,166,180,198
-.byte	232,221,116,31,75,189,139,138
-.byte	112,62,181,102,72,3,246,14
-.byte	97,53,87,185,134,193,29,158
-.byte	225,248,152,17,105,217,142,148
-.byte	155,30,135,233,206,85,40,223
-.byte	140,161,137,13,191,230,66,104
-.byte	65,153,45,15,176,84,187,22
-.byte	99,124,119,123,242,107,111,197
-.byte	48,1,103,43,254,215,171,118
-.byte	202,130,201,125,250,89,71,240
-.byte	173,212,162,175,156,164,114,192
-.byte	183,253,147,38,54,63,247,204
-.byte	52,165,229,241,113,216,49,21
-.byte	4,199,35,195,24,150,5,154
-.byte	7,18,128,226,235,39,178,117
-.byte	9,131,44,26,27,110,90,160
-.byte	82,59,214,179,41,227,47,132
-.byte	83,209,0,237,32,252,177,91
-.byte	106,203,190,57,74,76,88,207
-.byte	208,239,170,251,67,77,51,133
-.byte	69,249,2,127,80,60,159,168
-.byte	81,163,64,143,146,157,56,245
-.byte	188,182,218,33,16,255,243,210
-.byte	205,12,19,236,95,151,68,23
-.byte	196,167,126,61,100,93,25,115
-.byte	96,129,79,220,34,42,144,136
-.byte	70,238,184,20,222,94,11,219
-.byte	224,50,58,10,73,6,36,92
-.byte	194,211,172,98,145,149,228,121
-.byte	231,200,55,109,141,213,78,169
-.byte	108,86,244,234,101,122,174,8
-.byte	186,120,37,46,28,166,180,198
-.byte	232,221,116,31,75,189,139,138
-.byte	112,62,181,102,72,3,246,14
-.byte	97,53,87,185,134,193,29,158
-.byte	225,248,152,17,105,217,142,148
-.byte	155,30,135,233,206,85,40,223
-.byte	140,161,137,13,191,230,66,104
-.byte	65,153,45,15,176,84,187,22
-.long	1,2,4,8
-.long	16,32,64,128
-.long	27,54,0,0
-.long	0,0,0,0
-.globl	_AES_encrypt
-.type	_AES_encrypt,@function
-.align	4
-_AES_encrypt:
-L_AES_encrypt_begin:
-	pushl	%ebp
-	pushl	%ebx
-	pushl	%esi
-	pushl	%edi
-	movl	20(%esp),%esi
-	movl	28(%esp),%edi
-	movl	%esp,%eax
-	subl	$36,%esp
-	andl	$-64,%esp
-	leal	-127(%edi),%ebx
-	subl	%esp,%ebx
-	negl	%ebx
-	andl	$960,%ebx
-	subl	%ebx,%esp
-	addl	$4,%esp
-	movl	%eax,28(%esp)
-	call	L004pic_point
-L004pic_point:
-	popl	%ebp
-	leal	__GLOBAL_OFFSET_TABLE_+[.-L004pic_point](%ebp),%eax
-	movl	_OPENSSL_ia32cap_P@GOT(%eax),%eax
-	leal	LAES_Te-L004pic_point(%ebp),%ebp
-	leal	764(%esp),%ebx
-	subl	%ebp,%ebx
-	andl	$768,%ebx
-	leal	2176(%ebp,%ebx,1),%ebp
-	btl	$25,(%eax)
-	jnc	L005x86
-	movq	(%esi),%mm0
-	movq	8(%esi),%mm4
-	call	__sse_AES_encrypt_compact
-	movl	28(%esp),%esp
-	movl	24(%esp),%esi
-	movq	%mm0,(%esi)
-	movq	%mm4,8(%esi)
-	emms
-	popl	%edi
-	popl	%esi
-	popl	%ebx
-	popl	%ebp
-	ret
-.align	4,0x90
-L005x86:
-	movl	%ebp,24(%esp)
-	movl	(%esi),%eax
-	movl	4(%esi),%ebx
-	movl	8(%esi),%ecx
-	movl	12(%esi),%edx
-	call	__x86_AES_encrypt_compact
-	movl	28(%esp),%esp
-	movl	24(%esp),%esi
-	movl	%eax,(%esi)
-	movl	%ebx,4(%esi)
-	movl	%ecx,8(%esi)
-	movl	%edx,12(%esi)
-	popl	%edi
-	popl	%esi
-	popl	%ebx
-	popl	%ebp
-	ret
-.type	__x86_AES_decrypt_compact,@function
-.align	4
-__x86_AES_decrypt_compact:
-	movl	%edi,20(%esp)
-	xorl	(%edi),%eax
-	xorl	4(%edi),%ebx
-	xorl	8(%edi),%ecx
-	xorl	12(%edi),%edx
-	movl	240(%edi),%esi
-	leal	-2(%esi,%esi,1),%esi
-	leal	(%edi,%esi,8),%esi
-	movl	%esi,24(%esp)
-	movl	-128(%ebp),%edi
-	movl	-96(%ebp),%esi
-	movl	-64(%ebp),%edi
-	movl	-32(%ebp),%esi
-	movl	(%ebp),%edi
-	movl	32(%ebp),%esi
-	movl	64(%ebp),%edi
-	movl	96(%ebp),%esi
-.align	4,0x90
-L006loop:
-	movl	%eax,%esi
-	andl	$255,%esi
-	movzbl	-128(%ebp,%esi,1),%esi
-	movzbl	%dh,%edi
-	movzbl	-128(%ebp,%edi,1),%edi
-	shll	$8,%edi
-	xorl	%edi,%esi
-	movl	%ecx,%edi
-	shrl	$16,%edi
-	andl	$255,%edi
-	movzbl	-128(%ebp,%edi,1),%edi
-	shll	$16,%edi
-	xorl	%edi,%esi
-	movl	%ebx,%edi
-	shrl	$24,%edi
-	movzbl	-128(%ebp,%edi,1),%edi
-	shll	$24,%edi
-	xorl	%edi,%esi
-	movl	%esi,4(%esp)
-	movl	%ebx,%esi
-	andl	$255,%esi
-	movzbl	-128(%ebp,%esi,1),%esi
-	movzbl	%ah,%edi
-	movzbl	-128(%ebp,%edi,1),%edi
-	shll	$8,%edi
-	xorl	%edi,%esi
-	movl	%edx,%edi
-	shrl	$16,%edi
-	andl	$255,%edi
-	movzbl	-128(%ebp,%edi,1),%edi
-	shll	$16,%edi
-	xorl	%edi,%esi
-	movl	%ecx,%edi
-	shrl	$24,%edi
-	movzbl	-128(%ebp,%edi,1),%edi
-	shll	$24,%edi
-	xorl	%edi,%esi
-	movl	%esi,8(%esp)
-	movl	%ecx,%esi
-	andl	$255,%esi
-	movzbl	-128(%ebp,%esi,1),%esi
-	movzbl	%bh,%edi
-	movzbl	-128(%ebp,%edi,1),%edi
-	shll	$8,%edi
-	xorl	%edi,%esi
-	movl	%eax,%edi
-	shrl	$16,%edi
-	andl	$255,%edi
-	movzbl	-128(%ebp,%edi,1),%edi
-	shll	$16,%edi
-	xorl	%edi,%esi
-	movl	%edx,%edi
-	shrl	$24,%edi
-	movzbl	-128(%ebp,%edi,1),%edi
-	shll	$24,%edi
-	xorl	%edi,%esi
-	andl	$255,%edx
-	movzbl	-128(%ebp,%edx,1),%edx
-	movzbl	%ch,%ecx
-	movzbl	-128(%ebp,%ecx,1),%ecx
-	shll	$8,%ecx
-	xorl	%ecx,%edx
-	movl	%esi,%ecx
-	shrl	$16,%ebx
-	andl	$255,%ebx
-	movzbl	-128(%ebp,%ebx,1),%ebx
-	shll	$16,%ebx
-	xorl	%ebx,%edx
-	shrl	$24,%eax
-	movzbl	-128(%ebp,%eax,1),%eax
-	shll	$24,%eax
-	xorl	%eax,%edx
-	movl	$2155905152,%edi
-	andl	%ecx,%edi
-	movl	%edi,%esi
-	shrl	$7,%edi
-	leal	(%ecx,%ecx,1),%eax
-	subl	%edi,%esi
-	andl	$4278124286,%eax
-	andl	$454761243,%esi
-	xorl	%esi,%eax
-	movl	$2155905152,%edi
-	andl	%eax,%edi
-	movl	%edi,%esi
-	shrl	$7,%edi
-	leal	(%eax,%eax,1),%ebx
-	subl	%edi,%esi
-	andl	$4278124286,%ebx
-	andl	$454761243,%esi
-	xorl	%ecx,%eax
-	xorl	%esi,%ebx
-	movl	$2155905152,%edi
-	andl	%ebx,%edi
-	movl	%edi,%esi
-	shrl	$7,%edi
-	leal	(%ebx,%ebx,1),%ebp
-	subl	%edi,%esi
-	andl	$4278124286,%ebp
-	andl	$454761243,%esi
-	xorl	%ecx,%ebx
-	roll	$8,%ecx
-	xorl	%esi,%ebp
-	xorl	%eax,%ecx
-	xorl	%ebp,%eax
-	xorl	%ebx,%ecx
-	xorl	%ebp,%ebx
-	roll	$24,%eax
-	xorl	%ebp,%ecx
-	roll	$16,%ebx
-	xorl	%eax,%ecx
-	roll	$8,%ebp
-	xorl	%ebx,%ecx
-	movl	4(%esp),%eax
-	xorl	%ebp,%ecx
-	movl	%ecx,12(%esp)
-	movl	$2155905152,%edi
-	andl	%edx,%edi
-	movl	%edi,%esi
-	shrl	$7,%edi
-	leal	(%edx,%edx,1),%ebx
-	subl	%edi,%esi
-	andl	$4278124286,%ebx
-	andl	$454761243,%esi
-	xorl	%esi,%ebx
-	movl	$2155905152,%edi
-	andl	%ebx,%edi
-	movl	%edi,%esi
-	shrl	$7,%edi
-	leal	(%ebx,%ebx,1),%ecx
-	subl	%edi,%esi
-	andl	$4278124286,%ecx
-	andl	$454761243,%esi
-	xorl	%edx,%ebx
-	xorl	%esi,%ecx
-	movl	$2155905152,%edi
-	andl	%ecx,%edi
-	movl	%edi,%esi
-	shrl	$7,%edi
-	leal	(%ecx,%ecx,1),%ebp
-	subl	%edi,%esi
-	andl	$4278124286,%ebp
-	andl	$454761243,%esi
-	xorl	%edx,%ecx
-	roll	$8,%edx
-	xorl	%esi,%ebp
-	xorl	%ebx,%edx
-	xorl	%ebp,%ebx
-	xorl	%ecx,%edx
-	xorl	%ebp,%ecx
-	roll	$24,%ebx
-	xorl	%ebp,%edx
-	roll	$16,%ecx
-	xorl	%ebx,%edx
-	roll	$8,%ebp
-	xorl	%ecx,%edx
-	movl	8(%esp),%ebx
-	xorl	%ebp,%edx
-	movl	%edx,16(%esp)
-	movl	$2155905152,%edi
-	andl	%eax,%edi
-	movl	%edi,%esi
-	shrl	$7,%edi
-	leal	(%eax,%eax,1),%ecx
-	subl	%edi,%esi
-	andl	$4278124286,%ecx
-	andl	$454761243,%esi
-	xorl	%esi,%ecx
-	movl	$2155905152,%edi
-	andl	%ecx,%edi
-	movl	%edi,%esi
-	shrl	$7,%edi
-	leal	(%ecx,%ecx,1),%edx
-	subl	%edi,%esi
-	andl	$4278124286,%edx
-	andl	$454761243,%esi
-	xorl	%eax,%ecx
-	xorl	%esi,%edx
-	movl	$2155905152,%edi
-	andl	%edx,%edi
-	movl	%edi,%esi
-	shrl	$7,%edi
-	leal	(%edx,%edx,1),%ebp
-	subl	%edi,%esi
-	andl	$4278124286,%ebp
-	andl	$454761243,%esi
-	xorl	%eax,%edx
-	roll	$8,%eax
-	xorl	%esi,%ebp
-	xorl	%ecx,%eax
-	xorl	%ebp,%ecx
-	xorl	%edx,%eax
-	xorl	%ebp,%edx
-	roll	$24,%ecx
-	xorl	%ebp,%eax
-	roll	$16,%edx
-	xorl	%ecx,%eax
-	roll	$8,%ebp
-	xorl	%edx,%eax
-	xorl	%ebp,%eax
-	movl	$2155905152,%edi
-	andl	%ebx,%edi
-	movl	%edi,%esi
-	shrl	$7,%edi
-	leal	(%ebx,%ebx,1),%ecx
-	subl	%edi,%esi
-	andl	$4278124286,%ecx
-	andl	$454761243,%esi
-	xorl	%esi,%ecx
-	movl	$2155905152,%edi
-	andl	%ecx,%edi
-	movl	%edi,%esi
-	shrl	$7,%edi
-	leal	(%ecx,%ecx,1),%edx
-	subl	%edi,%esi
-	andl	$4278124286,%edx
-	andl	$454761243,%esi
-	xorl	%ebx,%ecx
-	xorl	%esi,%edx
-	movl	$2155905152,%edi
-	andl	%edx,%edi
-	movl	%edi,%esi
-	shrl	$7,%edi
-	leal	(%edx,%edx,1),%ebp
-	subl	%edi,%esi
-	andl	$4278124286,%ebp
-	andl	$454761243,%esi
-	xorl	%ebx,%edx
-	roll	$8,%ebx
-	xorl	%esi,%ebp
-	xorl	%ecx,%ebx
-	xorl	%ebp,%ecx
-	xorl	%edx,%ebx
-	xorl	%ebp,%edx
-	roll	$24,%ecx
-	xorl	%ebp,%ebx
-	roll	$16,%edx
-	xorl	%ecx,%ebx
-	roll	$8,%ebp
-	xorl	%edx,%ebx
-	movl	12(%esp),%ecx
-	xorl	%ebp,%ebx
-	movl	16(%esp),%edx
-	movl	20(%esp),%edi
-	movl	28(%esp),%ebp
-	addl	$16,%edi
-	xorl	(%edi),%eax
-	xorl	4(%edi),%ebx
-	xorl	8(%edi),%ecx
-	xorl	12(%edi),%edx
-	cmpl	24(%esp),%edi
-	movl	%edi,20(%esp)
-	jb	L006loop
-	movl	%eax,%esi
-	andl	$255,%esi
-	movzbl	-128(%ebp,%esi,1),%esi
-	movzbl	%dh,%edi
-	movzbl	-128(%ebp,%edi,1),%edi
-	shll	$8,%edi
-	xorl	%edi,%esi
-	movl	%ecx,%edi
-	shrl	$16,%edi
-	andl	$255,%edi
-	movzbl	-128(%ebp,%edi,1),%edi
-	shll	$16,%edi
-	xorl	%edi,%esi
-	movl	%ebx,%edi
-	shrl	$24,%edi
-	movzbl	-128(%ebp,%edi,1),%edi
-	shll	$24,%edi
-	xorl	%edi,%esi
-	movl	%esi,4(%esp)
-	movl	%ebx,%esi
-	andl	$255,%esi
-	movzbl	-128(%ebp,%esi,1),%esi
-	movzbl	%ah,%edi
-	movzbl	-128(%ebp,%edi,1),%edi
-	shll	$8,%edi
-	xorl	%edi,%esi
-	movl	%edx,%edi
-	shrl	$16,%edi
-	andl	$255,%edi
-	movzbl	-128(%ebp,%edi,1),%edi
-	shll	$16,%edi
-	xorl	%edi,%esi
-	movl	%ecx,%edi
-	shrl	$24,%edi
-	movzbl	-128(%ebp,%edi,1),%edi
-	shll	$24,%edi
-	xorl	%edi,%esi
-	movl	%esi,8(%esp)
-	movl	%ecx,%esi
-	andl	$255,%esi
-	movzbl	-128(%ebp,%esi,1),%esi
-	movzbl	%bh,%edi
-	movzbl	-128(%ebp,%edi,1),%edi
-	shll	$8,%edi
-	xorl	%edi,%esi
-	movl	%eax,%edi
-	shrl	$16,%edi
-	andl	$255,%edi
-	movzbl	-128(%ebp,%edi,1),%edi
-	shll	$16,%edi
-	xorl	%edi,%esi
-	movl	%edx,%edi
-	shrl	$24,%edi
-	movzbl	-128(%ebp,%edi,1),%edi
-	shll	$24,%edi
-	xorl	%edi,%esi
-	movl	20(%esp),%edi
-	andl	$255,%edx
-	movzbl	-128(%ebp,%edx,1),%edx
-	movzbl	%ch,%ecx
-	movzbl	-128(%ebp,%ecx,1),%ecx
-	shll	$8,%ecx
-	xorl	%ecx,%edx
-	movl	%esi,%ecx
-	shrl	$16,%ebx
-	andl	$255,%ebx
-	movzbl	-128(%ebp,%ebx,1),%ebx
-	shll	$16,%ebx
-	xorl	%ebx,%edx
-	movl	8(%esp),%ebx
-	shrl	$24,%eax
-	movzbl	-128(%ebp,%eax,1),%eax
-	shll	$24,%eax
-	xorl	%eax,%edx
-	movl	4(%esp),%eax
-	xorl	16(%edi),%eax
-	xorl	20(%edi),%ebx
-	xorl	24(%edi),%ecx
-	xorl	28(%edi),%edx
-	ret
-.type	__sse_AES_decrypt_compact,@function
-.align	4
-__sse_AES_decrypt_compact:
-	pxor	(%edi),%mm0
-	pxor	8(%edi),%mm4
-	movl	240(%edi),%esi
-	leal	-2(%esi,%esi,1),%esi
-	leal	(%edi,%esi,8),%esi
-	movl	%esi,24(%esp)
-	movl	$454761243,%eax
-	movl	%eax,8(%esp)
-	movl	%eax,12(%esp)
-	movl	-128(%ebp),%eax
-	movl	-96(%ebp),%ebx
-	movl	-64(%ebp),%ecx
-	movl	-32(%ebp),%edx
-	movl	(%ebp),%eax
-	movl	32(%ebp),%ebx
-	movl	64(%ebp),%ecx
-	movl	96(%ebp),%edx
-.align	4,0x90
-L007loop:
-	pshufw	$12,%mm0,%mm1
-	pshufw	$9,%mm4,%mm5
-	movd	%mm1,%eax
-	movd	%mm5,%ebx
-	movl	%edi,20(%esp)
-	movzbl	%al,%esi
-	movzbl	%ah,%edx
-	pshufw	$6,%mm0,%mm2
-	movzbl	-128(%ebp,%esi,1),%ecx
-	movzbl	%bl,%edi
-	movzbl	-128(%ebp,%edx,1),%edx
-	shrl	$16,%eax
-	shll	$8,%edx
-	movzbl	-128(%ebp,%edi,1),%esi
-	movzbl	%bh,%edi
-	shll	$16,%esi
-	pshufw	$3,%mm4,%mm6
-	orl	%esi,%ecx
-	movzbl	-128(%ebp,%edi,1),%esi
-	movzbl	%ah,%edi
-	shll	$24,%esi
-	shrl	$16,%ebx
-	orl	%esi,%edx
-	movzbl	-128(%ebp,%edi,1),%esi
-	movzbl	%bh,%edi
-	shll	$24,%esi
-	orl	%esi,%ecx
-	movzbl	-128(%ebp,%edi,1),%esi
-	movzbl	%al,%edi
-	shll	$8,%esi
-	movd	%mm2,%eax
-	orl	%esi,%ecx
-	movzbl	-128(%ebp,%edi,1),%esi
-	movzbl	%bl,%edi
-	shll	$16,%esi
-	movd	%mm6,%ebx
-	movd	%ecx,%mm0
-	movzbl	-128(%ebp,%edi,1),%ecx
-	movzbl	%al,%edi
-	orl	%esi,%ecx
-	movzbl	-128(%ebp,%edi,1),%esi
-	movzbl	%bl,%edi
-	orl	%esi,%edx
-	movzbl	-128(%ebp,%edi,1),%esi
-	movzbl	%ah,%edi
-	shll	$16,%esi
-	shrl	$16,%eax
-	orl	%esi,%edx
-	movzbl	-128(%ebp,%edi,1),%esi
-	movzbl	%bh,%edi
-	shrl	$16,%ebx
-	shll	$8,%esi
-	movd	%edx,%mm1
-	movzbl	-128(%ebp,%edi,1),%edx
-	movzbl	%bh,%edi
-	shll	$24,%edx
-	andl	$255,%ebx
-	orl	%esi,%edx
-	punpckldq	%mm1,%mm0
-	movzbl	-128(%ebp,%edi,1),%esi
-	movzbl	%al,%edi
-	shll	$8,%esi
-	movzbl	%ah,%eax
-	movzbl	-128(%ebp,%ebx,1),%ebx
-	orl	%esi,%ecx
-	movzbl	-128(%ebp,%edi,1),%esi
-	orl	%ebx,%edx
-	shll	$16,%esi
-	movzbl	-128(%ebp,%eax,1),%eax
-	orl	%esi,%edx
-	shll	$24,%eax
-	orl	%eax,%ecx
-	movl	20(%esp),%edi
-	movd	%edx,%mm4
-	movd	%ecx,%mm5
-	punpckldq	%mm5,%mm4
-	addl	$16,%edi
-	cmpl	24(%esp),%edi
-	ja	L008out
-	movq	%mm0,%mm3
-	movq	%mm4,%mm7
-	pshufw	$228,%mm0,%mm2
-	pshufw	$228,%mm4,%mm6
-	movq	%mm0,%mm1
-	movq	%mm4,%mm5
-	pshufw	$177,%mm0,%mm0
-	pshufw	$177,%mm4,%mm4
-	pslld	$8,%mm2
-	pslld	$8,%mm6
-	psrld	$8,%mm3
-	psrld	$8,%mm7
-	pxor	%mm2,%mm0
-	pxor	%mm6,%mm4
-	pxor	%mm3,%mm0
-	pxor	%mm7,%mm4
-	pslld	$16,%mm2
-	pslld	$16,%mm6
-	psrld	$16,%mm3
-	psrld	$16,%mm7
-	pxor	%mm2,%mm0
-	pxor	%mm6,%mm4
-	pxor	%mm3,%mm0
-	pxor	%mm7,%mm4
-	movq	8(%esp),%mm3
-	pxor	%mm2,%mm2
-	pxor	%mm6,%mm6
-	pcmpgtb	%mm1,%mm2
-	pcmpgtb	%mm5,%mm6
-	pand	%mm3,%mm2
-	pand	%mm3,%mm6
-	paddb	%mm1,%mm1
-	paddb	%mm5,%mm5
-	pxor	%mm2,%mm1
-	pxor	%mm6,%mm5
-	movq	%mm1,%mm3
-	movq	%mm5,%mm7
-	movq	%mm1,%mm2
-	movq	%mm5,%mm6
-	pxor	%mm1,%mm0
-	pxor	%mm5,%mm4
-	pslld	$24,%mm3
-	pslld	$24,%mm7
-	psrld	$8,%mm2
-	psrld	$8,%mm6
-	pxor	%mm3,%mm0
-	pxor	%mm7,%mm4
-	pxor	%mm2,%mm0
-	pxor	%mm6,%mm4
-	movq	8(%esp),%mm2
-	pxor	%mm3,%mm3
-	pxor	%mm7,%mm7
-	pcmpgtb	%mm1,%mm3
-	pcmpgtb	%mm5,%mm7
-	pand	%mm2,%mm3
-	pand	%mm2,%mm7
-	paddb	%mm1,%mm1
-	paddb	%mm5,%mm5
-	pxor	%mm3,%mm1
-	pxor	%mm7,%mm5
-	pshufw	$177,%mm1,%mm3
-	pshufw	$177,%mm5,%mm7
-	pxor	%mm1,%mm0
-	pxor	%mm5,%mm4
-	pxor	%mm3,%mm0
-	pxor	%mm7,%mm4
-	pxor	%mm3,%mm3
-	pxor	%mm7,%mm7
-	pcmpgtb	%mm1,%mm3
-	pcmpgtb	%mm5,%mm7
-	pand	%mm2,%mm3
-	pand	%mm2,%mm7
-	paddb	%mm1,%mm1
-	paddb	%mm5,%mm5
-	pxor	%mm3,%mm1
-	pxor	%mm7,%mm5
-	pxor	%mm1,%mm0
-	pxor	%mm5,%mm4
-	movq	%mm1,%mm3
-	movq	%mm5,%mm7
-	pshufw	$177,%mm1,%mm2
-	pshufw	$177,%mm5,%mm6
-	pxor	%mm2,%mm0
-	pxor	%mm6,%mm4
-	pslld	$8,%mm1
-	pslld	$8,%mm5
-	psrld	$8,%mm3
-	psrld	$8,%mm7
-	movq	(%edi),%mm2
-	movq	8(%edi),%mm6
-	pxor	%mm1,%mm0
-	pxor	%mm5,%mm4
-	pxor	%mm3,%mm0
-	pxor	%mm7,%mm4
-	movl	-128(%ebp),%eax
-	pslld	$16,%mm1
-	pslld	$16,%mm5
-	movl	-64(%ebp),%ebx
-	psrld	$16,%mm3
-	psrld	$16,%mm7
-	movl	(%ebp),%ecx
-	pxor	%mm1,%mm0
-	pxor	%mm5,%mm4
-	movl	64(%ebp),%edx
-	pxor	%mm3,%mm0
-	pxor	%mm7,%mm4
-	pxor	%mm2,%mm0
-	pxor	%mm6,%mm4
-	jmp	L007loop
-.align	4,0x90
-L008out:
-	pxor	(%edi),%mm0
-	pxor	8(%edi),%mm4
-	ret
-.type	__x86_AES_decrypt,@function
-.align	4
-__x86_AES_decrypt:
-	movl	%edi,20(%esp)
-	xorl	(%edi),%eax
-	xorl	4(%edi),%ebx
-	xorl	8(%edi),%ecx
-	xorl	12(%edi),%edx
-	movl	240(%edi),%esi
-	leal	-2(%esi,%esi,1),%esi
-	leal	(%edi,%esi,8),%esi
-	movl	%esi,24(%esp)
-.align	4,0x90
-L009loop:
-	movl	%eax,%esi
-	andl	$255,%esi
-	movl	(%ebp,%esi,8),%esi
-	movzbl	%dh,%edi
-	xorl	3(%ebp,%edi,8),%esi
-	movl	%ecx,%edi
-	shrl	$16,%edi
-	andl	$255,%edi
-	xorl	2(%ebp,%edi,8),%esi
-	movl	%ebx,%edi
-	shrl	$24,%edi
-	xorl	1(%ebp,%edi,8),%esi
-	movl	%esi,4(%esp)
-	movl	%ebx,%esi
-	andl	$255,%esi
-	movl	(%ebp,%esi,8),%esi
-	movzbl	%ah,%edi
-	xorl	3(%ebp,%edi,8),%esi
-	movl	%edx,%edi
-	shrl	$16,%edi
-	andl	$255,%edi
-	xorl	2(%ebp,%edi,8),%esi
-	movl	%ecx,%edi
-	shrl	$24,%edi
-	xorl	1(%ebp,%edi,8),%esi
-	movl	%esi,8(%esp)
-	movl	%ecx,%esi
-	andl	$255,%esi
-	movl	(%ebp,%esi,8),%esi
-	movzbl	%bh,%edi
-	xorl	3(%ebp,%edi,8),%esi
-	movl	%eax,%edi
-	shrl	$16,%edi
-	andl	$255,%edi
-	xorl	2(%ebp,%edi,8),%esi
-	movl	%edx,%edi
-	shrl	$24,%edi
-	xorl	1(%ebp,%edi,8),%esi
-	movl	20(%esp),%edi
-	andl	$255,%edx
-	movl	(%ebp,%edx,8),%edx
-	movzbl	%ch,%ecx
-	xorl	3(%ebp,%ecx,8),%edx
-	movl	%esi,%ecx
-	shrl	$16,%ebx
-	andl	$255,%ebx
-	xorl	2(%ebp,%ebx,8),%edx
-	movl	8(%esp),%ebx
-	shrl	$24,%eax
-	xorl	1(%ebp,%eax,8),%edx
-	movl	4(%esp),%eax
-	addl	$16,%edi
-	xorl	(%edi),%eax
-	xorl	4(%edi),%ebx
-	xorl	8(%edi),%ecx
-	xorl	12(%edi),%edx
-	cmpl	24(%esp),%edi
-	movl	%edi,20(%esp)
-	jb	L009loop
-	leal	2176(%ebp),%ebp
-	movl	-128(%ebp),%edi
-	movl	-96(%ebp),%esi
-	movl	-64(%ebp),%edi
-	movl	-32(%ebp),%esi
-	movl	(%ebp),%edi
-	movl	32(%ebp),%esi
-	movl	64(%ebp),%edi
-	movl	96(%ebp),%esi
-	leal	-128(%ebp),%ebp
-	movl	%eax,%esi
-	andl	$255,%esi
-	movzbl	(%ebp,%esi,1),%esi
-	movzbl	%dh,%edi
-	movzbl	(%ebp,%edi,1),%edi
-	shll	$8,%edi
-	xorl	%edi,%esi
-	movl	%ecx,%edi
-	shrl	$16,%edi
-	andl	$255,%edi
-	movzbl	(%ebp,%edi,1),%edi
-	shll	$16,%edi
-	xorl	%edi,%esi
-	movl	%ebx,%edi
-	shrl	$24,%edi
-	movzbl	(%ebp,%edi,1),%edi
-	shll	$24,%edi
-	xorl	%edi,%esi
-	movl	%esi,4(%esp)
-	movl	%ebx,%esi
-	andl	$255,%esi
-	movzbl	(%ebp,%esi,1),%esi
-	movzbl	%ah,%edi
-	movzbl	(%ebp,%edi,1),%edi
-	shll	$8,%edi
-	xorl	%edi,%esi
-	movl	%edx,%edi
-	shrl	$16,%edi
-	andl	$255,%edi
-	movzbl	(%ebp,%edi,1),%edi
-	shll	$16,%edi
-	xorl	%edi,%esi
-	movl	%ecx,%edi
-	shrl	$24,%edi
-	movzbl	(%ebp,%edi,1),%edi
-	shll	$24,%edi
-	xorl	%edi,%esi
-	movl	%esi,8(%esp)
-	movl	%ecx,%esi
-	andl	$255,%esi
-	movzbl	(%ebp,%esi,1),%esi
-	movzbl	%bh,%edi
-	movzbl	(%ebp,%edi,1),%edi
-	shll	$8,%edi
-	xorl	%edi,%esi
-	movl	%eax,%edi
-	shrl	$16,%edi
-	andl	$255,%edi
-	movzbl	(%ebp,%edi,1),%edi
-	shll	$16,%edi
-	xorl	%edi,%esi
-	movl	%edx,%edi
-	shrl	$24,%edi
-	movzbl	(%ebp,%edi,1),%edi
-	shll	$24,%edi
-	xorl	%edi,%esi
-	movl	20(%esp),%edi
-	andl	$255,%edx
-	movzbl	(%ebp,%edx,1),%edx
-	movzbl	%ch,%ecx
-	movzbl	(%ebp,%ecx,1),%ecx
-	shll	$8,%ecx
-	xorl	%ecx,%edx
-	movl	%esi,%ecx
-	shrl	$16,%ebx
-	andl	$255,%ebx
-	movzbl	(%ebp,%ebx,1),%ebx
-	shll	$16,%ebx
-	xorl	%ebx,%edx
-	movl	8(%esp),%ebx
-	shrl	$24,%eax
-	movzbl	(%ebp,%eax,1),%eax
-	shll	$24,%eax
-	xorl	%eax,%edx
-	movl	4(%esp),%eax
-	leal	-2048(%ebp),%ebp
-	addl	$16,%edi
-	xorl	(%edi),%eax
-	xorl	4(%edi),%ebx
-	xorl	8(%edi),%ecx
-	xorl	12(%edi),%edx
-	ret
-.align	6,0x90
-LAES_Td:
-.long	1353184337,1353184337
-.long	1399144830,1399144830
-.long	3282310938,3282310938
-.long	2522752826,2522752826
-.long	3412831035,3412831035
-.long	4047871263,4047871263
-.long	2874735276,2874735276
-.long	2466505547,2466505547
-.long	1442459680,1442459680
-.long	4134368941,4134368941
-.long	2440481928,2440481928
-.long	625738485,625738485
-.long	4242007375,4242007375
-.long	3620416197,3620416197
-.long	2151953702,2151953702
-.long	2409849525,2409849525
-.long	1230680542,1230680542
-.long	1729870373,1729870373
-.long	2551114309,2551114309
-.long	3787521629,3787521629
-.long	41234371,41234371
-.long	317738113,317738113
-.long	2744600205,2744600205
-.long	3338261355,3338261355
-.long	3881799427,3881799427
-.long	2510066197,2510066197
-.long	3950669247,3950669247
-.long	3663286933,3663286933
-.long	763608788,763608788
-.long	3542185048,3542185048
-.long	694804553,694804553
-.long	1154009486,1154009486
-.long	1787413109,1787413109
-.long	2021232372,2021232372
-.long	1799248025,1799248025
-.long	3715217703,3715217703
-.long	3058688446,3058688446
-.long	397248752,397248752
-.long	1722556617,1722556617
-.long	3023752829,3023752829
-.long	407560035,407560035
-.long	2184256229,2184256229
-.long	1613975959,1613975959
-.long	1165972322,1165972322
-.long	3765920945,3765920945
-.long	2226023355,2226023355
-.long	480281086,480281086
-.long	2485848313,2485848313
-.long	1483229296,1483229296
-.long	436028815,436028815
-.long	2272059028,2272059028
-.long	3086515026,3086515026
-.long	601060267,601060267
-.long	3791801202,3791801202
-.long	1468997603,1468997603
-.long	715871590,715871590
-.long	120122290,120122290
-.long	63092015,63092015
-.long	2591802758,2591802758
-.long	2768779219,2768779219
-.long	4068943920,4068943920
-.long	2997206819,2997206819
-.long	3127509762,3127509762
-.long	1552029421,1552029421
-.long	723308426,723308426
-.long	2461301159,2461301159
-.long	4042393587,4042393587
-.long	2715969870,2715969870
-.long	3455375973,3455375973
-.long	3586000134,3586000134
-.long	526529745,526529745
-.long	2331944644,2331944644
-.long	2639474228,2639474228
-.long	2689987490,2689987490
-.long	853641733,853641733
-.long	1978398372,1978398372
-.long	971801355,971801355
-.long	2867814464,2867814464
-.long	111112542,111112542
-.long	1360031421,1360031421
-.long	4186579262,4186579262
-.long	1023860118,1023860118
-.long	2919579357,2919579357
-.long	1186850381,1186850381
-.long	3045938321,3045938321
-.long	90031217,90031217
-.long	1876166148,1876166148
-.long	4279586912,4279586912
-.long	620468249,620468249
-.long	2548678102,2548678102
-.long	3426959497,3426959497
-.long	2006899047,2006899047
-.long	3175278768,3175278768
-.long	2290845959,2290845959
-.long	945494503,945494503
-.long	3689859193,3689859193
-.long	1191869601,1191869601
-.long	3910091388,3910091388
-.long	3374220536,3374220536
-.long	0,0
-.long	2206629897,2206629897
-.long	1223502642,1223502642
-.long	2893025566,2893025566
-.long	1316117100,1316117100
-.long	4227796733,4227796733
-.long	1446544655,1446544655
-.long	517320253,517320253
-.long	658058550,658058550
-.long	1691946762,1691946762
-.long	564550760,564550760
-.long	3511966619,3511966619
-.long	976107044,976107044
-.long	2976320012,2976320012
-.long	266819475,266819475
-.long	3533106868,3533106868
-.long	2660342555,2660342555
-.long	1338359936,1338359936
-.long	2720062561,2720062561
-.long	1766553434,1766553434
-.long	370807324,370807324
-.long	179999714,179999714
-.long	3844776128,3844776128
-.long	1138762300,1138762300
-.long	488053522,488053522
-.long	185403662,185403662
-.long	2915535858,2915535858
-.long	3114841645,3114841645
-.long	3366526484,3366526484
-.long	2233069911,2233069911
-.long	1275557295,1275557295
-.long	3151862254,3151862254
-.long	4250959779,4250959779
-.long	2670068215,2670068215
-.long	3170202204,3170202204
-.long	3309004356,3309004356
-.long	880737115,880737115
-.long	1982415755,1982415755
-.long	3703972811,3703972811
-.long	1761406390,1761406390
-.long	1676797112,1676797112
-.long	3403428311,3403428311
-.long	277177154,277177154
-.long	1076008723,1076008723
-.long	538035844,538035844
-.long	2099530373,2099530373
-.long	4164795346,4164795346
-.long	288553390,288553390
-.long	1839278535,1839278535
-.long	1261411869,1261411869
-.long	4080055004,4080055004
-.long	3964831245,3964831245
-.long	3504587127,3504587127
-.long	1813426987,1813426987
-.long	2579067049,2579067049
-.long	4199060497,4199060497
-.long	577038663,577038663
-.long	3297574056,3297574056
-.long	440397984,440397984
-.long	3626794326,3626794326
-.long	4019204898,4019204898
-.long	3343796615,3343796615
-.long	3251714265,3251714265
-.long	4272081548,4272081548
-.long	906744984,906744984
-.long	3481400742,3481400742
-.long	685669029,685669029
-.long	646887386,646887386
-.long	2764025151,2764025151
-.long	3835509292,3835509292
-.long	227702864,227702864
-.long	2613862250,2613862250
-.long	1648787028,1648787028
-.long	3256061430,3256061430
-.long	3904428176,3904428176
-.long	1593260334,1593260334
-.long	4121936770,4121936770
-.long	3196083615,3196083615
-.long	2090061929,2090061929
-.long	2838353263,2838353263
-.long	3004310991,3004310991
-.long	999926984,999926984
-.long	2809993232,2809993232
-.long	1852021992,1852021992
-.long	2075868123,2075868123
-.long	158869197,158869197
-.long	4095236462,4095236462
-.long	28809964,28809964
-.long	2828685187,2828685187
-.long	1701746150,1701746150
-.long	2129067946,2129067946
-.long	147831841,147831841
-.long	3873969647,3873969647
-.long	3650873274,3650873274
-.long	3459673930,3459673930
-.long	3557400554,3557400554
-.long	3598495785,3598495785
-.long	2947720241,2947720241
-.long	824393514,824393514
-.long	815048134,815048134
-.long	3227951669,3227951669
-.long	935087732,935087732
-.long	2798289660,2798289660
-.long	2966458592,2966458592
-.long	366520115,366520115
-.long	1251476721,1251476721
-.long	4158319681,4158319681
-.long	240176511,240176511
-.long	804688151,804688151
-.long	2379631990,2379631990
-.long	1303441219,1303441219
-.long	1414376140,1414376140
-.long	3741619940,3741619940
-.long	3820343710,3820343710
-.long	461924940,461924940
-.long	3089050817,3089050817
-.long	2136040774,2136040774
-.long	82468509,82468509
-.long	1563790337,1563790337
-.long	1937016826,1937016826
-.long	776014843,776014843
-.long	1511876531,1511876531
-.long	1389550482,1389550482
-.long	861278441,861278441
-.long	323475053,323475053
-.long	2355222426,2355222426
-.long	2047648055,2047648055
-.long	2383738969,2383738969
-.long	2302415851,2302415851
-.long	3995576782,3995576782
-.long	902390199,902390199
-.long	3991215329,3991215329
-.long	1018251130,1018251130
-.long	1507840668,1507840668
-.long	1064563285,1064563285
-.long	2043548696,2043548696
-.long	3208103795,3208103795
-.long	3939366739,3939366739
-.long	1537932639,1537932639
-.long	342834655,342834655
-.long	2262516856,2262516856
-.long	2180231114,2180231114
-.long	1053059257,1053059257
-.long	741614648,741614648
-.long	1598071746,1598071746
-.long	1925389590,1925389590
-.long	203809468,203809468
-.long	2336832552,2336832552
-.long	1100287487,1100287487
-.long	1895934009,1895934009
-.long	3736275976,3736275976
-.long	2632234200,2632234200
-.long	2428589668,2428589668
-.long	1636092795,1636092795
-.long	1890988757,1890988757
-.long	1952214088,1952214088
-.long	1113045200,1113045200
-.byte	82,9,106,213,48,54,165,56
-.byte	191,64,163,158,129,243,215,251
-.byte	124,227,57,130,155,47,255,135
-.byte	52,142,67,68,196,222,233,203
-.byte	84,123,148,50,166,194,35,61
-.byte	238,76,149,11,66,250,195,78
-.byte	8,46,161,102,40,217,36,178
-.byte	118,91,162,73,109,139,209,37
-.byte	114,248,246,100,134,104,152,22
-.byte	212,164,92,204,93,101,182,146
-.byte	108,112,72,80,253,237,185,218
-.byte	94,21,70,87,167,141,157,132
-.byte	144,216,171,0,140,188,211,10
-.byte	247,228,88,5,184,179,69,6
-.byte	208,44,30,143,202,63,15,2
-.byte	193,175,189,3,1,19,138,107
-.byte	58,145,17,65,79,103,220,234
-.byte	151,242,207,206,240,180,230,115
-.byte	150,172,116,34,231,173,53,133
-.byte	226,249,55,232,28,117,223,110
-.byte	71,241,26,113,29,41,197,137
-.byte	111,183,98,14,170,24,190,27
-.byte	252,86,62,75,198,210,121,32
-.byte	154,219,192,254,120,205,90,244
-.byte	31,221,168,51,136,7,199,49
-.byte	177,18,16,89,39,128,236,95
-.byte	96,81,127,169,25,181,74,13
-.byte	45,229,122,159,147,201,156,239
-.byte	160,224,59,77,174,42,245,176
-.byte	200,235,187,60,131,83,153,97
-.byte	23,43,4,126,186,119,214,38
-.byte	225,105,20,99,85,33,12,125
-.byte	82,9,106,213,48,54,165,56
-.byte	191,64,163,158,129,243,215,251
-.byte	124,227,57,130,155,47,255,135
-.byte	52,142,67,68,196,222,233,203
-.byte	84,123,148,50,166,194,35,61
-.byte	238,76,149,11,66,250,195,78
-.byte	8,46,161,102,40,217,36,178
-.byte	118,91,162,73,109,139,209,37
-.byte	114,248,246,100,134,104,152,22
-.byte	212,164,92,204,93,101,182,146
-.byte	108,112,72,80,253,237,185,218
-.byte	94,21,70,87,167,141,157,132
-.byte	144,216,171,0,140,188,211,10
-.byte	247,228,88,5,184,179,69,6
-.byte	208,44,30,143,202,63,15,2
-.byte	193,175,189,3,1,19,138,107
-.byte	58,145,17,65,79,103,220,234
-.byte	151,242,207,206,240,180,230,115
-.byte	150,172,116,34,231,173,53,133
-.byte	226,249,55,232,28,117,223,110
-.byte	71,241,26,113,29,41,197,137
-.byte	111,183,98,14,170,24,190,27
-.byte	252,86,62,75,198,210,121,32
-.byte	154,219,192,254,120,205,90,244
-.byte	31,221,168,51,136,7,199,49
-.byte	177,18,16,89,39,128,236,95
-.byte	96,81,127,169,25,181,74,13
-.byte	45,229,122,159,147,201,156,239
-.byte	160,224,59,77,174,42,245,176
-.byte	200,235,187,60,131,83,153,97
-.byte	23,43,4,126,186,119,214,38
-.byte	225,105,20,99,85,33,12,125
-.byte	82,9,106,213,48,54,165,56
-.byte	191,64,163,158,129,243,215,251
-.byte	124,227,57,130,155,47,255,135
-.byte	52,142,67,68,196,222,233,203
-.byte	84,123,148,50,166,194,35,61
-.byte	238,76,149,11,66,250,195,78
-.byte	8,46,161,102,40,217,36,178
-.byte	118,91,162,73,109,139,209,37
-.byte	114,248,246,100,134,104,152,22
-.byte	212,164,92,204,93,101,182,146
-.byte	108,112,72,80,253,237,185,218
-.byte	94,21,70,87,167,141,157,132
-.byte	144,216,171,0,140,188,211,10
-.byte	247,228,88,5,184,179,69,6
-.byte	208,44,30,143,202,63,15,2
-.byte	193,175,189,3,1,19,138,107
-.byte	58,145,17,65,79,103,220,234
-.byte	151,242,207,206,240,180,230,115
-.byte	150,172,116,34,231,173,53,133
-.byte	226,249,55,232,28,117,223,110
-.byte	71,241,26,113,29,41,197,137
-.byte	111,183,98,14,170,24,190,27
-.byte	252,86,62,75,198,210,121,32
-.byte	154,219,192,254,120,205,90,244
-.byte	31,221,168,51,136,7,199,49
-.byte	177,18,16,89,39,128,236,95
-.byte	96,81,127,169,25,181,74,13
-.byte	45,229,122,159,147,201,156,239
-.byte	160,224,59,77,174,42,245,176
-.byte	200,235,187,60,131,83,153,97
-.byte	23,43,4,126,186,119,214,38
-.byte	225,105,20,99,85,33,12,125
-.byte	82,9,106,213,48,54,165,56
-.byte	191,64,163,158,129,243,215,251
-.byte	124,227,57,130,155,47,255,135
-.byte	52,142,67,68,196,222,233,203
-.byte	84,123,148,50,166,194,35,61
-.byte	238,76,149,11,66,250,195,78
-.byte	8,46,161,102,40,217,36,178
-.byte	118,91,162,73,109,139,209,37
-.byte	114,248,246,100,134,104,152,22
-.byte	212,164,92,204,93,101,182,146
-.byte	108,112,72,80,253,237,185,218
-.byte	94,21,70,87,167,141,157,132
-.byte	144,216,171,0,140,188,211,10
-.byte	247,228,88,5,184,179,69,6
-.byte	208,44,30,143,202,63,15,2
-.byte	193,175,189,3,1,19,138,107
-.byte	58,145,17,65,79,103,220,234
-.byte	151,242,207,206,240,180,230,115
-.byte	150,172,116,34,231,173,53,133
-.byte	226,249,55,232,28,117,223,110
-.byte	71,241,26,113,29,41,197,137
-.byte	111,183,98,14,170,24,190,27
-.byte	252,86,62,75,198,210,121,32
-.byte	154,219,192,254,120,205,90,244
-.byte	31,221,168,51,136,7,199,49
-.byte	177,18,16,89,39,128,236,95
-.byte	96,81,127,169,25,181,74,13
-.byte	45,229,122,159,147,201,156,239
-.byte	160,224,59,77,174,42,245,176
-.byte	200,235,187,60,131,83,153,97
-.byte	23,43,4,126,186,119,214,38
-.byte	225,105,20,99,85,33,12,125
-.globl	_AES_decrypt
-.type	_AES_decrypt,@function
-.align	4
-_AES_decrypt:
-L_AES_decrypt_begin:
-	pushl	%ebp
-	pushl	%ebx
-	pushl	%esi
-	pushl	%edi
-	movl	20(%esp),%esi
-	movl	28(%esp),%edi
-	movl	%esp,%eax
-	subl	$36,%esp
-	andl	$-64,%esp
-	leal	-127(%edi),%ebx
-	subl	%esp,%ebx
-	negl	%ebx
-	andl	$960,%ebx
-	subl	%ebx,%esp
-	addl	$4,%esp
-	movl	%eax,28(%esp)
-	call	L010pic_point
-L010pic_point:
-	popl	%ebp
-	leal	__GLOBAL_OFFSET_TABLE_+[.-L010pic_point](%ebp),%eax
-	movl	_OPENSSL_ia32cap_P@GOT(%eax),%eax
-	leal	LAES_Td-L010pic_point(%ebp),%ebp
-	leal	764(%esp),%ebx
-	subl	%ebp,%ebx
-	andl	$768,%ebx
-	leal	2176(%ebp,%ebx,1),%ebp
-	btl	$25,(%eax)
-	jnc	L011x86
-	movq	(%esi),%mm0
-	movq	8(%esi),%mm4
-	call	__sse_AES_decrypt_compact
-	movl	28(%esp),%esp
-	movl	24(%esp),%esi
-	movq	%mm0,(%esi)
-	movq	%mm4,8(%esi)
-	emms
-	popl	%edi
-	popl	%esi
-	popl	%ebx
-	popl	%ebp
-	ret
-.align	4,0x90
-L011x86:
-	movl	%ebp,24(%esp)
-	movl	(%esi),%eax
-	movl	4(%esi),%ebx
-	movl	8(%esi),%ecx
-	movl	12(%esi),%edx
-	call	__x86_AES_decrypt_compact
-	movl	28(%esp),%esp
-	movl	24(%esp),%esi
-	movl	%eax,(%esi)
-	movl	%ebx,4(%esi)
-	movl	%ecx,8(%esi)
-	movl	%edx,12(%esi)
-	popl	%edi
-	popl	%esi
-	popl	%ebx
-	popl	%ebp
-	ret
-.globl	_AES_cbc_encrypt
-.type	_AES_cbc_encrypt,@function
-.align	4
-_AES_cbc_encrypt:
-L_AES_cbc_encrypt_begin:
-	pushl	%ebp
-	pushl	%ebx
-	pushl	%esi
-	pushl	%edi
-	movl	28(%esp),%ecx
-	cmpl	$0,%ecx
-	je	L012drop_out
-	call	L013pic_point
-L013pic_point:
-	popl	%ebp
-	leal	__GLOBAL_OFFSET_TABLE_+[.-L013pic_point](%ebp),%eax
-	movl	_OPENSSL_ia32cap_P@GOT(%eax),%eax
-	cmpl	$0,40(%esp)
-	leal	LAES_Te-L013pic_point(%ebp),%ebp
-	jne	L014picked_te
-	leal	LAES_Td-LAES_Te(%ebp),%ebp
-L014picked_te:
-	pushfl
-	cld
-	cmpl	$512,%ecx
-	jb	L015slow_way
-	testl	$15,%ecx
-	jnz	L015slow_way
-	btl	$28,(%eax)
-	jc	L015slow_way
-	leal	-324(%esp),%esi
-	andl	$-64,%esi
-	movl	%ebp,%eax
-	leal	2304(%ebp),%ebx
-	movl	%esi,%edx
-	andl	$4095,%eax
-	andl	$4095,%ebx
-	andl	$4095,%edx
-	cmpl	%ebx,%edx
-	jb	L016tbl_break_out
-	subl	%ebx,%edx
-	subl	%edx,%esi
-	jmp	L017tbl_ok
-.align	2,0x90
-L016tbl_break_out:
-	subl	%eax,%edx
-	andl	$4095,%edx
-	addl	$384,%edx
-	subl	%edx,%esi
-.align	2,0x90
-L017tbl_ok:
-	leal	24(%esp),%edx
-	xchgl	%esi,%esp
-	addl	$4,%esp
-	movl	%ebp,24(%esp)
-	movl	%esi,28(%esp)
-	movl	(%edx),%eax
-	movl	4(%edx),%ebx
-	movl	12(%edx),%edi
-	movl	16(%edx),%esi
-	movl	20(%edx),%edx
-	movl	%eax,32(%esp)
-	movl	%ebx,36(%esp)
-	movl	%ecx,40(%esp)
-	movl	%edi,44(%esp)
-	movl	%esi,48(%esp)
-	movl	$0,316(%esp)
-	movl	%edi,%ebx
-	movl	$61,%ecx
-	subl	%ebp,%ebx
-	movl	%edi,%esi
-	andl	$4095,%ebx
-	leal	76(%esp),%edi
-	cmpl	$2304,%ebx
-	jb	L018do_copy
-	cmpl	$3852,%ebx
-	jb	L019skip_copy
-.align	2,0x90
-L018do_copy:
-	movl	%edi,44(%esp)
-.long	2784229001
-L019skip_copy:
-	movl	$16,%edi
-.align	2,0x90
-L020prefetch_tbl:
-	movl	(%ebp),%eax
-	movl	32(%ebp),%ebx
-	movl	64(%ebp),%ecx
-	movl	96(%ebp),%esi
-	leal	128(%ebp),%ebp
-	subl	$1,%edi
-	jnz	L020prefetch_tbl
-	subl	$2048,%ebp
-	movl	32(%esp),%esi
-	movl	48(%esp),%edi
-	cmpl	$0,%edx
-	je	L021fast_decrypt
-	movl	(%edi),%eax
-	movl	4(%edi),%ebx
-.align	4,0x90
-L022fast_enc_loop:
-	movl	8(%edi),%ecx
-	movl	12(%edi),%edx
-	xorl	(%esi),%eax
-	xorl	4(%esi),%ebx
-	xorl	8(%esi),%ecx
-	xorl	12(%esi),%edx
-	movl	44(%esp),%edi
-	call	__x86_AES_encrypt
-	movl	32(%esp),%esi
-	movl	36(%esp),%edi
-	movl	%eax,(%edi)
-	movl	%ebx,4(%edi)
-	movl	%ecx,8(%edi)
-	movl	%edx,12(%edi)
-	leal	16(%esi),%esi
-	movl	40(%esp),%ecx
-	movl	%esi,32(%esp)
-	leal	16(%edi),%edx
-	movl	%edx,36(%esp)
-	subl	$16,%ecx
-	movl	%ecx,40(%esp)
-	jnz	L022fast_enc_loop
-	movl	48(%esp),%esi
-	movl	8(%edi),%ecx
-	movl	12(%edi),%edx
-	movl	%eax,(%esi)
-	movl	%ebx,4(%esi)
-	movl	%ecx,8(%esi)
-	movl	%edx,12(%esi)
-	cmpl	$0,316(%esp)
-	movl	44(%esp),%edi
-	je	L023skip_ezero
-	movl	$60,%ecx
-	xorl	%eax,%eax
-.align	2,0x90
-.long	2884892297
-L023skip_ezero:
-	movl	28(%esp),%esp
-	popfl
-L012drop_out:
-	popl	%edi
-	popl	%esi
-	popl	%ebx
-	popl	%ebp
-	ret
-	pushfl
-.align	4,0x90
-L021fast_decrypt:
-	cmpl	36(%esp),%esi
-	je	L024fast_dec_in_place
-	movl	%edi,52(%esp)
-.align	2,0x90
-.align	4,0x90
-L025fast_dec_loop:
-	movl	(%esi),%eax
-	movl	4(%esi),%ebx
-	movl	8(%esi),%ecx
-	movl	12(%esi),%edx
-	movl	44(%esp),%edi
-	call	__x86_AES_decrypt
-	movl	52(%esp),%edi
-	movl	40(%esp),%esi
-	xorl	(%edi),%eax
-	xorl	4(%edi),%ebx
-	xorl	8(%edi),%ecx
-	xorl	12(%edi),%edx
-	movl	36(%esp),%edi
-	movl	32(%esp),%esi
-	movl	%eax,(%edi)
-	movl	%ebx,4(%edi)
-	movl	%ecx,8(%edi)
-	movl	%edx,12(%edi)
-	movl	40(%esp),%ecx
-	movl	%esi,52(%esp)
-	leal	16(%esi),%esi
-	movl	%esi,32(%esp)
-	leal	16(%edi),%edi
-	movl	%edi,36(%esp)
-	subl	$16,%ecx
-	movl	%ecx,40(%esp)
-	jnz	L025fast_dec_loop
-	movl	52(%esp),%edi
-	movl	48(%esp),%esi
-	movl	(%edi),%eax
-	movl	4(%edi),%ebx
-	movl	8(%edi),%ecx
-	movl	12(%edi),%edx
-	movl	%eax,(%esi)
-	movl	%ebx,4(%esi)
-	movl	%ecx,8(%esi)
-	movl	%edx,12(%esi)
-	jmp	L026fast_dec_out
-.align	4,0x90
-L024fast_dec_in_place:
-L027fast_dec_in_place_loop:
-	movl	(%esi),%eax
-	movl	4(%esi),%ebx
-	movl	8(%esi),%ecx
-	movl	12(%esi),%edx
-	leal	60(%esp),%edi
-	movl	%eax,(%edi)
-	movl	%ebx,4(%edi)
-	movl	%ecx,8(%edi)
-	movl	%edx,12(%edi)
-	movl	44(%esp),%edi
-	call	__x86_AES_decrypt
-	movl	48(%esp),%edi
-	movl	36(%esp),%esi
-	xorl	(%edi),%eax
-	xorl	4(%edi),%ebx
-	xorl	8(%edi),%ecx
-	xorl	12(%edi),%edx
-	movl	%eax,(%esi)
-	movl	%ebx,4(%esi)
-	movl	%ecx,8(%esi)
-	movl	%edx,12(%esi)
-	leal	16(%esi),%esi
-	movl	%esi,36(%esp)
-	leal	60(%esp),%esi
-	movl	(%esi),%eax
-	movl	4(%esi),%ebx
-	movl	8(%esi),%ecx
-	movl	12(%esi),%edx
-	movl	%eax,(%edi)
-	movl	%ebx,4(%edi)
-	movl	%ecx,8(%edi)
-	movl	%edx,12(%edi)
-	movl	32(%esp),%esi
-	movl	40(%esp),%ecx
-	leal	16(%esi),%esi
-	movl	%esi,32(%esp)
-	subl	$16,%ecx
-	movl	%ecx,40(%esp)
-	jnz	L027fast_dec_in_place_loop
-.align	2,0x90
-L026fast_dec_out:
-	cmpl	$0,316(%esp)
-	movl	44(%esp),%edi
-	je	L028skip_dzero
-	movl	$60,%ecx
-	xorl	%eax,%eax
-.align	2,0x90
-.long	2884892297
-L028skip_dzero:
-	movl	28(%esp),%esp
-	popfl
-	popl	%edi
-	popl	%esi
-	popl	%ebx
-	popl	%ebp
-	ret
-	pushfl
-.align	4,0x90
-L015slow_way:
-	movl	(%eax),%eax
-	movl	36(%esp),%edi
-	leal	-80(%esp),%esi
-	andl	$-64,%esi
-	leal	-143(%edi),%ebx
-	subl	%esi,%ebx
-	negl	%ebx
-	andl	$960,%ebx
-	subl	%ebx,%esi
-	leal	768(%esi),%ebx
-	subl	%ebp,%ebx
-	andl	$768,%ebx
-	leal	2176(%ebp,%ebx,1),%ebp
-	leal	24(%esp),%edx
-	xchgl	%esi,%esp
-	addl	$4,%esp
-	movl	%ebp,24(%esp)
-	movl	%esi,28(%esp)
-	movl	%eax,52(%esp)
-	movl	(%edx),%eax
-	movl	4(%edx),%ebx
-	movl	16(%edx),%esi
-	movl	20(%edx),%edx
-	movl	%eax,32(%esp)
-	movl	%ebx,36(%esp)
-	movl	%ecx,40(%esp)
-	movl	%edi,44(%esp)
-	movl	%esi,48(%esp)
-	movl	%esi,%edi
-	movl	%eax,%esi
-	cmpl	$0,%edx
-	je	L029slow_decrypt
-	cmpl	$16,%ecx
-	movl	%ebx,%edx
-	jb	L030slow_enc_tail
-	btl	$25,52(%esp)
-	jnc	L031slow_enc_x86
-	movq	(%edi),%mm0
-	movq	8(%edi),%mm4
-.align	4,0x90
-L032slow_enc_loop_sse:
-	pxor	(%esi),%mm0
-	pxor	8(%esi),%mm4
-	movl	44(%esp),%edi
-	call	__sse_AES_encrypt_compact
-	movl	32(%esp),%esi
-	movl	36(%esp),%edi
-	movl	40(%esp),%ecx
-	movq	%mm0,(%edi)
-	movq	%mm4,8(%edi)
-	leal	16(%esi),%esi
-	movl	%esi,32(%esp)
-	leal	16(%edi),%edx
-	movl	%edx,36(%esp)
-	subl	$16,%ecx
-	cmpl	$16,%ecx
-	movl	%ecx,40(%esp)
-	jae	L032slow_enc_loop_sse
-	testl	$15,%ecx
-	jnz	L030slow_enc_tail
-	movl	48(%esp),%esi
-	movq	%mm0,(%esi)
-	movq	%mm4,8(%esi)
-	emms
-	movl	28(%esp),%esp
-	popfl
-	popl	%edi
-	popl	%esi
-	popl	%ebx
-	popl	%ebp
-	ret
-	pushfl
-.align	4,0x90
-L031slow_enc_x86:
-	movl	(%edi),%eax
-	movl	4(%edi),%ebx
-.align	2,0x90
-L033slow_enc_loop_x86:
-	movl	8(%edi),%ecx
-	movl	12(%edi),%edx
-	xorl	(%esi),%eax
-	xorl	4(%esi),%ebx
-	xorl	8(%esi),%ecx
-	xorl	12(%esi),%edx
-	movl	44(%esp),%edi
-	call	__x86_AES_encrypt_compact
-	movl	32(%esp),%esi
-	movl	36(%esp),%edi
-	movl	%eax,(%edi)
-	movl	%ebx,4(%edi)
-	movl	%ecx,8(%edi)
-	movl	%edx,12(%edi)
-	movl	40(%esp),%ecx
-	leal	16(%esi),%esi
-	movl	%esi,32(%esp)
-	leal	16(%edi),%edx
-	movl	%edx,36(%esp)
-	subl	$16,%ecx
-	cmpl	$16,%ecx
-	movl	%ecx,40(%esp)
-	jae	L033slow_enc_loop_x86
-	testl	$15,%ecx
-	jnz	L030slow_enc_tail
-	movl	48(%esp),%esi
-	movl	8(%edi),%ecx
-	movl	12(%edi),%edx
-	movl	%eax,(%esi)
-	movl	%ebx,4(%esi)
-	movl	%ecx,8(%esi)
-	movl	%edx,12(%esi)
-	movl	28(%esp),%esp
-	popfl
-	popl	%edi
-	popl	%esi
-	popl	%ebx
-	popl	%ebp
-	ret
-	pushfl
-.align	4,0x90
-L030slow_enc_tail:
-	emms
-	movl	%edx,%edi
-	movl	$16,%ebx
-	subl	%ecx,%ebx
-	cmpl	%esi,%edi
-	je	L034enc_in_place
-.align	2,0x90
-.long	2767451785
-	jmp	L035enc_skip_in_place
-L034enc_in_place:
-	leal	(%edi,%ecx,1),%edi
-L035enc_skip_in_place:
-	movl	%ebx,%ecx
-	xorl	%eax,%eax
-.align	2,0x90
-.long	2868115081
-	movl	48(%esp),%edi
-	movl	%edx,%esi
-	movl	(%edi),%eax
-	movl	4(%edi),%ebx
-	movl	$16,40(%esp)
-	jmp	L033slow_enc_loop_x86
-.align	4,0x90
-L029slow_decrypt:
-	btl	$25,52(%esp)
-	jnc	L036slow_dec_loop_x86
-.align	2,0x90
-L037slow_dec_loop_sse:
-	movq	(%esi),%mm0
-	movq	8(%esi),%mm4
-	movl	44(%esp),%edi
-	call	__sse_AES_decrypt_compact
-	movl	32(%esp),%esi
-	leal	60(%esp),%eax
-	movl	36(%esp),%ebx
-	movl	40(%esp),%ecx
-	movl	48(%esp),%edi
-	movq	(%esi),%mm1
-	movq	8(%esi),%mm5
-	pxor	(%edi),%mm0
-	pxor	8(%edi),%mm4
-	movq	%mm1,(%edi)
-	movq	%mm5,8(%edi)
-	subl	$16,%ecx
-	jc	L038slow_dec_partial_sse
-	movq	%mm0,(%ebx)
-	movq	%mm4,8(%ebx)
-	leal	16(%ebx),%ebx
-	movl	%ebx,36(%esp)
-	leal	16(%esi),%esi
-	movl	%esi,32(%esp)
-	movl	%ecx,40(%esp)
-	jnz	L037slow_dec_loop_sse
-	emms
-	movl	28(%esp),%esp
-	popfl
-	popl	%edi
-	popl	%esi
-	popl	%ebx
-	popl	%ebp
-	ret
-	pushfl
-.align	4,0x90
-L038slow_dec_partial_sse:
-	movq	%mm0,(%eax)
-	movq	%mm4,8(%eax)
-	emms
-	addl	$16,%ecx
-	movl	%ebx,%edi
-	movl	%eax,%esi
-.align	2,0x90
-.long	2767451785
-	movl	28(%esp),%esp
-	popfl
-	popl	%edi
-	popl	%esi
-	popl	%ebx
-	popl	%ebp
-	ret
-	pushfl
-.align	4,0x90
-L036slow_dec_loop_x86:
-	movl	(%esi),%eax
-	movl	4(%esi),%ebx
-	movl	8(%esi),%ecx
-	movl	12(%esi),%edx
-	leal	60(%esp),%edi
-	movl	%eax,(%edi)
-	movl	%ebx,4(%edi)
-	movl	%ecx,8(%edi)
-	movl	%edx,12(%edi)
-	movl	44(%esp),%edi
-	call	__x86_AES_decrypt_compact
-	movl	48(%esp),%edi
-	movl	40(%esp),%esi
-	xorl	(%edi),%eax
-	xorl	4(%edi),%ebx
-	xorl	8(%edi),%ecx
-	xorl	12(%edi),%edx
-	subl	$16,%esi
-	jc	L039slow_dec_partial_x86
-	movl	%esi,40(%esp)
-	movl	36(%esp),%esi
-	movl	%eax,(%esi)
-	movl	%ebx,4(%esi)
-	movl	%ecx,8(%esi)
-	movl	%edx,12(%esi)
-	leal	16(%esi),%esi
-	movl	%esi,36(%esp)
-	leal	60(%esp),%esi
-	movl	(%esi),%eax
-	movl	4(%esi),%ebx
-	movl	8(%esi),%ecx
-	movl	12(%esi),%edx
-	movl	%eax,(%edi)
-	movl	%ebx,4(%edi)
-	movl	%ecx,8(%edi)
-	movl	%edx,12(%edi)
-	movl	32(%esp),%esi
-	leal	16(%esi),%esi
-	movl	%esi,32(%esp)
-	jnz	L036slow_dec_loop_x86
-	movl	28(%esp),%esp
-	popfl
-	popl	%edi
-	popl	%esi
-	popl	%ebx
-	popl	%ebp
-	ret
-	pushfl
-.align	4,0x90
-L039slow_dec_partial_x86:
-	leal	60(%esp),%esi
-	movl	%eax,(%esi)
-	movl	%ebx,4(%esi)
-	movl	%ecx,8(%esi)
-	movl	%edx,12(%esi)
-	movl	32(%esp),%esi
-	movl	(%esi),%eax
-	movl	4(%esi),%ebx
-	movl	8(%esi),%ecx
-	movl	12(%esi),%edx
-	movl	%eax,(%edi)
-	movl	%ebx,4(%edi)
-	movl	%ecx,8(%edi)
-	movl	%edx,12(%edi)
-	movl	40(%esp),%ecx
-	movl	36(%esp),%edi
-	leal	60(%esp),%esi
-.align	2,0x90
-.long	2767451785
-	movl	28(%esp),%esp
-	popfl
-	popl	%edi
-	popl	%esi
-	popl	%ebx
-	popl	%ebp
-	ret
-.type	__x86_AES_set_encrypt_key,@function
-.align	4
-__x86_AES_set_encrypt_key:
-	pushl	%ebp
-	pushl	%ebx
-	pushl	%esi
-	pushl	%edi
-	movl	24(%esp),%esi
-	movl	32(%esp),%edi
-	testl	$-1,%esi
-	jz	L040badpointer
-	testl	$-1,%edi
-	jz	L040badpointer
-	call	L041pic_point
-L041pic_point:
-	popl	%ebp
-	leal	LAES_Te-L041pic_point(%ebp),%ebp
-	leal	2176(%ebp),%ebp
-	movl	-128(%ebp),%eax
-	movl	-96(%ebp),%ebx
-	movl	-64(%ebp),%ecx
-	movl	-32(%ebp),%edx
-	movl	(%ebp),%eax
-	movl	32(%ebp),%ebx
-	movl	64(%ebp),%ecx
-	movl	96(%ebp),%edx
-	movl	28(%esp),%ecx
-	cmpl	$128,%ecx
-	je	L04210rounds
-	cmpl	$192,%ecx
-	je	L04312rounds
-	cmpl	$256,%ecx
-	je	L04414rounds
-	movl	$-2,%eax
-	jmp	L045exit
-L04210rounds:
-	movl	(%esi),%eax
-	movl	4(%esi),%ebx
-	movl	8(%esi),%ecx
-	movl	12(%esi),%edx
-	movl	%eax,(%edi)
-	movl	%ebx,4(%edi)
-	movl	%ecx,8(%edi)
-	movl	%edx,12(%edi)
-	xorl	%ecx,%ecx
-	jmp	L04610shortcut
-.align	2,0x90
-L04710loop:
-	movl	(%edi),%eax
-	movl	12(%edi),%edx
-L04610shortcut:
-	movzbl	%dl,%esi
-	movzbl	-128(%ebp,%esi,1),%ebx
-	movzbl	%dh,%esi
-	shll	$24,%ebx
-	xorl	%ebx,%eax
-	movzbl	-128(%ebp,%esi,1),%ebx
-	shrl	$16,%edx
-	movzbl	%dl,%esi
-	xorl	%ebx,%eax
-	movzbl	-128(%ebp,%esi,1),%ebx
-	movzbl	%dh,%esi
-	shll	$8,%ebx
-	xorl	%ebx,%eax
-	movzbl	-128(%ebp,%esi,1),%ebx
-	shll	$16,%ebx
-	xorl	%ebx,%eax
-	xorl	896(%ebp,%ecx,4),%eax
-	movl	%eax,16(%edi)
-	xorl	4(%edi),%eax
-	movl	%eax,20(%edi)
-	xorl	8(%edi),%eax
-	movl	%eax,24(%edi)
-	xorl	12(%edi),%eax
-	movl	%eax,28(%edi)
-	incl	%ecx
-	addl	$16,%edi
-	cmpl	$10,%ecx
-	jl	L04710loop
-	movl	$10,80(%edi)
-	xorl	%eax,%eax
-	jmp	L045exit
-L04312rounds:
-	movl	(%esi),%eax
-	movl	4(%esi),%ebx
-	movl	8(%esi),%ecx
-	movl	12(%esi),%edx
-	movl	%eax,(%edi)
-	movl	%ebx,4(%edi)
-	movl	%ecx,8(%edi)
-	movl	%edx,12(%edi)
-	movl	16(%esi),%ecx
-	movl	20(%esi),%edx
-	movl	%ecx,16(%edi)
-	movl	%edx,20(%edi)
-	xorl	%ecx,%ecx
-	jmp	L04812shortcut
-.align	2,0x90
-L04912loop:
-	movl	(%edi),%eax
-	movl	20(%edi),%edx
-L04812shortcut:
-	movzbl	%dl,%esi
-	movzbl	-128(%ebp,%esi,1),%ebx
-	movzbl	%dh,%esi
-	shll	$24,%ebx
-	xorl	%ebx,%eax
-	movzbl	-128(%ebp,%esi,1),%ebx
-	shrl	$16,%edx
-	movzbl	%dl,%esi
-	xorl	%ebx,%eax
-	movzbl	-128(%ebp,%esi,1),%ebx
-	movzbl	%dh,%esi
-	shll	$8,%ebx
-	xorl	%ebx,%eax
-	movzbl	-128(%ebp,%esi,1),%ebx
-	shll	$16,%ebx
-	xorl	%ebx,%eax
-	xorl	896(%ebp,%ecx,4),%eax
-	movl	%eax,24(%edi)
-	xorl	4(%edi),%eax
-	movl	%eax,28(%edi)
-	xorl	8(%edi),%eax
-	movl	%eax,32(%edi)
-	xorl	12(%edi),%eax
-	movl	%eax,36(%edi)
-	cmpl	$7,%ecx
-	je	L05012break
-	incl	%ecx
-	xorl	16(%edi),%eax
-	movl	%eax,40(%edi)
-	xorl	20(%edi),%eax
-	movl	%eax,44(%edi)
-	addl	$24,%edi
-	jmp	L04912loop
-L05012break:
-	movl	$12,72(%edi)
-	xorl	%eax,%eax
-	jmp	L045exit
-L04414rounds:
-	movl	(%esi),%eax
-	movl	4(%esi),%ebx
-	movl	8(%esi),%ecx
-	movl	12(%esi),%edx
-	movl	%eax,(%edi)
-	movl	%ebx,4(%edi)
-	movl	%ecx,8(%edi)
-	movl	%edx,12(%edi)
-	movl	16(%esi),%eax
-	movl	20(%esi),%ebx
-	movl	24(%esi),%ecx
-	movl	28(%esi),%edx
-	movl	%eax,16(%edi)
-	movl	%ebx,20(%edi)
-	movl	%ecx,24(%edi)
-	movl	%edx,28(%edi)
-	xorl	%ecx,%ecx
-	jmp	L05114shortcut
-.align	2,0x90
-L05214loop:
-	movl	28(%edi),%edx
-L05114shortcut:
-	movl	(%edi),%eax
-	movzbl	%dl,%esi
-	movzbl	-128(%ebp,%esi,1),%ebx
-	movzbl	%dh,%esi
-	shll	$24,%ebx
-	xorl	%ebx,%eax
-	movzbl	-128(%ebp,%esi,1),%ebx
-	shrl	$16,%edx
-	movzbl	%dl,%esi
-	xorl	%ebx,%eax
-	movzbl	-128(%ebp,%esi,1),%ebx
-	movzbl	%dh,%esi
-	shll	$8,%ebx
-	xorl	%ebx,%eax
-	movzbl	-128(%ebp,%esi,1),%ebx
-	shll	$16,%ebx
-	xorl	%ebx,%eax
-	xorl	896(%ebp,%ecx,4),%eax
-	movl	%eax,32(%edi)
-	xorl	4(%edi),%eax
-	movl	%eax,36(%edi)
-	xorl	8(%edi),%eax
-	movl	%eax,40(%edi)
-	xorl	12(%edi),%eax
-	movl	%eax,44(%edi)
-	cmpl	$6,%ecx
-	je	L05314break
-	incl	%ecx
-	movl	%eax,%edx
-	movl	16(%edi),%eax
-	movzbl	%dl,%esi
-	movzbl	-128(%ebp,%esi,1),%ebx
-	movzbl	%dh,%esi
-	xorl	%ebx,%eax
-	movzbl	-128(%ebp,%esi,1),%ebx
-	shrl	$16,%edx
-	shll	$8,%ebx
-	movzbl	%dl,%esi
-	xorl	%ebx,%eax
-	movzbl	-128(%ebp,%esi,1),%ebx
-	movzbl	%dh,%esi
-	shll	$16,%ebx
-	xorl	%ebx,%eax
-	movzbl	-128(%ebp,%esi,1),%ebx
-	shll	$24,%ebx
-	xorl	%ebx,%eax
-	movl	%eax,48(%edi)
-	xorl	20(%edi),%eax
-	movl	%eax,52(%edi)
-	xorl	24(%edi),%eax
-	movl	%eax,56(%edi)
-	xorl	28(%edi),%eax
-	movl	%eax,60(%edi)
-	addl	$32,%edi
-	jmp	L05214loop
-L05314break:
-	movl	$14,48(%edi)
-	xorl	%eax,%eax
-	jmp	L045exit
-L040badpointer:
-	movl	$-1,%eax
-L045exit:
-	popl	%edi
-	popl	%esi
-	popl	%ebx
-	popl	%ebp
-	ret
-.globl	_AES_set_encrypt_key
-.type	_AES_set_encrypt_key,@function
-.align	4
-_AES_set_encrypt_key:
-L_AES_set_encrypt_key_begin:
-	call	__x86_AES_set_encrypt_key
-	ret
-.globl	_AES_set_decrypt_key
-.type	_AES_set_decrypt_key,@function
-.align	4
-_AES_set_decrypt_key:
-L_AES_set_decrypt_key_begin:
-	call	__x86_AES_set_encrypt_key
-	cmpl	$0,%eax
-	je	L054proceed
-	ret
-L054proceed:
-	pushl	%ebp
-	pushl	%ebx
-	pushl	%esi
-	pushl	%edi
-	movl	28(%esp),%esi
-	movl	240(%esi),%ecx
-	leal	(,%ecx,4),%ecx
-	leal	(%esi,%ecx,4),%edi
-.align	2,0x90
-L055invert:
-	movl	(%esi),%eax
-	movl	4(%esi),%ebx
-	movl	(%edi),%ecx
-	movl	4(%edi),%edx
-	movl	%eax,(%edi)
-	movl	%ebx,4(%edi)
-	movl	%ecx,(%esi)
-	movl	%edx,4(%esi)
-	movl	8(%esi),%eax
-	movl	12(%esi),%ebx
-	movl	8(%edi),%ecx
-	movl	12(%edi),%edx
-	movl	%eax,8(%edi)
-	movl	%ebx,12(%edi)
-	movl	%ecx,8(%esi)
-	movl	%edx,12(%esi)
-	addl	$16,%esi
-	subl	$16,%edi
-	cmpl	%edi,%esi
-	jne	L055invert
-	movl	28(%esp),%edi
-	movl	240(%edi),%esi
-	leal	-2(%esi,%esi,1),%esi
-	leal	(%edi,%esi,8),%esi
-	movl	%esi,28(%esp)
-	movl	16(%edi),%eax
-.align	2,0x90
-L056permute:
-	addl	$16,%edi
-	movl	$2155905152,%ebp
-	andl	%eax,%ebp
-	leal	(%eax,%eax,1),%ebx
-	movl	%ebp,%esi
-	shrl	$7,%ebp
-	subl	%ebp,%esi
-	andl	$4278124286,%ebx
-	andl	$454761243,%esi
-	xorl	%esi,%ebx
-	movl	$2155905152,%ebp
-	andl	%ebx,%ebp
-	leal	(%ebx,%ebx,1),%ecx
-	movl	%ebp,%esi
-	shrl	$7,%ebp
-	subl	%ebp,%esi
-	andl	$4278124286,%ecx
-	andl	$454761243,%esi
-	xorl	%eax,%ebx
-	xorl	%esi,%ecx
-	movl	$2155905152,%ebp
-	andl	%ecx,%ebp
-	leal	(%ecx,%ecx,1),%edx
-	movl	%ebp,%esi
-	shrl	$7,%ebp
-	xorl	%eax,%ecx
-	subl	%ebp,%esi
-	andl	$4278124286,%edx
-	andl	$454761243,%esi
-	roll	$8,%eax
-	xorl	%esi,%edx
-	movl	4(%edi),%ebp
-	xorl	%ebx,%eax
-	xorl	%edx,%ebx
-	xorl	%ecx,%eax
-	roll	$24,%ebx
-	xorl	%edx,%ecx
-	xorl	%edx,%eax
-	roll	$16,%ecx
-	xorl	%ebx,%eax
-	roll	$8,%edx
-	xorl	%ecx,%eax
-	movl	%ebp,%ebx
-	xorl	%edx,%eax
-	movl	%eax,(%edi)
-	movl	$2155905152,%ebp
-	andl	%ebx,%ebp
-	leal	(%ebx,%ebx,1),%ecx
-	movl	%ebp,%esi
-	shrl	$7,%ebp
-	subl	%ebp,%esi
-	andl	$4278124286,%ecx
-	andl	$454761243,%esi
-	xorl	%esi,%ecx
-	movl	$2155905152,%ebp
-	andl	%ecx,%ebp
-	leal	(%ecx,%ecx,1),%edx
-	movl	%ebp,%esi
-	shrl	$7,%ebp
-	subl	%ebp,%esi
-	andl	$4278124286,%edx
-	andl	$454761243,%esi
-	xorl	%ebx,%ecx
-	xorl	%esi,%edx
-	movl	$2155905152,%ebp
-	andl	%edx,%ebp
-	leal	(%edx,%edx,1),%eax
-	movl	%ebp,%esi
-	shrl	$7,%ebp
-	xorl	%ebx,%edx
-	subl	%ebp,%esi
-	andl	$4278124286,%eax
-	andl	$454761243,%esi
-	roll	$8,%ebx
-	xorl	%esi,%eax
-	movl	8(%edi),%ebp
-	xorl	%ecx,%ebx
-	xorl	%eax,%ecx
-	xorl	%edx,%ebx
-	roll	$24,%ecx
-	xorl	%eax,%edx
-	xorl	%eax,%ebx
-	roll	$16,%edx
-	xorl	%ecx,%ebx
-	roll	$8,%eax
-	xorl	%edx,%ebx
-	movl	%ebp,%ecx
-	xorl	%eax,%ebx
-	movl	%ebx,4(%edi)
-	movl	$2155905152,%ebp
-	andl	%ecx,%ebp
-	leal	(%ecx,%ecx,1),%edx
-	movl	%ebp,%esi
-	shrl	$7,%ebp
-	subl	%ebp,%esi
-	andl	$4278124286,%edx
-	andl	$454761243,%esi
-	xorl	%esi,%edx
-	movl	$2155905152,%ebp
-	andl	%edx,%ebp
-	leal	(%edx,%edx,1),%eax
-	movl	%ebp,%esi
-	shrl	$7,%ebp
-	subl	%ebp,%esi
-	andl	$4278124286,%eax
-	andl	$454761243,%esi
-	xorl	%ecx,%edx
-	xorl	%esi,%eax
-	movl	$2155905152,%ebp
-	andl	%eax,%ebp
-	leal	(%eax,%eax,1),%ebx
-	movl	%ebp,%esi
-	shrl	$7,%ebp
-	xorl	%ecx,%eax
-	subl	%ebp,%esi
-	andl	$4278124286,%ebx
-	andl	$454761243,%esi
-	roll	$8,%ecx
-	xorl	%esi,%ebx
-	movl	12(%edi),%ebp
-	xorl	%edx,%ecx
-	xorl	%ebx,%edx
-	xorl	%eax,%ecx
-	roll	$24,%edx
-	xorl	%ebx,%eax
-	xorl	%ebx,%ecx
-	roll	$16,%eax
-	xorl	%edx,%ecx
-	roll	$8,%ebx
-	xorl	%eax,%ecx
-	movl	%ebp,%edx
-	xorl	%ebx,%ecx
-	movl	%ecx,8(%edi)
-	movl	$2155905152,%ebp
-	andl	%edx,%ebp
-	leal	(%edx,%edx,1),%eax
-	movl	%ebp,%esi
-	shrl	$7,%ebp
-	subl	%ebp,%esi
-	andl	$4278124286,%eax
-	andl	$454761243,%esi
-	xorl	%esi,%eax
-	movl	$2155905152,%ebp
-	andl	%eax,%ebp
-	leal	(%eax,%eax,1),%ebx
-	movl	%ebp,%esi
-	shrl	$7,%ebp
-	subl	%ebp,%esi
-	andl	$4278124286,%ebx
-	andl	$454761243,%esi
-	xorl	%edx,%eax
-	xorl	%esi,%ebx
-	movl	$2155905152,%ebp
-	andl	%ebx,%ebp
-	leal	(%ebx,%ebx,1),%ecx
-	movl	%ebp,%esi
-	shrl	$7,%ebp
-	xorl	%edx,%ebx
-	subl	%ebp,%esi
-	andl	$4278124286,%ecx
-	andl	$454761243,%esi
-	roll	$8,%edx
-	xorl	%esi,%ecx
-	movl	16(%edi),%ebp
-	xorl	%eax,%edx
-	xorl	%ecx,%eax
-	xorl	%ebx,%edx
-	roll	$24,%eax
-	xorl	%ecx,%ebx
-	xorl	%ecx,%edx
-	roll	$16,%ebx
-	xorl	%eax,%edx
-	roll	$8,%ecx
-	xorl	%ebx,%edx
-	movl	%ebp,%eax
-	xorl	%ecx,%edx
-	movl	%edx,12(%edi)
-	cmpl	28(%esp),%edi
-	jb	L056permute
-	xorl	%eax,%eax
-	popl	%edi
-	popl	%esi
-	popl	%ebx
-	popl	%ebp
-	ret
-.byte	65,69,83,32,102,111,114,32,120,56,54,44,32,67,82,89
-.byte	80,84,79,71,65,77,83,32,98,121,32,60,97,112,112,114
-.byte	111,64,111,112,101,110,115,115,108,46,111,114,103,62,0
-.comm	_OPENSSL_ia32cap_P,16
diff --git a/deps/openssl/config/archs/BSD-x86/asm_avx2/crypto/buildinf.h b/deps/openssl/config/archs/BSD-x86/asm_avx2/crypto/buildinf.h
index e3bc6a9e02..96c786974c 100644
--- a/deps/openssl/config/archs/BSD-x86/asm_avx2/crypto/buildinf.h
+++ b/deps/openssl/config/archs/BSD-x86/asm_avx2/crypto/buildinf.h
@@ -11,7 +11,7 @@
  */
 
 #define PLATFORM "platform: BSD-x86"
-#define DATE "built on: Fri Sep 13 15:57:23 2019 UTC"
+#define DATE "built on: Wed Mar 18 21:04:52 2020 UTC"
 
 /*
  * Generate compiler_flags as an array of individual characters. This is a
@@ -38,11 +38,12 @@ static const char compiler_flags[] = {
     ' ','-','D','S','H','A','5','1','2','_','A','S','M',' ','-','D',
     'R','C','4','_','A','S','M',' ','-','D','M','D','5','_','A','S',
     'M',' ','-','D','R','M','D','1','6','0','_','A','S','M',' ','-',
-    'D','V','P','A','E','S','_','A','S','M',' ','-','D','W','H','I',
-    'R','L','P','O','O','L','_','A','S','M',' ','-','D','G','H','A',
-    'S','H','_','A','S','M',' ','-','D','E','C','P','_','N','I','S',
-    'T','Z','2','5','6','_','A','S','M',' ','-','D','P','O','L','Y',
-    '1','3','0','5','_','A','S','M',' ','-','D','_','T','H','R','E',
-    'A','D','_','S','A','F','E',' ','-','D','_','R','E','E','N','T',
-    'R','A','N','T',' ','-','D','N','D','E','B','U','G','\0'
+    'D','A','E','S','N','I','_','A','S','M',' ','-','D','V','P','A',
+    'E','S','_','A','S','M',' ','-','D','W','H','I','R','L','P','O',
+    'O','L','_','A','S','M',' ','-','D','G','H','A','S','H','_','A',
+    'S','M',' ','-','D','E','C','P','_','N','I','S','T','Z','2','5',
+    '6','_','A','S','M',' ','-','D','P','O','L','Y','1','3','0','5',
+    '_','A','S','M',' ','-','D','_','T','H','R','E','A','D','_','S',
+    'A','F','E',' ','-','D','_','R','E','E','N','T','R','A','N','T',
+    ' ','-','D','N','D','E','B','U','G','\0'
 };
diff --git a/deps/openssl/config/archs/BSD-x86/asm_avx2/crypto/ec/ecp_nistz256-x86.s b/deps/openssl/config/archs/BSD-x86/asm_avx2/crypto/ec/ecp_nistz256-x86.s
index 569a636888..5299520882 100644
--- a/deps/openssl/config/archs/BSD-x86/asm_avx2/crypto/ec/ecp_nistz256-x86.s
+++ b/deps/openssl/config/archs/BSD-x86/asm_avx2/crypto/ec/ecp_nistz256-x86.s
@@ -4405,19 +4405,15 @@ L009pic:
 	orl	4(%edi),%eax
 	orl	8(%edi),%eax
 	orl	12(%edi),%eax
+	movl	576(%esp),%ebx
+	notl	%ebx
+	orl	%ebx,%eax
+	movl	580(%esp),%ebx
+	notl	%ebx
+	orl	%ebx,%eax
+	orl	584(%esp),%eax
 .byte	62
 	jnz	L010add_proceed
-	movl	576(%esp),%eax
-	andl	580(%esp),%eax
-	movl	584(%esp),%ebx
-	jz	L010add_proceed
-	testl	%ebx,%ebx
-	jz	L011add_double
-	movl	616(%esp),%edi
-	xorl	%eax,%eax
-	movl	$24,%ecx
-.byte	252,243,171
-	jmp	L012add_done
 .align	4,0x90
 L011add_double:
 	movl	620(%esp),%esi
diff --git a/deps/openssl/config/archs/BSD-x86/asm_avx2/crypto/include/internal/bn_conf.h b/deps/openssl/config/archs/BSD-x86/asm_avx2/crypto/include/internal/bn_conf.h
index fb52156bd0..459055c96f 100644
--- a/deps/openssl/config/archs/BSD-x86/asm_avx2/crypto/include/internal/bn_conf.h
+++ b/deps/openssl/config/archs/BSD-x86/asm_avx2/crypto/include/internal/bn_conf.h
@@ -1,5 +1,5 @@
 /* WARNING: do not edit! */
-/* Generated by Makefile from crypto/include/internal/bn_conf.h.in */
+/* Generated by Makefile from include/crypto/bn_conf.h.in */
 /*
  * Copyright 2016 The OpenSSL Project Authors. All Rights Reserved.
  *
@@ -9,8 +9,8 @@
  * https://www.openssl.org/source/license.html
  */
 
-#ifndef HEADER_BN_CONF_H
-# define HEADER_BN_CONF_H
+#ifndef OSSL_CRYPTO_BN_CONF_H
+# define OSSL_CRYPTO_BN_CONF_H
 
 /*
  * The contents of this file are not used in the UEFI build, as
diff --git a/deps/openssl/config/archs/BSD-x86/asm_avx2/crypto/include/internal/dso_conf.h b/deps/openssl/config/archs/BSD-x86/asm_avx2/crypto/include/internal/dso_conf.h
index 252266ec2a..4b1167c3d8 100644
--- a/deps/openssl/config/archs/BSD-x86/asm_avx2/crypto/include/internal/dso_conf.h
+++ b/deps/openssl/config/archs/BSD-x86/asm_avx2/crypto/include/internal/dso_conf.h
@@ -1,5 +1,5 @@
 /* WARNING: do not edit! */
-/* Generated by Makefile from crypto/include/internal/dso_conf.h.in */
+/* Generated by Makefile from include/crypto/dso_conf.h.in */
 /*
  * Copyright 2016-2019 The OpenSSL Project Authors. All Rights Reserved.
  *
@@ -9,8 +9,8 @@
  * https://www.openssl.org/source/license.html
  */
 
-#ifndef HEADER_DSO_CONF_H
-# define HEADER_DSO_CONF_H
+#ifndef OSSL_CRYPTO_DSO_CONF_H
+# define OSSL_CRYPTO_DSO_CONF_H
 # define DSO_DLFCN
 # define HAVE_DLFCN_H
 # define DSO_EXTENSION ".so"
diff --git a/deps/openssl/config/archs/BSD-x86/asm_avx2/include/openssl/opensslconf.h b/deps/openssl/config/archs/BSD-x86/asm_avx2/include/openssl/opensslconf.h
index dbeaee16f1..febd51aca0 100644
--- a/deps/openssl/config/archs/BSD-x86/asm_avx2/include/openssl/opensslconf.h
+++ b/deps/openssl/config/archs/BSD-x86/asm_avx2/include/openssl/opensslconf.h
@@ -93,9 +93,6 @@ extern "C" {
 #ifndef OPENSSL_NO_DYNAMIC_ENGINE
 # define OPENSSL_NO_DYNAMIC_ENGINE
 #endif
-#ifndef OPENSSL_NO_AFALGENG
-# define OPENSSL_NO_AFALGENG
-#endif
 
 
 /*
diff --git a/deps/openssl/config/archs/BSD-x86/asm_avx2/include/progs.h b/deps/openssl/config/archs/BSD-x86/asm_avx2/include/progs.h
index 9b3d270e20..308c65601b 100644
--- a/deps/openssl/config/archs/BSD-x86/asm_avx2/include/progs.h
+++ b/deps/openssl/config/archs/BSD-x86/asm_avx2/include/progs.h
@@ -2,7 +2,7 @@
  * WARNING: do not edit!
  * Generated by apps/progs.pl
  *
- * Copyright 1995-2019 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 1995-2020 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
diff --git a/deps/openssl/config/archs/BSD-x86/asm_avx2/openssl-cl.gypi b/deps/openssl/config/archs/BSD-x86/asm_avx2/openssl-cl.gypi
index 96efa1c4bb..55742c5a7d 100644
--- a/deps/openssl/config/archs/BSD-x86/asm_avx2/openssl-cl.gypi
+++ b/deps/openssl/config/archs/BSD-x86/asm_avx2/openssl-cl.gypi
@@ -15,6 +15,7 @@
       'RC4_ASM',
       'MD5_ASM',
       'RMD160_ASM',
+      'AESNI_ASM',
       'VPAES_ASM',
       'WHIRLPOOL_ASM',
       'GHASH_ASM',
diff --git a/deps/openssl/config/archs/BSD-x86/asm_avx2/openssl.gypi b/deps/openssl/config/archs/BSD-x86/asm_avx2/openssl.gypi
index 0645934ea7..86277a3f35 100644
--- a/deps/openssl/config/archs/BSD-x86/asm_avx2/openssl.gypi
+++ b/deps/openssl/config/archs/BSD-x86/asm_avx2/openssl.gypi
@@ -713,6 +713,7 @@
       'RC4_ASM',
       'MD5_ASM',
       'RMD160_ASM',
+      'AESNI_ASM',
       'VPAES_ASM',
       'WHIRLPOOL_ASM',
       'GHASH_ASM',
diff --git a/deps/openssl/config/archs/BSD-x86/no-asm/configdata.pm b/deps/openssl/config/archs/BSD-x86/no-asm/configdata.pm
index c406c0cc98..c8fd824b7f 100644
--- a/deps/openssl/config/archs/BSD-x86/no-asm/configdata.pm
+++ b/deps/openssl/config/archs/BSD-x86/no-asm/configdata.pm
@@ -54,7 +54,7 @@ our %config = (
   minor => "1.1",
   openssl_algorithm_defines => [ "OPENSSL_NO_COMP", "OPENSSL_NO_MD2", "OPENSSL_NO_RC5" ],
   openssl_api_defines => [  ],
-  openssl_other_defines => [ "OPENSSL_RAND_SEED_OS", "OPENSSL_NO_AFALGENG", "OPENSSL_NO_ASAN", "OPENSSL_NO_ASM", "OPENSSL_NO_CRYPTO_MDEBUG", "OPENSSL_NO_CRYPTO_MDEBUG_BACKTRACE", "OPENSSL_NO_EC_NISTP_64_GCC_128", "OPENSSL_NO_EGD", "OPENSSL_NO_EXTERNAL_TESTS", "OPENSSL_NO_FUZZ_AFL", "OPENSSL_NO_FUZZ_LIBFUZZER", "OPENSSL_NO_HEARTBEATS", "OPENSSL_NO_MSAN", "OPENSSL_NO_SCTP", "OPENSSL_NO_SSL3", "OPENSSL_NO_SSL3_METHOD", "OPENSSL_NO_UBSAN", "OPENSSL_NO_UNIT_TEST", "OPENSSL_NO_WEAK_SSL_CIPHERS", "OPENSSL_NO_DYNAMIC_ENGINE", "OPENSSL_NO_AFALGENG" ],
+  openssl_other_defines => [ "OPENSSL_RAND_SEED_OS", "OPENSSL_NO_AFALGENG", "OPENSSL_NO_ASAN", "OPENSSL_NO_ASM", "OPENSSL_NO_CRYPTO_MDEBUG", "OPENSSL_NO_CRYPTO_MDEBUG_BACKTRACE", "OPENSSL_NO_EC_NISTP_64_GCC_128", "OPENSSL_NO_EGD", "OPENSSL_NO_EXTERNAL_TESTS", "OPENSSL_NO_FUZZ_AFL", "OPENSSL_NO_FUZZ_LIBFUZZER", "OPENSSL_NO_HEARTBEATS", "OPENSSL_NO_MSAN", "OPENSSL_NO_SCTP", "OPENSSL_NO_SSL3", "OPENSSL_NO_SSL3_METHOD", "OPENSSL_NO_UBSAN", "OPENSSL_NO_UNIT_TEST", "OPENSSL_NO_WEAK_SSL_CIPHERS", "OPENSSL_NO_DYNAMIC_ENGINE" ],
   openssl_sys_defines => [  ],
   openssl_thread_defines => [ "OPENSSL_THREADS" ],
   openssldir => "",
@@ -110,8 +110,8 @@ our %config = (
   sourcedir => ".",
   target => "BSD-x86",
   tdirs => [ "ossl_shim" ],
-  version => "1.1.1d",
-  version_num => "0x1010104fL",
+  version => "1.1.1e",
+  version_num => "0x1010105fL",
 );
 
 our %target = (
@@ -232,6 +232,7 @@ our @disablables = (
   "dgram",
   "dh",
   "dsa",
+  "dso",
   "dtls",
   "dynamic-engine",
   "ec",
@@ -349,8 +350,8 @@ our %unified_info = (
         {
             "" =>
                 [
-                    "crypto/include/internal/bn_conf.h",
-                    "crypto/include/internal/dso_conf.h",
+                    "include/crypto/bn_conf.h",
+                    "include/crypto/dso_conf.h",
                     "include/openssl/opensslconf.h",
                 ],
             "apps/asn1pars.o" =>
@@ -618,14 +619,6 @@ our %unified_info = (
                     "crypto/perlasm/cbc.pl",
                     "crypto/perlasm/x86asm.pl",
                 ],
-            "crypto/include/internal/bn_conf.h" =>
-                [
-                    "configdata.pm",
-                ],
-            "crypto/include/internal/dso_conf.h" =>
-                [
-                    "configdata.pm",
-                ],
             "crypto/rc4/rc4-586.s" =>
                 [
                     "crypto/perlasm/x86asm.pl",
@@ -701,6 +694,14 @@ our %unified_info = (
                 [
                     "libcrypto",
                 ],
+            "include/crypto/bn_conf.h" =>
+                [
+                    "configdata.pm",
+                ],
+            "include/crypto/dso_conf.h" =>
+                [
+                    "configdata.pm",
+                ],
             "include/openssl/opensslconf.h" =>
                 [
                     "configdata.pm",
@@ -1490,6 +1491,12 @@ our %unified_info = (
                     "libcrypto",
                     "test/libtestutil.a",
                 ],
+            "test/ssl_ctx_test" =>
+                [
+                    "libcrypto",
+                    "libssl",
+                    "test/libtestutil.a",
+                ],
             "test/ssl_test" =>
                 [
                     "libcrypto",
@@ -3209,7 +3216,6 @@ our %unified_info = (
                             "test/testutil/cb.o",
                             "test/testutil/driver.o",
                             "test/testutil/format_output.o",
-                            "test/testutil/init.o",
                             "test/testutil/main.o",
                             "test/testutil/output_helpers.o",
                             "test/testutil/random.o",
@@ -3217,6 +3223,7 @@ our %unified_info = (
                             "test/testutil/tap_bio.o",
                             "test/testutil/test_cleanup.o",
                             "test/testutil/tests.o",
+                            "test/testutil/testutil_init.o",
                         ],
                     "products" =>
                         {
@@ -3715,14 +3722,6 @@ our %unified_info = (
                 [
                     "crypto/ia64cpuid.S",
                 ],
-            "crypto/include/internal/bn_conf.h" =>
-                [
-                    "crypto/include/internal/bn_conf.h.in",
-                ],
-            "crypto/include/internal/dso_conf.h" =>
-                [
-                    "crypto/include/internal/dso_conf.h.in",
-                ],
             "crypto/md5/md5-586.s" =>
                 [
                     "crypto/md5/asm/md5-586.pl",
@@ -4163,6 +4162,14 @@ our %unified_info = (
                     "engines/asm/e_padlock-x86_64.pl",
                     "\$(PERLASM_SCHEME)",
                 ],
+            "include/crypto/bn_conf.h" =>
+                [
+                    "include/crypto/bn_conf.h.in",
+                ],
+            "include/crypto/dso_conf.h" =>
+                [
+                    "include/crypto/dso_conf.h.in",
+                ],
             "include/openssl/opensslconf.h" =>
                 [
                     "include/openssl/opensslconf.h.in",
@@ -4845,49 +4852,41 @@ our %unified_info = (
             "crypto/aes/aes_cbc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/aes/aes_cfb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/aes/aes_core.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/aes/aes_ecb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/aes/aes_ige.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/aes/aes_misc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/aes/aes_ofb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/aes/aes_wrap.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/aes/aesfx-sparcv9.o" =>
@@ -4909,7 +4908,6 @@ our %unified_info = (
             "crypto/aria/aria.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/arm64cpuid.o" =>
@@ -4923,613 +4921,511 @@ our %unified_info = (
             "crypto/asn1/a_bitstr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_d2i_fp.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_digest.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_dup.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_gentm.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_i2d_fp.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_int.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_mbstr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_object.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_octet.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_print.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_sign.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_strex.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_strnid.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_time.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_type.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_utctm.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_utf8.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_verify.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/ameth_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/asn1_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/asn1_gen.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/asn1_item_list.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/asn1_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/asn1_par.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/asn_mime.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/asn_moid.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/asn_mstbl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/asn_pack.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/bio_asn1.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/bio_ndef.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/d2i_pr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/d2i_pu.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/evp_asn1.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/f_int.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/f_string.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/i2d_pr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/i2d_pu.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/n_pkey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/nsseq.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/p5_pbe.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/p5_pbev2.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/p5_scrypt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/p8_pkey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/t_bitst.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/t_pkey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/t_spki.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/tasn_dec.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/tasn_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/tasn_fre.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/tasn_new.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/tasn_prn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/tasn_scn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/tasn_typ.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/tasn_utl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/x_algor.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/x_bignum.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/x_info.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/x_int64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/x_long.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/x_pkey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/x_sig.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/x_spki.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/x_val.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/async/arch/async_null.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/async/arch/async_posix.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/async/arch/async_win.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/async/async.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/async/async_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/async/async_wait.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bf/bf_cfb64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bf/bf_ecb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bf/bf_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bf/bf_ofb64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bf/bf_skey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/b_addr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/b_dump.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/b_print.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/b_sock.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/b_sock2.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bf_buff.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bf_lbuf.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bf_nbio.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bf_null.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bio_cb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bio_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bio_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bio_meth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bss_acpt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bss_bio.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bss_conn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bss_dgram.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bss_fd.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bss_file.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bss_log.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bss_mem.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bss_null.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bss_sock.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/blake2/blake2b.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/blake2/blake2s.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/blake2/m_blake2b.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/blake2/m_blake2s.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/armv4-gf2m.o" =>
@@ -5547,188 +5443,157 @@ our %unified_info = (
             "crypto/bn/bn_add.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_asm.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_blind.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_const.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_ctx.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_depr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_dh.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_div.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_exp.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto",
                 ],
             "crypto/bn/bn_exp2.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_gcd.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_gf2m.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_intern.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_kron.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_mod.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_mont.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_mpi.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_mul.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_nist.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_prime.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_print.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_rand.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_recp.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_shift.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_sqr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_sqrt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_srp.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_word.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_x931p.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/mips-mont.o" =>
@@ -5758,13 +5623,11 @@ our %unified_info = (
             "crypto/buffer/buf_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/buffer/buffer.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/buildinf.h" =>
@@ -5774,43 +5637,36 @@ our %unified_info = (
             "crypto/camellia/camellia.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/camellia/cmll_cbc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/camellia/cmll_cfb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/camellia/cmll_ctr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/camellia/cmll_ecb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/camellia/cmll_misc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/camellia/cmll_ofb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/camellia/cmllt4-sparcv9.o" =>
@@ -5820,31 +5676,26 @@ our %unified_info = (
             "crypto/cast/c_cfb64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cast/c_ecb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cast/c_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cast/c_ofb64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cast/c_skey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/chacha/chacha-armv4.o" =>
@@ -5862,278 +5713,232 @@ our %unified_info = (
             "crypto/chacha/chacha_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cmac/cm_ameth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cmac/cm_pmeth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cmac/cmac.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_asn1.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_att.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_cd.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_dd.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_env.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_ess.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_io.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_kari.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_pwri.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_sd.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_smime.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/conf/conf_api.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/conf/conf_def.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/conf/conf_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/conf/conf_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/conf/conf_mall.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/conf/conf_mod.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/conf/conf_sap.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/conf/conf_ssl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cpt_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cryptlib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ct/ct_b64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ct/ct_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ct/ct_log.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ct/ct_oct.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ct/ct_policy.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ct/ct_prn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ct/ct_sct.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ct/ct_sct_ctx.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ct/ct_vfy.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ct/ct_x509v3.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ctype.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cversion.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto",
                 ],
             "crypto/des/cbc_cksm.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/cbc_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/cfb64ede.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/cfb64enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/cfb_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/des_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/dest4-sparcv9.o" =>
@@ -6143,301 +5948,251 @@ our %unified_info = (
             "crypto/des/ecb3_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/ecb_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/fcrypt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/fcrypt_b.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/ofb64ede.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/ofb64enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/ofb_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/pcbc_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/qud_cksm.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/rand_key.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/set_key.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/str2key.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/xcbc_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_ameth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_asn1.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_check.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_depr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_gen.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_kdf.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_key.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_meth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_pmeth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_prn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_rfc5114.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_rfc7919.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dsa/dsa_ameth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dsa/dsa_asn1.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dsa/dsa_depr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dsa/dsa_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dsa/dsa_gen.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dsa/dsa_key.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dsa/dsa_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dsa/dsa_meth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dsa/dsa_ossl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dsa/dsa_pmeth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dsa/dsa_prn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dsa/dsa_sign.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dsa/dsa_vrf.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dso/dso_dl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dso/dso_dlfcn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dso/dso_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dso/dso_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dso/dso_openssl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dso/dso_vms.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dso/dso_win32.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ebcdic.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/curve25519.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/curve448/arch_32/f_impl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto/ec/curve448/arch_32",
                     "crypto/ec/curve448",
@@ -6445,7 +6200,6 @@ our %unified_info = (
             "crypto/ec/curve448/curve448.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto/ec/curve448/arch_32",
                     "crypto/ec/curve448",
@@ -6453,7 +6207,6 @@ our %unified_info = (
             "crypto/ec/curve448/curve448_tables.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto/ec/curve448/arch_32",
                     "crypto/ec/curve448",
@@ -6461,7 +6214,6 @@ our %unified_info = (
             "crypto/ec/curve448/eddsa.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto/ec/curve448/arch_32",
                     "crypto/ec/curve448",
@@ -6469,7 +6221,6 @@ our %unified_info = (
             "crypto/ec/curve448/f_generic.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto/ec/curve448/arch_32",
                     "crypto/ec/curve448",
@@ -6477,7 +6228,6 @@ our %unified_info = (
             "crypto/ec/curve448/scalar.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto/ec/curve448/arch_32",
                     "crypto/ec/curve448",
@@ -6485,163 +6235,136 @@ our %unified_info = (
             "crypto/ec/ec2_oct.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec2_smpl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec_ameth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec_asn1.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec_check.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec_curve.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec_cvt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec_key.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec_kmeth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec_mult.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec_oct.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec_pmeth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec_print.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecdh_kdf.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecdh_ossl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecdsa_ossl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecdsa_sign.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecdsa_vrf.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/eck_prn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecp_mont.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecp_nist.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecp_nistp224.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecp_nistp256.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecp_nistp521.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecp_nistputil.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecp_nistz256-armv4.o" =>
@@ -6659,229 +6382,191 @@ our %unified_info = (
             "crypto/ec/ecp_oct.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecp_smpl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecx_meth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/eng_all.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/eng_cnf.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/eng_ctrl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/eng_devcrypto.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/eng_dyn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/eng_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/eng_fat.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/eng_init.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/eng_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/eng_list.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/eng_openssl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/eng_pkey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/eng_rdrand.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/eng_table.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/tb_asnmth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/tb_cipher.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/tb_dh.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/tb_digest.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/tb_dsa.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/tb_eckey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/tb_pkmeth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/tb_rand.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/tb_rsa.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/err/err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/err/err_all.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/err/err_prn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/bio_b64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/bio_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/bio_md.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/bio_ok.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/c_allc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/c_alld.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/cmeth_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/digest.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/e_aes.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto",
                     "crypto/modes",
@@ -6889,21 +6574,18 @@ our %unified_info = (
             "crypto/evp/e_aes_cbc_hmac_sha1.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto/modes",
                 ],
             "crypto/evp/e_aes_cbc_hmac_sha256.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto/modes",
                 ],
             "crypto/evp/e_aria.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto",
                     "crypto/modes",
@@ -6911,13 +6593,11 @@ our %unified_info = (
             "crypto/evp/e_bf.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/e_camellia.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto",
                     "crypto/modes",
@@ -6925,81 +6605,68 @@ our %unified_info = (
             "crypto/evp/e_cast.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/e_chacha20_poly1305.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/e_des.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto",
                 ],
             "crypto/evp/e_des3.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto",
                 ],
             "crypto/evp/e_idea.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/e_null.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/e_old.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/e_rc2.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/e_rc4.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/e_rc4_hmac_md5.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/e_rc5.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/e_seed.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/e_sm4.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto",
                     "crypto/modes",
@@ -7007,328 +6674,267 @@ our %unified_info = (
             "crypto/evp/e_xcbc_d.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/encode.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/evp_cnf.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/evp_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/evp_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/evp_key.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/evp_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/evp_pbe.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/evp_pkey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/m_md2.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/m_md4.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/m_md5.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/m_md5_sha1.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/m_mdc2.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/m_null.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/m_ripemd.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/m_sha1.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/m_sha3.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto",
                 ],
             "crypto/evp/m_sigver.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/m_wp.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/names.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/p5_crpt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/p5_crpt2.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/p_dec.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/p_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/p_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/p_open.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/p_seal.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/p_sign.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/p_verify.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/pbe_scrypt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/pmeth_fn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/pmeth_gn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/pmeth_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ex_data.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/getenv.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/hmac/hm_ameth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/hmac/hm_pmeth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/hmac/hmac.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/idea/i_cbc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/idea/i_cfb64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/idea/i_ecb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/idea/i_ofb64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/idea/i_skey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
-            "crypto/include/internal/bn_conf.h" =>
-                [
-                    ".",
-                ],
-            "crypto/include/internal/dso_conf.h" =>
-                [
-                    ".",
-                ],
             "crypto/init.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/kdf/hkdf.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/kdf/kdf_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/kdf/scrypt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/kdf/tls1_prf.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/lhash/lh_stats.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/lhash/lhash.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/md4/md4_dgst.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/md4/md4_one.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/md5/md5-sparcv9.o" =>
@@ -7338,85 +6944,71 @@ our %unified_info = (
             "crypto/md5/md5_dgst.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/md5/md5_one.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/mdc2/mdc2_one.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/mdc2/mdc2dgst.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/mem.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/mem_clr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/mem_dbg.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/mem_sec.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/modes/cbc128.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/modes/ccm128.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/modes/cfb128.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/modes/ctr128.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/modes/cts128.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/modes/gcm128.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto",
                 ],
@@ -7439,361 +7031,301 @@ our %unified_info = (
             "crypto/modes/ocb128.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/modes/ofb128.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/modes/wrap128.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/modes/xts128.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/o_dir.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/o_fips.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/o_fopen.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/o_init.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/o_str.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/o_time.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/objects/o_names.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/objects/obj_dat.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/objects/obj_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/objects/obj_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/objects/obj_xref.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ocsp/ocsp_asn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ocsp/ocsp_cl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ocsp/ocsp_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ocsp/ocsp_ext.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ocsp/ocsp_ht.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ocsp/ocsp_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ocsp/ocsp_prn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ocsp/ocsp_srv.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ocsp/ocsp_vfy.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ocsp/v3_ocsp.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pem/pem_all.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pem/pem_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pem/pem_info.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pem/pem_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pem/pem_oth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pem/pem_pk8.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pem/pem_pkey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pem/pem_sign.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pem/pem_x509.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pem/pem_xaux.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pem/pvkfmt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_add.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_asn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_attr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_crpt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_crt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_decr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_init.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_key.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_kiss.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_mutl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_npas.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_p8d.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_p8e.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_sbag.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_utl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/pk12err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs7/bio_pk7.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs7/pk7_asn1.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs7/pk7_attr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs7/pk7_doit.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs7/pk7_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs7/pk7_mime.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs7/pk7_smime.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs7/pkcs7err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/poly1305/poly1305-armv4.o" =>
@@ -7815,259 +7347,216 @@ our %unified_info = (
             "crypto/poly1305/poly1305.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/poly1305/poly1305_ameth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/poly1305/poly1305_pmeth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rand/drbg_ctr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rand/drbg_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rand/rand_egd.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rand/rand_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rand/rand_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rand/rand_unix.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rand/rand_vms.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rand/rand_win.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rand/randfile.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rc2/rc2_cbc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rc2/rc2_ecb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rc2/rc2_skey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rc2/rc2cfb64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rc2/rc2ofb64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rc4/rc4_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rc4/rc4_skey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ripemd/rmd_dgst.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ripemd/rmd_one.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_ameth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_asn1.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_chk.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_crpt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_depr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_gen.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_meth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_mp.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_none.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_oaep.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_ossl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_pk1.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_pmeth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_prn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_pss.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_saos.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_sign.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_ssl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_x931.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_x931g.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/s390xcpuid.o" =>
@@ -8077,31 +7566,26 @@ our %unified_info = (
             "crypto/seed/seed.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/seed/seed_cbc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/seed/seed_cfb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/seed/seed_ecb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/seed/seed_ofb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sha/keccak1600-armv4.o" =>
@@ -8111,7 +7595,6 @@ our %unified_info = (
             "crypto/sha/keccak1600.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sha/sha1-armv4-large.o" =>
@@ -8137,13 +7620,11 @@ our %unified_info = (
             "crypto/sha/sha1_one.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sha/sha1dgst.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sha/sha256-armv4.o" =>
@@ -8169,7 +7650,6 @@ our %unified_info = (
             "crypto/sha/sha256.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sha/sha512-armv4.o" =>
@@ -8195,709 +7675,591 @@ our %unified_info = (
             "crypto/sha/sha512.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/siphash/siphash.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/siphash/siphash_ameth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/siphash/siphash_pmeth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sm2/sm2_crypt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sm2/sm2_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sm2/sm2_pmeth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sm2/sm2_sign.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sm3/m_sm3.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sm3/sm3.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sm4/sm4.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/srp/srp_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/srp/srp_vfy.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/stack/stack.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/store/loader_file.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/store/store_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/store/store_init.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/store/store_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/store/store_register.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/store/store_strings.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/threads_none.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/threads_pthread.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/threads_win.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ts/ts_asn1.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ts/ts_conf.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ts/ts_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ts/ts_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ts/ts_req_print.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ts/ts_req_utils.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ts/ts_rsp_print.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ts/ts_rsp_sign.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ts/ts_rsp_utils.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ts/ts_rsp_verify.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ts/ts_verify_ctx.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/txt_db/txt_db.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ui/ui_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ui/ui_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ui/ui_null.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ui/ui_openssl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ui/ui_util.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/uid.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/whrlpool/wp_block.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/whrlpool/wp_dgst.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/by_dir.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/by_file.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/t_crl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/t_req.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/t_x509.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_att.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_cmp.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_d2.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_def.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_ext.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_lu.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_meth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_obj.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_r2x.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_req.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_set.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_trs.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_txt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_v3.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_vfy.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_vpm.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509cset.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509name.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509rset.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509spki.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509type.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x_all.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x_attrib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x_crl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x_exten.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x_name.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x_pubkey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x_req.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x_x509.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x_x509a.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/pcy_cache.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/pcy_data.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/pcy_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/pcy_map.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/pcy_node.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/pcy_tree.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_addr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_admis.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_akey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_akeya.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_alt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_asid.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_bcons.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_bitst.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_conf.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_cpols.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_crld.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_enum.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_extku.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_genn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_ia5.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_info.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_int.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_ncons.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_pci.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_pcia.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_pcons.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_pku.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_pmaps.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_prn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_purp.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_skey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_sxnet.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_tlsf.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_utl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "engines/e_capi.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "engines/e_padlock.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "fuzz/asn1.o" =>
@@ -8948,6 +8310,14 @@ our %unified_info = (
                 [
                     "include",
                 ],
+            "include/crypto/bn_conf.h" =>
+                [
+                    ".",
+                ],
+            "include/crypto/dso_conf.h" =>
+                [
+                    ".",
+                ],
             "include/openssl/opensslconf.h" =>
                 [
                     ".",
@@ -9192,7 +8562,6 @@ our %unified_info = (
                 [
                     ".",
                     "include",
-                    "crypto/include",
                 ],
             "test/asn1_string_table_test.o" =>
                 [
@@ -9518,7 +8887,6 @@ our %unified_info = (
                 [
                     ".",
                     "include",
-                    "crypto/include",
                 ],
             "test/cipher_overhead_test.o" =>
                 [
@@ -9564,7 +8932,6 @@ our %unified_info = (
             "test/ctype_internal_test.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "test/curve448_internal_test.o" =>
@@ -9630,7 +8997,6 @@ our %unified_info = (
                 [
                     "include",
                     "crypto/ec",
-                    "crypto/include",
                 ],
             "test/ecdsatest.o" =>
                 [
@@ -9655,7 +9021,6 @@ our %unified_info = (
             "test/evp_extra_test.o" =>
                 [
                     "include",
-                    "crypto/include",
                 ],
             "test/evp_test.o" =>
                 [
@@ -9753,7 +9118,6 @@ our %unified_info = (
                 [
                     ".",
                     "include",
-                    "crypto/include",
                 ],
             "test/rc2test.o" =>
                 [
@@ -9803,18 +9167,15 @@ our %unified_info = (
                 [
                     ".",
                     "include",
-                    "crypto/include",
                 ],
             "test/sm2_internal_test.o" =>
                 [
                     "include",
-                    "crypto/include",
                 ],
             "test/sm4_internal_test.o" =>
                 [
                     ".",
                     "include",
-                    "crypto/include",
                 ],
             "test/srptest.o" =>
                 [
@@ -9825,6 +9186,10 @@ our %unified_info = (
                     ".",
                     "include",
                 ],
+            "test/ssl_ctx_test.o" =>
+                [
+                    "include",
+                ],
             "test/ssl_test.o" =>
                 [
                     "include",
@@ -9888,10 +9253,6 @@ our %unified_info = (
                 [
                     "include",
                 ],
-            "test/testutil/init.o" =>
-                [
-                    "include",
-                ],
             "test/testutil/main.o" =>
                 [
                     "include",
@@ -9920,6 +9281,10 @@ our %unified_info = (
                 [
                     "include",
                 ],
+            "test/testutil/testutil_init.o" =>
+                [
+                    "include",
+                ],
             "test/threadstest.o" =>
                 [
                     "include",
@@ -10184,6 +9549,7 @@ our %unified_info = (
             "test/sm4_internal_test",
             "test/srptest",
             "test/ssl_cert_table_internal_test",
+            "test/ssl_ctx_test",
             "test/ssl_test",
             "test/ssl_test_ctx_test",
             "test/sslapitest",
@@ -15079,7 +14445,6 @@ our %unified_info = (
                     "test/testutil/cb.o",
                     "test/testutil/driver.o",
                     "test/testutil/format_output.o",
-                    "test/testutil/init.o",
                     "test/testutil/main.o",
                     "test/testutil/output_helpers.o",
                     "test/testutil/random.o",
@@ -15087,6 +14452,7 @@ our %unified_info = (
                     "test/testutil/tap_bio.o",
                     "test/testutil/test_cleanup.o",
                     "test/testutil/tests.o",
+                    "test/testutil/testutil_init.o",
                 ],
             "test/md2test" =>
                 [
@@ -15314,6 +14680,14 @@ our %unified_info = (
                 [
                     "test/ssl_cert_table_internal_test.c",
                 ],
+            "test/ssl_ctx_test" =>
+                [
+                    "test/ssl_ctx_test.o",
+                ],
+            "test/ssl_ctx_test.o" =>
+                [
+                    "test/ssl_ctx_test.c",
+                ],
             "test/ssl_test" =>
                 [
                     "test/handshake_helper.o",
@@ -15416,10 +14790,6 @@ our %unified_info = (
                 [
                     "test/testutil/format_output.c",
                 ],
-            "test/testutil/init.o" =>
-                [
-                    "test/testutil/init.c",
-                ],
             "test/testutil/main.o" =>
                 [
                     "test/testutil/main.c",
@@ -15448,6 +14818,10 @@ our %unified_info = (
                 [
                     "test/testutil/tests.c",
                 ],
+            "test/testutil/testutil_init.o" =>
+                [
+                    "test/testutil/testutil_init.c",
+                ],
             "test/threadstest" =>
                 [
                     "test/threadstest.o",
diff --git a/deps/openssl/config/archs/BSD-x86/no-asm/crypto/buildinf.h b/deps/openssl/config/archs/BSD-x86/no-asm/crypto/buildinf.h
index c1c537b3fb..4d7a6c77c1 100644
--- a/deps/openssl/config/archs/BSD-x86/no-asm/crypto/buildinf.h
+++ b/deps/openssl/config/archs/BSD-x86/no-asm/crypto/buildinf.h
@@ -11,7 +11,7 @@
  */
 
 #define PLATFORM "platform: BSD-x86"
-#define DATE "built on: Fri Sep 13 15:57:29 2019 UTC"
+#define DATE "built on: Wed Mar 18 21:04:56 2020 UTC"
 
 /*
  * Generate compiler_flags as an array of individual characters. This is a
diff --git a/deps/openssl/config/archs/BSD-x86/no-asm/crypto/include/internal/bn_conf.h b/deps/openssl/config/archs/BSD-x86/no-asm/crypto/include/internal/bn_conf.h
index fb52156bd0..459055c96f 100644
--- a/deps/openssl/config/archs/BSD-x86/no-asm/crypto/include/internal/bn_conf.h
+++ b/deps/openssl/config/archs/BSD-x86/no-asm/crypto/include/internal/bn_conf.h
@@ -1,5 +1,5 @@
 /* WARNING: do not edit! */
-/* Generated by Makefile from crypto/include/internal/bn_conf.h.in */
+/* Generated by Makefile from include/crypto/bn_conf.h.in */
 /*
  * Copyright 2016 The OpenSSL Project Authors. All Rights Reserved.
  *
@@ -9,8 +9,8 @@
  * https://www.openssl.org/source/license.html
  */
 
-#ifndef HEADER_BN_CONF_H
-# define HEADER_BN_CONF_H
+#ifndef OSSL_CRYPTO_BN_CONF_H
+# define OSSL_CRYPTO_BN_CONF_H
 
 /*
  * The contents of this file are not used in the UEFI build, as
diff --git a/deps/openssl/config/archs/BSD-x86/no-asm/crypto/include/internal/dso_conf.h b/deps/openssl/config/archs/BSD-x86/no-asm/crypto/include/internal/dso_conf.h
index 252266ec2a..4b1167c3d8 100644
--- a/deps/openssl/config/archs/BSD-x86/no-asm/crypto/include/internal/dso_conf.h
+++ b/deps/openssl/config/archs/BSD-x86/no-asm/crypto/include/internal/dso_conf.h
@@ -1,5 +1,5 @@
 /* WARNING: do not edit! */
-/* Generated by Makefile from crypto/include/internal/dso_conf.h.in */
+/* Generated by Makefile from include/crypto/dso_conf.h.in */
 /*
  * Copyright 2016-2019 The OpenSSL Project Authors. All Rights Reserved.
  *
@@ -9,8 +9,8 @@
  * https://www.openssl.org/source/license.html
  */
 
-#ifndef HEADER_DSO_CONF_H
-# define HEADER_DSO_CONF_H
+#ifndef OSSL_CRYPTO_DSO_CONF_H
+# define OSSL_CRYPTO_DSO_CONF_H
 # define DSO_DLFCN
 # define HAVE_DLFCN_H
 # define DSO_EXTENSION ".so"
diff --git a/deps/openssl/config/archs/BSD-x86/no-asm/include/openssl/opensslconf.h b/deps/openssl/config/archs/BSD-x86/no-asm/include/openssl/opensslconf.h
index bc67d87059..435e0e58ef 100644
--- a/deps/openssl/config/archs/BSD-x86/no-asm/include/openssl/opensslconf.h
+++ b/deps/openssl/config/archs/BSD-x86/no-asm/include/openssl/opensslconf.h
@@ -96,9 +96,6 @@ extern "C" {
 #ifndef OPENSSL_NO_DYNAMIC_ENGINE
 # define OPENSSL_NO_DYNAMIC_ENGINE
 #endif
-#ifndef OPENSSL_NO_AFALGENG
-# define OPENSSL_NO_AFALGENG
-#endif
 
 
 /*
diff --git a/deps/openssl/config/archs/BSD-x86/no-asm/include/progs.h b/deps/openssl/config/archs/BSD-x86/no-asm/include/progs.h
index 9b3d270e20..308c65601b 100644
--- a/deps/openssl/config/archs/BSD-x86/no-asm/include/progs.h
+++ b/deps/openssl/config/archs/BSD-x86/no-asm/include/progs.h
@@ -2,7 +2,7 @@
  * WARNING: do not edit!
  * Generated by apps/progs.pl
  *
- * Copyright 1995-2019 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 1995-2020 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
diff --git a/deps/openssl/config/archs/BSD-x86_64/asm/configdata.pm b/deps/openssl/config/archs/BSD-x86_64/asm/configdata.pm
index 958b30cc6a..49248aba5e 100644
--- a/deps/openssl/config/archs/BSD-x86_64/asm/configdata.pm
+++ b/deps/openssl/config/archs/BSD-x86_64/asm/configdata.pm
@@ -48,14 +48,14 @@ our %config = (
   export_var_as_fn => "0",
   includes => [  ],
   lflags => [  ],
-  lib_defines => [ "OPENSSL_PIC", "OPENSSL_CPUID_OBJ", "OPENSSL_IA32_SSE2", "OPENSSL_BN_ASM_MONT", "OPENSSL_BN_ASM_MONT5", "OPENSSL_BN_ASM_GF2m", "SHA1_ASM", "SHA256_ASM", "SHA512_ASM", "KECCAK1600_ASM", "RC4_ASM", "MD5_ASM", "VPAES_ASM", "GHASH_ASM", "ECP_NISTZ256_ASM", "X25519_ASM", "POLY1305_ASM" ],
+  lib_defines => [ "OPENSSL_PIC", "OPENSSL_CPUID_OBJ", "OPENSSL_IA32_SSE2", "OPENSSL_BN_ASM_MONT", "OPENSSL_BN_ASM_MONT5", "OPENSSL_BN_ASM_GF2m", "SHA1_ASM", "SHA256_ASM", "SHA512_ASM", "KECCAK1600_ASM", "RC4_ASM", "MD5_ASM", "AESNI_ASM", "VPAES_ASM", "GHASH_ASM", "ECP_NISTZ256_ASM", "X25519_ASM", "POLY1305_ASM" ],
   libdir => "",
   major => "1",
   makedepprog => "\$(CROSS_COMPILE)gcc",
   minor => "1.1",
   openssl_algorithm_defines => [ "OPENSSL_NO_COMP", "OPENSSL_NO_MD2", "OPENSSL_NO_RC5" ],
   openssl_api_defines => [  ],
-  openssl_other_defines => [ "OPENSSL_RAND_SEED_OS", "OPENSSL_NO_AFALGENG", "OPENSSL_NO_ASAN", "OPENSSL_NO_CRYPTO_MDEBUG", "OPENSSL_NO_CRYPTO_MDEBUG_BACKTRACE", "OPENSSL_NO_EC_NISTP_64_GCC_128", "OPENSSL_NO_EGD", "OPENSSL_NO_EXTERNAL_TESTS", "OPENSSL_NO_FUZZ_AFL", "OPENSSL_NO_FUZZ_LIBFUZZER", "OPENSSL_NO_HEARTBEATS", "OPENSSL_NO_MSAN", "OPENSSL_NO_SCTP", "OPENSSL_NO_SSL3", "OPENSSL_NO_SSL3_METHOD", "OPENSSL_NO_UBSAN", "OPENSSL_NO_UNIT_TEST", "OPENSSL_NO_WEAK_SSL_CIPHERS", "OPENSSL_NO_DYNAMIC_ENGINE", "OPENSSL_NO_AFALGENG" ],
+  openssl_other_defines => [ "OPENSSL_RAND_SEED_OS", "OPENSSL_NO_AFALGENG", "OPENSSL_NO_ASAN", "OPENSSL_NO_CRYPTO_MDEBUG", "OPENSSL_NO_CRYPTO_MDEBUG_BACKTRACE", "OPENSSL_NO_EC_NISTP_64_GCC_128", "OPENSSL_NO_EGD", "OPENSSL_NO_EXTERNAL_TESTS", "OPENSSL_NO_FUZZ_AFL", "OPENSSL_NO_FUZZ_LIBFUZZER", "OPENSSL_NO_HEARTBEATS", "OPENSSL_NO_MSAN", "OPENSSL_NO_SCTP", "OPENSSL_NO_SSL3", "OPENSSL_NO_SSL3_METHOD", "OPENSSL_NO_UBSAN", "OPENSSL_NO_UNIT_TEST", "OPENSSL_NO_WEAK_SSL_CIPHERS", "OPENSSL_NO_DYNAMIC_ENGINE" ],
   openssl_sys_defines => [  ],
   openssl_thread_defines => [ "OPENSSL_THREADS" ],
   openssldir => "",
@@ -111,8 +111,8 @@ our %config = (
   sourcedir => ".",
   target => "BSD-x86_64",
   tdirs => [ "ossl_shim" ],
-  version => "1.1.1d",
-  version_num => "0x1010104fL",
+  version => "1.1.1e",
+  version_num => "0x1010105fL",
 );
 
 our %target = (
@@ -236,6 +236,7 @@ our @disablables = (
   "dgram",
   "dh",
   "dsa",
+  "dso",
   "dtls",
   "dynamic-engine",
   "ec",
@@ -352,8 +353,8 @@ our %unified_info = (
         {
             "" =>
                 [
-                    "crypto/include/internal/bn_conf.h",
-                    "crypto/include/internal/dso_conf.h",
+                    "include/crypto/bn_conf.h",
+                    "include/crypto/dso_conf.h",
                     "include/openssl/opensslconf.h",
                 ],
             "apps/asn1pars.o" =>
@@ -621,14 +622,6 @@ our %unified_info = (
                     "crypto/perlasm/cbc.pl",
                     "crypto/perlasm/x86asm.pl",
                 ],
-            "crypto/include/internal/bn_conf.h" =>
-                [
-                    "configdata.pm",
-                ],
-            "crypto/include/internal/dso_conf.h" =>
-                [
-                    "configdata.pm",
-                ],
             "crypto/rc4/rc4-586.s" =>
                 [
                     "crypto/perlasm/x86asm.pl",
@@ -704,6 +697,14 @@ our %unified_info = (
                 [
                     "libcrypto",
                 ],
+            "include/crypto/bn_conf.h" =>
+                [
+                    "configdata.pm",
+                ],
+            "include/crypto/dso_conf.h" =>
+                [
+                    "configdata.pm",
+                ],
             "include/openssl/opensslconf.h" =>
                 [
                     "configdata.pm",
@@ -1501,6 +1502,12 @@ our %unified_info = (
                     "libcrypto",
                     "test/libtestutil.a",
                 ],
+            "test/ssl_ctx_test" =>
+                [
+                    "libcrypto",
+                    "libssl",
+                    "test/libtestutil.a",
+                ],
             "test/ssl_test" =>
                 [
                     "libcrypto",
@@ -3256,7 +3263,6 @@ our %unified_info = (
                             "test/testutil/cb.o",
                             "test/testutil/driver.o",
                             "test/testutil/format_output.o",
-                            "test/testutil/init.o",
                             "test/testutil/main.o",
                             "test/testutil/output_helpers.o",
                             "test/testutil/random.o",
@@ -3264,6 +3270,7 @@ our %unified_info = (
                             "test/testutil/tap_bio.o",
                             "test/testutil/test_cleanup.o",
                             "test/testutil/tests.o",
+                            "test/testutil/testutil_init.o",
                         ],
                     "products" =>
                         {
@@ -3762,14 +3769,6 @@ our %unified_info = (
                 [
                     "crypto/ia64cpuid.S",
                 ],
-            "crypto/include/internal/bn_conf.h" =>
-                [
-                    "crypto/include/internal/bn_conf.h.in",
-                ],
-            "crypto/include/internal/dso_conf.h" =>
-                [
-                    "crypto/include/internal/dso_conf.h.in",
-                ],
             "crypto/md5/md5-586.s" =>
                 [
                     "crypto/md5/asm/md5-586.pl",
@@ -4210,6 +4209,14 @@ our %unified_info = (
                     "engines/asm/e_padlock-x86_64.pl",
                     "\$(PERLASM_SCHEME)",
                 ],
+            "include/crypto/bn_conf.h" =>
+                [
+                    "include/crypto/bn_conf.h.in",
+                ],
+            "include/crypto/dso_conf.h" =>
+                [
+                    "include/crypto/dso_conf.h.in",
+                ],
             "include/openssl/opensslconf.h" =>
                 [
                     "include/openssl/opensslconf.h.in",
@@ -4904,49 +4911,41 @@ our %unified_info = (
             "crypto/aes/aes_cbc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/aes/aes_cfb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/aes/aes_core.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/aes/aes_ecb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/aes/aes_ige.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/aes/aes_misc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/aes/aes_ofb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/aes/aes_wrap.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/aes/aesfx-sparcv9.o" =>
@@ -4956,25 +4955,21 @@ our %unified_info = (
             "crypto/aes/aesni-mb-x86_64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/aes/aesni-sha1-x86_64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/aes/aesni-sha256-x86_64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/aes/aesni-x86_64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/aes/aest4-sparcv9.o" =>
@@ -4992,13 +4987,11 @@ our %unified_info = (
             "crypto/aes/vpaes-x86_64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/aria/aria.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/arm64cpuid.o" =>
@@ -5012,613 +5005,511 @@ our %unified_info = (
             "crypto/asn1/a_bitstr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_d2i_fp.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_digest.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_dup.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_gentm.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_i2d_fp.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_int.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_mbstr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_object.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_octet.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_print.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_sign.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_strex.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_strnid.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_time.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_type.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_utctm.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_utf8.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_verify.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/ameth_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/asn1_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/asn1_gen.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/asn1_item_list.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/asn1_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/asn1_par.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/asn_mime.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/asn_moid.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/asn_mstbl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/asn_pack.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/bio_asn1.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/bio_ndef.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/d2i_pr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/d2i_pu.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/evp_asn1.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/f_int.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/f_string.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/i2d_pr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/i2d_pu.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/n_pkey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/nsseq.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/p5_pbe.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/p5_pbev2.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/p5_scrypt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/p8_pkey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/t_bitst.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/t_pkey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/t_spki.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/tasn_dec.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/tasn_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/tasn_fre.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/tasn_new.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/tasn_prn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/tasn_scn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/tasn_typ.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/tasn_utl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/x_algor.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/x_bignum.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/x_info.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/x_int64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/x_long.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/x_pkey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/x_sig.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/x_spki.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/x_val.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/async/arch/async_null.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/async/arch/async_posix.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/async/arch/async_win.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/async/async.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/async/async_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/async/async_wait.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bf/bf_cfb64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bf/bf_ecb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bf/bf_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bf/bf_ofb64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bf/bf_skey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/b_addr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/b_dump.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/b_print.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/b_sock.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/b_sock2.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bf_buff.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bf_lbuf.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bf_nbio.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bf_null.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bio_cb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bio_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bio_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bio_meth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bss_acpt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bss_bio.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bss_conn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bss_dgram.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bss_fd.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bss_file.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bss_log.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bss_mem.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bss_null.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bss_sock.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/blake2/blake2b.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/blake2/blake2s.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/blake2/m_blake2b.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/blake2/m_blake2s.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/armv4-gf2m.o" =>
@@ -5632,7 +5523,6 @@ our %unified_info = (
             "crypto/bn/asm/x86_64-gcc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn-mips.o" =>
@@ -5642,182 +5532,152 @@ our %unified_info = (
             "crypto/bn/bn_add.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_blind.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_const.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_ctx.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_depr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_dh.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_div.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_exp.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto",
                 ],
             "crypto/bn/bn_exp2.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_gcd.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_gf2m.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_intern.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_kron.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_mod.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_mont.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_mpi.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_mul.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_nist.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_prime.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_print.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_rand.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_recp.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_shift.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_sqr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_sqrt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_srp.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_word.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_x931p.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/mips-mont.o" =>
@@ -5827,19 +5687,16 @@ our %unified_info = (
             "crypto/bn/rsaz-avx2.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/rsaz-x86_64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/rsaz_exp.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/sparct4-mont.o" =>
@@ -5865,31 +5722,26 @@ our %unified_info = (
             "crypto/bn/x86_64-gf2m.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/x86_64-mont.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/x86_64-mont5.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/buffer/buf_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/buffer/buffer.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/buildinf.h" =>
@@ -5899,37 +5751,31 @@ our %unified_info = (
             "crypto/camellia/cmll-x86_64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/camellia/cmll_cfb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/camellia/cmll_ctr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/camellia/cmll_ecb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/camellia/cmll_misc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/camellia/cmll_ofb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/camellia/cmllt4-sparcv9.o" =>
@@ -5939,31 +5785,26 @@ our %unified_info = (
             "crypto/cast/c_cfb64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cast/c_ecb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cast/c_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cast/c_ofb64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cast/c_skey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/chacha/chacha-armv4.o" =>
@@ -5981,278 +5822,232 @@ our %unified_info = (
             "crypto/chacha/chacha-x86_64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cmac/cm_ameth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cmac/cm_pmeth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cmac/cmac.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_asn1.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_att.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_cd.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_dd.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_env.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_ess.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_io.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_kari.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_pwri.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_sd.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_smime.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/conf/conf_api.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/conf/conf_def.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/conf/conf_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/conf/conf_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/conf/conf_mall.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/conf/conf_mod.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/conf/conf_sap.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/conf/conf_ssl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cpt_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cryptlib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ct/ct_b64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ct/ct_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ct/ct_log.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ct/ct_oct.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ct/ct_policy.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ct/ct_prn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ct/ct_sct.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ct/ct_sct_ctx.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ct/ct_vfy.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ct/ct_x509v3.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ctype.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cversion.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto",
                 ],
             "crypto/des/cbc_cksm.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/cbc_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/cfb64ede.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/cfb64enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/cfb_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/des_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/dest4-sparcv9.o" =>
@@ -6262,301 +6057,251 @@ our %unified_info = (
             "crypto/des/ecb3_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/ecb_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/fcrypt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/fcrypt_b.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/ofb64ede.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/ofb64enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/ofb_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/pcbc_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/qud_cksm.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/rand_key.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/set_key.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/str2key.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/xcbc_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_ameth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_asn1.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_check.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_depr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_gen.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_kdf.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_key.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_meth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_pmeth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_prn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_rfc5114.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_rfc7919.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dsa/dsa_ameth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dsa/dsa_asn1.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dsa/dsa_depr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dsa/dsa_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dsa/dsa_gen.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dsa/dsa_key.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dsa/dsa_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dsa/dsa_meth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dsa/dsa_ossl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dsa/dsa_pmeth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dsa/dsa_prn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dsa/dsa_sign.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dsa/dsa_vrf.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dso/dso_dl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dso/dso_dlfcn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dso/dso_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dso/dso_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dso/dso_openssl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dso/dso_vms.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dso/dso_win32.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ebcdic.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/curve25519.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/curve448/arch_32/f_impl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto/ec/curve448/arch_32",
                     "crypto/ec/curve448",
@@ -6564,7 +6309,6 @@ our %unified_info = (
             "crypto/ec/curve448/curve448.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto/ec/curve448/arch_32",
                     "crypto/ec/curve448",
@@ -6572,7 +6316,6 @@ our %unified_info = (
             "crypto/ec/curve448/curve448_tables.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto/ec/curve448/arch_32",
                     "crypto/ec/curve448",
@@ -6580,7 +6323,6 @@ our %unified_info = (
             "crypto/ec/curve448/eddsa.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto/ec/curve448/arch_32",
                     "crypto/ec/curve448",
@@ -6588,7 +6330,6 @@ our %unified_info = (
             "crypto/ec/curve448/f_generic.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto/ec/curve448/arch_32",
                     "crypto/ec/curve448",
@@ -6596,7 +6337,6 @@ our %unified_info = (
             "crypto/ec/curve448/scalar.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto/ec/curve448/arch_32",
                     "crypto/ec/curve448",
@@ -6604,163 +6344,136 @@ our %unified_info = (
             "crypto/ec/ec2_oct.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec2_smpl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec_ameth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec_asn1.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec_check.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec_curve.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec_cvt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec_key.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec_kmeth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec_mult.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec_oct.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec_pmeth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec_print.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecdh_kdf.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecdh_ossl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecdsa_ossl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecdsa_sign.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecdsa_vrf.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/eck_prn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecp_mont.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecp_nist.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecp_nistp224.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecp_nistp256.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecp_nistp521.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecp_nistputil.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecp_nistz256-armv4.o" =>
@@ -6778,247 +6491,206 @@ our %unified_info = (
             "crypto/ec/ecp_nistz256-x86_64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecp_nistz256.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecp_oct.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecp_smpl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecx_meth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/x25519-x86_64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/eng_all.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/eng_cnf.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/eng_ctrl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/eng_devcrypto.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/eng_dyn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/eng_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/eng_fat.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/eng_init.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/eng_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/eng_list.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/eng_openssl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/eng_pkey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/eng_rdrand.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/eng_table.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/tb_asnmth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/tb_cipher.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/tb_dh.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/tb_digest.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/tb_dsa.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/tb_eckey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/tb_pkmeth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/tb_rand.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/tb_rsa.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/err/err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/err/err_all.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/err/err_prn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/bio_b64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/bio_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/bio_md.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/bio_ok.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/c_allc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/c_alld.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/cmeth_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/digest.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/e_aes.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto",
                     "crypto/modes",
@@ -7026,21 +6698,18 @@ our %unified_info = (
             "crypto/evp/e_aes_cbc_hmac_sha1.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto/modes",
                 ],
             "crypto/evp/e_aes_cbc_hmac_sha256.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto/modes",
                 ],
             "crypto/evp/e_aria.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto",
                     "crypto/modes",
@@ -7048,13 +6717,11 @@ our %unified_info = (
             "crypto/evp/e_bf.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/e_camellia.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto",
                     "crypto/modes",
@@ -7062,81 +6729,68 @@ our %unified_info = (
             "crypto/evp/e_cast.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/e_chacha20_poly1305.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/e_des.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto",
                 ],
             "crypto/evp/e_des3.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto",
                 ],
             "crypto/evp/e_idea.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/e_null.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/e_old.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/e_rc2.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/e_rc4.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/e_rc4_hmac_md5.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/e_rc5.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/e_seed.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/e_sm4.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto",
                     "crypto/modes",
@@ -7144,328 +6798,267 @@ our %unified_info = (
             "crypto/evp/e_xcbc_d.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/encode.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/evp_cnf.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/evp_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/evp_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/evp_key.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/evp_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/evp_pbe.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/evp_pkey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/m_md2.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/m_md4.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/m_md5.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/m_md5_sha1.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/m_mdc2.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/m_null.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/m_ripemd.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/m_sha1.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/m_sha3.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto",
                 ],
             "crypto/evp/m_sigver.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/m_wp.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/names.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/p5_crpt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/p5_crpt2.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/p_dec.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/p_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/p_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/p_open.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/p_seal.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/p_sign.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/p_verify.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/pbe_scrypt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/pmeth_fn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/pmeth_gn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/pmeth_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ex_data.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/getenv.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/hmac/hm_ameth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/hmac/hm_pmeth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/hmac/hmac.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/idea/i_cbc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/idea/i_cfb64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/idea/i_ecb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/idea/i_ofb64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/idea/i_skey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
-            "crypto/include/internal/bn_conf.h" =>
-                [
-                    ".",
-                ],
-            "crypto/include/internal/dso_conf.h" =>
-                [
-                    ".",
-                ],
             "crypto/init.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/kdf/hkdf.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/kdf/kdf_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/kdf/scrypt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/kdf/tls1_prf.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/lhash/lh_stats.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/lhash/lhash.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/md4/md4_dgst.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/md4/md4_one.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/md5/md5-sparcv9.o" =>
@@ -7475,91 +7068,76 @@ our %unified_info = (
             "crypto/md5/md5-x86_64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/md5/md5_dgst.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/md5/md5_one.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/mdc2/mdc2_one.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/mdc2/mdc2dgst.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/mem.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/mem_dbg.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/mem_sec.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/modes/aesni-gcm-x86_64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/modes/cbc128.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/modes/ccm128.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/modes/cfb128.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/modes/ctr128.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/modes/cts128.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/modes/gcm128.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto",
                 ],
@@ -7578,7 +7156,6 @@ our %unified_info = (
             "crypto/modes/ghash-x86_64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/modes/ghashv8-armx.o" =>
@@ -7588,361 +7165,301 @@ our %unified_info = (
             "crypto/modes/ocb128.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/modes/ofb128.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/modes/wrap128.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/modes/xts128.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/o_dir.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/o_fips.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/o_fopen.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/o_init.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/o_str.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/o_time.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/objects/o_names.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/objects/obj_dat.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/objects/obj_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/objects/obj_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/objects/obj_xref.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ocsp/ocsp_asn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ocsp/ocsp_cl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ocsp/ocsp_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ocsp/ocsp_ext.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ocsp/ocsp_ht.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ocsp/ocsp_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ocsp/ocsp_prn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ocsp/ocsp_srv.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ocsp/ocsp_vfy.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ocsp/v3_ocsp.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pem/pem_all.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pem/pem_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pem/pem_info.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pem/pem_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pem/pem_oth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pem/pem_pk8.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pem/pem_pkey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pem/pem_sign.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pem/pem_x509.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pem/pem_xaux.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pem/pvkfmt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_add.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_asn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_attr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_crpt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_crt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_decr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_init.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_key.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_kiss.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_mutl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_npas.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_p8d.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_p8e.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_sbag.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_utl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/pk12err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs7/bio_pk7.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs7/pk7_asn1.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs7/pk7_attr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs7/pk7_doit.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs7/pk7_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs7/pk7_mime.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs7/pk7_smime.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs7/pkcs7err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/poly1305/poly1305-armv4.o" =>
@@ -7964,265 +7481,221 @@ our %unified_info = (
             "crypto/poly1305/poly1305-x86_64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/poly1305/poly1305.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/poly1305/poly1305_ameth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/poly1305/poly1305_pmeth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rand/drbg_ctr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rand/drbg_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rand/rand_egd.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rand/rand_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rand/rand_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rand/rand_unix.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rand/rand_vms.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rand/rand_win.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rand/randfile.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rc2/rc2_cbc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rc2/rc2_ecb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rc2/rc2_skey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rc2/rc2cfb64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rc2/rc2ofb64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rc4/rc4-md5-x86_64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rc4/rc4-x86_64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ripemd/rmd_dgst.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ripemd/rmd_one.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_ameth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_asn1.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_chk.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_crpt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_depr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_gen.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_meth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_mp.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_none.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_oaep.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_ossl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_pk1.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_pmeth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_prn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_pss.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_saos.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_sign.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_ssl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_x931.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_x931g.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/s390xcpuid.o" =>
@@ -8232,31 +7705,26 @@ our %unified_info = (
             "crypto/seed/seed.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/seed/seed_cbc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/seed/seed_cfb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/seed/seed_ecb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/seed/seed_ofb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sha/keccak1600-armv4.o" =>
@@ -8266,7 +7734,6 @@ our %unified_info = (
             "crypto/sha/keccak1600-x86_64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sha/sha1-armv4-large.o" =>
@@ -8280,7 +7747,6 @@ our %unified_info = (
             "crypto/sha/sha1-mb-x86_64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sha/sha1-mips.o" =>
@@ -8298,19 +7764,16 @@ our %unified_info = (
             "crypto/sha/sha1-x86_64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sha/sha1_one.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sha/sha1dgst.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sha/sha256-armv4.o" =>
@@ -8324,7 +7787,6 @@ our %unified_info = (
             "crypto/sha/sha256-mb-x86_64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sha/sha256-mips.o" =>
@@ -8342,13 +7804,11 @@ our %unified_info = (
             "crypto/sha/sha256-x86_64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sha/sha256.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sha/sha512-armv4.o" =>
@@ -8374,727 +7834,606 @@ our %unified_info = (
             "crypto/sha/sha512-x86_64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sha/sha512.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/siphash/siphash.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/siphash/siphash_ameth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/siphash/siphash_pmeth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sm2/sm2_crypt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sm2/sm2_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sm2/sm2_pmeth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sm2/sm2_sign.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sm3/m_sm3.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sm3/sm3.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sm4/sm4.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/srp/srp_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/srp/srp_vfy.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/stack/stack.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/store/loader_file.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/store/store_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/store/store_init.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/store/store_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/store/store_register.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/store/store_strings.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/threads_none.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/threads_pthread.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/threads_win.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ts/ts_asn1.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ts/ts_conf.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ts/ts_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ts/ts_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ts/ts_req_print.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ts/ts_req_utils.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ts/ts_rsp_print.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ts/ts_rsp_sign.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ts/ts_rsp_utils.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ts/ts_rsp_verify.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ts/ts_verify_ctx.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/txt_db/txt_db.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ui/ui_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ui/ui_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ui/ui_null.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ui/ui_openssl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ui/ui_util.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/uid.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/whrlpool/wp-x86_64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/whrlpool/wp_dgst.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/by_dir.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/by_file.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/t_crl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/t_req.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/t_x509.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_att.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_cmp.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_d2.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_def.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_ext.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_lu.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_meth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_obj.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_r2x.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_req.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_set.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_trs.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_txt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_v3.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_vfy.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_vpm.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509cset.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509name.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509rset.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509spki.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509type.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x_all.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x_attrib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x_crl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x_exten.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x_name.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x_pubkey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x_req.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x_x509.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x_x509a.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/pcy_cache.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/pcy_data.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/pcy_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/pcy_map.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/pcy_node.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/pcy_tree.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_addr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_admis.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_akey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_akeya.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_alt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_asid.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_bcons.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_bitst.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_conf.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_cpols.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_crld.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_enum.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_extku.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_genn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_ia5.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_info.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_int.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_ncons.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_pci.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_pcia.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_pcons.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_pku.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_pmaps.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_prn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_purp.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_skey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_sxnet.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_tlsf.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_utl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x86_64cpuid.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "engines/e_capi.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "engines/e_padlock-x86_64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "engines/e_padlock.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "fuzz/asn1.o" =>
@@ -9145,6 +8484,14 @@ our %unified_info = (
                 [
                     "include",
                 ],
+            "include/crypto/bn_conf.h" =>
+                [
+                    ".",
+                ],
+            "include/crypto/dso_conf.h" =>
+                [
+                    ".",
+                ],
             "include/openssl/opensslconf.h" =>
                 [
                     ".",
@@ -9389,7 +8736,6 @@ our %unified_info = (
                 [
                     ".",
                     "include",
-                    "crypto/include",
                 ],
             "test/asn1_string_table_test.o" =>
                 [
@@ -9715,7 +9061,6 @@ our %unified_info = (
                 [
                     ".",
                     "include",
-                    "crypto/include",
                 ],
             "test/cipher_overhead_test.o" =>
                 [
@@ -9761,7 +9106,6 @@ our %unified_info = (
             "test/ctype_internal_test.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "test/curve448_internal_test.o" =>
@@ -9827,7 +9171,6 @@ our %unified_info = (
                 [
                     "include",
                     "crypto/ec",
-                    "crypto/include",
                 ],
             "test/ecdsatest.o" =>
                 [
@@ -9852,7 +9195,6 @@ our %unified_info = (
             "test/evp_extra_test.o" =>
                 [
                     "include",
-                    "crypto/include",
                 ],
             "test/evp_test.o" =>
                 [
@@ -9950,7 +9292,6 @@ our %unified_info = (
                 [
                     ".",
                     "include",
-                    "crypto/include",
                 ],
             "test/rc2test.o" =>
                 [
@@ -10000,18 +9341,15 @@ our %unified_info = (
                 [
                     ".",
                     "include",
-                    "crypto/include",
                 ],
             "test/sm2_internal_test.o" =>
                 [
                     "include",
-                    "crypto/include",
                 ],
             "test/sm4_internal_test.o" =>
                 [
                     ".",
                     "include",
-                    "crypto/include",
                 ],
             "test/srptest.o" =>
                 [
@@ -10022,6 +9360,10 @@ our %unified_info = (
                     ".",
                     "include",
                 ],
+            "test/ssl_ctx_test.o" =>
+                [
+                    "include",
+                ],
             "test/ssl_test.o" =>
                 [
                     "include",
@@ -10085,10 +9427,6 @@ our %unified_info = (
                 [
                     "include",
                 ],
-            "test/testutil/init.o" =>
-                [
-                    "include",
-                ],
             "test/testutil/main.o" =>
                 [
                     "include",
@@ -10117,6 +9455,10 @@ our %unified_info = (
                 [
                     "include",
                 ],
+            "test/testutil/testutil_init.o" =>
+                [
+                    "include",
+                ],
             "test/threadstest.o" =>
                 [
                     "include",
@@ -10381,6 +9723,7 @@ our %unified_info = (
             "test/sm4_internal_test",
             "test/srptest",
             "test/ssl_cert_table_internal_test",
+            "test/ssl_ctx_test",
             "test/ssl_test",
             "test/ssl_test_ctx_test",
             "test/sslapitest",
@@ -15391,7 +14734,6 @@ our %unified_info = (
                     "test/testutil/cb.o",
                     "test/testutil/driver.o",
                     "test/testutil/format_output.o",
-                    "test/testutil/init.o",
                     "test/testutil/main.o",
                     "test/testutil/output_helpers.o",
                     "test/testutil/random.o",
@@ -15399,6 +14741,7 @@ our %unified_info = (
                     "test/testutil/tap_bio.o",
                     "test/testutil/test_cleanup.o",
                     "test/testutil/tests.o",
+                    "test/testutil/testutil_init.o",
                 ],
             "test/md2test" =>
                 [
@@ -15626,6 +14969,14 @@ our %unified_info = (
                 [
                     "test/ssl_cert_table_internal_test.c",
                 ],
+            "test/ssl_ctx_test" =>
+                [
+                    "test/ssl_ctx_test.o",
+                ],
+            "test/ssl_ctx_test.o" =>
+                [
+                    "test/ssl_ctx_test.c",
+                ],
             "test/ssl_test" =>
                 [
                     "test/handshake_helper.o",
@@ -15728,10 +15079,6 @@ our %unified_info = (
                 [
                     "test/testutil/format_output.c",
                 ],
-            "test/testutil/init.o" =>
-                [
-                    "test/testutil/init.c",
-                ],
             "test/testutil/main.o" =>
                 [
                     "test/testutil/main.c",
@@ -15760,6 +15107,10 @@ our %unified_info = (
                 [
                     "test/testutil/tests.c",
                 ],
+            "test/testutil/testutil_init.o" =>
+                [
+                    "test/testutil/testutil_init.c",
+                ],
             "test/threadstest" =>
                 [
                     "test/threadstest.o",
diff --git a/deps/openssl/config/archs/BSD-x86_64/asm/crypto/aes/aes-x86_64.s b/deps/openssl/config/archs/BSD-x86_64/asm/crypto/aes/aes-x86_64.s
deleted file mode 100644
index f0c1685fb9..0000000000
--- a/deps/openssl/config/archs/BSD-x86_64/asm/crypto/aes/aes-x86_64.s
+++ /dev/null
@@ -1,2649 +0,0 @@
-.text	
-.type	_x86_64_AES_encrypt,@function
-.align	16
-_x86_64_AES_encrypt:
-	xorl	0(%r15),%eax
-	xorl	4(%r15),%ebx
-	xorl	8(%r15),%ecx
-	xorl	12(%r15),%edx
-
-	movl	240(%r15),%r13d
-	subl	$1,%r13d
-	jmp	.Lenc_loop
-.align	16
-.Lenc_loop:
-
-	movzbl	%al,%esi
-	movzbl	%bl,%edi
-	movzbl	%cl,%ebp
-	movl	0(%r14,%rsi,8),%r10d
-	movl	0(%r14,%rdi,8),%r11d
-	movl	0(%r14,%rbp,8),%r12d
-
-	movzbl	%bh,%esi
-	movzbl	%ch,%edi
-	movzbl	%dl,%ebp
-	xorl	3(%r14,%rsi,8),%r10d
-	xorl	3(%r14,%rdi,8),%r11d
-	movl	0(%r14,%rbp,8),%r8d
-
-	movzbl	%dh,%esi
-	shrl	$16,%ecx
-	movzbl	%ah,%ebp
-	xorl	3(%r14,%rsi,8),%r12d
-	shrl	$16,%edx
-	xorl	3(%r14,%rbp,8),%r8d
-
-	shrl	$16,%ebx
-	leaq	16(%r15),%r15
-	shrl	$16,%eax
-
-	movzbl	%cl,%esi
-	movzbl	%dl,%edi
-	movzbl	%al,%ebp
-	xorl	2(%r14,%rsi,8),%r10d
-	xorl	2(%r14,%rdi,8),%r11d
-	xorl	2(%r14,%rbp,8),%r12d
-
-	movzbl	%dh,%esi
-	movzbl	%ah,%edi
-	movzbl	%bl,%ebp
-	xorl	1(%r14,%rsi,8),%r10d
-	xorl	1(%r14,%rdi,8),%r11d
-	xorl	2(%r14,%rbp,8),%r8d
-
-	movl	12(%r15),%edx
-	movzbl	%bh,%edi
-	movzbl	%ch,%ebp
-	movl	0(%r15),%eax
-	xorl	1(%r14,%rdi,8),%r12d
-	xorl	1(%r14,%rbp,8),%r8d
-
-	movl	4(%r15),%ebx
-	movl	8(%r15),%ecx
-	xorl	%r10d,%eax
-	xorl	%r11d,%ebx
-	xorl	%r12d,%ecx
-	xorl	%r8d,%edx
-	subl	$1,%r13d
-	jnz	.Lenc_loop
-	movzbl	%al,%esi
-	movzbl	%bl,%edi
-	movzbl	%cl,%ebp
-	movzbl	2(%r14,%rsi,8),%r10d
-	movzbl	2(%r14,%rdi,8),%r11d
-	movzbl	2(%r14,%rbp,8),%r12d
-
-	movzbl	%dl,%esi
-	movzbl	%bh,%edi
-	movzbl	%ch,%ebp
-	movzbl	2(%r14,%rsi,8),%r8d
-	movl	0(%r14,%rdi,8),%edi
-	movl	0(%r14,%rbp,8),%ebp
-
-	andl	$0x0000ff00,%edi
-	andl	$0x0000ff00,%ebp
-
-	xorl	%edi,%r10d
-	xorl	%ebp,%r11d
-	shrl	$16,%ecx
-
-	movzbl	%dh,%esi
-	movzbl	%ah,%edi
-	shrl	$16,%edx
-	movl	0(%r14,%rsi,8),%esi
-	movl	0(%r14,%rdi,8),%edi
-
-	andl	$0x0000ff00,%esi
-	andl	$0x0000ff00,%edi
-	shrl	$16,%ebx
-	xorl	%esi,%r12d
-	xorl	%edi,%r8d
-	shrl	$16,%eax
-
-	movzbl	%cl,%esi
-	movzbl	%dl,%edi
-	movzbl	%al,%ebp
-	movl	0(%r14,%rsi,8),%esi
-	movl	0(%r14,%rdi,8),%edi
-	movl	0(%r14,%rbp,8),%ebp
-
-	andl	$0x00ff0000,%esi
-	andl	$0x00ff0000,%edi
-	andl	$0x00ff0000,%ebp
-
-	xorl	%esi,%r10d
-	xorl	%edi,%r11d
-	xorl	%ebp,%r12d
-
-	movzbl	%bl,%esi
-	movzbl	%dh,%edi
-	movzbl	%ah,%ebp
-	movl	0(%r14,%rsi,8),%esi
-	movl	2(%r14,%rdi,8),%edi
-	movl	2(%r14,%rbp,8),%ebp
-
-	andl	$0x00ff0000,%esi
-	andl	$0xff000000,%edi
-	andl	$0xff000000,%ebp
-
-	xorl	%esi,%r8d
-	xorl	%edi,%r10d
-	xorl	%ebp,%r11d
-
-	movzbl	%bh,%esi
-	movzbl	%ch,%edi
-	movl	16+12(%r15),%edx
-	movl	2(%r14,%rsi,8),%esi
-	movl	2(%r14,%rdi,8),%edi
-	movl	16+0(%r15),%eax
-
-	andl	$0xff000000,%esi
-	andl	$0xff000000,%edi
-
-	xorl	%esi,%r12d
-	xorl	%edi,%r8d
-
-	movl	16+4(%r15),%ebx
-	movl	16+8(%r15),%ecx
-	xorl	%r10d,%eax
-	xorl	%r11d,%ebx
-	xorl	%r12d,%ecx
-	xorl	%r8d,%edx
-.byte	0xf3,0xc3
-.size	_x86_64_AES_encrypt,.-_x86_64_AES_encrypt
-.type	_x86_64_AES_encrypt_compact,@function
-.align	16
-_x86_64_AES_encrypt_compact:
-.cfi_startproc	
-	leaq	128(%r14),%r8
-	movl	0-128(%r8),%edi
-	movl	32-128(%r8),%ebp
-	movl	64-128(%r8),%r10d
-	movl	96-128(%r8),%r11d
-	movl	128-128(%r8),%edi
-	movl	160-128(%r8),%ebp
-	movl	192-128(%r8),%r10d
-	movl	224-128(%r8),%r11d
-	jmp	.Lenc_loop_compact
-.align	16
-.Lenc_loop_compact:
-	xorl	0(%r15),%eax
-	xorl	4(%r15),%ebx
-	xorl	8(%r15),%ecx
-	xorl	12(%r15),%edx
-	leaq	16(%r15),%r15
-	movzbl	%al,%r10d
-	movzbl	%bl,%r11d
-	movzbl	%cl,%r12d
-	movzbl	%dl,%r8d
-	movzbl	%bh,%esi
-	movzbl	%ch,%edi
-	shrl	$16,%ecx
-	movzbl	%dh,%ebp
-	movzbl	(%r14,%r10,1),%r10d
-	movzbl	(%r14,%r11,1),%r11d
-	movzbl	(%r14,%r12,1),%r12d
-	movzbl	(%r14,%r8,1),%r8d
-
-	movzbl	(%r14,%rsi,1),%r9d
-	movzbl	%ah,%esi
-	movzbl	(%r14,%rdi,1),%r13d
-	movzbl	%cl,%edi
-	movzbl	(%r14,%rbp,1),%ebp
-	movzbl	(%r14,%rsi,1),%esi
-
-	shll	$8,%r9d
-	shrl	$16,%edx
-	shll	$8,%r13d
-	xorl	%r9d,%r10d
-	shrl	$16,%eax
-	movzbl	%dl,%r9d
-	shrl	$16,%ebx
-	xorl	%r13d,%r11d
-	shll	$8,%ebp
-	movzbl	%al,%r13d
-	movzbl	(%r14,%rdi,1),%edi
-	xorl	%ebp,%r12d
-
-	shll	$8,%esi
-	movzbl	%bl,%ebp
-	shll	$16,%edi
-	xorl	%esi,%r8d
-	movzbl	(%r14,%r9,1),%r9d
-	movzbl	%dh,%esi
-	movzbl	(%r14,%r13,1),%r13d
-	xorl	%edi,%r10d
-
-	shrl	$8,%ecx
-	movzbl	%ah,%edi
-	shll	$16,%r9d
-	shrl	$8,%ebx
-	shll	$16,%r13d
-	xorl	%r9d,%r11d
-	movzbl	(%r14,%rbp,1),%ebp
-	movzbl	(%r14,%rsi,1),%esi
-	movzbl	(%r14,%rdi,1),%edi
-	movzbl	(%r14,%rcx,1),%edx
-	movzbl	(%r14,%rbx,1),%ecx
-
-	shll	$16,%ebp
-	xorl	%r13d,%r12d
-	shll	$24,%esi
-	xorl	%ebp,%r8d
-	shll	$24,%edi
-	xorl	%esi,%r10d
-	shll	$24,%edx
-	xorl	%edi,%r11d
-	shll	$24,%ecx
-	movl	%r10d,%eax
-	movl	%r11d,%ebx
-	xorl	%r12d,%ecx
-	xorl	%r8d,%edx
-	cmpq	16(%rsp),%r15
-	je	.Lenc_compact_done
-	movl	$0x80808080,%r10d
-	movl	$0x80808080,%r11d
-	andl	%eax,%r10d
-	andl	%ebx,%r11d
-	movl	%r10d,%esi
-	movl	%r11d,%edi
-	shrl	$7,%r10d
-	leal	(%rax,%rax,1),%r8d
-	shrl	$7,%r11d
-	leal	(%rbx,%rbx,1),%r9d
-	subl	%r10d,%esi
-	subl	%r11d,%edi
-	andl	$0xfefefefe,%r8d
-	andl	$0xfefefefe,%r9d
-	andl	$0x1b1b1b1b,%esi
-	andl	$0x1b1b1b1b,%edi
-	movl	%eax,%r10d
-	movl	%ebx,%r11d
-	xorl	%esi,%r8d
-	xorl	%edi,%r9d
-
-	xorl	%r8d,%eax
-	xorl	%r9d,%ebx
-	movl	$0x80808080,%r12d
-	roll	$24,%eax
-	movl	$0x80808080,%ebp
-	roll	$24,%ebx
-	andl	%ecx,%r12d
-	andl	%edx,%ebp
-	xorl	%r8d,%eax
-	xorl	%r9d,%ebx
-	movl	%r12d,%esi
-	rorl	$16,%r10d
-	movl	%ebp,%edi
-	rorl	$16,%r11d
-	leal	(%rcx,%rcx,1),%r8d
-	shrl	$7,%r12d
-	xorl	%r10d,%eax
-	shrl	$7,%ebp
-	xorl	%r11d,%ebx
-	rorl	$8,%r10d
-	leal	(%rdx,%rdx,1),%r9d
-	rorl	$8,%r11d
-	subl	%r12d,%esi
-	subl	%ebp,%edi
-	xorl	%r10d,%eax
-	xorl	%r11d,%ebx
-
-	andl	$0xfefefefe,%r8d
-	andl	$0xfefefefe,%r9d
-	andl	$0x1b1b1b1b,%esi
-	andl	$0x1b1b1b1b,%edi
-	movl	%ecx,%r12d
-	movl	%edx,%ebp
-	xorl	%esi,%r8d
-	xorl	%edi,%r9d
-
-	rorl	$16,%r12d
-	xorl	%r8d,%ecx
-	rorl	$16,%ebp
-	xorl	%r9d,%edx
-	roll	$24,%ecx
-	movl	0(%r14),%esi
-	roll	$24,%edx
-	xorl	%r8d,%ecx
-	movl	64(%r14),%edi
-	xorl	%r9d,%edx
-	movl	128(%r14),%r8d
-	xorl	%r12d,%ecx
-	rorl	$8,%r12d
-	xorl	%ebp,%edx
-	rorl	$8,%ebp
-	xorl	%r12d,%ecx
-	movl	192(%r14),%r9d
-	xorl	%ebp,%edx
-	jmp	.Lenc_loop_compact
-.align	16
-.Lenc_compact_done:
-	xorl	0(%r15),%eax
-	xorl	4(%r15),%ebx
-	xorl	8(%r15),%ecx
-	xorl	12(%r15),%edx
-.byte	0xf3,0xc3
-.cfi_endproc	
-.size	_x86_64_AES_encrypt_compact,.-_x86_64_AES_encrypt_compact
-.globl	AES_encrypt
-.type	AES_encrypt,@function
-.align	16
-.globl	asm_AES_encrypt
-.hidden	asm_AES_encrypt
-asm_AES_encrypt:
-AES_encrypt:
-.cfi_startproc	
-	movq	%rsp,%rax
-.cfi_def_cfa_register	%rax
-	pushq	%rbx
-.cfi_offset	%rbx,-16
-	pushq	%rbp
-.cfi_offset	%rbp,-24
-	pushq	%r12
-.cfi_offset	%r12,-32
-	pushq	%r13
-.cfi_offset	%r13,-40
-	pushq	%r14
-.cfi_offset	%r14,-48
-	pushq	%r15
-.cfi_offset	%r15,-56
-
-
-	leaq	-63(%rdx),%rcx
-	andq	$-64,%rsp
-	subq	%rsp,%rcx
-	negq	%rcx
-	andq	$0x3c0,%rcx
-	subq	%rcx,%rsp
-	subq	$32,%rsp
-
-	movq	%rsi,16(%rsp)
-	movq	%rax,24(%rsp)
-.cfi_escape	0x0f,0x05,0x77,0x18,0x06,0x23,0x08
-.Lenc_prologue:
-
-	movq	%rdx,%r15
-	movl	240(%r15),%r13d
-
-	movl	0(%rdi),%eax
-	movl	4(%rdi),%ebx
-	movl	8(%rdi),%ecx
-	movl	12(%rdi),%edx
-
-	shll	$4,%r13d
-	leaq	(%r15,%r13,1),%rbp
-	movq	%r15,(%rsp)
-	movq	%rbp,8(%rsp)
-
-
-	leaq	.LAES_Te+2048(%rip),%r14
-	leaq	768(%rsp),%rbp
-	subq	%r14,%rbp
-	andq	$0x300,%rbp
-	leaq	(%r14,%rbp,1),%r14
-
-	call	_x86_64_AES_encrypt_compact
-
-	movq	16(%rsp),%r9
-	movq	24(%rsp),%rsi
-.cfi_def_cfa	%rsi,8
-	movl	%eax,0(%r9)
-	movl	%ebx,4(%r9)
-	movl	%ecx,8(%r9)
-	movl	%edx,12(%r9)
-
-	movq	-48(%rsi),%r15
-.cfi_restore	%r15
-	movq	-40(%rsi),%r14
-.cfi_restore	%r14
-	movq	-32(%rsi),%r13
-.cfi_restore	%r13
-	movq	-24(%rsi),%r12
-.cfi_restore	%r12
-	movq	-16(%rsi),%rbp
-.cfi_restore	%rbp
-	movq	-8(%rsi),%rbx
-.cfi_restore	%rbx
-	leaq	(%rsi),%rsp
-.cfi_def_cfa_register	%rsp
-.Lenc_epilogue:
-	.byte	0xf3,0xc3
-.cfi_endproc	
-.size	AES_encrypt,.-AES_encrypt
-.type	_x86_64_AES_decrypt,@function
-.align	16
-_x86_64_AES_decrypt:
-	xorl	0(%r15),%eax
-	xorl	4(%r15),%ebx
-	xorl	8(%r15),%ecx
-	xorl	12(%r15),%edx
-
-	movl	240(%r15),%r13d
-	subl	$1,%r13d
-	jmp	.Ldec_loop
-.align	16
-.Ldec_loop:
-
-	movzbl	%al,%esi
-	movzbl	%bl,%edi
-	movzbl	%cl,%ebp
-	movl	0(%r14,%rsi,8),%r10d
-	movl	0(%r14,%rdi,8),%r11d
-	movl	0(%r14,%rbp,8),%r12d
-
-	movzbl	%dh,%esi
-	movzbl	%ah,%edi
-	movzbl	%dl,%ebp
-	xorl	3(%r14,%rsi,8),%r10d
-	xorl	3(%r14,%rdi,8),%r11d
-	movl	0(%r14,%rbp,8),%r8d
-
-	movzbl	%bh,%esi
-	shrl	$16,%eax
-	movzbl	%ch,%ebp
-	xorl	3(%r14,%rsi,8),%r12d
-	shrl	$16,%edx
-	xorl	3(%r14,%rbp,8),%r8d
-
-	shrl	$16,%ebx
-	leaq	16(%r15),%r15
-	shrl	$16,%ecx
-
-	movzbl	%cl,%esi
-	movzbl	%dl,%edi
-	movzbl	%al,%ebp
-	xorl	2(%r14,%rsi,8),%r10d
-	xorl	2(%r14,%rdi,8),%r11d
-	xorl	2(%r14,%rbp,8),%r12d
-
-	movzbl	%bh,%esi
-	movzbl	%ch,%edi
-	movzbl	%bl,%ebp
-	xorl	1(%r14,%rsi,8),%r10d
-	xorl	1(%r14,%rdi,8),%r11d
-	xorl	2(%r14,%rbp,8),%r8d
-
-	movzbl	%dh,%esi
-	movl	12(%r15),%edx
-	movzbl	%ah,%ebp
-	xorl	1(%r14,%rsi,8),%r12d
-	movl	0(%r15),%eax
-	xorl	1(%r14,%rbp,8),%r8d
-
-	xorl	%r10d,%eax
-	movl	4(%r15),%ebx
-	movl	8(%r15),%ecx
-	xorl	%r12d,%ecx
-	xorl	%r11d,%ebx
-	xorl	%r8d,%edx
-	subl	$1,%r13d
-	jnz	.Ldec_loop
-	leaq	2048(%r14),%r14
-	movzbl	%al,%esi
-	movzbl	%bl,%edi
-	movzbl	%cl,%ebp
-	movzbl	(%r14,%rsi,1),%r10d
-	movzbl	(%r14,%rdi,1),%r11d
-	movzbl	(%r14,%rbp,1),%r12d
-
-	movzbl	%dl,%esi
-	movzbl	%dh,%edi
-	movzbl	%ah,%ebp
-	movzbl	(%r14,%rsi,1),%r8d
-	movzbl	(%r14,%rdi,1),%edi
-	movzbl	(%r14,%rbp,1),%ebp
-
-	shll	$8,%edi
-	shll	$8,%ebp
-
-	xorl	%edi,%r10d
-	xorl	%ebp,%r11d
-	shrl	$16,%edx
-
-	movzbl	%bh,%esi
-	movzbl	%ch,%edi
-	shrl	$16,%eax
-	movzbl	(%r14,%rsi,1),%esi
-	movzbl	(%r14,%rdi,1),%edi
-
-	shll	$8,%esi
-	shll	$8,%edi
-	shrl	$16,%ebx
-	xorl	%esi,%r12d
-	xorl	%edi,%r8d
-	shrl	$16,%ecx
-
-	movzbl	%cl,%esi
-	movzbl	%dl,%edi
-	movzbl	%al,%ebp
-	movzbl	(%r14,%rsi,1),%esi
-	movzbl	(%r14,%rdi,1),%edi
-	movzbl	(%r14,%rbp,1),%ebp
-
-	shll	$16,%esi
-	shll	$16,%edi
-	shll	$16,%ebp
-
-	xorl	%esi,%r10d
-	xorl	%edi,%r11d
-	xorl	%ebp,%r12d
-
-	movzbl	%bl,%esi
-	movzbl	%bh,%edi
-	movzbl	%ch,%ebp
-	movzbl	(%r14,%rsi,1),%esi
-	movzbl	(%r14,%rdi,1),%edi
-	movzbl	(%r14,%rbp,1),%ebp
-
-	shll	$16,%esi
-	shll	$24,%edi
-	shll	$24,%ebp
-
-	xorl	%esi,%r8d
-	xorl	%edi,%r10d
-	xorl	%ebp,%r11d
-
-	movzbl	%dh,%esi
-	movzbl	%ah,%edi
-	movl	16+12(%r15),%edx
-	movzbl	(%r14,%rsi,1),%esi
-	movzbl	(%r14,%rdi,1),%edi
-	movl	16+0(%r15),%eax
-
-	shll	$24,%esi
-	shll	$24,%edi
-
-	xorl	%esi,%r12d
-	xorl	%edi,%r8d
-
-	movl	16+4(%r15),%ebx
-	movl	16+8(%r15),%ecx
-	leaq	-2048(%r14),%r14
-	xorl	%r10d,%eax
-	xorl	%r11d,%ebx
-	xorl	%r12d,%ecx
-	xorl	%r8d,%edx
-.byte	0xf3,0xc3
-.size	_x86_64_AES_decrypt,.-_x86_64_AES_decrypt
-.type	_x86_64_AES_decrypt_compact,@function
-.align	16
-_x86_64_AES_decrypt_compact:
-.cfi_startproc	
-	leaq	128(%r14),%r8
-	movl	0-128(%r8),%edi
-	movl	32-128(%r8),%ebp
-	movl	64-128(%r8),%r10d
-	movl	96-128(%r8),%r11d
-	movl	128-128(%r8),%edi
-	movl	160-128(%r8),%ebp
-	movl	192-128(%r8),%r10d
-	movl	224-128(%r8),%r11d
-	jmp	.Ldec_loop_compact
-
-.align	16
-.Ldec_loop_compact:
-	xorl	0(%r15),%eax
-	xorl	4(%r15),%ebx
-	xorl	8(%r15),%ecx
-	xorl	12(%r15),%edx
-	leaq	16(%r15),%r15
-	movzbl	%al,%r10d
-	movzbl	%bl,%r11d
-	movzbl	%cl,%r12d
-	movzbl	%dl,%r8d
-	movzbl	%dh,%esi
-	movzbl	%ah,%edi
-	shrl	$16,%edx
-	movzbl	%bh,%ebp
-	movzbl	(%r14,%r10,1),%r10d
-	movzbl	(%r14,%r11,1),%r11d
-	movzbl	(%r14,%r12,1),%r12d
-	movzbl	(%r14,%r8,1),%r8d
-
-	movzbl	(%r14,%rsi,1),%r9d
-	movzbl	%ch,%esi
-	movzbl	(%r14,%rdi,1),%r13d
-	movzbl	(%r14,%rbp,1),%ebp
-	movzbl	(%r14,%rsi,1),%esi
-
-	shrl	$16,%ecx
-	shll	$8,%r13d
-	shll	$8,%r9d
-	movzbl	%cl,%edi
-	shrl	$16,%eax
-	xorl	%r9d,%r10d
-	shrl	$16,%ebx
-	movzbl	%dl,%r9d
-
-	shll	$8,%ebp
-	xorl	%r13d,%r11d
-	shll	$8,%esi
-	movzbl	%al,%r13d
-	movzbl	(%r14,%rdi,1),%edi
-	xorl	%ebp,%r12d
-	movzbl	%bl,%ebp
-
-	shll	$16,%edi
-	xorl	%esi,%r8d
-	movzbl	(%r14,%r9,1),%r9d
-	movzbl	%bh,%esi
-	movzbl	(%r14,%rbp,1),%ebp
-	xorl	%edi,%r10d
-	movzbl	(%r14,%r13,1),%r13d
-	movzbl	%ch,%edi
-
-	shll	$16,%ebp
-	shll	$16,%r9d
-	shll	$16,%r13d
-	xorl	%ebp,%r8d
-	movzbl	%dh,%ebp
-	xorl	%r9d,%r11d
-	shrl	$8,%eax
-	xorl	%r13d,%r12d
-
-	movzbl	(%r14,%rsi,1),%esi
-	movzbl	(%r14,%rdi,1),%ebx
-	movzbl	(%r14,%rbp,1),%ecx
-	movzbl	(%r14,%rax,1),%edx
-
-	movl	%r10d,%eax
-	shll	$24,%esi
-	shll	$24,%ebx
-	shll	$24,%ecx
-	xorl	%esi,%eax
-	shll	$24,%edx
-	xorl	%r11d,%ebx
-	xorl	%r12d,%ecx
-	xorl	%r8d,%edx
-	cmpq	16(%rsp),%r15
-	je	.Ldec_compact_done
-
-	movq	256+0(%r14),%rsi
-	shlq	$32,%rbx
-	shlq	$32,%rdx
-	movq	256+8(%r14),%rdi
-	orq	%rbx,%rax
-	orq	%rdx,%rcx
-	movq	256+16(%r14),%rbp
-	movq	%rsi,%r9
-	movq	%rsi,%r12
-	andq	%rax,%r9
-	andq	%rcx,%r12
-	movq	%r9,%rbx
-	movq	%r12,%rdx
-	shrq	$7,%r9
-	leaq	(%rax,%rax,1),%r8
-	shrq	$7,%r12
-	leaq	(%rcx,%rcx,1),%r11
-	subq	%r9,%rbx
-	subq	%r12,%rdx
-	andq	%rdi,%r8
-	andq	%rdi,%r11
-	andq	%rbp,%rbx
-	andq	%rbp,%rdx
-	xorq	%rbx,%r8
-	xorq	%rdx,%r11
-	movq	%rsi,%r10
-	movq	%rsi,%r13
-
-	andq	%r8,%r10
-	andq	%r11,%r13
-	movq	%r10,%rbx
-	movq	%r13,%rdx
-	shrq	$7,%r10
-	leaq	(%r8,%r8,1),%r9
-	shrq	$7,%r13
-	leaq	(%r11,%r11,1),%r12
-	subq	%r10,%rbx
-	subq	%r13,%rdx
-	andq	%rdi,%r9
-	andq	%rdi,%r12
-	andq	%rbp,%rbx
-	andq	%rbp,%rdx
-	xorq	%rbx,%r9
-	xorq	%rdx,%r12
-	movq	%rsi,%r10
-	movq	%rsi,%r13
-
-	andq	%r9,%r10
-	andq	%r12,%r13
-	movq	%r10,%rbx
-	movq	%r13,%rdx
-	shrq	$7,%r10
-	xorq	%rax,%r8
-	shrq	$7,%r13
-	xorq	%rcx,%r11
-	subq	%r10,%rbx
-	subq	%r13,%rdx
-	leaq	(%r9,%r9,1),%r10
-	leaq	(%r12,%r12,1),%r13
-	xorq	%rax,%r9
-	xorq	%rcx,%r12
-	andq	%rdi,%r10
-	andq	%rdi,%r13
-	andq	%rbp,%rbx
-	andq	%rbp,%rdx
-	xorq	%rbx,%r10
-	xorq	%rdx,%r13
-
-	xorq	%r10,%rax
-	xorq	%r13,%rcx
-	xorq	%r10,%r8
-	xorq	%r13,%r11
-	movq	%rax,%rbx
-	movq	%rcx,%rdx
-	xorq	%r10,%r9
-	shrq	$32,%rbx
-	xorq	%r13,%r12
-	shrq	$32,%rdx
-	xorq	%r8,%r10
-	roll	$8,%eax
-	xorq	%r11,%r13
-	roll	$8,%ecx
-	xorq	%r9,%r10
-	roll	$8,%ebx
-	xorq	%r12,%r13
-
-	roll	$8,%edx
-	xorl	%r10d,%eax
-	shrq	$32,%r10
-	xorl	%r13d,%ecx
-	shrq	$32,%r13
-	xorl	%r10d,%ebx
-	xorl	%r13d,%edx
-
-	movq	%r8,%r10
-	roll	$24,%r8d
-	movq	%r11,%r13
-	roll	$24,%r11d
-	shrq	$32,%r10
-	xorl	%r8d,%eax
-	shrq	$32,%r13
-	xorl	%r11d,%ecx
-	roll	$24,%r10d
-	movq	%r9,%r8
-	roll	$24,%r13d
-	movq	%r12,%r11
-	shrq	$32,%r8
-	xorl	%r10d,%ebx
-	shrq	$32,%r11
-	xorl	%r13d,%edx
-
-	movq	0(%r14),%rsi
-	roll	$16,%r9d
-	movq	64(%r14),%rdi
-	roll	$16,%r12d
-	movq	128(%r14),%rbp
-	roll	$16,%r8d
-	movq	192(%r14),%r10
-	xorl	%r9d,%eax
-	roll	$16,%r11d
-	xorl	%r12d,%ecx
-	movq	256(%r14),%r13
-	xorl	%r8d,%ebx
-	xorl	%r11d,%edx
-	jmp	.Ldec_loop_compact
-.align	16
-.Ldec_compact_done:
-	xorl	0(%r15),%eax
-	xorl	4(%r15),%ebx
-	xorl	8(%r15),%ecx
-	xorl	12(%r15),%edx
-.byte	0xf3,0xc3
-.cfi_endproc	
-.size	_x86_64_AES_decrypt_compact,.-_x86_64_AES_decrypt_compact
-.globl	AES_decrypt
-.type	AES_decrypt,@function
-.align	16
-.globl	asm_AES_decrypt
-.hidden	asm_AES_decrypt
-asm_AES_decrypt:
-AES_decrypt:
-.cfi_startproc	
-	movq	%rsp,%rax
-.cfi_def_cfa_register	%rax
-	pushq	%rbx
-.cfi_offset	%rbx,-16
-	pushq	%rbp
-.cfi_offset	%rbp,-24
-	pushq	%r12
-.cfi_offset	%r12,-32
-	pushq	%r13
-.cfi_offset	%r13,-40
-	pushq	%r14
-.cfi_offset	%r14,-48
-	pushq	%r15
-.cfi_offset	%r15,-56
-
-
-	leaq	-63(%rdx),%rcx
-	andq	$-64,%rsp
-	subq	%rsp,%rcx
-	negq	%rcx
-	andq	$0x3c0,%rcx
-	subq	%rcx,%rsp
-	subq	$32,%rsp
-
-	movq	%rsi,16(%rsp)
-	movq	%rax,24(%rsp)
-.cfi_escape	0x0f,0x05,0x77,0x18,0x06,0x23,0x08
-.Ldec_prologue:
-
-	movq	%rdx,%r15
-	movl	240(%r15),%r13d
-
-	movl	0(%rdi),%eax
-	movl	4(%rdi),%ebx
-	movl	8(%rdi),%ecx
-	movl	12(%rdi),%edx
-
-	shll	$4,%r13d
-	leaq	(%r15,%r13,1),%rbp
-	movq	%r15,(%rsp)
-	movq	%rbp,8(%rsp)
-
-
-	leaq	.LAES_Td+2048(%rip),%r14
-	leaq	768(%rsp),%rbp
-	subq	%r14,%rbp
-	andq	$0x300,%rbp
-	leaq	(%r14,%rbp,1),%r14
-	shrq	$3,%rbp
-	addq	%rbp,%r14
-
-	call	_x86_64_AES_decrypt_compact
-
-	movq	16(%rsp),%r9
-	movq	24(%rsp),%rsi
-.cfi_def_cfa	%rsi,8
-	movl	%eax,0(%r9)
-	movl	%ebx,4(%r9)
-	movl	%ecx,8(%r9)
-	movl	%edx,12(%r9)
-
-	movq	-48(%rsi),%r15
-.cfi_restore	%r15
-	movq	-40(%rsi),%r14
-.cfi_restore	%r14
-	movq	-32(%rsi),%r13
-.cfi_restore	%r13
-	movq	-24(%rsi),%r12
-.cfi_restore	%r12
-	movq	-16(%rsi),%rbp
-.cfi_restore	%rbp
-	movq	-8(%rsi),%rbx
-.cfi_restore	%rbx
-	leaq	(%rsi),%rsp
-.cfi_def_cfa_register	%rsp
-.Ldec_epilogue:
-	.byte	0xf3,0xc3
-.cfi_endproc	
-.size	AES_decrypt,.-AES_decrypt
-.globl	AES_set_encrypt_key
-.type	AES_set_encrypt_key,@function
-.align	16
-AES_set_encrypt_key:
-.cfi_startproc	
-	pushq	%rbx
-.cfi_adjust_cfa_offset	8
-.cfi_offset	%rbx,-16
-	pushq	%rbp
-.cfi_adjust_cfa_offset	8
-.cfi_offset	%rbp,-24
-	pushq	%r12
-.cfi_adjust_cfa_offset	8
-.cfi_offset	%r12,-32
-	pushq	%r13
-.cfi_adjust_cfa_offset	8
-.cfi_offset	%r13,-40
-	pushq	%r14
-.cfi_adjust_cfa_offset	8
-.cfi_offset	%r14,-48
-	pushq	%r15
-.cfi_adjust_cfa_offset	8
-.cfi_offset	%r15,-56
-	subq	$8,%rsp
-.cfi_adjust_cfa_offset	8
-.Lenc_key_prologue:
-
-	call	_x86_64_AES_set_encrypt_key
-
-	movq	40(%rsp),%rbp
-.cfi_restore	%rbp
-	movq	48(%rsp),%rbx
-.cfi_restore	%rbx
-	addq	$56,%rsp
-.cfi_adjust_cfa_offset	-56
-.Lenc_key_epilogue:
-	.byte	0xf3,0xc3
-.cfi_endproc	
-.size	AES_set_encrypt_key,.-AES_set_encrypt_key
-
-.type	_x86_64_AES_set_encrypt_key,@function
-.align	16
-_x86_64_AES_set_encrypt_key:
-.cfi_startproc	
-	movl	%esi,%ecx
-	movq	%rdi,%rsi
-	movq	%rdx,%rdi
-
-	testq	$-1,%rsi
-	jz	.Lbadpointer
-	testq	$-1,%rdi
-	jz	.Lbadpointer
-
-	leaq	.LAES_Te(%rip),%rbp
-	leaq	2048+128(%rbp),%rbp
-
-
-	movl	0-128(%rbp),%eax
-	movl	32-128(%rbp),%ebx
-	movl	64-128(%rbp),%r8d
-	movl	96-128(%rbp),%edx
-	movl	128-128(%rbp),%eax
-	movl	160-128(%rbp),%ebx
-	movl	192-128(%rbp),%r8d
-	movl	224-128(%rbp),%edx
-
-	cmpl	$128,%ecx
-	je	.L10rounds
-	cmpl	$192,%ecx
-	je	.L12rounds
-	cmpl	$256,%ecx
-	je	.L14rounds
-	movq	$-2,%rax
-	jmp	.Lexit
-
-.L10rounds:
-	movq	0(%rsi),%rax
-	movq	8(%rsi),%rdx
-	movq	%rax,0(%rdi)
-	movq	%rdx,8(%rdi)
-
-	shrq	$32,%rdx
-	xorl	%ecx,%ecx
-	jmp	.L10shortcut
-.align	4
-.L10loop:
-	movl	0(%rdi),%eax
-	movl	12(%rdi),%edx
-.L10shortcut:
-	movzbl	%dl,%esi
-	movzbl	-128(%rbp,%rsi,1),%ebx
-	movzbl	%dh,%esi
-	shll	$24,%ebx
-	xorl	%ebx,%eax
-
-	movzbl	-128(%rbp,%rsi,1),%ebx
-	shrl	$16,%edx
-	movzbl	%dl,%esi
-	xorl	%ebx,%eax
-
-	movzbl	-128(%rbp,%rsi,1),%ebx
-	movzbl	%dh,%esi
-	shll	$8,%ebx
-	xorl	%ebx,%eax
-
-	movzbl	-128(%rbp,%rsi,1),%ebx
-	shll	$16,%ebx
-	xorl	%ebx,%eax
-
-	xorl	1024-128(%rbp,%rcx,4),%eax
-	movl	%eax,16(%rdi)
-	xorl	4(%rdi),%eax
-	movl	%eax,20(%rdi)
-	xorl	8(%rdi),%eax
-	movl	%eax,24(%rdi)
-	xorl	12(%rdi),%eax
-	movl	%eax,28(%rdi)
-	addl	$1,%ecx
-	leaq	16(%rdi),%rdi
-	cmpl	$10,%ecx
-	jl	.L10loop
-
-	movl	$10,80(%rdi)
-	xorq	%rax,%rax
-	jmp	.Lexit
-
-.L12rounds:
-	movq	0(%rsi),%rax
-	movq	8(%rsi),%rbx
-	movq	16(%rsi),%rdx
-	movq	%rax,0(%rdi)
-	movq	%rbx,8(%rdi)
-	movq	%rdx,16(%rdi)
-
-	shrq	$32,%rdx
-	xorl	%ecx,%ecx
-	jmp	.L12shortcut
-.align	4
-.L12loop:
-	movl	0(%rdi),%eax
-	movl	20(%rdi),%edx
-.L12shortcut:
-	movzbl	%dl,%esi
-	movzbl	-128(%rbp,%rsi,1),%ebx
-	movzbl	%dh,%esi
-	shll	$24,%ebx
-	xorl	%ebx,%eax
-
-	movzbl	-128(%rbp,%rsi,1),%ebx
-	shrl	$16,%edx
-	movzbl	%dl,%esi
-	xorl	%ebx,%eax
-
-	movzbl	-128(%rbp,%rsi,1),%ebx
-	movzbl	%dh,%esi
-	shll	$8,%ebx
-	xorl	%ebx,%eax
-
-	movzbl	-128(%rbp,%rsi,1),%ebx
-	shll	$16,%ebx
-	xorl	%ebx,%eax
-
-	xorl	1024-128(%rbp,%rcx,4),%eax
-	movl	%eax,24(%rdi)
-	xorl	4(%rdi),%eax
-	movl	%eax,28(%rdi)
-	xorl	8(%rdi),%eax
-	movl	%eax,32(%rdi)
-	xorl	12(%rdi),%eax
-	movl	%eax,36(%rdi)
-
-	cmpl	$7,%ecx
-	je	.L12break
-	addl	$1,%ecx
-
-	xorl	16(%rdi),%eax
-	movl	%eax,40(%rdi)
-	xorl	20(%rdi),%eax
-	movl	%eax,44(%rdi)
-
-	leaq	24(%rdi),%rdi
-	jmp	.L12loop
-.L12break:
-	movl	$12,72(%rdi)
-	xorq	%rax,%rax
-	jmp	.Lexit
-
-.L14rounds:
-	movq	0(%rsi),%rax
-	movq	8(%rsi),%rbx
-	movq	16(%rsi),%rcx
-	movq	24(%rsi),%rdx
-	movq	%rax,0(%rdi)
-	movq	%rbx,8(%rdi)
-	movq	%rcx,16(%rdi)
-	movq	%rdx,24(%rdi)
-
-	shrq	$32,%rdx
-	xorl	%ecx,%ecx
-	jmp	.L14shortcut
-.align	4
-.L14loop:
-	movl	0(%rdi),%eax
-	movl	28(%rdi),%edx
-.L14shortcut:
-	movzbl	%dl,%esi
-	movzbl	-128(%rbp,%rsi,1),%ebx
-	movzbl	%dh,%esi
-	shll	$24,%ebx
-	xorl	%ebx,%eax
-
-	movzbl	-128(%rbp,%rsi,1),%ebx
-	shrl	$16,%edx
-	movzbl	%dl,%esi
-	xorl	%ebx,%eax
-
-	movzbl	-128(%rbp,%rsi,1),%ebx
-	movzbl	%dh,%esi
-	shll	$8,%ebx
-	xorl	%ebx,%eax
-
-	movzbl	-128(%rbp,%rsi,1),%ebx
-	shll	$16,%ebx
-	xorl	%ebx,%eax
-
-	xorl	1024-128(%rbp,%rcx,4),%eax
-	movl	%eax,32(%rdi)
-	xorl	4(%rdi),%eax
-	movl	%eax,36(%rdi)
-	xorl	8(%rdi),%eax
-	movl	%eax,40(%rdi)
-	xorl	12(%rdi),%eax
-	movl	%eax,44(%rdi)
-
-	cmpl	$6,%ecx
-	je	.L14break
-	addl	$1,%ecx
-
-	movl	%eax,%edx
-	movl	16(%rdi),%eax
-	movzbl	%dl,%esi
-	movzbl	-128(%rbp,%rsi,1),%ebx
-	movzbl	%dh,%esi
-	xorl	%ebx,%eax
-
-	movzbl	-128(%rbp,%rsi,1),%ebx
-	shrl	$16,%edx
-	shll	$8,%ebx
-	movzbl	%dl,%esi
-	xorl	%ebx,%eax
-
-	movzbl	-128(%rbp,%rsi,1),%ebx
-	movzbl	%dh,%esi
-	shll	$16,%ebx
-	xorl	%ebx,%eax
-
-	movzbl	-128(%rbp,%rsi,1),%ebx
-	shll	$24,%ebx
-	xorl	%ebx,%eax
-
-	movl	%eax,48(%rdi)
-	xorl	20(%rdi),%eax
-	movl	%eax,52(%rdi)
-	xorl	24(%rdi),%eax
-	movl	%eax,56(%rdi)
-	xorl	28(%rdi),%eax
-	movl	%eax,60(%rdi)
-
-	leaq	32(%rdi),%rdi
-	jmp	.L14loop
-.L14break:
-	movl	$14,48(%rdi)
-	xorq	%rax,%rax
-	jmp	.Lexit
-
-.Lbadpointer:
-	movq	$-1,%rax
-.Lexit:
-.byte	0xf3,0xc3
-.cfi_endproc	
-.size	_x86_64_AES_set_encrypt_key,.-_x86_64_AES_set_encrypt_key
-.globl	AES_set_decrypt_key
-.type	AES_set_decrypt_key,@function
-.align	16
-AES_set_decrypt_key:
-.cfi_startproc	
-	pushq	%rbx
-.cfi_adjust_cfa_offset	8
-.cfi_offset	%rbx,-16
-	pushq	%rbp
-.cfi_adjust_cfa_offset	8
-.cfi_offset	%rbp,-24
-	pushq	%r12
-.cfi_adjust_cfa_offset	8
-.cfi_offset	%r12,-32
-	pushq	%r13
-.cfi_adjust_cfa_offset	8
-.cfi_offset	%r13,-40
-	pushq	%r14
-.cfi_adjust_cfa_offset	8
-.cfi_offset	%r14,-48
-	pushq	%r15
-.cfi_adjust_cfa_offset	8
-.cfi_offset	%r15,-56
-	pushq	%rdx
-.cfi_adjust_cfa_offset	8
-.Ldec_key_prologue:
-
-	call	_x86_64_AES_set_encrypt_key
-	movq	(%rsp),%r8
-	cmpl	$0,%eax
-	jne	.Labort
-
-	movl	240(%r8),%r14d
-	xorq	%rdi,%rdi
-	leaq	(%rdi,%r14,4),%rcx
-	movq	%r8,%rsi
-	leaq	(%r8,%rcx,4),%rdi
-.align	4
-.Linvert:
-	movq	0(%rsi),%rax
-	movq	8(%rsi),%rbx
-	movq	0(%rdi),%rcx
-	movq	8(%rdi),%rdx
-	movq	%rax,0(%rdi)
-	movq	%rbx,8(%rdi)
-	movq	%rcx,0(%rsi)
-	movq	%rdx,8(%rsi)
-	leaq	16(%rsi),%rsi
-	leaq	-16(%rdi),%rdi
-	cmpq	%rsi,%rdi
-	jne	.Linvert
-
-	leaq	.LAES_Te+2048+1024(%rip),%rax
-
-	movq	40(%rax),%rsi
-	movq	48(%rax),%rdi
-	movq	56(%rax),%rbp
-
-	movq	%r8,%r15
-	subl	$1,%r14d
-.align	4
-.Lpermute:
-	leaq	16(%r15),%r15
-	movq	0(%r15),%rax
-	movq	8(%r15),%rcx
-	movq	%rsi,%r9
-	movq	%rsi,%r12
-	andq	%rax,%r9
-	andq	%rcx,%r12
-	movq	%r9,%rbx
-	movq	%r12,%rdx
-	shrq	$7,%r9
-	leaq	(%rax,%rax,1),%r8
-	shrq	$7,%r12
-	leaq	(%rcx,%rcx,1),%r11
-	subq	%r9,%rbx
-	subq	%r12,%rdx
-	andq	%rdi,%r8
-	andq	%rdi,%r11
-	andq	%rbp,%rbx
-	andq	%rbp,%rdx
-	xorq	%rbx,%r8
-	xorq	%rdx,%r11
-	movq	%rsi,%r10
-	movq	%rsi,%r13
-
-	andq	%r8,%r10
-	andq	%r11,%r13
-	movq	%r10,%rbx
-	movq	%r13,%rdx
-	shrq	$7,%r10
-	leaq	(%r8,%r8,1),%r9
-	shrq	$7,%r13
-	leaq	(%r11,%r11,1),%r12
-	subq	%r10,%rbx
-	subq	%r13,%rdx
-	andq	%rdi,%r9
-	andq	%rdi,%r12
-	andq	%rbp,%rbx
-	andq	%rbp,%rdx
-	xorq	%rbx,%r9
-	xorq	%rdx,%r12
-	movq	%rsi,%r10
-	movq	%rsi,%r13
-
-	andq	%r9,%r10
-	andq	%r12,%r13
-	movq	%r10,%rbx
-	movq	%r13,%rdx
-	shrq	$7,%r10
-	xorq	%rax,%r8
-	shrq	$7,%r13
-	xorq	%rcx,%r11
-	subq	%r10,%rbx
-	subq	%r13,%rdx
-	leaq	(%r9,%r9,1),%r10
-	leaq	(%r12,%r12,1),%r13
-	xorq	%rax,%r9
-	xorq	%rcx,%r12
-	andq	%rdi,%r10
-	andq	%rdi,%r13
-	andq	%rbp,%rbx
-	andq	%rbp,%rdx
-	xorq	%rbx,%r10
-	xorq	%rdx,%r13
-
-	xorq	%r10,%rax
-	xorq	%r13,%rcx
-	xorq	%r10,%r8
-	xorq	%r13,%r11
-	movq	%rax,%rbx
-	movq	%rcx,%rdx
-	xorq	%r10,%r9
-	shrq	$32,%rbx
-	xorq	%r13,%r12
-	shrq	$32,%rdx
-	xorq	%r8,%r10
-	roll	$8,%eax
-	xorq	%r11,%r13
-	roll	$8,%ecx
-	xorq	%r9,%r10
-	roll	$8,%ebx
-	xorq	%r12,%r13
-
-	roll	$8,%edx
-	xorl	%r10d,%eax
-	shrq	$32,%r10
-	xorl	%r13d,%ecx
-	shrq	$32,%r13
-	xorl	%r10d,%ebx
-	xorl	%r13d,%edx
-
-	movq	%r8,%r10
-	roll	$24,%r8d
-	movq	%r11,%r13
-	roll	$24,%r11d
-	shrq	$32,%r10
-	xorl	%r8d,%eax
-	shrq	$32,%r13
-	xorl	%r11d,%ecx
-	roll	$24,%r10d
-	movq	%r9,%r8
-	roll	$24,%r13d
-	movq	%r12,%r11
-	shrq	$32,%r8
-	xorl	%r10d,%ebx
-	shrq	$32,%r11
-	xorl	%r13d,%edx
-
-
-	roll	$16,%r9d
-
-	roll	$16,%r12d
-
-	roll	$16,%r8d
-
-	xorl	%r9d,%eax
-	roll	$16,%r11d
-	xorl	%r12d,%ecx
-
-	xorl	%r8d,%ebx
-	xorl	%r11d,%edx
-	movl	%eax,0(%r15)
-	movl	%ebx,4(%r15)
-	movl	%ecx,8(%r15)
-	movl	%edx,12(%r15)
-	subl	$1,%r14d
-	jnz	.Lpermute
-
-	xorq	%rax,%rax
-.Labort:
-	movq	8(%rsp),%r15
-.cfi_restore	%r15
-	movq	16(%rsp),%r14
-.cfi_restore	%r14
-	movq	24(%rsp),%r13
-.cfi_restore	%r13
-	movq	32(%rsp),%r12
-.cfi_restore	%r12
-	movq	40(%rsp),%rbp
-.cfi_restore	%rbp
-	movq	48(%rsp),%rbx
-.cfi_restore	%rbx
-	addq	$56,%rsp
-.cfi_adjust_cfa_offset	-56
-.Ldec_key_epilogue:
-	.byte	0xf3,0xc3
-.cfi_endproc	
-.size	AES_set_decrypt_key,.-AES_set_decrypt_key
-.globl	AES_cbc_encrypt
-.type	AES_cbc_encrypt,@function
-.align	16
-
-.globl	asm_AES_cbc_encrypt
-.hidden	asm_AES_cbc_encrypt
-asm_AES_cbc_encrypt:
-AES_cbc_encrypt:
-.cfi_startproc	
-	cmpq	$0,%rdx
-	je	.Lcbc_epilogue
-	pushfq
-
-
-.cfi_adjust_cfa_offset	8
-	pushq	%rbx
-.cfi_adjust_cfa_offset	8
-.cfi_offset	%rbx,-24
-	pushq	%rbp
-.cfi_adjust_cfa_offset	8
-.cfi_offset	%rbp,-32
-	pushq	%r12
-.cfi_adjust_cfa_offset	8
-.cfi_offset	%r12,-40
-	pushq	%r13
-.cfi_adjust_cfa_offset	8
-.cfi_offset	%r13,-48
-	pushq	%r14
-.cfi_adjust_cfa_offset	8
-.cfi_offset	%r14,-56
-	pushq	%r15
-.cfi_adjust_cfa_offset	8
-.cfi_offset	%r15,-64
-.Lcbc_prologue:
-
-	cld
-	movl	%r9d,%r9d
-
-	leaq	.LAES_Te(%rip),%r14
-	leaq	.LAES_Td(%rip),%r10
-	cmpq	$0,%r9
-	cmoveq	%r10,%r14
-
-.cfi_remember_state	
-	movl	OPENSSL_ia32cap_P(%rip),%r10d
-	cmpq	$512,%rdx
-	jb	.Lcbc_slow_prologue
-	testq	$15,%rdx
-	jnz	.Lcbc_slow_prologue
-	btl	$28,%r10d
-	jc	.Lcbc_slow_prologue
-
-
-	leaq	-88-248(%rsp),%r15
-	andq	$-64,%r15
-
-
-	movq	%r14,%r10
-	leaq	2304(%r14),%r11
-	movq	%r15,%r12
-	andq	$0xFFF,%r10
-	andq	$0xFFF,%r11
-	andq	$0xFFF,%r12
-
-	cmpq	%r11,%r12
-	jb	.Lcbc_te_break_out
-	subq	%r11,%r12
-	subq	%r12,%r15
-	jmp	.Lcbc_te_ok
-.Lcbc_te_break_out:
-	subq	%r10,%r12
-	andq	$0xFFF,%r12
-	addq	$320,%r12
-	subq	%r12,%r15
-.align	4
-.Lcbc_te_ok:
-
-	xchgq	%rsp,%r15
-.cfi_def_cfa_register	%r15
-
-	movq	%r15,16(%rsp)
-.cfi_escape	0x0f,0x05,0x77,0x10,0x06,0x23,0x40
-.Lcbc_fast_body:
-	movq	%rdi,24(%rsp)
-	movq	%rsi,32(%rsp)
-	movq	%rdx,40(%rsp)
-	movq	%rcx,48(%rsp)
-	movq	%r8,56(%rsp)
-	movl	$0,80+240(%rsp)
-	movq	%r8,%rbp
-	movq	%r9,%rbx
-	movq	%rsi,%r9
-	movq	%rdi,%r8
-	movq	%rcx,%r15
-
-	movl	240(%r15),%eax
-
-	movq	%r15,%r10
-	subq	%r14,%r10
-	andq	$0xfff,%r10
-	cmpq	$2304,%r10
-	jb	.Lcbc_do_ecopy
-	cmpq	$4096-248,%r10
-	jb	.Lcbc_skip_ecopy
-.align	4
-.Lcbc_do_ecopy:
-	movq	%r15,%rsi
-	leaq	80(%rsp),%rdi
-	leaq	80(%rsp),%r15
-	movl	$30,%ecx
-.long	0x90A548F3
-	movl	%eax,(%rdi)
-.Lcbc_skip_ecopy:
-	movq	%r15,0(%rsp)
-
-	movl	$18,%ecx
-.align	4
-.Lcbc_prefetch_te:
-	movq	0(%r14),%r10
-	movq	32(%r14),%r11
-	movq	64(%r14),%r12
-	movq	96(%r14),%r13
-	leaq	128(%r14),%r14
-	subl	$1,%ecx
-	jnz	.Lcbc_prefetch_te
-	leaq	-2304(%r14),%r14
-
-	cmpq	$0,%rbx
-	je	.LFAST_DECRYPT
-
-
-	movl	0(%rbp),%eax
-	movl	4(%rbp),%ebx
-	movl	8(%rbp),%ecx
-	movl	12(%rbp),%edx
-
-.align	4
-.Lcbc_fast_enc_loop:
-	xorl	0(%r8),%eax
-	xorl	4(%r8),%ebx
-	xorl	8(%r8),%ecx
-	xorl	12(%r8),%edx
-	movq	0(%rsp),%r15
-	movq	%r8,24(%rsp)
-
-	call	_x86_64_AES_encrypt
-
-	movq	24(%rsp),%r8
-	movq	40(%rsp),%r10
-	movl	%eax,0(%r9)
-	movl	%ebx,4(%r9)
-	movl	%ecx,8(%r9)
-	movl	%edx,12(%r9)
-
-	leaq	16(%r8),%r8
-	leaq	16(%r9),%r9
-	subq	$16,%r10
-	testq	$-16,%r10
-	movq	%r10,40(%rsp)
-	jnz	.Lcbc_fast_enc_loop
-	movq	56(%rsp),%rbp
-	movl	%eax,0(%rbp)
-	movl	%ebx,4(%rbp)
-	movl	%ecx,8(%rbp)
-	movl	%edx,12(%rbp)
-
-	jmp	.Lcbc_fast_cleanup
-
-
-.align	16
-.LFAST_DECRYPT:
-	cmpq	%r8,%r9
-	je	.Lcbc_fast_dec_in_place
-
-	movq	%rbp,64(%rsp)
-.align	4
-.Lcbc_fast_dec_loop:
-	movl	0(%r8),%eax
-	movl	4(%r8),%ebx
-	movl	8(%r8),%ecx
-	movl	12(%r8),%edx
-	movq	0(%rsp),%r15
-	movq	%r8,24(%rsp)
-
-	call	_x86_64_AES_decrypt
-
-	movq	64(%rsp),%rbp
-	movq	24(%rsp),%r8
-	movq	40(%rsp),%r10
-	xorl	0(%rbp),%eax
-	xorl	4(%rbp),%ebx
-	xorl	8(%rbp),%ecx
-	xorl	12(%rbp),%edx
-	movq	%r8,%rbp
-
-	subq	$16,%r10
-	movq	%r10,40(%rsp)
-	movq	%rbp,64(%rsp)
-
-	movl	%eax,0(%r9)
-	movl	%ebx,4(%r9)
-	movl	%ecx,8(%r9)
-	movl	%edx,12(%r9)
-
-	leaq	16(%r8),%r8
-	leaq	16(%r9),%r9
-	jnz	.Lcbc_fast_dec_loop
-	movq	56(%rsp),%r12
-	movq	0(%rbp),%r10
-	movq	8(%rbp),%r11
-	movq	%r10,0(%r12)
-	movq	%r11,8(%r12)
-	jmp	.Lcbc_fast_cleanup
-
-.align	16
-.Lcbc_fast_dec_in_place:
-	movq	0(%rbp),%r10
-	movq	8(%rbp),%r11
-	movq	%r10,0+64(%rsp)
-	movq	%r11,8+64(%rsp)
-.align	4
-.Lcbc_fast_dec_in_place_loop:
-	movl	0(%r8),%eax
-	movl	4(%r8),%ebx
-	movl	8(%r8),%ecx
-	movl	12(%r8),%edx
-	movq	0(%rsp),%r15
-	movq	%r8,24(%rsp)
-
-	call	_x86_64_AES_decrypt
-
-	movq	24(%rsp),%r8
-	movq	40(%rsp),%r10
-	xorl	0+64(%rsp),%eax
-	xorl	4+64(%rsp),%ebx
-	xorl	8+64(%rsp),%ecx
-	xorl	12+64(%rsp),%edx
-
-	movq	0(%r8),%r11
-	movq	8(%r8),%r12
-	subq	$16,%r10
-	jz	.Lcbc_fast_dec_in_place_done
-
-	movq	%r11,0+64(%rsp)
-	movq	%r12,8+64(%rsp)
-
-	movl	%eax,0(%r9)
-	movl	%ebx,4(%r9)
-	movl	%ecx,8(%r9)
-	movl	%edx,12(%r9)
-
-	leaq	16(%r8),%r8
-	leaq	16(%r9),%r9
-	movq	%r10,40(%rsp)
-	jmp	.Lcbc_fast_dec_in_place_loop
-.Lcbc_fast_dec_in_place_done:
-	movq	56(%rsp),%rdi
-	movq	%r11,0(%rdi)
-	movq	%r12,8(%rdi)
-
-	movl	%eax,0(%r9)
-	movl	%ebx,4(%r9)
-	movl	%ecx,8(%r9)
-	movl	%edx,12(%r9)
-
-.align	4
-.Lcbc_fast_cleanup:
-	cmpl	$0,80+240(%rsp)
-	leaq	80(%rsp),%rdi
-	je	.Lcbc_exit
-	movl	$30,%ecx
-	xorq	%rax,%rax
-.long	0x90AB48F3
-
-	jmp	.Lcbc_exit
-
-
-.align	16
-.Lcbc_slow_prologue:
-.cfi_restore_state	
-
-	leaq	-88(%rsp),%rbp
-	andq	$-64,%rbp
-
-	leaq	-88-63(%rcx),%r10
-	subq	%rbp,%r10
-	negq	%r10
-	andq	$0x3c0,%r10
-	subq	%r10,%rbp
-
-	xchgq	%rsp,%rbp
-.cfi_def_cfa_register	%rbp
-
-	movq	%rbp,16(%rsp)
-.cfi_escape	0x0f,0x05,0x77,0x10,0x06,0x23,0x40
-.Lcbc_slow_body:
-
-
-
-
-	movq	%r8,56(%rsp)
-	movq	%r8,%rbp
-	movq	%r9,%rbx
-	movq	%rsi,%r9
-	movq	%rdi,%r8
-	movq	%rcx,%r15
-	movq	%rdx,%r10
-
-	movl	240(%r15),%eax
-	movq	%r15,0(%rsp)
-	shll	$4,%eax
-	leaq	(%r15,%rax,1),%rax
-	movq	%rax,8(%rsp)
-
-
-	leaq	2048(%r14),%r14
-	leaq	768-8(%rsp),%rax
-	subq	%r14,%rax
-	andq	$0x300,%rax
-	leaq	(%r14,%rax,1),%r14
-
-	cmpq	$0,%rbx
-	je	.LSLOW_DECRYPT
-
-
-	testq	$-16,%r10
-	movl	0(%rbp),%eax
-	movl	4(%rbp),%ebx
-	movl	8(%rbp),%ecx
-	movl	12(%rbp),%edx
-	jz	.Lcbc_slow_enc_tail
-
-.align	4
-.Lcbc_slow_enc_loop:
-	xorl	0(%r8),%eax
-	xorl	4(%r8),%ebx
-	xorl	8(%r8),%ecx
-	xorl	12(%r8),%edx
-	movq	0(%rsp),%r15
-	movq	%r8,24(%rsp)
-	movq	%r9,32(%rsp)
-	movq	%r10,40(%rsp)
-
-	call	_x86_64_AES_encrypt_compact
-
-	movq	24(%rsp),%r8
-	movq	32(%rsp),%r9
-	movq	40(%rsp),%r10
-	movl	%eax,0(%r9)
-	movl	%ebx,4(%r9)
-	movl	%ecx,8(%r9)
-	movl	%edx,12(%r9)
-
-	leaq	16(%r8),%r8
-	leaq	16(%r9),%r9
-	subq	$16,%r10
-	testq	$-16,%r10
-	jnz	.Lcbc_slow_enc_loop
-	testq	$15,%r10
-	jnz	.Lcbc_slow_enc_tail
-	movq	56(%rsp),%rbp
-	movl	%eax,0(%rbp)
-	movl	%ebx,4(%rbp)
-	movl	%ecx,8(%rbp)
-	movl	%edx,12(%rbp)
-
-	jmp	.Lcbc_exit
-
-.align	4
-.Lcbc_slow_enc_tail:
-	movq	%rax,%r11
-	movq	%rcx,%r12
-	movq	%r10,%rcx
-	movq	%r8,%rsi
-	movq	%r9,%rdi
-.long	0x9066A4F3
-	movq	$16,%rcx
-	subq	%r10,%rcx
-	xorq	%rax,%rax
-.long	0x9066AAF3
-	movq	%r9,%r8
-	movq	$16,%r10
-	movq	%r11,%rax
-	movq	%r12,%rcx
-	jmp	.Lcbc_slow_enc_loop
-
-.align	16
-.LSLOW_DECRYPT:
-	shrq	$3,%rax
-	addq	%rax,%r14
-
-	movq	0(%rbp),%r11
-	movq	8(%rbp),%r12
-	movq	%r11,0+64(%rsp)
-	movq	%r12,8+64(%rsp)
-
-.align	4
-.Lcbc_slow_dec_loop:
-	movl	0(%r8),%eax
-	movl	4(%r8),%ebx
-	movl	8(%r8),%ecx
-	movl	12(%r8),%edx
-	movq	0(%rsp),%r15
-	movq	%r8,24(%rsp)
-	movq	%r9,32(%rsp)
-	movq	%r10,40(%rsp)
-
-	call	_x86_64_AES_decrypt_compact
-
-	movq	24(%rsp),%r8
-	movq	32(%rsp),%r9
-	movq	40(%rsp),%r10
-	xorl	0+64(%rsp),%eax
-	xorl	4+64(%rsp),%ebx
-	xorl	8+64(%rsp),%ecx
-	xorl	12+64(%rsp),%edx
-
-	movq	0(%r8),%r11
-	movq	8(%r8),%r12
-	subq	$16,%r10
-	jc	.Lcbc_slow_dec_partial
-	jz	.Lcbc_slow_dec_done
-
-	movq	%r11,0+64(%rsp)
-	movq	%r12,8+64(%rsp)
-
-	movl	%eax,0(%r9)
-	movl	%ebx,4(%r9)
-	movl	%ecx,8(%r9)
-	movl	%edx,12(%r9)
-
-	leaq	16(%r8),%r8
-	leaq	16(%r9),%r9
-	jmp	.Lcbc_slow_dec_loop
-.Lcbc_slow_dec_done:
-	movq	56(%rsp),%rdi
-	movq	%r11,0(%rdi)
-	movq	%r12,8(%rdi)
-
-	movl	%eax,0(%r9)
-	movl	%ebx,4(%r9)
-	movl	%ecx,8(%r9)
-	movl	%edx,12(%r9)
-
-	jmp	.Lcbc_exit
-
-.align	4
-.Lcbc_slow_dec_partial:
-	movq	56(%rsp),%rdi
-	movq	%r11,0(%rdi)
-	movq	%r12,8(%rdi)
-
-	movl	%eax,0+64(%rsp)
-	movl	%ebx,4+64(%rsp)
-	movl	%ecx,8+64(%rsp)
-	movl	%edx,12+64(%rsp)
-
-	movq	%r9,%rdi
-	leaq	64(%rsp),%rsi
-	leaq	16(%r10),%rcx
-.long	0x9066A4F3
-	jmp	.Lcbc_exit
-
-.align	16
-.Lcbc_exit:
-	movq	16(%rsp),%rsi
-.cfi_def_cfa	%rsi,64
-	movq	(%rsi),%r15
-.cfi_restore	%r15
-	movq	8(%rsi),%r14
-.cfi_restore	%r14
-	movq	16(%rsi),%r13
-.cfi_restore	%r13
-	movq	24(%rsi),%r12
-.cfi_restore	%r12
-	movq	32(%rsi),%rbp
-.cfi_restore	%rbp
-	movq	40(%rsi),%rbx
-.cfi_restore	%rbx
-	leaq	48(%rsi),%rsp
-.cfi_def_cfa	%rsp,16
-.Lcbc_popfq:
-	popfq
-
-
-.cfi_adjust_cfa_offset	-8
-.Lcbc_epilogue:
-	.byte	0xf3,0xc3
-.cfi_endproc	
-.size	AES_cbc_encrypt,.-AES_cbc_encrypt
-.align	64
-.LAES_Te:
-.long	0xa56363c6,0xa56363c6
-.long	0x847c7cf8,0x847c7cf8
-.long	0x997777ee,0x997777ee
-.long	0x8d7b7bf6,0x8d7b7bf6
-.long	0x0df2f2ff,0x0df2f2ff
-.long	0xbd6b6bd6,0xbd6b6bd6
-.long	0xb16f6fde,0xb16f6fde
-.long	0x54c5c591,0x54c5c591
-.long	0x50303060,0x50303060
-.long	0x03010102,0x03010102
-.long	0xa96767ce,0xa96767ce
-.long	0x7d2b2b56,0x7d2b2b56
-.long	0x19fefee7,0x19fefee7
-.long	0x62d7d7b5,0x62d7d7b5
-.long	0xe6abab4d,0xe6abab4d
-.long	0x9a7676ec,0x9a7676ec
-.long	0x45caca8f,0x45caca8f
-.long	0x9d82821f,0x9d82821f
-.long	0x40c9c989,0x40c9c989
-.long	0x877d7dfa,0x877d7dfa
-.long	0x15fafaef,0x15fafaef
-.long	0xeb5959b2,0xeb5959b2
-.long	0xc947478e,0xc947478e
-.long	0x0bf0f0fb,0x0bf0f0fb
-.long	0xecadad41,0xecadad41
-.long	0x67d4d4b3,0x67d4d4b3
-.long	0xfda2a25f,0xfda2a25f
-.long	0xeaafaf45,0xeaafaf45
-.long	0xbf9c9c23,0xbf9c9c23
-.long	0xf7a4a453,0xf7a4a453
-.long	0x967272e4,0x967272e4
-.long	0x5bc0c09b,0x5bc0c09b
-.long	0xc2b7b775,0xc2b7b775
-.long	0x1cfdfde1,0x1cfdfde1
-.long	0xae93933d,0xae93933d
-.long	0x6a26264c,0x6a26264c
-.long	0x5a36366c,0x5a36366c
-.long	0x413f3f7e,0x413f3f7e
-.long	0x02f7f7f5,0x02f7f7f5
-.long	0x4fcccc83,0x4fcccc83
-.long	0x5c343468,0x5c343468
-.long	0xf4a5a551,0xf4a5a551
-.long	0x34e5e5d1,0x34e5e5d1
-.long	0x08f1f1f9,0x08f1f1f9
-.long	0x937171e2,0x937171e2
-.long	0x73d8d8ab,0x73d8d8ab
-.long	0x53313162,0x53313162
-.long	0x3f15152a,0x3f15152a
-.long	0x0c040408,0x0c040408
-.long	0x52c7c795,0x52c7c795
-.long	0x65232346,0x65232346
-.long	0x5ec3c39d,0x5ec3c39d
-.long	0x28181830,0x28181830
-.long	0xa1969637,0xa1969637
-.long	0x0f05050a,0x0f05050a
-.long	0xb59a9a2f,0xb59a9a2f
-.long	0x0907070e,0x0907070e
-.long	0x36121224,0x36121224
-.long	0x9b80801b,0x9b80801b
-.long	0x3de2e2df,0x3de2e2df
-.long	0x26ebebcd,0x26ebebcd
-.long	0x6927274e,0x6927274e
-.long	0xcdb2b27f,0xcdb2b27f
-.long	0x9f7575ea,0x9f7575ea
-.long	0x1b090912,0x1b090912
-.long	0x9e83831d,0x9e83831d
-.long	0x742c2c58,0x742c2c58
-.long	0x2e1a1a34,0x2e1a1a34
-.long	0x2d1b1b36,0x2d1b1b36
-.long	0xb26e6edc,0xb26e6edc
-.long	0xee5a5ab4,0xee5a5ab4
-.long	0xfba0a05b,0xfba0a05b
-.long	0xf65252a4,0xf65252a4
-.long	0x4d3b3b76,0x4d3b3b76
-.long	0x61d6d6b7,0x61d6d6b7
-.long	0xceb3b37d,0xceb3b37d
-.long	0x7b292952,0x7b292952
-.long	0x3ee3e3dd,0x3ee3e3dd
-.long	0x712f2f5e,0x712f2f5e
-.long	0x97848413,0x97848413
-.long	0xf55353a6,0xf55353a6
-.long	0x68d1d1b9,0x68d1d1b9
-.long	0x00000000,0x00000000
-.long	0x2cededc1,0x2cededc1
-.long	0x60202040,0x60202040
-.long	0x1ffcfce3,0x1ffcfce3
-.long	0xc8b1b179,0xc8b1b179
-.long	0xed5b5bb6,0xed5b5bb6
-.long	0xbe6a6ad4,0xbe6a6ad4
-.long	0x46cbcb8d,0x46cbcb8d
-.long	0xd9bebe67,0xd9bebe67
-.long	0x4b393972,0x4b393972
-.long	0xde4a4a94,0xde4a4a94
-.long	0xd44c4c98,0xd44c4c98
-.long	0xe85858b0,0xe85858b0
-.long	0x4acfcf85,0x4acfcf85
-.long	0x6bd0d0bb,0x6bd0d0bb
-.long	0x2aefefc5,0x2aefefc5
-.long	0xe5aaaa4f,0xe5aaaa4f
-.long	0x16fbfbed,0x16fbfbed
-.long	0xc5434386,0xc5434386
-.long	0xd74d4d9a,0xd74d4d9a
-.long	0x55333366,0x55333366
-.long	0x94858511,0x94858511
-.long	0xcf45458a,0xcf45458a
-.long	0x10f9f9e9,0x10f9f9e9
-.long	0x06020204,0x06020204
-.long	0x817f7ffe,0x817f7ffe
-.long	0xf05050a0,0xf05050a0
-.long	0x443c3c78,0x443c3c78
-.long	0xba9f9f25,0xba9f9f25
-.long	0xe3a8a84b,0xe3a8a84b
-.long	0xf35151a2,0xf35151a2
-.long	0xfea3a35d,0xfea3a35d
-.long	0xc0404080,0xc0404080
-.long	0x8a8f8f05,0x8a8f8f05
-.long	0xad92923f,0xad92923f
-.long	0xbc9d9d21,0xbc9d9d21
-.long	0x48383870,0x48383870
-.long	0x04f5f5f1,0x04f5f5f1
-.long	0xdfbcbc63,0xdfbcbc63
-.long	0xc1b6b677,0xc1b6b677
-.long	0x75dadaaf,0x75dadaaf
-.long	0x63212142,0x63212142
-.long	0x30101020,0x30101020
-.long	0x1affffe5,0x1affffe5
-.long	0x0ef3f3fd,0x0ef3f3fd
-.long	0x6dd2d2bf,0x6dd2d2bf
-.long	0x4ccdcd81,0x4ccdcd81
-.long	0x140c0c18,0x140c0c18
-.long	0x35131326,0x35131326
-.long	0x2fececc3,0x2fececc3
-.long	0xe15f5fbe,0xe15f5fbe
-.long	0xa2979735,0xa2979735
-.long	0xcc444488,0xcc444488
-.long	0x3917172e,0x3917172e
-.long	0x57c4c493,0x57c4c493
-.long	0xf2a7a755,0xf2a7a755
-.long	0x827e7efc,0x827e7efc
-.long	0x473d3d7a,0x473d3d7a
-.long	0xac6464c8,0xac6464c8
-.long	0xe75d5dba,0xe75d5dba
-.long	0x2b191932,0x2b191932
-.long	0x957373e6,0x957373e6
-.long	0xa06060c0,0xa06060c0
-.long	0x98818119,0x98818119
-.long	0xd14f4f9e,0xd14f4f9e
-.long	0x7fdcdca3,0x7fdcdca3
-.long	0x66222244,0x66222244
-.long	0x7e2a2a54,0x7e2a2a54
-.long	0xab90903b,0xab90903b
-.long	0x8388880b,0x8388880b
-.long	0xca46468c,0xca46468c
-.long	0x29eeeec7,0x29eeeec7
-.long	0xd3b8b86b,0xd3b8b86b
-.long	0x3c141428,0x3c141428
-.long	0x79dedea7,0x79dedea7
-.long	0xe25e5ebc,0xe25e5ebc
-.long	0x1d0b0b16,0x1d0b0b16
-.long	0x76dbdbad,0x76dbdbad
-.long	0x3be0e0db,0x3be0e0db
-.long	0x56323264,0x56323264
-.long	0x4e3a3a74,0x4e3a3a74
-.long	0x1e0a0a14,0x1e0a0a14
-.long	0xdb494992,0xdb494992
-.long	0x0a06060c,0x0a06060c
-.long	0x6c242448,0x6c242448
-.long	0xe45c5cb8,0xe45c5cb8
-.long	0x5dc2c29f,0x5dc2c29f
-.long	0x6ed3d3bd,0x6ed3d3bd
-.long	0xefacac43,0xefacac43
-.long	0xa66262c4,0xa66262c4
-.long	0xa8919139,0xa8919139
-.long	0xa4959531,0xa4959531
-.long	0x37e4e4d3,0x37e4e4d3
-.long	0x8b7979f2,0x8b7979f2
-.long	0x32e7e7d5,0x32e7e7d5
-.long	0x43c8c88b,0x43c8c88b
-.long	0x5937376e,0x5937376e
-.long	0xb76d6dda,0xb76d6dda
-.long	0x8c8d8d01,0x8c8d8d01
-.long	0x64d5d5b1,0x64d5d5b1
-.long	0xd24e4e9c,0xd24e4e9c
-.long	0xe0a9a949,0xe0a9a949
-.long	0xb46c6cd8,0xb46c6cd8
-.long	0xfa5656ac,0xfa5656ac
-.long	0x07f4f4f3,0x07f4f4f3
-.long	0x25eaeacf,0x25eaeacf
-.long	0xaf6565ca,0xaf6565ca
-.long	0x8e7a7af4,0x8e7a7af4
-.long	0xe9aeae47,0xe9aeae47
-.long	0x18080810,0x18080810
-.long	0xd5baba6f,0xd5baba6f
-.long	0x887878f0,0x887878f0
-.long	0x6f25254a,0x6f25254a
-.long	0x722e2e5c,0x722e2e5c
-.long	0x241c1c38,0x241c1c38
-.long	0xf1a6a657,0xf1a6a657
-.long	0xc7b4b473,0xc7b4b473
-.long	0x51c6c697,0x51c6c697
-.long	0x23e8e8cb,0x23e8e8cb
-.long	0x7cdddda1,0x7cdddda1
-.long	0x9c7474e8,0x9c7474e8
-.long	0x211f1f3e,0x211f1f3e
-.long	0xdd4b4b96,0xdd4b4b96
-.long	0xdcbdbd61,0xdcbdbd61
-.long	0x868b8b0d,0x868b8b0d
-.long	0x858a8a0f,0x858a8a0f
-.long	0x907070e0,0x907070e0
-.long	0x423e3e7c,0x423e3e7c
-.long	0xc4b5b571,0xc4b5b571
-.long	0xaa6666cc,0xaa6666cc
-.long	0xd8484890,0xd8484890
-.long	0x05030306,0x05030306
-.long	0x01f6f6f7,0x01f6f6f7
-.long	0x120e0e1c,0x120e0e1c
-.long	0xa36161c2,0xa36161c2
-.long	0x5f35356a,0x5f35356a
-.long	0xf95757ae,0xf95757ae
-.long	0xd0b9b969,0xd0b9b969
-.long	0x91868617,0x91868617
-.long	0x58c1c199,0x58c1c199
-.long	0x271d1d3a,0x271d1d3a
-.long	0xb99e9e27,0xb99e9e27
-.long	0x38e1e1d9,0x38e1e1d9
-.long	0x13f8f8eb,0x13f8f8eb
-.long	0xb398982b,0xb398982b
-.long	0x33111122,0x33111122
-.long	0xbb6969d2,0xbb6969d2
-.long	0x70d9d9a9,0x70d9d9a9
-.long	0x898e8e07,0x898e8e07
-.long	0xa7949433,0xa7949433
-.long	0xb69b9b2d,0xb69b9b2d
-.long	0x221e1e3c,0x221e1e3c
-.long	0x92878715,0x92878715
-.long	0x20e9e9c9,0x20e9e9c9
-.long	0x49cece87,0x49cece87
-.long	0xff5555aa,0xff5555aa
-.long	0x78282850,0x78282850
-.long	0x7adfdfa5,0x7adfdfa5
-.long	0x8f8c8c03,0x8f8c8c03
-.long	0xf8a1a159,0xf8a1a159
-.long	0x80898909,0x80898909
-.long	0x170d0d1a,0x170d0d1a
-.long	0xdabfbf65,0xdabfbf65
-.long	0x31e6e6d7,0x31e6e6d7
-.long	0xc6424284,0xc6424284
-.long	0xb86868d0,0xb86868d0
-.long	0xc3414182,0xc3414182
-.long	0xb0999929,0xb0999929
-.long	0x772d2d5a,0x772d2d5a
-.long	0x110f0f1e,0x110f0f1e
-.long	0xcbb0b07b,0xcbb0b07b
-.long	0xfc5454a8,0xfc5454a8
-.long	0xd6bbbb6d,0xd6bbbb6d
-.long	0x3a16162c,0x3a16162c
-.byte	0x63,0x7c,0x77,0x7b,0xf2,0x6b,0x6f,0xc5
-.byte	0x30,0x01,0x67,0x2b,0xfe,0xd7,0xab,0x76
-.byte	0xca,0x82,0xc9,0x7d,0xfa,0x59,0x47,0xf0
-.byte	0xad,0xd4,0xa2,0xaf,0x9c,0xa4,0x72,0xc0
-.byte	0xb7,0xfd,0x93,0x26,0x36,0x3f,0xf7,0xcc
-.byte	0x34,0xa5,0xe5,0xf1,0x71,0xd8,0x31,0x15
-.byte	0x04,0xc7,0x23,0xc3,0x18,0x96,0x05,0x9a
-.byte	0x07,0x12,0x80,0xe2,0xeb,0x27,0xb2,0x75
-.byte	0x09,0x83,0x2c,0x1a,0x1b,0x6e,0x5a,0xa0
-.byte	0x52,0x3b,0xd6,0xb3,0x29,0xe3,0x2f,0x84
-.byte	0x53,0xd1,0x00,0xed,0x20,0xfc,0xb1,0x5b
-.byte	0x6a,0xcb,0xbe,0x39,0x4a,0x4c,0x58,0xcf
-.byte	0xd0,0xef,0xaa,0xfb,0x43,0x4d,0x33,0x85
-.byte	0x45,0xf9,0x02,0x7f,0x50,0x3c,0x9f,0xa8
-.byte	0x51,0xa3,0x40,0x8f,0x92,0x9d,0x38,0xf5
-.byte	0xbc,0xb6,0xda,0x21,0x10,0xff,0xf3,0xd2
-.byte	0xcd,0x0c,0x13,0xec,0x5f,0x97,0x44,0x17
-.byte	0xc4,0xa7,0x7e,0x3d,0x64,0x5d,0x19,0x73
-.byte	0x60,0x81,0x4f,0xdc,0x22,0x2a,0x90,0x88
-.byte	0x46,0xee,0xb8,0x14,0xde,0x5e,0x0b,0xdb
-.byte	0xe0,0x32,0x3a,0x0a,0x49,0x06,0x24,0x5c
-.byte	0xc2,0xd3,0xac,0x62,0x91,0x95,0xe4,0x79
-.byte	0xe7,0xc8,0x37,0x6d,0x8d,0xd5,0x4e,0xa9
-.byte	0x6c,0x56,0xf4,0xea,0x65,0x7a,0xae,0x08
-.byte	0xba,0x78,0x25,0x2e,0x1c,0xa6,0xb4,0xc6
-.byte	0xe8,0xdd,0x74,0x1f,0x4b,0xbd,0x8b,0x8a
-.byte	0x70,0x3e,0xb5,0x66,0x48,0x03,0xf6,0x0e
-.byte	0x61,0x35,0x57,0xb9,0x86,0xc1,0x1d,0x9e
-.byte	0xe1,0xf8,0x98,0x11,0x69,0xd9,0x8e,0x94
-.byte	0x9b,0x1e,0x87,0xe9,0xce,0x55,0x28,0xdf
-.byte	0x8c,0xa1,0x89,0x0d,0xbf,0xe6,0x42,0x68
-.byte	0x41,0x99,0x2d,0x0f,0xb0,0x54,0xbb,0x16
-.byte	0x63,0x7c,0x77,0x7b,0xf2,0x6b,0x6f,0xc5
-.byte	0x30,0x01,0x67,0x2b,0xfe,0xd7,0xab,0x76
-.byte	0xca,0x82,0xc9,0x7d,0xfa,0x59,0x47,0xf0
-.byte	0xad,0xd4,0xa2,0xaf,0x9c,0xa4,0x72,0xc0
-.byte	0xb7,0xfd,0x93,0x26,0x36,0x3f,0xf7,0xcc
-.byte	0x34,0xa5,0xe5,0xf1,0x71,0xd8,0x31,0x15
-.byte	0x04,0xc7,0x23,0xc3,0x18,0x96,0x05,0x9a
-.byte	0x07,0x12,0x80,0xe2,0xeb,0x27,0xb2,0x75
-.byte	0x09,0x83,0x2c,0x1a,0x1b,0x6e,0x5a,0xa0
-.byte	0x52,0x3b,0xd6,0xb3,0x29,0xe3,0x2f,0x84
-.byte	0x53,0xd1,0x00,0xed,0x20,0xfc,0xb1,0x5b
-.byte	0x6a,0xcb,0xbe,0x39,0x4a,0x4c,0x58,0xcf
-.byte	0xd0,0xef,0xaa,0xfb,0x43,0x4d,0x33,0x85
-.byte	0x45,0xf9,0x02,0x7f,0x50,0x3c,0x9f,0xa8
-.byte	0x51,0xa3,0x40,0x8f,0x92,0x9d,0x38,0xf5
-.byte	0xbc,0xb6,0xda,0x21,0x10,0xff,0xf3,0xd2
-.byte	0xcd,0x0c,0x13,0xec,0x5f,0x97,0x44,0x17
-.byte	0xc4,0xa7,0x7e,0x3d,0x64,0x5d,0x19,0x73
-.byte	0x60,0x81,0x4f,0xdc,0x22,0x2a,0x90,0x88
-.byte	0x46,0xee,0xb8,0x14,0xde,0x5e,0x0b,0xdb
-.byte	0xe0,0x32,0x3a,0x0a,0x49,0x06,0x24,0x5c
-.byte	0xc2,0xd3,0xac,0x62,0x91,0x95,0xe4,0x79
-.byte	0xe7,0xc8,0x37,0x6d,0x8d,0xd5,0x4e,0xa9
-.byte	0x6c,0x56,0xf4,0xea,0x65,0x7a,0xae,0x08
-.byte	0xba,0x78,0x25,0x2e,0x1c,0xa6,0xb4,0xc6
-.byte	0xe8,0xdd,0x74,0x1f,0x4b,0xbd,0x8b,0x8a
-.byte	0x70,0x3e,0xb5,0x66,0x48,0x03,0xf6,0x0e
-.byte	0x61,0x35,0x57,0xb9,0x86,0xc1,0x1d,0x9e
-.byte	0xe1,0xf8,0x98,0x11,0x69,0xd9,0x8e,0x94
-.byte	0x9b,0x1e,0x87,0xe9,0xce,0x55,0x28,0xdf
-.byte	0x8c,0xa1,0x89,0x0d,0xbf,0xe6,0x42,0x68
-.byte	0x41,0x99,0x2d,0x0f,0xb0,0x54,0xbb,0x16
-.byte	0x63,0x7c,0x77,0x7b,0xf2,0x6b,0x6f,0xc5
-.byte	0x30,0x01,0x67,0x2b,0xfe,0xd7,0xab,0x76
-.byte	0xca,0x82,0xc9,0x7d,0xfa,0x59,0x47,0xf0
-.byte	0xad,0xd4,0xa2,0xaf,0x9c,0xa4,0x72,0xc0
-.byte	0xb7,0xfd,0x93,0x26,0x36,0x3f,0xf7,0xcc
-.byte	0x34,0xa5,0xe5,0xf1,0x71,0xd8,0x31,0x15
-.byte	0x04,0xc7,0x23,0xc3,0x18,0x96,0x05,0x9a
-.byte	0x07,0x12,0x80,0xe2,0xeb,0x27,0xb2,0x75
-.byte	0x09,0x83,0x2c,0x1a,0x1b,0x6e,0x5a,0xa0
-.byte	0x52,0x3b,0xd6,0xb3,0x29,0xe3,0x2f,0x84
-.byte	0x53,0xd1,0x00,0xed,0x20,0xfc,0xb1,0x5b
-.byte	0x6a,0xcb,0xbe,0x39,0x4a,0x4c,0x58,0xcf
-.byte	0xd0,0xef,0xaa,0xfb,0x43,0x4d,0x33,0x85
-.byte	0x45,0xf9,0x02,0x7f,0x50,0x3c,0x9f,0xa8
-.byte	0x51,0xa3,0x40,0x8f,0x92,0x9d,0x38,0xf5
-.byte	0xbc,0xb6,0xda,0x21,0x10,0xff,0xf3,0xd2
-.byte	0xcd,0x0c,0x13,0xec,0x5f,0x97,0x44,0x17
-.byte	0xc4,0xa7,0x7e,0x3d,0x64,0x5d,0x19,0x73
-.byte	0x60,0x81,0x4f,0xdc,0x22,0x2a,0x90,0x88
-.byte	0x46,0xee,0xb8,0x14,0xde,0x5e,0x0b,0xdb
-.byte	0xe0,0x32,0x3a,0x0a,0x49,0x06,0x24,0x5c
-.byte	0xc2,0xd3,0xac,0x62,0x91,0x95,0xe4,0x79
-.byte	0xe7,0xc8,0x37,0x6d,0x8d,0xd5,0x4e,0xa9
-.byte	0x6c,0x56,0xf4,0xea,0x65,0x7a,0xae,0x08
-.byte	0xba,0x78,0x25,0x2e,0x1c,0xa6,0xb4,0xc6
-.byte	0xe8,0xdd,0x74,0x1f,0x4b,0xbd,0x8b,0x8a
-.byte	0x70,0x3e,0xb5,0x66,0x48,0x03,0xf6,0x0e
-.byte	0x61,0x35,0x57,0xb9,0x86,0xc1,0x1d,0x9e
-.byte	0xe1,0xf8,0x98,0x11,0x69,0xd9,0x8e,0x94
-.byte	0x9b,0x1e,0x87,0xe9,0xce,0x55,0x28,0xdf
-.byte	0x8c,0xa1,0x89,0x0d,0xbf,0xe6,0x42,0x68
-.byte	0x41,0x99,0x2d,0x0f,0xb0,0x54,0xbb,0x16
-.byte	0x63,0x7c,0x77,0x7b,0xf2,0x6b,0x6f,0xc5
-.byte	0x30,0x01,0x67,0x2b,0xfe,0xd7,0xab,0x76
-.byte	0xca,0x82,0xc9,0x7d,0xfa,0x59,0x47,0xf0
-.byte	0xad,0xd4,0xa2,0xaf,0x9c,0xa4,0x72,0xc0
-.byte	0xb7,0xfd,0x93,0x26,0x36,0x3f,0xf7,0xcc
-.byte	0x34,0xa5,0xe5,0xf1,0x71,0xd8,0x31,0x15
-.byte	0x04,0xc7,0x23,0xc3,0x18,0x96,0x05,0x9a
-.byte	0x07,0x12,0x80,0xe2,0xeb,0x27,0xb2,0x75
-.byte	0x09,0x83,0x2c,0x1a,0x1b,0x6e,0x5a,0xa0
-.byte	0x52,0x3b,0xd6,0xb3,0x29,0xe3,0x2f,0x84
-.byte	0x53,0xd1,0x00,0xed,0x20,0xfc,0xb1,0x5b
-.byte	0x6a,0xcb,0xbe,0x39,0x4a,0x4c,0x58,0xcf
-.byte	0xd0,0xef,0xaa,0xfb,0x43,0x4d,0x33,0x85
-.byte	0x45,0xf9,0x02,0x7f,0x50,0x3c,0x9f,0xa8
-.byte	0x51,0xa3,0x40,0x8f,0x92,0x9d,0x38,0xf5
-.byte	0xbc,0xb6,0xda,0x21,0x10,0xff,0xf3,0xd2
-.byte	0xcd,0x0c,0x13,0xec,0x5f,0x97,0x44,0x17
-.byte	0xc4,0xa7,0x7e,0x3d,0x64,0x5d,0x19,0x73
-.byte	0x60,0x81,0x4f,0xdc,0x22,0x2a,0x90,0x88
-.byte	0x46,0xee,0xb8,0x14,0xde,0x5e,0x0b,0xdb
-.byte	0xe0,0x32,0x3a,0x0a,0x49,0x06,0x24,0x5c
-.byte	0xc2,0xd3,0xac,0x62,0x91,0x95,0xe4,0x79
-.byte	0xe7,0xc8,0x37,0x6d,0x8d,0xd5,0x4e,0xa9
-.byte	0x6c,0x56,0xf4,0xea,0x65,0x7a,0xae,0x08
-.byte	0xba,0x78,0x25,0x2e,0x1c,0xa6,0xb4,0xc6
-.byte	0xe8,0xdd,0x74,0x1f,0x4b,0xbd,0x8b,0x8a
-.byte	0x70,0x3e,0xb5,0x66,0x48,0x03,0xf6,0x0e
-.byte	0x61,0x35,0x57,0xb9,0x86,0xc1,0x1d,0x9e
-.byte	0xe1,0xf8,0x98,0x11,0x69,0xd9,0x8e,0x94
-.byte	0x9b,0x1e,0x87,0xe9,0xce,0x55,0x28,0xdf
-.byte	0x8c,0xa1,0x89,0x0d,0xbf,0xe6,0x42,0x68
-.byte	0x41,0x99,0x2d,0x0f,0xb0,0x54,0xbb,0x16
-.long	0x00000001, 0x00000002, 0x00000004, 0x00000008
-.long	0x00000010, 0x00000020, 0x00000040, 0x00000080
-.long	0x0000001b, 0x00000036, 0x80808080, 0x80808080
-.long	0xfefefefe, 0xfefefefe, 0x1b1b1b1b, 0x1b1b1b1b
-.align	64
-.LAES_Td:
-.long	0x50a7f451,0x50a7f451
-.long	0x5365417e,0x5365417e
-.long	0xc3a4171a,0xc3a4171a
-.long	0x965e273a,0x965e273a
-.long	0xcb6bab3b,0xcb6bab3b
-.long	0xf1459d1f,0xf1459d1f
-.long	0xab58faac,0xab58faac
-.long	0x9303e34b,0x9303e34b
-.long	0x55fa3020,0x55fa3020
-.long	0xf66d76ad,0xf66d76ad
-.long	0x9176cc88,0x9176cc88
-.long	0x254c02f5,0x254c02f5
-.long	0xfcd7e54f,0xfcd7e54f
-.long	0xd7cb2ac5,0xd7cb2ac5
-.long	0x80443526,0x80443526
-.long	0x8fa362b5,0x8fa362b5
-.long	0x495ab1de,0x495ab1de
-.long	0x671bba25,0x671bba25
-.long	0x980eea45,0x980eea45
-.long	0xe1c0fe5d,0xe1c0fe5d
-.long	0x02752fc3,0x02752fc3
-.long	0x12f04c81,0x12f04c81
-.long	0xa397468d,0xa397468d
-.long	0xc6f9d36b,0xc6f9d36b
-.long	0xe75f8f03,0xe75f8f03
-.long	0x959c9215,0x959c9215
-.long	0xeb7a6dbf,0xeb7a6dbf
-.long	0xda595295,0xda595295
-.long	0x2d83bed4,0x2d83bed4
-.long	0xd3217458,0xd3217458
-.long	0x2969e049,0x2969e049
-.long	0x44c8c98e,0x44c8c98e
-.long	0x6a89c275,0x6a89c275
-.long	0x78798ef4,0x78798ef4
-.long	0x6b3e5899,0x6b3e5899
-.long	0xdd71b927,0xdd71b927
-.long	0xb64fe1be,0xb64fe1be
-.long	0x17ad88f0,0x17ad88f0
-.long	0x66ac20c9,0x66ac20c9
-.long	0xb43ace7d,0xb43ace7d
-.long	0x184adf63,0x184adf63
-.long	0x82311ae5,0x82311ae5
-.long	0x60335197,0x60335197
-.long	0x457f5362,0x457f5362
-.long	0xe07764b1,0xe07764b1
-.long	0x84ae6bbb,0x84ae6bbb
-.long	0x1ca081fe,0x1ca081fe
-.long	0x942b08f9,0x942b08f9
-.long	0x58684870,0x58684870
-.long	0x19fd458f,0x19fd458f
-.long	0x876cde94,0x876cde94
-.long	0xb7f87b52,0xb7f87b52
-.long	0x23d373ab,0x23d373ab
-.long	0xe2024b72,0xe2024b72
-.long	0x578f1fe3,0x578f1fe3
-.long	0x2aab5566,0x2aab5566
-.long	0x0728ebb2,0x0728ebb2
-.long	0x03c2b52f,0x03c2b52f
-.long	0x9a7bc586,0x9a7bc586
-.long	0xa50837d3,0xa50837d3
-.long	0xf2872830,0xf2872830
-.long	0xb2a5bf23,0xb2a5bf23
-.long	0xba6a0302,0xba6a0302
-.long	0x5c8216ed,0x5c8216ed
-.long	0x2b1ccf8a,0x2b1ccf8a
-.long	0x92b479a7,0x92b479a7
-.long	0xf0f207f3,0xf0f207f3
-.long	0xa1e2694e,0xa1e2694e
-.long	0xcdf4da65,0xcdf4da65
-.long	0xd5be0506,0xd5be0506
-.long	0x1f6234d1,0x1f6234d1
-.long	0x8afea6c4,0x8afea6c4
-.long	0x9d532e34,0x9d532e34
-.long	0xa055f3a2,0xa055f3a2
-.long	0x32e18a05,0x32e18a05
-.long	0x75ebf6a4,0x75ebf6a4
-.long	0x39ec830b,0x39ec830b
-.long	0xaaef6040,0xaaef6040
-.long	0x069f715e,0x069f715e
-.long	0x51106ebd,0x51106ebd
-.long	0xf98a213e,0xf98a213e
-.long	0x3d06dd96,0x3d06dd96
-.long	0xae053edd,0xae053edd
-.long	0x46bde64d,0x46bde64d
-.long	0xb58d5491,0xb58d5491
-.long	0x055dc471,0x055dc471
-.long	0x6fd40604,0x6fd40604
-.long	0xff155060,0xff155060
-.long	0x24fb9819,0x24fb9819
-.long	0x97e9bdd6,0x97e9bdd6
-.long	0xcc434089,0xcc434089
-.long	0x779ed967,0x779ed967
-.long	0xbd42e8b0,0xbd42e8b0
-.long	0x888b8907,0x888b8907
-.long	0x385b19e7,0x385b19e7
-.long	0xdbeec879,0xdbeec879
-.long	0x470a7ca1,0x470a7ca1
-.long	0xe90f427c,0xe90f427c
-.long	0xc91e84f8,0xc91e84f8
-.long	0x00000000,0x00000000
-.long	0x83868009,0x83868009
-.long	0x48ed2b32,0x48ed2b32
-.long	0xac70111e,0xac70111e
-.long	0x4e725a6c,0x4e725a6c
-.long	0xfbff0efd,0xfbff0efd
-.long	0x5638850f,0x5638850f
-.long	0x1ed5ae3d,0x1ed5ae3d
-.long	0x27392d36,0x27392d36
-.long	0x64d90f0a,0x64d90f0a
-.long	0x21a65c68,0x21a65c68
-.long	0xd1545b9b,0xd1545b9b
-.long	0x3a2e3624,0x3a2e3624
-.long	0xb1670a0c,0xb1670a0c
-.long	0x0fe75793,0x0fe75793
-.long	0xd296eeb4,0xd296eeb4
-.long	0x9e919b1b,0x9e919b1b
-.long	0x4fc5c080,0x4fc5c080
-.long	0xa220dc61,0xa220dc61
-.long	0x694b775a,0x694b775a
-.long	0x161a121c,0x161a121c
-.long	0x0aba93e2,0x0aba93e2
-.long	0xe52aa0c0,0xe52aa0c0
-.long	0x43e0223c,0x43e0223c
-.long	0x1d171b12,0x1d171b12
-.long	0x0b0d090e,0x0b0d090e
-.long	0xadc78bf2,0xadc78bf2
-.long	0xb9a8b62d,0xb9a8b62d
-.long	0xc8a91e14,0xc8a91e14
-.long	0x8519f157,0x8519f157
-.long	0x4c0775af,0x4c0775af
-.long	0xbbdd99ee,0xbbdd99ee
-.long	0xfd607fa3,0xfd607fa3
-.long	0x9f2601f7,0x9f2601f7
-.long	0xbcf5725c,0xbcf5725c
-.long	0xc53b6644,0xc53b6644
-.long	0x347efb5b,0x347efb5b
-.long	0x7629438b,0x7629438b
-.long	0xdcc623cb,0xdcc623cb
-.long	0x68fcedb6,0x68fcedb6
-.long	0x63f1e4b8,0x63f1e4b8
-.long	0xcadc31d7,0xcadc31d7
-.long	0x10856342,0x10856342
-.long	0x40229713,0x40229713
-.long	0x2011c684,0x2011c684
-.long	0x7d244a85,0x7d244a85
-.long	0xf83dbbd2,0xf83dbbd2
-.long	0x1132f9ae,0x1132f9ae
-.long	0x6da129c7,0x6da129c7
-.long	0x4b2f9e1d,0x4b2f9e1d
-.long	0xf330b2dc,0xf330b2dc
-.long	0xec52860d,0xec52860d
-.long	0xd0e3c177,0xd0e3c177
-.long	0x6c16b32b,0x6c16b32b
-.long	0x99b970a9,0x99b970a9
-.long	0xfa489411,0xfa489411
-.long	0x2264e947,0x2264e947
-.long	0xc48cfca8,0xc48cfca8
-.long	0x1a3ff0a0,0x1a3ff0a0
-.long	0xd82c7d56,0xd82c7d56
-.long	0xef903322,0xef903322
-.long	0xc74e4987,0xc74e4987
-.long	0xc1d138d9,0xc1d138d9
-.long	0xfea2ca8c,0xfea2ca8c
-.long	0x360bd498,0x360bd498
-.long	0xcf81f5a6,0xcf81f5a6
-.long	0x28de7aa5,0x28de7aa5
-.long	0x268eb7da,0x268eb7da
-.long	0xa4bfad3f,0xa4bfad3f
-.long	0xe49d3a2c,0xe49d3a2c
-.long	0x0d927850,0x0d927850
-.long	0x9bcc5f6a,0x9bcc5f6a
-.long	0x62467e54,0x62467e54
-.long	0xc2138df6,0xc2138df6
-.long	0xe8b8d890,0xe8b8d890
-.long	0x5ef7392e,0x5ef7392e
-.long	0xf5afc382,0xf5afc382
-.long	0xbe805d9f,0xbe805d9f
-.long	0x7c93d069,0x7c93d069
-.long	0xa92dd56f,0xa92dd56f
-.long	0xb31225cf,0xb31225cf
-.long	0x3b99acc8,0x3b99acc8
-.long	0xa77d1810,0xa77d1810
-.long	0x6e639ce8,0x6e639ce8
-.long	0x7bbb3bdb,0x7bbb3bdb
-.long	0x097826cd,0x097826cd
-.long	0xf418596e,0xf418596e
-.long	0x01b79aec,0x01b79aec
-.long	0xa89a4f83,0xa89a4f83
-.long	0x656e95e6,0x656e95e6
-.long	0x7ee6ffaa,0x7ee6ffaa
-.long	0x08cfbc21,0x08cfbc21
-.long	0xe6e815ef,0xe6e815ef
-.long	0xd99be7ba,0xd99be7ba
-.long	0xce366f4a,0xce366f4a
-.long	0xd4099fea,0xd4099fea
-.long	0xd67cb029,0xd67cb029
-.long	0xafb2a431,0xafb2a431
-.long	0x31233f2a,0x31233f2a
-.long	0x3094a5c6,0x3094a5c6
-.long	0xc066a235,0xc066a235
-.long	0x37bc4e74,0x37bc4e74
-.long	0xa6ca82fc,0xa6ca82fc
-.long	0xb0d090e0,0xb0d090e0
-.long	0x15d8a733,0x15d8a733
-.long	0x4a9804f1,0x4a9804f1
-.long	0xf7daec41,0xf7daec41
-.long	0x0e50cd7f,0x0e50cd7f
-.long	0x2ff69117,0x2ff69117
-.long	0x8dd64d76,0x8dd64d76
-.long	0x4db0ef43,0x4db0ef43
-.long	0x544daacc,0x544daacc
-.long	0xdf0496e4,0xdf0496e4
-.long	0xe3b5d19e,0xe3b5d19e
-.long	0x1b886a4c,0x1b886a4c
-.long	0xb81f2cc1,0xb81f2cc1
-.long	0x7f516546,0x7f516546
-.long	0x04ea5e9d,0x04ea5e9d
-.long	0x5d358c01,0x5d358c01
-.long	0x737487fa,0x737487fa
-.long	0x2e410bfb,0x2e410bfb
-.long	0x5a1d67b3,0x5a1d67b3
-.long	0x52d2db92,0x52d2db92
-.long	0x335610e9,0x335610e9
-.long	0x1347d66d,0x1347d66d
-.long	0x8c61d79a,0x8c61d79a
-.long	0x7a0ca137,0x7a0ca137
-.long	0x8e14f859,0x8e14f859
-.long	0x893c13eb,0x893c13eb
-.long	0xee27a9ce,0xee27a9ce
-.long	0x35c961b7,0x35c961b7
-.long	0xede51ce1,0xede51ce1
-.long	0x3cb1477a,0x3cb1477a
-.long	0x59dfd29c,0x59dfd29c
-.long	0x3f73f255,0x3f73f255
-.long	0x79ce1418,0x79ce1418
-.long	0xbf37c773,0xbf37c773
-.long	0xeacdf753,0xeacdf753
-.long	0x5baafd5f,0x5baafd5f
-.long	0x146f3ddf,0x146f3ddf
-.long	0x86db4478,0x86db4478
-.long	0x81f3afca,0x81f3afca
-.long	0x3ec468b9,0x3ec468b9
-.long	0x2c342438,0x2c342438
-.long	0x5f40a3c2,0x5f40a3c2
-.long	0x72c31d16,0x72c31d16
-.long	0x0c25e2bc,0x0c25e2bc
-.long	0x8b493c28,0x8b493c28
-.long	0x41950dff,0x41950dff
-.long	0x7101a839,0x7101a839
-.long	0xdeb30c08,0xdeb30c08
-.long	0x9ce4b4d8,0x9ce4b4d8
-.long	0x90c15664,0x90c15664
-.long	0x6184cb7b,0x6184cb7b
-.long	0x70b632d5,0x70b632d5
-.long	0x745c6c48,0x745c6c48
-.long	0x4257b8d0,0x4257b8d0
-.byte	0x52,0x09,0x6a,0xd5,0x30,0x36,0xa5,0x38
-.byte	0xbf,0x40,0xa3,0x9e,0x81,0xf3,0xd7,0xfb
-.byte	0x7c,0xe3,0x39,0x82,0x9b,0x2f,0xff,0x87
-.byte	0x34,0x8e,0x43,0x44,0xc4,0xde,0xe9,0xcb
-.byte	0x54,0x7b,0x94,0x32,0xa6,0xc2,0x23,0x3d
-.byte	0xee,0x4c,0x95,0x0b,0x42,0xfa,0xc3,0x4e
-.byte	0x08,0x2e,0xa1,0x66,0x28,0xd9,0x24,0xb2
-.byte	0x76,0x5b,0xa2,0x49,0x6d,0x8b,0xd1,0x25
-.byte	0x72,0xf8,0xf6,0x64,0x86,0x68,0x98,0x16
-.byte	0xd4,0xa4,0x5c,0xcc,0x5d,0x65,0xb6,0x92
-.byte	0x6c,0x70,0x48,0x50,0xfd,0xed,0xb9,0xda
-.byte	0x5e,0x15,0x46,0x57,0xa7,0x8d,0x9d,0x84
-.byte	0x90,0xd8,0xab,0x00,0x8c,0xbc,0xd3,0x0a
-.byte	0xf7,0xe4,0x58,0x05,0xb8,0xb3,0x45,0x06
-.byte	0xd0,0x2c,0x1e,0x8f,0xca,0x3f,0x0f,0x02
-.byte	0xc1,0xaf,0xbd,0x03,0x01,0x13,0x8a,0x6b
-.byte	0x3a,0x91,0x11,0x41,0x4f,0x67,0xdc,0xea
-.byte	0x97,0xf2,0xcf,0xce,0xf0,0xb4,0xe6,0x73
-.byte	0x96,0xac,0x74,0x22,0xe7,0xad,0x35,0x85
-.byte	0xe2,0xf9,0x37,0xe8,0x1c,0x75,0xdf,0x6e
-.byte	0x47,0xf1,0x1a,0x71,0x1d,0x29,0xc5,0x89
-.byte	0x6f,0xb7,0x62,0x0e,0xaa,0x18,0xbe,0x1b
-.byte	0xfc,0x56,0x3e,0x4b,0xc6,0xd2,0x79,0x20
-.byte	0x9a,0xdb,0xc0,0xfe,0x78,0xcd,0x5a,0xf4
-.byte	0x1f,0xdd,0xa8,0x33,0x88,0x07,0xc7,0x31
-.byte	0xb1,0x12,0x10,0x59,0x27,0x80,0xec,0x5f
-.byte	0x60,0x51,0x7f,0xa9,0x19,0xb5,0x4a,0x0d
-.byte	0x2d,0xe5,0x7a,0x9f,0x93,0xc9,0x9c,0xef
-.byte	0xa0,0xe0,0x3b,0x4d,0xae,0x2a,0xf5,0xb0
-.byte	0xc8,0xeb,0xbb,0x3c,0x83,0x53,0x99,0x61
-.byte	0x17,0x2b,0x04,0x7e,0xba,0x77,0xd6,0x26
-.byte	0xe1,0x69,0x14,0x63,0x55,0x21,0x0c,0x7d
-.long	0x80808080, 0x80808080, 0xfefefefe, 0xfefefefe
-.long	0x1b1b1b1b, 0x1b1b1b1b, 0, 0
-.byte	0x52,0x09,0x6a,0xd5,0x30,0x36,0xa5,0x38
-.byte	0xbf,0x40,0xa3,0x9e,0x81,0xf3,0xd7,0xfb
-.byte	0x7c,0xe3,0x39,0x82,0x9b,0x2f,0xff,0x87
-.byte	0x34,0x8e,0x43,0x44,0xc4,0xde,0xe9,0xcb
-.byte	0x54,0x7b,0x94,0x32,0xa6,0xc2,0x23,0x3d
-.byte	0xee,0x4c,0x95,0x0b,0x42,0xfa,0xc3,0x4e
-.byte	0x08,0x2e,0xa1,0x66,0x28,0xd9,0x24,0xb2
-.byte	0x76,0x5b,0xa2,0x49,0x6d,0x8b,0xd1,0x25
-.byte	0x72,0xf8,0xf6,0x64,0x86,0x68,0x98,0x16
-.byte	0xd4,0xa4,0x5c,0xcc,0x5d,0x65,0xb6,0x92
-.byte	0x6c,0x70,0x48,0x50,0xfd,0xed,0xb9,0xda
-.byte	0x5e,0x15,0x46,0x57,0xa7,0x8d,0x9d,0x84
-.byte	0x90,0xd8,0xab,0x00,0x8c,0xbc,0xd3,0x0a
-.byte	0xf7,0xe4,0x58,0x05,0xb8,0xb3,0x45,0x06
-.byte	0xd0,0x2c,0x1e,0x8f,0xca,0x3f,0x0f,0x02
-.byte	0xc1,0xaf,0xbd,0x03,0x01,0x13,0x8a,0x6b
-.byte	0x3a,0x91,0x11,0x41,0x4f,0x67,0xdc,0xea
-.byte	0x97,0xf2,0xcf,0xce,0xf0,0xb4,0xe6,0x73
-.byte	0x96,0xac,0x74,0x22,0xe7,0xad,0x35,0x85
-.byte	0xe2,0xf9,0x37,0xe8,0x1c,0x75,0xdf,0x6e
-.byte	0x47,0xf1,0x1a,0x71,0x1d,0x29,0xc5,0x89
-.byte	0x6f,0xb7,0x62,0x0e,0xaa,0x18,0xbe,0x1b
-.byte	0xfc,0x56,0x3e,0x4b,0xc6,0xd2,0x79,0x20
-.byte	0x9a,0xdb,0xc0,0xfe,0x78,0xcd,0x5a,0xf4
-.byte	0x1f,0xdd,0xa8,0x33,0x88,0x07,0xc7,0x31
-.byte	0xb1,0x12,0x10,0x59,0x27,0x80,0xec,0x5f
-.byte	0x60,0x51,0x7f,0xa9,0x19,0xb5,0x4a,0x0d
-.byte	0x2d,0xe5,0x7a,0x9f,0x93,0xc9,0x9c,0xef
-.byte	0xa0,0xe0,0x3b,0x4d,0xae,0x2a,0xf5,0xb0
-.byte	0xc8,0xeb,0xbb,0x3c,0x83,0x53,0x99,0x61
-.byte	0x17,0x2b,0x04,0x7e,0xba,0x77,0xd6,0x26
-.byte	0xe1,0x69,0x14,0x63,0x55,0x21,0x0c,0x7d
-.long	0x80808080, 0x80808080, 0xfefefefe, 0xfefefefe
-.long	0x1b1b1b1b, 0x1b1b1b1b, 0, 0
-.byte	0x52,0x09,0x6a,0xd5,0x30,0x36,0xa5,0x38
-.byte	0xbf,0x40,0xa3,0x9e,0x81,0xf3,0xd7,0xfb
-.byte	0x7c,0xe3,0x39,0x82,0x9b,0x2f,0xff,0x87
-.byte	0x34,0x8e,0x43,0x44,0xc4,0xde,0xe9,0xcb
-.byte	0x54,0x7b,0x94,0x32,0xa6,0xc2,0x23,0x3d
-.byte	0xee,0x4c,0x95,0x0b,0x42,0xfa,0xc3,0x4e
-.byte	0x08,0x2e,0xa1,0x66,0x28,0xd9,0x24,0xb2
-.byte	0x76,0x5b,0xa2,0x49,0x6d,0x8b,0xd1,0x25
-.byte	0x72,0xf8,0xf6,0x64,0x86,0x68,0x98,0x16
-.byte	0xd4,0xa4,0x5c,0xcc,0x5d,0x65,0xb6,0x92
-.byte	0x6c,0x70,0x48,0x50,0xfd,0xed,0xb9,0xda
-.byte	0x5e,0x15,0x46,0x57,0xa7,0x8d,0x9d,0x84
-.byte	0x90,0xd8,0xab,0x00,0x8c,0xbc,0xd3,0x0a
-.byte	0xf7,0xe4,0x58,0x05,0xb8,0xb3,0x45,0x06
-.byte	0xd0,0x2c,0x1e,0x8f,0xca,0x3f,0x0f,0x02
-.byte	0xc1,0xaf,0xbd,0x03,0x01,0x13,0x8a,0x6b
-.byte	0x3a,0x91,0x11,0x41,0x4f,0x67,0xdc,0xea
-.byte	0x97,0xf2,0xcf,0xce,0xf0,0xb4,0xe6,0x73
-.byte	0x96,0xac,0x74,0x22,0xe7,0xad,0x35,0x85
-.byte	0xe2,0xf9,0x37,0xe8,0x1c,0x75,0xdf,0x6e
-.byte	0x47,0xf1,0x1a,0x71,0x1d,0x29,0xc5,0x89
-.byte	0x6f,0xb7,0x62,0x0e,0xaa,0x18,0xbe,0x1b
-.byte	0xfc,0x56,0x3e,0x4b,0xc6,0xd2,0x79,0x20
-.byte	0x9a,0xdb,0xc0,0xfe,0x78,0xcd,0x5a,0xf4
-.byte	0x1f,0xdd,0xa8,0x33,0x88,0x07,0xc7,0x31
-.byte	0xb1,0x12,0x10,0x59,0x27,0x80,0xec,0x5f
-.byte	0x60,0x51,0x7f,0xa9,0x19,0xb5,0x4a,0x0d
-.byte	0x2d,0xe5,0x7a,0x9f,0x93,0xc9,0x9c,0xef
-.byte	0xa0,0xe0,0x3b,0x4d,0xae,0x2a,0xf5,0xb0
-.byte	0xc8,0xeb,0xbb,0x3c,0x83,0x53,0x99,0x61
-.byte	0x17,0x2b,0x04,0x7e,0xba,0x77,0xd6,0x26
-.byte	0xe1,0x69,0x14,0x63,0x55,0x21,0x0c,0x7d
-.long	0x80808080, 0x80808080, 0xfefefefe, 0xfefefefe
-.long	0x1b1b1b1b, 0x1b1b1b1b, 0, 0
-.byte	0x52,0x09,0x6a,0xd5,0x30,0x36,0xa5,0x38
-.byte	0xbf,0x40,0xa3,0x9e,0x81,0xf3,0xd7,0xfb
-.byte	0x7c,0xe3,0x39,0x82,0x9b,0x2f,0xff,0x87
-.byte	0x34,0x8e,0x43,0x44,0xc4,0xde,0xe9,0xcb
-.byte	0x54,0x7b,0x94,0x32,0xa6,0xc2,0x23,0x3d
-.byte	0xee,0x4c,0x95,0x0b,0x42,0xfa,0xc3,0x4e
-.byte	0x08,0x2e,0xa1,0x66,0x28,0xd9,0x24,0xb2
-.byte	0x76,0x5b,0xa2,0x49,0x6d,0x8b,0xd1,0x25
-.byte	0x72,0xf8,0xf6,0x64,0x86,0x68,0x98,0x16
-.byte	0xd4,0xa4,0x5c,0xcc,0x5d,0x65,0xb6,0x92
-.byte	0x6c,0x70,0x48,0x50,0xfd,0xed,0xb9,0xda
-.byte	0x5e,0x15,0x46,0x57,0xa7,0x8d,0x9d,0x84
-.byte	0x90,0xd8,0xab,0x00,0x8c,0xbc,0xd3,0x0a
-.byte	0xf7,0xe4,0x58,0x05,0xb8,0xb3,0x45,0x06
-.byte	0xd0,0x2c,0x1e,0x8f,0xca,0x3f,0x0f,0x02
-.byte	0xc1,0xaf,0xbd,0x03,0x01,0x13,0x8a,0x6b
-.byte	0x3a,0x91,0x11,0x41,0x4f,0x67,0xdc,0xea
-.byte	0x97,0xf2,0xcf,0xce,0xf0,0xb4,0xe6,0x73
-.byte	0x96,0xac,0x74,0x22,0xe7,0xad,0x35,0x85
-.byte	0xe2,0xf9,0x37,0xe8,0x1c,0x75,0xdf,0x6e
-.byte	0x47,0xf1,0x1a,0x71,0x1d,0x29,0xc5,0x89
-.byte	0x6f,0xb7,0x62,0x0e,0xaa,0x18,0xbe,0x1b
-.byte	0xfc,0x56,0x3e,0x4b,0xc6,0xd2,0x79,0x20
-.byte	0x9a,0xdb,0xc0,0xfe,0x78,0xcd,0x5a,0xf4
-.byte	0x1f,0xdd,0xa8,0x33,0x88,0x07,0xc7,0x31
-.byte	0xb1,0x12,0x10,0x59,0x27,0x80,0xec,0x5f
-.byte	0x60,0x51,0x7f,0xa9,0x19,0xb5,0x4a,0x0d
-.byte	0x2d,0xe5,0x7a,0x9f,0x93,0xc9,0x9c,0xef
-.byte	0xa0,0xe0,0x3b,0x4d,0xae,0x2a,0xf5,0xb0
-.byte	0xc8,0xeb,0xbb,0x3c,0x83,0x53,0x99,0x61
-.byte	0x17,0x2b,0x04,0x7e,0xba,0x77,0xd6,0x26
-.byte	0xe1,0x69,0x14,0x63,0x55,0x21,0x0c,0x7d
-.long	0x80808080, 0x80808080, 0xfefefefe, 0xfefefefe
-.long	0x1b1b1b1b, 0x1b1b1b1b, 0, 0
-.byte	65,69,83,32,102,111,114,32,120,56,54,95,54,52,44,32,67,82,89,80,84,79,71,65,77,83,32,98,121,32,60,97,112,112,114,111,64,111,112,101,110,115,115,108,46,111,114,103,62,0
-.align	64
diff --git a/deps/openssl/config/archs/BSD-x86_64/asm/crypto/aes/aesni-sha1-x86_64.s b/deps/openssl/config/archs/BSD-x86_64/asm/crypto/aes/aesni-sha1-x86_64.s
index 4d2dfe4489..978bd2b623 100644
--- a/deps/openssl/config/archs/BSD-x86_64/asm/crypto/aes/aesni-sha1-x86_64.s
+++ b/deps/openssl/config/archs/BSD-x86_64/asm/crypto/aes/aesni-sha1-x86_64.s
@@ -5,6 +5,7 @@
 .type	aesni_cbc_sha1_enc,@function
 .align	32
 aesni_cbc_sha1_enc:
+.cfi_startproc
 
 	movl	OPENSSL_ia32cap_P+0(%rip),%r10d
 	movq	OPENSSL_ia32cap_P+4(%rip),%r11
@@ -17,6 +18,7 @@ aesni_cbc_sha1_enc:
 	je	aesni_cbc_sha1_enc_avx
 	jmp	aesni_cbc_sha1_enc_ssse3
 	.byte	0xf3,0xc3
+.cfi_endproc
 .size	aesni_cbc_sha1_enc,.-aesni_cbc_sha1_enc
 .type	aesni_cbc_sha1_enc_ssse3,@function
 .align	32
@@ -2730,6 +2732,7 @@ K_XX_XX:
 .type	aesni_cbc_sha1_enc_shaext,@function
 .align	32
 aesni_cbc_sha1_enc_shaext:
+.cfi_startproc
 	movq	8(%rsp),%r10
 	movdqu	(%r9),%xmm8
 	movd	16(%r9),%xmm9
@@ -3028,4 +3031,5 @@ aesni_cbc_sha1_enc_shaext:
 	movdqu	%xmm8,(%r9)
 	movd	%xmm9,16(%r9)
 	.byte	0xf3,0xc3
+.cfi_endproc
 .size	aesni_cbc_sha1_enc_shaext,.-aesni_cbc_sha1_enc_shaext
diff --git a/deps/openssl/config/archs/BSD-x86_64/asm/crypto/aes/aesni-sha256-x86_64.s b/deps/openssl/config/archs/BSD-x86_64/asm/crypto/aes/aesni-sha256-x86_64.s
index 5a47b3ee51..dd09f1b290 100644
--- a/deps/openssl/config/archs/BSD-x86_64/asm/crypto/aes/aesni-sha256-x86_64.s
+++ b/deps/openssl/config/archs/BSD-x86_64/asm/crypto/aes/aesni-sha256-x86_64.s
@@ -5,6 +5,7 @@
 .type	aesni_cbc_sha256_enc,@function
 .align	16
 aesni_cbc_sha256_enc:
+.cfi_startproc
 	leaq	OPENSSL_ia32cap_P(%rip),%r11
 	movl	$1,%eax
 	cmpq	$0,%rdi
@@ -30,6 +31,7 @@ aesni_cbc_sha256_enc:
 	ud2
 .Lprobe:
 	.byte	0xf3,0xc3
+.cfi_endproc
 .size	aesni_cbc_sha256_enc,.-aesni_cbc_sha256_enc
 
 .align	64
@@ -2528,7 +2530,15 @@ aesni_cbc_sha256_enc_avx2:
 	vmovdqa	%ymm4,0(%rsp)
 	xorl	%r14d,%r14d
 	vmovdqa	%ymm5,32(%rsp)
+
+	movq	120(%rsp),%rsi
+.cfi_def_cfa	%rsi,8
 	leaq	-64(%rsp),%rsp
+
+
+
+	movq	%rsi,-8(%rsp)
+.cfi_escape	0x0f,0x05,0x77,0x78,0x06,0x23,0x08
 	movl	%ebx,%esi
 	vmovdqa	%ymm6,0(%rsp)
 	xorl	%ecx,%esi
@@ -2542,6 +2552,12 @@ aesni_cbc_sha256_enc_avx2:
 	vmovdqu	(%r13),%xmm9
 	vpinsrq	$0,%r13,%xmm15,%xmm15
 	leaq	-64(%rsp),%rsp
+.cfi_escape	0x0f,0x05,0x77,0x38,0x06,0x23,0x08
+
+	pushq	64-8(%rsp)
+.cfi_escape	0x0f,0x05,0x77,0x00,0x06,0x23,0x08
+	leaq	8(%rsp),%rsp
+.cfi_escape	0x0f,0x05,0x77,0x78,0x06,0x23,0x08
 	vpalignr	$4,%ymm0,%ymm1,%ymm4
 	addl	0+128(%rsp),%r11d
 	andl	%r8d,%r12d
@@ -2816,6 +2832,12 @@ aesni_cbc_sha256_enc_avx2:
 	movl	%r9d,%r12d
 	vmovdqa	%ymm6,32(%rsp)
 	leaq	-64(%rsp),%rsp
+.cfi_escape	0x0f,0x05,0x77,0x38,0x06,0x23,0x08
+
+	pushq	64-8(%rsp)
+.cfi_escape	0x0f,0x05,0x77,0x00,0x06,0x23,0x08
+	leaq	8(%rsp),%rsp
+.cfi_escape	0x0f,0x05,0x77,0x78,0x06,0x23,0x08
 	vpalignr	$4,%ymm2,%ymm3,%ymm4
 	addl	0+128(%rsp),%r11d
 	andl	%r8d,%r12d
@@ -4029,10 +4051,12 @@ aesni_cbc_sha256_enc_avx2:
 	jbe	.Loop_avx2
 	leaq	(%rsp),%rbp
 
+
+.cfi_escape	0x0f,0x06,0x76,0xf8,0x00,0x06,0x23,0x08
+
 .Ldone_avx2:
-	leaq	(%rbp),%rsp
-	movq	64+32(%rsp),%r8
-	movq	120(%rsp),%rsi
+	movq	64+32(%rbp),%r8
+	movq	64+56(%rbp),%rsi
 .cfi_def_cfa	%rsi,8
 	vmovdqu	%xmm8,(%r8)
 	vzeroall
@@ -4057,6 +4081,7 @@ aesni_cbc_sha256_enc_avx2:
 .type	aesni_cbc_sha256_enc_shaext,@function
 .align	32
 aesni_cbc_sha256_enc_shaext:
+.cfi_startproc
 	movq	8(%rsp),%r10
 	leaq	K256+128(%rip),%rax
 	movdqu	(%r9),%xmm1
@@ -4406,4 +4431,5 @@ aesni_cbc_sha256_enc_shaext:
 	movdqu	%xmm1,(%r9)
 	movdqu	%xmm2,16(%r9)
 	.byte	0xf3,0xc3
+.cfi_endproc
 .size	aesni_cbc_sha256_enc_shaext,.-aesni_cbc_sha256_enc_shaext
diff --git a/deps/openssl/config/archs/BSD-x86_64/asm/crypto/aes/aesni-x86_64.s b/deps/openssl/config/archs/BSD-x86_64/asm/crypto/aes/aesni-x86_64.s
index 2986a647c1..c1e791eff5 100644
--- a/deps/openssl/config/archs/BSD-x86_64/asm/crypto/aes/aesni-x86_64.s
+++ b/deps/openssl/config/archs/BSD-x86_64/asm/crypto/aes/aesni-x86_64.s
@@ -861,6 +861,7 @@ aesni_ecb_encrypt:
 .type	aesni_ccm64_encrypt_blocks,@function
 .align	16
 aesni_ccm64_encrypt_blocks:
+.cfi_startproc
 	movl	240(%rcx),%eax
 	movdqu	(%r8),%xmm6
 	movdqa	.Lincrement64(%rip),%xmm9
@@ -919,11 +920,13 @@ aesni_ccm64_encrypt_blocks:
 	pxor	%xmm8,%xmm8
 	pxor	%xmm6,%xmm6
 	.byte	0xf3,0xc3
+.cfi_endproc
 .size	aesni_ccm64_encrypt_blocks,.-aesni_ccm64_encrypt_blocks
 .globl	aesni_ccm64_decrypt_blocks
 .type	aesni_ccm64_decrypt_blocks,@function
 .align	16
 aesni_ccm64_decrypt_blocks:
+.cfi_startproc
 	movl	240(%rcx),%eax
 	movups	(%r8),%xmm6
 	movdqu	(%r9),%xmm3
@@ -1016,6 +1019,7 @@ aesni_ccm64_decrypt_blocks:
 	pxor	%xmm8,%xmm8
 	pxor	%xmm6,%xmm6
 	.byte	0xf3,0xc3
+.cfi_endproc
 .size	aesni_ccm64_decrypt_blocks,.-aesni_ccm64_decrypt_blocks
 .globl	aesni_ctr32_encrypt_blocks
 .type	aesni_ctr32_encrypt_blocks,@function
@@ -2790,6 +2794,7 @@ aesni_ocb_encrypt:
 .type	__ocb_encrypt6,@function
 .align	32
 __ocb_encrypt6:
+.cfi_startproc
 	pxor	%xmm9,%xmm15
 	movdqu	(%rbx,%r12,1),%xmm11
 	movdqa	%xmm10,%xmm12
@@ -2887,11 +2892,13 @@ __ocb_encrypt6:
 .byte	102,65,15,56,221,246
 .byte	102,65,15,56,221,255
 	.byte	0xf3,0xc3
+.cfi_endproc
 .size	__ocb_encrypt6,.-__ocb_encrypt6
 
 .type	__ocb_encrypt4,@function
 .align	32
 __ocb_encrypt4:
+.cfi_startproc
 	pxor	%xmm9,%xmm15
 	movdqu	(%rbx,%r12,1),%xmm11
 	movdqa	%xmm10,%xmm12
@@ -2956,11 +2963,13 @@ __ocb_encrypt4:
 .byte	102,65,15,56,221,228
 .byte	102,65,15,56,221,237
 	.byte	0xf3,0xc3
+.cfi_endproc
 .size	__ocb_encrypt4,.-__ocb_encrypt4
 
 .type	__ocb_encrypt1,@function
 .align	32
 __ocb_encrypt1:
+.cfi_startproc
 	pxor	%xmm15,%xmm7
 	pxor	%xmm9,%xmm7
 	pxor	%xmm2,%xmm8
@@ -2991,6 +3000,7 @@ __ocb_encrypt1:
 
 .byte	102,15,56,221,215
 	.byte	0xf3,0xc3
+.cfi_endproc
 .size	__ocb_encrypt1,.-__ocb_encrypt1
 
 .globl	aesni_ocb_decrypt
@@ -3233,6 +3243,7 @@ aesni_ocb_decrypt:
 .type	__ocb_decrypt6,@function
 .align	32
 __ocb_decrypt6:
+.cfi_startproc
 	pxor	%xmm9,%xmm15
 	movdqu	(%rbx,%r12,1),%xmm11
 	movdqa	%xmm10,%xmm12
@@ -3324,11 +3335,13 @@ __ocb_decrypt6:
 .byte	102,65,15,56,223,246
 .byte	102,65,15,56,223,255
 	.byte	0xf3,0xc3
+.cfi_endproc
 .size	__ocb_decrypt6,.-__ocb_decrypt6
 
 .type	__ocb_decrypt4,@function
 .align	32
 __ocb_decrypt4:
+.cfi_startproc
 	pxor	%xmm9,%xmm15
 	movdqu	(%rbx,%r12,1),%xmm11
 	movdqa	%xmm10,%xmm12
@@ -3389,11 +3402,13 @@ __ocb_decrypt4:
 .byte	102,65,15,56,223,228
 .byte	102,65,15,56,223,237
 	.byte	0xf3,0xc3
+.cfi_endproc
 .size	__ocb_decrypt4,.-__ocb_decrypt4
 
 .type	__ocb_decrypt1,@function
 .align	32
 __ocb_decrypt1:
+.cfi_startproc
 	pxor	%xmm15,%xmm7
 	pxor	%xmm9,%xmm7
 	pxor	%xmm7,%xmm2
@@ -3423,6 +3438,7 @@ __ocb_decrypt1:
 
 .byte	102,15,56,223,215
 	.byte	0xf3,0xc3
+.cfi_endproc
 .size	__ocb_decrypt1,.-__ocb_decrypt1
 .globl	aesni_cbc_encrypt
 .type	aesni_cbc_encrypt,@function
@@ -4361,7 +4377,6 @@ __aesni_set_encrypt_key:
 	addq	$8,%rsp
 .cfi_adjust_cfa_offset	-8
 	.byte	0xf3,0xc3
-.cfi_endproc	
 .LSEH_end_set_encrypt_key:
 
 .align	16
@@ -4432,6 +4447,7 @@ __aesni_set_encrypt_key:
 	shufps	$170,%xmm1,%xmm1
 	xorps	%xmm1,%xmm2
 	.byte	0xf3,0xc3
+.cfi_endproc
 .size	aesni_set_encrypt_key,.-aesni_set_encrypt_key
 .size	__aesni_set_encrypt_key,.-__aesni_set_encrypt_key
 .align	64
diff --git a/deps/openssl/config/archs/BSD-x86_64/asm/crypto/aes/bsaes-x86_64.s b/deps/openssl/config/archs/BSD-x86_64/asm/crypto/aes/bsaes-x86_64.s
deleted file mode 100644
index e1f3abadbc..0000000000
--- a/deps/openssl/config/archs/BSD-x86_64/asm/crypto/aes/bsaes-x86_64.s
+++ /dev/null
@@ -1,2595 +0,0 @@
-.text	
-
-
-
-
-.type	_bsaes_encrypt8,@function
-.align	64
-_bsaes_encrypt8:
-.cfi_startproc	
-	leaq	.LBS0(%rip),%r11
-
-	movdqa	(%rax),%xmm8
-	leaq	16(%rax),%rax
-	movdqa	80(%r11),%xmm7
-	pxor	%xmm8,%xmm15
-	pxor	%xmm8,%xmm0
-	pxor	%xmm8,%xmm1
-	pxor	%xmm8,%xmm2
-.byte	102,68,15,56,0,255
-.byte	102,15,56,0,199
-	pxor	%xmm8,%xmm3
-	pxor	%xmm8,%xmm4
-.byte	102,15,56,0,207
-.byte	102,15,56,0,215
-	pxor	%xmm8,%xmm5
-	pxor	%xmm8,%xmm6
-.byte	102,15,56,0,223
-.byte	102,15,56,0,231
-.byte	102,15,56,0,239
-.byte	102,15,56,0,247
-_bsaes_encrypt8_bitslice:
-	movdqa	0(%r11),%xmm7
-	movdqa	16(%r11),%xmm8
-	movdqa	%xmm5,%xmm9
-	psrlq	$1,%xmm5
-	movdqa	%xmm3,%xmm10
-	psrlq	$1,%xmm3
-	pxor	%xmm6,%xmm5
-	pxor	%xmm4,%xmm3
-	pand	%xmm7,%xmm5
-	pand	%xmm7,%xmm3
-	pxor	%xmm5,%xmm6
-	psllq	$1,%xmm5
-	pxor	%xmm3,%xmm4
-	psllq	$1,%xmm3
-	pxor	%xmm9,%xmm5
-	pxor	%xmm10,%xmm3
-	movdqa	%xmm1,%xmm9
-	psrlq	$1,%xmm1
-	movdqa	%xmm15,%xmm10
-	psrlq	$1,%xmm15
-	pxor	%xmm2,%xmm1
-	pxor	%xmm0,%xmm15
-	pand	%xmm7,%xmm1
-	pand	%xmm7,%xmm15
-	pxor	%xmm1,%xmm2
-	psllq	$1,%xmm1
-	pxor	%xmm15,%xmm0
-	psllq	$1,%xmm15
-	pxor	%xmm9,%xmm1
-	pxor	%xmm10,%xmm15
-	movdqa	32(%r11),%xmm7
-	movdqa	%xmm4,%xmm9
-	psrlq	$2,%xmm4
-	movdqa	%xmm3,%xmm10
-	psrlq	$2,%xmm3
-	pxor	%xmm6,%xmm4
-	pxor	%xmm5,%xmm3
-	pand	%xmm8,%xmm4
-	pand	%xmm8,%xmm3
-	pxor	%xmm4,%xmm6
-	psllq	$2,%xmm4
-	pxor	%xmm3,%xmm5
-	psllq	$2,%xmm3
-	pxor	%xmm9,%xmm4
-	pxor	%xmm10,%xmm3
-	movdqa	%xmm0,%xmm9
-	psrlq	$2,%xmm0
-	movdqa	%xmm15,%xmm10
-	psrlq	$2,%xmm15
-	pxor	%xmm2,%xmm0
-	pxor	%xmm1,%xmm15
-	pand	%xmm8,%xmm0
-	pand	%xmm8,%xmm15
-	pxor	%xmm0,%xmm2
-	psllq	$2,%xmm0
-	pxor	%xmm15,%xmm1
-	psllq	$2,%xmm15
-	pxor	%xmm9,%xmm0
-	pxor	%xmm10,%xmm15
-	movdqa	%xmm2,%xmm9
-	psrlq	$4,%xmm2
-	movdqa	%xmm1,%xmm10
-	psrlq	$4,%xmm1
-	pxor	%xmm6,%xmm2
-	pxor	%xmm5,%xmm1
-	pand	%xmm7,%xmm2
-	pand	%xmm7,%xmm1
-	pxor	%xmm2,%xmm6
-	psllq	$4,%xmm2
-	pxor	%xmm1,%xmm5
-	psllq	$4,%xmm1
-	pxor	%xmm9,%xmm2
-	pxor	%xmm10,%xmm1
-	movdqa	%xmm0,%xmm9
-	psrlq	$4,%xmm0
-	movdqa	%xmm15,%xmm10
-	psrlq	$4,%xmm15
-	pxor	%xmm4,%xmm0
-	pxor	%xmm3,%xmm15
-	pand	%xmm7,%xmm0
-	pand	%xmm7,%xmm15
-	pxor	%xmm0,%xmm4
-	psllq	$4,%xmm0
-	pxor	%xmm15,%xmm3
-	psllq	$4,%xmm15
-	pxor	%xmm9,%xmm0
-	pxor	%xmm10,%xmm15
-	decl	%r10d
-	jmp	.Lenc_sbox
-.align	16
-.Lenc_loop:
-	pxor	0(%rax),%xmm15
-	pxor	16(%rax),%xmm0
-	pxor	32(%rax),%xmm1
-	pxor	48(%rax),%xmm2
-.byte	102,68,15,56,0,255
-.byte	102,15,56,0,199
-	pxor	64(%rax),%xmm3
-	pxor	80(%rax),%xmm4
-.byte	102,15,56,0,207
-.byte	102,15,56,0,215
-	pxor	96(%rax),%xmm5
-	pxor	112(%rax),%xmm6
-.byte	102,15,56,0,223
-.byte	102,15,56,0,231
-.byte	102,15,56,0,239
-.byte	102,15,56,0,247
-	leaq	128(%rax),%rax
-.Lenc_sbox:
-	pxor	%xmm5,%xmm4
-	pxor	%xmm0,%xmm1
-	pxor	%xmm15,%xmm2
-	pxor	%xmm1,%xmm5
-	pxor	%xmm15,%xmm4
-
-	pxor	%xmm2,%xmm5
-	pxor	%xmm6,%xmm2
-	pxor	%xmm4,%xmm6
-	pxor	%xmm3,%xmm2
-	pxor	%xmm4,%xmm3
-	pxor	%xmm0,%xmm2
-
-	pxor	%xmm6,%xmm1
-	pxor	%xmm4,%xmm0
-	movdqa	%xmm6,%xmm10
-	movdqa	%xmm0,%xmm9
-	movdqa	%xmm4,%xmm8
-	movdqa	%xmm1,%xmm12
-	movdqa	%xmm5,%xmm11
-
-	pxor	%xmm3,%xmm10
-	pxor	%xmm1,%xmm9
-	pxor	%xmm2,%xmm8
-	movdqa	%xmm10,%xmm13
-	pxor	%xmm3,%xmm12
-	movdqa	%xmm9,%xmm7
-	pxor	%xmm15,%xmm11
-	movdqa	%xmm10,%xmm14
-
-	por	%xmm8,%xmm9
-	por	%xmm11,%xmm10
-	pxor	%xmm7,%xmm14
-	pand	%xmm11,%xmm13
-	pxor	%xmm8,%xmm11
-	pand	%xmm8,%xmm7
-	pand	%xmm11,%xmm14
-	movdqa	%xmm2,%xmm11
-	pxor	%xmm15,%xmm11
-	pand	%xmm11,%xmm12
-	pxor	%xmm12,%xmm10
-	pxor	%xmm12,%xmm9
-	movdqa	%xmm6,%xmm12
-	movdqa	%xmm4,%xmm11
-	pxor	%xmm0,%xmm12
-	pxor	%xmm5,%xmm11
-	movdqa	%xmm12,%xmm8
-	pand	%xmm11,%xmm12
-	por	%xmm11,%xmm8
-	pxor	%xmm12,%xmm7
-	pxor	%xmm14,%xmm10
-	pxor	%xmm13,%xmm9
-	pxor	%xmm14,%xmm8
-	movdqa	%xmm1,%xmm11
-	pxor	%xmm13,%xmm7
-	movdqa	%xmm3,%xmm12
-	pxor	%xmm13,%xmm8
-	movdqa	%xmm0,%xmm13
-	pand	%xmm2,%xmm11
-	movdqa	%xmm6,%xmm14
-	pand	%xmm15,%xmm12
-	pand	%xmm4,%xmm13
-	por	%xmm5,%xmm14
-	pxor	%xmm11,%xmm10
-	pxor	%xmm12,%xmm9
-	pxor	%xmm13,%xmm8
-	pxor	%xmm14,%xmm7
-
-
-
-
-
-	movdqa	%xmm10,%xmm11
-	pand	%xmm8,%xmm10
-	pxor	%xmm9,%xmm11
-
-	movdqa	%xmm7,%xmm13
-	movdqa	%xmm11,%xmm14
-	pxor	%xmm10,%xmm13
-	pand	%xmm13,%xmm14
-
-	movdqa	%xmm8,%xmm12
-	pxor	%xmm9,%xmm14
-	pxor	%xmm7,%xmm12
-
-	pxor	%xmm9,%xmm10
-
-	pand	%xmm10,%xmm12
-
-	movdqa	%xmm13,%xmm9
-	pxor	%xmm7,%xmm12
-
-	pxor	%xmm12,%xmm9
-	pxor	%xmm12,%xmm8
-
-	pand	%xmm7,%xmm9
-
-	pxor	%xmm9,%xmm13
-	pxor	%xmm9,%xmm8
-
-	pand	%xmm14,%xmm13
-
-	pxor	%xmm11,%xmm13
-	movdqa	%xmm5,%xmm11
-	movdqa	%xmm4,%xmm7
-	movdqa	%xmm14,%xmm9
-	pxor	%xmm13,%xmm9
-	pand	%xmm5,%xmm9
-	pxor	%xmm4,%xmm5
-	pand	%xmm14,%xmm4
-	pand	%xmm13,%xmm5
-	pxor	%xmm4,%xmm5
-	pxor	%xmm9,%xmm4
-	pxor	%xmm15,%xmm11
-	pxor	%xmm2,%xmm7
-	pxor	%xmm12,%xmm14
-	pxor	%xmm8,%xmm13
-	movdqa	%xmm14,%xmm10
-	movdqa	%xmm12,%xmm9
-	pxor	%xmm13,%xmm10
-	pxor	%xmm8,%xmm9
-	pand	%xmm11,%xmm10
-	pand	%xmm15,%xmm9
-	pxor	%xmm7,%xmm11
-	pxor	%xmm2,%xmm15
-	pand	%xmm14,%xmm7
-	pand	%xmm12,%xmm2
-	pand	%xmm13,%xmm11
-	pand	%xmm8,%xmm15
-	pxor	%xmm11,%xmm7
-	pxor	%xmm2,%xmm15
-	pxor	%xmm10,%xmm11
-	pxor	%xmm9,%xmm2
-	pxor	%xmm11,%xmm5
-	pxor	%xmm11,%xmm15
-	pxor	%xmm7,%xmm4
-	pxor	%xmm7,%xmm2
-
-	movdqa	%xmm6,%xmm11
-	movdqa	%xmm0,%xmm7
-	pxor	%xmm3,%xmm11
-	pxor	%xmm1,%xmm7
-	movdqa	%xmm14,%xmm10
-	movdqa	%xmm12,%xmm9
-	pxor	%xmm13,%xmm10
-	pxor	%xmm8,%xmm9
-	pand	%xmm11,%xmm10
-	pand	%xmm3,%xmm9
-	pxor	%xmm7,%xmm11
-	pxor	%xmm1,%xmm3
-	pand	%xmm14,%xmm7
-	pand	%xmm12,%xmm1
-	pand	%xmm13,%xmm11
-	pand	%xmm8,%xmm3
-	pxor	%xmm11,%xmm7
-	pxor	%xmm1,%xmm3
-	pxor	%xmm10,%xmm11
-	pxor	%xmm9,%xmm1
-	pxor	%xmm12,%xmm14
-	pxor	%xmm8,%xmm13
-	movdqa	%xmm14,%xmm10
-	pxor	%xmm13,%xmm10
-	pand	%xmm6,%xmm10
-	pxor	%xmm0,%xmm6
-	pand	%xmm14,%xmm0
-	pand	%xmm13,%xmm6
-	pxor	%xmm0,%xmm6
-	pxor	%xmm10,%xmm0
-	pxor	%xmm11,%xmm6
-	pxor	%xmm11,%xmm3
-	pxor	%xmm7,%xmm0
-	pxor	%xmm7,%xmm1
-	pxor	%xmm15,%xmm6
-	pxor	%xmm5,%xmm0
-	pxor	%xmm6,%xmm3
-	pxor	%xmm15,%xmm5
-	pxor	%xmm0,%xmm15
-
-	pxor	%xmm4,%xmm0
-	pxor	%xmm1,%xmm4
-	pxor	%xmm2,%xmm1
-	pxor	%xmm4,%xmm2
-	pxor	%xmm4,%xmm3
-
-	pxor	%xmm2,%xmm5
-	decl	%r10d
-	jl	.Lenc_done
-	pshufd	$0x93,%xmm15,%xmm7
-	pshufd	$0x93,%xmm0,%xmm8
-	pxor	%xmm7,%xmm15
-	pshufd	$0x93,%xmm3,%xmm9
-	pxor	%xmm8,%xmm0
-	pshufd	$0x93,%xmm5,%xmm10
-	pxor	%xmm9,%xmm3
-	pshufd	$0x93,%xmm2,%xmm11
-	pxor	%xmm10,%xmm5
-	pshufd	$0x93,%xmm6,%xmm12
-	pxor	%xmm11,%xmm2
-	pshufd	$0x93,%xmm1,%xmm13
-	pxor	%xmm12,%xmm6
-	pshufd	$0x93,%xmm4,%xmm14
-	pxor	%xmm13,%xmm1
-	pxor	%xmm14,%xmm4
-
-	pxor	%xmm15,%xmm8
-	pxor	%xmm4,%xmm7
-	pxor	%xmm4,%xmm8
-	pshufd	$0x4E,%xmm15,%xmm15
-	pxor	%xmm0,%xmm9
-	pshufd	$0x4E,%xmm0,%xmm0
-	pxor	%xmm2,%xmm12
-	pxor	%xmm7,%xmm15
-	pxor	%xmm6,%xmm13
-	pxor	%xmm8,%xmm0
-	pxor	%xmm5,%xmm11
-	pshufd	$0x4E,%xmm2,%xmm7
-	pxor	%xmm1,%xmm14
-	pshufd	$0x4E,%xmm6,%xmm8
-	pxor	%xmm3,%xmm10
-	pshufd	$0x4E,%xmm5,%xmm2
-	pxor	%xmm4,%xmm10
-	pshufd	$0x4E,%xmm4,%xmm6
-	pxor	%xmm4,%xmm11
-	pshufd	$0x4E,%xmm1,%xmm5
-	pxor	%xmm11,%xmm7
-	pshufd	$0x4E,%xmm3,%xmm1
-	pxor	%xmm12,%xmm8
-	pxor	%xmm10,%xmm2
-	pxor	%xmm14,%xmm6
-	pxor	%xmm13,%xmm5
-	movdqa	%xmm7,%xmm3
-	pxor	%xmm9,%xmm1
-	movdqa	%xmm8,%xmm4
-	movdqa	48(%r11),%xmm7
-	jnz	.Lenc_loop
-	movdqa	64(%r11),%xmm7
-	jmp	.Lenc_loop
-.align	16
-.Lenc_done:
-	movdqa	0(%r11),%xmm7
-	movdqa	16(%r11),%xmm8
-	movdqa	%xmm1,%xmm9
-	psrlq	$1,%xmm1
-	movdqa	%xmm2,%xmm10
-	psrlq	$1,%xmm2
-	pxor	%xmm4,%xmm1
-	pxor	%xmm6,%xmm2
-	pand	%xmm7,%xmm1
-	pand	%xmm7,%xmm2
-	pxor	%xmm1,%xmm4
-	psllq	$1,%xmm1
-	pxor	%xmm2,%xmm6
-	psllq	$1,%xmm2
-	pxor	%xmm9,%xmm1
-	pxor	%xmm10,%xmm2
-	movdqa	%xmm3,%xmm9
-	psrlq	$1,%xmm3
-	movdqa	%xmm15,%xmm10
-	psrlq	$1,%xmm15
-	pxor	%xmm5,%xmm3
-	pxor	%xmm0,%xmm15
-	pand	%xmm7,%xmm3
-	pand	%xmm7,%xmm15
-	pxor	%xmm3,%xmm5
-	psllq	$1,%xmm3
-	pxor	%xmm15,%xmm0
-	psllq	$1,%xmm15
-	pxor	%xmm9,%xmm3
-	pxor	%xmm10,%xmm15
-	movdqa	32(%r11),%xmm7
-	movdqa	%xmm6,%xmm9
-	psrlq	$2,%xmm6
-	movdqa	%xmm2,%xmm10
-	psrlq	$2,%xmm2
-	pxor	%xmm4,%xmm6
-	pxor	%xmm1,%xmm2
-	pand	%xmm8,%xmm6
-	pand	%xmm8,%xmm2
-	pxor	%xmm6,%xmm4
-	psllq	$2,%xmm6
-	pxor	%xmm2,%xmm1
-	psllq	$2,%xmm2
-	pxor	%xmm9,%xmm6
-	pxor	%xmm10,%xmm2
-	movdqa	%xmm0,%xmm9
-	psrlq	$2,%xmm0
-	movdqa	%xmm15,%xmm10
-	psrlq	$2,%xmm15
-	pxor	%xmm5,%xmm0
-	pxor	%xmm3,%xmm15
-	pand	%xmm8,%xmm0
-	pand	%xmm8,%xmm15
-	pxor	%xmm0,%xmm5
-	psllq	$2,%xmm0
-	pxor	%xmm15,%xmm3
-	psllq	$2,%xmm15
-	pxor	%xmm9,%xmm0
-	pxor	%xmm10,%xmm15
-	movdqa	%xmm5,%xmm9
-	psrlq	$4,%xmm5
-	movdqa	%xmm3,%xmm10
-	psrlq	$4,%xmm3
-	pxor	%xmm4,%xmm5
-	pxor	%xmm1,%xmm3
-	pand	%xmm7,%xmm5
-	pand	%xmm7,%xmm3
-	pxor	%xmm5,%xmm4
-	psllq	$4,%xmm5
-	pxor	%xmm3,%xmm1
-	psllq	$4,%xmm3
-	pxor	%xmm9,%xmm5
-	pxor	%xmm10,%xmm3
-	movdqa	%xmm0,%xmm9
-	psrlq	$4,%xmm0
-	movdqa	%xmm15,%xmm10
-	psrlq	$4,%xmm15
-	pxor	%xmm6,%xmm0
-	pxor	%xmm2,%xmm15
-	pand	%xmm7,%xmm0
-	pand	%xmm7,%xmm15
-	pxor	%xmm0,%xmm6
-	psllq	$4,%xmm0
-	pxor	%xmm15,%xmm2
-	psllq	$4,%xmm15
-	pxor	%xmm9,%xmm0
-	pxor	%xmm10,%xmm15
-	movdqa	(%rax),%xmm7
-	pxor	%xmm7,%xmm3
-	pxor	%xmm7,%xmm5
-	pxor	%xmm7,%xmm2
-	pxor	%xmm7,%xmm6
-	pxor	%xmm7,%xmm1
-	pxor	%xmm7,%xmm4
-	pxor	%xmm7,%xmm15
-	pxor	%xmm7,%xmm0
-	.byte	0xf3,0xc3
-.cfi_endproc	
-.size	_bsaes_encrypt8,.-_bsaes_encrypt8
-
-.type	_bsaes_decrypt8,@function
-.align	64
-_bsaes_decrypt8:
-.cfi_startproc	
-	leaq	.LBS0(%rip),%r11
-
-	movdqa	(%rax),%xmm8
-	leaq	16(%rax),%rax
-	movdqa	-48(%r11),%xmm7
-	pxor	%xmm8,%xmm15
-	pxor	%xmm8,%xmm0
-	pxor	%xmm8,%xmm1
-	pxor	%xmm8,%xmm2
-.byte	102,68,15,56,0,255
-.byte	102,15,56,0,199
-	pxor	%xmm8,%xmm3
-	pxor	%xmm8,%xmm4
-.byte	102,15,56,0,207
-.byte	102,15,56,0,215
-	pxor	%xmm8,%xmm5
-	pxor	%xmm8,%xmm6
-.byte	102,15,56,0,223
-.byte	102,15,56,0,231
-.byte	102,15,56,0,239
-.byte	102,15,56,0,247
-	movdqa	0(%r11),%xmm7
-	movdqa	16(%r11),%xmm8
-	movdqa	%xmm5,%xmm9
-	psrlq	$1,%xmm5
-	movdqa	%xmm3,%xmm10
-	psrlq	$1,%xmm3
-	pxor	%xmm6,%xmm5
-	pxor	%xmm4,%xmm3
-	pand	%xmm7,%xmm5
-	pand	%xmm7,%xmm3
-	pxor	%xmm5,%xmm6
-	psllq	$1,%xmm5
-	pxor	%xmm3,%xmm4
-	psllq	$1,%xmm3
-	pxor	%xmm9,%xmm5
-	pxor	%xmm10,%xmm3
-	movdqa	%xmm1,%xmm9
-	psrlq	$1,%xmm1
-	movdqa	%xmm15,%xmm10
-	psrlq	$1,%xmm15
-	pxor	%xmm2,%xmm1
-	pxor	%xmm0,%xmm15
-	pand	%xmm7,%xmm1
-	pand	%xmm7,%xmm15
-	pxor	%xmm1,%xmm2
-	psllq	$1,%xmm1
-	pxor	%xmm15,%xmm0
-	psllq	$1,%xmm15
-	pxor	%xmm9,%xmm1
-	pxor	%xmm10,%xmm15
-	movdqa	32(%r11),%xmm7
-	movdqa	%xmm4,%xmm9
-	psrlq	$2,%xmm4
-	movdqa	%xmm3,%xmm10
-	psrlq	$2,%xmm3
-	pxor	%xmm6,%xmm4
-	pxor	%xmm5,%xmm3
-	pand	%xmm8,%xmm4
-	pand	%xmm8,%xmm3
-	pxor	%xmm4,%xmm6
-	psllq	$2,%xmm4
-	pxor	%xmm3,%xmm5
-	psllq	$2,%xmm3
-	pxor	%xmm9,%xmm4
-	pxor	%xmm10,%xmm3
-	movdqa	%xmm0,%xmm9
-	psrlq	$2,%xmm0
-	movdqa	%xmm15,%xmm10
-	psrlq	$2,%xmm15
-	pxor	%xmm2,%xmm0
-	pxor	%xmm1,%xmm15
-	pand	%xmm8,%xmm0
-	pand	%xmm8,%xmm15
-	pxor	%xmm0,%xmm2
-	psllq	$2,%xmm0
-	pxor	%xmm15,%xmm1
-	psllq	$2,%xmm15
-	pxor	%xmm9,%xmm0
-	pxor	%xmm10,%xmm15
-	movdqa	%xmm2,%xmm9
-	psrlq	$4,%xmm2
-	movdqa	%xmm1,%xmm10
-	psrlq	$4,%xmm1
-	pxor	%xmm6,%xmm2
-	pxor	%xmm5,%xmm1
-	pand	%xmm7,%xmm2
-	pand	%xmm7,%xmm1
-	pxor	%xmm2,%xmm6
-	psllq	$4,%xmm2
-	pxor	%xmm1,%xmm5
-	psllq	$4,%xmm1
-	pxor	%xmm9,%xmm2
-	pxor	%xmm10,%xmm1
-	movdqa	%xmm0,%xmm9
-	psrlq	$4,%xmm0
-	movdqa	%xmm15,%xmm10
-	psrlq	$4,%xmm15
-	pxor	%xmm4,%xmm0
-	pxor	%xmm3,%xmm15
-	pand	%xmm7,%xmm0
-	pand	%xmm7,%xmm15
-	pxor	%xmm0,%xmm4
-	psllq	$4,%xmm0
-	pxor	%xmm15,%xmm3
-	psllq	$4,%xmm15
-	pxor	%xmm9,%xmm0
-	pxor	%xmm10,%xmm15
-	decl	%r10d
-	jmp	.Ldec_sbox
-.align	16
-.Ldec_loop:
-	pxor	0(%rax),%xmm15
-	pxor	16(%rax),%xmm0
-	pxor	32(%rax),%xmm1
-	pxor	48(%rax),%xmm2
-.byte	102,68,15,56,0,255
-.byte	102,15,56,0,199
-	pxor	64(%rax),%xmm3
-	pxor	80(%rax),%xmm4
-.byte	102,15,56,0,207
-.byte	102,15,56,0,215
-	pxor	96(%rax),%xmm5
-	pxor	112(%rax),%xmm6
-.byte	102,15,56,0,223
-.byte	102,15,56,0,231
-.byte	102,15,56,0,239
-.byte	102,15,56,0,247
-	leaq	128(%rax),%rax
-.Ldec_sbox:
-	pxor	%xmm3,%xmm2
-
-	pxor	%xmm6,%xmm3
-	pxor	%xmm6,%xmm1
-	pxor	%xmm3,%xmm5
-	pxor	%xmm5,%xmm6
-	pxor	%xmm6,%xmm0
-
-	pxor	%xmm0,%xmm15
-	pxor	%xmm4,%xmm1
-	pxor	%xmm15,%xmm2
-	pxor	%xmm15,%xmm4
-	pxor	%xmm2,%xmm0
-	movdqa	%xmm2,%xmm10
-	movdqa	%xmm6,%xmm9
-	movdqa	%xmm0,%xmm8
-	movdqa	%xmm3,%xmm12
-	movdqa	%xmm4,%xmm11
-
-	pxor	%xmm15,%xmm10
-	pxor	%xmm3,%xmm9
-	pxor	%xmm5,%xmm8
-	movdqa	%xmm10,%xmm13
-	pxor	%xmm15,%xmm12
-	movdqa	%xmm9,%xmm7
-	pxor	%xmm1,%xmm11
-	movdqa	%xmm10,%xmm14
-
-	por	%xmm8,%xmm9
-	por	%xmm11,%xmm10
-	pxor	%xmm7,%xmm14
-	pand	%xmm11,%xmm13
-	pxor	%xmm8,%xmm11
-	pand	%xmm8,%xmm7
-	pand	%xmm11,%xmm14
-	movdqa	%xmm5,%xmm11
-	pxor	%xmm1,%xmm11
-	pand	%xmm11,%xmm12
-	pxor	%xmm12,%xmm10
-	pxor	%xmm12,%xmm9
-	movdqa	%xmm2,%xmm12
-	movdqa	%xmm0,%xmm11
-	pxor	%xmm6,%xmm12
-	pxor	%xmm4,%xmm11
-	movdqa	%xmm12,%xmm8
-	pand	%xmm11,%xmm12
-	por	%xmm11,%xmm8
-	pxor	%xmm12,%xmm7
-	pxor	%xmm14,%xmm10
-	pxor	%xmm13,%xmm9
-	pxor	%xmm14,%xmm8
-	movdqa	%xmm3,%xmm11
-	pxor	%xmm13,%xmm7
-	movdqa	%xmm15,%xmm12
-	pxor	%xmm13,%xmm8
-	movdqa	%xmm6,%xmm13
-	pand	%xmm5,%xmm11
-	movdqa	%xmm2,%xmm14
-	pand	%xmm1,%xmm12
-	pand	%xmm0,%xmm13
-	por	%xmm4,%xmm14
-	pxor	%xmm11,%xmm10
-	pxor	%xmm12,%xmm9
-	pxor	%xmm13,%xmm8
-	pxor	%xmm14,%xmm7
-
-
-
-
-
-	movdqa	%xmm10,%xmm11
-	pand	%xmm8,%xmm10
-	pxor	%xmm9,%xmm11
-
-	movdqa	%xmm7,%xmm13
-	movdqa	%xmm11,%xmm14
-	pxor	%xmm10,%xmm13
-	pand	%xmm13,%xmm14
-
-	movdqa	%xmm8,%xmm12
-	pxor	%xmm9,%xmm14
-	pxor	%xmm7,%xmm12
-
-	pxor	%xmm9,%xmm10
-
-	pand	%xmm10,%xmm12
-
-	movdqa	%xmm13,%xmm9
-	pxor	%xmm7,%xmm12
-
-	pxor	%xmm12,%xmm9
-	pxor	%xmm12,%xmm8
-
-	pand	%xmm7,%xmm9
-
-	pxor	%xmm9,%xmm13
-	pxor	%xmm9,%xmm8
-
-	pand	%xmm14,%xmm13
-
-	pxor	%xmm11,%xmm13
-	movdqa	%xmm4,%xmm11
-	movdqa	%xmm0,%xmm7
-	movdqa	%xmm14,%xmm9
-	pxor	%xmm13,%xmm9
-	pand	%xmm4,%xmm9
-	pxor	%xmm0,%xmm4
-	pand	%xmm14,%xmm0
-	pand	%xmm13,%xmm4
-	pxor	%xmm0,%xmm4
-	pxor	%xmm9,%xmm0
-	pxor	%xmm1,%xmm11
-	pxor	%xmm5,%xmm7
-	pxor	%xmm12,%xmm14
-	pxor	%xmm8,%xmm13
-	movdqa	%xmm14,%xmm10
-	movdqa	%xmm12,%xmm9
-	pxor	%xmm13,%xmm10
-	pxor	%xmm8,%xmm9
-	pand	%xmm11,%xmm10
-	pand	%xmm1,%xmm9
-	pxor	%xmm7,%xmm11
-	pxor	%xmm5,%xmm1
-	pand	%xmm14,%xmm7
-	pand	%xmm12,%xmm5
-	pand	%xmm13,%xmm11
-	pand	%xmm8,%xmm1
-	pxor	%xmm11,%xmm7
-	pxor	%xmm5,%xmm1
-	pxor	%xmm10,%xmm11
-	pxor	%xmm9,%xmm5
-	pxor	%xmm11,%xmm4
-	pxor	%xmm11,%xmm1
-	pxor	%xmm7,%xmm0
-	pxor	%xmm7,%xmm5
-
-	movdqa	%xmm2,%xmm11
-	movdqa	%xmm6,%xmm7
-	pxor	%xmm15,%xmm11
-	pxor	%xmm3,%xmm7
-	movdqa	%xmm14,%xmm10
-	movdqa	%xmm12,%xmm9
-	pxor	%xmm13,%xmm10
-	pxor	%xmm8,%xmm9
-	pand	%xmm11,%xmm10
-	pand	%xmm15,%xmm9
-	pxor	%xmm7,%xmm11
-	pxor	%xmm3,%xmm15
-	pand	%xmm14,%xmm7
-	pand	%xmm12,%xmm3
-	pand	%xmm13,%xmm11
-	pand	%xmm8,%xmm15
-	pxor	%xmm11,%xmm7
-	pxor	%xmm3,%xmm15
-	pxor	%xmm10,%xmm11
-	pxor	%xmm9,%xmm3
-	pxor	%xmm12,%xmm14
-	pxor	%xmm8,%xmm13
-	movdqa	%xmm14,%xmm10
-	pxor	%xmm13,%xmm10
-	pand	%xmm2,%xmm10
-	pxor	%xmm6,%xmm2
-	pand	%xmm14,%xmm6
-	pand	%xmm13,%xmm2
-	pxor	%xmm6,%xmm2
-	pxor	%xmm10,%xmm6
-	pxor	%xmm11,%xmm2
-	pxor	%xmm11,%xmm15
-	pxor	%xmm7,%xmm6
-	pxor	%xmm7,%xmm3
-	pxor	%xmm6,%xmm0
-	pxor	%xmm4,%xmm5
-
-	pxor	%xmm0,%xmm3
-	pxor	%xmm6,%xmm1
-	pxor	%xmm6,%xmm4
-	pxor	%xmm1,%xmm3
-	pxor	%xmm15,%xmm6
-	pxor	%xmm4,%xmm3
-	pxor	%xmm5,%xmm2
-	pxor	%xmm0,%xmm5
-	pxor	%xmm3,%xmm2
-
-	pxor	%xmm15,%xmm3
-	pxor	%xmm2,%xmm6
-	decl	%r10d
-	jl	.Ldec_done
-
-	pshufd	$0x4E,%xmm15,%xmm7
-	pshufd	$0x4E,%xmm2,%xmm13
-	pxor	%xmm15,%xmm7
-	pshufd	$0x4E,%xmm4,%xmm14
-	pxor	%xmm2,%xmm13
-	pshufd	$0x4E,%xmm0,%xmm8
-	pxor	%xmm4,%xmm14
-	pshufd	$0x4E,%xmm5,%xmm9
-	pxor	%xmm0,%xmm8
-	pshufd	$0x4E,%xmm3,%xmm10
-	pxor	%xmm5,%xmm9
-	pxor	%xmm13,%xmm15
-	pxor	%xmm13,%xmm0
-	pshufd	$0x4E,%xmm1,%xmm11
-	pxor	%xmm3,%xmm10
-	pxor	%xmm7,%xmm5
-	pxor	%xmm8,%xmm3
-	pshufd	$0x4E,%xmm6,%xmm12
-	pxor	%xmm1,%xmm11
-	pxor	%xmm14,%xmm0
-	pxor	%xmm9,%xmm1
-	pxor	%xmm6,%xmm12
-
-	pxor	%xmm14,%xmm5
-	pxor	%xmm13,%xmm3
-	pxor	%xmm13,%xmm1
-	pxor	%xmm10,%xmm6
-	pxor	%xmm11,%xmm2
-	pxor	%xmm14,%xmm1
-	pxor	%xmm14,%xmm6
-	pxor	%xmm12,%xmm4
-	pshufd	$0x93,%xmm15,%xmm7
-	pshufd	$0x93,%xmm0,%xmm8
-	pxor	%xmm7,%xmm15
-	pshufd	$0x93,%xmm5,%xmm9
-	pxor	%xmm8,%xmm0
-	pshufd	$0x93,%xmm3,%xmm10
-	pxor	%xmm9,%xmm5
-	pshufd	$0x93,%xmm1,%xmm11
-	pxor	%xmm10,%xmm3
-	pshufd	$0x93,%xmm6,%xmm12
-	pxor	%xmm11,%xmm1
-	pshufd	$0x93,%xmm2,%xmm13
-	pxor	%xmm12,%xmm6
-	pshufd	$0x93,%xmm4,%xmm14
-	pxor	%xmm13,%xmm2
-	pxor	%xmm14,%xmm4
-
-	pxor	%xmm15,%xmm8
-	pxor	%xmm4,%xmm7
-	pxor	%xmm4,%xmm8
-	pshufd	$0x4E,%xmm15,%xmm15
-	pxor	%xmm0,%xmm9
-	pshufd	$0x4E,%xmm0,%xmm0
-	pxor	%xmm1,%xmm12
-	pxor	%xmm7,%xmm15
-	pxor	%xmm6,%xmm13
-	pxor	%xmm8,%xmm0
-	pxor	%xmm3,%xmm11
-	pshufd	$0x4E,%xmm1,%xmm7
-	pxor	%xmm2,%xmm14
-	pshufd	$0x4E,%xmm6,%xmm8
-	pxor	%xmm5,%xmm10
-	pshufd	$0x4E,%xmm3,%xmm1
-	pxor	%xmm4,%xmm10
-	pshufd	$0x4E,%xmm4,%xmm6
-	pxor	%xmm4,%xmm11
-	pshufd	$0x4E,%xmm2,%xmm3
-	pxor	%xmm11,%xmm7
-	pshufd	$0x4E,%xmm5,%xmm2
-	pxor	%xmm12,%xmm8
-	pxor	%xmm1,%xmm10
-	pxor	%xmm14,%xmm6
-	pxor	%xmm3,%xmm13
-	movdqa	%xmm7,%xmm3
-	pxor	%xmm9,%xmm2
-	movdqa	%xmm13,%xmm5
-	movdqa	%xmm8,%xmm4
-	movdqa	%xmm2,%xmm1
-	movdqa	%xmm10,%xmm2
-	movdqa	-16(%r11),%xmm7
-	jnz	.Ldec_loop
-	movdqa	-32(%r11),%xmm7
-	jmp	.Ldec_loop
-.align	16
-.Ldec_done:
-	movdqa	0(%r11),%xmm7
-	movdqa	16(%r11),%xmm8
-	movdqa	%xmm2,%xmm9
-	psrlq	$1,%xmm2
-	movdqa	%xmm1,%xmm10
-	psrlq	$1,%xmm1
-	pxor	%xmm4,%xmm2
-	pxor	%xmm6,%xmm1
-	pand	%xmm7,%xmm2
-	pand	%xmm7,%xmm1
-	pxor	%xmm2,%xmm4
-	psllq	$1,%xmm2
-	pxor	%xmm1,%xmm6
-	psllq	$1,%xmm1
-	pxor	%xmm9,%xmm2
-	pxor	%xmm10,%xmm1
-	movdqa	%xmm5,%xmm9
-	psrlq	$1,%xmm5
-	movdqa	%xmm15,%xmm10
-	psrlq	$1,%xmm15
-	pxor	%xmm3,%xmm5
-	pxor	%xmm0,%xmm15
-	pand	%xmm7,%xmm5
-	pand	%xmm7,%xmm15
-	pxor	%xmm5,%xmm3
-	psllq	$1,%xmm5
-	pxor	%xmm15,%xmm0
-	psllq	$1,%xmm15
-	pxor	%xmm9,%xmm5
-	pxor	%xmm10,%xmm15
-	movdqa	32(%r11),%xmm7
-	movdqa	%xmm6,%xmm9
-	psrlq	$2,%xmm6
-	movdqa	%xmm1,%xmm10
-	psrlq	$2,%xmm1
-	pxor	%xmm4,%xmm6
-	pxor	%xmm2,%xmm1
-	pand	%xmm8,%xmm6
-	pand	%xmm8,%xmm1
-	pxor	%xmm6,%xmm4
-	psllq	$2,%xmm6
-	pxor	%xmm1,%xmm2
-	psllq	$2,%xmm1
-	pxor	%xmm9,%xmm6
-	pxor	%xmm10,%xmm1
-	movdqa	%xmm0,%xmm9
-	psrlq	$2,%xmm0
-	movdqa	%xmm15,%xmm10
-	psrlq	$2,%xmm15
-	pxor	%xmm3,%xmm0
-	pxor	%xmm5,%xmm15
-	pand	%xmm8,%xmm0
-	pand	%xmm8,%xmm15
-	pxor	%xmm0,%xmm3
-	psllq	$2,%xmm0
-	pxor	%xmm15,%xmm5
-	psllq	$2,%xmm15
-	pxor	%xmm9,%xmm0
-	pxor	%xmm10,%xmm15
-	movdqa	%xmm3,%xmm9
-	psrlq	$4,%xmm3
-	movdqa	%xmm5,%xmm10
-	psrlq	$4,%xmm5
-	pxor	%xmm4,%xmm3
-	pxor	%xmm2,%xmm5
-	pand	%xmm7,%xmm3
-	pand	%xmm7,%xmm5
-	pxor	%xmm3,%xmm4
-	psllq	$4,%xmm3
-	pxor	%xmm5,%xmm2
-	psllq	$4,%xmm5
-	pxor	%xmm9,%xmm3
-	pxor	%xmm10,%xmm5
-	movdqa	%xmm0,%xmm9
-	psrlq	$4,%xmm0
-	movdqa	%xmm15,%xmm10
-	psrlq	$4,%xmm15
-	pxor	%xmm6,%xmm0
-	pxor	%xmm1,%xmm15
-	pand	%xmm7,%xmm0
-	pand	%xmm7,%xmm15
-	pxor	%xmm0,%xmm6
-	psllq	$4,%xmm0
-	pxor	%xmm15,%xmm1
-	psllq	$4,%xmm15
-	pxor	%xmm9,%xmm0
-	pxor	%xmm10,%xmm15
-	movdqa	(%rax),%xmm7
-	pxor	%xmm7,%xmm5
-	pxor	%xmm7,%xmm3
-	pxor	%xmm7,%xmm1
-	pxor	%xmm7,%xmm6
-	pxor	%xmm7,%xmm2
-	pxor	%xmm7,%xmm4
-	pxor	%xmm7,%xmm15
-	pxor	%xmm7,%xmm0
-	.byte	0xf3,0xc3
-.cfi_endproc	
-.size	_bsaes_decrypt8,.-_bsaes_decrypt8
-.type	_bsaes_key_convert,@function
-.align	16
-_bsaes_key_convert:
-.cfi_startproc	
-	leaq	.Lmasks(%rip),%r11
-	movdqu	(%rcx),%xmm7
-	leaq	16(%rcx),%rcx
-	movdqa	0(%r11),%xmm0
-	movdqa	16(%r11),%xmm1
-	movdqa	32(%r11),%xmm2
-	movdqa	48(%r11),%xmm3
-	movdqa	64(%r11),%xmm4
-	pcmpeqd	%xmm5,%xmm5
-
-	movdqu	(%rcx),%xmm6
-	movdqa	%xmm7,(%rax)
-	leaq	16(%rax),%rax
-	decl	%r10d
-	jmp	.Lkey_loop
-.align	16
-.Lkey_loop:
-.byte	102,15,56,0,244
-
-	movdqa	%xmm0,%xmm8
-	movdqa	%xmm1,%xmm9
-
-	pand	%xmm6,%xmm8
-	pand	%xmm6,%xmm9
-	movdqa	%xmm2,%xmm10
-	pcmpeqb	%xmm0,%xmm8
-	psllq	$4,%xmm0
-	movdqa	%xmm3,%xmm11
-	pcmpeqb	%xmm1,%xmm9
-	psllq	$4,%xmm1
-
-	pand	%xmm6,%xmm10
-	pand	%xmm6,%xmm11
-	movdqa	%xmm0,%xmm12
-	pcmpeqb	%xmm2,%xmm10
-	psllq	$4,%xmm2
-	movdqa	%xmm1,%xmm13
-	pcmpeqb	%xmm3,%xmm11
-	psllq	$4,%xmm3
-
-	movdqa	%xmm2,%xmm14
-	movdqa	%xmm3,%xmm15
-	pxor	%xmm5,%xmm8
-	pxor	%xmm5,%xmm9
-
-	pand	%xmm6,%xmm12
-	pand	%xmm6,%xmm13
-	movdqa	%xmm8,0(%rax)
-	pcmpeqb	%xmm0,%xmm12
-	psrlq	$4,%xmm0
-	movdqa	%xmm9,16(%rax)
-	pcmpeqb	%xmm1,%xmm13
-	psrlq	$4,%xmm1
-	leaq	16(%rcx),%rcx
-
-	pand	%xmm6,%xmm14
-	pand	%xmm6,%xmm15
-	movdqa	%xmm10,32(%rax)
-	pcmpeqb	%xmm2,%xmm14
-	psrlq	$4,%xmm2
-	movdqa	%xmm11,48(%rax)
-	pcmpeqb	%xmm3,%xmm15
-	psrlq	$4,%xmm3
-	movdqu	(%rcx),%xmm6
-
-	pxor	%xmm5,%xmm13
-	pxor	%xmm5,%xmm14
-	movdqa	%xmm12,64(%rax)
-	movdqa	%xmm13,80(%rax)
-	movdqa	%xmm14,96(%rax)
-	movdqa	%xmm15,112(%rax)
-	leaq	128(%rax),%rax
-	decl	%r10d
-	jnz	.Lkey_loop
-
-	movdqa	80(%r11),%xmm7
-
-	.byte	0xf3,0xc3
-.cfi_endproc	
-.size	_bsaes_key_convert,.-_bsaes_key_convert
-
-.globl	bsaes_cbc_encrypt
-.type	bsaes_cbc_encrypt,@function
-.align	16
-bsaes_cbc_encrypt:
-.cfi_startproc	
-	cmpl	$0,%r9d
-	jne	asm_AES_cbc_encrypt
-	cmpq	$128,%rdx
-	jb	asm_AES_cbc_encrypt
-
-	movq	%rsp,%rax
-.Lcbc_dec_prologue:
-	pushq	%rbp
-.cfi_adjust_cfa_offset	8
-.cfi_offset	%rbp,-16
-	pushq	%rbx
-.cfi_adjust_cfa_offset	8
-.cfi_offset	%rbx,-24
-	pushq	%r12
-.cfi_adjust_cfa_offset	8
-.cfi_offset	%r12,-32
-	pushq	%r13
-.cfi_adjust_cfa_offset	8
-.cfi_offset	%r13,-40
-	pushq	%r14
-.cfi_adjust_cfa_offset	8
-.cfi_offset	%r14,-48
-	pushq	%r15
-.cfi_adjust_cfa_offset	8
-.cfi_offset	%r15,-56
-	leaq	-72(%rsp),%rsp
-.cfi_adjust_cfa_offset	0x48
-	movq	%rsp,%rbp
-.cfi_def_cfa_register	%rbp
-	movl	240(%rcx),%eax
-	movq	%rdi,%r12
-	movq	%rsi,%r13
-	movq	%rdx,%r14
-	movq	%rcx,%r15
-	movq	%r8,%rbx
-	shrq	$4,%r14
-
-	movl	%eax,%edx
-	shlq	$7,%rax
-	subq	$96,%rax
-	subq	%rax,%rsp
-
-	movq	%rsp,%rax
-	movq	%r15,%rcx
-	movl	%edx,%r10d
-	call	_bsaes_key_convert
-	pxor	(%rsp),%xmm7
-	movdqa	%xmm6,(%rax)
-	movdqa	%xmm7,(%rsp)
-
-	movdqu	(%rbx),%xmm14
-	subq	$8,%r14
-.Lcbc_dec_loop:
-	movdqu	0(%r12),%xmm15
-	movdqu	16(%r12),%xmm0
-	movdqu	32(%r12),%xmm1
-	movdqu	48(%r12),%xmm2
-	movdqu	64(%r12),%xmm3
-	movdqu	80(%r12),%xmm4
-	movq	%rsp,%rax
-	movdqu	96(%r12),%xmm5
-	movl	%edx,%r10d
-	movdqu	112(%r12),%xmm6
-	movdqa	%xmm14,32(%rbp)
-
-	call	_bsaes_decrypt8
-
-	pxor	32(%rbp),%xmm15
-	movdqu	0(%r12),%xmm7
-	movdqu	16(%r12),%xmm8
-	pxor	%xmm7,%xmm0
-	movdqu	32(%r12),%xmm9
-	pxor	%xmm8,%xmm5
-	movdqu	48(%r12),%xmm10
-	pxor	%xmm9,%xmm3
-	movdqu	64(%r12),%xmm11
-	pxor	%xmm10,%xmm1
-	movdqu	80(%r12),%xmm12
-	pxor	%xmm11,%xmm6
-	movdqu	96(%r12),%xmm13
-	pxor	%xmm12,%xmm2
-	movdqu	112(%r12),%xmm14
-	pxor	%xmm13,%xmm4
-	movdqu	%xmm15,0(%r13)
-	leaq	128(%r12),%r12
-	movdqu	%xmm0,16(%r13)
-	movdqu	%xmm5,32(%r13)
-	movdqu	%xmm3,48(%r13)
-	movdqu	%xmm1,64(%r13)
-	movdqu	%xmm6,80(%r13)
-	movdqu	%xmm2,96(%r13)
-	movdqu	%xmm4,112(%r13)
-	leaq	128(%r13),%r13
-	subq	$8,%r14
-	jnc	.Lcbc_dec_loop
-
-	addq	$8,%r14
-	jz	.Lcbc_dec_done
-
-	movdqu	0(%r12),%xmm15
-	movq	%rsp,%rax
-	movl	%edx,%r10d
-	cmpq	$2,%r14
-	jb	.Lcbc_dec_one
-	movdqu	16(%r12),%xmm0
-	je	.Lcbc_dec_two
-	movdqu	32(%r12),%xmm1
-	cmpq	$4,%r14
-	jb	.Lcbc_dec_three
-	movdqu	48(%r12),%xmm2
-	je	.Lcbc_dec_four
-	movdqu	64(%r12),%xmm3
-	cmpq	$6,%r14
-	jb	.Lcbc_dec_five
-	movdqu	80(%r12),%xmm4
-	je	.Lcbc_dec_six
-	movdqu	96(%r12),%xmm5
-	movdqa	%xmm14,32(%rbp)
-	call	_bsaes_decrypt8
-	pxor	32(%rbp),%xmm15
-	movdqu	0(%r12),%xmm7
-	movdqu	16(%r12),%xmm8
-	pxor	%xmm7,%xmm0
-	movdqu	32(%r12),%xmm9
-	pxor	%xmm8,%xmm5
-	movdqu	48(%r12),%xmm10
-	pxor	%xmm9,%xmm3
-	movdqu	64(%r12),%xmm11
-	pxor	%xmm10,%xmm1
-	movdqu	80(%r12),%xmm12
-	pxor	%xmm11,%xmm6
-	movdqu	96(%r12),%xmm14
-	pxor	%xmm12,%xmm2
-	movdqu	%xmm15,0(%r13)
-	movdqu	%xmm0,16(%r13)
-	movdqu	%xmm5,32(%r13)
-	movdqu	%xmm3,48(%r13)
-	movdqu	%xmm1,64(%r13)
-	movdqu	%xmm6,80(%r13)
-	movdqu	%xmm2,96(%r13)
-	jmp	.Lcbc_dec_done
-.align	16
-.Lcbc_dec_six:
-	movdqa	%xmm14,32(%rbp)
-	call	_bsaes_decrypt8
-	pxor	32(%rbp),%xmm15
-	movdqu	0(%r12),%xmm7
-	movdqu	16(%r12),%xmm8
-	pxor	%xmm7,%xmm0
-	movdqu	32(%r12),%xmm9
-	pxor	%xmm8,%xmm5
-	movdqu	48(%r12),%xmm10
-	pxor	%xmm9,%xmm3
-	movdqu	64(%r12),%xmm11
-	pxor	%xmm10,%xmm1
-	movdqu	80(%r12),%xmm14
-	pxor	%xmm11,%xmm6
-	movdqu	%xmm15,0(%r13)
-	movdqu	%xmm0,16(%r13)
-	movdqu	%xmm5,32(%r13)
-	movdqu	%xmm3,48(%r13)
-	movdqu	%xmm1,64(%r13)
-	movdqu	%xmm6,80(%r13)
-	jmp	.Lcbc_dec_done
-.align	16
-.Lcbc_dec_five:
-	movdqa	%xmm14,32(%rbp)
-	call	_bsaes_decrypt8
-	pxor	32(%rbp),%xmm15
-	movdqu	0(%r12),%xmm7
-	movdqu	16(%r12),%xmm8
-	pxor	%xmm7,%xmm0
-	movdqu	32(%r12),%xmm9
-	pxor	%xmm8,%xmm5
-	movdqu	48(%r12),%xmm10
-	pxor	%xmm9,%xmm3
-	movdqu	64(%r12),%xmm14
-	pxor	%xmm10,%xmm1
-	movdqu	%xmm15,0(%r13)
-	movdqu	%xmm0,16(%r13)
-	movdqu	%xmm5,32(%r13)
-	movdqu	%xmm3,48(%r13)
-	movdqu	%xmm1,64(%r13)
-	jmp	.Lcbc_dec_done
-.align	16
-.Lcbc_dec_four:
-	movdqa	%xmm14,32(%rbp)
-	call	_bsaes_decrypt8
-	pxor	32(%rbp),%xmm15
-	movdqu	0(%r12),%xmm7
-	movdqu	16(%r12),%xmm8
-	pxor	%xmm7,%xmm0
-	movdqu	32(%r12),%xmm9
-	pxor	%xmm8,%xmm5
-	movdqu	48(%r12),%xmm14
-	pxor	%xmm9,%xmm3
-	movdqu	%xmm15,0(%r13)
-	movdqu	%xmm0,16(%r13)
-	movdqu	%xmm5,32(%r13)
-	movdqu	%xmm3,48(%r13)
-	jmp	.Lcbc_dec_done
-.align	16
-.Lcbc_dec_three:
-	movdqa	%xmm14,32(%rbp)
-	call	_bsaes_decrypt8
-	pxor	32(%rbp),%xmm15
-	movdqu	0(%r12),%xmm7
-	movdqu	16(%r12),%xmm8
-	pxor	%xmm7,%xmm0
-	movdqu	32(%r12),%xmm14
-	pxor	%xmm8,%xmm5
-	movdqu	%xmm15,0(%r13)
-	movdqu	%xmm0,16(%r13)
-	movdqu	%xmm5,32(%r13)
-	jmp	.Lcbc_dec_done
-.align	16
-.Lcbc_dec_two:
-	movdqa	%xmm14,32(%rbp)
-	call	_bsaes_decrypt8
-	pxor	32(%rbp),%xmm15
-	movdqu	0(%r12),%xmm7
-	movdqu	16(%r12),%xmm14
-	pxor	%xmm7,%xmm0
-	movdqu	%xmm15,0(%r13)
-	movdqu	%xmm0,16(%r13)
-	jmp	.Lcbc_dec_done
-.align	16
-.Lcbc_dec_one:
-	leaq	(%r12),%rdi
-	leaq	32(%rbp),%rsi
-	leaq	(%r15),%rdx
-	call	asm_AES_decrypt
-	pxor	32(%rbp),%xmm14
-	movdqu	%xmm14,(%r13)
-	movdqa	%xmm15,%xmm14
-
-.Lcbc_dec_done:
-	movdqu	%xmm14,(%rbx)
-	leaq	(%rsp),%rax
-	pxor	%xmm0,%xmm0
-.Lcbc_dec_bzero:
-	movdqa	%xmm0,0(%rax)
-	movdqa	%xmm0,16(%rax)
-	leaq	32(%rax),%rax
-	cmpq	%rax,%rbp
-	ja	.Lcbc_dec_bzero
-
-	leaq	120(%rbp),%rax
-.cfi_def_cfa	%rax,8
-	movq	-48(%rax),%r15
-.cfi_restore	%r15
-	movq	-40(%rax),%r14
-.cfi_restore	%r14
-	movq	-32(%rax),%r13
-.cfi_restore	%r13
-	movq	-24(%rax),%r12
-.cfi_restore	%r12
-	movq	-16(%rax),%rbx
-.cfi_restore	%rbx
-	movq	-8(%rax),%rbp
-.cfi_restore	%rbp
-	leaq	(%rax),%rsp
-.cfi_def_cfa_register	%rsp
-.Lcbc_dec_epilogue:
-	.byte	0xf3,0xc3
-.cfi_endproc	
-.size	bsaes_cbc_encrypt,.-bsaes_cbc_encrypt
-
-.globl	bsaes_ctr32_encrypt_blocks
-.type	bsaes_ctr32_encrypt_blocks,@function
-.align	16
-bsaes_ctr32_encrypt_blocks:
-.cfi_startproc	
-	movq	%rsp,%rax
-.Lctr_enc_prologue:
-	pushq	%rbp
-.cfi_adjust_cfa_offset	8
-.cfi_offset	%rbp,-16
-	pushq	%rbx
-.cfi_adjust_cfa_offset	8
-.cfi_offset	%rbx,-24
-	pushq	%r12
-.cfi_adjust_cfa_offset	8
-.cfi_offset	%r12,-32
-	pushq	%r13
-.cfi_adjust_cfa_offset	8
-.cfi_offset	%r13,-40
-	pushq	%r14
-.cfi_adjust_cfa_offset	8
-.cfi_offset	%r14,-48
-	pushq	%r15
-.cfi_adjust_cfa_offset	8
-.cfi_offset	%r15,-56
-	leaq	-72(%rsp),%rsp
-.cfi_adjust_cfa_offset	0x48
-	movq	%rsp,%rbp
-.cfi_def_cfa_register	%rbp
-	movdqu	(%r8),%xmm0
-	movl	240(%rcx),%eax
-	movq	%rdi,%r12
-	movq	%rsi,%r13
-	movq	%rdx,%r14
-	movq	%rcx,%r15
-	movdqa	%xmm0,32(%rbp)
-	cmpq	$8,%rdx
-	jb	.Lctr_enc_short
-
-	movl	%eax,%ebx
-	shlq	$7,%rax
-	subq	$96,%rax
-	subq	%rax,%rsp
-
-	movq	%rsp,%rax
-	movq	%r15,%rcx
-	movl	%ebx,%r10d
-	call	_bsaes_key_convert
-	pxor	%xmm6,%xmm7
-	movdqa	%xmm7,(%rax)
-
-	movdqa	(%rsp),%xmm8
-	leaq	.LADD1(%rip),%r11
-	movdqa	32(%rbp),%xmm15
-	movdqa	-32(%r11),%xmm7
-.byte	102,68,15,56,0,199
-.byte	102,68,15,56,0,255
-	movdqa	%xmm8,(%rsp)
-	jmp	.Lctr_enc_loop
-.align	16
-.Lctr_enc_loop:
-	movdqa	%xmm15,32(%rbp)
-	movdqa	%xmm15,%xmm0
-	movdqa	%xmm15,%xmm1
-	paddd	0(%r11),%xmm0
-	movdqa	%xmm15,%xmm2
-	paddd	16(%r11),%xmm1
-	movdqa	%xmm15,%xmm3
-	paddd	32(%r11),%xmm2
-	movdqa	%xmm15,%xmm4
-	paddd	48(%r11),%xmm3
-	movdqa	%xmm15,%xmm5
-	paddd	64(%r11),%xmm4
-	movdqa	%xmm15,%xmm6
-	paddd	80(%r11),%xmm5
-	paddd	96(%r11),%xmm6
-
-
-
-	movdqa	(%rsp),%xmm8
-	leaq	16(%rsp),%rax
-	movdqa	-16(%r11),%xmm7
-	pxor	%xmm8,%xmm15
-	pxor	%xmm8,%xmm0
-	pxor	%xmm8,%xmm1
-	pxor	%xmm8,%xmm2
-.byte	102,68,15,56,0,255
-.byte	102,15,56,0,199
-	pxor	%xmm8,%xmm3
-	pxor	%xmm8,%xmm4
-.byte	102,15,56,0,207
-.byte	102,15,56,0,215
-	pxor	%xmm8,%xmm5
-	pxor	%xmm8,%xmm6
-.byte	102,15,56,0,223
-.byte	102,15,56,0,231
-.byte	102,15,56,0,239
-.byte	102,15,56,0,247
-	leaq	.LBS0(%rip),%r11
-	movl	%ebx,%r10d
-
-	call	_bsaes_encrypt8_bitslice
-
-	subq	$8,%r14
-	jc	.Lctr_enc_loop_done
-
-	movdqu	0(%r12),%xmm7
-	movdqu	16(%r12),%xmm8
-	movdqu	32(%r12),%xmm9
-	movdqu	48(%r12),%xmm10
-	movdqu	64(%r12),%xmm11
-	movdqu	80(%r12),%xmm12
-	movdqu	96(%r12),%xmm13
-	movdqu	112(%r12),%xmm14
-	leaq	128(%r12),%r12
-	pxor	%xmm15,%xmm7
-	movdqa	32(%rbp),%xmm15
-	pxor	%xmm8,%xmm0
-	movdqu	%xmm7,0(%r13)
-	pxor	%xmm9,%xmm3
-	movdqu	%xmm0,16(%r13)
-	pxor	%xmm10,%xmm5
-	movdqu	%xmm3,32(%r13)
-	pxor	%xmm11,%xmm2
-	movdqu	%xmm5,48(%r13)
-	pxor	%xmm12,%xmm6
-	movdqu	%xmm2,64(%r13)
-	pxor	%xmm13,%xmm1
-	movdqu	%xmm6,80(%r13)
-	pxor	%xmm14,%xmm4
-	movdqu	%xmm1,96(%r13)
-	leaq	.LADD1(%rip),%r11
-	movdqu	%xmm4,112(%r13)
-	leaq	128(%r13),%r13
-	paddd	112(%r11),%xmm15
-	jnz	.Lctr_enc_loop
-
-	jmp	.Lctr_enc_done
-.align	16
-.Lctr_enc_loop_done:
-	addq	$8,%r14
-	movdqu	0(%r12),%xmm7
-	pxor	%xmm7,%xmm15
-	movdqu	%xmm15,0(%r13)
-	cmpq	$2,%r14
-	jb	.Lctr_enc_done
-	movdqu	16(%r12),%xmm8
-	pxor	%xmm8,%xmm0
-	movdqu	%xmm0,16(%r13)
-	je	.Lctr_enc_done
-	movdqu	32(%r12),%xmm9
-	pxor	%xmm9,%xmm3
-	movdqu	%xmm3,32(%r13)
-	cmpq	$4,%r14
-	jb	.Lctr_enc_done
-	movdqu	48(%r12),%xmm10
-	pxor	%xmm10,%xmm5
-	movdqu	%xmm5,48(%r13)
-	je	.Lctr_enc_done
-	movdqu	64(%r12),%xmm11
-	pxor	%xmm11,%xmm2
-	movdqu	%xmm2,64(%r13)
-	cmpq	$6,%r14
-	jb	.Lctr_enc_done
-	movdqu	80(%r12),%xmm12
-	pxor	%xmm12,%xmm6
-	movdqu	%xmm6,80(%r13)
-	je	.Lctr_enc_done
-	movdqu	96(%r12),%xmm13
-	pxor	%xmm13,%xmm1
-	movdqu	%xmm1,96(%r13)
-	jmp	.Lctr_enc_done
-
-.align	16
-.Lctr_enc_short:
-	leaq	32(%rbp),%rdi
-	leaq	48(%rbp),%rsi
-	leaq	(%r15),%rdx
-	call	asm_AES_encrypt
-	movdqu	(%r12),%xmm0
-	leaq	16(%r12),%r12
-	movl	44(%rbp),%eax
-	bswapl	%eax
-	pxor	48(%rbp),%xmm0
-	incl	%eax
-	movdqu	%xmm0,(%r13)
-	bswapl	%eax
-	leaq	16(%r13),%r13
-	movl	%eax,44(%rsp)
-	decq	%r14
-	jnz	.Lctr_enc_short
-
-.Lctr_enc_done:
-	leaq	(%rsp),%rax
-	pxor	%xmm0,%xmm0
-.Lctr_enc_bzero:
-	movdqa	%xmm0,0(%rax)
-	movdqa	%xmm0,16(%rax)
-	leaq	32(%rax),%rax
-	cmpq	%rax,%rbp
-	ja	.Lctr_enc_bzero
-
-	leaq	120(%rbp),%rax
-.cfi_def_cfa	%rax,8
-	movq	-48(%rax),%r15
-.cfi_restore	%r15
-	movq	-40(%rax),%r14
-.cfi_restore	%r14
-	movq	-32(%rax),%r13
-.cfi_restore	%r13
-	movq	-24(%rax),%r12
-.cfi_restore	%r12
-	movq	-16(%rax),%rbx
-.cfi_restore	%rbx
-	movq	-8(%rax),%rbp
-.cfi_restore	%rbp
-	leaq	(%rax),%rsp
-.cfi_def_cfa_register	%rsp
-.Lctr_enc_epilogue:
-	.byte	0xf3,0xc3
-.cfi_endproc	
-.size	bsaes_ctr32_encrypt_blocks,.-bsaes_ctr32_encrypt_blocks
-.globl	bsaes_xts_encrypt
-.type	bsaes_xts_encrypt,@function
-.align	16
-bsaes_xts_encrypt:
-.cfi_startproc	
-	movq	%rsp,%rax
-.Lxts_enc_prologue:
-	pushq	%rbp
-.cfi_adjust_cfa_offset	8
-.cfi_offset	%rbp,-16
-	pushq	%rbx
-.cfi_adjust_cfa_offset	8
-.cfi_offset	%rbx,-24
-	pushq	%r12
-.cfi_adjust_cfa_offset	8
-.cfi_offset	%r12,-32
-	pushq	%r13
-.cfi_adjust_cfa_offset	8
-.cfi_offset	%r13,-40
-	pushq	%r14
-.cfi_adjust_cfa_offset	8
-.cfi_offset	%r14,-48
-	pushq	%r15
-.cfi_adjust_cfa_offset	8
-.cfi_offset	%r15,-56
-	leaq	-72(%rsp),%rsp
-.cfi_adjust_cfa_offset	0x48
-	movq	%rsp,%rbp
-.cfi_def_cfa_register	%rbp
-	movq	%rdi,%r12
-	movq	%rsi,%r13
-	movq	%rdx,%r14
-	movq	%rcx,%r15
-
-	leaq	(%r9),%rdi
-	leaq	32(%rbp),%rsi
-	leaq	(%r8),%rdx
-	call	asm_AES_encrypt
-
-	movl	240(%r15),%eax
-	movq	%r14,%rbx
-
-	movl	%eax,%edx
-	shlq	$7,%rax
-	subq	$96,%rax
-	subq	%rax,%rsp
-
-	movq	%rsp,%rax
-	movq	%r15,%rcx
-	movl	%edx,%r10d
-	call	_bsaes_key_convert
-	pxor	%xmm6,%xmm7
-	movdqa	%xmm7,(%rax)
-
-	andq	$-16,%r14
-	subq	$0x80,%rsp
-	movdqa	32(%rbp),%xmm6
-
-	pxor	%xmm14,%xmm14
-	movdqa	.Lxts_magic(%rip),%xmm12
-	pcmpgtd	%xmm6,%xmm14
-
-	subq	$0x80,%r14
-	jc	.Lxts_enc_short
-	jmp	.Lxts_enc_loop
-
-.align	16
-.Lxts_enc_loop:
-	pshufd	$0x13,%xmm14,%xmm13
-	pxor	%xmm14,%xmm14
-	movdqa	%xmm6,%xmm15
-	movdqa	%xmm6,0(%rsp)
-	paddq	%xmm6,%xmm6
-	pand	%xmm12,%xmm13
-	pcmpgtd	%xmm6,%xmm14
-	pxor	%xmm13,%xmm6
-	pshufd	$0x13,%xmm14,%xmm13
-	pxor	%xmm14,%xmm14
-	movdqa	%xmm6,%xmm0
-	movdqa	%xmm6,16(%rsp)
-	paddq	%xmm6,%xmm6
-	pand	%xmm12,%xmm13
-	pcmpgtd	%xmm6,%xmm14
-	pxor	%xmm13,%xmm6
-	movdqu	0(%r12),%xmm7
-	pshufd	$0x13,%xmm14,%xmm13
-	pxor	%xmm14,%xmm14
-	movdqa	%xmm6,%xmm1
-	movdqa	%xmm6,32(%rsp)
-	paddq	%xmm6,%xmm6
-	pand	%xmm12,%xmm13
-	pcmpgtd	%xmm6,%xmm14
-	pxor	%xmm13,%xmm6
-	movdqu	16(%r12),%xmm8
-	pxor	%xmm7,%xmm15
-	pshufd	$0x13,%xmm14,%xmm13
-	pxor	%xmm14,%xmm14
-	movdqa	%xmm6,%xmm2
-	movdqa	%xmm6,48(%rsp)
-	paddq	%xmm6,%xmm6
-	pand	%xmm12,%xmm13
-	pcmpgtd	%xmm6,%xmm14
-	pxor	%xmm13,%xmm6
-	movdqu	32(%r12),%xmm9
-	pxor	%xmm8,%xmm0
-	pshufd	$0x13,%xmm14,%xmm13
-	pxor	%xmm14,%xmm14
-	movdqa	%xmm6,%xmm3
-	movdqa	%xmm6,64(%rsp)
-	paddq	%xmm6,%xmm6
-	pand	%xmm12,%xmm13
-	pcmpgtd	%xmm6,%xmm14
-	pxor	%xmm13,%xmm6
-	movdqu	48(%r12),%xmm10
-	pxor	%xmm9,%xmm1
-	pshufd	$0x13,%xmm14,%xmm13
-	pxor	%xmm14,%xmm14
-	movdqa	%xmm6,%xmm4
-	movdqa	%xmm6,80(%rsp)
-	paddq	%xmm6,%xmm6
-	pand	%xmm12,%xmm13
-	pcmpgtd	%xmm6,%xmm14
-	pxor	%xmm13,%xmm6
-	movdqu	64(%r12),%xmm11
-	pxor	%xmm10,%xmm2
-	pshufd	$0x13,%xmm14,%xmm13
-	pxor	%xmm14,%xmm14
-	movdqa	%xmm6,%xmm5
-	movdqa	%xmm6,96(%rsp)
-	paddq	%xmm6,%xmm6
-	pand	%xmm12,%xmm13
-	pcmpgtd	%xmm6,%xmm14
-	pxor	%xmm13,%xmm6
-	movdqu	80(%r12),%xmm12
-	pxor	%xmm11,%xmm3
-	movdqu	96(%r12),%xmm13
-	pxor	%xmm12,%xmm4
-	movdqu	112(%r12),%xmm14
-	leaq	128(%r12),%r12
-	movdqa	%xmm6,112(%rsp)
-	pxor	%xmm13,%xmm5
-	leaq	128(%rsp),%rax
-	pxor	%xmm14,%xmm6
-	movl	%edx,%r10d
-
-	call	_bsaes_encrypt8
-
-	pxor	0(%rsp),%xmm15
-	pxor	16(%rsp),%xmm0
-	movdqu	%xmm15,0(%r13)
-	pxor	32(%rsp),%xmm3
-	movdqu	%xmm0,16(%r13)
-	pxor	48(%rsp),%xmm5
-	movdqu	%xmm3,32(%r13)
-	pxor	64(%rsp),%xmm2
-	movdqu	%xmm5,48(%r13)
-	pxor	80(%rsp),%xmm6
-	movdqu	%xmm2,64(%r13)
-	pxor	96(%rsp),%xmm1
-	movdqu	%xmm6,80(%r13)
-	pxor	112(%rsp),%xmm4
-	movdqu	%xmm1,96(%r13)
-	movdqu	%xmm4,112(%r13)
-	leaq	128(%r13),%r13
-
-	movdqa	112(%rsp),%xmm6
-	pxor	%xmm14,%xmm14
-	movdqa	.Lxts_magic(%rip),%xmm12
-	pcmpgtd	%xmm6,%xmm14
-	pshufd	$0x13,%xmm14,%xmm13
-	pxor	%xmm14,%xmm14
-	paddq	%xmm6,%xmm6
-	pand	%xmm12,%xmm13
-	pcmpgtd	%xmm6,%xmm14
-	pxor	%xmm13,%xmm6
-
-	subq	$0x80,%r14
-	jnc	.Lxts_enc_loop
-
-.Lxts_enc_short:
-	addq	$0x80,%r14
-	jz	.Lxts_enc_done
-	pshufd	$0x13,%xmm14,%xmm13
-	pxor	%xmm14,%xmm14
-	movdqa	%xmm6,%xmm15
-	movdqa	%xmm6,0(%rsp)
-	paddq	%xmm6,%xmm6
-	pand	%xmm12,%xmm13
-	pcmpgtd	%xmm6,%xmm14
-	pxor	%xmm13,%xmm6
-	pshufd	$0x13,%xmm14,%xmm13
-	pxor	%xmm14,%xmm14
-	movdqa	%xmm6,%xmm0
-	movdqa	%xmm6,16(%rsp)
-	paddq	%xmm6,%xmm6
-	pand	%xmm12,%xmm13
-	pcmpgtd	%xmm6,%xmm14
-	pxor	%xmm13,%xmm6
-	movdqu	0(%r12),%xmm7
-	cmpq	$16,%r14
-	je	.Lxts_enc_1
-	pshufd	$0x13,%xmm14,%xmm13
-	pxor	%xmm14,%xmm14
-	movdqa	%xmm6,%xmm1
-	movdqa	%xmm6,32(%rsp)
-	paddq	%xmm6,%xmm6
-	pand	%xmm12,%xmm13
-	pcmpgtd	%xmm6,%xmm14
-	pxor	%xmm13,%xmm6
-	movdqu	16(%r12),%xmm8
-	cmpq	$32,%r14
-	je	.Lxts_enc_2
-	pxor	%xmm7,%xmm15
-	pshufd	$0x13,%xmm14,%xmm13
-	pxor	%xmm14,%xmm14
-	movdqa	%xmm6,%xmm2
-	movdqa	%xmm6,48(%rsp)
-	paddq	%xmm6,%xmm6
-	pand	%xmm12,%xmm13
-	pcmpgtd	%xmm6,%xmm14
-	pxor	%xmm13,%xmm6
-	movdqu	32(%r12),%xmm9
-	cmpq	$48,%r14
-	je	.Lxts_enc_3
-	pxor	%xmm8,%xmm0
-	pshufd	$0x13,%xmm14,%xmm13
-	pxor	%xmm14,%xmm14
-	movdqa	%xmm6,%xmm3
-	movdqa	%xmm6,64(%rsp)
-	paddq	%xmm6,%xmm6
-	pand	%xmm12,%xmm13
-	pcmpgtd	%xmm6,%xmm14
-	pxor	%xmm13,%xmm6
-	movdqu	48(%r12),%xmm10
-	cmpq	$64,%r14
-	je	.Lxts_enc_4
-	pxor	%xmm9,%xmm1
-	pshufd	$0x13,%xmm14,%xmm13
-	pxor	%xmm14,%xmm14
-	movdqa	%xmm6,%xmm4
-	movdqa	%xmm6,80(%rsp)
-	paddq	%xmm6,%xmm6
-	pand	%xmm12,%xmm13
-	pcmpgtd	%xmm6,%xmm14
-	pxor	%xmm13,%xmm6
-	movdqu	64(%r12),%xmm11
-	cmpq	$80,%r14
-	je	.Lxts_enc_5
-	pxor	%xmm10,%xmm2
-	pshufd	$0x13,%xmm14,%xmm13
-	pxor	%xmm14,%xmm14
-	movdqa	%xmm6,%xmm5
-	movdqa	%xmm6,96(%rsp)
-	paddq	%xmm6,%xmm6
-	pand	%xmm12,%xmm13
-	pcmpgtd	%xmm6,%xmm14
-	pxor	%xmm13,%xmm6
-	movdqu	80(%r12),%xmm12
-	cmpq	$96,%r14
-	je	.Lxts_enc_6
-	pxor	%xmm11,%xmm3
-	movdqu	96(%r12),%xmm13
-	pxor	%xmm12,%xmm4
-	movdqa	%xmm6,112(%rsp)
-	leaq	112(%r12),%r12
-	pxor	%xmm13,%xmm5
-	leaq	128(%rsp),%rax
-	movl	%edx,%r10d
-
-	call	_bsaes_encrypt8
-
-	pxor	0(%rsp),%xmm15
-	pxor	16(%rsp),%xmm0
-	movdqu	%xmm15,0(%r13)
-	pxor	32(%rsp),%xmm3
-	movdqu	%xmm0,16(%r13)
-	pxor	48(%rsp),%xmm5
-	movdqu	%xmm3,32(%r13)
-	pxor	64(%rsp),%xmm2
-	movdqu	%xmm5,48(%r13)
-	pxor	80(%rsp),%xmm6
-	movdqu	%xmm2,64(%r13)
-	pxor	96(%rsp),%xmm1
-	movdqu	%xmm6,80(%r13)
-	movdqu	%xmm1,96(%r13)
-	leaq	112(%r13),%r13
-
-	movdqa	112(%rsp),%xmm6
-	jmp	.Lxts_enc_done
-.align	16
-.Lxts_enc_6:
-	pxor	%xmm11,%xmm3
-	leaq	96(%r12),%r12
-	pxor	%xmm12,%xmm4
-	leaq	128(%rsp),%rax
-	movl	%edx,%r10d
-
-	call	_bsaes_encrypt8
-
-	pxor	0(%rsp),%xmm15
-	pxor	16(%rsp),%xmm0
-	movdqu	%xmm15,0(%r13)
-	pxor	32(%rsp),%xmm3
-	movdqu	%xmm0,16(%r13)
-	pxor	48(%rsp),%xmm5
-	movdqu	%xmm3,32(%r13)
-	pxor	64(%rsp),%xmm2
-	movdqu	%xmm5,48(%r13)
-	pxor	80(%rsp),%xmm6
-	movdqu	%xmm2,64(%r13)
-	movdqu	%xmm6,80(%r13)
-	leaq	96(%r13),%r13
-
-	movdqa	96(%rsp),%xmm6
-	jmp	.Lxts_enc_done
-.align	16
-.Lxts_enc_5:
-	pxor	%xmm10,%xmm2
-	leaq	80(%r12),%r12
-	pxor	%xmm11,%xmm3
-	leaq	128(%rsp),%rax
-	movl	%edx,%r10d
-
-	call	_bsaes_encrypt8
-
-	pxor	0(%rsp),%xmm15
-	pxor	16(%rsp),%xmm0
-	movdqu	%xmm15,0(%r13)
-	pxor	32(%rsp),%xmm3
-	movdqu	%xmm0,16(%r13)
-	pxor	48(%rsp),%xmm5
-	movdqu	%xmm3,32(%r13)
-	pxor	64(%rsp),%xmm2
-	movdqu	%xmm5,48(%r13)
-	movdqu	%xmm2,64(%r13)
-	leaq	80(%r13),%r13
-
-	movdqa	80(%rsp),%xmm6
-	jmp	.Lxts_enc_done
-.align	16
-.Lxts_enc_4:
-	pxor	%xmm9,%xmm1
-	leaq	64(%r12),%r12
-	pxor	%xmm10,%xmm2
-	leaq	128(%rsp),%rax
-	movl	%edx,%r10d
-
-	call	_bsaes_encrypt8
-
-	pxor	0(%rsp),%xmm15
-	pxor	16(%rsp),%xmm0
-	movdqu	%xmm15,0(%r13)
-	pxor	32(%rsp),%xmm3
-	movdqu	%xmm0,16(%r13)
-	pxor	48(%rsp),%xmm5
-	movdqu	%xmm3,32(%r13)
-	movdqu	%xmm5,48(%r13)
-	leaq	64(%r13),%r13
-
-	movdqa	64(%rsp),%xmm6
-	jmp	.Lxts_enc_done
-.align	16
-.Lxts_enc_3:
-	pxor	%xmm8,%xmm0
-	leaq	48(%r12),%r12
-	pxor	%xmm9,%xmm1
-	leaq	128(%rsp),%rax
-	movl	%edx,%r10d
-
-	call	_bsaes_encrypt8
-
-	pxor	0(%rsp),%xmm15
-	pxor	16(%rsp),%xmm0
-	movdqu	%xmm15,0(%r13)
-	pxor	32(%rsp),%xmm3
-	movdqu	%xmm0,16(%r13)
-	movdqu	%xmm3,32(%r13)
-	leaq	48(%r13),%r13
-
-	movdqa	48(%rsp),%xmm6
-	jmp	.Lxts_enc_done
-.align	16
-.Lxts_enc_2:
-	pxor	%xmm7,%xmm15
-	leaq	32(%r12),%r12
-	pxor	%xmm8,%xmm0
-	leaq	128(%rsp),%rax
-	movl	%edx,%r10d
-
-	call	_bsaes_encrypt8
-
-	pxor	0(%rsp),%xmm15
-	pxor	16(%rsp),%xmm0
-	movdqu	%xmm15,0(%r13)
-	movdqu	%xmm0,16(%r13)
-	leaq	32(%r13),%r13
-
-	movdqa	32(%rsp),%xmm6
-	jmp	.Lxts_enc_done
-.align	16
-.Lxts_enc_1:
-	pxor	%xmm15,%xmm7
-	leaq	16(%r12),%r12
-	movdqa	%xmm7,32(%rbp)
-	leaq	32(%rbp),%rdi
-	leaq	32(%rbp),%rsi
-	leaq	(%r15),%rdx
-	call	asm_AES_encrypt
-	pxor	32(%rbp),%xmm15
-
-
-
-
-
-	movdqu	%xmm15,0(%r13)
-	leaq	16(%r13),%r13
-
-	movdqa	16(%rsp),%xmm6
-
-.Lxts_enc_done:
-	andl	$15,%ebx
-	jz	.Lxts_enc_ret
-	movq	%r13,%rdx
-
-.Lxts_enc_steal:
-	movzbl	(%r12),%eax
-	movzbl	-16(%rdx),%ecx
-	leaq	1(%r12),%r12
-	movb	%al,-16(%rdx)
-	movb	%cl,0(%rdx)
-	leaq	1(%rdx),%rdx
-	subl	$1,%ebx
-	jnz	.Lxts_enc_steal
-
-	movdqu	-16(%r13),%xmm15
-	leaq	32(%rbp),%rdi
-	pxor	%xmm6,%xmm15
-	leaq	32(%rbp),%rsi
-	movdqa	%xmm15,32(%rbp)
-	leaq	(%r15),%rdx
-	call	asm_AES_encrypt
-	pxor	32(%rbp),%xmm6
-	movdqu	%xmm6,-16(%r13)
-
-.Lxts_enc_ret:
-	leaq	(%rsp),%rax
-	pxor	%xmm0,%xmm0
-.Lxts_enc_bzero:
-	movdqa	%xmm0,0(%rax)
-	movdqa	%xmm0,16(%rax)
-	leaq	32(%rax),%rax
-	cmpq	%rax,%rbp
-	ja	.Lxts_enc_bzero
-
-	leaq	120(%rbp),%rax
-.cfi_def_cfa	%rax,8
-	movq	-48(%rax),%r15
-.cfi_restore	%r15
-	movq	-40(%rax),%r14
-.cfi_restore	%r14
-	movq	-32(%rax),%r13
-.cfi_restore	%r13
-	movq	-24(%rax),%r12
-.cfi_restore	%r12
-	movq	-16(%rax),%rbx
-.cfi_restore	%rbx
-	movq	-8(%rax),%rbp
-.cfi_restore	%rbp
-	leaq	(%rax),%rsp
-.cfi_def_cfa_register	%rsp
-.Lxts_enc_epilogue:
-	.byte	0xf3,0xc3
-.cfi_endproc	
-.size	bsaes_xts_encrypt,.-bsaes_xts_encrypt
-
-.globl	bsaes_xts_decrypt
-.type	bsaes_xts_decrypt,@function
-.align	16
-bsaes_xts_decrypt:
-.cfi_startproc	
-	movq	%rsp,%rax
-.Lxts_dec_prologue:
-	pushq	%rbp
-.cfi_adjust_cfa_offset	8
-.cfi_offset	%rbp,-16
-	pushq	%rbx
-.cfi_adjust_cfa_offset	8
-.cfi_offset	%rbx,-24
-	pushq	%r12
-.cfi_adjust_cfa_offset	8
-.cfi_offset	%r12,-32
-	pushq	%r13
-.cfi_adjust_cfa_offset	8
-.cfi_offset	%r13,-40
-	pushq	%r14
-.cfi_adjust_cfa_offset	8
-.cfi_offset	%r14,-48
-	pushq	%r15
-.cfi_adjust_cfa_offset	8
-.cfi_offset	%r15,-56
-	leaq	-72(%rsp),%rsp
-.cfi_adjust_cfa_offset	0x48
-	movq	%rsp,%rbp
-	movq	%rdi,%r12
-	movq	%rsi,%r13
-	movq	%rdx,%r14
-	movq	%rcx,%r15
-
-	leaq	(%r9),%rdi
-	leaq	32(%rbp),%rsi
-	leaq	(%r8),%rdx
-	call	asm_AES_encrypt
-
-	movl	240(%r15),%eax
-	movq	%r14,%rbx
-
-	movl	%eax,%edx
-	shlq	$7,%rax
-	subq	$96,%rax
-	subq	%rax,%rsp
-
-	movq	%rsp,%rax
-	movq	%r15,%rcx
-	movl	%edx,%r10d
-	call	_bsaes_key_convert
-	pxor	(%rsp),%xmm7
-	movdqa	%xmm6,(%rax)
-	movdqa	%xmm7,(%rsp)
-
-	xorl	%eax,%eax
-	andq	$-16,%r14
-	testl	$15,%ebx
-	setnz	%al
-	shlq	$4,%rax
-	subq	%rax,%r14
-
-	subq	$0x80,%rsp
-	movdqa	32(%rbp),%xmm6
-
-	pxor	%xmm14,%xmm14
-	movdqa	.Lxts_magic(%rip),%xmm12
-	pcmpgtd	%xmm6,%xmm14
-
-	subq	$0x80,%r14
-	jc	.Lxts_dec_short
-	jmp	.Lxts_dec_loop
-
-.align	16
-.Lxts_dec_loop:
-	pshufd	$0x13,%xmm14,%xmm13
-	pxor	%xmm14,%xmm14
-	movdqa	%xmm6,%xmm15
-	movdqa	%xmm6,0(%rsp)
-	paddq	%xmm6,%xmm6
-	pand	%xmm12,%xmm13
-	pcmpgtd	%xmm6,%xmm14
-	pxor	%xmm13,%xmm6
-	pshufd	$0x13,%xmm14,%xmm13
-	pxor	%xmm14,%xmm14
-	movdqa	%xmm6,%xmm0
-	movdqa	%xmm6,16(%rsp)
-	paddq	%xmm6,%xmm6
-	pand	%xmm12,%xmm13
-	pcmpgtd	%xmm6,%xmm14
-	pxor	%xmm13,%xmm6
-	movdqu	0(%r12),%xmm7
-	pshufd	$0x13,%xmm14,%xmm13
-	pxor	%xmm14,%xmm14
-	movdqa	%xmm6,%xmm1
-	movdqa	%xmm6,32(%rsp)
-	paddq	%xmm6,%xmm6
-	pand	%xmm12,%xmm13
-	pcmpgtd	%xmm6,%xmm14
-	pxor	%xmm13,%xmm6
-	movdqu	16(%r12),%xmm8
-	pxor	%xmm7,%xmm15
-	pshufd	$0x13,%xmm14,%xmm13
-	pxor	%xmm14,%xmm14
-	movdqa	%xmm6,%xmm2
-	movdqa	%xmm6,48(%rsp)
-	paddq	%xmm6,%xmm6
-	pand	%xmm12,%xmm13
-	pcmpgtd	%xmm6,%xmm14
-	pxor	%xmm13,%xmm6
-	movdqu	32(%r12),%xmm9
-	pxor	%xmm8,%xmm0
-	pshufd	$0x13,%xmm14,%xmm13
-	pxor	%xmm14,%xmm14
-	movdqa	%xmm6,%xmm3
-	movdqa	%xmm6,64(%rsp)
-	paddq	%xmm6,%xmm6
-	pand	%xmm12,%xmm13
-	pcmpgtd	%xmm6,%xmm14
-	pxor	%xmm13,%xmm6
-	movdqu	48(%r12),%xmm10
-	pxor	%xmm9,%xmm1
-	pshufd	$0x13,%xmm14,%xmm13
-	pxor	%xmm14,%xmm14
-	movdqa	%xmm6,%xmm4
-	movdqa	%xmm6,80(%rsp)
-	paddq	%xmm6,%xmm6
-	pand	%xmm12,%xmm13
-	pcmpgtd	%xmm6,%xmm14
-	pxor	%xmm13,%xmm6
-	movdqu	64(%r12),%xmm11
-	pxor	%xmm10,%xmm2
-	pshufd	$0x13,%xmm14,%xmm13
-	pxor	%xmm14,%xmm14
-	movdqa	%xmm6,%xmm5
-	movdqa	%xmm6,96(%rsp)
-	paddq	%xmm6,%xmm6
-	pand	%xmm12,%xmm13
-	pcmpgtd	%xmm6,%xmm14
-	pxor	%xmm13,%xmm6
-	movdqu	80(%r12),%xmm12
-	pxor	%xmm11,%xmm3
-	movdqu	96(%r12),%xmm13
-	pxor	%xmm12,%xmm4
-	movdqu	112(%r12),%xmm14
-	leaq	128(%r12),%r12
-	movdqa	%xmm6,112(%rsp)
-	pxor	%xmm13,%xmm5
-	leaq	128(%rsp),%rax
-	pxor	%xmm14,%xmm6
-	movl	%edx,%r10d
-
-	call	_bsaes_decrypt8
-
-	pxor	0(%rsp),%xmm15
-	pxor	16(%rsp),%xmm0
-	movdqu	%xmm15,0(%r13)
-	pxor	32(%rsp),%xmm5
-	movdqu	%xmm0,16(%r13)
-	pxor	48(%rsp),%xmm3
-	movdqu	%xmm5,32(%r13)
-	pxor	64(%rsp),%xmm1
-	movdqu	%xmm3,48(%r13)
-	pxor	80(%rsp),%xmm6
-	movdqu	%xmm1,64(%r13)
-	pxor	96(%rsp),%xmm2
-	movdqu	%xmm6,80(%r13)
-	pxor	112(%rsp),%xmm4
-	movdqu	%xmm2,96(%r13)
-	movdqu	%xmm4,112(%r13)
-	leaq	128(%r13),%r13
-
-	movdqa	112(%rsp),%xmm6
-	pxor	%xmm14,%xmm14
-	movdqa	.Lxts_magic(%rip),%xmm12
-	pcmpgtd	%xmm6,%xmm14
-	pshufd	$0x13,%xmm14,%xmm13
-	pxor	%xmm14,%xmm14
-	paddq	%xmm6,%xmm6
-	pand	%xmm12,%xmm13
-	pcmpgtd	%xmm6,%xmm14
-	pxor	%xmm13,%xmm6
-
-	subq	$0x80,%r14
-	jnc	.Lxts_dec_loop
-
-.Lxts_dec_short:
-	addq	$0x80,%r14
-	jz	.Lxts_dec_done
-	pshufd	$0x13,%xmm14,%xmm13
-	pxor	%xmm14,%xmm14
-	movdqa	%xmm6,%xmm15
-	movdqa	%xmm6,0(%rsp)
-	paddq	%xmm6,%xmm6
-	pand	%xmm12,%xmm13
-	pcmpgtd	%xmm6,%xmm14
-	pxor	%xmm13,%xmm6
-	pshufd	$0x13,%xmm14,%xmm13
-	pxor	%xmm14,%xmm14
-	movdqa	%xmm6,%xmm0
-	movdqa	%xmm6,16(%rsp)
-	paddq	%xmm6,%xmm6
-	pand	%xmm12,%xmm13
-	pcmpgtd	%xmm6,%xmm14
-	pxor	%xmm13,%xmm6
-	movdqu	0(%r12),%xmm7
-	cmpq	$16,%r14
-	je	.Lxts_dec_1
-	pshufd	$0x13,%xmm14,%xmm13
-	pxor	%xmm14,%xmm14
-	movdqa	%xmm6,%xmm1
-	movdqa	%xmm6,32(%rsp)
-	paddq	%xmm6,%xmm6
-	pand	%xmm12,%xmm13
-	pcmpgtd	%xmm6,%xmm14
-	pxor	%xmm13,%xmm6
-	movdqu	16(%r12),%xmm8
-	cmpq	$32,%r14
-	je	.Lxts_dec_2
-	pxor	%xmm7,%xmm15
-	pshufd	$0x13,%xmm14,%xmm13
-	pxor	%xmm14,%xmm14
-	movdqa	%xmm6,%xmm2
-	movdqa	%xmm6,48(%rsp)
-	paddq	%xmm6,%xmm6
-	pand	%xmm12,%xmm13
-	pcmpgtd	%xmm6,%xmm14
-	pxor	%xmm13,%xmm6
-	movdqu	32(%r12),%xmm9
-	cmpq	$48,%r14
-	je	.Lxts_dec_3
-	pxor	%xmm8,%xmm0
-	pshufd	$0x13,%xmm14,%xmm13
-	pxor	%xmm14,%xmm14
-	movdqa	%xmm6,%xmm3
-	movdqa	%xmm6,64(%rsp)
-	paddq	%xmm6,%xmm6
-	pand	%xmm12,%xmm13
-	pcmpgtd	%xmm6,%xmm14
-	pxor	%xmm13,%xmm6
-	movdqu	48(%r12),%xmm10
-	cmpq	$64,%r14
-	je	.Lxts_dec_4
-	pxor	%xmm9,%xmm1
-	pshufd	$0x13,%xmm14,%xmm13
-	pxor	%xmm14,%xmm14
-	movdqa	%xmm6,%xmm4
-	movdqa	%xmm6,80(%rsp)
-	paddq	%xmm6,%xmm6
-	pand	%xmm12,%xmm13
-	pcmpgtd	%xmm6,%xmm14
-	pxor	%xmm13,%xmm6
-	movdqu	64(%r12),%xmm11
-	cmpq	$80,%r14
-	je	.Lxts_dec_5
-	pxor	%xmm10,%xmm2
-	pshufd	$0x13,%xmm14,%xmm13
-	pxor	%xmm14,%xmm14
-	movdqa	%xmm6,%xmm5
-	movdqa	%xmm6,96(%rsp)
-	paddq	%xmm6,%xmm6
-	pand	%xmm12,%xmm13
-	pcmpgtd	%xmm6,%xmm14
-	pxor	%xmm13,%xmm6
-	movdqu	80(%r12),%xmm12
-	cmpq	$96,%r14
-	je	.Lxts_dec_6
-	pxor	%xmm11,%xmm3
-	movdqu	96(%r12),%xmm13
-	pxor	%xmm12,%xmm4
-	movdqa	%xmm6,112(%rsp)
-	leaq	112(%r12),%r12
-	pxor	%xmm13,%xmm5
-	leaq	128(%rsp),%rax
-	movl	%edx,%r10d
-
-	call	_bsaes_decrypt8
-
-	pxor	0(%rsp),%xmm15
-	pxor	16(%rsp),%xmm0
-	movdqu	%xmm15,0(%r13)
-	pxor	32(%rsp),%xmm5
-	movdqu	%xmm0,16(%r13)
-	pxor	48(%rsp),%xmm3
-	movdqu	%xmm5,32(%r13)
-	pxor	64(%rsp),%xmm1
-	movdqu	%xmm3,48(%r13)
-	pxor	80(%rsp),%xmm6
-	movdqu	%xmm1,64(%r13)
-	pxor	96(%rsp),%xmm2
-	movdqu	%xmm6,80(%r13)
-	movdqu	%xmm2,96(%r13)
-	leaq	112(%r13),%r13
-
-	movdqa	112(%rsp),%xmm6
-	jmp	.Lxts_dec_done
-.align	16
-.Lxts_dec_6:
-	pxor	%xmm11,%xmm3
-	leaq	96(%r12),%r12
-	pxor	%xmm12,%xmm4
-	leaq	128(%rsp),%rax
-	movl	%edx,%r10d
-
-	call	_bsaes_decrypt8
-
-	pxor	0(%rsp),%xmm15
-	pxor	16(%rsp),%xmm0
-	movdqu	%xmm15,0(%r13)
-	pxor	32(%rsp),%xmm5
-	movdqu	%xmm0,16(%r13)
-	pxor	48(%rsp),%xmm3
-	movdqu	%xmm5,32(%r13)
-	pxor	64(%rsp),%xmm1
-	movdqu	%xmm3,48(%r13)
-	pxor	80(%rsp),%xmm6
-	movdqu	%xmm1,64(%r13)
-	movdqu	%xmm6,80(%r13)
-	leaq	96(%r13),%r13
-
-	movdqa	96(%rsp),%xmm6
-	jmp	.Lxts_dec_done
-.align	16
-.Lxts_dec_5:
-	pxor	%xmm10,%xmm2
-	leaq	80(%r12),%r12
-	pxor	%xmm11,%xmm3
-	leaq	128(%rsp),%rax
-	movl	%edx,%r10d
-
-	call	_bsaes_decrypt8
-
-	pxor	0(%rsp),%xmm15
-	pxor	16(%rsp),%xmm0
-	movdqu	%xmm15,0(%r13)
-	pxor	32(%rsp),%xmm5
-	movdqu	%xmm0,16(%r13)
-	pxor	48(%rsp),%xmm3
-	movdqu	%xmm5,32(%r13)
-	pxor	64(%rsp),%xmm1
-	movdqu	%xmm3,48(%r13)
-	movdqu	%xmm1,64(%r13)
-	leaq	80(%r13),%r13
-
-	movdqa	80(%rsp),%xmm6
-	jmp	.Lxts_dec_done
-.align	16
-.Lxts_dec_4:
-	pxor	%xmm9,%xmm1
-	leaq	64(%r12),%r12
-	pxor	%xmm10,%xmm2
-	leaq	128(%rsp),%rax
-	movl	%edx,%r10d
-
-	call	_bsaes_decrypt8
-
-	pxor	0(%rsp),%xmm15
-	pxor	16(%rsp),%xmm0
-	movdqu	%xmm15,0(%r13)
-	pxor	32(%rsp),%xmm5
-	movdqu	%xmm0,16(%r13)
-	pxor	48(%rsp),%xmm3
-	movdqu	%xmm5,32(%r13)
-	movdqu	%xmm3,48(%r13)
-	leaq	64(%r13),%r13
-
-	movdqa	64(%rsp),%xmm6
-	jmp	.Lxts_dec_done
-.align	16
-.Lxts_dec_3:
-	pxor	%xmm8,%xmm0
-	leaq	48(%r12),%r12
-	pxor	%xmm9,%xmm1
-	leaq	128(%rsp),%rax
-	movl	%edx,%r10d
-
-	call	_bsaes_decrypt8
-
-	pxor	0(%rsp),%xmm15
-	pxor	16(%rsp),%xmm0
-	movdqu	%xmm15,0(%r13)
-	pxor	32(%rsp),%xmm5
-	movdqu	%xmm0,16(%r13)
-	movdqu	%xmm5,32(%r13)
-	leaq	48(%r13),%r13
-
-	movdqa	48(%rsp),%xmm6
-	jmp	.Lxts_dec_done
-.align	16
-.Lxts_dec_2:
-	pxor	%xmm7,%xmm15
-	leaq	32(%r12),%r12
-	pxor	%xmm8,%xmm0
-	leaq	128(%rsp),%rax
-	movl	%edx,%r10d
-
-	call	_bsaes_decrypt8
-
-	pxor	0(%rsp),%xmm15
-	pxor	16(%rsp),%xmm0
-	movdqu	%xmm15,0(%r13)
-	movdqu	%xmm0,16(%r13)
-	leaq	32(%r13),%r13
-
-	movdqa	32(%rsp),%xmm6
-	jmp	.Lxts_dec_done
-.align	16
-.Lxts_dec_1:
-	pxor	%xmm15,%xmm7
-	leaq	16(%r12),%r12
-	movdqa	%xmm7,32(%rbp)
-	leaq	32(%rbp),%rdi
-	leaq	32(%rbp),%rsi
-	leaq	(%r15),%rdx
-	call	asm_AES_decrypt
-	pxor	32(%rbp),%xmm15
-
-
-
-
-
-	movdqu	%xmm15,0(%r13)
-	leaq	16(%r13),%r13
-
-	movdqa	16(%rsp),%xmm6
-
-.Lxts_dec_done:
-	andl	$15,%ebx
-	jz	.Lxts_dec_ret
-
-	pxor	%xmm14,%xmm14
-	movdqa	.Lxts_magic(%rip),%xmm12
-	pcmpgtd	%xmm6,%xmm14
-	pshufd	$0x13,%xmm14,%xmm13
-	movdqa	%xmm6,%xmm5
-	paddq	%xmm6,%xmm6
-	pand	%xmm12,%xmm13
-	movdqu	(%r12),%xmm15
-	pxor	%xmm13,%xmm6
-
-	leaq	32(%rbp),%rdi
-	pxor	%xmm6,%xmm15
-	leaq	32(%rbp),%rsi
-	movdqa	%xmm15,32(%rbp)
-	leaq	(%r15),%rdx
-	call	asm_AES_decrypt
-	pxor	32(%rbp),%xmm6
-	movq	%r13,%rdx
-	movdqu	%xmm6,(%r13)
-
-.Lxts_dec_steal:
-	movzbl	16(%r12),%eax
-	movzbl	(%rdx),%ecx
-	leaq	1(%r12),%r12
-	movb	%al,(%rdx)
-	movb	%cl,16(%rdx)
-	leaq	1(%rdx),%rdx
-	subl	$1,%ebx
-	jnz	.Lxts_dec_steal
-
-	movdqu	(%r13),%xmm15
-	leaq	32(%rbp),%rdi
-	pxor	%xmm5,%xmm15
-	leaq	32(%rbp),%rsi
-	movdqa	%xmm15,32(%rbp)
-	leaq	(%r15),%rdx
-	call	asm_AES_decrypt
-	pxor	32(%rbp),%xmm5
-	movdqu	%xmm5,(%r13)
-
-.Lxts_dec_ret:
-	leaq	(%rsp),%rax
-	pxor	%xmm0,%xmm0
-.Lxts_dec_bzero:
-	movdqa	%xmm0,0(%rax)
-	movdqa	%xmm0,16(%rax)
-	leaq	32(%rax),%rax
-	cmpq	%rax,%rbp
-	ja	.Lxts_dec_bzero
-
-	leaq	120(%rbp),%rax
-.cfi_def_cfa	%rax,8
-	movq	-48(%rax),%r15
-.cfi_restore	%r15
-	movq	-40(%rax),%r14
-.cfi_restore	%r14
-	movq	-32(%rax),%r13
-.cfi_restore	%r13
-	movq	-24(%rax),%r12
-.cfi_restore	%r12
-	movq	-16(%rax),%rbx
-.cfi_restore	%rbx
-	movq	-8(%rax),%rbp
-.cfi_restore	%rbp
-	leaq	(%rax),%rsp
-.cfi_def_cfa_register	%rsp
-.Lxts_dec_epilogue:
-	.byte	0xf3,0xc3
-.cfi_endproc	
-.size	bsaes_xts_decrypt,.-bsaes_xts_decrypt
-.type	_bsaes_const,@object
-.align	64
-_bsaes_const:
-.LM0ISR:
-.quad	0x0a0e0206070b0f03, 0x0004080c0d010509
-.LISRM0:
-.quad	0x01040b0e0205080f, 0x0306090c00070a0d
-.LISR:
-.quad	0x0504070602010003, 0x0f0e0d0c080b0a09
-.LBS0:
-.quad	0x5555555555555555, 0x5555555555555555
-.LBS1:
-.quad	0x3333333333333333, 0x3333333333333333
-.LBS2:
-.quad	0x0f0f0f0f0f0f0f0f, 0x0f0f0f0f0f0f0f0f
-.LSR:
-.quad	0x0504070600030201, 0x0f0e0d0c0a09080b
-.LSRM0:
-.quad	0x0304090e00050a0f, 0x01060b0c0207080d
-.LM0SR:
-.quad	0x0a0e02060f03070b, 0x0004080c05090d01
-.LSWPUP:
-.quad	0x0706050403020100, 0x0c0d0e0f0b0a0908
-.LSWPUPM0SR:
-.quad	0x0a0d02060c03070b, 0x0004080f05090e01
-.LADD1:
-.quad	0x0000000000000000, 0x0000000100000000
-.LADD2:
-.quad	0x0000000000000000, 0x0000000200000000
-.LADD3:
-.quad	0x0000000000000000, 0x0000000300000000
-.LADD4:
-.quad	0x0000000000000000, 0x0000000400000000
-.LADD5:
-.quad	0x0000000000000000, 0x0000000500000000
-.LADD6:
-.quad	0x0000000000000000, 0x0000000600000000
-.LADD7:
-.quad	0x0000000000000000, 0x0000000700000000
-.LADD8:
-.quad	0x0000000000000000, 0x0000000800000000
-.Lxts_magic:
-.long	0x87,0,1,0
-.Lmasks:
-.quad	0x0101010101010101, 0x0101010101010101
-.quad	0x0202020202020202, 0x0202020202020202
-.quad	0x0404040404040404, 0x0404040404040404
-.quad	0x0808080808080808, 0x0808080808080808
-.LM0:
-.quad	0x02060a0e03070b0f, 0x0004080c0105090d
-.L63:
-.quad	0x6363636363636363, 0x6363636363636363
-.byte	66,105,116,45,115,108,105,99,101,100,32,65,69,83,32,102,111,114,32,120,56,54,95,54,52,47,83,83,83,69,51,44,32,69,109,105,108,105,97,32,75,195,164,115,112,101,114,44,32,80,101,116,101,114,32,83,99,104,119,97,98,101,44,32,65,110,100,121,32,80,111,108,121,97,107,111,118,0
-.align	64
-.size	_bsaes_const,.-_bsaes_const
diff --git a/deps/openssl/config/archs/BSD-x86_64/asm/crypto/bn/rsaz-x86_64.s b/deps/openssl/config/archs/BSD-x86_64/asm/crypto/bn/rsaz-x86_64.s
index f8e4a80588..7876e0b8f9 100644
--- a/deps/openssl/config/archs/BSD-x86_64/asm/crypto/bn/rsaz-x86_64.s
+++ b/deps/openssl/config/archs/BSD-x86_64/asm/crypto/bn/rsaz-x86_64.s
@@ -29,7 +29,7 @@ rsaz_512_sqr:
 	subq	$128+24,%rsp
 .cfi_adjust_cfa_offset	128+24
 .Lsqr_body:
-	movq	%rdx,%rbp
+.byte	102,72,15,110,202
 	movq	(%rsi),%rdx
 	movq	8(%rsi),%rax
 	movq	%rcx,128(%rsp)
@@ -44,6 +44,7 @@ rsaz_512_sqr:
 	movl	%r8d,128+8(%rsp)
 
 	movq	%rdx,%rbx
+	movq	%rax,%rbp
 	mulq	%rdx
 	movq	%rax,%r8
 	movq	16(%rsi),%rax
@@ -82,31 +83,29 @@ rsaz_512_sqr:
 	mulq	%rbx
 	addq	%rax,%r14
 	movq	%rbx,%rax
-	movq	%rdx,%r15
-	adcq	$0,%r15
+	adcq	$0,%rdx
 
+	xorq	%rcx,%rcx
 	addq	%r8,%r8
-	movq	%r9,%rcx
-	adcq	%r9,%r9
+	movq	%rdx,%r15
+	adcq	$0,%rcx
 
 	mulq	%rax
-	movq	%rax,(%rsp)
-	addq	%rdx,%r8
-	adcq	$0,%r9
+	addq	%r8,%rdx
+	adcq	$0,%rcx
 
-	movq	%r8,8(%rsp)
-	shrq	$63,%rcx
+	movq	%rax,(%rsp)
+	movq	%rdx,8(%rsp)
 
 
-	movq	8(%rsi),%r8
 	movq	16(%rsi),%rax
-	mulq	%r8
+	mulq	%rbp
 	addq	%rax,%r10
 	movq	24(%rsi),%rax
 	movq	%rdx,%rbx
 	adcq	$0,%rbx
 
-	mulq	%r8
+	mulq	%rbp
 	addq	%rax,%r11
 	movq	32(%rsi),%rax
 	adcq	$0,%rdx
@@ -114,7 +113,7 @@ rsaz_512_sqr:
 	movq	%rdx,%rbx
 	adcq	$0,%rbx
 
-	mulq	%r8
+	mulq	%rbp
 	addq	%rax,%r12
 	movq	40(%rsi),%rax
 	adcq	$0,%rdx
@@ -122,7 +121,7 @@ rsaz_512_sqr:
 	movq	%rdx,%rbx
 	adcq	$0,%rbx
 
-	mulq	%r8
+	mulq	%rbp
 	addq	%rax,%r13
 	movq	48(%rsi),%rax
 	adcq	$0,%rdx
@@ -130,7 +129,7 @@ rsaz_512_sqr:
 	movq	%rdx,%rbx
 	adcq	$0,%rbx
 
-	mulq	%r8
+	mulq	%rbp
 	addq	%rax,%r14
 	movq	56(%rsi),%rax
 	adcq	$0,%rdx
@@ -138,39 +137,39 @@ rsaz_512_sqr:
 	movq	%rdx,%rbx
 	adcq	$0,%rbx
 
-	mulq	%r8
+	mulq	%rbp
 	addq	%rax,%r15
-	movq	%r8,%rax
+	movq	%rbp,%rax
 	adcq	$0,%rdx
 	addq	%rbx,%r15
-	movq	%rdx,%r8
-	movq	%r10,%rdx
-	adcq	$0,%r8
+	adcq	$0,%rdx
 
-	addq	%rdx,%rdx
-	leaq	(%rcx,%r10,2),%r10
-	movq	%r11,%rbx
-	adcq	%r11,%r11
+	xorq	%rbx,%rbx
+	addq	%r9,%r9
+	movq	%rdx,%r8
+	adcq	%r10,%r10
+	adcq	$0,%rbx
 
 	mulq	%rax
+
+	addq	%rcx,%rax
+	movq	16(%rsi),%rbp
 	addq	%rax,%r9
+	movq	24(%rsi),%rax
 	adcq	%rdx,%r10
-	adcq	$0,%r11
+	adcq	$0,%rbx
 
 	movq	%r9,16(%rsp)
 	movq	%r10,24(%rsp)
-	shrq	$63,%rbx
 
 
-	movq	16(%rsi),%r9
-	movq	24(%rsi),%rax
-	mulq	%r9
+	mulq	%rbp
 	addq	%rax,%r12
 	movq	32(%rsi),%rax
 	movq	%rdx,%rcx
 	adcq	$0,%rcx
 
-	mulq	%r9
+	mulq	%rbp
 	addq	%rax,%r13
 	movq	40(%rsi),%rax
 	adcq	$0,%rdx
@@ -178,7 +177,7 @@ rsaz_512_sqr:
 	movq	%rdx,%rcx
 	adcq	$0,%rcx
 
-	mulq	%r9
+	mulq	%rbp
 	addq	%rax,%r14
 	movq	48(%rsi),%rax
 	adcq	$0,%rdx
@@ -186,9 +185,7 @@ rsaz_512_sqr:
 	movq	%rdx,%rcx
 	adcq	$0,%rcx
 
-	mulq	%r9
-	movq	%r12,%r10
-	leaq	(%rbx,%r12,2),%r12
+	mulq	%rbp
 	addq	%rax,%r15
 	movq	56(%rsi),%rax
 	adcq	$0,%rdx
@@ -196,36 +193,40 @@ rsaz_512_sqr:
 	movq	%rdx,%rcx
 	adcq	$0,%rcx
 
-	mulq	%r9
-	shrq	$63,%r10
+	mulq	%rbp
 	addq	%rax,%r8
-	movq	%r9,%rax
+	movq	%rbp,%rax
 	adcq	$0,%rdx
 	addq	%rcx,%r8
-	movq	%rdx,%r9
-	adcq	$0,%r9
+	adcq	$0,%rdx
 
-	movq	%r13,%rcx
-	leaq	(%r10,%r13,2),%r13
+	xorq	%rcx,%rcx
+	addq	%r11,%r11
+	movq	%rdx,%r9
+	adcq	%r12,%r12
+	adcq	$0,%rcx
 
 	mulq	%rax
+
+	addq	%rbx,%rax
+	movq	24(%rsi),%r10
 	addq	%rax,%r11
+	movq	32(%rsi),%rax
 	adcq	%rdx,%r12
-	adcq	$0,%r13
+	adcq	$0,%rcx
 
 	movq	%r11,32(%rsp)
 	movq	%r12,40(%rsp)
-	shrq	$63,%rcx
 
 
-	movq	24(%rsi),%r10
-	movq	32(%rsi),%rax
+	movq	%rax,%r11
 	mulq	%r10
 	addq	%rax,%r14
 	movq	40(%rsi),%rax
 	movq	%rdx,%rbx
 	adcq	$0,%rbx
 
+	movq	%rax,%r12
 	mulq	%r10
 	addq	%rax,%r15
 	movq	48(%rsi),%rax
@@ -234,9 +235,8 @@ rsaz_512_sqr:
 	movq	%rdx,%rbx
 	adcq	$0,%rbx
 
+	movq	%rax,%rbp
 	mulq	%r10
-	movq	%r14,%r12
-	leaq	(%rcx,%r14,2),%r14
 	addq	%rax,%r8
 	movq	56(%rsi),%rax
 	adcq	$0,%rdx
@@ -245,32 +245,33 @@ rsaz_512_sqr:
 	adcq	$0,%rbx
 
 	mulq	%r10
-	shrq	$63,%r12
 	addq	%rax,%r9
 	movq	%r10,%rax
 	adcq	$0,%rdx
 	addq	%rbx,%r9
-	movq	%rdx,%r10
-	adcq	$0,%r10
+	adcq	$0,%rdx
 
-	movq	%r15,%rbx
-	leaq	(%r12,%r15,2),%r15
+	xorq	%rbx,%rbx
+	addq	%r13,%r13
+	movq	%rdx,%r10
+	adcq	%r14,%r14
+	adcq	$0,%rbx
 
 	mulq	%rax
+
+	addq	%rcx,%rax
 	addq	%rax,%r13
+	movq	%r12,%rax
 	adcq	%rdx,%r14
-	adcq	$0,%r15
+	adcq	$0,%rbx
 
 	movq	%r13,48(%rsp)
 	movq	%r14,56(%rsp)
-	shrq	$63,%rbx
 
 
-	movq	32(%rsi),%r11
-	movq	40(%rsi),%rax
 	mulq	%r11
 	addq	%rax,%r8
-	movq	48(%rsi),%rax
+	movq	%rbp,%rax
 	movq	%rdx,%rcx
 	adcq	$0,%rcx
 
@@ -278,97 +279,99 @@ rsaz_512_sqr:
 	addq	%rax,%r9
 	movq	56(%rsi),%rax
 	adcq	$0,%rdx
-	movq	%r8,%r12
-	leaq	(%rbx,%r8,2),%r8
 	addq	%rcx,%r9
 	movq	%rdx,%rcx
 	adcq	$0,%rcx
 
+	movq	%rax,%r14
 	mulq	%r11
-	shrq	$63,%r12
 	addq	%rax,%r10
 	movq	%r11,%rax
 	adcq	$0,%rdx
 	addq	%rcx,%r10
-	movq	%rdx,%r11
-	adcq	$0,%r11
+	adcq	$0,%rdx
 
-	movq	%r9,%rcx
-	leaq	(%r12,%r9,2),%r9
+	xorq	%rcx,%rcx
+	addq	%r15,%r15
+	movq	%rdx,%r11
+	adcq	%r8,%r8
+	adcq	$0,%rcx
 
 	mulq	%rax
+
+	addq	%rbx,%rax
 	addq	%rax,%r15
+	movq	%rbp,%rax
 	adcq	%rdx,%r8
-	adcq	$0,%r9
+	adcq	$0,%rcx
 
 	movq	%r15,64(%rsp)
 	movq	%r8,72(%rsp)
-	shrq	$63,%rcx
 
 
-	movq	40(%rsi),%r12
-	movq	48(%rsi),%rax
 	mulq	%r12
 	addq	%rax,%r10
-	movq	56(%rsi),%rax
+	movq	%r14,%rax
 	movq	%rdx,%rbx
 	adcq	$0,%rbx
 
 	mulq	%r12
 	addq	%rax,%r11
 	movq	%r12,%rax
-	movq	%r10,%r15
-	leaq	(%rcx,%r10,2),%r10
 	adcq	$0,%rdx
-	shrq	$63,%r15
 	addq	%rbx,%r11
-	movq	%rdx,%r12
-	adcq	$0,%r12
+	adcq	$0,%rdx
 
-	movq	%r11,%rbx
-	leaq	(%r15,%r11,2),%r11
+	xorq	%rbx,%rbx
+	addq	%r9,%r9
+	movq	%rdx,%r12
+	adcq	%r10,%r10
+	adcq	$0,%rbx
 
 	mulq	%rax
+
+	addq	%rcx,%rax
 	addq	%rax,%r9
+	movq	%r14,%rax
 	adcq	%rdx,%r10
-	adcq	$0,%r11
+	adcq	$0,%rbx
 
 	movq	%r9,80(%rsp)
 	movq	%r10,88(%rsp)
 
 
-	movq	48(%rsi),%r13
-	movq	56(%rsi),%rax
-	mulq	%r13
+	mulq	%rbp
 	addq	%rax,%r12
-	movq	%r13,%rax
-	movq	%rdx,%r13
-	adcq	$0,%r13
+	movq	%rbp,%rax
+	adcq	$0,%rdx
 
-	xorq	%r14,%r14
-	shlq	$1,%rbx
+	xorq	%rcx,%rcx
+	addq	%r11,%r11
+	movq	%rdx,%r13
 	adcq	%r12,%r12
-	adcq	%r13,%r13
-	adcq	%r14,%r14
+	adcq	$0,%rcx
 
 	mulq	%rax
+
+	addq	%rbx,%rax
 	addq	%rax,%r11
+	movq	%r14,%rax
 	adcq	%rdx,%r12
-	adcq	$0,%r13
+	adcq	$0,%rcx
 
 	movq	%r11,96(%rsp)
 	movq	%r12,104(%rsp)
 
 
-	movq	56(%rsi),%rax
-	mulq	%rax
-	addq	%rax,%r13
-	adcq	$0,%rdx
+	xorq	%rbx,%rbx
+	addq	%r13,%r13
+	adcq	$0,%rbx
 
-	addq	%rdx,%r14
+	mulq	%rax
 
-	movq	%r13,112(%rsp)
-	movq	%r14,120(%rsp)
+	addq	%rcx,%rax
+	addq	%r13,%rax
+	adcq	%rbx,%rdx
 
 	movq	(%rsp),%r8
 	movq	8(%rsp),%r9
@@ -378,6 +381,10 @@ rsaz_512_sqr:
 	movq	40(%rsp),%r13
 	movq	48(%rsp),%r14
 	movq	56(%rsp),%r15
+.byte	102,72,15,126,205
+
+	movq	%rax,112(%rsp)
+	movq	%rdx,120(%rsp)
 
 	call	__rsaz_512_reduce
 
@@ -406,9 +413,9 @@ rsaz_512_sqr:
 .Loop_sqrx:
 	movl	%r8d,128+8(%rsp)
 .byte	102,72,15,110,199
-.byte	102,72,15,110,205
 
 	mulxq	%rax,%r8,%r9
+	movq	%rax,%rbx
 
 	mulxq	16(%rsi),%rcx,%r10
 	xorq	%rbp,%rbp
@@ -416,40 +423,39 @@ rsaz_512_sqr:
 	mulxq	24(%rsi),%rax,%r11
 	adcxq	%rcx,%r9
 
-	mulxq	32(%rsi),%rcx,%r12
+.byte	0xc4,0x62,0xf3,0xf6,0xa6,0x20,0x00,0x00,0x00
 	adcxq	%rax,%r10
 
-	mulxq	40(%rsi),%rax,%r13
+.byte	0xc4,0x62,0xfb,0xf6,0xae,0x28,0x00,0x00,0x00
 	adcxq	%rcx,%r11
 
-.byte	0xc4,0x62,0xf3,0xf6,0xb6,0x30,0x00,0x00,0x00
+	mulxq	48(%rsi),%rcx,%r14
 	adcxq	%rax,%r12
 	adcxq	%rcx,%r13
 
-.byte	0xc4,0x62,0xfb,0xf6,0xbe,0x38,0x00,0x00,0x00
+	mulxq	56(%rsi),%rax,%r15
 	adcxq	%rax,%r14
 	adcxq	%rbp,%r15
 
-	movq	%r9,%rcx
-	shldq	$1,%r8,%r9
-	shlq	$1,%r8
-
-	xorl	%ebp,%ebp
-	mulxq	%rdx,%rax,%rdx
-	adcxq	%rdx,%r8
-	movq	8(%rsi),%rdx
-	adcxq	%rbp,%r9
+	mulxq	%rdx,%rax,%rdi
+	movq	%rbx,%rdx
+	xorq	%rcx,%rcx
+	adoxq	%r8,%r8
+	adcxq	%rdi,%r8
+	adoxq	%rbp,%rcx
+	adcxq	%rbp,%rcx
 
 	movq	%rax,(%rsp)
 	movq	%r8,8(%rsp)
 
 
-	mulxq	16(%rsi),%rax,%rbx
+.byte	0xc4,0xe2,0xfb,0xf6,0x9e,0x10,0x00,0x00,0x00
 	adoxq	%rax,%r10
 	adcxq	%rbx,%r11
 
-.byte	0xc4,0x62,0xc3,0xf6,0x86,0x18,0x00,0x00,0x00
+	mulxq	24(%rsi),%rdi,%r8
 	adoxq	%rdi,%r11
+.byte	0x66
 	adcxq	%r8,%r12
 
 	mulxq	32(%rsi),%rax,%rbx
@@ -467,24 +473,25 @@ rsaz_512_sqr:
 .byte	0xc4,0x62,0xc3,0xf6,0x86,0x38,0x00,0x00,0x00
 	adoxq	%rdi,%r15
 	adcxq	%rbp,%r8
+	mulxq	%rdx,%rax,%rdi
 	adoxq	%rbp,%r8
+.byte	0x48,0x8b,0x96,0x10,0x00,0x00,0x00
 
-	movq	%r11,%rbx
-	shldq	$1,%r10,%r11
-	shldq	$1,%rcx,%r10
+	xorq	%rbx,%rbx
+	adoxq	%r9,%r9
 
-	xorl	%ebp,%ebp
-	mulxq	%rdx,%rax,%rcx
-	movq	16(%rsi),%rdx
+	adcxq	%rcx,%rax
+	adoxq	%r10,%r10
 	adcxq	%rax,%r9
-	adcxq	%rcx,%r10
-	adcxq	%rbp,%r11
+	adoxq	%rbp,%rbx
+	adcxq	%rdi,%r10
+	adcxq	%rbp,%rbx
 
 	movq	%r9,16(%rsp)
 .byte	0x4c,0x89,0x94,0x24,0x18,0x00,0x00,0x00
 
 
-.byte	0xc4,0x62,0xc3,0xf6,0x8e,0x18,0x00,0x00,0x00
+	mulxq	24(%rsi),%rdi,%r9
 	adoxq	%rdi,%r12
 	adcxq	%r9,%r13
 
@@ -492,7 +499,7 @@ rsaz_512_sqr:
 	adoxq	%rax,%r13
 	adcxq	%rcx,%r14
 
-	mulxq	40(%rsi),%rdi,%r9
+.byte	0xc4,0x62,0xc3,0xf6,0x8e,0x28,0x00,0x00,0x00
 	adoxq	%rdi,%r14
 	adcxq	%r9,%r15
 
@@ -500,27 +507,28 @@ rsaz_512_sqr:
 	adoxq	%rax,%r15
 	adcxq	%rcx,%r8
 
-.byte	0xc4,0x62,0xc3,0xf6,0x8e,0x38,0x00,0x00,0x00
+	mulxq	56(%rsi),%rdi,%r9
 	adoxq	%rdi,%r8
 	adcxq	%rbp,%r9
+	mulxq	%rdx,%rax,%rdi
 	adoxq	%rbp,%r9
+	movq	24(%rsi),%rdx
 
-	movq	%r13,%rcx
-	shldq	$1,%r12,%r13
-	shldq	$1,%rbx,%r12
+	xorq	%rcx,%rcx
+	adoxq	%r11,%r11
 
-	xorl	%ebp,%ebp
-	mulxq	%rdx,%rax,%rdx
+	adcxq	%rbx,%rax
+	adoxq	%r12,%r12
 	adcxq	%rax,%r11
-	adcxq	%rdx,%r12
-	movq	24(%rsi),%rdx
-	adcxq	%rbp,%r13
+	adoxq	%rbp,%rcx
+	adcxq	%rdi,%r12
+	adcxq	%rbp,%rcx
 
 	movq	%r11,32(%rsp)
-.byte	0x4c,0x89,0xa4,0x24,0x28,0x00,0x00,0x00
+	movq	%r12,40(%rsp)
 
 
-.byte	0xc4,0xe2,0xfb,0xf6,0x9e,0x20,0x00,0x00,0x00
+	mulxq	32(%rsi),%rax,%rbx
 	adoxq	%rax,%r14
 	adcxq	%rbx,%r15
 
@@ -535,25 +543,25 @@ rsaz_512_sqr:
 	mulxq	56(%rsi),%rdi,%r10
 	adoxq	%rdi,%r9
 	adcxq	%rbp,%r10
+	mulxq	%rdx,%rax,%rdi
 	adoxq	%rbp,%r10
+	movq	32(%rsi),%rdx
 
-.byte	0x66
-	movq	%r15,%rbx
-	shldq	$1,%r14,%r15
-	shldq	$1,%rcx,%r14
+	xorq	%rbx,%rbx
+	adoxq	%r13,%r13
 
-	xorl	%ebp,%ebp
-	mulxq	%rdx,%rax,%rdx
+	adcxq	%rcx,%rax
+	adoxq	%r14,%r14
 	adcxq	%rax,%r13
-	adcxq	%rdx,%r14
-	movq	32(%rsi),%rdx
-	adcxq	%rbp,%r15
+	adoxq	%rbp,%rbx
+	adcxq	%rdi,%r14
+	adcxq	%rbp,%rbx
 
 	movq	%r13,48(%rsp)
 	movq	%r14,56(%rsp)
 
 
-.byte	0xc4,0x62,0xc3,0xf6,0x9e,0x28,0x00,0x00,0x00
+	mulxq	40(%rsi),%rdi,%r11
 	adoxq	%rdi,%r8
 	adcxq	%r11,%r9
 
@@ -564,18 +572,19 @@ rsaz_512_sqr:
 	mulxq	56(%rsi),%rdi,%r11
 	adoxq	%rdi,%r10
 	adcxq	%rbp,%r11
+	mulxq	%rdx,%rax,%rdi
+	movq	40(%rsi),%rdx
 	adoxq	%rbp,%r11
 
-	movq	%r9,%rcx
-	shldq	$1,%r8,%r9
-	shldq	$1,%rbx,%r8
+	xorq	%rcx,%rcx
+	adoxq	%r15,%r15
 
-	xorl	%ebp,%ebp
-	mulxq	%rdx,%rax,%rdx
+	adcxq	%rbx,%rax
+	adoxq	%r8,%r8
 	adcxq	%rax,%r15
-	adcxq	%rdx,%r8
-	movq	40(%rsi),%rdx
-	adcxq	%rbp,%r9
+	adoxq	%rbp,%rcx
+	adcxq	%rdi,%r8
+	adcxq	%rbp,%rcx
 
 	movq	%r15,64(%rsp)
 	movq	%r8,72(%rsp)
@@ -588,18 +597,19 @@ rsaz_512_sqr:
 .byte	0xc4,0x62,0xc3,0xf6,0xa6,0x38,0x00,0x00,0x00
 	adoxq	%rdi,%r11
 	adcxq	%rbp,%r12
+	mulxq	%rdx,%rax,%rdi
 	adoxq	%rbp,%r12
+	movq	48(%rsi),%rdx
 
-	movq	%r11,%rbx
-	shldq	$1,%r10,%r11
-	shldq	$1,%rcx,%r10
+	xorq	%rbx,%rbx
+	adoxq	%r9,%r9
 
-	xorl	%ebp,%ebp
-	mulxq	%rdx,%rax,%rdx
+	adcxq	%rcx,%rax
+	adoxq	%r10,%r10
 	adcxq	%rax,%r9
-	adcxq	%rdx,%r10
-	movq	48(%rsi),%rdx
-	adcxq	%rbp,%r11
+	adcxq	%rdi,%r10
+	adoxq	%rbp,%rbx
+	adcxq	%rbp,%rbx
 
 	movq	%r9,80(%rsp)
 	movq	%r10,88(%rsp)
@@ -609,31 +619,31 @@ rsaz_512_sqr:
 	adoxq	%rax,%r12
 	adoxq	%rbp,%r13
 
-	xorq	%r14,%r14
-	shldq	$1,%r13,%r14
-	shldq	$1,%r12,%r13
-	shldq	$1,%rbx,%r12
+	mulxq	%rdx,%rax,%rdi
+	xorq	%rcx,%rcx
+	movq	56(%rsi),%rdx
+	adoxq	%r11,%r11
 
-	xorl	%ebp,%ebp
-	mulxq	%rdx,%rax,%rdx
+	adcxq	%rbx,%rax
+	adoxq	%r12,%r12
 	adcxq	%rax,%r11
-	adcxq	%rdx,%r12
-	movq	56(%rsi),%rdx
-	adcxq	%rbp,%r13
+	adoxq	%rbp,%rcx
+	adcxq	%rdi,%r12
+	adcxq	%rbp,%rcx
 
 .byte	0x4c,0x89,0x9c,0x24,0x60,0x00,0x00,0x00
 .byte	0x4c,0x89,0xa4,0x24,0x68,0x00,0x00,0x00
 
 
 	mulxq	%rdx,%rax,%rdx
-	adoxq	%rax,%r13
-	adoxq	%rbp,%rdx
+	xorq	%rbx,%rbx
+	adoxq	%r13,%r13
 
-.byte	0x66
-	addq	%rdx,%r14
+	adcxq	%rcx,%rax
+	adoxq	%rbp,%rbx
+	adcxq	%r13,%rax
+	adcxq	%rdx,%rbx
 
-	movq	%r13,112(%rsp)
-	movq	%r14,120(%rsp)
 .byte	102,72,15,126,199
 .byte	102,72,15,126,205
 
@@ -647,6 +657,9 @@ rsaz_512_sqr:
 	movq	48(%rsp),%r14
 	movq	56(%rsp),%r15
 
+	movq	%rax,112(%rsp)
+	movq	%rbx,120(%rsp)
+
 	call	__rsaz_512_reducex
 
 	addq	64(%rsp),%r8
@@ -1440,6 +1453,7 @@ rsaz_512_mul_by_one:
 .type	__rsaz_512_reduce,@function
 .align	32
 __rsaz_512_reduce:
+.cfi_startproc
 	movq	%r8,%rbx
 	imulq	128+8(%rsp),%rbx
 	movq	0(%rbp),%rax
@@ -1519,10 +1533,12 @@ __rsaz_512_reduce:
 	jne	.Lreduction_loop
 
 	.byte	0xf3,0xc3
+.cfi_endproc
 .size	__rsaz_512_reduce,.-__rsaz_512_reduce
 .type	__rsaz_512_reducex,@function
 .align	32
 __rsaz_512_reducex:
+.cfi_startproc
 
 	imulq	%r8,%rdx
 	xorq	%rsi,%rsi
@@ -1575,10 +1591,12 @@ __rsaz_512_reducex:
 	jne	.Lreduction_loopx
 
 	.byte	0xf3,0xc3
+.cfi_endproc
 .size	__rsaz_512_reducex,.-__rsaz_512_reducex
 .type	__rsaz_512_subtract,@function
 .align	32
 __rsaz_512_subtract:
+.cfi_startproc
 	movq	%r8,(%rdi)
 	movq	%r9,8(%rdi)
 	movq	%r10,16(%rdi)
@@ -1632,10 +1650,12 @@ __rsaz_512_subtract:
 	movq	%r15,56(%rdi)
 
 	.byte	0xf3,0xc3
+.cfi_endproc
 .size	__rsaz_512_subtract,.-__rsaz_512_subtract
 .type	__rsaz_512_mul,@function
 .align	32
 __rsaz_512_mul:
+.cfi_startproc
 	leaq	8(%rsp),%rdi
 
 	movq	(%rsi),%rax
@@ -1774,10 +1794,12 @@ __rsaz_512_mul:
 	movq	%r15,56(%rdi)
 
 	.byte	0xf3,0xc3
+.cfi_endproc
 .size	__rsaz_512_mul,.-__rsaz_512_mul
 .type	__rsaz_512_mulx,@function
 .align	32
 __rsaz_512_mulx:
+.cfi_startproc
 	mulxq	(%rsi),%rbx,%r8
 	movq	$-6,%rcx
 
@@ -1894,11 +1916,13 @@ __rsaz_512_mulx:
 	movq	%r15,8+64+56(%rsp)
 
 	.byte	0xf3,0xc3
+.cfi_endproc
 .size	__rsaz_512_mulx,.-__rsaz_512_mulx
 .globl	rsaz_512_scatter4
 .type	rsaz_512_scatter4,@function
 .align	16
 rsaz_512_scatter4:
+.cfi_startproc
 	leaq	(%rdi,%rdx,8),%rdi
 	movl	$8,%r9d
 	jmp	.Loop_scatter
@@ -1911,12 +1935,14 @@ rsaz_512_scatter4:
 	decl	%r9d
 	jnz	.Loop_scatter
 	.byte	0xf3,0xc3
+.cfi_endproc
 .size	rsaz_512_scatter4,.-rsaz_512_scatter4
 
 .globl	rsaz_512_gather4
 .type	rsaz_512_gather4,@function
 .align	16
 rsaz_512_gather4:
+.cfi_startproc
 	movd	%edx,%xmm8
 	movdqa	.Linc+16(%rip),%xmm1
 	movdqa	.Linc(%rip),%xmm0
@@ -1980,6 +2006,7 @@ rsaz_512_gather4:
 	jnz	.Loop_gather
 	.byte	0xf3,0xc3
 .LSEH_end_rsaz_512_gather4:
+.cfi_endproc
 .size	rsaz_512_gather4,.-rsaz_512_gather4
 
 .align	64
diff --git a/deps/openssl/config/archs/BSD-x86_64/asm/crypto/bn/x86_64-mont5.s b/deps/openssl/config/archs/BSD-x86_64/asm/crypto/bn/x86_64-mont5.s
index df4b6610a0..40a60a3c8f 100644
--- a/deps/openssl/config/archs/BSD-x86_64/asm/crypto/bn/x86_64-mont5.s
+++ b/deps/openssl/config/archs/BSD-x86_64/asm/crypto/bn/x86_64-mont5.s
@@ -550,6 +550,7 @@ bn_mul4x_mont_gather5:
 .type	mul4x_internal,@function
 .align	32
 mul4x_internal:
+.cfi_startproc
 	shlq	$5,%r9
 	movd	8(%rax),%xmm5
 	leaq	.Linc(%rip),%rax
@@ -1071,6 +1072,7 @@ mul4x_internal:
 	movq	16(%rbp),%r14
 	movq	24(%rbp),%r15
 	jmp	.Lsqr4x_sub_entry
+.cfi_endproc
 .size	mul4x_internal,.-mul4x_internal
 .globl	bn_power5
 .type	bn_power5,@function
@@ -1213,6 +1215,7 @@ bn_power5:
 .align	32
 bn_sqr8x_internal:
 __bn_sqr8x_internal:
+.cfi_startproc
 
 
 
@@ -1987,10 +1990,12 @@ __bn_sqr8x_reduction:
 	cmpq	%rdx,%rdi
 	jb	.L8x_reduction_loop
 	.byte	0xf3,0xc3
+.cfi_endproc
 .size	bn_sqr8x_internal,.-bn_sqr8x_internal
 .type	__bn_post4x_internal,@function
 .align	32
 __bn_post4x_internal:
+.cfi_startproc
 	movq	0(%rbp),%r12
 	leaq	(%rdi,%r9,1),%rbx
 	movq	%r9,%rcx
@@ -2041,15 +2046,18 @@ __bn_post4x_internal:
 	movq	%r9,%r10
 	negq	%r9
 	.byte	0xf3,0xc3
+.cfi_endproc
 .size	__bn_post4x_internal,.-__bn_post4x_internal
 .globl	bn_from_montgomery
 .type	bn_from_montgomery,@function
 .align	32
 bn_from_montgomery:
+.cfi_startproc
 	testl	$7,%r9d
 	jz	bn_from_mont8x
 	xorl	%eax,%eax
 	.byte	0xf3,0xc3
+.cfi_endproc
 .size	bn_from_montgomery,.-bn_from_montgomery
 
 .type	bn_from_mont8x,@function
@@ -2333,6 +2341,7 @@ bn_mulx4x_mont_gather5:
 .type	mulx4x_internal,@function
 .align	32
 mulx4x_internal:
+.cfi_startproc
 	movq	%r9,8(%rsp)
 	movq	%r9,%r10
 	negq	%r9
@@ -2751,6 +2760,7 @@ mulx4x_internal:
 	movq	16(%rbp),%r14
 	movq	24(%rbp),%r15
 	jmp	.Lsqrx4x_sub_entry
+.cfi_endproc
 .size	mulx4x_internal,.-mulx4x_internal
 .type	bn_powerx5,@function
 .align	32
@@ -3509,6 +3519,7 @@ __bn_sqrx8x_reduction:
 .size	bn_sqrx8x_internal,.-bn_sqrx8x_internal
 .align	32
 __bn_postx4x_internal:
+.cfi_startproc
 	movq	0(%rbp),%r12
 	movq	%rcx,%r10
 	movq	%rcx,%r9
@@ -3556,11 +3567,13 @@ __bn_postx4x_internal:
 	negq	%r9
 
 	.byte	0xf3,0xc3
+.cfi_endproc
 .size	__bn_postx4x_internal,.-__bn_postx4x_internal
 .globl	bn_get_bits5
 .type	bn_get_bits5,@function
 .align	16
 bn_get_bits5:
+.cfi_startproc
 	leaq	0(%rdi),%r10
 	leaq	1(%rdi),%r11
 	movl	%esi,%ecx
@@ -3574,12 +3587,14 @@ bn_get_bits5:
 	shrl	%cl,%eax
 	andl	$31,%eax
 	.byte	0xf3,0xc3
+.cfi_endproc
 .size	bn_get_bits5,.-bn_get_bits5
 
 .globl	bn_scatter5
 .type	bn_scatter5,@function
 .align	16
 bn_scatter5:
+.cfi_startproc
 	cmpl	$0,%esi
 	jz	.Lscatter_epilogue
 	leaq	(%rdx,%rcx,8),%rdx
@@ -3592,6 +3607,7 @@ bn_scatter5:
 	jnz	.Lscatter
 .Lscatter_epilogue:
 	.byte	0xf3,0xc3
+.cfi_endproc
 .size	bn_scatter5,.-bn_scatter5
 
 .globl	bn_gather5
@@ -3599,6 +3615,7 @@ bn_scatter5:
 .align	32
 bn_gather5:
 .LSEH_begin_bn_gather5:
+.cfi_startproc
 
 .byte	0x4c,0x8d,0x14,0x24
 .byte	0x48,0x81,0xec,0x08,0x01,0x00,0x00
@@ -3756,6 +3773,7 @@ bn_gather5:
 	leaq	(%r10),%rsp
 	.byte	0xf3,0xc3
 .LSEH_end_bn_gather5:
+.cfi_endproc
 .size	bn_gather5,.-bn_gather5
 .align	64
 .Linc:
diff --git a/deps/openssl/config/archs/BSD-x86_64/asm/crypto/buildinf.h b/deps/openssl/config/archs/BSD-x86_64/asm/crypto/buildinf.h
index 3eb8d7ca6b..b52f1881d3 100644
--- a/deps/openssl/config/archs/BSD-x86_64/asm/crypto/buildinf.h
+++ b/deps/openssl/config/archs/BSD-x86_64/asm/crypto/buildinf.h
@@ -11,7 +11,7 @@
  */
 
 #define PLATFORM "platform: BSD-x86_64"
-#define DATE "built on: Fri Sep 13 15:57:33 2019 UTC"
+#define DATE "built on: Wed Mar 18 21:04:59 2020 UTC"
 
 /*
  * Generate compiler_flags as an array of individual characters. This is a
@@ -35,12 +35,12 @@ static const char compiler_flags[] = {
     '_','A','S','M',' ','-','D','S','H','A','5','1','2','_','A','S',
     'M',' ','-','D','K','E','C','C','A','K','1','6','0','0','_','A',
     'S','M',' ','-','D','R','C','4','_','A','S','M',' ','-','D','M',
-    'D','5','_','A','S','M',' ','-','D','V','P','A','E','S','_','A',
-    'S','M',' ','-','D','G','H','A','S','H','_','A','S','M',' ','-',
-    'D','E','C','P','_','N','I','S','T','Z','2','5','6','_','A','S',
-    'M',' ','-','D','X','2','5','5','1','9','_','A','S','M',' ','-',
-    'D','P','O','L','Y','1','3','0','5','_','A','S','M',' ','-','D',
-    '_','T','H','R','E','A','D','_','S','A','F','E',' ','-','D','_',
-    'R','E','E','N','T','R','A','N','T',' ','-','D','N','D','E','B',
-    'U','G','\0'
+    'D','5','_','A','S','M',' ','-','D','A','E','S','N','I','_','A',
+    'S','M',' ','-','D','V','P','A','E','S','_','A','S','M',' ','-',
+    'D','G','H','A','S','H','_','A','S','M',' ','-','D','E','C','P',
+    '_','N','I','S','T','Z','2','5','6','_','A','S','M',' ','-','D',
+    'X','2','5','5','1','9','_','A','S','M',' ','-','D','P','O','L',
+    'Y','1','3','0','5','_','A','S','M',' ','-','D','_','T','H','R',
+    'E','A','D','_','S','A','F','E',' ','-','D','_','R','E','E','N',
+    'T','R','A','N','T',' ','-','D','N','D','E','B','U','G','\0'
 };
diff --git a/deps/openssl/config/archs/BSD-x86_64/asm/crypto/camellia/cmll-x86_64.s b/deps/openssl/config/archs/BSD-x86_64/asm/crypto/camellia/cmll-x86_64.s
index 405566b01c..eeb20dd229 100644
--- a/deps/openssl/config/archs/BSD-x86_64/asm/crypto/camellia/cmll-x86_64.s
+++ b/deps/openssl/config/archs/BSD-x86_64/asm/crypto/camellia/cmll-x86_64.s
@@ -5,11 +5,13 @@
 .type	Camellia_EncryptBlock,@function
 .align	16
 Camellia_EncryptBlock:
+.cfi_startproc
 	movl	$128,%eax
 	subl	%edi,%eax
 	movl	$3,%edi
 	adcl	$0,%edi
 	jmp	.Lenc_rounds
+.cfi_endproc
 .size	Camellia_EncryptBlock,.-Camellia_EncryptBlock
 
 .globl	Camellia_EncryptBlock_Rounds
@@ -83,6 +85,7 @@ Camellia_EncryptBlock_Rounds:
 .type	_x86_64_Camellia_encrypt,@function
 .align	16
 _x86_64_Camellia_encrypt:
+.cfi_startproc
 	xorl	0(%r14),%r9d
 	xorl	4(%r14),%r8d
 	xorl	8(%r14),%r11d
@@ -285,6 +288,7 @@ _x86_64_Camellia_encrypt:
 	movl	%edx,%r11d
 
 .byte	0xf3,0xc3
+.cfi_endproc
 .size	_x86_64_Camellia_encrypt,.-_x86_64_Camellia_encrypt
 
 
@@ -292,11 +296,13 @@ _x86_64_Camellia_encrypt:
 .type	Camellia_DecryptBlock,@function
 .align	16
 Camellia_DecryptBlock:
+.cfi_startproc
 	movl	$128,%eax
 	subl	%edi,%eax
 	movl	$3,%edi
 	adcl	$0,%edi
 	jmp	.Ldec_rounds
+.cfi_endproc
 .size	Camellia_DecryptBlock,.-Camellia_DecryptBlock
 
 .globl	Camellia_DecryptBlock_Rounds
@@ -370,6 +376,7 @@ Camellia_DecryptBlock_Rounds:
 .type	_x86_64_Camellia_decrypt,@function
 .align	16
 _x86_64_Camellia_decrypt:
+.cfi_startproc
 	xorl	0(%r14),%r9d
 	xorl	4(%r14),%r8d
 	xorl	8(%r14),%r11d
@@ -573,6 +580,7 @@ _x86_64_Camellia_decrypt:
 	movl	%ebx,%r11d
 
 .byte	0xf3,0xc3
+.cfi_endproc
 .size	_x86_64_Camellia_decrypt,.-_x86_64_Camellia_decrypt
 .globl	Camellia_Ekeygen
 .type	Camellia_Ekeygen,@function
diff --git a/deps/openssl/config/archs/BSD-x86_64/asm/crypto/ec/ecp_nistz256-x86_64.s b/deps/openssl/config/archs/BSD-x86_64/asm/crypto/ec/ecp_nistz256-x86_64.s
index 62b9ac6616..5c9e405041 100644
--- a/deps/openssl/config/archs/BSD-x86_64/asm/crypto/ec/ecp_nistz256-x86_64.s
+++ b/deps/openssl/config/archs/BSD-x86_64/asm/crypto/ec/ecp_nistz256-x86_64.s
@@ -3874,10 +3874,12 @@ ecp_nistz256_ord_sqr_montx:
 .type	ecp_nistz256_to_mont,@function
 .align	32
 ecp_nistz256_to_mont:
+.cfi_startproc
 	movl	$0x80100,%ecx
 	andl	OPENSSL_ia32cap_P+8(%rip),%ecx
 	leaq	.LRR(%rip),%rdx
 	jmp	.Lmul_mont
+.cfi_endproc
 .size	ecp_nistz256_to_mont,.-ecp_nistz256_to_mont
 
 
@@ -4821,6 +4823,7 @@ ecp_nistz256_from_mont:
 .type	ecp_nistz256_scatter_w5,@function
 .align	32
 ecp_nistz256_scatter_w5:
+.cfi_startproc
 	leal	-3(%rdx,%rdx,2),%edx
 	movdqa	0(%rsi),%xmm0
 	shll	$5,%edx
@@ -4837,6 +4840,7 @@ ecp_nistz256_scatter_w5:
 	movdqa	%xmm5,80(%rdi,%rdx,1)
 
 	.byte	0xf3,0xc3
+.cfi_endproc
 .size	ecp_nistz256_scatter_w5,.-ecp_nistz256_scatter_w5
 
 
@@ -4910,6 +4914,7 @@ ecp_nistz256_gather_w5:
 .type	ecp_nistz256_scatter_w7,@function
 .align	32
 ecp_nistz256_scatter_w7:
+.cfi_startproc
 	movdqu	0(%rsi),%xmm0
 	shll	$6,%edx
 	movdqu	16(%rsi),%xmm1
@@ -4921,6 +4926,7 @@ ecp_nistz256_scatter_w7:
 	movdqa	%xmm3,48(%rdi,%rdx,1)
 
 	.byte	0xf3,0xc3
+.cfi_endproc
 .size	ecp_nistz256_scatter_w7,.-ecp_nistz256_scatter_w7
 
 
@@ -5655,26 +5661,16 @@ ecp_nistz256_point_add:
 	orq	%r8,%r12
 	orq	%r9,%r12
 
-.byte	0x3e
-	jnz	.Ladd_proceedq
 .byte	102,73,15,126,208
 .byte	102,73,15,126,217
-	testq	%r8,%r8
-	jnz	.Ladd_proceedq
-	testq	%r9,%r9
-	jz	.Ladd_doubleq
 
-.byte	102,72,15,126,199
-	pxor	%xmm0,%xmm0
-	movdqu	%xmm0,0(%rdi)
-	movdqu	%xmm0,16(%rdi)
-	movdqu	%xmm0,32(%rdi)
-	movdqu	%xmm0,48(%rdi)
-	movdqu	%xmm0,64(%rdi)
-	movdqu	%xmm0,80(%rdi)
-	jmp	.Ladd_doneq
+	orq	%r8,%r12
+	orq	%r9,%r12
+
+
+.byte	0x3e
+	jnz	.Ladd_proceedq
 
-.align	32
 .Ladd_doubleq:
 .byte	102,72,15,126,206
 .byte	102,72,15,126,199
@@ -6774,26 +6770,16 @@ ecp_nistz256_point_addx:
 	orq	%r8,%r12
 	orq	%r9,%r12
 
-.byte	0x3e
-	jnz	.Ladd_proceedx
 .byte	102,73,15,126,208
 .byte	102,73,15,126,217
-	testq	%r8,%r8
-	jnz	.Ladd_proceedx
-	testq	%r9,%r9
-	jz	.Ladd_doublex
 
-.byte	102,72,15,126,199
-	pxor	%xmm0,%xmm0
-	movdqu	%xmm0,0(%rdi)
-	movdqu	%xmm0,16(%rdi)
-	movdqu	%xmm0,32(%rdi)
-	movdqu	%xmm0,48(%rdi)
-	movdqu	%xmm0,64(%rdi)
-	movdqu	%xmm0,80(%rdi)
-	jmp	.Ladd_donex
+	orq	%r8,%r12
+	orq	%r9,%r12
+
+
+.byte	0x3e
+	jnz	.Ladd_proceedx
 
-.align	32
 .Ladd_doublex:
 .byte	102,72,15,126,206
 .byte	102,72,15,126,199
diff --git a/deps/openssl/config/archs/BSD-x86_64/asm/crypto/ec/x25519-x86_64.s b/deps/openssl/config/archs/BSD-x86_64/asm/crypto/ec/x25519-x86_64.s
index 2a18eaee28..1788e568cd 100644
--- a/deps/openssl/config/archs/BSD-x86_64/asm/crypto/ec/x25519-x86_64.s
+++ b/deps/openssl/config/archs/BSD-x86_64/asm/crypto/ec/x25519-x86_64.s
@@ -400,12 +400,14 @@ x25519_fe51_mul121666:
 .type	x25519_fe64_eligible,@function
 .align	32
 x25519_fe64_eligible:
+.cfi_startproc
 	movl	OPENSSL_ia32cap_P+8(%rip),%ecx
 	xorl	%eax,%eax
 	andl	$0x80100,%ecx
 	cmpl	$0x80100,%ecx
 	cmovel	%ecx,%eax
 	.byte	0xf3,0xc3
+.cfi_endproc
 .size	x25519_fe64_eligible,.-x25519_fe64_eligible
 
 .globl	x25519_fe64_mul
@@ -648,6 +650,7 @@ x25519_fe64_sqr:
 .align	32
 x25519_fe64_mul121666:
 .Lfe64_mul121666_body:
+.cfi_startproc
 	movl	$121666,%edx
 	mulxq	0(%rsi),%r8,%rcx
 	mulxq	8(%rsi),%r9,%rax
@@ -676,6 +679,7 @@ x25519_fe64_mul121666:
 
 .Lfe64_mul121666_epilogue:
 	.byte	0xf3,0xc3
+.cfi_endproc
 .size	x25519_fe64_mul121666,.-x25519_fe64_mul121666
 
 .globl	x25519_fe64_add
@@ -683,6 +687,7 @@ x25519_fe64_mul121666:
 .align	32
 x25519_fe64_add:
 .Lfe64_add_body:
+.cfi_startproc
 	movq	0(%rsi),%r8
 	movq	8(%rsi),%r9
 	movq	16(%rsi),%r10
@@ -711,6 +716,7 @@ x25519_fe64_add:
 
 .Lfe64_add_epilogue:
 	.byte	0xf3,0xc3
+.cfi_endproc
 .size	x25519_fe64_add,.-x25519_fe64_add
 
 .globl	x25519_fe64_sub
@@ -718,6 +724,7 @@ x25519_fe64_add:
 .align	32
 x25519_fe64_sub:
 .Lfe64_sub_body:
+.cfi_startproc
 	movq	0(%rsi),%r8
 	movq	8(%rsi),%r9
 	movq	16(%rsi),%r10
@@ -746,6 +753,7 @@ x25519_fe64_sub:
 
 .Lfe64_sub_epilogue:
 	.byte	0xf3,0xc3
+.cfi_endproc
 .size	x25519_fe64_sub,.-x25519_fe64_sub
 
 .globl	x25519_fe64_tobytes
@@ -753,6 +761,7 @@ x25519_fe64_sub:
 .align	32
 x25519_fe64_tobytes:
 .Lfe64_to_body:
+.cfi_startproc
 	movq	0(%rsi),%r8
 	movq	8(%rsi),%r9
 	movq	16(%rsi),%r10
@@ -788,5 +797,6 @@ x25519_fe64_tobytes:
 
 .Lfe64_to_epilogue:
 	.byte	0xf3,0xc3
+.cfi_endproc
 .size	x25519_fe64_tobytes,.-x25519_fe64_tobytes
 .byte	88,50,53,53,49,57,32,112,114,105,109,105,116,105,118,101,115,32,102,111,114,32,120,56,54,95,54,52,44,32,67,82,89,80,84,79,71,65,77,83,32,98,121,32,60,97,112,112,114,111,64,111,112,101,110,115,115,108,46,111,114,103,62,0
diff --git a/deps/openssl/config/archs/BSD-x86_64/asm/crypto/include/internal/bn_conf.h b/deps/openssl/config/archs/BSD-x86_64/asm/crypto/include/internal/bn_conf.h
index 34bd8b78b4..5312ef5a7a 100644
--- a/deps/openssl/config/archs/BSD-x86_64/asm/crypto/include/internal/bn_conf.h
+++ b/deps/openssl/config/archs/BSD-x86_64/asm/crypto/include/internal/bn_conf.h
@@ -1,5 +1,5 @@
 /* WARNING: do not edit! */
-/* Generated by Makefile from crypto/include/internal/bn_conf.h.in */
+/* Generated by Makefile from include/crypto/bn_conf.h.in */
 /*
  * Copyright 2016 The OpenSSL Project Authors. All Rights Reserved.
  *
@@ -9,8 +9,8 @@
  * https://www.openssl.org/source/license.html
  */
 
-#ifndef HEADER_BN_CONF_H
-# define HEADER_BN_CONF_H
+#ifndef OSSL_CRYPTO_BN_CONF_H
+# define OSSL_CRYPTO_BN_CONF_H
 
 /*
  * The contents of this file are not used in the UEFI build, as
diff --git a/deps/openssl/config/archs/BSD-x86_64/asm/crypto/include/internal/dso_conf.h b/deps/openssl/config/archs/BSD-x86_64/asm/crypto/include/internal/dso_conf.h
index 252266ec2a..4b1167c3d8 100644
--- a/deps/openssl/config/archs/BSD-x86_64/asm/crypto/include/internal/dso_conf.h
+++ b/deps/openssl/config/archs/BSD-x86_64/asm/crypto/include/internal/dso_conf.h
@@ -1,5 +1,5 @@
 /* WARNING: do not edit! */
-/* Generated by Makefile from crypto/include/internal/dso_conf.h.in */
+/* Generated by Makefile from include/crypto/dso_conf.h.in */
 /*
  * Copyright 2016-2019 The OpenSSL Project Authors. All Rights Reserved.
  *
@@ -9,8 +9,8 @@
  * https://www.openssl.org/source/license.html
  */
 
-#ifndef HEADER_DSO_CONF_H
-# define HEADER_DSO_CONF_H
+#ifndef OSSL_CRYPTO_DSO_CONF_H
+# define OSSL_CRYPTO_DSO_CONF_H
 # define DSO_DLFCN
 # define HAVE_DLFCN_H
 # define DSO_EXTENSION ".so"
diff --git a/deps/openssl/config/archs/BSD-x86_64/asm/crypto/modes/aesni-gcm-x86_64.s b/deps/openssl/config/archs/BSD-x86_64/asm/crypto/modes/aesni-gcm-x86_64.s
index 6a7a9577c7..01d89630a4 100644
--- a/deps/openssl/config/archs/BSD-x86_64/asm/crypto/modes/aesni-gcm-x86_64.s
+++ b/deps/openssl/config/archs/BSD-x86_64/asm/crypto/modes/aesni-gcm-x86_64.s
@@ -3,6 +3,7 @@
 .type	_aesni_ctr32_ghash_6x,@function
 .align	32
 _aesni_ctr32_ghash_6x:
+.cfi_startproc
 	vmovdqu	32(%r11),%xmm2
 	subq	$6,%rdx
 	vpxor	%xmm4,%xmm4,%xmm4
@@ -310,6 +311,7 @@ _aesni_ctr32_ghash_6x:
 	vpxor	%xmm4,%xmm8,%xmm8
 
 	.byte	0xf3,0xc3
+.cfi_endproc
 .size	_aesni_ctr32_ghash_6x,.-_aesni_ctr32_ghash_6x
 .globl	aesni_gcm_decrypt
 .type	aesni_gcm_decrypt,@function
@@ -416,6 +418,7 @@ aesni_gcm_decrypt:
 .type	_aesni_ctr32_6x,@function
 .align	32
 _aesni_ctr32_6x:
+.cfi_startproc
 	vmovdqu	0-128(%rcx),%xmm4
 	vmovdqu	32(%r11),%xmm2
 	leaq	-1(%rbp),%r13
@@ -502,6 +505,7 @@ _aesni_ctr32_6x:
 	vpshufb	%xmm0,%xmm1,%xmm1
 	vpxor	%xmm4,%xmm14,%xmm14
 	jmp	.Loop_ctr32
+.cfi_endproc
 .size	_aesni_ctr32_6x,.-_aesni_ctr32_6x
 
 .globl	aesni_gcm_encrypt
diff --git a/deps/openssl/config/archs/BSD-x86_64/asm/crypto/poly1305/poly1305-x86_64.s b/deps/openssl/config/archs/BSD-x86_64/asm/crypto/poly1305/poly1305-x86_64.s
index deb4f74bfb..987a65aab3 100644
--- a/deps/openssl/config/archs/BSD-x86_64/asm/crypto/poly1305/poly1305-x86_64.s
+++ b/deps/openssl/config/archs/BSD-x86_64/asm/crypto/poly1305/poly1305-x86_64.s
@@ -12,6 +12,7 @@
 .type	poly1305_init,@function
 .align	32
 poly1305_init:
+.cfi_startproc
 	xorq	%rax,%rax
 	movq	%rax,0(%rdi)
 	movq	%rax,8(%rdi)
@@ -47,6 +48,7 @@ poly1305_init:
 	movl	$1,%eax
 .Lno_key:
 	.byte	0xf3,0xc3
+.cfi_endproc
 .size	poly1305_init,.-poly1305_init
 
 .type	poly1305_blocks,@function
@@ -167,6 +169,7 @@ poly1305_blocks:
 .type	poly1305_emit,@function
 .align	32
 poly1305_emit:
+.cfi_startproc
 .Lemit:
 	movq	0(%rdi),%r8
 	movq	8(%rdi),%r9
@@ -187,10 +190,12 @@ poly1305_emit:
 	movq	%rcx,8(%rsi)
 
 	.byte	0xf3,0xc3
+.cfi_endproc
 .size	poly1305_emit,.-poly1305_emit
 .type	__poly1305_block,@function
 .align	32
 __poly1305_block:
+.cfi_startproc
 	mulq	%r14
 	movq	%rax,%r9
 	movq	%r11,%rax
@@ -230,11 +235,13 @@ __poly1305_block:
 	adcq	$0,%rbx
 	adcq	$0,%rbp
 	.byte	0xf3,0xc3
+.cfi_endproc
 .size	__poly1305_block,.-__poly1305_block
 
 .type	__poly1305_init_avx,@function
 .align	32
 __poly1305_init_avx:
+.cfi_startproc
 	movq	%r11,%r14
 	movq	%r12,%rbx
 	xorq	%rbp,%rbp
@@ -392,6 +399,7 @@ __poly1305_init_avx:
 
 	leaq	-48-64(%rdi),%rdi
 	.byte	0xf3,0xc3
+.cfi_endproc
 .size	__poly1305_init_avx,.-__poly1305_init_avx
 
 .type	poly1305_blocks_avx,@function
@@ -1232,6 +1240,7 @@ poly1305_blocks_avx:
 .type	poly1305_emit_avx,@function
 .align	32
 poly1305_emit_avx:
+.cfi_startproc
 	cmpl	$0,20(%rdi)
 	je	.Lemit
 
@@ -1282,6 +1291,7 @@ poly1305_emit_avx:
 	movq	%rcx,8(%rsi)
 
 	.byte	0xf3,0xc3
+.cfi_endproc
 .size	poly1305_emit_avx,.-poly1305_emit_avx
 .type	poly1305_blocks_avx2,@function
 .align	32
@@ -2478,6 +2488,7 @@ poly1305_blocks_avx512:
 .type	poly1305_init_base2_44,@function
 .align	32
 poly1305_init_base2_44:
+.cfi_startproc
 	xorq	%rax,%rax
 	movq	%rax,0(%rdi)
 	movq	%rax,8(%rdi)
@@ -2511,10 +2522,12 @@ poly1305_init_base2_44:
 	movq	%r11,8(%rdx)
 	movl	$1,%eax
 	.byte	0xf3,0xc3
+.cfi_endproc
 .size	poly1305_init_base2_44,.-poly1305_init_base2_44
 .type	poly1305_blocks_vpmadd52,@function
 .align	32
 poly1305_blocks_vpmadd52:
+.cfi_startproc
 	shrq	$4,%rdx
 	jz	.Lno_data_vpmadd52
 
@@ -2621,10 +2634,12 @@ poly1305_blocks_vpmadd52:
 
 .Lno_data_vpmadd52:
 	.byte	0xf3,0xc3
+.cfi_endproc
 .size	poly1305_blocks_vpmadd52,.-poly1305_blocks_vpmadd52
 .type	poly1305_blocks_vpmadd52_4x,@function
 .align	32
 poly1305_blocks_vpmadd52_4x:
+.cfi_startproc
 	shrq	$4,%rdx
 	jz	.Lno_data_vpmadd52_4x
 
@@ -3049,10 +3064,12 @@ poly1305_blocks_vpmadd52_4x:
 
 .Lno_data_vpmadd52_4x:
 	.byte	0xf3,0xc3
+.cfi_endproc
 .size	poly1305_blocks_vpmadd52_4x,.-poly1305_blocks_vpmadd52_4x
 .type	poly1305_blocks_vpmadd52_8x,@function
 .align	32
 poly1305_blocks_vpmadd52_8x:
+.cfi_startproc
 	shrq	$4,%rdx
 	jz	.Lno_data_vpmadd52_8x
 
@@ -3393,10 +3410,12 @@ poly1305_blocks_vpmadd52_8x:
 
 .Lno_data_vpmadd52_8x:
 	.byte	0xf3,0xc3
+.cfi_endproc
 .size	poly1305_blocks_vpmadd52_8x,.-poly1305_blocks_vpmadd52_8x
 .type	poly1305_emit_base2_44,@function
 .align	32
 poly1305_emit_base2_44:
+.cfi_startproc
 	movq	0(%rdi),%r8
 	movq	8(%rdi),%r9
 	movq	16(%rdi),%r10
@@ -3427,6 +3446,7 @@ poly1305_emit_base2_44:
 	movq	%rcx,8(%rsi)
 
 	.byte	0xf3,0xc3
+.cfi_endproc
 .size	poly1305_emit_base2_44,.-poly1305_emit_base2_44
 .align	64
 .Lconst:
@@ -3465,6 +3485,7 @@ poly1305_emit_base2_44:
 .type	xor128_encrypt_n_pad,@function
 .align	16
 xor128_encrypt_n_pad:
+.cfi_startproc
 	subq	%rdx,%rsi
 	subq	%rdx,%rdi
 	movq	%rcx,%r10
@@ -3506,12 +3527,14 @@ xor128_encrypt_n_pad:
 .Ldone_enc:
 	movq	%rdx,%rax
 	.byte	0xf3,0xc3
+.cfi_endproc
 .size	xor128_encrypt_n_pad,.-xor128_encrypt_n_pad
 
 .globl	xor128_decrypt_n_pad
 .type	xor128_decrypt_n_pad,@function
 .align	16
 xor128_decrypt_n_pad:
+.cfi_startproc
 	subq	%rdx,%rsi
 	subq	%rdx,%rdi
 	movq	%rcx,%r10
@@ -3557,4 +3580,5 @@ xor128_decrypt_n_pad:
 .Ldone_dec:
 	movq	%rdx,%rax
 	.byte	0xf3,0xc3
+.cfi_endproc
 .size	xor128_decrypt_n_pad,.-xor128_decrypt_n_pad
diff --git a/deps/openssl/config/archs/BSD-x86_64/asm/crypto/rc4/rc4-x86_64.s b/deps/openssl/config/archs/BSD-x86_64/asm/crypto/rc4/rc4-x86_64.s
index fba70351d4..b97c757550 100644
--- a/deps/openssl/config/archs/BSD-x86_64/asm/crypto/rc4/rc4-x86_64.s
+++ b/deps/openssl/config/archs/BSD-x86_64/asm/crypto/rc4/rc4-x86_64.s
@@ -4,11 +4,12 @@
 .globl	RC4
 .type	RC4,@function
 .align	16
-RC4:	orq	%rsi,%rsi
+RC4:
+.cfi_startproc
+	orq	%rsi,%rsi
 	jne	.Lentry
 	.byte	0xf3,0xc3
 .Lentry:
-.cfi_startproc	
 	pushq	%rbx
 .cfi_adjust_cfa_offset	8
 .cfi_offset	%rbx,-16
@@ -533,6 +534,7 @@ RC4:	orq	%rsi,%rsi
 .type	RC4_set_key,@function
 .align	16
 RC4_set_key:
+.cfi_startproc
 	leaq	8(%rdi),%rdi
 	leaq	(%rdx,%rsi,1),%rdx
 	negq	%rsi
@@ -599,12 +601,14 @@ RC4_set_key:
 	movl	%eax,-8(%rdi)
 	movl	%eax,-4(%rdi)
 	.byte	0xf3,0xc3
+.cfi_endproc
 .size	RC4_set_key,.-RC4_set_key
 
 .globl	RC4_options
 .type	RC4_options,@function
 .align	16
 RC4_options:
+.cfi_startproc
 	leaq	.Lopts(%rip),%rax
 	movl	OPENSSL_ia32cap_P(%rip),%edx
 	btl	$20,%edx
@@ -617,6 +621,7 @@ RC4_options:
 	addq	$12,%rax
 .Ldone:
 	.byte	0xf3,0xc3
+.cfi_endproc
 .align	64
 .Lopts:
 .byte	114,99,52,40,56,120,44,105,110,116,41,0
diff --git a/deps/openssl/config/archs/BSD-x86_64/asm/crypto/sha/keccak1600-x86_64.s b/deps/openssl/config/archs/BSD-x86_64/asm/crypto/sha/keccak1600-x86_64.s
index e511f25035..09617d014b 100644
--- a/deps/openssl/config/archs/BSD-x86_64/asm/crypto/sha/keccak1600-x86_64.s
+++ b/deps/openssl/config/archs/BSD-x86_64/asm/crypto/sha/keccak1600-x86_64.s
@@ -3,6 +3,7 @@
 .type	__KeccakF1600,@function
 .align	32
 __KeccakF1600:
+.cfi_startproc
 	movq	60(%rdi),%rax
 	movq	68(%rdi),%rbx
 	movq	76(%rdi),%rcx
@@ -255,6 +256,7 @@ __KeccakF1600:
 
 	leaq	-192(%r15),%r15
 	.byte	0xf3,0xc3
+.cfi_endproc
 .size	__KeccakF1600,.-__KeccakF1600
 
 .type	KeccakF1600,@function
diff --git a/deps/openssl/config/archs/BSD-x86_64/asm/crypto/sha/sha1-x86_64.s b/deps/openssl/config/archs/BSD-x86_64/asm/crypto/sha/sha1-x86_64.s
index e436521a04..98541727e5 100644
--- a/deps/openssl/config/archs/BSD-x86_64/asm/crypto/sha/sha1-x86_64.s
+++ b/deps/openssl/config/archs/BSD-x86_64/asm/crypto/sha/sha1-x86_64.s
@@ -1421,8 +1421,8 @@ _shaext_shortcut:
 	pshufd	$27,%xmm1,%xmm1
 	movdqu	%xmm0,(%rdi)
 	movd	%xmm1,16(%rdi)
-.cfi_endproc	
 	.byte	0xf3,0xc3
+.cfi_endproc
 .size	sha1_block_data_order_shaext,.-sha1_block_data_order_shaext
 .type	sha1_block_data_order_ssse3,@function
 .align	16
diff --git a/deps/openssl/config/archs/BSD-x86_64/asm/crypto/sha/sha256-x86_64.s b/deps/openssl/config/archs/BSD-x86_64/asm/crypto/sha/sha256-x86_64.s
index 42b24df18e..9357385da3 100644
--- a/deps/openssl/config/archs/BSD-x86_64/asm/crypto/sha/sha256-x86_64.s
+++ b/deps/openssl/config/archs/BSD-x86_64/asm/crypto/sha/sha256-x86_64.s
@@ -1775,6 +1775,7 @@ K256:
 .align	64
 sha256_block_data_order_shaext:
 _shaext_shortcut:
+.cfi_startproc
 	leaq	K256+128(%rip),%rcx
 	movdqu	(%rdi),%xmm1
 	movdqu	16(%rdi),%xmm2
@@ -1977,6 +1978,7 @@ _shaext_shortcut:
 	movdqu	%xmm1,(%rdi)
 	movdqu	%xmm2,16(%rdi)
 	.byte	0xf3,0xc3
+.cfi_endproc
 .size	sha256_block_data_order_shaext,.-sha256_block_data_order_shaext
 .type	sha256_block_data_order_ssse3,@function
 .align	64
@@ -4238,7 +4240,15 @@ sha256_block_data_order_avx2:
 	vmovdqa	%ymm4,0(%rsp)
 	xorl	%r14d,%r14d
 	vmovdqa	%ymm5,32(%rsp)
+
+	movq	88(%rsp),%rdi
+.cfi_def_cfa	%rdi,8
 	leaq	-64(%rsp),%rsp
+
+
+
+	movq	%rdi,-8(%rsp)
+.cfi_escape	0x0f,0x05,0x77,0x78,0x06,0x23,0x08
 	movl	%ebx,%edi
 	vmovdqa	%ymm6,0(%rsp)
 	xorl	%ecx,%edi
@@ -4250,6 +4260,12 @@ sha256_block_data_order_avx2:
 .align	16
 .Lavx2_00_47:
 	leaq	-64(%rsp),%rsp
+.cfi_escape	0x0f,0x05,0x77,0x38,0x06,0x23,0x08
+
+	pushq	64-8(%rsp)
+.cfi_escape	0x0f,0x05,0x77,0x00,0x06,0x23,0x08
+	leaq	8(%rsp),%rsp
+.cfi_escape	0x0f,0x05,0x77,0x78,0x06,0x23,0x08
 	vpalignr	$4,%ymm0,%ymm1,%ymm4
 	addl	0+128(%rsp),%r11d
 	andl	%r8d,%r12d
@@ -4505,6 +4521,12 @@ sha256_block_data_order_avx2:
 	movl	%r9d,%r12d
 	vmovdqa	%ymm6,32(%rsp)
 	leaq	-64(%rsp),%rsp
+.cfi_escape	0x0f,0x05,0x77,0x38,0x06,0x23,0x08
+
+	pushq	64-8(%rsp)
+.cfi_escape	0x0f,0x05,0x77,0x00,0x06,0x23,0x08
+	leaq	8(%rsp),%rsp
+.cfi_escape	0x0f,0x05,0x77,0x78,0x06,0x23,0x08
 	vpalignr	$4,%ymm2,%ymm3,%ymm4
 	addl	0+128(%rsp),%r11d
 	andl	%r8d,%r12d
@@ -5380,6 +5402,8 @@ sha256_block_data_order_avx2:
 
 	leaq	448(%rsp),%rsp
 
+.cfi_escape	0x0f,0x06,0x77,0xd8,0x00,0x06,0x23,0x08
+
 	addl	0(%rdi),%eax
 	addl	4(%rdi),%ebx
 	addl	8(%rdi),%ecx
@@ -5405,9 +5429,11 @@ sha256_block_data_order_avx2:
 	jbe	.Loop_avx2
 	leaq	(%rsp),%rbp
 
+
+.cfi_escape	0x0f,0x06,0x76,0xd8,0x00,0x06,0x23,0x08
+
 .Ldone_avx2:
-	leaq	(%rbp),%rsp
-	movq	88(%rsp),%rsi
+	movq	88(%rbp),%rsi
 .cfi_def_cfa	%rsi,8
 	vzeroupper
 	movq	-48(%rsi),%r15
diff --git a/deps/openssl/config/archs/BSD-x86_64/asm/crypto/sha/sha512-x86_64.s b/deps/openssl/config/archs/BSD-x86_64/asm/crypto/sha/sha512-x86_64.s
index 5931a2a932..939f1ca71c 100644
--- a/deps/openssl/config/archs/BSD-x86_64/asm/crypto/sha/sha512-x86_64.s
+++ b/deps/openssl/config/archs/BSD-x86_64/asm/crypto/sha/sha512-x86_64.s
@@ -4165,7 +4165,15 @@ sha512_block_data_order_avx2:
 	vmovdqa	%ymm10,64(%rsp)
 	vpaddq	64(%rbp),%ymm6,%ymm10
 	vmovdqa	%ymm11,96(%rsp)
+
+	movq	152(%rsp),%rdi
+.cfi_def_cfa	%rdi,8
 	leaq	-128(%rsp),%rsp
+
+
+
+	movq	%rdi,-8(%rsp)
+.cfi_escape	0x0f,0x05,0x77,0x78,0x06,0x23,0x08
 	vpaddq	96(%rbp),%ymm7,%ymm11
 	vmovdqa	%ymm8,0(%rsp)
 	xorq	%r14,%r14
@@ -4181,6 +4189,12 @@ sha512_block_data_order_avx2:
 .align	16
 .Lavx2_00_47:
 	leaq	-128(%rsp),%rsp
+.cfi_escape	0x0f,0x06,0x77,0xf8,0x00,0x06,0x23,0x08
+
+	pushq	128-8(%rsp)
+.cfi_escape	0x0f,0x05,0x77,0x00,0x06,0x23,0x08
+	leaq	8(%rsp),%rsp
+.cfi_escape	0x0f,0x05,0x77,0x78,0x06,0x23,0x08
 	vpalignr	$8,%ymm0,%ymm1,%ymm8
 	addq	0+256(%rsp),%r11
 	andq	%r8,%r12
@@ -4474,6 +4488,12 @@ sha512_block_data_order_avx2:
 	movq	%r9,%r12
 	vmovdqa	%ymm10,96(%rsp)
 	leaq	-128(%rsp),%rsp
+.cfi_escape	0x0f,0x06,0x77,0xf8,0x00,0x06,0x23,0x08
+
+	pushq	128-8(%rsp)
+.cfi_escape	0x0f,0x05,0x77,0x00,0x06,0x23,0x08
+	leaq	8(%rsp),%rsp
+.cfi_escape	0x0f,0x05,0x77,0x78,0x06,0x23,0x08
 	vpalignr	$8,%ymm4,%ymm5,%ymm8
 	addq	0+256(%rsp),%r11
 	andq	%r8,%r12
@@ -5387,6 +5407,8 @@ sha512_block_data_order_avx2:
 
 	leaq	1152(%rsp),%rsp
 
+.cfi_escape	0x0f,0x06,0x77,0x98,0x01,0x06,0x23,0x08
+
 	addq	0(%rdi),%rax
 	addq	8(%rdi),%rbx
 	addq	16(%rdi),%rcx
@@ -5412,9 +5434,11 @@ sha512_block_data_order_avx2:
 	jbe	.Loop_avx2
 	leaq	(%rsp),%rbp
 
+
+.cfi_escape	0x0f,0x06,0x76,0x98,0x01,0x06,0x23,0x08
+
 .Ldone_avx2:
-	leaq	(%rbp),%rsp
-	movq	152(%rsp),%rsi
+	movq	152(%rbp),%rsi
 .cfi_def_cfa	%rsi,8
 	vzeroupper
 	movq	-48(%rsi),%r15
diff --git a/deps/openssl/config/archs/BSD-x86_64/asm/crypto/x86_64cpuid.s b/deps/openssl/config/archs/BSD-x86_64/asm/crypto/x86_64cpuid.s
index fd17eaaba4..9268ce8c9a 100644
--- a/deps/openssl/config/archs/BSD-x86_64/asm/crypto/x86_64cpuid.s
+++ b/deps/openssl/config/archs/BSD-x86_64/asm/crypto/x86_64cpuid.s
@@ -12,6 +12,7 @@
 .type	OPENSSL_atomic_add,@function
 .align	16
 OPENSSL_atomic_add:
+.cfi_startproc
 	movl	(%rdi),%eax
 .Lspin:	leaq	(%rsi,%rax,1),%r8
 .byte	0xf0
@@ -20,16 +21,19 @@ OPENSSL_atomic_add:
 	movl	%r8d,%eax
 .byte	0x48,0x98
 	.byte	0xf3,0xc3
+.cfi_endproc
 .size	OPENSSL_atomic_add,.-OPENSSL_atomic_add
 
 .globl	OPENSSL_rdtsc
 .type	OPENSSL_rdtsc,@function
 .align	16
 OPENSSL_rdtsc:
+.cfi_startproc
 	rdtsc
 	shlq	$32,%rdx
 	orq	%rdx,%rax
 	.byte	0xf3,0xc3
+.cfi_endproc
 .size	OPENSSL_rdtsc,.-OPENSSL_rdtsc
 
 .globl	OPENSSL_ia32_cpuid
@@ -205,6 +209,7 @@ OPENSSL_ia32_cpuid:
 .type	OPENSSL_cleanse,@function
 .align	16
 OPENSSL_cleanse:
+.cfi_startproc
 	xorq	%rax,%rax
 	cmpq	$15,%rsi
 	jae	.Lot
@@ -234,12 +239,14 @@ OPENSSL_cleanse:
 	cmpq	$0,%rsi
 	jne	.Little
 	.byte	0xf3,0xc3
+.cfi_endproc
 .size	OPENSSL_cleanse,.-OPENSSL_cleanse
 
 .globl	CRYPTO_memcmp
 .type	CRYPTO_memcmp,@function
 .align	16
 CRYPTO_memcmp:
+.cfi_startproc
 	xorq	%rax,%rax
 	xorq	%r10,%r10
 	cmpq	$0,%rdx
@@ -268,11 +275,13 @@ CRYPTO_memcmp:
 	shrq	$63,%rax
 .Lno_data:
 	.byte	0xf3,0xc3
+.cfi_endproc
 .size	CRYPTO_memcmp,.-CRYPTO_memcmp
 .globl	OPENSSL_wipe_cpu
 .type	OPENSSL_wipe_cpu,@function
 .align	16
 OPENSSL_wipe_cpu:
+.cfi_startproc
 	pxor	%xmm0,%xmm0
 	pxor	%xmm1,%xmm1
 	pxor	%xmm2,%xmm2
@@ -299,11 +308,13 @@ OPENSSL_wipe_cpu:
 	xorq	%r11,%r11
 	leaq	8(%rsp),%rax
 	.byte	0xf3,0xc3
+.cfi_endproc
 .size	OPENSSL_wipe_cpu,.-OPENSSL_wipe_cpu
 .globl	OPENSSL_instrument_bus
 .type	OPENSSL_instrument_bus,@function
 .align	16
 OPENSSL_instrument_bus:
+.cfi_startproc
 	movq	%rdi,%r10
 	movq	%rsi,%rcx
 	movq	%rsi,%r11
@@ -330,12 +341,14 @@ OPENSSL_instrument_bus:
 
 	movq	%r11,%rax
 	.byte	0xf3,0xc3
+.cfi_endproc
 .size	OPENSSL_instrument_bus,.-OPENSSL_instrument_bus
 
 .globl	OPENSSL_instrument_bus2
 .type	OPENSSL_instrument_bus2,@function
 .align	16
 OPENSSL_instrument_bus2:
+.cfi_startproc
 	movq	%rdi,%r10
 	movq	%rsi,%rcx
 	movq	%rdx,%r11
@@ -378,11 +391,13 @@ OPENSSL_instrument_bus2:
 	movq	8(%rsp),%rax
 	subq	%rcx,%rax
 	.byte	0xf3,0xc3
+.cfi_endproc
 .size	OPENSSL_instrument_bus2,.-OPENSSL_instrument_bus2
 .globl	OPENSSL_ia32_rdrand_bytes
 .type	OPENSSL_ia32_rdrand_bytes,@function
 .align	16
 OPENSSL_ia32_rdrand_bytes:
+.cfi_startproc
 	xorq	%rax,%rax
 	cmpq	$0,%rsi
 	je	.Ldone_rdrand_bytes
@@ -419,11 +434,13 @@ OPENSSL_ia32_rdrand_bytes:
 .Ldone_rdrand_bytes:
 	xorq	%r10,%r10
 	.byte	0xf3,0xc3
+.cfi_endproc
 .size	OPENSSL_ia32_rdrand_bytes,.-OPENSSL_ia32_rdrand_bytes
 .globl	OPENSSL_ia32_rdseed_bytes
 .type	OPENSSL_ia32_rdseed_bytes,@function
 .align	16
 OPENSSL_ia32_rdseed_bytes:
+.cfi_startproc
 	xorq	%rax,%rax
 	cmpq	$0,%rsi
 	je	.Ldone_rdseed_bytes
@@ -460,4 +477,5 @@ OPENSSL_ia32_rdseed_bytes:
 .Ldone_rdseed_bytes:
 	xorq	%r10,%r10
 	.byte	0xf3,0xc3
+.cfi_endproc
 .size	OPENSSL_ia32_rdseed_bytes,.-OPENSSL_ia32_rdseed_bytes
diff --git a/deps/openssl/config/archs/BSD-x86_64/asm/include/openssl/opensslconf.h b/deps/openssl/config/archs/BSD-x86_64/asm/include/openssl/opensslconf.h
index 6094de421e..80bda2b852 100644
--- a/deps/openssl/config/archs/BSD-x86_64/asm/include/openssl/opensslconf.h
+++ b/deps/openssl/config/archs/BSD-x86_64/asm/include/openssl/opensslconf.h
@@ -93,9 +93,6 @@ extern "C" {
 #ifndef OPENSSL_NO_DYNAMIC_ENGINE
 # define OPENSSL_NO_DYNAMIC_ENGINE
 #endif
-#ifndef OPENSSL_NO_AFALGENG
-# define OPENSSL_NO_AFALGENG
-#endif
 
 
 /*
diff --git a/deps/openssl/config/archs/BSD-x86_64/asm/include/progs.h b/deps/openssl/config/archs/BSD-x86_64/asm/include/progs.h
index 9b3d270e20..308c65601b 100644
--- a/deps/openssl/config/archs/BSD-x86_64/asm/include/progs.h
+++ b/deps/openssl/config/archs/BSD-x86_64/asm/include/progs.h
@@ -2,7 +2,7 @@
  * WARNING: do not edit!
  * Generated by apps/progs.pl
  *
- * Copyright 1995-2019 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 1995-2020 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
diff --git a/deps/openssl/config/archs/BSD-x86_64/asm/openssl-cl.gypi b/deps/openssl/config/archs/BSD-x86_64/asm/openssl-cl.gypi
index 046ed1ab79..6ced0528ca 100644
--- a/deps/openssl/config/archs/BSD-x86_64/asm/openssl-cl.gypi
+++ b/deps/openssl/config/archs/BSD-x86_64/asm/openssl-cl.gypi
@@ -15,6 +15,7 @@
       'KECCAK1600_ASM',
       'RC4_ASM',
       'MD5_ASM',
+      'AESNI_ASM',
       'VPAES_ASM',
       'GHASH_ASM',
       'ECP_NISTZ256_ASM',
diff --git a/deps/openssl/config/archs/BSD-x86_64/asm/openssl.gypi b/deps/openssl/config/archs/BSD-x86_64/asm/openssl.gypi
index 08b438900a..fec8bfc6a2 100644
--- a/deps/openssl/config/archs/BSD-x86_64/asm/openssl.gypi
+++ b/deps/openssl/config/archs/BSD-x86_64/asm/openssl.gypi
@@ -723,6 +723,7 @@
       'KECCAK1600_ASM',
       'RC4_ASM',
       'MD5_ASM',
+      'AESNI_ASM',
       'VPAES_ASM',
       'GHASH_ASM',
       'ECP_NISTZ256_ASM',
diff --git a/deps/openssl/config/archs/BSD-x86_64/asm_avx2/configdata.pm b/deps/openssl/config/archs/BSD-x86_64/asm_avx2/configdata.pm
index bf9459acad..30164e88aa 100644
--- a/deps/openssl/config/archs/BSD-x86_64/asm_avx2/configdata.pm
+++ b/deps/openssl/config/archs/BSD-x86_64/asm_avx2/configdata.pm
@@ -48,14 +48,14 @@ our %config = (
   export_var_as_fn => "0",
   includes => [  ],
   lflags => [  ],
-  lib_defines => [ "OPENSSL_PIC", "OPENSSL_CPUID_OBJ", "OPENSSL_IA32_SSE2", "OPENSSL_BN_ASM_MONT", "OPENSSL_BN_ASM_MONT5", "OPENSSL_BN_ASM_GF2m", "SHA1_ASM", "SHA256_ASM", "SHA512_ASM", "KECCAK1600_ASM", "RC4_ASM", "MD5_ASM", "VPAES_ASM", "GHASH_ASM", "ECP_NISTZ256_ASM", "X25519_ASM", "POLY1305_ASM" ],
+  lib_defines => [ "OPENSSL_PIC", "OPENSSL_CPUID_OBJ", "OPENSSL_IA32_SSE2", "OPENSSL_BN_ASM_MONT", "OPENSSL_BN_ASM_MONT5", "OPENSSL_BN_ASM_GF2m", "SHA1_ASM", "SHA256_ASM", "SHA512_ASM", "KECCAK1600_ASM", "RC4_ASM", "MD5_ASM", "AESNI_ASM", "VPAES_ASM", "GHASH_ASM", "ECP_NISTZ256_ASM", "X25519_ASM", "POLY1305_ASM" ],
   libdir => "",
   major => "1",
   makedepprog => "\$(CROSS_COMPILE)../config/fake_gcc.pl",
   minor => "1.1",
   openssl_algorithm_defines => [ "OPENSSL_NO_COMP", "OPENSSL_NO_MD2", "OPENSSL_NO_RC5" ],
   openssl_api_defines => [  ],
-  openssl_other_defines => [ "OPENSSL_RAND_SEED_OS", "OPENSSL_NO_AFALGENG", "OPENSSL_NO_ASAN", "OPENSSL_NO_CRYPTO_MDEBUG", "OPENSSL_NO_CRYPTO_MDEBUG_BACKTRACE", "OPENSSL_NO_EC_NISTP_64_GCC_128", "OPENSSL_NO_EGD", "OPENSSL_NO_EXTERNAL_TESTS", "OPENSSL_NO_FUZZ_AFL", "OPENSSL_NO_FUZZ_LIBFUZZER", "OPENSSL_NO_HEARTBEATS", "OPENSSL_NO_MSAN", "OPENSSL_NO_SCTP", "OPENSSL_NO_SSL3", "OPENSSL_NO_SSL3_METHOD", "OPENSSL_NO_UBSAN", "OPENSSL_NO_UNIT_TEST", "OPENSSL_NO_WEAK_SSL_CIPHERS", "OPENSSL_NO_DYNAMIC_ENGINE", "OPENSSL_NO_AFALGENG" ],
+  openssl_other_defines => [ "OPENSSL_RAND_SEED_OS", "OPENSSL_NO_AFALGENG", "OPENSSL_NO_ASAN", "OPENSSL_NO_CRYPTO_MDEBUG", "OPENSSL_NO_CRYPTO_MDEBUG_BACKTRACE", "OPENSSL_NO_EC_NISTP_64_GCC_128", "OPENSSL_NO_EGD", "OPENSSL_NO_EXTERNAL_TESTS", "OPENSSL_NO_FUZZ_AFL", "OPENSSL_NO_FUZZ_LIBFUZZER", "OPENSSL_NO_HEARTBEATS", "OPENSSL_NO_MSAN", "OPENSSL_NO_SCTP", "OPENSSL_NO_SSL3", "OPENSSL_NO_SSL3_METHOD", "OPENSSL_NO_UBSAN", "OPENSSL_NO_UNIT_TEST", "OPENSSL_NO_WEAK_SSL_CIPHERS", "OPENSSL_NO_DYNAMIC_ENGINE" ],
   openssl_sys_defines => [  ],
   openssl_thread_defines => [ "OPENSSL_THREADS" ],
   openssldir => "",
@@ -111,8 +111,8 @@ our %config = (
   sourcedir => ".",
   target => "BSD-x86_64",
   tdirs => [ "ossl_shim" ],
-  version => "1.1.1d",
-  version_num => "0x1010104fL",
+  version => "1.1.1e",
+  version_num => "0x1010105fL",
 );
 
 our %target = (
@@ -236,6 +236,7 @@ our @disablables = (
   "dgram",
   "dh",
   "dsa",
+  "dso",
   "dtls",
   "dynamic-engine",
   "ec",
@@ -352,8 +353,8 @@ our %unified_info = (
         {
             "" =>
                 [
-                    "crypto/include/internal/bn_conf.h",
-                    "crypto/include/internal/dso_conf.h",
+                    "include/crypto/bn_conf.h",
+                    "include/crypto/dso_conf.h",
                     "include/openssl/opensslconf.h",
                 ],
             "apps/asn1pars.o" =>
@@ -621,14 +622,6 @@ our %unified_info = (
                     "crypto/perlasm/cbc.pl",
                     "crypto/perlasm/x86asm.pl",
                 ],
-            "crypto/include/internal/bn_conf.h" =>
-                [
-                    "configdata.pm",
-                ],
-            "crypto/include/internal/dso_conf.h" =>
-                [
-                    "configdata.pm",
-                ],
             "crypto/rc4/rc4-586.s" =>
                 [
                     "crypto/perlasm/x86asm.pl",
@@ -704,6 +697,14 @@ our %unified_info = (
                 [
                     "libcrypto",
                 ],
+            "include/crypto/bn_conf.h" =>
+                [
+                    "configdata.pm",
+                ],
+            "include/crypto/dso_conf.h" =>
+                [
+                    "configdata.pm",
+                ],
             "include/openssl/opensslconf.h" =>
                 [
                     "configdata.pm",
@@ -1501,6 +1502,12 @@ our %unified_info = (
                     "libcrypto",
                     "test/libtestutil.a",
                 ],
+            "test/ssl_ctx_test" =>
+                [
+                    "libcrypto",
+                    "libssl",
+                    "test/libtestutil.a",
+                ],
             "test/ssl_test" =>
                 [
                     "libcrypto",
@@ -3256,7 +3263,6 @@ our %unified_info = (
                             "test/testutil/cb.o",
                             "test/testutil/driver.o",
                             "test/testutil/format_output.o",
-                            "test/testutil/init.o",
                             "test/testutil/main.o",
                             "test/testutil/output_helpers.o",
                             "test/testutil/random.o",
@@ -3264,6 +3270,7 @@ our %unified_info = (
                             "test/testutil/tap_bio.o",
                             "test/testutil/test_cleanup.o",
                             "test/testutil/tests.o",
+                            "test/testutil/testutil_init.o",
                         ],
                     "products" =>
                         {
@@ -3762,14 +3769,6 @@ our %unified_info = (
                 [
                     "crypto/ia64cpuid.S",
                 ],
-            "crypto/include/internal/bn_conf.h" =>
-                [
-                    "crypto/include/internal/bn_conf.h.in",
-                ],
-            "crypto/include/internal/dso_conf.h" =>
-                [
-                    "crypto/include/internal/dso_conf.h.in",
-                ],
             "crypto/md5/md5-586.s" =>
                 [
                     "crypto/md5/asm/md5-586.pl",
@@ -4210,6 +4209,14 @@ our %unified_info = (
                     "engines/asm/e_padlock-x86_64.pl",
                     "\$(PERLASM_SCHEME)",
                 ],
+            "include/crypto/bn_conf.h" =>
+                [
+                    "include/crypto/bn_conf.h.in",
+                ],
+            "include/crypto/dso_conf.h" =>
+                [
+                    "include/crypto/dso_conf.h.in",
+                ],
             "include/openssl/opensslconf.h" =>
                 [
                     "include/openssl/opensslconf.h.in",
@@ -4904,49 +4911,41 @@ our %unified_info = (
             "crypto/aes/aes_cbc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/aes/aes_cfb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/aes/aes_core.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/aes/aes_ecb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/aes/aes_ige.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/aes/aes_misc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/aes/aes_ofb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/aes/aes_wrap.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/aes/aesfx-sparcv9.o" =>
@@ -4956,25 +4955,21 @@ our %unified_info = (
             "crypto/aes/aesni-mb-x86_64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/aes/aesni-sha1-x86_64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/aes/aesni-sha256-x86_64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/aes/aesni-x86_64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/aes/aest4-sparcv9.o" =>
@@ -4992,13 +4987,11 @@ our %unified_info = (
             "crypto/aes/vpaes-x86_64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/aria/aria.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/arm64cpuid.o" =>
@@ -5012,613 +5005,511 @@ our %unified_info = (
             "crypto/asn1/a_bitstr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_d2i_fp.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_digest.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_dup.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_gentm.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_i2d_fp.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_int.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_mbstr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_object.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_octet.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_print.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_sign.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_strex.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_strnid.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_time.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_type.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_utctm.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_utf8.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_verify.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/ameth_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/asn1_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/asn1_gen.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/asn1_item_list.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/asn1_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/asn1_par.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/asn_mime.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/asn_moid.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/asn_mstbl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/asn_pack.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/bio_asn1.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/bio_ndef.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/d2i_pr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/d2i_pu.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/evp_asn1.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/f_int.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/f_string.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/i2d_pr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/i2d_pu.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/n_pkey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/nsseq.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/p5_pbe.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/p5_pbev2.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/p5_scrypt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/p8_pkey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/t_bitst.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/t_pkey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/t_spki.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/tasn_dec.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/tasn_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/tasn_fre.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/tasn_new.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/tasn_prn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/tasn_scn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/tasn_typ.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/tasn_utl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/x_algor.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/x_bignum.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/x_info.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/x_int64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/x_long.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/x_pkey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/x_sig.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/x_spki.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/x_val.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/async/arch/async_null.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/async/arch/async_posix.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/async/arch/async_win.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/async/async.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/async/async_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/async/async_wait.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bf/bf_cfb64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bf/bf_ecb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bf/bf_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bf/bf_ofb64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bf/bf_skey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/b_addr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/b_dump.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/b_print.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/b_sock.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/b_sock2.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bf_buff.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bf_lbuf.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bf_nbio.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bf_null.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bio_cb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bio_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bio_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bio_meth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bss_acpt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bss_bio.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bss_conn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bss_dgram.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bss_fd.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bss_file.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bss_log.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bss_mem.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bss_null.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bss_sock.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/blake2/blake2b.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/blake2/blake2s.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/blake2/m_blake2b.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/blake2/m_blake2s.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/armv4-gf2m.o" =>
@@ -5632,7 +5523,6 @@ our %unified_info = (
             "crypto/bn/asm/x86_64-gcc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn-mips.o" =>
@@ -5642,182 +5532,152 @@ our %unified_info = (
             "crypto/bn/bn_add.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_blind.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_const.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_ctx.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_depr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_dh.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_div.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_exp.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto",
                 ],
             "crypto/bn/bn_exp2.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_gcd.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_gf2m.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_intern.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_kron.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_mod.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_mont.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_mpi.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_mul.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_nist.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_prime.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_print.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_rand.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_recp.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_shift.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_sqr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_sqrt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_srp.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_word.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_x931p.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/mips-mont.o" =>
@@ -5827,19 +5687,16 @@ our %unified_info = (
             "crypto/bn/rsaz-avx2.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/rsaz-x86_64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/rsaz_exp.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/sparct4-mont.o" =>
@@ -5865,31 +5722,26 @@ our %unified_info = (
             "crypto/bn/x86_64-gf2m.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/x86_64-mont.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/x86_64-mont5.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/buffer/buf_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/buffer/buffer.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/buildinf.h" =>
@@ -5899,37 +5751,31 @@ our %unified_info = (
             "crypto/camellia/cmll-x86_64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/camellia/cmll_cfb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/camellia/cmll_ctr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/camellia/cmll_ecb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/camellia/cmll_misc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/camellia/cmll_ofb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/camellia/cmllt4-sparcv9.o" =>
@@ -5939,31 +5785,26 @@ our %unified_info = (
             "crypto/cast/c_cfb64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cast/c_ecb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cast/c_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cast/c_ofb64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cast/c_skey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/chacha/chacha-armv4.o" =>
@@ -5981,278 +5822,232 @@ our %unified_info = (
             "crypto/chacha/chacha-x86_64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cmac/cm_ameth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cmac/cm_pmeth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cmac/cmac.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_asn1.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_att.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_cd.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_dd.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_env.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_ess.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_io.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_kari.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_pwri.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_sd.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_smime.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/conf/conf_api.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/conf/conf_def.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/conf/conf_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/conf/conf_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/conf/conf_mall.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/conf/conf_mod.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/conf/conf_sap.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/conf/conf_ssl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cpt_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cryptlib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ct/ct_b64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ct/ct_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ct/ct_log.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ct/ct_oct.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ct/ct_policy.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ct/ct_prn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ct/ct_sct.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ct/ct_sct_ctx.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ct/ct_vfy.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ct/ct_x509v3.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ctype.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cversion.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto",
                 ],
             "crypto/des/cbc_cksm.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/cbc_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/cfb64ede.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/cfb64enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/cfb_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/des_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/dest4-sparcv9.o" =>
@@ -6262,301 +6057,251 @@ our %unified_info = (
             "crypto/des/ecb3_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/ecb_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/fcrypt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/fcrypt_b.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/ofb64ede.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/ofb64enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/ofb_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/pcbc_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/qud_cksm.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/rand_key.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/set_key.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/str2key.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/xcbc_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_ameth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_asn1.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_check.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_depr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_gen.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_kdf.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_key.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_meth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_pmeth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_prn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_rfc5114.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_rfc7919.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dsa/dsa_ameth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dsa/dsa_asn1.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dsa/dsa_depr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dsa/dsa_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dsa/dsa_gen.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dsa/dsa_key.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dsa/dsa_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dsa/dsa_meth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dsa/dsa_ossl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dsa/dsa_pmeth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dsa/dsa_prn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dsa/dsa_sign.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dsa/dsa_vrf.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dso/dso_dl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dso/dso_dlfcn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dso/dso_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dso/dso_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dso/dso_openssl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dso/dso_vms.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dso/dso_win32.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ebcdic.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/curve25519.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/curve448/arch_32/f_impl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto/ec/curve448/arch_32",
                     "crypto/ec/curve448",
@@ -6564,7 +6309,6 @@ our %unified_info = (
             "crypto/ec/curve448/curve448.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto/ec/curve448/arch_32",
                     "crypto/ec/curve448",
@@ -6572,7 +6316,6 @@ our %unified_info = (
             "crypto/ec/curve448/curve448_tables.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto/ec/curve448/arch_32",
                     "crypto/ec/curve448",
@@ -6580,7 +6323,6 @@ our %unified_info = (
             "crypto/ec/curve448/eddsa.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto/ec/curve448/arch_32",
                     "crypto/ec/curve448",
@@ -6588,7 +6330,6 @@ our %unified_info = (
             "crypto/ec/curve448/f_generic.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto/ec/curve448/arch_32",
                     "crypto/ec/curve448",
@@ -6596,7 +6337,6 @@ our %unified_info = (
             "crypto/ec/curve448/scalar.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto/ec/curve448/arch_32",
                     "crypto/ec/curve448",
@@ -6604,163 +6344,136 @@ our %unified_info = (
             "crypto/ec/ec2_oct.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec2_smpl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec_ameth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec_asn1.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec_check.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec_curve.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec_cvt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec_key.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec_kmeth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec_mult.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec_oct.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec_pmeth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec_print.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecdh_kdf.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecdh_ossl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecdsa_ossl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecdsa_sign.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecdsa_vrf.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/eck_prn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecp_mont.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecp_nist.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecp_nistp224.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecp_nistp256.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecp_nistp521.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecp_nistputil.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecp_nistz256-armv4.o" =>
@@ -6778,247 +6491,206 @@ our %unified_info = (
             "crypto/ec/ecp_nistz256-x86_64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecp_nistz256.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecp_oct.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecp_smpl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecx_meth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/x25519-x86_64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/eng_all.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/eng_cnf.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/eng_ctrl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/eng_devcrypto.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/eng_dyn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/eng_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/eng_fat.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/eng_init.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/eng_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/eng_list.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/eng_openssl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/eng_pkey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/eng_rdrand.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/eng_table.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/tb_asnmth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/tb_cipher.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/tb_dh.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/tb_digest.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/tb_dsa.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/tb_eckey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/tb_pkmeth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/tb_rand.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/tb_rsa.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/err/err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/err/err_all.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/err/err_prn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/bio_b64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/bio_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/bio_md.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/bio_ok.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/c_allc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/c_alld.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/cmeth_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/digest.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/e_aes.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto",
                     "crypto/modes",
@@ -7026,21 +6698,18 @@ our %unified_info = (
             "crypto/evp/e_aes_cbc_hmac_sha1.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto/modes",
                 ],
             "crypto/evp/e_aes_cbc_hmac_sha256.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto/modes",
                 ],
             "crypto/evp/e_aria.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto",
                     "crypto/modes",
@@ -7048,13 +6717,11 @@ our %unified_info = (
             "crypto/evp/e_bf.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/e_camellia.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto",
                     "crypto/modes",
@@ -7062,81 +6729,68 @@ our %unified_info = (
             "crypto/evp/e_cast.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/e_chacha20_poly1305.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/e_des.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto",
                 ],
             "crypto/evp/e_des3.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto",
                 ],
             "crypto/evp/e_idea.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/e_null.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/e_old.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/e_rc2.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/e_rc4.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/e_rc4_hmac_md5.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/e_rc5.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/e_seed.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/e_sm4.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto",
                     "crypto/modes",
@@ -7144,328 +6798,267 @@ our %unified_info = (
             "crypto/evp/e_xcbc_d.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/encode.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/evp_cnf.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/evp_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/evp_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/evp_key.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/evp_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/evp_pbe.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/evp_pkey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/m_md2.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/m_md4.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/m_md5.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/m_md5_sha1.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/m_mdc2.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/m_null.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/m_ripemd.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/m_sha1.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/m_sha3.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto",
                 ],
             "crypto/evp/m_sigver.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/m_wp.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/names.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/p5_crpt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/p5_crpt2.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/p_dec.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/p_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/p_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/p_open.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/p_seal.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/p_sign.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/p_verify.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/pbe_scrypt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/pmeth_fn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/pmeth_gn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/pmeth_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ex_data.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/getenv.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/hmac/hm_ameth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/hmac/hm_pmeth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/hmac/hmac.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/idea/i_cbc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/idea/i_cfb64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/idea/i_ecb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/idea/i_ofb64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/idea/i_skey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
-            "crypto/include/internal/bn_conf.h" =>
-                [
-                    ".",
-                ],
-            "crypto/include/internal/dso_conf.h" =>
-                [
-                    ".",
-                ],
             "crypto/init.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/kdf/hkdf.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/kdf/kdf_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/kdf/scrypt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/kdf/tls1_prf.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/lhash/lh_stats.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/lhash/lhash.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/md4/md4_dgst.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/md4/md4_one.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/md5/md5-sparcv9.o" =>
@@ -7475,91 +7068,76 @@ our %unified_info = (
             "crypto/md5/md5-x86_64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/md5/md5_dgst.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/md5/md5_one.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/mdc2/mdc2_one.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/mdc2/mdc2dgst.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/mem.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/mem_dbg.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/mem_sec.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/modes/aesni-gcm-x86_64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/modes/cbc128.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/modes/ccm128.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/modes/cfb128.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/modes/ctr128.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/modes/cts128.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/modes/gcm128.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto",
                 ],
@@ -7578,7 +7156,6 @@ our %unified_info = (
             "crypto/modes/ghash-x86_64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/modes/ghashv8-armx.o" =>
@@ -7588,361 +7165,301 @@ our %unified_info = (
             "crypto/modes/ocb128.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/modes/ofb128.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/modes/wrap128.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/modes/xts128.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/o_dir.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/o_fips.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/o_fopen.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/o_init.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/o_str.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/o_time.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/objects/o_names.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/objects/obj_dat.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/objects/obj_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/objects/obj_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/objects/obj_xref.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ocsp/ocsp_asn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ocsp/ocsp_cl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ocsp/ocsp_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ocsp/ocsp_ext.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ocsp/ocsp_ht.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ocsp/ocsp_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ocsp/ocsp_prn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ocsp/ocsp_srv.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ocsp/ocsp_vfy.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ocsp/v3_ocsp.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pem/pem_all.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pem/pem_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pem/pem_info.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pem/pem_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pem/pem_oth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pem/pem_pk8.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pem/pem_pkey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pem/pem_sign.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pem/pem_x509.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pem/pem_xaux.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pem/pvkfmt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_add.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_asn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_attr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_crpt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_crt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_decr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_init.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_key.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_kiss.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_mutl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_npas.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_p8d.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_p8e.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_sbag.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_utl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/pk12err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs7/bio_pk7.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs7/pk7_asn1.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs7/pk7_attr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs7/pk7_doit.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs7/pk7_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs7/pk7_mime.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs7/pk7_smime.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs7/pkcs7err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/poly1305/poly1305-armv4.o" =>
@@ -7964,265 +7481,221 @@ our %unified_info = (
             "crypto/poly1305/poly1305-x86_64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/poly1305/poly1305.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/poly1305/poly1305_ameth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/poly1305/poly1305_pmeth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rand/drbg_ctr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rand/drbg_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rand/rand_egd.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rand/rand_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rand/rand_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rand/rand_unix.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rand/rand_vms.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rand/rand_win.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rand/randfile.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rc2/rc2_cbc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rc2/rc2_ecb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rc2/rc2_skey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rc2/rc2cfb64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rc2/rc2ofb64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rc4/rc4-md5-x86_64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rc4/rc4-x86_64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ripemd/rmd_dgst.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ripemd/rmd_one.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_ameth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_asn1.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_chk.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_crpt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_depr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_gen.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_meth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_mp.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_none.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_oaep.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_ossl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_pk1.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_pmeth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_prn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_pss.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_saos.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_sign.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_ssl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_x931.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_x931g.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/s390xcpuid.o" =>
@@ -8232,31 +7705,26 @@ our %unified_info = (
             "crypto/seed/seed.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/seed/seed_cbc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/seed/seed_cfb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/seed/seed_ecb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/seed/seed_ofb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sha/keccak1600-armv4.o" =>
@@ -8266,7 +7734,6 @@ our %unified_info = (
             "crypto/sha/keccak1600-x86_64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sha/sha1-armv4-large.o" =>
@@ -8280,7 +7747,6 @@ our %unified_info = (
             "crypto/sha/sha1-mb-x86_64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sha/sha1-mips.o" =>
@@ -8298,19 +7764,16 @@ our %unified_info = (
             "crypto/sha/sha1-x86_64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sha/sha1_one.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sha/sha1dgst.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sha/sha256-armv4.o" =>
@@ -8324,7 +7787,6 @@ our %unified_info = (
             "crypto/sha/sha256-mb-x86_64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sha/sha256-mips.o" =>
@@ -8342,13 +7804,11 @@ our %unified_info = (
             "crypto/sha/sha256-x86_64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sha/sha256.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sha/sha512-armv4.o" =>
@@ -8374,727 +7834,606 @@ our %unified_info = (
             "crypto/sha/sha512-x86_64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sha/sha512.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/siphash/siphash.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/siphash/siphash_ameth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/siphash/siphash_pmeth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sm2/sm2_crypt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sm2/sm2_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sm2/sm2_pmeth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sm2/sm2_sign.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sm3/m_sm3.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sm3/sm3.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sm4/sm4.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/srp/srp_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/srp/srp_vfy.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/stack/stack.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/store/loader_file.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/store/store_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/store/store_init.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/store/store_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/store/store_register.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/store/store_strings.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/threads_none.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/threads_pthread.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/threads_win.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ts/ts_asn1.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ts/ts_conf.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ts/ts_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ts/ts_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ts/ts_req_print.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ts/ts_req_utils.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ts/ts_rsp_print.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ts/ts_rsp_sign.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ts/ts_rsp_utils.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ts/ts_rsp_verify.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ts/ts_verify_ctx.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/txt_db/txt_db.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ui/ui_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ui/ui_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ui/ui_null.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ui/ui_openssl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ui/ui_util.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/uid.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/whrlpool/wp-x86_64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/whrlpool/wp_dgst.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/by_dir.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/by_file.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/t_crl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/t_req.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/t_x509.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_att.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_cmp.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_d2.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_def.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_ext.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_lu.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_meth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_obj.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_r2x.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_req.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_set.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_trs.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_txt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_v3.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_vfy.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_vpm.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509cset.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509name.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509rset.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509spki.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509type.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x_all.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x_attrib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x_crl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x_exten.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x_name.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x_pubkey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x_req.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x_x509.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x_x509a.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/pcy_cache.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/pcy_data.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/pcy_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/pcy_map.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/pcy_node.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/pcy_tree.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_addr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_admis.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_akey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_akeya.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_alt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_asid.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_bcons.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_bitst.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_conf.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_cpols.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_crld.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_enum.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_extku.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_genn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_ia5.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_info.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_int.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_ncons.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_pci.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_pcia.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_pcons.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_pku.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_pmaps.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_prn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_purp.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_skey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_sxnet.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_tlsf.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_utl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x86_64cpuid.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "engines/e_capi.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "engines/e_padlock-x86_64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "engines/e_padlock.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "fuzz/asn1.o" =>
@@ -9145,6 +8484,14 @@ our %unified_info = (
                 [
                     "include",
                 ],
+            "include/crypto/bn_conf.h" =>
+                [
+                    ".",
+                ],
+            "include/crypto/dso_conf.h" =>
+                [
+                    ".",
+                ],
             "include/openssl/opensslconf.h" =>
                 [
                     ".",
@@ -9389,7 +8736,6 @@ our %unified_info = (
                 [
                     ".",
                     "include",
-                    "crypto/include",
                 ],
             "test/asn1_string_table_test.o" =>
                 [
@@ -9715,7 +9061,6 @@ our %unified_info = (
                 [
                     ".",
                     "include",
-                    "crypto/include",
                 ],
             "test/cipher_overhead_test.o" =>
                 [
@@ -9761,7 +9106,6 @@ our %unified_info = (
             "test/ctype_internal_test.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "test/curve448_internal_test.o" =>
@@ -9827,7 +9171,6 @@ our %unified_info = (
                 [
                     "include",
                     "crypto/ec",
-                    "crypto/include",
                 ],
             "test/ecdsatest.o" =>
                 [
@@ -9852,7 +9195,6 @@ our %unified_info = (
             "test/evp_extra_test.o" =>
                 [
                     "include",
-                    "crypto/include",
                 ],
             "test/evp_test.o" =>
                 [
@@ -9950,7 +9292,6 @@ our %unified_info = (
                 [
                     ".",
                     "include",
-                    "crypto/include",
                 ],
             "test/rc2test.o" =>
                 [
@@ -10000,18 +9341,15 @@ our %unified_info = (
                 [
                     ".",
                     "include",
-                    "crypto/include",
                 ],
             "test/sm2_internal_test.o" =>
                 [
                     "include",
-                    "crypto/include",
                 ],
             "test/sm4_internal_test.o" =>
                 [
                     ".",
                     "include",
-                    "crypto/include",
                 ],
             "test/srptest.o" =>
                 [
@@ -10022,6 +9360,10 @@ our %unified_info = (
                     ".",
                     "include",
                 ],
+            "test/ssl_ctx_test.o" =>
+                [
+                    "include",
+                ],
             "test/ssl_test.o" =>
                 [
                     "include",
@@ -10085,10 +9427,6 @@ our %unified_info = (
                 [
                     "include",
                 ],
-            "test/testutil/init.o" =>
-                [
-                    "include",
-                ],
             "test/testutil/main.o" =>
                 [
                     "include",
@@ -10117,6 +9455,10 @@ our %unified_info = (
                 [
                     "include",
                 ],
+            "test/testutil/testutil_init.o" =>
+                [
+                    "include",
+                ],
             "test/threadstest.o" =>
                 [
                     "include",
@@ -10381,6 +9723,7 @@ our %unified_info = (
             "test/sm4_internal_test",
             "test/srptest",
             "test/ssl_cert_table_internal_test",
+            "test/ssl_ctx_test",
             "test/ssl_test",
             "test/ssl_test_ctx_test",
             "test/sslapitest",
@@ -15391,7 +14734,6 @@ our %unified_info = (
                     "test/testutil/cb.o",
                     "test/testutil/driver.o",
                     "test/testutil/format_output.o",
-                    "test/testutil/init.o",
                     "test/testutil/main.o",
                     "test/testutil/output_helpers.o",
                     "test/testutil/random.o",
@@ -15399,6 +14741,7 @@ our %unified_info = (
                     "test/testutil/tap_bio.o",
                     "test/testutil/test_cleanup.o",
                     "test/testutil/tests.o",
+                    "test/testutil/testutil_init.o",
                 ],
             "test/md2test" =>
                 [
@@ -15626,6 +14969,14 @@ our %unified_info = (
                 [
                     "test/ssl_cert_table_internal_test.c",
                 ],
+            "test/ssl_ctx_test" =>
+                [
+                    "test/ssl_ctx_test.o",
+                ],
+            "test/ssl_ctx_test.o" =>
+                [
+                    "test/ssl_ctx_test.c",
+                ],
             "test/ssl_test" =>
                 [
                     "test/handshake_helper.o",
@@ -15728,10 +15079,6 @@ our %unified_info = (
                 [
                     "test/testutil/format_output.c",
                 ],
-            "test/testutil/init.o" =>
-                [
-                    "test/testutil/init.c",
-                ],
             "test/testutil/main.o" =>
                 [
                     "test/testutil/main.c",
@@ -15760,6 +15107,10 @@ our %unified_info = (
                 [
                     "test/testutil/tests.c",
                 ],
+            "test/testutil/testutil_init.o" =>
+                [
+                    "test/testutil/testutil_init.c",
+                ],
             "test/threadstest" =>
                 [
                     "test/threadstest.o",
diff --git a/deps/openssl/config/archs/BSD-x86_64/asm_avx2/crypto/aes/aes-x86_64.s b/deps/openssl/config/archs/BSD-x86_64/asm_avx2/crypto/aes/aes-x86_64.s
deleted file mode 100644
index f0c1685fb9..0000000000
--- a/deps/openssl/config/archs/BSD-x86_64/asm_avx2/crypto/aes/aes-x86_64.s
+++ /dev/null
@@ -1,2649 +0,0 @@
-.text	
-.type	_x86_64_AES_encrypt,@function
-.align	16
-_x86_64_AES_encrypt:
-	xorl	0(%r15),%eax
-	xorl	4(%r15),%ebx
-	xorl	8(%r15),%ecx
-	xorl	12(%r15),%edx
-
-	movl	240(%r15),%r13d
-	subl	$1,%r13d
-	jmp	.Lenc_loop
-.align	16
-.Lenc_loop:
-
-	movzbl	%al,%esi
-	movzbl	%bl,%edi
-	movzbl	%cl,%ebp
-	movl	0(%r14,%rsi,8),%r10d
-	movl	0(%r14,%rdi,8),%r11d
-	movl	0(%r14,%rbp,8),%r12d
-
-	movzbl	%bh,%esi
-	movzbl	%ch,%edi
-	movzbl	%dl,%ebp
-	xorl	3(%r14,%rsi,8),%r10d
-	xorl	3(%r14,%rdi,8),%r11d
-	movl	0(%r14,%rbp,8),%r8d
-
-	movzbl	%dh,%esi
-	shrl	$16,%ecx
-	movzbl	%ah,%ebp
-	xorl	3(%r14,%rsi,8),%r12d
-	shrl	$16,%edx
-	xorl	3(%r14,%rbp,8),%r8d
-
-	shrl	$16,%ebx
-	leaq	16(%r15),%r15
-	shrl	$16,%eax
-
-	movzbl	%cl,%esi
-	movzbl	%dl,%edi
-	movzbl	%al,%ebp
-	xorl	2(%r14,%rsi,8),%r10d
-	xorl	2(%r14,%rdi,8),%r11d
-	xorl	2(%r14,%rbp,8),%r12d
-
-	movzbl	%dh,%esi
-	movzbl	%ah,%edi
-	movzbl	%bl,%ebp
-	xorl	1(%r14,%rsi,8),%r10d
-	xorl	1(%r14,%rdi,8),%r11d
-	xorl	2(%r14,%rbp,8),%r8d
-
-	movl	12(%r15),%edx
-	movzbl	%bh,%edi
-	movzbl	%ch,%ebp
-	movl	0(%r15),%eax
-	xorl	1(%r14,%rdi,8),%r12d
-	xorl	1(%r14,%rbp,8),%r8d
-
-	movl	4(%r15),%ebx
-	movl	8(%r15),%ecx
-	xorl	%r10d,%eax
-	xorl	%r11d,%ebx
-	xorl	%r12d,%ecx
-	xorl	%r8d,%edx
-	subl	$1,%r13d
-	jnz	.Lenc_loop
-	movzbl	%al,%esi
-	movzbl	%bl,%edi
-	movzbl	%cl,%ebp
-	movzbl	2(%r14,%rsi,8),%r10d
-	movzbl	2(%r14,%rdi,8),%r11d
-	movzbl	2(%r14,%rbp,8),%r12d
-
-	movzbl	%dl,%esi
-	movzbl	%bh,%edi
-	movzbl	%ch,%ebp
-	movzbl	2(%r14,%rsi,8),%r8d
-	movl	0(%r14,%rdi,8),%edi
-	movl	0(%r14,%rbp,8),%ebp
-
-	andl	$0x0000ff00,%edi
-	andl	$0x0000ff00,%ebp
-
-	xorl	%edi,%r10d
-	xorl	%ebp,%r11d
-	shrl	$16,%ecx
-
-	movzbl	%dh,%esi
-	movzbl	%ah,%edi
-	shrl	$16,%edx
-	movl	0(%r14,%rsi,8),%esi
-	movl	0(%r14,%rdi,8),%edi
-
-	andl	$0x0000ff00,%esi
-	andl	$0x0000ff00,%edi
-	shrl	$16,%ebx
-	xorl	%esi,%r12d
-	xorl	%edi,%r8d
-	shrl	$16,%eax
-
-	movzbl	%cl,%esi
-	movzbl	%dl,%edi
-	movzbl	%al,%ebp
-	movl	0(%r14,%rsi,8),%esi
-	movl	0(%r14,%rdi,8),%edi
-	movl	0(%r14,%rbp,8),%ebp
-
-	andl	$0x00ff0000,%esi
-	andl	$0x00ff0000,%edi
-	andl	$0x00ff0000,%ebp
-
-	xorl	%esi,%r10d
-	xorl	%edi,%r11d
-	xorl	%ebp,%r12d
-
-	movzbl	%bl,%esi
-	movzbl	%dh,%edi
-	movzbl	%ah,%ebp
-	movl	0(%r14,%rsi,8),%esi
-	movl	2(%r14,%rdi,8),%edi
-	movl	2(%r14,%rbp,8),%ebp
-
-	andl	$0x00ff0000,%esi
-	andl	$0xff000000,%edi
-	andl	$0xff000000,%ebp
-
-	xorl	%esi,%r8d
-	xorl	%edi,%r10d
-	xorl	%ebp,%r11d
-
-	movzbl	%bh,%esi
-	movzbl	%ch,%edi
-	movl	16+12(%r15),%edx
-	movl	2(%r14,%rsi,8),%esi
-	movl	2(%r14,%rdi,8),%edi
-	movl	16+0(%r15),%eax
-
-	andl	$0xff000000,%esi
-	andl	$0xff000000,%edi
-
-	xorl	%esi,%r12d
-	xorl	%edi,%r8d
-
-	movl	16+4(%r15),%ebx
-	movl	16+8(%r15),%ecx
-	xorl	%r10d,%eax
-	xorl	%r11d,%ebx
-	xorl	%r12d,%ecx
-	xorl	%r8d,%edx
-.byte	0xf3,0xc3
-.size	_x86_64_AES_encrypt,.-_x86_64_AES_encrypt
-.type	_x86_64_AES_encrypt_compact,@function
-.align	16
-_x86_64_AES_encrypt_compact:
-.cfi_startproc	
-	leaq	128(%r14),%r8
-	movl	0-128(%r8),%edi
-	movl	32-128(%r8),%ebp
-	movl	64-128(%r8),%r10d
-	movl	96-128(%r8),%r11d
-	movl	128-128(%r8),%edi
-	movl	160-128(%r8),%ebp
-	movl	192-128(%r8),%r10d
-	movl	224-128(%r8),%r11d
-	jmp	.Lenc_loop_compact
-.align	16
-.Lenc_loop_compact:
-	xorl	0(%r15),%eax
-	xorl	4(%r15),%ebx
-	xorl	8(%r15),%ecx
-	xorl	12(%r15),%edx
-	leaq	16(%r15),%r15
-	movzbl	%al,%r10d
-	movzbl	%bl,%r11d
-	movzbl	%cl,%r12d
-	movzbl	%dl,%r8d
-	movzbl	%bh,%esi
-	movzbl	%ch,%edi
-	shrl	$16,%ecx
-	movzbl	%dh,%ebp
-	movzbl	(%r14,%r10,1),%r10d
-	movzbl	(%r14,%r11,1),%r11d
-	movzbl	(%r14,%r12,1),%r12d
-	movzbl	(%r14,%r8,1),%r8d
-
-	movzbl	(%r14,%rsi,1),%r9d
-	movzbl	%ah,%esi
-	movzbl	(%r14,%rdi,1),%r13d
-	movzbl	%cl,%edi
-	movzbl	(%r14,%rbp,1),%ebp
-	movzbl	(%r14,%rsi,1),%esi
-
-	shll	$8,%r9d
-	shrl	$16,%edx
-	shll	$8,%r13d
-	xorl	%r9d,%r10d
-	shrl	$16,%eax
-	movzbl	%dl,%r9d
-	shrl	$16,%ebx
-	xorl	%r13d,%r11d
-	shll	$8,%ebp
-	movzbl	%al,%r13d
-	movzbl	(%r14,%rdi,1),%edi
-	xorl	%ebp,%r12d
-
-	shll	$8,%esi
-	movzbl	%bl,%ebp
-	shll	$16,%edi
-	xorl	%esi,%r8d
-	movzbl	(%r14,%r9,1),%r9d
-	movzbl	%dh,%esi
-	movzbl	(%r14,%r13,1),%r13d
-	xorl	%edi,%r10d
-
-	shrl	$8,%ecx
-	movzbl	%ah,%edi
-	shll	$16,%r9d
-	shrl	$8,%ebx
-	shll	$16,%r13d
-	xorl	%r9d,%r11d
-	movzbl	(%r14,%rbp,1),%ebp
-	movzbl	(%r14,%rsi,1),%esi
-	movzbl	(%r14,%rdi,1),%edi
-	movzbl	(%r14,%rcx,1),%edx
-	movzbl	(%r14,%rbx,1),%ecx
-
-	shll	$16,%ebp
-	xorl	%r13d,%r12d
-	shll	$24,%esi
-	xorl	%ebp,%r8d
-	shll	$24,%edi
-	xorl	%esi,%r10d
-	shll	$24,%edx
-	xorl	%edi,%r11d
-	shll	$24,%ecx
-	movl	%r10d,%eax
-	movl	%r11d,%ebx
-	xorl	%r12d,%ecx
-	xorl	%r8d,%edx
-	cmpq	16(%rsp),%r15
-	je	.Lenc_compact_done
-	movl	$0x80808080,%r10d
-	movl	$0x80808080,%r11d
-	andl	%eax,%r10d
-	andl	%ebx,%r11d
-	movl	%r10d,%esi
-	movl	%r11d,%edi
-	shrl	$7,%r10d
-	leal	(%rax,%rax,1),%r8d
-	shrl	$7,%r11d
-	leal	(%rbx,%rbx,1),%r9d
-	subl	%r10d,%esi
-	subl	%r11d,%edi
-	andl	$0xfefefefe,%r8d
-	andl	$0xfefefefe,%r9d
-	andl	$0x1b1b1b1b,%esi
-	andl	$0x1b1b1b1b,%edi
-	movl	%eax,%r10d
-	movl	%ebx,%r11d
-	xorl	%esi,%r8d
-	xorl	%edi,%r9d
-
-	xorl	%r8d,%eax
-	xorl	%r9d,%ebx
-	movl	$0x80808080,%r12d
-	roll	$24,%eax
-	movl	$0x80808080,%ebp
-	roll	$24,%ebx
-	andl	%ecx,%r12d
-	andl	%edx,%ebp
-	xorl	%r8d,%eax
-	xorl	%r9d,%ebx
-	movl	%r12d,%esi
-	rorl	$16,%r10d
-	movl	%ebp,%edi
-	rorl	$16,%r11d
-	leal	(%rcx,%rcx,1),%r8d
-	shrl	$7,%r12d
-	xorl	%r10d,%eax
-	shrl	$7,%ebp
-	xorl	%r11d,%ebx
-	rorl	$8,%r10d
-	leal	(%rdx,%rdx,1),%r9d
-	rorl	$8,%r11d
-	subl	%r12d,%esi
-	subl	%ebp,%edi
-	xorl	%r10d,%eax
-	xorl	%r11d,%ebx
-
-	andl	$0xfefefefe,%r8d
-	andl	$0xfefefefe,%r9d
-	andl	$0x1b1b1b1b,%esi
-	andl	$0x1b1b1b1b,%edi
-	movl	%ecx,%r12d
-	movl	%edx,%ebp
-	xorl	%esi,%r8d
-	xorl	%edi,%r9d
-
-	rorl	$16,%r12d
-	xorl	%r8d,%ecx
-	rorl	$16,%ebp
-	xorl	%r9d,%edx
-	roll	$24,%ecx
-	movl	0(%r14),%esi
-	roll	$24,%edx
-	xorl	%r8d,%ecx
-	movl	64(%r14),%edi
-	xorl	%r9d,%edx
-	movl	128(%r14),%r8d
-	xorl	%r12d,%ecx
-	rorl	$8,%r12d
-	xorl	%ebp,%edx
-	rorl	$8,%ebp
-	xorl	%r12d,%ecx
-	movl	192(%r14),%r9d
-	xorl	%ebp,%edx
-	jmp	.Lenc_loop_compact
-.align	16
-.Lenc_compact_done:
-	xorl	0(%r15),%eax
-	xorl	4(%r15),%ebx
-	xorl	8(%r15),%ecx
-	xorl	12(%r15),%edx
-.byte	0xf3,0xc3
-.cfi_endproc	
-.size	_x86_64_AES_encrypt_compact,.-_x86_64_AES_encrypt_compact
-.globl	AES_encrypt
-.type	AES_encrypt,@function
-.align	16
-.globl	asm_AES_encrypt
-.hidden	asm_AES_encrypt
-asm_AES_encrypt:
-AES_encrypt:
-.cfi_startproc	
-	movq	%rsp,%rax
-.cfi_def_cfa_register	%rax
-	pushq	%rbx
-.cfi_offset	%rbx,-16
-	pushq	%rbp
-.cfi_offset	%rbp,-24
-	pushq	%r12
-.cfi_offset	%r12,-32
-	pushq	%r13
-.cfi_offset	%r13,-40
-	pushq	%r14
-.cfi_offset	%r14,-48
-	pushq	%r15
-.cfi_offset	%r15,-56
-
-
-	leaq	-63(%rdx),%rcx
-	andq	$-64,%rsp
-	subq	%rsp,%rcx
-	negq	%rcx
-	andq	$0x3c0,%rcx
-	subq	%rcx,%rsp
-	subq	$32,%rsp
-
-	movq	%rsi,16(%rsp)
-	movq	%rax,24(%rsp)
-.cfi_escape	0x0f,0x05,0x77,0x18,0x06,0x23,0x08
-.Lenc_prologue:
-
-	movq	%rdx,%r15
-	movl	240(%r15),%r13d
-
-	movl	0(%rdi),%eax
-	movl	4(%rdi),%ebx
-	movl	8(%rdi),%ecx
-	movl	12(%rdi),%edx
-
-	shll	$4,%r13d
-	leaq	(%r15,%r13,1),%rbp
-	movq	%r15,(%rsp)
-	movq	%rbp,8(%rsp)
-
-
-	leaq	.LAES_Te+2048(%rip),%r14
-	leaq	768(%rsp),%rbp
-	subq	%r14,%rbp
-	andq	$0x300,%rbp
-	leaq	(%r14,%rbp,1),%r14
-
-	call	_x86_64_AES_encrypt_compact
-
-	movq	16(%rsp),%r9
-	movq	24(%rsp),%rsi
-.cfi_def_cfa	%rsi,8
-	movl	%eax,0(%r9)
-	movl	%ebx,4(%r9)
-	movl	%ecx,8(%r9)
-	movl	%edx,12(%r9)
-
-	movq	-48(%rsi),%r15
-.cfi_restore	%r15
-	movq	-40(%rsi),%r14
-.cfi_restore	%r14
-	movq	-32(%rsi),%r13
-.cfi_restore	%r13
-	movq	-24(%rsi),%r12
-.cfi_restore	%r12
-	movq	-16(%rsi),%rbp
-.cfi_restore	%rbp
-	movq	-8(%rsi),%rbx
-.cfi_restore	%rbx
-	leaq	(%rsi),%rsp
-.cfi_def_cfa_register	%rsp
-.Lenc_epilogue:
-	.byte	0xf3,0xc3
-.cfi_endproc	
-.size	AES_encrypt,.-AES_encrypt
-.type	_x86_64_AES_decrypt,@function
-.align	16
-_x86_64_AES_decrypt:
-	xorl	0(%r15),%eax
-	xorl	4(%r15),%ebx
-	xorl	8(%r15),%ecx
-	xorl	12(%r15),%edx
-
-	movl	240(%r15),%r13d
-	subl	$1,%r13d
-	jmp	.Ldec_loop
-.align	16
-.Ldec_loop:
-
-	movzbl	%al,%esi
-	movzbl	%bl,%edi
-	movzbl	%cl,%ebp
-	movl	0(%r14,%rsi,8),%r10d
-	movl	0(%r14,%rdi,8),%r11d
-	movl	0(%r14,%rbp,8),%r12d
-
-	movzbl	%dh,%esi
-	movzbl	%ah,%edi
-	movzbl	%dl,%ebp
-	xorl	3(%r14,%rsi,8),%r10d
-	xorl	3(%r14,%rdi,8),%r11d
-	movl	0(%r14,%rbp,8),%r8d
-
-	movzbl	%bh,%esi
-	shrl	$16,%eax
-	movzbl	%ch,%ebp
-	xorl	3(%r14,%rsi,8),%r12d
-	shrl	$16,%edx
-	xorl	3(%r14,%rbp,8),%r8d
-
-	shrl	$16,%ebx
-	leaq	16(%r15),%r15
-	shrl	$16,%ecx
-
-	movzbl	%cl,%esi
-	movzbl	%dl,%edi
-	movzbl	%al,%ebp
-	xorl	2(%r14,%rsi,8),%r10d
-	xorl	2(%r14,%rdi,8),%r11d
-	xorl	2(%r14,%rbp,8),%r12d
-
-	movzbl	%bh,%esi
-	movzbl	%ch,%edi
-	movzbl	%bl,%ebp
-	xorl	1(%r14,%rsi,8),%r10d
-	xorl	1(%r14,%rdi,8),%r11d
-	xorl	2(%r14,%rbp,8),%r8d
-
-	movzbl	%dh,%esi
-	movl	12(%r15),%edx
-	movzbl	%ah,%ebp
-	xorl	1(%r14,%rsi,8),%r12d
-	movl	0(%r15),%eax
-	xorl	1(%r14,%rbp,8),%r8d
-
-	xorl	%r10d,%eax
-	movl	4(%r15),%ebx
-	movl	8(%r15),%ecx
-	xorl	%r12d,%ecx
-	xorl	%r11d,%ebx
-	xorl	%r8d,%edx
-	subl	$1,%r13d
-	jnz	.Ldec_loop
-	leaq	2048(%r14),%r14
-	movzbl	%al,%esi
-	movzbl	%bl,%edi
-	movzbl	%cl,%ebp
-	movzbl	(%r14,%rsi,1),%r10d
-	movzbl	(%r14,%rdi,1),%r11d
-	movzbl	(%r14,%rbp,1),%r12d
-
-	movzbl	%dl,%esi
-	movzbl	%dh,%edi
-	movzbl	%ah,%ebp
-	movzbl	(%r14,%rsi,1),%r8d
-	movzbl	(%r14,%rdi,1),%edi
-	movzbl	(%r14,%rbp,1),%ebp
-
-	shll	$8,%edi
-	shll	$8,%ebp
-
-	xorl	%edi,%r10d
-	xorl	%ebp,%r11d
-	shrl	$16,%edx
-
-	movzbl	%bh,%esi
-	movzbl	%ch,%edi
-	shrl	$16,%eax
-	movzbl	(%r14,%rsi,1),%esi
-	movzbl	(%r14,%rdi,1),%edi
-
-	shll	$8,%esi
-	shll	$8,%edi
-	shrl	$16,%ebx
-	xorl	%esi,%r12d
-	xorl	%edi,%r8d
-	shrl	$16,%ecx
-
-	movzbl	%cl,%esi
-	movzbl	%dl,%edi
-	movzbl	%al,%ebp
-	movzbl	(%r14,%rsi,1),%esi
-	movzbl	(%r14,%rdi,1),%edi
-	movzbl	(%r14,%rbp,1),%ebp
-
-	shll	$16,%esi
-	shll	$16,%edi
-	shll	$16,%ebp
-
-	xorl	%esi,%r10d
-	xorl	%edi,%r11d
-	xorl	%ebp,%r12d
-
-	movzbl	%bl,%esi
-	movzbl	%bh,%edi
-	movzbl	%ch,%ebp
-	movzbl	(%r14,%rsi,1),%esi
-	movzbl	(%r14,%rdi,1),%edi
-	movzbl	(%r14,%rbp,1),%ebp
-
-	shll	$16,%esi
-	shll	$24,%edi
-	shll	$24,%ebp
-
-	xorl	%esi,%r8d
-	xorl	%edi,%r10d
-	xorl	%ebp,%r11d
-
-	movzbl	%dh,%esi
-	movzbl	%ah,%edi
-	movl	16+12(%r15),%edx
-	movzbl	(%r14,%rsi,1),%esi
-	movzbl	(%r14,%rdi,1),%edi
-	movl	16+0(%r15),%eax
-
-	shll	$24,%esi
-	shll	$24,%edi
-
-	xorl	%esi,%r12d
-	xorl	%edi,%r8d
-
-	movl	16+4(%r15),%ebx
-	movl	16+8(%r15),%ecx
-	leaq	-2048(%r14),%r14
-	xorl	%r10d,%eax
-	xorl	%r11d,%ebx
-	xorl	%r12d,%ecx
-	xorl	%r8d,%edx
-.byte	0xf3,0xc3
-.size	_x86_64_AES_decrypt,.-_x86_64_AES_decrypt
-.type	_x86_64_AES_decrypt_compact,@function
-.align	16
-_x86_64_AES_decrypt_compact:
-.cfi_startproc	
-	leaq	128(%r14),%r8
-	movl	0-128(%r8),%edi
-	movl	32-128(%r8),%ebp
-	movl	64-128(%r8),%r10d
-	movl	96-128(%r8),%r11d
-	movl	128-128(%r8),%edi
-	movl	160-128(%r8),%ebp
-	movl	192-128(%r8),%r10d
-	movl	224-128(%r8),%r11d
-	jmp	.Ldec_loop_compact
-
-.align	16
-.Ldec_loop_compact:
-	xorl	0(%r15),%eax
-	xorl	4(%r15),%ebx
-	xorl	8(%r15),%ecx
-	xorl	12(%r15),%edx
-	leaq	16(%r15),%r15
-	movzbl	%al,%r10d
-	movzbl	%bl,%r11d
-	movzbl	%cl,%r12d
-	movzbl	%dl,%r8d
-	movzbl	%dh,%esi
-	movzbl	%ah,%edi
-	shrl	$16,%edx
-	movzbl	%bh,%ebp
-	movzbl	(%r14,%r10,1),%r10d
-	movzbl	(%r14,%r11,1),%r11d
-	movzbl	(%r14,%r12,1),%r12d
-	movzbl	(%r14,%r8,1),%r8d
-
-	movzbl	(%r14,%rsi,1),%r9d
-	movzbl	%ch,%esi
-	movzbl	(%r14,%rdi,1),%r13d
-	movzbl	(%r14,%rbp,1),%ebp
-	movzbl	(%r14,%rsi,1),%esi
-
-	shrl	$16,%ecx
-	shll	$8,%r13d
-	shll	$8,%r9d
-	movzbl	%cl,%edi
-	shrl	$16,%eax
-	xorl	%r9d,%r10d
-	shrl	$16,%ebx
-	movzbl	%dl,%r9d
-
-	shll	$8,%ebp
-	xorl	%r13d,%r11d
-	shll	$8,%esi
-	movzbl	%al,%r13d
-	movzbl	(%r14,%rdi,1),%edi
-	xorl	%ebp,%r12d
-	movzbl	%bl,%ebp
-
-	shll	$16,%edi
-	xorl	%esi,%r8d
-	movzbl	(%r14,%r9,1),%r9d
-	movzbl	%bh,%esi
-	movzbl	(%r14,%rbp,1),%ebp
-	xorl	%edi,%r10d
-	movzbl	(%r14,%r13,1),%r13d
-	movzbl	%ch,%edi
-
-	shll	$16,%ebp
-	shll	$16,%r9d
-	shll	$16,%r13d
-	xorl	%ebp,%r8d
-	movzbl	%dh,%ebp
-	xorl	%r9d,%r11d
-	shrl	$8,%eax
-	xorl	%r13d,%r12d
-
-	movzbl	(%r14,%rsi,1),%esi
-	movzbl	(%r14,%rdi,1),%ebx
-	movzbl	(%r14,%rbp,1),%ecx
-	movzbl	(%r14,%rax,1),%edx
-
-	movl	%r10d,%eax
-	shll	$24,%esi
-	shll	$24,%ebx
-	shll	$24,%ecx
-	xorl	%esi,%eax
-	shll	$24,%edx
-	xorl	%r11d,%ebx
-	xorl	%r12d,%ecx
-	xorl	%r8d,%edx
-	cmpq	16(%rsp),%r15
-	je	.Ldec_compact_done
-
-	movq	256+0(%r14),%rsi
-	shlq	$32,%rbx
-	shlq	$32,%rdx
-	movq	256+8(%r14),%rdi
-	orq	%rbx,%rax
-	orq	%rdx,%rcx
-	movq	256+16(%r14),%rbp
-	movq	%rsi,%r9
-	movq	%rsi,%r12
-	andq	%rax,%r9
-	andq	%rcx,%r12
-	movq	%r9,%rbx
-	movq	%r12,%rdx
-	shrq	$7,%r9
-	leaq	(%rax,%rax,1),%r8
-	shrq	$7,%r12
-	leaq	(%rcx,%rcx,1),%r11
-	subq	%r9,%rbx
-	subq	%r12,%rdx
-	andq	%rdi,%r8
-	andq	%rdi,%r11
-	andq	%rbp,%rbx
-	andq	%rbp,%rdx
-	xorq	%rbx,%r8
-	xorq	%rdx,%r11
-	movq	%rsi,%r10
-	movq	%rsi,%r13
-
-	andq	%r8,%r10
-	andq	%r11,%r13
-	movq	%r10,%rbx
-	movq	%r13,%rdx
-	shrq	$7,%r10
-	leaq	(%r8,%r8,1),%r9
-	shrq	$7,%r13
-	leaq	(%r11,%r11,1),%r12
-	subq	%r10,%rbx
-	subq	%r13,%rdx
-	andq	%rdi,%r9
-	andq	%rdi,%r12
-	andq	%rbp,%rbx
-	andq	%rbp,%rdx
-	xorq	%rbx,%r9
-	xorq	%rdx,%r12
-	movq	%rsi,%r10
-	movq	%rsi,%r13
-
-	andq	%r9,%r10
-	andq	%r12,%r13
-	movq	%r10,%rbx
-	movq	%r13,%rdx
-	shrq	$7,%r10
-	xorq	%rax,%r8
-	shrq	$7,%r13
-	xorq	%rcx,%r11
-	subq	%r10,%rbx
-	subq	%r13,%rdx
-	leaq	(%r9,%r9,1),%r10
-	leaq	(%r12,%r12,1),%r13
-	xorq	%rax,%r9
-	xorq	%rcx,%r12
-	andq	%rdi,%r10
-	andq	%rdi,%r13
-	andq	%rbp,%rbx
-	andq	%rbp,%rdx
-	xorq	%rbx,%r10
-	xorq	%rdx,%r13
-
-	xorq	%r10,%rax
-	xorq	%r13,%rcx
-	xorq	%r10,%r8
-	xorq	%r13,%r11
-	movq	%rax,%rbx
-	movq	%rcx,%rdx
-	xorq	%r10,%r9
-	shrq	$32,%rbx
-	xorq	%r13,%r12
-	shrq	$32,%rdx
-	xorq	%r8,%r10
-	roll	$8,%eax
-	xorq	%r11,%r13
-	roll	$8,%ecx
-	xorq	%r9,%r10
-	roll	$8,%ebx
-	xorq	%r12,%r13
-
-	roll	$8,%edx
-	xorl	%r10d,%eax
-	shrq	$32,%r10
-	xorl	%r13d,%ecx
-	shrq	$32,%r13
-	xorl	%r10d,%ebx
-	xorl	%r13d,%edx
-
-	movq	%r8,%r10
-	roll	$24,%r8d
-	movq	%r11,%r13
-	roll	$24,%r11d
-	shrq	$32,%r10
-	xorl	%r8d,%eax
-	shrq	$32,%r13
-	xorl	%r11d,%ecx
-	roll	$24,%r10d
-	movq	%r9,%r8
-	roll	$24,%r13d
-	movq	%r12,%r11
-	shrq	$32,%r8
-	xorl	%r10d,%ebx
-	shrq	$32,%r11
-	xorl	%r13d,%edx
-
-	movq	0(%r14),%rsi
-	roll	$16,%r9d
-	movq	64(%r14),%rdi
-	roll	$16,%r12d
-	movq	128(%r14),%rbp
-	roll	$16,%r8d
-	movq	192(%r14),%r10
-	xorl	%r9d,%eax
-	roll	$16,%r11d
-	xorl	%r12d,%ecx
-	movq	256(%r14),%r13
-	xorl	%r8d,%ebx
-	xorl	%r11d,%edx
-	jmp	.Ldec_loop_compact
-.align	16
-.Ldec_compact_done:
-	xorl	0(%r15),%eax
-	xorl	4(%r15),%ebx
-	xorl	8(%r15),%ecx
-	xorl	12(%r15),%edx
-.byte	0xf3,0xc3
-.cfi_endproc	
-.size	_x86_64_AES_decrypt_compact,.-_x86_64_AES_decrypt_compact
-.globl	AES_decrypt
-.type	AES_decrypt,@function
-.align	16
-.globl	asm_AES_decrypt
-.hidden	asm_AES_decrypt
-asm_AES_decrypt:
-AES_decrypt:
-.cfi_startproc	
-	movq	%rsp,%rax
-.cfi_def_cfa_register	%rax
-	pushq	%rbx
-.cfi_offset	%rbx,-16
-	pushq	%rbp
-.cfi_offset	%rbp,-24
-	pushq	%r12
-.cfi_offset	%r12,-32
-	pushq	%r13
-.cfi_offset	%r13,-40
-	pushq	%r14
-.cfi_offset	%r14,-48
-	pushq	%r15
-.cfi_offset	%r15,-56
-
-
-	leaq	-63(%rdx),%rcx
-	andq	$-64,%rsp
-	subq	%rsp,%rcx
-	negq	%rcx
-	andq	$0x3c0,%rcx
-	subq	%rcx,%rsp
-	subq	$32,%rsp
-
-	movq	%rsi,16(%rsp)
-	movq	%rax,24(%rsp)
-.cfi_escape	0x0f,0x05,0x77,0x18,0x06,0x23,0x08
-.Ldec_prologue:
-
-	movq	%rdx,%r15
-	movl	240(%r15),%r13d
-
-	movl	0(%rdi),%eax
-	movl	4(%rdi),%ebx
-	movl	8(%rdi),%ecx
-	movl	12(%rdi),%edx
-
-	shll	$4,%r13d
-	leaq	(%r15,%r13,1),%rbp
-	movq	%r15,(%rsp)
-	movq	%rbp,8(%rsp)
-
-
-	leaq	.LAES_Td+2048(%rip),%r14
-	leaq	768(%rsp),%rbp
-	subq	%r14,%rbp
-	andq	$0x300,%rbp
-	leaq	(%r14,%rbp,1),%r14
-	shrq	$3,%rbp
-	addq	%rbp,%r14
-
-	call	_x86_64_AES_decrypt_compact
-
-	movq	16(%rsp),%r9
-	movq	24(%rsp),%rsi
-.cfi_def_cfa	%rsi,8
-	movl	%eax,0(%r9)
-	movl	%ebx,4(%r9)
-	movl	%ecx,8(%r9)
-	movl	%edx,12(%r9)
-
-	movq	-48(%rsi),%r15
-.cfi_restore	%r15
-	movq	-40(%rsi),%r14
-.cfi_restore	%r14
-	movq	-32(%rsi),%r13
-.cfi_restore	%r13
-	movq	-24(%rsi),%r12
-.cfi_restore	%r12
-	movq	-16(%rsi),%rbp
-.cfi_restore	%rbp
-	movq	-8(%rsi),%rbx
-.cfi_restore	%rbx
-	leaq	(%rsi),%rsp
-.cfi_def_cfa_register	%rsp
-.Ldec_epilogue:
-	.byte	0xf3,0xc3
-.cfi_endproc	
-.size	AES_decrypt,.-AES_decrypt
-.globl	AES_set_encrypt_key
-.type	AES_set_encrypt_key,@function
-.align	16
-AES_set_encrypt_key:
-.cfi_startproc	
-	pushq	%rbx
-.cfi_adjust_cfa_offset	8
-.cfi_offset	%rbx,-16
-	pushq	%rbp
-.cfi_adjust_cfa_offset	8
-.cfi_offset	%rbp,-24
-	pushq	%r12
-.cfi_adjust_cfa_offset	8
-.cfi_offset	%r12,-32
-	pushq	%r13
-.cfi_adjust_cfa_offset	8
-.cfi_offset	%r13,-40
-	pushq	%r14
-.cfi_adjust_cfa_offset	8
-.cfi_offset	%r14,-48
-	pushq	%r15
-.cfi_adjust_cfa_offset	8
-.cfi_offset	%r15,-56
-	subq	$8,%rsp
-.cfi_adjust_cfa_offset	8
-.Lenc_key_prologue:
-
-	call	_x86_64_AES_set_encrypt_key
-
-	movq	40(%rsp),%rbp
-.cfi_restore	%rbp
-	movq	48(%rsp),%rbx
-.cfi_restore	%rbx
-	addq	$56,%rsp
-.cfi_adjust_cfa_offset	-56
-.Lenc_key_epilogue:
-	.byte	0xf3,0xc3
-.cfi_endproc	
-.size	AES_set_encrypt_key,.-AES_set_encrypt_key
-
-.type	_x86_64_AES_set_encrypt_key,@function
-.align	16
-_x86_64_AES_set_encrypt_key:
-.cfi_startproc	
-	movl	%esi,%ecx
-	movq	%rdi,%rsi
-	movq	%rdx,%rdi
-
-	testq	$-1,%rsi
-	jz	.Lbadpointer
-	testq	$-1,%rdi
-	jz	.Lbadpointer
-
-	leaq	.LAES_Te(%rip),%rbp
-	leaq	2048+128(%rbp),%rbp
-
-
-	movl	0-128(%rbp),%eax
-	movl	32-128(%rbp),%ebx
-	movl	64-128(%rbp),%r8d
-	movl	96-128(%rbp),%edx
-	movl	128-128(%rbp),%eax
-	movl	160-128(%rbp),%ebx
-	movl	192-128(%rbp),%r8d
-	movl	224-128(%rbp),%edx
-
-	cmpl	$128,%ecx
-	je	.L10rounds
-	cmpl	$192,%ecx
-	je	.L12rounds
-	cmpl	$256,%ecx
-	je	.L14rounds
-	movq	$-2,%rax
-	jmp	.Lexit
-
-.L10rounds:
-	movq	0(%rsi),%rax
-	movq	8(%rsi),%rdx
-	movq	%rax,0(%rdi)
-	movq	%rdx,8(%rdi)
-
-	shrq	$32,%rdx
-	xorl	%ecx,%ecx
-	jmp	.L10shortcut
-.align	4
-.L10loop:
-	movl	0(%rdi),%eax
-	movl	12(%rdi),%edx
-.L10shortcut:
-	movzbl	%dl,%esi
-	movzbl	-128(%rbp,%rsi,1),%ebx
-	movzbl	%dh,%esi
-	shll	$24,%ebx
-	xorl	%ebx,%eax
-
-	movzbl	-128(%rbp,%rsi,1),%ebx
-	shrl	$16,%edx
-	movzbl	%dl,%esi
-	xorl	%ebx,%eax
-
-	movzbl	-128(%rbp,%rsi,1),%ebx
-	movzbl	%dh,%esi
-	shll	$8,%ebx
-	xorl	%ebx,%eax
-
-	movzbl	-128(%rbp,%rsi,1),%ebx
-	shll	$16,%ebx
-	xorl	%ebx,%eax
-
-	xorl	1024-128(%rbp,%rcx,4),%eax
-	movl	%eax,16(%rdi)
-	xorl	4(%rdi),%eax
-	movl	%eax,20(%rdi)
-	xorl	8(%rdi),%eax
-	movl	%eax,24(%rdi)
-	xorl	12(%rdi),%eax
-	movl	%eax,28(%rdi)
-	addl	$1,%ecx
-	leaq	16(%rdi),%rdi
-	cmpl	$10,%ecx
-	jl	.L10loop
-
-	movl	$10,80(%rdi)
-	xorq	%rax,%rax
-	jmp	.Lexit
-
-.L12rounds:
-	movq	0(%rsi),%rax
-	movq	8(%rsi),%rbx
-	movq	16(%rsi),%rdx
-	movq	%rax,0(%rdi)
-	movq	%rbx,8(%rdi)
-	movq	%rdx,16(%rdi)
-
-	shrq	$32,%rdx
-	xorl	%ecx,%ecx
-	jmp	.L12shortcut
-.align	4
-.L12loop:
-	movl	0(%rdi),%eax
-	movl	20(%rdi),%edx
-.L12shortcut:
-	movzbl	%dl,%esi
-	movzbl	-128(%rbp,%rsi,1),%ebx
-	movzbl	%dh,%esi
-	shll	$24,%ebx
-	xorl	%ebx,%eax
-
-	movzbl	-128(%rbp,%rsi,1),%ebx
-	shrl	$16,%edx
-	movzbl	%dl,%esi
-	xorl	%ebx,%eax
-
-	movzbl	-128(%rbp,%rsi,1),%ebx
-	movzbl	%dh,%esi
-	shll	$8,%ebx
-	xorl	%ebx,%eax
-
-	movzbl	-128(%rbp,%rsi,1),%ebx
-	shll	$16,%ebx
-	xorl	%ebx,%eax
-
-	xorl	1024-128(%rbp,%rcx,4),%eax
-	movl	%eax,24(%rdi)
-	xorl	4(%rdi),%eax
-	movl	%eax,28(%rdi)
-	xorl	8(%rdi),%eax
-	movl	%eax,32(%rdi)
-	xorl	12(%rdi),%eax
-	movl	%eax,36(%rdi)
-
-	cmpl	$7,%ecx
-	je	.L12break
-	addl	$1,%ecx
-
-	xorl	16(%rdi),%eax
-	movl	%eax,40(%rdi)
-	xorl	20(%rdi),%eax
-	movl	%eax,44(%rdi)
-
-	leaq	24(%rdi),%rdi
-	jmp	.L12loop
-.L12break:
-	movl	$12,72(%rdi)
-	xorq	%rax,%rax
-	jmp	.Lexit
-
-.L14rounds:
-	movq	0(%rsi),%rax
-	movq	8(%rsi),%rbx
-	movq	16(%rsi),%rcx
-	movq	24(%rsi),%rdx
-	movq	%rax,0(%rdi)
-	movq	%rbx,8(%rdi)
-	movq	%rcx,16(%rdi)
-	movq	%rdx,24(%rdi)
-
-	shrq	$32,%rdx
-	xorl	%ecx,%ecx
-	jmp	.L14shortcut
-.align	4
-.L14loop:
-	movl	0(%rdi),%eax
-	movl	28(%rdi),%edx
-.L14shortcut:
-	movzbl	%dl,%esi
-	movzbl	-128(%rbp,%rsi,1),%ebx
-	movzbl	%dh,%esi
-	shll	$24,%ebx
-	xorl	%ebx,%eax
-
-	movzbl	-128(%rbp,%rsi,1),%ebx
-	shrl	$16,%edx
-	movzbl	%dl,%esi
-	xorl	%ebx,%eax
-
-	movzbl	-128(%rbp,%rsi,1),%ebx
-	movzbl	%dh,%esi
-	shll	$8,%ebx
-	xorl	%ebx,%eax
-
-	movzbl	-128(%rbp,%rsi,1),%ebx
-	shll	$16,%ebx
-	xorl	%ebx,%eax
-
-	xorl	1024-128(%rbp,%rcx,4),%eax
-	movl	%eax,32(%rdi)
-	xorl	4(%rdi),%eax
-	movl	%eax,36(%rdi)
-	xorl	8(%rdi),%eax
-	movl	%eax,40(%rdi)
-	xorl	12(%rdi),%eax
-	movl	%eax,44(%rdi)
-
-	cmpl	$6,%ecx
-	je	.L14break
-	addl	$1,%ecx
-
-	movl	%eax,%edx
-	movl	16(%rdi),%eax
-	movzbl	%dl,%esi
-	movzbl	-128(%rbp,%rsi,1),%ebx
-	movzbl	%dh,%esi
-	xorl	%ebx,%eax
-
-	movzbl	-128(%rbp,%rsi,1),%ebx
-	shrl	$16,%edx
-	shll	$8,%ebx
-	movzbl	%dl,%esi
-	xorl	%ebx,%eax
-
-	movzbl	-128(%rbp,%rsi,1),%ebx
-	movzbl	%dh,%esi
-	shll	$16,%ebx
-	xorl	%ebx,%eax
-
-	movzbl	-128(%rbp,%rsi,1),%ebx
-	shll	$24,%ebx
-	xorl	%ebx,%eax
-
-	movl	%eax,48(%rdi)
-	xorl	20(%rdi),%eax
-	movl	%eax,52(%rdi)
-	xorl	24(%rdi),%eax
-	movl	%eax,56(%rdi)
-	xorl	28(%rdi),%eax
-	movl	%eax,60(%rdi)
-
-	leaq	32(%rdi),%rdi
-	jmp	.L14loop
-.L14break:
-	movl	$14,48(%rdi)
-	xorq	%rax,%rax
-	jmp	.Lexit
-
-.Lbadpointer:
-	movq	$-1,%rax
-.Lexit:
-.byte	0xf3,0xc3
-.cfi_endproc	
-.size	_x86_64_AES_set_encrypt_key,.-_x86_64_AES_set_encrypt_key
-.globl	AES_set_decrypt_key
-.type	AES_set_decrypt_key,@function
-.align	16
-AES_set_decrypt_key:
-.cfi_startproc	
-	pushq	%rbx
-.cfi_adjust_cfa_offset	8
-.cfi_offset	%rbx,-16
-	pushq	%rbp
-.cfi_adjust_cfa_offset	8
-.cfi_offset	%rbp,-24
-	pushq	%r12
-.cfi_adjust_cfa_offset	8
-.cfi_offset	%r12,-32
-	pushq	%r13
-.cfi_adjust_cfa_offset	8
-.cfi_offset	%r13,-40
-	pushq	%r14
-.cfi_adjust_cfa_offset	8
-.cfi_offset	%r14,-48
-	pushq	%r15
-.cfi_adjust_cfa_offset	8
-.cfi_offset	%r15,-56
-	pushq	%rdx
-.cfi_adjust_cfa_offset	8
-.Ldec_key_prologue:
-
-	call	_x86_64_AES_set_encrypt_key
-	movq	(%rsp),%r8
-	cmpl	$0,%eax
-	jne	.Labort
-
-	movl	240(%r8),%r14d
-	xorq	%rdi,%rdi
-	leaq	(%rdi,%r14,4),%rcx
-	movq	%r8,%rsi
-	leaq	(%r8,%rcx,4),%rdi
-.align	4
-.Linvert:
-	movq	0(%rsi),%rax
-	movq	8(%rsi),%rbx
-	movq	0(%rdi),%rcx
-	movq	8(%rdi),%rdx
-	movq	%rax,0(%rdi)
-	movq	%rbx,8(%rdi)
-	movq	%rcx,0(%rsi)
-	movq	%rdx,8(%rsi)
-	leaq	16(%rsi),%rsi
-	leaq	-16(%rdi),%rdi
-	cmpq	%rsi,%rdi
-	jne	.Linvert
-
-	leaq	.LAES_Te+2048+1024(%rip),%rax
-
-	movq	40(%rax),%rsi
-	movq	48(%rax),%rdi
-	movq	56(%rax),%rbp
-
-	movq	%r8,%r15
-	subl	$1,%r14d
-.align	4
-.Lpermute:
-	leaq	16(%r15),%r15
-	movq	0(%r15),%rax
-	movq	8(%r15),%rcx
-	movq	%rsi,%r9
-	movq	%rsi,%r12
-	andq	%rax,%r9
-	andq	%rcx,%r12
-	movq	%r9,%rbx
-	movq	%r12,%rdx
-	shrq	$7,%r9
-	leaq	(%rax,%rax,1),%r8
-	shrq	$7,%r12
-	leaq	(%rcx,%rcx,1),%r11
-	subq	%r9,%rbx
-	subq	%r12,%rdx
-	andq	%rdi,%r8
-	andq	%rdi,%r11
-	andq	%rbp,%rbx
-	andq	%rbp,%rdx
-	xorq	%rbx,%r8
-	xorq	%rdx,%r11
-	movq	%rsi,%r10
-	movq	%rsi,%r13
-
-	andq	%r8,%r10
-	andq	%r11,%r13
-	movq	%r10,%rbx
-	movq	%r13,%rdx
-	shrq	$7,%r10
-	leaq	(%r8,%r8,1),%r9
-	shrq	$7,%r13
-	leaq	(%r11,%r11,1),%r12
-	subq	%r10,%rbx
-	subq	%r13,%rdx
-	andq	%rdi,%r9
-	andq	%rdi,%r12
-	andq	%rbp,%rbx
-	andq	%rbp,%rdx
-	xorq	%rbx,%r9
-	xorq	%rdx,%r12
-	movq	%rsi,%r10
-	movq	%rsi,%r13
-
-	andq	%r9,%r10
-	andq	%r12,%r13
-	movq	%r10,%rbx
-	movq	%r13,%rdx
-	shrq	$7,%r10
-	xorq	%rax,%r8
-	shrq	$7,%r13
-	xorq	%rcx,%r11
-	subq	%r10,%rbx
-	subq	%r13,%rdx
-	leaq	(%r9,%r9,1),%r10
-	leaq	(%r12,%r12,1),%r13
-	xorq	%rax,%r9
-	xorq	%rcx,%r12
-	andq	%rdi,%r10
-	andq	%rdi,%r13
-	andq	%rbp,%rbx
-	andq	%rbp,%rdx
-	xorq	%rbx,%r10
-	xorq	%rdx,%r13
-
-	xorq	%r10,%rax
-	xorq	%r13,%rcx
-	xorq	%r10,%r8
-	xorq	%r13,%r11
-	movq	%rax,%rbx
-	movq	%rcx,%rdx
-	xorq	%r10,%r9
-	shrq	$32,%rbx
-	xorq	%r13,%r12
-	shrq	$32,%rdx
-	xorq	%r8,%r10
-	roll	$8,%eax
-	xorq	%r11,%r13
-	roll	$8,%ecx
-	xorq	%r9,%r10
-	roll	$8,%ebx
-	xorq	%r12,%r13
-
-	roll	$8,%edx
-	xorl	%r10d,%eax
-	shrq	$32,%r10
-	xorl	%r13d,%ecx
-	shrq	$32,%r13
-	xorl	%r10d,%ebx
-	xorl	%r13d,%edx
-
-	movq	%r8,%r10
-	roll	$24,%r8d
-	movq	%r11,%r13
-	roll	$24,%r11d
-	shrq	$32,%r10
-	xorl	%r8d,%eax
-	shrq	$32,%r13
-	xorl	%r11d,%ecx
-	roll	$24,%r10d
-	movq	%r9,%r8
-	roll	$24,%r13d
-	movq	%r12,%r11
-	shrq	$32,%r8
-	xorl	%r10d,%ebx
-	shrq	$32,%r11
-	xorl	%r13d,%edx
-
-
-	roll	$16,%r9d
-
-	roll	$16,%r12d
-
-	roll	$16,%r8d
-
-	xorl	%r9d,%eax
-	roll	$16,%r11d
-	xorl	%r12d,%ecx
-
-	xorl	%r8d,%ebx
-	xorl	%r11d,%edx
-	movl	%eax,0(%r15)
-	movl	%ebx,4(%r15)
-	movl	%ecx,8(%r15)
-	movl	%edx,12(%r15)
-	subl	$1,%r14d
-	jnz	.Lpermute
-
-	xorq	%rax,%rax
-.Labort:
-	movq	8(%rsp),%r15
-.cfi_restore	%r15
-	movq	16(%rsp),%r14
-.cfi_restore	%r14
-	movq	24(%rsp),%r13
-.cfi_restore	%r13
-	movq	32(%rsp),%r12
-.cfi_restore	%r12
-	movq	40(%rsp),%rbp
-.cfi_restore	%rbp
-	movq	48(%rsp),%rbx
-.cfi_restore	%rbx
-	addq	$56,%rsp
-.cfi_adjust_cfa_offset	-56
-.Ldec_key_epilogue:
-	.byte	0xf3,0xc3
-.cfi_endproc	
-.size	AES_set_decrypt_key,.-AES_set_decrypt_key
-.globl	AES_cbc_encrypt
-.type	AES_cbc_encrypt,@function
-.align	16
-
-.globl	asm_AES_cbc_encrypt
-.hidden	asm_AES_cbc_encrypt
-asm_AES_cbc_encrypt:
-AES_cbc_encrypt:
-.cfi_startproc	
-	cmpq	$0,%rdx
-	je	.Lcbc_epilogue
-	pushfq
-
-
-.cfi_adjust_cfa_offset	8
-	pushq	%rbx
-.cfi_adjust_cfa_offset	8
-.cfi_offset	%rbx,-24
-	pushq	%rbp
-.cfi_adjust_cfa_offset	8
-.cfi_offset	%rbp,-32
-	pushq	%r12
-.cfi_adjust_cfa_offset	8
-.cfi_offset	%r12,-40
-	pushq	%r13
-.cfi_adjust_cfa_offset	8
-.cfi_offset	%r13,-48
-	pushq	%r14
-.cfi_adjust_cfa_offset	8
-.cfi_offset	%r14,-56
-	pushq	%r15
-.cfi_adjust_cfa_offset	8
-.cfi_offset	%r15,-64
-.Lcbc_prologue:
-
-	cld
-	movl	%r9d,%r9d
-
-	leaq	.LAES_Te(%rip),%r14
-	leaq	.LAES_Td(%rip),%r10
-	cmpq	$0,%r9
-	cmoveq	%r10,%r14
-
-.cfi_remember_state	
-	movl	OPENSSL_ia32cap_P(%rip),%r10d
-	cmpq	$512,%rdx
-	jb	.Lcbc_slow_prologue
-	testq	$15,%rdx
-	jnz	.Lcbc_slow_prologue
-	btl	$28,%r10d
-	jc	.Lcbc_slow_prologue
-
-
-	leaq	-88-248(%rsp),%r15
-	andq	$-64,%r15
-
-
-	movq	%r14,%r10
-	leaq	2304(%r14),%r11
-	movq	%r15,%r12
-	andq	$0xFFF,%r10
-	andq	$0xFFF,%r11
-	andq	$0xFFF,%r12
-
-	cmpq	%r11,%r12
-	jb	.Lcbc_te_break_out
-	subq	%r11,%r12
-	subq	%r12,%r15
-	jmp	.Lcbc_te_ok
-.Lcbc_te_break_out:
-	subq	%r10,%r12
-	andq	$0xFFF,%r12
-	addq	$320,%r12
-	subq	%r12,%r15
-.align	4
-.Lcbc_te_ok:
-
-	xchgq	%rsp,%r15
-.cfi_def_cfa_register	%r15
-
-	movq	%r15,16(%rsp)
-.cfi_escape	0x0f,0x05,0x77,0x10,0x06,0x23,0x40
-.Lcbc_fast_body:
-	movq	%rdi,24(%rsp)
-	movq	%rsi,32(%rsp)
-	movq	%rdx,40(%rsp)
-	movq	%rcx,48(%rsp)
-	movq	%r8,56(%rsp)
-	movl	$0,80+240(%rsp)
-	movq	%r8,%rbp
-	movq	%r9,%rbx
-	movq	%rsi,%r9
-	movq	%rdi,%r8
-	movq	%rcx,%r15
-
-	movl	240(%r15),%eax
-
-	movq	%r15,%r10
-	subq	%r14,%r10
-	andq	$0xfff,%r10
-	cmpq	$2304,%r10
-	jb	.Lcbc_do_ecopy
-	cmpq	$4096-248,%r10
-	jb	.Lcbc_skip_ecopy
-.align	4
-.Lcbc_do_ecopy:
-	movq	%r15,%rsi
-	leaq	80(%rsp),%rdi
-	leaq	80(%rsp),%r15
-	movl	$30,%ecx
-.long	0x90A548F3
-	movl	%eax,(%rdi)
-.Lcbc_skip_ecopy:
-	movq	%r15,0(%rsp)
-
-	movl	$18,%ecx
-.align	4
-.Lcbc_prefetch_te:
-	movq	0(%r14),%r10
-	movq	32(%r14),%r11
-	movq	64(%r14),%r12
-	movq	96(%r14),%r13
-	leaq	128(%r14),%r14
-	subl	$1,%ecx
-	jnz	.Lcbc_prefetch_te
-	leaq	-2304(%r14),%r14
-
-	cmpq	$0,%rbx
-	je	.LFAST_DECRYPT
-
-
-	movl	0(%rbp),%eax
-	movl	4(%rbp),%ebx
-	movl	8(%rbp),%ecx
-	movl	12(%rbp),%edx
-
-.align	4
-.Lcbc_fast_enc_loop:
-	xorl	0(%r8),%eax
-	xorl	4(%r8),%ebx
-	xorl	8(%r8),%ecx
-	xorl	12(%r8),%edx
-	movq	0(%rsp),%r15
-	movq	%r8,24(%rsp)
-
-	call	_x86_64_AES_encrypt
-
-	movq	24(%rsp),%r8
-	movq	40(%rsp),%r10
-	movl	%eax,0(%r9)
-	movl	%ebx,4(%r9)
-	movl	%ecx,8(%r9)
-	movl	%edx,12(%r9)
-
-	leaq	16(%r8),%r8
-	leaq	16(%r9),%r9
-	subq	$16,%r10
-	testq	$-16,%r10
-	movq	%r10,40(%rsp)
-	jnz	.Lcbc_fast_enc_loop
-	movq	56(%rsp),%rbp
-	movl	%eax,0(%rbp)
-	movl	%ebx,4(%rbp)
-	movl	%ecx,8(%rbp)
-	movl	%edx,12(%rbp)
-
-	jmp	.Lcbc_fast_cleanup
-
-
-.align	16
-.LFAST_DECRYPT:
-	cmpq	%r8,%r9
-	je	.Lcbc_fast_dec_in_place
-
-	movq	%rbp,64(%rsp)
-.align	4
-.Lcbc_fast_dec_loop:
-	movl	0(%r8),%eax
-	movl	4(%r8),%ebx
-	movl	8(%r8),%ecx
-	movl	12(%r8),%edx
-	movq	0(%rsp),%r15
-	movq	%r8,24(%rsp)
-
-	call	_x86_64_AES_decrypt
-
-	movq	64(%rsp),%rbp
-	movq	24(%rsp),%r8
-	movq	40(%rsp),%r10
-	xorl	0(%rbp),%eax
-	xorl	4(%rbp),%ebx
-	xorl	8(%rbp),%ecx
-	xorl	12(%rbp),%edx
-	movq	%r8,%rbp
-
-	subq	$16,%r10
-	movq	%r10,40(%rsp)
-	movq	%rbp,64(%rsp)
-
-	movl	%eax,0(%r9)
-	movl	%ebx,4(%r9)
-	movl	%ecx,8(%r9)
-	movl	%edx,12(%r9)
-
-	leaq	16(%r8),%r8
-	leaq	16(%r9),%r9
-	jnz	.Lcbc_fast_dec_loop
-	movq	56(%rsp),%r12
-	movq	0(%rbp),%r10
-	movq	8(%rbp),%r11
-	movq	%r10,0(%r12)
-	movq	%r11,8(%r12)
-	jmp	.Lcbc_fast_cleanup
-
-.align	16
-.Lcbc_fast_dec_in_place:
-	movq	0(%rbp),%r10
-	movq	8(%rbp),%r11
-	movq	%r10,0+64(%rsp)
-	movq	%r11,8+64(%rsp)
-.align	4
-.Lcbc_fast_dec_in_place_loop:
-	movl	0(%r8),%eax
-	movl	4(%r8),%ebx
-	movl	8(%r8),%ecx
-	movl	12(%r8),%edx
-	movq	0(%rsp),%r15
-	movq	%r8,24(%rsp)
-
-	call	_x86_64_AES_decrypt
-
-	movq	24(%rsp),%r8
-	movq	40(%rsp),%r10
-	xorl	0+64(%rsp),%eax
-	xorl	4+64(%rsp),%ebx
-	xorl	8+64(%rsp),%ecx
-	xorl	12+64(%rsp),%edx
-
-	movq	0(%r8),%r11
-	movq	8(%r8),%r12
-	subq	$16,%r10
-	jz	.Lcbc_fast_dec_in_place_done
-
-	movq	%r11,0+64(%rsp)
-	movq	%r12,8+64(%rsp)
-
-	movl	%eax,0(%r9)
-	movl	%ebx,4(%r9)
-	movl	%ecx,8(%r9)
-	movl	%edx,12(%r9)
-
-	leaq	16(%r8),%r8
-	leaq	16(%r9),%r9
-	movq	%r10,40(%rsp)
-	jmp	.Lcbc_fast_dec_in_place_loop
-.Lcbc_fast_dec_in_place_done:
-	movq	56(%rsp),%rdi
-	movq	%r11,0(%rdi)
-	movq	%r12,8(%rdi)
-
-	movl	%eax,0(%r9)
-	movl	%ebx,4(%r9)
-	movl	%ecx,8(%r9)
-	movl	%edx,12(%r9)
-
-.align	4
-.Lcbc_fast_cleanup:
-	cmpl	$0,80+240(%rsp)
-	leaq	80(%rsp),%rdi
-	je	.Lcbc_exit
-	movl	$30,%ecx
-	xorq	%rax,%rax
-.long	0x90AB48F3
-
-	jmp	.Lcbc_exit
-
-
-.align	16
-.Lcbc_slow_prologue:
-.cfi_restore_state	
-
-	leaq	-88(%rsp),%rbp
-	andq	$-64,%rbp
-
-	leaq	-88-63(%rcx),%r10
-	subq	%rbp,%r10
-	negq	%r10
-	andq	$0x3c0,%r10
-	subq	%r10,%rbp
-
-	xchgq	%rsp,%rbp
-.cfi_def_cfa_register	%rbp
-
-	movq	%rbp,16(%rsp)
-.cfi_escape	0x0f,0x05,0x77,0x10,0x06,0x23,0x40
-.Lcbc_slow_body:
-
-
-
-
-	movq	%r8,56(%rsp)
-	movq	%r8,%rbp
-	movq	%r9,%rbx
-	movq	%rsi,%r9
-	movq	%rdi,%r8
-	movq	%rcx,%r15
-	movq	%rdx,%r10
-
-	movl	240(%r15),%eax
-	movq	%r15,0(%rsp)
-	shll	$4,%eax
-	leaq	(%r15,%rax,1),%rax
-	movq	%rax,8(%rsp)
-
-
-	leaq	2048(%r14),%r14
-	leaq	768-8(%rsp),%rax
-	subq	%r14,%rax
-	andq	$0x300,%rax
-	leaq	(%r14,%rax,1),%r14
-
-	cmpq	$0,%rbx
-	je	.LSLOW_DECRYPT
-
-
-	testq	$-16,%r10
-	movl	0(%rbp),%eax
-	movl	4(%rbp),%ebx
-	movl	8(%rbp),%ecx
-	movl	12(%rbp),%edx
-	jz	.Lcbc_slow_enc_tail
-
-.align	4
-.Lcbc_slow_enc_loop:
-	xorl	0(%r8),%eax
-	xorl	4(%r8),%ebx
-	xorl	8(%r8),%ecx
-	xorl	12(%r8),%edx
-	movq	0(%rsp),%r15
-	movq	%r8,24(%rsp)
-	movq	%r9,32(%rsp)
-	movq	%r10,40(%rsp)
-
-	call	_x86_64_AES_encrypt_compact
-
-	movq	24(%rsp),%r8
-	movq	32(%rsp),%r9
-	movq	40(%rsp),%r10
-	movl	%eax,0(%r9)
-	movl	%ebx,4(%r9)
-	movl	%ecx,8(%r9)
-	movl	%edx,12(%r9)
-
-	leaq	16(%r8),%r8
-	leaq	16(%r9),%r9
-	subq	$16,%r10
-	testq	$-16,%r10
-	jnz	.Lcbc_slow_enc_loop
-	testq	$15,%r10
-	jnz	.Lcbc_slow_enc_tail
-	movq	56(%rsp),%rbp
-	movl	%eax,0(%rbp)
-	movl	%ebx,4(%rbp)
-	movl	%ecx,8(%rbp)
-	movl	%edx,12(%rbp)
-
-	jmp	.Lcbc_exit
-
-.align	4
-.Lcbc_slow_enc_tail:
-	movq	%rax,%r11
-	movq	%rcx,%r12
-	movq	%r10,%rcx
-	movq	%r8,%rsi
-	movq	%r9,%rdi
-.long	0x9066A4F3
-	movq	$16,%rcx
-	subq	%r10,%rcx
-	xorq	%rax,%rax
-.long	0x9066AAF3
-	movq	%r9,%r8
-	movq	$16,%r10
-	movq	%r11,%rax
-	movq	%r12,%rcx
-	jmp	.Lcbc_slow_enc_loop
-
-.align	16
-.LSLOW_DECRYPT:
-	shrq	$3,%rax
-	addq	%rax,%r14
-
-	movq	0(%rbp),%r11
-	movq	8(%rbp),%r12
-	movq	%r11,0+64(%rsp)
-	movq	%r12,8+64(%rsp)
-
-.align	4
-.Lcbc_slow_dec_loop:
-	movl	0(%r8),%eax
-	movl	4(%r8),%ebx
-	movl	8(%r8),%ecx
-	movl	12(%r8),%edx
-	movq	0(%rsp),%r15
-	movq	%r8,24(%rsp)
-	movq	%r9,32(%rsp)
-	movq	%r10,40(%rsp)
-
-	call	_x86_64_AES_decrypt_compact
-
-	movq	24(%rsp),%r8
-	movq	32(%rsp),%r9
-	movq	40(%rsp),%r10
-	xorl	0+64(%rsp),%eax
-	xorl	4+64(%rsp),%ebx
-	xorl	8+64(%rsp),%ecx
-	xorl	12+64(%rsp),%edx
-
-	movq	0(%r8),%r11
-	movq	8(%r8),%r12
-	subq	$16,%r10
-	jc	.Lcbc_slow_dec_partial
-	jz	.Lcbc_slow_dec_done
-
-	movq	%r11,0+64(%rsp)
-	movq	%r12,8+64(%rsp)
-
-	movl	%eax,0(%r9)
-	movl	%ebx,4(%r9)
-	movl	%ecx,8(%r9)
-	movl	%edx,12(%r9)
-
-	leaq	16(%r8),%r8
-	leaq	16(%r9),%r9
-	jmp	.Lcbc_slow_dec_loop
-.Lcbc_slow_dec_done:
-	movq	56(%rsp),%rdi
-	movq	%r11,0(%rdi)
-	movq	%r12,8(%rdi)
-
-	movl	%eax,0(%r9)
-	movl	%ebx,4(%r9)
-	movl	%ecx,8(%r9)
-	movl	%edx,12(%r9)
-
-	jmp	.Lcbc_exit
-
-.align	4
-.Lcbc_slow_dec_partial:
-	movq	56(%rsp),%rdi
-	movq	%r11,0(%rdi)
-	movq	%r12,8(%rdi)
-
-	movl	%eax,0+64(%rsp)
-	movl	%ebx,4+64(%rsp)
-	movl	%ecx,8+64(%rsp)
-	movl	%edx,12+64(%rsp)
-
-	movq	%r9,%rdi
-	leaq	64(%rsp),%rsi
-	leaq	16(%r10),%rcx
-.long	0x9066A4F3
-	jmp	.Lcbc_exit
-
-.align	16
-.Lcbc_exit:
-	movq	16(%rsp),%rsi
-.cfi_def_cfa	%rsi,64
-	movq	(%rsi),%r15
-.cfi_restore	%r15
-	movq	8(%rsi),%r14
-.cfi_restore	%r14
-	movq	16(%rsi),%r13
-.cfi_restore	%r13
-	movq	24(%rsi),%r12
-.cfi_restore	%r12
-	movq	32(%rsi),%rbp
-.cfi_restore	%rbp
-	movq	40(%rsi),%rbx
-.cfi_restore	%rbx
-	leaq	48(%rsi),%rsp
-.cfi_def_cfa	%rsp,16
-.Lcbc_popfq:
-	popfq
-
-
-.cfi_adjust_cfa_offset	-8
-.Lcbc_epilogue:
-	.byte	0xf3,0xc3
-.cfi_endproc	
-.size	AES_cbc_encrypt,.-AES_cbc_encrypt
-.align	64
-.LAES_Te:
-.long	0xa56363c6,0xa56363c6
-.long	0x847c7cf8,0x847c7cf8
-.long	0x997777ee,0x997777ee
-.long	0x8d7b7bf6,0x8d7b7bf6
-.long	0x0df2f2ff,0x0df2f2ff
-.long	0xbd6b6bd6,0xbd6b6bd6
-.long	0xb16f6fde,0xb16f6fde
-.long	0x54c5c591,0x54c5c591
-.long	0x50303060,0x50303060
-.long	0x03010102,0x03010102
-.long	0xa96767ce,0xa96767ce
-.long	0x7d2b2b56,0x7d2b2b56
-.long	0x19fefee7,0x19fefee7
-.long	0x62d7d7b5,0x62d7d7b5
-.long	0xe6abab4d,0xe6abab4d
-.long	0x9a7676ec,0x9a7676ec
-.long	0x45caca8f,0x45caca8f
-.long	0x9d82821f,0x9d82821f
-.long	0x40c9c989,0x40c9c989
-.long	0x877d7dfa,0x877d7dfa
-.long	0x15fafaef,0x15fafaef
-.long	0xeb5959b2,0xeb5959b2
-.long	0xc947478e,0xc947478e
-.long	0x0bf0f0fb,0x0bf0f0fb
-.long	0xecadad41,0xecadad41
-.long	0x67d4d4b3,0x67d4d4b3
-.long	0xfda2a25f,0xfda2a25f
-.long	0xeaafaf45,0xeaafaf45
-.long	0xbf9c9c23,0xbf9c9c23
-.long	0xf7a4a453,0xf7a4a453
-.long	0x967272e4,0x967272e4
-.long	0x5bc0c09b,0x5bc0c09b
-.long	0xc2b7b775,0xc2b7b775
-.long	0x1cfdfde1,0x1cfdfde1
-.long	0xae93933d,0xae93933d
-.long	0x6a26264c,0x6a26264c
-.long	0x5a36366c,0x5a36366c
-.long	0x413f3f7e,0x413f3f7e
-.long	0x02f7f7f5,0x02f7f7f5
-.long	0x4fcccc83,0x4fcccc83
-.long	0x5c343468,0x5c343468
-.long	0xf4a5a551,0xf4a5a551
-.long	0x34e5e5d1,0x34e5e5d1
-.long	0x08f1f1f9,0x08f1f1f9
-.long	0x937171e2,0x937171e2
-.long	0x73d8d8ab,0x73d8d8ab
-.long	0x53313162,0x53313162
-.long	0x3f15152a,0x3f15152a
-.long	0x0c040408,0x0c040408
-.long	0x52c7c795,0x52c7c795
-.long	0x65232346,0x65232346
-.long	0x5ec3c39d,0x5ec3c39d
-.long	0x28181830,0x28181830
-.long	0xa1969637,0xa1969637
-.long	0x0f05050a,0x0f05050a
-.long	0xb59a9a2f,0xb59a9a2f
-.long	0x0907070e,0x0907070e
-.long	0x36121224,0x36121224
-.long	0x9b80801b,0x9b80801b
-.long	0x3de2e2df,0x3de2e2df
-.long	0x26ebebcd,0x26ebebcd
-.long	0x6927274e,0x6927274e
-.long	0xcdb2b27f,0xcdb2b27f
-.long	0x9f7575ea,0x9f7575ea
-.long	0x1b090912,0x1b090912
-.long	0x9e83831d,0x9e83831d
-.long	0x742c2c58,0x742c2c58
-.long	0x2e1a1a34,0x2e1a1a34
-.long	0x2d1b1b36,0x2d1b1b36
-.long	0xb26e6edc,0xb26e6edc
-.long	0xee5a5ab4,0xee5a5ab4
-.long	0xfba0a05b,0xfba0a05b
-.long	0xf65252a4,0xf65252a4
-.long	0x4d3b3b76,0x4d3b3b76
-.long	0x61d6d6b7,0x61d6d6b7
-.long	0xceb3b37d,0xceb3b37d
-.long	0x7b292952,0x7b292952
-.long	0x3ee3e3dd,0x3ee3e3dd
-.long	0x712f2f5e,0x712f2f5e
-.long	0x97848413,0x97848413
-.long	0xf55353a6,0xf55353a6
-.long	0x68d1d1b9,0x68d1d1b9
-.long	0x00000000,0x00000000
-.long	0x2cededc1,0x2cededc1
-.long	0x60202040,0x60202040
-.long	0x1ffcfce3,0x1ffcfce3
-.long	0xc8b1b179,0xc8b1b179
-.long	0xed5b5bb6,0xed5b5bb6
-.long	0xbe6a6ad4,0xbe6a6ad4
-.long	0x46cbcb8d,0x46cbcb8d
-.long	0xd9bebe67,0xd9bebe67
-.long	0x4b393972,0x4b393972
-.long	0xde4a4a94,0xde4a4a94
-.long	0xd44c4c98,0xd44c4c98
-.long	0xe85858b0,0xe85858b0
-.long	0x4acfcf85,0x4acfcf85
-.long	0x6bd0d0bb,0x6bd0d0bb
-.long	0x2aefefc5,0x2aefefc5
-.long	0xe5aaaa4f,0xe5aaaa4f
-.long	0x16fbfbed,0x16fbfbed
-.long	0xc5434386,0xc5434386
-.long	0xd74d4d9a,0xd74d4d9a
-.long	0x55333366,0x55333366
-.long	0x94858511,0x94858511
-.long	0xcf45458a,0xcf45458a
-.long	0x10f9f9e9,0x10f9f9e9
-.long	0x06020204,0x06020204
-.long	0x817f7ffe,0x817f7ffe
-.long	0xf05050a0,0xf05050a0
-.long	0x443c3c78,0x443c3c78
-.long	0xba9f9f25,0xba9f9f25
-.long	0xe3a8a84b,0xe3a8a84b
-.long	0xf35151a2,0xf35151a2
-.long	0xfea3a35d,0xfea3a35d
-.long	0xc0404080,0xc0404080
-.long	0x8a8f8f05,0x8a8f8f05
-.long	0xad92923f,0xad92923f
-.long	0xbc9d9d21,0xbc9d9d21
-.long	0x48383870,0x48383870
-.long	0x04f5f5f1,0x04f5f5f1
-.long	0xdfbcbc63,0xdfbcbc63
-.long	0xc1b6b677,0xc1b6b677
-.long	0x75dadaaf,0x75dadaaf
-.long	0x63212142,0x63212142
-.long	0x30101020,0x30101020
-.long	0x1affffe5,0x1affffe5
-.long	0x0ef3f3fd,0x0ef3f3fd
-.long	0x6dd2d2bf,0x6dd2d2bf
-.long	0x4ccdcd81,0x4ccdcd81
-.long	0x140c0c18,0x140c0c18
-.long	0x35131326,0x35131326
-.long	0x2fececc3,0x2fececc3
-.long	0xe15f5fbe,0xe15f5fbe
-.long	0xa2979735,0xa2979735
-.long	0xcc444488,0xcc444488
-.long	0x3917172e,0x3917172e
-.long	0x57c4c493,0x57c4c493
-.long	0xf2a7a755,0xf2a7a755
-.long	0x827e7efc,0x827e7efc
-.long	0x473d3d7a,0x473d3d7a
-.long	0xac6464c8,0xac6464c8
-.long	0xe75d5dba,0xe75d5dba
-.long	0x2b191932,0x2b191932
-.long	0x957373e6,0x957373e6
-.long	0xa06060c0,0xa06060c0
-.long	0x98818119,0x98818119
-.long	0xd14f4f9e,0xd14f4f9e
-.long	0x7fdcdca3,0x7fdcdca3
-.long	0x66222244,0x66222244
-.long	0x7e2a2a54,0x7e2a2a54
-.long	0xab90903b,0xab90903b
-.long	0x8388880b,0x8388880b
-.long	0xca46468c,0xca46468c
-.long	0x29eeeec7,0x29eeeec7
-.long	0xd3b8b86b,0xd3b8b86b
-.long	0x3c141428,0x3c141428
-.long	0x79dedea7,0x79dedea7
-.long	0xe25e5ebc,0xe25e5ebc
-.long	0x1d0b0b16,0x1d0b0b16
-.long	0x76dbdbad,0x76dbdbad
-.long	0x3be0e0db,0x3be0e0db
-.long	0x56323264,0x56323264
-.long	0x4e3a3a74,0x4e3a3a74
-.long	0x1e0a0a14,0x1e0a0a14
-.long	0xdb494992,0xdb494992
-.long	0x0a06060c,0x0a06060c
-.long	0x6c242448,0x6c242448
-.long	0xe45c5cb8,0xe45c5cb8
-.long	0x5dc2c29f,0x5dc2c29f
-.long	0x6ed3d3bd,0x6ed3d3bd
-.long	0xefacac43,0xefacac43
-.long	0xa66262c4,0xa66262c4
-.long	0xa8919139,0xa8919139
-.long	0xa4959531,0xa4959531
-.long	0x37e4e4d3,0x37e4e4d3
-.long	0x8b7979f2,0x8b7979f2
-.long	0x32e7e7d5,0x32e7e7d5
-.long	0x43c8c88b,0x43c8c88b
-.long	0x5937376e,0x5937376e
-.long	0xb76d6dda,0xb76d6dda
-.long	0x8c8d8d01,0x8c8d8d01
-.long	0x64d5d5b1,0x64d5d5b1
-.long	0xd24e4e9c,0xd24e4e9c
-.long	0xe0a9a949,0xe0a9a949
-.long	0xb46c6cd8,0xb46c6cd8
-.long	0xfa5656ac,0xfa5656ac
-.long	0x07f4f4f3,0x07f4f4f3
-.long	0x25eaeacf,0x25eaeacf
-.long	0xaf6565ca,0xaf6565ca
-.long	0x8e7a7af4,0x8e7a7af4
-.long	0xe9aeae47,0xe9aeae47
-.long	0x18080810,0x18080810
-.long	0xd5baba6f,0xd5baba6f
-.long	0x887878f0,0x887878f0
-.long	0x6f25254a,0x6f25254a
-.long	0x722e2e5c,0x722e2e5c
-.long	0x241c1c38,0x241c1c38
-.long	0xf1a6a657,0xf1a6a657
-.long	0xc7b4b473,0xc7b4b473
-.long	0x51c6c697,0x51c6c697
-.long	0x23e8e8cb,0x23e8e8cb
-.long	0x7cdddda1,0x7cdddda1
-.long	0x9c7474e8,0x9c7474e8
-.long	0x211f1f3e,0x211f1f3e
-.long	0xdd4b4b96,0xdd4b4b96
-.long	0xdcbdbd61,0xdcbdbd61
-.long	0x868b8b0d,0x868b8b0d
-.long	0x858a8a0f,0x858a8a0f
-.long	0x907070e0,0x907070e0
-.long	0x423e3e7c,0x423e3e7c
-.long	0xc4b5b571,0xc4b5b571
-.long	0xaa6666cc,0xaa6666cc
-.long	0xd8484890,0xd8484890
-.long	0x05030306,0x05030306
-.long	0x01f6f6f7,0x01f6f6f7
-.long	0x120e0e1c,0x120e0e1c
-.long	0xa36161c2,0xa36161c2
-.long	0x5f35356a,0x5f35356a
-.long	0xf95757ae,0xf95757ae
-.long	0xd0b9b969,0xd0b9b969
-.long	0x91868617,0x91868617
-.long	0x58c1c199,0x58c1c199
-.long	0x271d1d3a,0x271d1d3a
-.long	0xb99e9e27,0xb99e9e27
-.long	0x38e1e1d9,0x38e1e1d9
-.long	0x13f8f8eb,0x13f8f8eb
-.long	0xb398982b,0xb398982b
-.long	0x33111122,0x33111122
-.long	0xbb6969d2,0xbb6969d2
-.long	0x70d9d9a9,0x70d9d9a9
-.long	0x898e8e07,0x898e8e07
-.long	0xa7949433,0xa7949433
-.long	0xb69b9b2d,0xb69b9b2d
-.long	0x221e1e3c,0x221e1e3c
-.long	0x92878715,0x92878715
-.long	0x20e9e9c9,0x20e9e9c9
-.long	0x49cece87,0x49cece87
-.long	0xff5555aa,0xff5555aa
-.long	0x78282850,0x78282850
-.long	0x7adfdfa5,0x7adfdfa5
-.long	0x8f8c8c03,0x8f8c8c03
-.long	0xf8a1a159,0xf8a1a159
-.long	0x80898909,0x80898909
-.long	0x170d0d1a,0x170d0d1a
-.long	0xdabfbf65,0xdabfbf65
-.long	0x31e6e6d7,0x31e6e6d7
-.long	0xc6424284,0xc6424284
-.long	0xb86868d0,0xb86868d0
-.long	0xc3414182,0xc3414182
-.long	0xb0999929,0xb0999929
-.long	0x772d2d5a,0x772d2d5a
-.long	0x110f0f1e,0x110f0f1e
-.long	0xcbb0b07b,0xcbb0b07b
-.long	0xfc5454a8,0xfc5454a8
-.long	0xd6bbbb6d,0xd6bbbb6d
-.long	0x3a16162c,0x3a16162c
-.byte	0x63,0x7c,0x77,0x7b,0xf2,0x6b,0x6f,0xc5
-.byte	0x30,0x01,0x67,0x2b,0xfe,0xd7,0xab,0x76
-.byte	0xca,0x82,0xc9,0x7d,0xfa,0x59,0x47,0xf0
-.byte	0xad,0xd4,0xa2,0xaf,0x9c,0xa4,0x72,0xc0
-.byte	0xb7,0xfd,0x93,0x26,0x36,0x3f,0xf7,0xcc
-.byte	0x34,0xa5,0xe5,0xf1,0x71,0xd8,0x31,0x15
-.byte	0x04,0xc7,0x23,0xc3,0x18,0x96,0x05,0x9a
-.byte	0x07,0x12,0x80,0xe2,0xeb,0x27,0xb2,0x75
-.byte	0x09,0x83,0x2c,0x1a,0x1b,0x6e,0x5a,0xa0
-.byte	0x52,0x3b,0xd6,0xb3,0x29,0xe3,0x2f,0x84
-.byte	0x53,0xd1,0x00,0xed,0x20,0xfc,0xb1,0x5b
-.byte	0x6a,0xcb,0xbe,0x39,0x4a,0x4c,0x58,0xcf
-.byte	0xd0,0xef,0xaa,0xfb,0x43,0x4d,0x33,0x85
-.byte	0x45,0xf9,0x02,0x7f,0x50,0x3c,0x9f,0xa8
-.byte	0x51,0xa3,0x40,0x8f,0x92,0x9d,0x38,0xf5
-.byte	0xbc,0xb6,0xda,0x21,0x10,0xff,0xf3,0xd2
-.byte	0xcd,0x0c,0x13,0xec,0x5f,0x97,0x44,0x17
-.byte	0xc4,0xa7,0x7e,0x3d,0x64,0x5d,0x19,0x73
-.byte	0x60,0x81,0x4f,0xdc,0x22,0x2a,0x90,0x88
-.byte	0x46,0xee,0xb8,0x14,0xde,0x5e,0x0b,0xdb
-.byte	0xe0,0x32,0x3a,0x0a,0x49,0x06,0x24,0x5c
-.byte	0xc2,0xd3,0xac,0x62,0x91,0x95,0xe4,0x79
-.byte	0xe7,0xc8,0x37,0x6d,0x8d,0xd5,0x4e,0xa9
-.byte	0x6c,0x56,0xf4,0xea,0x65,0x7a,0xae,0x08
-.byte	0xba,0x78,0x25,0x2e,0x1c,0xa6,0xb4,0xc6
-.byte	0xe8,0xdd,0x74,0x1f,0x4b,0xbd,0x8b,0x8a
-.byte	0x70,0x3e,0xb5,0x66,0x48,0x03,0xf6,0x0e
-.byte	0x61,0x35,0x57,0xb9,0x86,0xc1,0x1d,0x9e
-.byte	0xe1,0xf8,0x98,0x11,0x69,0xd9,0x8e,0x94
-.byte	0x9b,0x1e,0x87,0xe9,0xce,0x55,0x28,0xdf
-.byte	0x8c,0xa1,0x89,0x0d,0xbf,0xe6,0x42,0x68
-.byte	0x41,0x99,0x2d,0x0f,0xb0,0x54,0xbb,0x16
-.byte	0x63,0x7c,0x77,0x7b,0xf2,0x6b,0x6f,0xc5
-.byte	0x30,0x01,0x67,0x2b,0xfe,0xd7,0xab,0x76
-.byte	0xca,0x82,0xc9,0x7d,0xfa,0x59,0x47,0xf0
-.byte	0xad,0xd4,0xa2,0xaf,0x9c,0xa4,0x72,0xc0
-.byte	0xb7,0xfd,0x93,0x26,0x36,0x3f,0xf7,0xcc
-.byte	0x34,0xa5,0xe5,0xf1,0x71,0xd8,0x31,0x15
-.byte	0x04,0xc7,0x23,0xc3,0x18,0x96,0x05,0x9a
-.byte	0x07,0x12,0x80,0xe2,0xeb,0x27,0xb2,0x75
-.byte	0x09,0x83,0x2c,0x1a,0x1b,0x6e,0x5a,0xa0
-.byte	0x52,0x3b,0xd6,0xb3,0x29,0xe3,0x2f,0x84
-.byte	0x53,0xd1,0x00,0xed,0x20,0xfc,0xb1,0x5b
-.byte	0x6a,0xcb,0xbe,0x39,0x4a,0x4c,0x58,0xcf
-.byte	0xd0,0xef,0xaa,0xfb,0x43,0x4d,0x33,0x85
-.byte	0x45,0xf9,0x02,0x7f,0x50,0x3c,0x9f,0xa8
-.byte	0x51,0xa3,0x40,0x8f,0x92,0x9d,0x38,0xf5
-.byte	0xbc,0xb6,0xda,0x21,0x10,0xff,0xf3,0xd2
-.byte	0xcd,0x0c,0x13,0xec,0x5f,0x97,0x44,0x17
-.byte	0xc4,0xa7,0x7e,0x3d,0x64,0x5d,0x19,0x73
-.byte	0x60,0x81,0x4f,0xdc,0x22,0x2a,0x90,0x88
-.byte	0x46,0xee,0xb8,0x14,0xde,0x5e,0x0b,0xdb
-.byte	0xe0,0x32,0x3a,0x0a,0x49,0x06,0x24,0x5c
-.byte	0xc2,0xd3,0xac,0x62,0x91,0x95,0xe4,0x79
-.byte	0xe7,0xc8,0x37,0x6d,0x8d,0xd5,0x4e,0xa9
-.byte	0x6c,0x56,0xf4,0xea,0x65,0x7a,0xae,0x08
-.byte	0xba,0x78,0x25,0x2e,0x1c,0xa6,0xb4,0xc6
-.byte	0xe8,0xdd,0x74,0x1f,0x4b,0xbd,0x8b,0x8a
-.byte	0x70,0x3e,0xb5,0x66,0x48,0x03,0xf6,0x0e
-.byte	0x61,0x35,0x57,0xb9,0x86,0xc1,0x1d,0x9e
-.byte	0xe1,0xf8,0x98,0x11,0x69,0xd9,0x8e,0x94
-.byte	0x9b,0x1e,0x87,0xe9,0xce,0x55,0x28,0xdf
-.byte	0x8c,0xa1,0x89,0x0d,0xbf,0xe6,0x42,0x68
-.byte	0x41,0x99,0x2d,0x0f,0xb0,0x54,0xbb,0x16
-.byte	0x63,0x7c,0x77,0x7b,0xf2,0x6b,0x6f,0xc5
-.byte	0x30,0x01,0x67,0x2b,0xfe,0xd7,0xab,0x76
-.byte	0xca,0x82,0xc9,0x7d,0xfa,0x59,0x47,0xf0
-.byte	0xad,0xd4,0xa2,0xaf,0x9c,0xa4,0x72,0xc0
-.byte	0xb7,0xfd,0x93,0x26,0x36,0x3f,0xf7,0xcc
-.byte	0x34,0xa5,0xe5,0xf1,0x71,0xd8,0x31,0x15
-.byte	0x04,0xc7,0x23,0xc3,0x18,0x96,0x05,0x9a
-.byte	0x07,0x12,0x80,0xe2,0xeb,0x27,0xb2,0x75
-.byte	0x09,0x83,0x2c,0x1a,0x1b,0x6e,0x5a,0xa0
-.byte	0x52,0x3b,0xd6,0xb3,0x29,0xe3,0x2f,0x84
-.byte	0x53,0xd1,0x00,0xed,0x20,0xfc,0xb1,0x5b
-.byte	0x6a,0xcb,0xbe,0x39,0x4a,0x4c,0x58,0xcf
-.byte	0xd0,0xef,0xaa,0xfb,0x43,0x4d,0x33,0x85
-.byte	0x45,0xf9,0x02,0x7f,0x50,0x3c,0x9f,0xa8
-.byte	0x51,0xa3,0x40,0x8f,0x92,0x9d,0x38,0xf5
-.byte	0xbc,0xb6,0xda,0x21,0x10,0xff,0xf3,0xd2
-.byte	0xcd,0x0c,0x13,0xec,0x5f,0x97,0x44,0x17
-.byte	0xc4,0xa7,0x7e,0x3d,0x64,0x5d,0x19,0x73
-.byte	0x60,0x81,0x4f,0xdc,0x22,0x2a,0x90,0x88
-.byte	0x46,0xee,0xb8,0x14,0xde,0x5e,0x0b,0xdb
-.byte	0xe0,0x32,0x3a,0x0a,0x49,0x06,0x24,0x5c
-.byte	0xc2,0xd3,0xac,0x62,0x91,0x95,0xe4,0x79
-.byte	0xe7,0xc8,0x37,0x6d,0x8d,0xd5,0x4e,0xa9
-.byte	0x6c,0x56,0xf4,0xea,0x65,0x7a,0xae,0x08
-.byte	0xba,0x78,0x25,0x2e,0x1c,0xa6,0xb4,0xc6
-.byte	0xe8,0xdd,0x74,0x1f,0x4b,0xbd,0x8b,0x8a
-.byte	0x70,0x3e,0xb5,0x66,0x48,0x03,0xf6,0x0e
-.byte	0x61,0x35,0x57,0xb9,0x86,0xc1,0x1d,0x9e
-.byte	0xe1,0xf8,0x98,0x11,0x69,0xd9,0x8e,0x94
-.byte	0x9b,0x1e,0x87,0xe9,0xce,0x55,0x28,0xdf
-.byte	0x8c,0xa1,0x89,0x0d,0xbf,0xe6,0x42,0x68
-.byte	0x41,0x99,0x2d,0x0f,0xb0,0x54,0xbb,0x16
-.byte	0x63,0x7c,0x77,0x7b,0xf2,0x6b,0x6f,0xc5
-.byte	0x30,0x01,0x67,0x2b,0xfe,0xd7,0xab,0x76
-.byte	0xca,0x82,0xc9,0x7d,0xfa,0x59,0x47,0xf0
-.byte	0xad,0xd4,0xa2,0xaf,0x9c,0xa4,0x72,0xc0
-.byte	0xb7,0xfd,0x93,0x26,0x36,0x3f,0xf7,0xcc
-.byte	0x34,0xa5,0xe5,0xf1,0x71,0xd8,0x31,0x15
-.byte	0x04,0xc7,0x23,0xc3,0x18,0x96,0x05,0x9a
-.byte	0x07,0x12,0x80,0xe2,0xeb,0x27,0xb2,0x75
-.byte	0x09,0x83,0x2c,0x1a,0x1b,0x6e,0x5a,0xa0
-.byte	0x52,0x3b,0xd6,0xb3,0x29,0xe3,0x2f,0x84
-.byte	0x53,0xd1,0x00,0xed,0x20,0xfc,0xb1,0x5b
-.byte	0x6a,0xcb,0xbe,0x39,0x4a,0x4c,0x58,0xcf
-.byte	0xd0,0xef,0xaa,0xfb,0x43,0x4d,0x33,0x85
-.byte	0x45,0xf9,0x02,0x7f,0x50,0x3c,0x9f,0xa8
-.byte	0x51,0xa3,0x40,0x8f,0x92,0x9d,0x38,0xf5
-.byte	0xbc,0xb6,0xda,0x21,0x10,0xff,0xf3,0xd2
-.byte	0xcd,0x0c,0x13,0xec,0x5f,0x97,0x44,0x17
-.byte	0xc4,0xa7,0x7e,0x3d,0x64,0x5d,0x19,0x73
-.byte	0x60,0x81,0x4f,0xdc,0x22,0x2a,0x90,0x88
-.byte	0x46,0xee,0xb8,0x14,0xde,0x5e,0x0b,0xdb
-.byte	0xe0,0x32,0x3a,0x0a,0x49,0x06,0x24,0x5c
-.byte	0xc2,0xd3,0xac,0x62,0x91,0x95,0xe4,0x79
-.byte	0xe7,0xc8,0x37,0x6d,0x8d,0xd5,0x4e,0xa9
-.byte	0x6c,0x56,0xf4,0xea,0x65,0x7a,0xae,0x08
-.byte	0xba,0x78,0x25,0x2e,0x1c,0xa6,0xb4,0xc6
-.byte	0xe8,0xdd,0x74,0x1f,0x4b,0xbd,0x8b,0x8a
-.byte	0x70,0x3e,0xb5,0x66,0x48,0x03,0xf6,0x0e
-.byte	0x61,0x35,0x57,0xb9,0x86,0xc1,0x1d,0x9e
-.byte	0xe1,0xf8,0x98,0x11,0x69,0xd9,0x8e,0x94
-.byte	0x9b,0x1e,0x87,0xe9,0xce,0x55,0x28,0xdf
-.byte	0x8c,0xa1,0x89,0x0d,0xbf,0xe6,0x42,0x68
-.byte	0x41,0x99,0x2d,0x0f,0xb0,0x54,0xbb,0x16
-.long	0x00000001, 0x00000002, 0x00000004, 0x00000008
-.long	0x00000010, 0x00000020, 0x00000040, 0x00000080
-.long	0x0000001b, 0x00000036, 0x80808080, 0x80808080
-.long	0xfefefefe, 0xfefefefe, 0x1b1b1b1b, 0x1b1b1b1b
-.align	64
-.LAES_Td:
-.long	0x50a7f451,0x50a7f451
-.long	0x5365417e,0x5365417e
-.long	0xc3a4171a,0xc3a4171a
-.long	0x965e273a,0x965e273a
-.long	0xcb6bab3b,0xcb6bab3b
-.long	0xf1459d1f,0xf1459d1f
-.long	0xab58faac,0xab58faac
-.long	0x9303e34b,0x9303e34b
-.long	0x55fa3020,0x55fa3020
-.long	0xf66d76ad,0xf66d76ad
-.long	0x9176cc88,0x9176cc88
-.long	0x254c02f5,0x254c02f5
-.long	0xfcd7e54f,0xfcd7e54f
-.long	0xd7cb2ac5,0xd7cb2ac5
-.long	0x80443526,0x80443526
-.long	0x8fa362b5,0x8fa362b5
-.long	0x495ab1de,0x495ab1de
-.long	0x671bba25,0x671bba25
-.long	0x980eea45,0x980eea45
-.long	0xe1c0fe5d,0xe1c0fe5d
-.long	0x02752fc3,0x02752fc3
-.long	0x12f04c81,0x12f04c81
-.long	0xa397468d,0xa397468d
-.long	0xc6f9d36b,0xc6f9d36b
-.long	0xe75f8f03,0xe75f8f03
-.long	0x959c9215,0x959c9215
-.long	0xeb7a6dbf,0xeb7a6dbf
-.long	0xda595295,0xda595295
-.long	0x2d83bed4,0x2d83bed4
-.long	0xd3217458,0xd3217458
-.long	0x2969e049,0x2969e049
-.long	0x44c8c98e,0x44c8c98e
-.long	0x6a89c275,0x6a89c275
-.long	0x78798ef4,0x78798ef4
-.long	0x6b3e5899,0x6b3e5899
-.long	0xdd71b927,0xdd71b927
-.long	0xb64fe1be,0xb64fe1be
-.long	0x17ad88f0,0x17ad88f0
-.long	0x66ac20c9,0x66ac20c9
-.long	0xb43ace7d,0xb43ace7d
-.long	0x184adf63,0x184adf63
-.long	0x82311ae5,0x82311ae5
-.long	0x60335197,0x60335197
-.long	0x457f5362,0x457f5362
-.long	0xe07764b1,0xe07764b1
-.long	0x84ae6bbb,0x84ae6bbb
-.long	0x1ca081fe,0x1ca081fe
-.long	0x942b08f9,0x942b08f9
-.long	0x58684870,0x58684870
-.long	0x19fd458f,0x19fd458f
-.long	0x876cde94,0x876cde94
-.long	0xb7f87b52,0xb7f87b52
-.long	0x23d373ab,0x23d373ab
-.long	0xe2024b72,0xe2024b72
-.long	0x578f1fe3,0x578f1fe3
-.long	0x2aab5566,0x2aab5566
-.long	0x0728ebb2,0x0728ebb2
-.long	0x03c2b52f,0x03c2b52f
-.long	0x9a7bc586,0x9a7bc586
-.long	0xa50837d3,0xa50837d3
-.long	0xf2872830,0xf2872830
-.long	0xb2a5bf23,0xb2a5bf23
-.long	0xba6a0302,0xba6a0302
-.long	0x5c8216ed,0x5c8216ed
-.long	0x2b1ccf8a,0x2b1ccf8a
-.long	0x92b479a7,0x92b479a7
-.long	0xf0f207f3,0xf0f207f3
-.long	0xa1e2694e,0xa1e2694e
-.long	0xcdf4da65,0xcdf4da65
-.long	0xd5be0506,0xd5be0506
-.long	0x1f6234d1,0x1f6234d1
-.long	0x8afea6c4,0x8afea6c4
-.long	0x9d532e34,0x9d532e34
-.long	0xa055f3a2,0xa055f3a2
-.long	0x32e18a05,0x32e18a05
-.long	0x75ebf6a4,0x75ebf6a4
-.long	0x39ec830b,0x39ec830b
-.long	0xaaef6040,0xaaef6040
-.long	0x069f715e,0x069f715e
-.long	0x51106ebd,0x51106ebd
-.long	0xf98a213e,0xf98a213e
-.long	0x3d06dd96,0x3d06dd96
-.long	0xae053edd,0xae053edd
-.long	0x46bde64d,0x46bde64d
-.long	0xb58d5491,0xb58d5491
-.long	0x055dc471,0x055dc471
-.long	0x6fd40604,0x6fd40604
-.long	0xff155060,0xff155060
-.long	0x24fb9819,0x24fb9819
-.long	0x97e9bdd6,0x97e9bdd6
-.long	0xcc434089,0xcc434089
-.long	0x779ed967,0x779ed967
-.long	0xbd42e8b0,0xbd42e8b0
-.long	0x888b8907,0x888b8907
-.long	0x385b19e7,0x385b19e7
-.long	0xdbeec879,0xdbeec879
-.long	0x470a7ca1,0x470a7ca1
-.long	0xe90f427c,0xe90f427c
-.long	0xc91e84f8,0xc91e84f8
-.long	0x00000000,0x00000000
-.long	0x83868009,0x83868009
-.long	0x48ed2b32,0x48ed2b32
-.long	0xac70111e,0xac70111e
-.long	0x4e725a6c,0x4e725a6c
-.long	0xfbff0efd,0xfbff0efd
-.long	0x5638850f,0x5638850f
-.long	0x1ed5ae3d,0x1ed5ae3d
-.long	0x27392d36,0x27392d36
-.long	0x64d90f0a,0x64d90f0a
-.long	0x21a65c68,0x21a65c68
-.long	0xd1545b9b,0xd1545b9b
-.long	0x3a2e3624,0x3a2e3624
-.long	0xb1670a0c,0xb1670a0c
-.long	0x0fe75793,0x0fe75793
-.long	0xd296eeb4,0xd296eeb4
-.long	0x9e919b1b,0x9e919b1b
-.long	0x4fc5c080,0x4fc5c080
-.long	0xa220dc61,0xa220dc61
-.long	0x694b775a,0x694b775a
-.long	0x161a121c,0x161a121c
-.long	0x0aba93e2,0x0aba93e2
-.long	0xe52aa0c0,0xe52aa0c0
-.long	0x43e0223c,0x43e0223c
-.long	0x1d171b12,0x1d171b12
-.long	0x0b0d090e,0x0b0d090e
-.long	0xadc78bf2,0xadc78bf2
-.long	0xb9a8b62d,0xb9a8b62d
-.long	0xc8a91e14,0xc8a91e14
-.long	0x8519f157,0x8519f157
-.long	0x4c0775af,0x4c0775af
-.long	0xbbdd99ee,0xbbdd99ee
-.long	0xfd607fa3,0xfd607fa3
-.long	0x9f2601f7,0x9f2601f7
-.long	0xbcf5725c,0xbcf5725c
-.long	0xc53b6644,0xc53b6644
-.long	0x347efb5b,0x347efb5b
-.long	0x7629438b,0x7629438b
-.long	0xdcc623cb,0xdcc623cb
-.long	0x68fcedb6,0x68fcedb6
-.long	0x63f1e4b8,0x63f1e4b8
-.long	0xcadc31d7,0xcadc31d7
-.long	0x10856342,0x10856342
-.long	0x40229713,0x40229713
-.long	0x2011c684,0x2011c684
-.long	0x7d244a85,0x7d244a85
-.long	0xf83dbbd2,0xf83dbbd2
-.long	0x1132f9ae,0x1132f9ae
-.long	0x6da129c7,0x6da129c7
-.long	0x4b2f9e1d,0x4b2f9e1d
-.long	0xf330b2dc,0xf330b2dc
-.long	0xec52860d,0xec52860d
-.long	0xd0e3c177,0xd0e3c177
-.long	0x6c16b32b,0x6c16b32b
-.long	0x99b970a9,0x99b970a9
-.long	0xfa489411,0xfa489411
-.long	0x2264e947,0x2264e947
-.long	0xc48cfca8,0xc48cfca8
-.long	0x1a3ff0a0,0x1a3ff0a0
-.long	0xd82c7d56,0xd82c7d56
-.long	0xef903322,0xef903322
-.long	0xc74e4987,0xc74e4987
-.long	0xc1d138d9,0xc1d138d9
-.long	0xfea2ca8c,0xfea2ca8c
-.long	0x360bd498,0x360bd498
-.long	0xcf81f5a6,0xcf81f5a6
-.long	0x28de7aa5,0x28de7aa5
-.long	0x268eb7da,0x268eb7da
-.long	0xa4bfad3f,0xa4bfad3f
-.long	0xe49d3a2c,0xe49d3a2c
-.long	0x0d927850,0x0d927850
-.long	0x9bcc5f6a,0x9bcc5f6a
-.long	0x62467e54,0x62467e54
-.long	0xc2138df6,0xc2138df6
-.long	0xe8b8d890,0xe8b8d890
-.long	0x5ef7392e,0x5ef7392e
-.long	0xf5afc382,0xf5afc382
-.long	0xbe805d9f,0xbe805d9f
-.long	0x7c93d069,0x7c93d069
-.long	0xa92dd56f,0xa92dd56f
-.long	0xb31225cf,0xb31225cf
-.long	0x3b99acc8,0x3b99acc8
-.long	0xa77d1810,0xa77d1810
-.long	0x6e639ce8,0x6e639ce8
-.long	0x7bbb3bdb,0x7bbb3bdb
-.long	0x097826cd,0x097826cd
-.long	0xf418596e,0xf418596e
-.long	0x01b79aec,0x01b79aec
-.long	0xa89a4f83,0xa89a4f83
-.long	0x656e95e6,0x656e95e6
-.long	0x7ee6ffaa,0x7ee6ffaa
-.long	0x08cfbc21,0x08cfbc21
-.long	0xe6e815ef,0xe6e815ef
-.long	0xd99be7ba,0xd99be7ba
-.long	0xce366f4a,0xce366f4a
-.long	0xd4099fea,0xd4099fea
-.long	0xd67cb029,0xd67cb029
-.long	0xafb2a431,0xafb2a431
-.long	0x31233f2a,0x31233f2a
-.long	0x3094a5c6,0x3094a5c6
-.long	0xc066a235,0xc066a235
-.long	0x37bc4e74,0x37bc4e74
-.long	0xa6ca82fc,0xa6ca82fc
-.long	0xb0d090e0,0xb0d090e0
-.long	0x15d8a733,0x15d8a733
-.long	0x4a9804f1,0x4a9804f1
-.long	0xf7daec41,0xf7daec41
-.long	0x0e50cd7f,0x0e50cd7f
-.long	0x2ff69117,0x2ff69117
-.long	0x8dd64d76,0x8dd64d76
-.long	0x4db0ef43,0x4db0ef43
-.long	0x544daacc,0x544daacc
-.long	0xdf0496e4,0xdf0496e4
-.long	0xe3b5d19e,0xe3b5d19e
-.long	0x1b886a4c,0x1b886a4c
-.long	0xb81f2cc1,0xb81f2cc1
-.long	0x7f516546,0x7f516546
-.long	0x04ea5e9d,0x04ea5e9d
-.long	0x5d358c01,0x5d358c01
-.long	0x737487fa,0x737487fa
-.long	0x2e410bfb,0x2e410bfb
-.long	0x5a1d67b3,0x5a1d67b3
-.long	0x52d2db92,0x52d2db92
-.long	0x335610e9,0x335610e9
-.long	0x1347d66d,0x1347d66d
-.long	0x8c61d79a,0x8c61d79a
-.long	0x7a0ca137,0x7a0ca137
-.long	0x8e14f859,0x8e14f859
-.long	0x893c13eb,0x893c13eb
-.long	0xee27a9ce,0xee27a9ce
-.long	0x35c961b7,0x35c961b7
-.long	0xede51ce1,0xede51ce1
-.long	0x3cb1477a,0x3cb1477a
-.long	0x59dfd29c,0x59dfd29c
-.long	0x3f73f255,0x3f73f255
-.long	0x79ce1418,0x79ce1418
-.long	0xbf37c773,0xbf37c773
-.long	0xeacdf753,0xeacdf753
-.long	0x5baafd5f,0x5baafd5f
-.long	0x146f3ddf,0x146f3ddf
-.long	0x86db4478,0x86db4478
-.long	0x81f3afca,0x81f3afca
-.long	0x3ec468b9,0x3ec468b9
-.long	0x2c342438,0x2c342438
-.long	0x5f40a3c2,0x5f40a3c2
-.long	0x72c31d16,0x72c31d16
-.long	0x0c25e2bc,0x0c25e2bc
-.long	0x8b493c28,0x8b493c28
-.long	0x41950dff,0x41950dff
-.long	0x7101a839,0x7101a839
-.long	0xdeb30c08,0xdeb30c08
-.long	0x9ce4b4d8,0x9ce4b4d8
-.long	0x90c15664,0x90c15664
-.long	0x6184cb7b,0x6184cb7b
-.long	0x70b632d5,0x70b632d5
-.long	0x745c6c48,0x745c6c48
-.long	0x4257b8d0,0x4257b8d0
-.byte	0x52,0x09,0x6a,0xd5,0x30,0x36,0xa5,0x38
-.byte	0xbf,0x40,0xa3,0x9e,0x81,0xf3,0xd7,0xfb
-.byte	0x7c,0xe3,0x39,0x82,0x9b,0x2f,0xff,0x87
-.byte	0x34,0x8e,0x43,0x44,0xc4,0xde,0xe9,0xcb
-.byte	0x54,0x7b,0x94,0x32,0xa6,0xc2,0x23,0x3d
-.byte	0xee,0x4c,0x95,0x0b,0x42,0xfa,0xc3,0x4e
-.byte	0x08,0x2e,0xa1,0x66,0x28,0xd9,0x24,0xb2
-.byte	0x76,0x5b,0xa2,0x49,0x6d,0x8b,0xd1,0x25
-.byte	0x72,0xf8,0xf6,0x64,0x86,0x68,0x98,0x16
-.byte	0xd4,0xa4,0x5c,0xcc,0x5d,0x65,0xb6,0x92
-.byte	0x6c,0x70,0x48,0x50,0xfd,0xed,0xb9,0xda
-.byte	0x5e,0x15,0x46,0x57,0xa7,0x8d,0x9d,0x84
-.byte	0x90,0xd8,0xab,0x00,0x8c,0xbc,0xd3,0x0a
-.byte	0xf7,0xe4,0x58,0x05,0xb8,0xb3,0x45,0x06
-.byte	0xd0,0x2c,0x1e,0x8f,0xca,0x3f,0x0f,0x02
-.byte	0xc1,0xaf,0xbd,0x03,0x01,0x13,0x8a,0x6b
-.byte	0x3a,0x91,0x11,0x41,0x4f,0x67,0xdc,0xea
-.byte	0x97,0xf2,0xcf,0xce,0xf0,0xb4,0xe6,0x73
-.byte	0x96,0xac,0x74,0x22,0xe7,0xad,0x35,0x85
-.byte	0xe2,0xf9,0x37,0xe8,0x1c,0x75,0xdf,0x6e
-.byte	0x47,0xf1,0x1a,0x71,0x1d,0x29,0xc5,0x89
-.byte	0x6f,0xb7,0x62,0x0e,0xaa,0x18,0xbe,0x1b
-.byte	0xfc,0x56,0x3e,0x4b,0xc6,0xd2,0x79,0x20
-.byte	0x9a,0xdb,0xc0,0xfe,0x78,0xcd,0x5a,0xf4
-.byte	0x1f,0xdd,0xa8,0x33,0x88,0x07,0xc7,0x31
-.byte	0xb1,0x12,0x10,0x59,0x27,0x80,0xec,0x5f
-.byte	0x60,0x51,0x7f,0xa9,0x19,0xb5,0x4a,0x0d
-.byte	0x2d,0xe5,0x7a,0x9f,0x93,0xc9,0x9c,0xef
-.byte	0xa0,0xe0,0x3b,0x4d,0xae,0x2a,0xf5,0xb0
-.byte	0xc8,0xeb,0xbb,0x3c,0x83,0x53,0x99,0x61
-.byte	0x17,0x2b,0x04,0x7e,0xba,0x77,0xd6,0x26
-.byte	0xe1,0x69,0x14,0x63,0x55,0x21,0x0c,0x7d
-.long	0x80808080, 0x80808080, 0xfefefefe, 0xfefefefe
-.long	0x1b1b1b1b, 0x1b1b1b1b, 0, 0
-.byte	0x52,0x09,0x6a,0xd5,0x30,0x36,0xa5,0x38
-.byte	0xbf,0x40,0xa3,0x9e,0x81,0xf3,0xd7,0xfb
-.byte	0x7c,0xe3,0x39,0x82,0x9b,0x2f,0xff,0x87
-.byte	0x34,0x8e,0x43,0x44,0xc4,0xde,0xe9,0xcb
-.byte	0x54,0x7b,0x94,0x32,0xa6,0xc2,0x23,0x3d
-.byte	0xee,0x4c,0x95,0x0b,0x42,0xfa,0xc3,0x4e
-.byte	0x08,0x2e,0xa1,0x66,0x28,0xd9,0x24,0xb2
-.byte	0x76,0x5b,0xa2,0x49,0x6d,0x8b,0xd1,0x25
-.byte	0x72,0xf8,0xf6,0x64,0x86,0x68,0x98,0x16
-.byte	0xd4,0xa4,0x5c,0xcc,0x5d,0x65,0xb6,0x92
-.byte	0x6c,0x70,0x48,0x50,0xfd,0xed,0xb9,0xda
-.byte	0x5e,0x15,0x46,0x57,0xa7,0x8d,0x9d,0x84
-.byte	0x90,0xd8,0xab,0x00,0x8c,0xbc,0xd3,0x0a
-.byte	0xf7,0xe4,0x58,0x05,0xb8,0xb3,0x45,0x06
-.byte	0xd0,0x2c,0x1e,0x8f,0xca,0x3f,0x0f,0x02
-.byte	0xc1,0xaf,0xbd,0x03,0x01,0x13,0x8a,0x6b
-.byte	0x3a,0x91,0x11,0x41,0x4f,0x67,0xdc,0xea
-.byte	0x97,0xf2,0xcf,0xce,0xf0,0xb4,0xe6,0x73
-.byte	0x96,0xac,0x74,0x22,0xe7,0xad,0x35,0x85
-.byte	0xe2,0xf9,0x37,0xe8,0x1c,0x75,0xdf,0x6e
-.byte	0x47,0xf1,0x1a,0x71,0x1d,0x29,0xc5,0x89
-.byte	0x6f,0xb7,0x62,0x0e,0xaa,0x18,0xbe,0x1b
-.byte	0xfc,0x56,0x3e,0x4b,0xc6,0xd2,0x79,0x20
-.byte	0x9a,0xdb,0xc0,0xfe,0x78,0xcd,0x5a,0xf4
-.byte	0x1f,0xdd,0xa8,0x33,0x88,0x07,0xc7,0x31
-.byte	0xb1,0x12,0x10,0x59,0x27,0x80,0xec,0x5f
-.byte	0x60,0x51,0x7f,0xa9,0x19,0xb5,0x4a,0x0d
-.byte	0x2d,0xe5,0x7a,0x9f,0x93,0xc9,0x9c,0xef
-.byte	0xa0,0xe0,0x3b,0x4d,0xae,0x2a,0xf5,0xb0
-.byte	0xc8,0xeb,0xbb,0x3c,0x83,0x53,0x99,0x61
-.byte	0x17,0x2b,0x04,0x7e,0xba,0x77,0xd6,0x26
-.byte	0xe1,0x69,0x14,0x63,0x55,0x21,0x0c,0x7d
-.long	0x80808080, 0x80808080, 0xfefefefe, 0xfefefefe
-.long	0x1b1b1b1b, 0x1b1b1b1b, 0, 0
-.byte	0x52,0x09,0x6a,0xd5,0x30,0x36,0xa5,0x38
-.byte	0xbf,0x40,0xa3,0x9e,0x81,0xf3,0xd7,0xfb
-.byte	0x7c,0xe3,0x39,0x82,0x9b,0x2f,0xff,0x87
-.byte	0x34,0x8e,0x43,0x44,0xc4,0xde,0xe9,0xcb
-.byte	0x54,0x7b,0x94,0x32,0xa6,0xc2,0x23,0x3d
-.byte	0xee,0x4c,0x95,0x0b,0x42,0xfa,0xc3,0x4e
-.byte	0x08,0x2e,0xa1,0x66,0x28,0xd9,0x24,0xb2
-.byte	0x76,0x5b,0xa2,0x49,0x6d,0x8b,0xd1,0x25
-.byte	0x72,0xf8,0xf6,0x64,0x86,0x68,0x98,0x16
-.byte	0xd4,0xa4,0x5c,0xcc,0x5d,0x65,0xb6,0x92
-.byte	0x6c,0x70,0x48,0x50,0xfd,0xed,0xb9,0xda
-.byte	0x5e,0x15,0x46,0x57,0xa7,0x8d,0x9d,0x84
-.byte	0x90,0xd8,0xab,0x00,0x8c,0xbc,0xd3,0x0a
-.byte	0xf7,0xe4,0x58,0x05,0xb8,0xb3,0x45,0x06
-.byte	0xd0,0x2c,0x1e,0x8f,0xca,0x3f,0x0f,0x02
-.byte	0xc1,0xaf,0xbd,0x03,0x01,0x13,0x8a,0x6b
-.byte	0x3a,0x91,0x11,0x41,0x4f,0x67,0xdc,0xea
-.byte	0x97,0xf2,0xcf,0xce,0xf0,0xb4,0xe6,0x73
-.byte	0x96,0xac,0x74,0x22,0xe7,0xad,0x35,0x85
-.byte	0xe2,0xf9,0x37,0xe8,0x1c,0x75,0xdf,0x6e
-.byte	0x47,0xf1,0x1a,0x71,0x1d,0x29,0xc5,0x89
-.byte	0x6f,0xb7,0x62,0x0e,0xaa,0x18,0xbe,0x1b
-.byte	0xfc,0x56,0x3e,0x4b,0xc6,0xd2,0x79,0x20
-.byte	0x9a,0xdb,0xc0,0xfe,0x78,0xcd,0x5a,0xf4
-.byte	0x1f,0xdd,0xa8,0x33,0x88,0x07,0xc7,0x31
-.byte	0xb1,0x12,0x10,0x59,0x27,0x80,0xec,0x5f
-.byte	0x60,0x51,0x7f,0xa9,0x19,0xb5,0x4a,0x0d
-.byte	0x2d,0xe5,0x7a,0x9f,0x93,0xc9,0x9c,0xef
-.byte	0xa0,0xe0,0x3b,0x4d,0xae,0x2a,0xf5,0xb0
-.byte	0xc8,0xeb,0xbb,0x3c,0x83,0x53,0x99,0x61
-.byte	0x17,0x2b,0x04,0x7e,0xba,0x77,0xd6,0x26
-.byte	0xe1,0x69,0x14,0x63,0x55,0x21,0x0c,0x7d
-.long	0x80808080, 0x80808080, 0xfefefefe, 0xfefefefe
-.long	0x1b1b1b1b, 0x1b1b1b1b, 0, 0
-.byte	0x52,0x09,0x6a,0xd5,0x30,0x36,0xa5,0x38
-.byte	0xbf,0x40,0xa3,0x9e,0x81,0xf3,0xd7,0xfb
-.byte	0x7c,0xe3,0x39,0x82,0x9b,0x2f,0xff,0x87
-.byte	0x34,0x8e,0x43,0x44,0xc4,0xde,0xe9,0xcb
-.byte	0x54,0x7b,0x94,0x32,0xa6,0xc2,0x23,0x3d
-.byte	0xee,0x4c,0x95,0x0b,0x42,0xfa,0xc3,0x4e
-.byte	0x08,0x2e,0xa1,0x66,0x28,0xd9,0x24,0xb2
-.byte	0x76,0x5b,0xa2,0x49,0x6d,0x8b,0xd1,0x25
-.byte	0x72,0xf8,0xf6,0x64,0x86,0x68,0x98,0x16
-.byte	0xd4,0xa4,0x5c,0xcc,0x5d,0x65,0xb6,0x92
-.byte	0x6c,0x70,0x48,0x50,0xfd,0xed,0xb9,0xda
-.byte	0x5e,0x15,0x46,0x57,0xa7,0x8d,0x9d,0x84
-.byte	0x90,0xd8,0xab,0x00,0x8c,0xbc,0xd3,0x0a
-.byte	0xf7,0xe4,0x58,0x05,0xb8,0xb3,0x45,0x06
-.byte	0xd0,0x2c,0x1e,0x8f,0xca,0x3f,0x0f,0x02
-.byte	0xc1,0xaf,0xbd,0x03,0x01,0x13,0x8a,0x6b
-.byte	0x3a,0x91,0x11,0x41,0x4f,0x67,0xdc,0xea
-.byte	0x97,0xf2,0xcf,0xce,0xf0,0xb4,0xe6,0x73
-.byte	0x96,0xac,0x74,0x22,0xe7,0xad,0x35,0x85
-.byte	0xe2,0xf9,0x37,0xe8,0x1c,0x75,0xdf,0x6e
-.byte	0x47,0xf1,0x1a,0x71,0x1d,0x29,0xc5,0x89
-.byte	0x6f,0xb7,0x62,0x0e,0xaa,0x18,0xbe,0x1b
-.byte	0xfc,0x56,0x3e,0x4b,0xc6,0xd2,0x79,0x20
-.byte	0x9a,0xdb,0xc0,0xfe,0x78,0xcd,0x5a,0xf4
-.byte	0x1f,0xdd,0xa8,0x33,0x88,0x07,0xc7,0x31
-.byte	0xb1,0x12,0x10,0x59,0x27,0x80,0xec,0x5f
-.byte	0x60,0x51,0x7f,0xa9,0x19,0xb5,0x4a,0x0d
-.byte	0x2d,0xe5,0x7a,0x9f,0x93,0xc9,0x9c,0xef
-.byte	0xa0,0xe0,0x3b,0x4d,0xae,0x2a,0xf5,0xb0
-.byte	0xc8,0xeb,0xbb,0x3c,0x83,0x53,0x99,0x61
-.byte	0x17,0x2b,0x04,0x7e,0xba,0x77,0xd6,0x26
-.byte	0xe1,0x69,0x14,0x63,0x55,0x21,0x0c,0x7d
-.long	0x80808080, 0x80808080, 0xfefefefe, 0xfefefefe
-.long	0x1b1b1b1b, 0x1b1b1b1b, 0, 0
-.byte	65,69,83,32,102,111,114,32,120,56,54,95,54,52,44,32,67,82,89,80,84,79,71,65,77,83,32,98,121,32,60,97,112,112,114,111,64,111,112,101,110,115,115,108,46,111,114,103,62,0
-.align	64
diff --git a/deps/openssl/config/archs/BSD-x86_64/asm_avx2/crypto/aes/aesni-sha1-x86_64.s b/deps/openssl/config/archs/BSD-x86_64/asm_avx2/crypto/aes/aesni-sha1-x86_64.s
index 4d2dfe4489..978bd2b623 100644
--- a/deps/openssl/config/archs/BSD-x86_64/asm_avx2/crypto/aes/aesni-sha1-x86_64.s
+++ b/deps/openssl/config/archs/BSD-x86_64/asm_avx2/crypto/aes/aesni-sha1-x86_64.s
@@ -5,6 +5,7 @@
 .type	aesni_cbc_sha1_enc,@function
 .align	32
 aesni_cbc_sha1_enc:
+.cfi_startproc
 
 	movl	OPENSSL_ia32cap_P+0(%rip),%r10d
 	movq	OPENSSL_ia32cap_P+4(%rip),%r11
@@ -17,6 +18,7 @@ aesni_cbc_sha1_enc:
 	je	aesni_cbc_sha1_enc_avx
 	jmp	aesni_cbc_sha1_enc_ssse3
 	.byte	0xf3,0xc3
+.cfi_endproc
 .size	aesni_cbc_sha1_enc,.-aesni_cbc_sha1_enc
 .type	aesni_cbc_sha1_enc_ssse3,@function
 .align	32
@@ -2730,6 +2732,7 @@ K_XX_XX:
 .type	aesni_cbc_sha1_enc_shaext,@function
 .align	32
 aesni_cbc_sha1_enc_shaext:
+.cfi_startproc
 	movq	8(%rsp),%r10
 	movdqu	(%r9),%xmm8
 	movd	16(%r9),%xmm9
@@ -3028,4 +3031,5 @@ aesni_cbc_sha1_enc_shaext:
 	movdqu	%xmm8,(%r9)
 	movd	%xmm9,16(%r9)
 	.byte	0xf3,0xc3
+.cfi_endproc
 .size	aesni_cbc_sha1_enc_shaext,.-aesni_cbc_sha1_enc_shaext
diff --git a/deps/openssl/config/archs/BSD-x86_64/asm_avx2/crypto/aes/aesni-sha256-x86_64.s b/deps/openssl/config/archs/BSD-x86_64/asm_avx2/crypto/aes/aesni-sha256-x86_64.s
index 5a47b3ee51..dd09f1b290 100644
--- a/deps/openssl/config/archs/BSD-x86_64/asm_avx2/crypto/aes/aesni-sha256-x86_64.s
+++ b/deps/openssl/config/archs/BSD-x86_64/asm_avx2/crypto/aes/aesni-sha256-x86_64.s
@@ -5,6 +5,7 @@
 .type	aesni_cbc_sha256_enc,@function
 .align	16
 aesni_cbc_sha256_enc:
+.cfi_startproc
 	leaq	OPENSSL_ia32cap_P(%rip),%r11
 	movl	$1,%eax
 	cmpq	$0,%rdi
@@ -30,6 +31,7 @@ aesni_cbc_sha256_enc:
 	ud2
 .Lprobe:
 	.byte	0xf3,0xc3
+.cfi_endproc
 .size	aesni_cbc_sha256_enc,.-aesni_cbc_sha256_enc
 
 .align	64
@@ -2528,7 +2530,15 @@ aesni_cbc_sha256_enc_avx2:
 	vmovdqa	%ymm4,0(%rsp)
 	xorl	%r14d,%r14d
 	vmovdqa	%ymm5,32(%rsp)
+
+	movq	120(%rsp),%rsi
+.cfi_def_cfa	%rsi,8
 	leaq	-64(%rsp),%rsp
+
+
+
+	movq	%rsi,-8(%rsp)
+.cfi_escape	0x0f,0x05,0x77,0x78,0x06,0x23,0x08
 	movl	%ebx,%esi
 	vmovdqa	%ymm6,0(%rsp)
 	xorl	%ecx,%esi
@@ -2542,6 +2552,12 @@ aesni_cbc_sha256_enc_avx2:
 	vmovdqu	(%r13),%xmm9
 	vpinsrq	$0,%r13,%xmm15,%xmm15
 	leaq	-64(%rsp),%rsp
+.cfi_escape	0x0f,0x05,0x77,0x38,0x06,0x23,0x08
+
+	pushq	64-8(%rsp)
+.cfi_escape	0x0f,0x05,0x77,0x00,0x06,0x23,0x08
+	leaq	8(%rsp),%rsp
+.cfi_escape	0x0f,0x05,0x77,0x78,0x06,0x23,0x08
 	vpalignr	$4,%ymm0,%ymm1,%ymm4
 	addl	0+128(%rsp),%r11d
 	andl	%r8d,%r12d
@@ -2816,6 +2832,12 @@ aesni_cbc_sha256_enc_avx2:
 	movl	%r9d,%r12d
 	vmovdqa	%ymm6,32(%rsp)
 	leaq	-64(%rsp),%rsp
+.cfi_escape	0x0f,0x05,0x77,0x38,0x06,0x23,0x08
+
+	pushq	64-8(%rsp)
+.cfi_escape	0x0f,0x05,0x77,0x00,0x06,0x23,0x08
+	leaq	8(%rsp),%rsp
+.cfi_escape	0x0f,0x05,0x77,0x78,0x06,0x23,0x08
 	vpalignr	$4,%ymm2,%ymm3,%ymm4
 	addl	0+128(%rsp),%r11d
 	andl	%r8d,%r12d
@@ -4029,10 +4051,12 @@ aesni_cbc_sha256_enc_avx2:
 	jbe	.Loop_avx2
 	leaq	(%rsp),%rbp
 
+
+.cfi_escape	0x0f,0x06,0x76,0xf8,0x00,0x06,0x23,0x08
+
 .Ldone_avx2:
-	leaq	(%rbp),%rsp
-	movq	64+32(%rsp),%r8
-	movq	120(%rsp),%rsi
+	movq	64+32(%rbp),%r8
+	movq	64+56(%rbp),%rsi
 .cfi_def_cfa	%rsi,8
 	vmovdqu	%xmm8,(%r8)
 	vzeroall
@@ -4057,6 +4081,7 @@ aesni_cbc_sha256_enc_avx2:
 .type	aesni_cbc_sha256_enc_shaext,@function
 .align	32
 aesni_cbc_sha256_enc_shaext:
+.cfi_startproc
 	movq	8(%rsp),%r10
 	leaq	K256+128(%rip),%rax
 	movdqu	(%r9),%xmm1
@@ -4406,4 +4431,5 @@ aesni_cbc_sha256_enc_shaext:
 	movdqu	%xmm1,(%r9)
 	movdqu	%xmm2,16(%r9)
 	.byte	0xf3,0xc3
+.cfi_endproc
 .size	aesni_cbc_sha256_enc_shaext,.-aesni_cbc_sha256_enc_shaext
diff --git a/deps/openssl/config/archs/BSD-x86_64/asm_avx2/crypto/aes/aesni-x86_64.s b/deps/openssl/config/archs/BSD-x86_64/asm_avx2/crypto/aes/aesni-x86_64.s
index 2986a647c1..c1e791eff5 100644
--- a/deps/openssl/config/archs/BSD-x86_64/asm_avx2/crypto/aes/aesni-x86_64.s
+++ b/deps/openssl/config/archs/BSD-x86_64/asm_avx2/crypto/aes/aesni-x86_64.s
@@ -861,6 +861,7 @@ aesni_ecb_encrypt:
 .type	aesni_ccm64_encrypt_blocks,@function
 .align	16
 aesni_ccm64_encrypt_blocks:
+.cfi_startproc
 	movl	240(%rcx),%eax
 	movdqu	(%r8),%xmm6
 	movdqa	.Lincrement64(%rip),%xmm9
@@ -919,11 +920,13 @@ aesni_ccm64_encrypt_blocks:
 	pxor	%xmm8,%xmm8
 	pxor	%xmm6,%xmm6
 	.byte	0xf3,0xc3
+.cfi_endproc
 .size	aesni_ccm64_encrypt_blocks,.-aesni_ccm64_encrypt_blocks
 .globl	aesni_ccm64_decrypt_blocks
 .type	aesni_ccm64_decrypt_blocks,@function
 .align	16
 aesni_ccm64_decrypt_blocks:
+.cfi_startproc
 	movl	240(%rcx),%eax
 	movups	(%r8),%xmm6
 	movdqu	(%r9),%xmm3
@@ -1016,6 +1019,7 @@ aesni_ccm64_decrypt_blocks:
 	pxor	%xmm8,%xmm8
 	pxor	%xmm6,%xmm6
 	.byte	0xf3,0xc3
+.cfi_endproc
 .size	aesni_ccm64_decrypt_blocks,.-aesni_ccm64_decrypt_blocks
 .globl	aesni_ctr32_encrypt_blocks
 .type	aesni_ctr32_encrypt_blocks,@function
@@ -2790,6 +2794,7 @@ aesni_ocb_encrypt:
 .type	__ocb_encrypt6,@function
 .align	32
 __ocb_encrypt6:
+.cfi_startproc
 	pxor	%xmm9,%xmm15
 	movdqu	(%rbx,%r12,1),%xmm11
 	movdqa	%xmm10,%xmm12
@@ -2887,11 +2892,13 @@ __ocb_encrypt6:
 .byte	102,65,15,56,221,246
 .byte	102,65,15,56,221,255
 	.byte	0xf3,0xc3
+.cfi_endproc
 .size	__ocb_encrypt6,.-__ocb_encrypt6
 
 .type	__ocb_encrypt4,@function
 .align	32
 __ocb_encrypt4:
+.cfi_startproc
 	pxor	%xmm9,%xmm15
 	movdqu	(%rbx,%r12,1),%xmm11
 	movdqa	%xmm10,%xmm12
@@ -2956,11 +2963,13 @@ __ocb_encrypt4:
 .byte	102,65,15,56,221,228
 .byte	102,65,15,56,221,237
 	.byte	0xf3,0xc3
+.cfi_endproc
 .size	__ocb_encrypt4,.-__ocb_encrypt4
 
 .type	__ocb_encrypt1,@function
 .align	32
 __ocb_encrypt1:
+.cfi_startproc
 	pxor	%xmm15,%xmm7
 	pxor	%xmm9,%xmm7
 	pxor	%xmm2,%xmm8
@@ -2991,6 +3000,7 @@ __ocb_encrypt1:
 
 .byte	102,15,56,221,215
 	.byte	0xf3,0xc3
+.cfi_endproc
 .size	__ocb_encrypt1,.-__ocb_encrypt1
 
 .globl	aesni_ocb_decrypt
@@ -3233,6 +3243,7 @@ aesni_ocb_decrypt:
 .type	__ocb_decrypt6,@function
 .align	32
 __ocb_decrypt6:
+.cfi_startproc
 	pxor	%xmm9,%xmm15
 	movdqu	(%rbx,%r12,1),%xmm11
 	movdqa	%xmm10,%xmm12
@@ -3324,11 +3335,13 @@ __ocb_decrypt6:
 .byte	102,65,15,56,223,246
 .byte	102,65,15,56,223,255
 	.byte	0xf3,0xc3
+.cfi_endproc
 .size	__ocb_decrypt6,.-__ocb_decrypt6
 
 .type	__ocb_decrypt4,@function
 .align	32
 __ocb_decrypt4:
+.cfi_startproc
 	pxor	%xmm9,%xmm15
 	movdqu	(%rbx,%r12,1),%xmm11
 	movdqa	%xmm10,%xmm12
@@ -3389,11 +3402,13 @@ __ocb_decrypt4:
 .byte	102,65,15,56,223,228
 .byte	102,65,15,56,223,237
 	.byte	0xf3,0xc3
+.cfi_endproc
 .size	__ocb_decrypt4,.-__ocb_decrypt4
 
 .type	__ocb_decrypt1,@function
 .align	32
 __ocb_decrypt1:
+.cfi_startproc
 	pxor	%xmm15,%xmm7
 	pxor	%xmm9,%xmm7
 	pxor	%xmm7,%xmm2
@@ -3423,6 +3438,7 @@ __ocb_decrypt1:
 
 .byte	102,15,56,223,215
 	.byte	0xf3,0xc3
+.cfi_endproc
 .size	__ocb_decrypt1,.-__ocb_decrypt1
 .globl	aesni_cbc_encrypt
 .type	aesni_cbc_encrypt,@function
@@ -4361,7 +4377,6 @@ __aesni_set_encrypt_key:
 	addq	$8,%rsp
 .cfi_adjust_cfa_offset	-8
 	.byte	0xf3,0xc3
-.cfi_endproc	
 .LSEH_end_set_encrypt_key:
 
 .align	16
@@ -4432,6 +4447,7 @@ __aesni_set_encrypt_key:
 	shufps	$170,%xmm1,%xmm1
 	xorps	%xmm1,%xmm2
 	.byte	0xf3,0xc3
+.cfi_endproc
 .size	aesni_set_encrypt_key,.-aesni_set_encrypt_key
 .size	__aesni_set_encrypt_key,.-__aesni_set_encrypt_key
 .align	64
diff --git a/deps/openssl/config/archs/BSD-x86_64/asm_avx2/crypto/aes/bsaes-x86_64.s b/deps/openssl/config/archs/BSD-x86_64/asm_avx2/crypto/aes/bsaes-x86_64.s
deleted file mode 100644
index e1f3abadbc..0000000000
--- a/deps/openssl/config/archs/BSD-x86_64/asm_avx2/crypto/aes/bsaes-x86_64.s
+++ /dev/null
@@ -1,2595 +0,0 @@
-.text	
-
-
-
-
-.type	_bsaes_encrypt8,@function
-.align	64
-_bsaes_encrypt8:
-.cfi_startproc	
-	leaq	.LBS0(%rip),%r11
-
-	movdqa	(%rax),%xmm8
-	leaq	16(%rax),%rax
-	movdqa	80(%r11),%xmm7
-	pxor	%xmm8,%xmm15
-	pxor	%xmm8,%xmm0
-	pxor	%xmm8,%xmm1
-	pxor	%xmm8,%xmm2
-.byte	102,68,15,56,0,255
-.byte	102,15,56,0,199
-	pxor	%xmm8,%xmm3
-	pxor	%xmm8,%xmm4
-.byte	102,15,56,0,207
-.byte	102,15,56,0,215
-	pxor	%xmm8,%xmm5
-	pxor	%xmm8,%xmm6
-.byte	102,15,56,0,223
-.byte	102,15,56,0,231
-.byte	102,15,56,0,239
-.byte	102,15,56,0,247
-_bsaes_encrypt8_bitslice:
-	movdqa	0(%r11),%xmm7
-	movdqa	16(%r11),%xmm8
-	movdqa	%xmm5,%xmm9
-	psrlq	$1,%xmm5
-	movdqa	%xmm3,%xmm10
-	psrlq	$1,%xmm3
-	pxor	%xmm6,%xmm5
-	pxor	%xmm4,%xmm3
-	pand	%xmm7,%xmm5
-	pand	%xmm7,%xmm3
-	pxor	%xmm5,%xmm6
-	psllq	$1,%xmm5
-	pxor	%xmm3,%xmm4
-	psllq	$1,%xmm3
-	pxor	%xmm9,%xmm5
-	pxor	%xmm10,%xmm3
-	movdqa	%xmm1,%xmm9
-	psrlq	$1,%xmm1
-	movdqa	%xmm15,%xmm10
-	psrlq	$1,%xmm15
-	pxor	%xmm2,%xmm1
-	pxor	%xmm0,%xmm15
-	pand	%xmm7,%xmm1
-	pand	%xmm7,%xmm15
-	pxor	%xmm1,%xmm2
-	psllq	$1,%xmm1
-	pxor	%xmm15,%xmm0
-	psllq	$1,%xmm15
-	pxor	%xmm9,%xmm1
-	pxor	%xmm10,%xmm15
-	movdqa	32(%r11),%xmm7
-	movdqa	%xmm4,%xmm9
-	psrlq	$2,%xmm4
-	movdqa	%xmm3,%xmm10
-	psrlq	$2,%xmm3
-	pxor	%xmm6,%xmm4
-	pxor	%xmm5,%xmm3
-	pand	%xmm8,%xmm4
-	pand	%xmm8,%xmm3
-	pxor	%xmm4,%xmm6
-	psllq	$2,%xmm4
-	pxor	%xmm3,%xmm5
-	psllq	$2,%xmm3
-	pxor	%xmm9,%xmm4
-	pxor	%xmm10,%xmm3
-	movdqa	%xmm0,%xmm9
-	psrlq	$2,%xmm0
-	movdqa	%xmm15,%xmm10
-	psrlq	$2,%xmm15
-	pxor	%xmm2,%xmm0
-	pxor	%xmm1,%xmm15
-	pand	%xmm8,%xmm0
-	pand	%xmm8,%xmm15
-	pxor	%xmm0,%xmm2
-	psllq	$2,%xmm0
-	pxor	%xmm15,%xmm1
-	psllq	$2,%xmm15
-	pxor	%xmm9,%xmm0
-	pxor	%xmm10,%xmm15
-	movdqa	%xmm2,%xmm9
-	psrlq	$4,%xmm2
-	movdqa	%xmm1,%xmm10
-	psrlq	$4,%xmm1
-	pxor	%xmm6,%xmm2
-	pxor	%xmm5,%xmm1
-	pand	%xmm7,%xmm2
-	pand	%xmm7,%xmm1
-	pxor	%xmm2,%xmm6
-	psllq	$4,%xmm2
-	pxor	%xmm1,%xmm5
-	psllq	$4,%xmm1
-	pxor	%xmm9,%xmm2
-	pxor	%xmm10,%xmm1
-	movdqa	%xmm0,%xmm9
-	psrlq	$4,%xmm0
-	movdqa	%xmm15,%xmm10
-	psrlq	$4,%xmm15
-	pxor	%xmm4,%xmm0
-	pxor	%xmm3,%xmm15
-	pand	%xmm7,%xmm0
-	pand	%xmm7,%xmm15
-	pxor	%xmm0,%xmm4
-	psllq	$4,%xmm0
-	pxor	%xmm15,%xmm3
-	psllq	$4,%xmm15
-	pxor	%xmm9,%xmm0
-	pxor	%xmm10,%xmm15
-	decl	%r10d
-	jmp	.Lenc_sbox
-.align	16
-.Lenc_loop:
-	pxor	0(%rax),%xmm15
-	pxor	16(%rax),%xmm0
-	pxor	32(%rax),%xmm1
-	pxor	48(%rax),%xmm2
-.byte	102,68,15,56,0,255
-.byte	102,15,56,0,199
-	pxor	64(%rax),%xmm3
-	pxor	80(%rax),%xmm4
-.byte	102,15,56,0,207
-.byte	102,15,56,0,215
-	pxor	96(%rax),%xmm5
-	pxor	112(%rax),%xmm6
-.byte	102,15,56,0,223
-.byte	102,15,56,0,231
-.byte	102,15,56,0,239
-.byte	102,15,56,0,247
-	leaq	128(%rax),%rax
-.Lenc_sbox:
-	pxor	%xmm5,%xmm4
-	pxor	%xmm0,%xmm1
-	pxor	%xmm15,%xmm2
-	pxor	%xmm1,%xmm5
-	pxor	%xmm15,%xmm4
-
-	pxor	%xmm2,%xmm5
-	pxor	%xmm6,%xmm2
-	pxor	%xmm4,%xmm6
-	pxor	%xmm3,%xmm2
-	pxor	%xmm4,%xmm3
-	pxor	%xmm0,%xmm2
-
-	pxor	%xmm6,%xmm1
-	pxor	%xmm4,%xmm0
-	movdqa	%xmm6,%xmm10
-	movdqa	%xmm0,%xmm9
-	movdqa	%xmm4,%xmm8
-	movdqa	%xmm1,%xmm12
-	movdqa	%xmm5,%xmm11
-
-	pxor	%xmm3,%xmm10
-	pxor	%xmm1,%xmm9
-	pxor	%xmm2,%xmm8
-	movdqa	%xmm10,%xmm13
-	pxor	%xmm3,%xmm12
-	movdqa	%xmm9,%xmm7
-	pxor	%xmm15,%xmm11
-	movdqa	%xmm10,%xmm14
-
-	por	%xmm8,%xmm9
-	por	%xmm11,%xmm10
-	pxor	%xmm7,%xmm14
-	pand	%xmm11,%xmm13
-	pxor	%xmm8,%xmm11
-	pand	%xmm8,%xmm7
-	pand	%xmm11,%xmm14
-	movdqa	%xmm2,%xmm11
-	pxor	%xmm15,%xmm11
-	pand	%xmm11,%xmm12
-	pxor	%xmm12,%xmm10
-	pxor	%xmm12,%xmm9
-	movdqa	%xmm6,%xmm12
-	movdqa	%xmm4,%xmm11
-	pxor	%xmm0,%xmm12
-	pxor	%xmm5,%xmm11
-	movdqa	%xmm12,%xmm8
-	pand	%xmm11,%xmm12
-	por	%xmm11,%xmm8
-	pxor	%xmm12,%xmm7
-	pxor	%xmm14,%xmm10
-	pxor	%xmm13,%xmm9
-	pxor	%xmm14,%xmm8
-	movdqa	%xmm1,%xmm11
-	pxor	%xmm13,%xmm7
-	movdqa	%xmm3,%xmm12
-	pxor	%xmm13,%xmm8
-	movdqa	%xmm0,%xmm13
-	pand	%xmm2,%xmm11
-	movdqa	%xmm6,%xmm14
-	pand	%xmm15,%xmm12
-	pand	%xmm4,%xmm13
-	por	%xmm5,%xmm14
-	pxor	%xmm11,%xmm10
-	pxor	%xmm12,%xmm9
-	pxor	%xmm13,%xmm8
-	pxor	%xmm14,%xmm7
-
-
-
-
-
-	movdqa	%xmm10,%xmm11
-	pand	%xmm8,%xmm10
-	pxor	%xmm9,%xmm11
-
-	movdqa	%xmm7,%xmm13
-	movdqa	%xmm11,%xmm14
-	pxor	%xmm10,%xmm13
-	pand	%xmm13,%xmm14
-
-	movdqa	%xmm8,%xmm12
-	pxor	%xmm9,%xmm14
-	pxor	%xmm7,%xmm12
-
-	pxor	%xmm9,%xmm10
-
-	pand	%xmm10,%xmm12
-
-	movdqa	%xmm13,%xmm9
-	pxor	%xmm7,%xmm12
-
-	pxor	%xmm12,%xmm9
-	pxor	%xmm12,%xmm8
-
-	pand	%xmm7,%xmm9
-
-	pxor	%xmm9,%xmm13
-	pxor	%xmm9,%xmm8
-
-	pand	%xmm14,%xmm13
-
-	pxor	%xmm11,%xmm13
-	movdqa	%xmm5,%xmm11
-	movdqa	%xmm4,%xmm7
-	movdqa	%xmm14,%xmm9
-	pxor	%xmm13,%xmm9
-	pand	%xmm5,%xmm9
-	pxor	%xmm4,%xmm5
-	pand	%xmm14,%xmm4
-	pand	%xmm13,%xmm5
-	pxor	%xmm4,%xmm5
-	pxor	%xmm9,%xmm4
-	pxor	%xmm15,%xmm11
-	pxor	%xmm2,%xmm7
-	pxor	%xmm12,%xmm14
-	pxor	%xmm8,%xmm13
-	movdqa	%xmm14,%xmm10
-	movdqa	%xmm12,%xmm9
-	pxor	%xmm13,%xmm10
-	pxor	%xmm8,%xmm9
-	pand	%xmm11,%xmm10
-	pand	%xmm15,%xmm9
-	pxor	%xmm7,%xmm11
-	pxor	%xmm2,%xmm15
-	pand	%xmm14,%xmm7
-	pand	%xmm12,%xmm2
-	pand	%xmm13,%xmm11
-	pand	%xmm8,%xmm15
-	pxor	%xmm11,%xmm7
-	pxor	%xmm2,%xmm15
-	pxor	%xmm10,%xmm11
-	pxor	%xmm9,%xmm2
-	pxor	%xmm11,%xmm5
-	pxor	%xmm11,%xmm15
-	pxor	%xmm7,%xmm4
-	pxor	%xmm7,%xmm2
-
-	movdqa	%xmm6,%xmm11
-	movdqa	%xmm0,%xmm7
-	pxor	%xmm3,%xmm11
-	pxor	%xmm1,%xmm7
-	movdqa	%xmm14,%xmm10
-	movdqa	%xmm12,%xmm9
-	pxor	%xmm13,%xmm10
-	pxor	%xmm8,%xmm9
-	pand	%xmm11,%xmm10
-	pand	%xmm3,%xmm9
-	pxor	%xmm7,%xmm11
-	pxor	%xmm1,%xmm3
-	pand	%xmm14,%xmm7
-	pand	%xmm12,%xmm1
-	pand	%xmm13,%xmm11
-	pand	%xmm8,%xmm3
-	pxor	%xmm11,%xmm7
-	pxor	%xmm1,%xmm3
-	pxor	%xmm10,%xmm11
-	pxor	%xmm9,%xmm1
-	pxor	%xmm12,%xmm14
-	pxor	%xmm8,%xmm13
-	movdqa	%xmm14,%xmm10
-	pxor	%xmm13,%xmm10
-	pand	%xmm6,%xmm10
-	pxor	%xmm0,%xmm6
-	pand	%xmm14,%xmm0
-	pand	%xmm13,%xmm6
-	pxor	%xmm0,%xmm6
-	pxor	%xmm10,%xmm0
-	pxor	%xmm11,%xmm6
-	pxor	%xmm11,%xmm3
-	pxor	%xmm7,%xmm0
-	pxor	%xmm7,%xmm1
-	pxor	%xmm15,%xmm6
-	pxor	%xmm5,%xmm0
-	pxor	%xmm6,%xmm3
-	pxor	%xmm15,%xmm5
-	pxor	%xmm0,%xmm15
-
-	pxor	%xmm4,%xmm0
-	pxor	%xmm1,%xmm4
-	pxor	%xmm2,%xmm1
-	pxor	%xmm4,%xmm2
-	pxor	%xmm4,%xmm3
-
-	pxor	%xmm2,%xmm5
-	decl	%r10d
-	jl	.Lenc_done
-	pshufd	$0x93,%xmm15,%xmm7
-	pshufd	$0x93,%xmm0,%xmm8
-	pxor	%xmm7,%xmm15
-	pshufd	$0x93,%xmm3,%xmm9
-	pxor	%xmm8,%xmm0
-	pshufd	$0x93,%xmm5,%xmm10
-	pxor	%xmm9,%xmm3
-	pshufd	$0x93,%xmm2,%xmm11
-	pxor	%xmm10,%xmm5
-	pshufd	$0x93,%xmm6,%xmm12
-	pxor	%xmm11,%xmm2
-	pshufd	$0x93,%xmm1,%xmm13
-	pxor	%xmm12,%xmm6
-	pshufd	$0x93,%xmm4,%xmm14
-	pxor	%xmm13,%xmm1
-	pxor	%xmm14,%xmm4
-
-	pxor	%xmm15,%xmm8
-	pxor	%xmm4,%xmm7
-	pxor	%xmm4,%xmm8
-	pshufd	$0x4E,%xmm15,%xmm15
-	pxor	%xmm0,%xmm9
-	pshufd	$0x4E,%xmm0,%xmm0
-	pxor	%xmm2,%xmm12
-	pxor	%xmm7,%xmm15
-	pxor	%xmm6,%xmm13
-	pxor	%xmm8,%xmm0
-	pxor	%xmm5,%xmm11
-	pshufd	$0x4E,%xmm2,%xmm7
-	pxor	%xmm1,%xmm14
-	pshufd	$0x4E,%xmm6,%xmm8
-	pxor	%xmm3,%xmm10
-	pshufd	$0x4E,%xmm5,%xmm2
-	pxor	%xmm4,%xmm10
-	pshufd	$0x4E,%xmm4,%xmm6
-	pxor	%xmm4,%xmm11
-	pshufd	$0x4E,%xmm1,%xmm5
-	pxor	%xmm11,%xmm7
-	pshufd	$0x4E,%xmm3,%xmm1
-	pxor	%xmm12,%xmm8
-	pxor	%xmm10,%xmm2
-	pxor	%xmm14,%xmm6
-	pxor	%xmm13,%xmm5
-	movdqa	%xmm7,%xmm3
-	pxor	%xmm9,%xmm1
-	movdqa	%xmm8,%xmm4
-	movdqa	48(%r11),%xmm7
-	jnz	.Lenc_loop
-	movdqa	64(%r11),%xmm7
-	jmp	.Lenc_loop
-.align	16
-.Lenc_done:
-	movdqa	0(%r11),%xmm7
-	movdqa	16(%r11),%xmm8
-	movdqa	%xmm1,%xmm9
-	psrlq	$1,%xmm1
-	movdqa	%xmm2,%xmm10
-	psrlq	$1,%xmm2
-	pxor	%xmm4,%xmm1
-	pxor	%xmm6,%xmm2
-	pand	%xmm7,%xmm1
-	pand	%xmm7,%xmm2
-	pxor	%xmm1,%xmm4
-	psllq	$1,%xmm1
-	pxor	%xmm2,%xmm6
-	psllq	$1,%xmm2
-	pxor	%xmm9,%xmm1
-	pxor	%xmm10,%xmm2
-	movdqa	%xmm3,%xmm9
-	psrlq	$1,%xmm3
-	movdqa	%xmm15,%xmm10
-	psrlq	$1,%xmm15
-	pxor	%xmm5,%xmm3
-	pxor	%xmm0,%xmm15
-	pand	%xmm7,%xmm3
-	pand	%xmm7,%xmm15
-	pxor	%xmm3,%xmm5
-	psllq	$1,%xmm3
-	pxor	%xmm15,%xmm0
-	psllq	$1,%xmm15
-	pxor	%xmm9,%xmm3
-	pxor	%xmm10,%xmm15
-	movdqa	32(%r11),%xmm7
-	movdqa	%xmm6,%xmm9
-	psrlq	$2,%xmm6
-	movdqa	%xmm2,%xmm10
-	psrlq	$2,%xmm2
-	pxor	%xmm4,%xmm6
-	pxor	%xmm1,%xmm2
-	pand	%xmm8,%xmm6
-	pand	%xmm8,%xmm2
-	pxor	%xmm6,%xmm4
-	psllq	$2,%xmm6
-	pxor	%xmm2,%xmm1
-	psllq	$2,%xmm2
-	pxor	%xmm9,%xmm6
-	pxor	%xmm10,%xmm2
-	movdqa	%xmm0,%xmm9
-	psrlq	$2,%xmm0
-	movdqa	%xmm15,%xmm10
-	psrlq	$2,%xmm15
-	pxor	%xmm5,%xmm0
-	pxor	%xmm3,%xmm15
-	pand	%xmm8,%xmm0
-	pand	%xmm8,%xmm15
-	pxor	%xmm0,%xmm5
-	psllq	$2,%xmm0
-	pxor	%xmm15,%xmm3
-	psllq	$2,%xmm15
-	pxor	%xmm9,%xmm0
-	pxor	%xmm10,%xmm15
-	movdqa	%xmm5,%xmm9
-	psrlq	$4,%xmm5
-	movdqa	%xmm3,%xmm10
-	psrlq	$4,%xmm3
-	pxor	%xmm4,%xmm5
-	pxor	%xmm1,%xmm3
-	pand	%xmm7,%xmm5
-	pand	%xmm7,%xmm3
-	pxor	%xmm5,%xmm4
-	psllq	$4,%xmm5
-	pxor	%xmm3,%xmm1
-	psllq	$4,%xmm3
-	pxor	%xmm9,%xmm5
-	pxor	%xmm10,%xmm3
-	movdqa	%xmm0,%xmm9
-	psrlq	$4,%xmm0
-	movdqa	%xmm15,%xmm10
-	psrlq	$4,%xmm15
-	pxor	%xmm6,%xmm0
-	pxor	%xmm2,%xmm15
-	pand	%xmm7,%xmm0
-	pand	%xmm7,%xmm15
-	pxor	%xmm0,%xmm6
-	psllq	$4,%xmm0
-	pxor	%xmm15,%xmm2
-	psllq	$4,%xmm15
-	pxor	%xmm9,%xmm0
-	pxor	%xmm10,%xmm15
-	movdqa	(%rax),%xmm7
-	pxor	%xmm7,%xmm3
-	pxor	%xmm7,%xmm5
-	pxor	%xmm7,%xmm2
-	pxor	%xmm7,%xmm6
-	pxor	%xmm7,%xmm1
-	pxor	%xmm7,%xmm4
-	pxor	%xmm7,%xmm15
-	pxor	%xmm7,%xmm0
-	.byte	0xf3,0xc3
-.cfi_endproc	
-.size	_bsaes_encrypt8,.-_bsaes_encrypt8
-
-.type	_bsaes_decrypt8,@function
-.align	64
-_bsaes_decrypt8:
-.cfi_startproc	
-	leaq	.LBS0(%rip),%r11
-
-	movdqa	(%rax),%xmm8
-	leaq	16(%rax),%rax
-	movdqa	-48(%r11),%xmm7
-	pxor	%xmm8,%xmm15
-	pxor	%xmm8,%xmm0
-	pxor	%xmm8,%xmm1
-	pxor	%xmm8,%xmm2
-.byte	102,68,15,56,0,255
-.byte	102,15,56,0,199
-	pxor	%xmm8,%xmm3
-	pxor	%xmm8,%xmm4
-.byte	102,15,56,0,207
-.byte	102,15,56,0,215
-	pxor	%xmm8,%xmm5
-	pxor	%xmm8,%xmm6
-.byte	102,15,56,0,223
-.byte	102,15,56,0,231
-.byte	102,15,56,0,239
-.byte	102,15,56,0,247
-	movdqa	0(%r11),%xmm7
-	movdqa	16(%r11),%xmm8
-	movdqa	%xmm5,%xmm9
-	psrlq	$1,%xmm5
-	movdqa	%xmm3,%xmm10
-	psrlq	$1,%xmm3
-	pxor	%xmm6,%xmm5
-	pxor	%xmm4,%xmm3
-	pand	%xmm7,%xmm5
-	pand	%xmm7,%xmm3
-	pxor	%xmm5,%xmm6
-	psllq	$1,%xmm5
-	pxor	%xmm3,%xmm4
-	psllq	$1,%xmm3
-	pxor	%xmm9,%xmm5
-	pxor	%xmm10,%xmm3
-	movdqa	%xmm1,%xmm9
-	psrlq	$1,%xmm1
-	movdqa	%xmm15,%xmm10
-	psrlq	$1,%xmm15
-	pxor	%xmm2,%xmm1
-	pxor	%xmm0,%xmm15
-	pand	%xmm7,%xmm1
-	pand	%xmm7,%xmm15
-	pxor	%xmm1,%xmm2
-	psllq	$1,%xmm1
-	pxor	%xmm15,%xmm0
-	psllq	$1,%xmm15
-	pxor	%xmm9,%xmm1
-	pxor	%xmm10,%xmm15
-	movdqa	32(%r11),%xmm7
-	movdqa	%xmm4,%xmm9
-	psrlq	$2,%xmm4
-	movdqa	%xmm3,%xmm10
-	psrlq	$2,%xmm3
-	pxor	%xmm6,%xmm4
-	pxor	%xmm5,%xmm3
-	pand	%xmm8,%xmm4
-	pand	%xmm8,%xmm3
-	pxor	%xmm4,%xmm6
-	psllq	$2,%xmm4
-	pxor	%xmm3,%xmm5
-	psllq	$2,%xmm3
-	pxor	%xmm9,%xmm4
-	pxor	%xmm10,%xmm3
-	movdqa	%xmm0,%xmm9
-	psrlq	$2,%xmm0
-	movdqa	%xmm15,%xmm10
-	psrlq	$2,%xmm15
-	pxor	%xmm2,%xmm0
-	pxor	%xmm1,%xmm15
-	pand	%xmm8,%xmm0
-	pand	%xmm8,%xmm15
-	pxor	%xmm0,%xmm2
-	psllq	$2,%xmm0
-	pxor	%xmm15,%xmm1
-	psllq	$2,%xmm15
-	pxor	%xmm9,%xmm0
-	pxor	%xmm10,%xmm15
-	movdqa	%xmm2,%xmm9
-	psrlq	$4,%xmm2
-	movdqa	%xmm1,%xmm10
-	psrlq	$4,%xmm1
-	pxor	%xmm6,%xmm2
-	pxor	%xmm5,%xmm1
-	pand	%xmm7,%xmm2
-	pand	%xmm7,%xmm1
-	pxor	%xmm2,%xmm6
-	psllq	$4,%xmm2
-	pxor	%xmm1,%xmm5
-	psllq	$4,%xmm1
-	pxor	%xmm9,%xmm2
-	pxor	%xmm10,%xmm1
-	movdqa	%xmm0,%xmm9
-	psrlq	$4,%xmm0
-	movdqa	%xmm15,%xmm10
-	psrlq	$4,%xmm15
-	pxor	%xmm4,%xmm0
-	pxor	%xmm3,%xmm15
-	pand	%xmm7,%xmm0
-	pand	%xmm7,%xmm15
-	pxor	%xmm0,%xmm4
-	psllq	$4,%xmm0
-	pxor	%xmm15,%xmm3
-	psllq	$4,%xmm15
-	pxor	%xmm9,%xmm0
-	pxor	%xmm10,%xmm15
-	decl	%r10d
-	jmp	.Ldec_sbox
-.align	16
-.Ldec_loop:
-	pxor	0(%rax),%xmm15
-	pxor	16(%rax),%xmm0
-	pxor	32(%rax),%xmm1
-	pxor	48(%rax),%xmm2
-.byte	102,68,15,56,0,255
-.byte	102,15,56,0,199
-	pxor	64(%rax),%xmm3
-	pxor	80(%rax),%xmm4
-.byte	102,15,56,0,207
-.byte	102,15,56,0,215
-	pxor	96(%rax),%xmm5
-	pxor	112(%rax),%xmm6
-.byte	102,15,56,0,223
-.byte	102,15,56,0,231
-.byte	102,15,56,0,239
-.byte	102,15,56,0,247
-	leaq	128(%rax),%rax
-.Ldec_sbox:
-	pxor	%xmm3,%xmm2
-
-	pxor	%xmm6,%xmm3
-	pxor	%xmm6,%xmm1
-	pxor	%xmm3,%xmm5
-	pxor	%xmm5,%xmm6
-	pxor	%xmm6,%xmm0
-
-	pxor	%xmm0,%xmm15
-	pxor	%xmm4,%xmm1
-	pxor	%xmm15,%xmm2
-	pxor	%xmm15,%xmm4
-	pxor	%xmm2,%xmm0
-	movdqa	%xmm2,%xmm10
-	movdqa	%xmm6,%xmm9
-	movdqa	%xmm0,%xmm8
-	movdqa	%xmm3,%xmm12
-	movdqa	%xmm4,%xmm11
-
-	pxor	%xmm15,%xmm10
-	pxor	%xmm3,%xmm9
-	pxor	%xmm5,%xmm8
-	movdqa	%xmm10,%xmm13
-	pxor	%xmm15,%xmm12
-	movdqa	%xmm9,%xmm7
-	pxor	%xmm1,%xmm11
-	movdqa	%xmm10,%xmm14
-
-	por	%xmm8,%xmm9
-	por	%xmm11,%xmm10
-	pxor	%xmm7,%xmm14
-	pand	%xmm11,%xmm13
-	pxor	%xmm8,%xmm11
-	pand	%xmm8,%xmm7
-	pand	%xmm11,%xmm14
-	movdqa	%xmm5,%xmm11
-	pxor	%xmm1,%xmm11
-	pand	%xmm11,%xmm12
-	pxor	%xmm12,%xmm10
-	pxor	%xmm12,%xmm9
-	movdqa	%xmm2,%xmm12
-	movdqa	%xmm0,%xmm11
-	pxor	%xmm6,%xmm12
-	pxor	%xmm4,%xmm11
-	movdqa	%xmm12,%xmm8
-	pand	%xmm11,%xmm12
-	por	%xmm11,%xmm8
-	pxor	%xmm12,%xmm7
-	pxor	%xmm14,%xmm10
-	pxor	%xmm13,%xmm9
-	pxor	%xmm14,%xmm8
-	movdqa	%xmm3,%xmm11
-	pxor	%xmm13,%xmm7
-	movdqa	%xmm15,%xmm12
-	pxor	%xmm13,%xmm8
-	movdqa	%xmm6,%xmm13
-	pand	%xmm5,%xmm11
-	movdqa	%xmm2,%xmm14
-	pand	%xmm1,%xmm12
-	pand	%xmm0,%xmm13
-	por	%xmm4,%xmm14
-	pxor	%xmm11,%xmm10
-	pxor	%xmm12,%xmm9
-	pxor	%xmm13,%xmm8
-	pxor	%xmm14,%xmm7
-
-
-
-
-
-	movdqa	%xmm10,%xmm11
-	pand	%xmm8,%xmm10
-	pxor	%xmm9,%xmm11
-
-	movdqa	%xmm7,%xmm13
-	movdqa	%xmm11,%xmm14
-	pxor	%xmm10,%xmm13
-	pand	%xmm13,%xmm14
-
-	movdqa	%xmm8,%xmm12
-	pxor	%xmm9,%xmm14
-	pxor	%xmm7,%xmm12
-
-	pxor	%xmm9,%xmm10
-
-	pand	%xmm10,%xmm12
-
-	movdqa	%xmm13,%xmm9
-	pxor	%xmm7,%xmm12
-
-	pxor	%xmm12,%xmm9
-	pxor	%xmm12,%xmm8
-
-	pand	%xmm7,%xmm9
-
-	pxor	%xmm9,%xmm13
-	pxor	%xmm9,%xmm8
-
-	pand	%xmm14,%xmm13
-
-	pxor	%xmm11,%xmm13
-	movdqa	%xmm4,%xmm11
-	movdqa	%xmm0,%xmm7
-	movdqa	%xmm14,%xmm9
-	pxor	%xmm13,%xmm9
-	pand	%xmm4,%xmm9
-	pxor	%xmm0,%xmm4
-	pand	%xmm14,%xmm0
-	pand	%xmm13,%xmm4
-	pxor	%xmm0,%xmm4
-	pxor	%xmm9,%xmm0
-	pxor	%xmm1,%xmm11
-	pxor	%xmm5,%xmm7
-	pxor	%xmm12,%xmm14
-	pxor	%xmm8,%xmm13
-	movdqa	%xmm14,%xmm10
-	movdqa	%xmm12,%xmm9
-	pxor	%xmm13,%xmm10
-	pxor	%xmm8,%xmm9
-	pand	%xmm11,%xmm10
-	pand	%xmm1,%xmm9
-	pxor	%xmm7,%xmm11
-	pxor	%xmm5,%xmm1
-	pand	%xmm14,%xmm7
-	pand	%xmm12,%xmm5
-	pand	%xmm13,%xmm11
-	pand	%xmm8,%xmm1
-	pxor	%xmm11,%xmm7
-	pxor	%xmm5,%xmm1
-	pxor	%xmm10,%xmm11
-	pxor	%xmm9,%xmm5
-	pxor	%xmm11,%xmm4
-	pxor	%xmm11,%xmm1
-	pxor	%xmm7,%xmm0
-	pxor	%xmm7,%xmm5
-
-	movdqa	%xmm2,%xmm11
-	movdqa	%xmm6,%xmm7
-	pxor	%xmm15,%xmm11
-	pxor	%xmm3,%xmm7
-	movdqa	%xmm14,%xmm10
-	movdqa	%xmm12,%xmm9
-	pxor	%xmm13,%xmm10
-	pxor	%xmm8,%xmm9
-	pand	%xmm11,%xmm10
-	pand	%xmm15,%xmm9
-	pxor	%xmm7,%xmm11
-	pxor	%xmm3,%xmm15
-	pand	%xmm14,%xmm7
-	pand	%xmm12,%xmm3
-	pand	%xmm13,%xmm11
-	pand	%xmm8,%xmm15
-	pxor	%xmm11,%xmm7
-	pxor	%xmm3,%xmm15
-	pxor	%xmm10,%xmm11
-	pxor	%xmm9,%xmm3
-	pxor	%xmm12,%xmm14
-	pxor	%xmm8,%xmm13
-	movdqa	%xmm14,%xmm10
-	pxor	%xmm13,%xmm10
-	pand	%xmm2,%xmm10
-	pxor	%xmm6,%xmm2
-	pand	%xmm14,%xmm6
-	pand	%xmm13,%xmm2
-	pxor	%xmm6,%xmm2
-	pxor	%xmm10,%xmm6
-	pxor	%xmm11,%xmm2
-	pxor	%xmm11,%xmm15
-	pxor	%xmm7,%xmm6
-	pxor	%xmm7,%xmm3
-	pxor	%xmm6,%xmm0
-	pxor	%xmm4,%xmm5
-
-	pxor	%xmm0,%xmm3
-	pxor	%xmm6,%xmm1
-	pxor	%xmm6,%xmm4
-	pxor	%xmm1,%xmm3
-	pxor	%xmm15,%xmm6
-	pxor	%xmm4,%xmm3
-	pxor	%xmm5,%xmm2
-	pxor	%xmm0,%xmm5
-	pxor	%xmm3,%xmm2
-
-	pxor	%xmm15,%xmm3
-	pxor	%xmm2,%xmm6
-	decl	%r10d
-	jl	.Ldec_done
-
-	pshufd	$0x4E,%xmm15,%xmm7
-	pshufd	$0x4E,%xmm2,%xmm13
-	pxor	%xmm15,%xmm7
-	pshufd	$0x4E,%xmm4,%xmm14
-	pxor	%xmm2,%xmm13
-	pshufd	$0x4E,%xmm0,%xmm8
-	pxor	%xmm4,%xmm14
-	pshufd	$0x4E,%xmm5,%xmm9
-	pxor	%xmm0,%xmm8
-	pshufd	$0x4E,%xmm3,%xmm10
-	pxor	%xmm5,%xmm9
-	pxor	%xmm13,%xmm15
-	pxor	%xmm13,%xmm0
-	pshufd	$0x4E,%xmm1,%xmm11
-	pxor	%xmm3,%xmm10
-	pxor	%xmm7,%xmm5
-	pxor	%xmm8,%xmm3
-	pshufd	$0x4E,%xmm6,%xmm12
-	pxor	%xmm1,%xmm11
-	pxor	%xmm14,%xmm0
-	pxor	%xmm9,%xmm1
-	pxor	%xmm6,%xmm12
-
-	pxor	%xmm14,%xmm5
-	pxor	%xmm13,%xmm3
-	pxor	%xmm13,%xmm1
-	pxor	%xmm10,%xmm6
-	pxor	%xmm11,%xmm2
-	pxor	%xmm14,%xmm1
-	pxor	%xmm14,%xmm6
-	pxor	%xmm12,%xmm4
-	pshufd	$0x93,%xmm15,%xmm7
-	pshufd	$0x93,%xmm0,%xmm8
-	pxor	%xmm7,%xmm15
-	pshufd	$0x93,%xmm5,%xmm9
-	pxor	%xmm8,%xmm0
-	pshufd	$0x93,%xmm3,%xmm10
-	pxor	%xmm9,%xmm5
-	pshufd	$0x93,%xmm1,%xmm11
-	pxor	%xmm10,%xmm3
-	pshufd	$0x93,%xmm6,%xmm12
-	pxor	%xmm11,%xmm1
-	pshufd	$0x93,%xmm2,%xmm13
-	pxor	%xmm12,%xmm6
-	pshufd	$0x93,%xmm4,%xmm14
-	pxor	%xmm13,%xmm2
-	pxor	%xmm14,%xmm4
-
-	pxor	%xmm15,%xmm8
-	pxor	%xmm4,%xmm7
-	pxor	%xmm4,%xmm8
-	pshufd	$0x4E,%xmm15,%xmm15
-	pxor	%xmm0,%xmm9
-	pshufd	$0x4E,%xmm0,%xmm0
-	pxor	%xmm1,%xmm12
-	pxor	%xmm7,%xmm15
-	pxor	%xmm6,%xmm13
-	pxor	%xmm8,%xmm0
-	pxor	%xmm3,%xmm11
-	pshufd	$0x4E,%xmm1,%xmm7
-	pxor	%xmm2,%xmm14
-	pshufd	$0x4E,%xmm6,%xmm8
-	pxor	%xmm5,%xmm10
-	pshufd	$0x4E,%xmm3,%xmm1
-	pxor	%xmm4,%xmm10
-	pshufd	$0x4E,%xmm4,%xmm6
-	pxor	%xmm4,%xmm11
-	pshufd	$0x4E,%xmm2,%xmm3
-	pxor	%xmm11,%xmm7
-	pshufd	$0x4E,%xmm5,%xmm2
-	pxor	%xmm12,%xmm8
-	pxor	%xmm1,%xmm10
-	pxor	%xmm14,%xmm6
-	pxor	%xmm3,%xmm13
-	movdqa	%xmm7,%xmm3
-	pxor	%xmm9,%xmm2
-	movdqa	%xmm13,%xmm5
-	movdqa	%xmm8,%xmm4
-	movdqa	%xmm2,%xmm1
-	movdqa	%xmm10,%xmm2
-	movdqa	-16(%r11),%xmm7
-	jnz	.Ldec_loop
-	movdqa	-32(%r11),%xmm7
-	jmp	.Ldec_loop
-.align	16
-.Ldec_done:
-	movdqa	0(%r11),%xmm7
-	movdqa	16(%r11),%xmm8
-	movdqa	%xmm2,%xmm9
-	psrlq	$1,%xmm2
-	movdqa	%xmm1,%xmm10
-	psrlq	$1,%xmm1
-	pxor	%xmm4,%xmm2
-	pxor	%xmm6,%xmm1
-	pand	%xmm7,%xmm2
-	pand	%xmm7,%xmm1
-	pxor	%xmm2,%xmm4
-	psllq	$1,%xmm2
-	pxor	%xmm1,%xmm6
-	psllq	$1,%xmm1
-	pxor	%xmm9,%xmm2
-	pxor	%xmm10,%xmm1
-	movdqa	%xmm5,%xmm9
-	psrlq	$1,%xmm5
-	movdqa	%xmm15,%xmm10
-	psrlq	$1,%xmm15
-	pxor	%xmm3,%xmm5
-	pxor	%xmm0,%xmm15
-	pand	%xmm7,%xmm5
-	pand	%xmm7,%xmm15
-	pxor	%xmm5,%xmm3
-	psllq	$1,%xmm5
-	pxor	%xmm15,%xmm0
-	psllq	$1,%xmm15
-	pxor	%xmm9,%xmm5
-	pxor	%xmm10,%xmm15
-	movdqa	32(%r11),%xmm7
-	movdqa	%xmm6,%xmm9
-	psrlq	$2,%xmm6
-	movdqa	%xmm1,%xmm10
-	psrlq	$2,%xmm1
-	pxor	%xmm4,%xmm6
-	pxor	%xmm2,%xmm1
-	pand	%xmm8,%xmm6
-	pand	%xmm8,%xmm1
-	pxor	%xmm6,%xmm4
-	psllq	$2,%xmm6
-	pxor	%xmm1,%xmm2
-	psllq	$2,%xmm1
-	pxor	%xmm9,%xmm6
-	pxor	%xmm10,%xmm1
-	movdqa	%xmm0,%xmm9
-	psrlq	$2,%xmm0
-	movdqa	%xmm15,%xmm10
-	psrlq	$2,%xmm15
-	pxor	%xmm3,%xmm0
-	pxor	%xmm5,%xmm15
-	pand	%xmm8,%xmm0
-	pand	%xmm8,%xmm15
-	pxor	%xmm0,%xmm3
-	psllq	$2,%xmm0
-	pxor	%xmm15,%xmm5
-	psllq	$2,%xmm15
-	pxor	%xmm9,%xmm0
-	pxor	%xmm10,%xmm15
-	movdqa	%xmm3,%xmm9
-	psrlq	$4,%xmm3
-	movdqa	%xmm5,%xmm10
-	psrlq	$4,%xmm5
-	pxor	%xmm4,%xmm3
-	pxor	%xmm2,%xmm5
-	pand	%xmm7,%xmm3
-	pand	%xmm7,%xmm5
-	pxor	%xmm3,%xmm4
-	psllq	$4,%xmm3
-	pxor	%xmm5,%xmm2
-	psllq	$4,%xmm5
-	pxor	%xmm9,%xmm3
-	pxor	%xmm10,%xmm5
-	movdqa	%xmm0,%xmm9
-	psrlq	$4,%xmm0
-	movdqa	%xmm15,%xmm10
-	psrlq	$4,%xmm15
-	pxor	%xmm6,%xmm0
-	pxor	%xmm1,%xmm15
-	pand	%xmm7,%xmm0
-	pand	%xmm7,%xmm15
-	pxor	%xmm0,%xmm6
-	psllq	$4,%xmm0
-	pxor	%xmm15,%xmm1
-	psllq	$4,%xmm15
-	pxor	%xmm9,%xmm0
-	pxor	%xmm10,%xmm15
-	movdqa	(%rax),%xmm7
-	pxor	%xmm7,%xmm5
-	pxor	%xmm7,%xmm3
-	pxor	%xmm7,%xmm1
-	pxor	%xmm7,%xmm6
-	pxor	%xmm7,%xmm2
-	pxor	%xmm7,%xmm4
-	pxor	%xmm7,%xmm15
-	pxor	%xmm7,%xmm0
-	.byte	0xf3,0xc3
-.cfi_endproc	
-.size	_bsaes_decrypt8,.-_bsaes_decrypt8
-.type	_bsaes_key_convert,@function
-.align	16
-_bsaes_key_convert:
-.cfi_startproc	
-	leaq	.Lmasks(%rip),%r11
-	movdqu	(%rcx),%xmm7
-	leaq	16(%rcx),%rcx
-	movdqa	0(%r11),%xmm0
-	movdqa	16(%r11),%xmm1
-	movdqa	32(%r11),%xmm2
-	movdqa	48(%r11),%xmm3
-	movdqa	64(%r11),%xmm4
-	pcmpeqd	%xmm5,%xmm5
-
-	movdqu	(%rcx),%xmm6
-	movdqa	%xmm7,(%rax)
-	leaq	16(%rax),%rax
-	decl	%r10d
-	jmp	.Lkey_loop
-.align	16
-.Lkey_loop:
-.byte	102,15,56,0,244
-
-	movdqa	%xmm0,%xmm8
-	movdqa	%xmm1,%xmm9
-
-	pand	%xmm6,%xmm8
-	pand	%xmm6,%xmm9
-	movdqa	%xmm2,%xmm10
-	pcmpeqb	%xmm0,%xmm8
-	psllq	$4,%xmm0
-	movdqa	%xmm3,%xmm11
-	pcmpeqb	%xmm1,%xmm9
-	psllq	$4,%xmm1
-
-	pand	%xmm6,%xmm10
-	pand	%xmm6,%xmm11
-	movdqa	%xmm0,%xmm12
-	pcmpeqb	%xmm2,%xmm10
-	psllq	$4,%xmm2
-	movdqa	%xmm1,%xmm13
-	pcmpeqb	%xmm3,%xmm11
-	psllq	$4,%xmm3
-
-	movdqa	%xmm2,%xmm14
-	movdqa	%xmm3,%xmm15
-	pxor	%xmm5,%xmm8
-	pxor	%xmm5,%xmm9
-
-	pand	%xmm6,%xmm12
-	pand	%xmm6,%xmm13
-	movdqa	%xmm8,0(%rax)
-	pcmpeqb	%xmm0,%xmm12
-	psrlq	$4,%xmm0
-	movdqa	%xmm9,16(%rax)
-	pcmpeqb	%xmm1,%xmm13
-	psrlq	$4,%xmm1
-	leaq	16(%rcx),%rcx
-
-	pand	%xmm6,%xmm14
-	pand	%xmm6,%xmm15
-	movdqa	%xmm10,32(%rax)
-	pcmpeqb	%xmm2,%xmm14
-	psrlq	$4,%xmm2
-	movdqa	%xmm11,48(%rax)
-	pcmpeqb	%xmm3,%xmm15
-	psrlq	$4,%xmm3
-	movdqu	(%rcx),%xmm6
-
-	pxor	%xmm5,%xmm13
-	pxor	%xmm5,%xmm14
-	movdqa	%xmm12,64(%rax)
-	movdqa	%xmm13,80(%rax)
-	movdqa	%xmm14,96(%rax)
-	movdqa	%xmm15,112(%rax)
-	leaq	128(%rax),%rax
-	decl	%r10d
-	jnz	.Lkey_loop
-
-	movdqa	80(%r11),%xmm7
-
-	.byte	0xf3,0xc3
-.cfi_endproc	
-.size	_bsaes_key_convert,.-_bsaes_key_convert
-
-.globl	bsaes_cbc_encrypt
-.type	bsaes_cbc_encrypt,@function
-.align	16
-bsaes_cbc_encrypt:
-.cfi_startproc	
-	cmpl	$0,%r9d
-	jne	asm_AES_cbc_encrypt
-	cmpq	$128,%rdx
-	jb	asm_AES_cbc_encrypt
-
-	movq	%rsp,%rax
-.Lcbc_dec_prologue:
-	pushq	%rbp
-.cfi_adjust_cfa_offset	8
-.cfi_offset	%rbp,-16
-	pushq	%rbx
-.cfi_adjust_cfa_offset	8
-.cfi_offset	%rbx,-24
-	pushq	%r12
-.cfi_adjust_cfa_offset	8
-.cfi_offset	%r12,-32
-	pushq	%r13
-.cfi_adjust_cfa_offset	8
-.cfi_offset	%r13,-40
-	pushq	%r14
-.cfi_adjust_cfa_offset	8
-.cfi_offset	%r14,-48
-	pushq	%r15
-.cfi_adjust_cfa_offset	8
-.cfi_offset	%r15,-56
-	leaq	-72(%rsp),%rsp
-.cfi_adjust_cfa_offset	0x48
-	movq	%rsp,%rbp
-.cfi_def_cfa_register	%rbp
-	movl	240(%rcx),%eax
-	movq	%rdi,%r12
-	movq	%rsi,%r13
-	movq	%rdx,%r14
-	movq	%rcx,%r15
-	movq	%r8,%rbx
-	shrq	$4,%r14
-
-	movl	%eax,%edx
-	shlq	$7,%rax
-	subq	$96,%rax
-	subq	%rax,%rsp
-
-	movq	%rsp,%rax
-	movq	%r15,%rcx
-	movl	%edx,%r10d
-	call	_bsaes_key_convert
-	pxor	(%rsp),%xmm7
-	movdqa	%xmm6,(%rax)
-	movdqa	%xmm7,(%rsp)
-
-	movdqu	(%rbx),%xmm14
-	subq	$8,%r14
-.Lcbc_dec_loop:
-	movdqu	0(%r12),%xmm15
-	movdqu	16(%r12),%xmm0
-	movdqu	32(%r12),%xmm1
-	movdqu	48(%r12),%xmm2
-	movdqu	64(%r12),%xmm3
-	movdqu	80(%r12),%xmm4
-	movq	%rsp,%rax
-	movdqu	96(%r12),%xmm5
-	movl	%edx,%r10d
-	movdqu	112(%r12),%xmm6
-	movdqa	%xmm14,32(%rbp)
-
-	call	_bsaes_decrypt8
-
-	pxor	32(%rbp),%xmm15
-	movdqu	0(%r12),%xmm7
-	movdqu	16(%r12),%xmm8
-	pxor	%xmm7,%xmm0
-	movdqu	32(%r12),%xmm9
-	pxor	%xmm8,%xmm5
-	movdqu	48(%r12),%xmm10
-	pxor	%xmm9,%xmm3
-	movdqu	64(%r12),%xmm11
-	pxor	%xmm10,%xmm1
-	movdqu	80(%r12),%xmm12
-	pxor	%xmm11,%xmm6
-	movdqu	96(%r12),%xmm13
-	pxor	%xmm12,%xmm2
-	movdqu	112(%r12),%xmm14
-	pxor	%xmm13,%xmm4
-	movdqu	%xmm15,0(%r13)
-	leaq	128(%r12),%r12
-	movdqu	%xmm0,16(%r13)
-	movdqu	%xmm5,32(%r13)
-	movdqu	%xmm3,48(%r13)
-	movdqu	%xmm1,64(%r13)
-	movdqu	%xmm6,80(%r13)
-	movdqu	%xmm2,96(%r13)
-	movdqu	%xmm4,112(%r13)
-	leaq	128(%r13),%r13
-	subq	$8,%r14
-	jnc	.Lcbc_dec_loop
-
-	addq	$8,%r14
-	jz	.Lcbc_dec_done
-
-	movdqu	0(%r12),%xmm15
-	movq	%rsp,%rax
-	movl	%edx,%r10d
-	cmpq	$2,%r14
-	jb	.Lcbc_dec_one
-	movdqu	16(%r12),%xmm0
-	je	.Lcbc_dec_two
-	movdqu	32(%r12),%xmm1
-	cmpq	$4,%r14
-	jb	.Lcbc_dec_three
-	movdqu	48(%r12),%xmm2
-	je	.Lcbc_dec_four
-	movdqu	64(%r12),%xmm3
-	cmpq	$6,%r14
-	jb	.Lcbc_dec_five
-	movdqu	80(%r12),%xmm4
-	je	.Lcbc_dec_six
-	movdqu	96(%r12),%xmm5
-	movdqa	%xmm14,32(%rbp)
-	call	_bsaes_decrypt8
-	pxor	32(%rbp),%xmm15
-	movdqu	0(%r12),%xmm7
-	movdqu	16(%r12),%xmm8
-	pxor	%xmm7,%xmm0
-	movdqu	32(%r12),%xmm9
-	pxor	%xmm8,%xmm5
-	movdqu	48(%r12),%xmm10
-	pxor	%xmm9,%xmm3
-	movdqu	64(%r12),%xmm11
-	pxor	%xmm10,%xmm1
-	movdqu	80(%r12),%xmm12
-	pxor	%xmm11,%xmm6
-	movdqu	96(%r12),%xmm14
-	pxor	%xmm12,%xmm2
-	movdqu	%xmm15,0(%r13)
-	movdqu	%xmm0,16(%r13)
-	movdqu	%xmm5,32(%r13)
-	movdqu	%xmm3,48(%r13)
-	movdqu	%xmm1,64(%r13)
-	movdqu	%xmm6,80(%r13)
-	movdqu	%xmm2,96(%r13)
-	jmp	.Lcbc_dec_done
-.align	16
-.Lcbc_dec_six:
-	movdqa	%xmm14,32(%rbp)
-	call	_bsaes_decrypt8
-	pxor	32(%rbp),%xmm15
-	movdqu	0(%r12),%xmm7
-	movdqu	16(%r12),%xmm8
-	pxor	%xmm7,%xmm0
-	movdqu	32(%r12),%xmm9
-	pxor	%xmm8,%xmm5
-	movdqu	48(%r12),%xmm10
-	pxor	%xmm9,%xmm3
-	movdqu	64(%r12),%xmm11
-	pxor	%xmm10,%xmm1
-	movdqu	80(%r12),%xmm14
-	pxor	%xmm11,%xmm6
-	movdqu	%xmm15,0(%r13)
-	movdqu	%xmm0,16(%r13)
-	movdqu	%xmm5,32(%r13)
-	movdqu	%xmm3,48(%r13)
-	movdqu	%xmm1,64(%r13)
-	movdqu	%xmm6,80(%r13)
-	jmp	.Lcbc_dec_done
-.align	16
-.Lcbc_dec_five:
-	movdqa	%xmm14,32(%rbp)
-	call	_bsaes_decrypt8
-	pxor	32(%rbp),%xmm15
-	movdqu	0(%r12),%xmm7
-	movdqu	16(%r12),%xmm8
-	pxor	%xmm7,%xmm0
-	movdqu	32(%r12),%xmm9
-	pxor	%xmm8,%xmm5
-	movdqu	48(%r12),%xmm10
-	pxor	%xmm9,%xmm3
-	movdqu	64(%r12),%xmm14
-	pxor	%xmm10,%xmm1
-	movdqu	%xmm15,0(%r13)
-	movdqu	%xmm0,16(%r13)
-	movdqu	%xmm5,32(%r13)
-	movdqu	%xmm3,48(%r13)
-	movdqu	%xmm1,64(%r13)
-	jmp	.Lcbc_dec_done
-.align	16
-.Lcbc_dec_four:
-	movdqa	%xmm14,32(%rbp)
-	call	_bsaes_decrypt8
-	pxor	32(%rbp),%xmm15
-	movdqu	0(%r12),%xmm7
-	movdqu	16(%r12),%xmm8
-	pxor	%xmm7,%xmm0
-	movdqu	32(%r12),%xmm9
-	pxor	%xmm8,%xmm5
-	movdqu	48(%r12),%xmm14
-	pxor	%xmm9,%xmm3
-	movdqu	%xmm15,0(%r13)
-	movdqu	%xmm0,16(%r13)
-	movdqu	%xmm5,32(%r13)
-	movdqu	%xmm3,48(%r13)
-	jmp	.Lcbc_dec_done
-.align	16
-.Lcbc_dec_three:
-	movdqa	%xmm14,32(%rbp)
-	call	_bsaes_decrypt8
-	pxor	32(%rbp),%xmm15
-	movdqu	0(%r12),%xmm7
-	movdqu	16(%r12),%xmm8
-	pxor	%xmm7,%xmm0
-	movdqu	32(%r12),%xmm14
-	pxor	%xmm8,%xmm5
-	movdqu	%xmm15,0(%r13)
-	movdqu	%xmm0,16(%r13)
-	movdqu	%xmm5,32(%r13)
-	jmp	.Lcbc_dec_done
-.align	16
-.Lcbc_dec_two:
-	movdqa	%xmm14,32(%rbp)
-	call	_bsaes_decrypt8
-	pxor	32(%rbp),%xmm15
-	movdqu	0(%r12),%xmm7
-	movdqu	16(%r12),%xmm14
-	pxor	%xmm7,%xmm0
-	movdqu	%xmm15,0(%r13)
-	movdqu	%xmm0,16(%r13)
-	jmp	.Lcbc_dec_done
-.align	16
-.Lcbc_dec_one:
-	leaq	(%r12),%rdi
-	leaq	32(%rbp),%rsi
-	leaq	(%r15),%rdx
-	call	asm_AES_decrypt
-	pxor	32(%rbp),%xmm14
-	movdqu	%xmm14,(%r13)
-	movdqa	%xmm15,%xmm14
-
-.Lcbc_dec_done:
-	movdqu	%xmm14,(%rbx)
-	leaq	(%rsp),%rax
-	pxor	%xmm0,%xmm0
-.Lcbc_dec_bzero:
-	movdqa	%xmm0,0(%rax)
-	movdqa	%xmm0,16(%rax)
-	leaq	32(%rax),%rax
-	cmpq	%rax,%rbp
-	ja	.Lcbc_dec_bzero
-
-	leaq	120(%rbp),%rax
-.cfi_def_cfa	%rax,8
-	movq	-48(%rax),%r15
-.cfi_restore	%r15
-	movq	-40(%rax),%r14
-.cfi_restore	%r14
-	movq	-32(%rax),%r13
-.cfi_restore	%r13
-	movq	-24(%rax),%r12
-.cfi_restore	%r12
-	movq	-16(%rax),%rbx
-.cfi_restore	%rbx
-	movq	-8(%rax),%rbp
-.cfi_restore	%rbp
-	leaq	(%rax),%rsp
-.cfi_def_cfa_register	%rsp
-.Lcbc_dec_epilogue:
-	.byte	0xf3,0xc3
-.cfi_endproc	
-.size	bsaes_cbc_encrypt,.-bsaes_cbc_encrypt
-
-.globl	bsaes_ctr32_encrypt_blocks
-.type	bsaes_ctr32_encrypt_blocks,@function
-.align	16
-bsaes_ctr32_encrypt_blocks:
-.cfi_startproc	
-	movq	%rsp,%rax
-.Lctr_enc_prologue:
-	pushq	%rbp
-.cfi_adjust_cfa_offset	8
-.cfi_offset	%rbp,-16
-	pushq	%rbx
-.cfi_adjust_cfa_offset	8
-.cfi_offset	%rbx,-24
-	pushq	%r12
-.cfi_adjust_cfa_offset	8
-.cfi_offset	%r12,-32
-	pushq	%r13
-.cfi_adjust_cfa_offset	8
-.cfi_offset	%r13,-40
-	pushq	%r14
-.cfi_adjust_cfa_offset	8
-.cfi_offset	%r14,-48
-	pushq	%r15
-.cfi_adjust_cfa_offset	8
-.cfi_offset	%r15,-56
-	leaq	-72(%rsp),%rsp
-.cfi_adjust_cfa_offset	0x48
-	movq	%rsp,%rbp
-.cfi_def_cfa_register	%rbp
-	movdqu	(%r8),%xmm0
-	movl	240(%rcx),%eax
-	movq	%rdi,%r12
-	movq	%rsi,%r13
-	movq	%rdx,%r14
-	movq	%rcx,%r15
-	movdqa	%xmm0,32(%rbp)
-	cmpq	$8,%rdx
-	jb	.Lctr_enc_short
-
-	movl	%eax,%ebx
-	shlq	$7,%rax
-	subq	$96,%rax
-	subq	%rax,%rsp
-
-	movq	%rsp,%rax
-	movq	%r15,%rcx
-	movl	%ebx,%r10d
-	call	_bsaes_key_convert
-	pxor	%xmm6,%xmm7
-	movdqa	%xmm7,(%rax)
-
-	movdqa	(%rsp),%xmm8
-	leaq	.LADD1(%rip),%r11
-	movdqa	32(%rbp),%xmm15
-	movdqa	-32(%r11),%xmm7
-.byte	102,68,15,56,0,199
-.byte	102,68,15,56,0,255
-	movdqa	%xmm8,(%rsp)
-	jmp	.Lctr_enc_loop
-.align	16
-.Lctr_enc_loop:
-	movdqa	%xmm15,32(%rbp)
-	movdqa	%xmm15,%xmm0
-	movdqa	%xmm15,%xmm1
-	paddd	0(%r11),%xmm0
-	movdqa	%xmm15,%xmm2
-	paddd	16(%r11),%xmm1
-	movdqa	%xmm15,%xmm3
-	paddd	32(%r11),%xmm2
-	movdqa	%xmm15,%xmm4
-	paddd	48(%r11),%xmm3
-	movdqa	%xmm15,%xmm5
-	paddd	64(%r11),%xmm4
-	movdqa	%xmm15,%xmm6
-	paddd	80(%r11),%xmm5
-	paddd	96(%r11),%xmm6
-
-
-
-	movdqa	(%rsp),%xmm8
-	leaq	16(%rsp),%rax
-	movdqa	-16(%r11),%xmm7
-	pxor	%xmm8,%xmm15
-	pxor	%xmm8,%xmm0
-	pxor	%xmm8,%xmm1
-	pxor	%xmm8,%xmm2
-.byte	102,68,15,56,0,255
-.byte	102,15,56,0,199
-	pxor	%xmm8,%xmm3
-	pxor	%xmm8,%xmm4
-.byte	102,15,56,0,207
-.byte	102,15,56,0,215
-	pxor	%xmm8,%xmm5
-	pxor	%xmm8,%xmm6
-.byte	102,15,56,0,223
-.byte	102,15,56,0,231
-.byte	102,15,56,0,239
-.byte	102,15,56,0,247
-	leaq	.LBS0(%rip),%r11
-	movl	%ebx,%r10d
-
-	call	_bsaes_encrypt8_bitslice
-
-	subq	$8,%r14
-	jc	.Lctr_enc_loop_done
-
-	movdqu	0(%r12),%xmm7
-	movdqu	16(%r12),%xmm8
-	movdqu	32(%r12),%xmm9
-	movdqu	48(%r12),%xmm10
-	movdqu	64(%r12),%xmm11
-	movdqu	80(%r12),%xmm12
-	movdqu	96(%r12),%xmm13
-	movdqu	112(%r12),%xmm14
-	leaq	128(%r12),%r12
-	pxor	%xmm15,%xmm7
-	movdqa	32(%rbp),%xmm15
-	pxor	%xmm8,%xmm0
-	movdqu	%xmm7,0(%r13)
-	pxor	%xmm9,%xmm3
-	movdqu	%xmm0,16(%r13)
-	pxor	%xmm10,%xmm5
-	movdqu	%xmm3,32(%r13)
-	pxor	%xmm11,%xmm2
-	movdqu	%xmm5,48(%r13)
-	pxor	%xmm12,%xmm6
-	movdqu	%xmm2,64(%r13)
-	pxor	%xmm13,%xmm1
-	movdqu	%xmm6,80(%r13)
-	pxor	%xmm14,%xmm4
-	movdqu	%xmm1,96(%r13)
-	leaq	.LADD1(%rip),%r11
-	movdqu	%xmm4,112(%r13)
-	leaq	128(%r13),%r13
-	paddd	112(%r11),%xmm15
-	jnz	.Lctr_enc_loop
-
-	jmp	.Lctr_enc_done
-.align	16
-.Lctr_enc_loop_done:
-	addq	$8,%r14
-	movdqu	0(%r12),%xmm7
-	pxor	%xmm7,%xmm15
-	movdqu	%xmm15,0(%r13)
-	cmpq	$2,%r14
-	jb	.Lctr_enc_done
-	movdqu	16(%r12),%xmm8
-	pxor	%xmm8,%xmm0
-	movdqu	%xmm0,16(%r13)
-	je	.Lctr_enc_done
-	movdqu	32(%r12),%xmm9
-	pxor	%xmm9,%xmm3
-	movdqu	%xmm3,32(%r13)
-	cmpq	$4,%r14
-	jb	.Lctr_enc_done
-	movdqu	48(%r12),%xmm10
-	pxor	%xmm10,%xmm5
-	movdqu	%xmm5,48(%r13)
-	je	.Lctr_enc_done
-	movdqu	64(%r12),%xmm11
-	pxor	%xmm11,%xmm2
-	movdqu	%xmm2,64(%r13)
-	cmpq	$6,%r14
-	jb	.Lctr_enc_done
-	movdqu	80(%r12),%xmm12
-	pxor	%xmm12,%xmm6
-	movdqu	%xmm6,80(%r13)
-	je	.Lctr_enc_done
-	movdqu	96(%r12),%xmm13
-	pxor	%xmm13,%xmm1
-	movdqu	%xmm1,96(%r13)
-	jmp	.Lctr_enc_done
-
-.align	16
-.Lctr_enc_short:
-	leaq	32(%rbp),%rdi
-	leaq	48(%rbp),%rsi
-	leaq	(%r15),%rdx
-	call	asm_AES_encrypt
-	movdqu	(%r12),%xmm0
-	leaq	16(%r12),%r12
-	movl	44(%rbp),%eax
-	bswapl	%eax
-	pxor	48(%rbp),%xmm0
-	incl	%eax
-	movdqu	%xmm0,(%r13)
-	bswapl	%eax
-	leaq	16(%r13),%r13
-	movl	%eax,44(%rsp)
-	decq	%r14
-	jnz	.Lctr_enc_short
-
-.Lctr_enc_done:
-	leaq	(%rsp),%rax
-	pxor	%xmm0,%xmm0
-.Lctr_enc_bzero:
-	movdqa	%xmm0,0(%rax)
-	movdqa	%xmm0,16(%rax)
-	leaq	32(%rax),%rax
-	cmpq	%rax,%rbp
-	ja	.Lctr_enc_bzero
-
-	leaq	120(%rbp),%rax
-.cfi_def_cfa	%rax,8
-	movq	-48(%rax),%r15
-.cfi_restore	%r15
-	movq	-40(%rax),%r14
-.cfi_restore	%r14
-	movq	-32(%rax),%r13
-.cfi_restore	%r13
-	movq	-24(%rax),%r12
-.cfi_restore	%r12
-	movq	-16(%rax),%rbx
-.cfi_restore	%rbx
-	movq	-8(%rax),%rbp
-.cfi_restore	%rbp
-	leaq	(%rax),%rsp
-.cfi_def_cfa_register	%rsp
-.Lctr_enc_epilogue:
-	.byte	0xf3,0xc3
-.cfi_endproc	
-.size	bsaes_ctr32_encrypt_blocks,.-bsaes_ctr32_encrypt_blocks
-.globl	bsaes_xts_encrypt
-.type	bsaes_xts_encrypt,@function
-.align	16
-bsaes_xts_encrypt:
-.cfi_startproc	
-	movq	%rsp,%rax
-.Lxts_enc_prologue:
-	pushq	%rbp
-.cfi_adjust_cfa_offset	8
-.cfi_offset	%rbp,-16
-	pushq	%rbx
-.cfi_adjust_cfa_offset	8
-.cfi_offset	%rbx,-24
-	pushq	%r12
-.cfi_adjust_cfa_offset	8
-.cfi_offset	%r12,-32
-	pushq	%r13
-.cfi_adjust_cfa_offset	8
-.cfi_offset	%r13,-40
-	pushq	%r14
-.cfi_adjust_cfa_offset	8
-.cfi_offset	%r14,-48
-	pushq	%r15
-.cfi_adjust_cfa_offset	8
-.cfi_offset	%r15,-56
-	leaq	-72(%rsp),%rsp
-.cfi_adjust_cfa_offset	0x48
-	movq	%rsp,%rbp
-.cfi_def_cfa_register	%rbp
-	movq	%rdi,%r12
-	movq	%rsi,%r13
-	movq	%rdx,%r14
-	movq	%rcx,%r15
-
-	leaq	(%r9),%rdi
-	leaq	32(%rbp),%rsi
-	leaq	(%r8),%rdx
-	call	asm_AES_encrypt
-
-	movl	240(%r15),%eax
-	movq	%r14,%rbx
-
-	movl	%eax,%edx
-	shlq	$7,%rax
-	subq	$96,%rax
-	subq	%rax,%rsp
-
-	movq	%rsp,%rax
-	movq	%r15,%rcx
-	movl	%edx,%r10d
-	call	_bsaes_key_convert
-	pxor	%xmm6,%xmm7
-	movdqa	%xmm7,(%rax)
-
-	andq	$-16,%r14
-	subq	$0x80,%rsp
-	movdqa	32(%rbp),%xmm6
-
-	pxor	%xmm14,%xmm14
-	movdqa	.Lxts_magic(%rip),%xmm12
-	pcmpgtd	%xmm6,%xmm14
-
-	subq	$0x80,%r14
-	jc	.Lxts_enc_short
-	jmp	.Lxts_enc_loop
-
-.align	16
-.Lxts_enc_loop:
-	pshufd	$0x13,%xmm14,%xmm13
-	pxor	%xmm14,%xmm14
-	movdqa	%xmm6,%xmm15
-	movdqa	%xmm6,0(%rsp)
-	paddq	%xmm6,%xmm6
-	pand	%xmm12,%xmm13
-	pcmpgtd	%xmm6,%xmm14
-	pxor	%xmm13,%xmm6
-	pshufd	$0x13,%xmm14,%xmm13
-	pxor	%xmm14,%xmm14
-	movdqa	%xmm6,%xmm0
-	movdqa	%xmm6,16(%rsp)
-	paddq	%xmm6,%xmm6
-	pand	%xmm12,%xmm13
-	pcmpgtd	%xmm6,%xmm14
-	pxor	%xmm13,%xmm6
-	movdqu	0(%r12),%xmm7
-	pshufd	$0x13,%xmm14,%xmm13
-	pxor	%xmm14,%xmm14
-	movdqa	%xmm6,%xmm1
-	movdqa	%xmm6,32(%rsp)
-	paddq	%xmm6,%xmm6
-	pand	%xmm12,%xmm13
-	pcmpgtd	%xmm6,%xmm14
-	pxor	%xmm13,%xmm6
-	movdqu	16(%r12),%xmm8
-	pxor	%xmm7,%xmm15
-	pshufd	$0x13,%xmm14,%xmm13
-	pxor	%xmm14,%xmm14
-	movdqa	%xmm6,%xmm2
-	movdqa	%xmm6,48(%rsp)
-	paddq	%xmm6,%xmm6
-	pand	%xmm12,%xmm13
-	pcmpgtd	%xmm6,%xmm14
-	pxor	%xmm13,%xmm6
-	movdqu	32(%r12),%xmm9
-	pxor	%xmm8,%xmm0
-	pshufd	$0x13,%xmm14,%xmm13
-	pxor	%xmm14,%xmm14
-	movdqa	%xmm6,%xmm3
-	movdqa	%xmm6,64(%rsp)
-	paddq	%xmm6,%xmm6
-	pand	%xmm12,%xmm13
-	pcmpgtd	%xmm6,%xmm14
-	pxor	%xmm13,%xmm6
-	movdqu	48(%r12),%xmm10
-	pxor	%xmm9,%xmm1
-	pshufd	$0x13,%xmm14,%xmm13
-	pxor	%xmm14,%xmm14
-	movdqa	%xmm6,%xmm4
-	movdqa	%xmm6,80(%rsp)
-	paddq	%xmm6,%xmm6
-	pand	%xmm12,%xmm13
-	pcmpgtd	%xmm6,%xmm14
-	pxor	%xmm13,%xmm6
-	movdqu	64(%r12),%xmm11
-	pxor	%xmm10,%xmm2
-	pshufd	$0x13,%xmm14,%xmm13
-	pxor	%xmm14,%xmm14
-	movdqa	%xmm6,%xmm5
-	movdqa	%xmm6,96(%rsp)
-	paddq	%xmm6,%xmm6
-	pand	%xmm12,%xmm13
-	pcmpgtd	%xmm6,%xmm14
-	pxor	%xmm13,%xmm6
-	movdqu	80(%r12),%xmm12
-	pxor	%xmm11,%xmm3
-	movdqu	96(%r12),%xmm13
-	pxor	%xmm12,%xmm4
-	movdqu	112(%r12),%xmm14
-	leaq	128(%r12),%r12
-	movdqa	%xmm6,112(%rsp)
-	pxor	%xmm13,%xmm5
-	leaq	128(%rsp),%rax
-	pxor	%xmm14,%xmm6
-	movl	%edx,%r10d
-
-	call	_bsaes_encrypt8
-
-	pxor	0(%rsp),%xmm15
-	pxor	16(%rsp),%xmm0
-	movdqu	%xmm15,0(%r13)
-	pxor	32(%rsp),%xmm3
-	movdqu	%xmm0,16(%r13)
-	pxor	48(%rsp),%xmm5
-	movdqu	%xmm3,32(%r13)
-	pxor	64(%rsp),%xmm2
-	movdqu	%xmm5,48(%r13)
-	pxor	80(%rsp),%xmm6
-	movdqu	%xmm2,64(%r13)
-	pxor	96(%rsp),%xmm1
-	movdqu	%xmm6,80(%r13)
-	pxor	112(%rsp),%xmm4
-	movdqu	%xmm1,96(%r13)
-	movdqu	%xmm4,112(%r13)
-	leaq	128(%r13),%r13
-
-	movdqa	112(%rsp),%xmm6
-	pxor	%xmm14,%xmm14
-	movdqa	.Lxts_magic(%rip),%xmm12
-	pcmpgtd	%xmm6,%xmm14
-	pshufd	$0x13,%xmm14,%xmm13
-	pxor	%xmm14,%xmm14
-	paddq	%xmm6,%xmm6
-	pand	%xmm12,%xmm13
-	pcmpgtd	%xmm6,%xmm14
-	pxor	%xmm13,%xmm6
-
-	subq	$0x80,%r14
-	jnc	.Lxts_enc_loop
-
-.Lxts_enc_short:
-	addq	$0x80,%r14
-	jz	.Lxts_enc_done
-	pshufd	$0x13,%xmm14,%xmm13
-	pxor	%xmm14,%xmm14
-	movdqa	%xmm6,%xmm15
-	movdqa	%xmm6,0(%rsp)
-	paddq	%xmm6,%xmm6
-	pand	%xmm12,%xmm13
-	pcmpgtd	%xmm6,%xmm14
-	pxor	%xmm13,%xmm6
-	pshufd	$0x13,%xmm14,%xmm13
-	pxor	%xmm14,%xmm14
-	movdqa	%xmm6,%xmm0
-	movdqa	%xmm6,16(%rsp)
-	paddq	%xmm6,%xmm6
-	pand	%xmm12,%xmm13
-	pcmpgtd	%xmm6,%xmm14
-	pxor	%xmm13,%xmm6
-	movdqu	0(%r12),%xmm7
-	cmpq	$16,%r14
-	je	.Lxts_enc_1
-	pshufd	$0x13,%xmm14,%xmm13
-	pxor	%xmm14,%xmm14
-	movdqa	%xmm6,%xmm1
-	movdqa	%xmm6,32(%rsp)
-	paddq	%xmm6,%xmm6
-	pand	%xmm12,%xmm13
-	pcmpgtd	%xmm6,%xmm14
-	pxor	%xmm13,%xmm6
-	movdqu	16(%r12),%xmm8
-	cmpq	$32,%r14
-	je	.Lxts_enc_2
-	pxor	%xmm7,%xmm15
-	pshufd	$0x13,%xmm14,%xmm13
-	pxor	%xmm14,%xmm14
-	movdqa	%xmm6,%xmm2
-	movdqa	%xmm6,48(%rsp)
-	paddq	%xmm6,%xmm6
-	pand	%xmm12,%xmm13
-	pcmpgtd	%xmm6,%xmm14
-	pxor	%xmm13,%xmm6
-	movdqu	32(%r12),%xmm9
-	cmpq	$48,%r14
-	je	.Lxts_enc_3
-	pxor	%xmm8,%xmm0
-	pshufd	$0x13,%xmm14,%xmm13
-	pxor	%xmm14,%xmm14
-	movdqa	%xmm6,%xmm3
-	movdqa	%xmm6,64(%rsp)
-	paddq	%xmm6,%xmm6
-	pand	%xmm12,%xmm13
-	pcmpgtd	%xmm6,%xmm14
-	pxor	%xmm13,%xmm6
-	movdqu	48(%r12),%xmm10
-	cmpq	$64,%r14
-	je	.Lxts_enc_4
-	pxor	%xmm9,%xmm1
-	pshufd	$0x13,%xmm14,%xmm13
-	pxor	%xmm14,%xmm14
-	movdqa	%xmm6,%xmm4
-	movdqa	%xmm6,80(%rsp)
-	paddq	%xmm6,%xmm6
-	pand	%xmm12,%xmm13
-	pcmpgtd	%xmm6,%xmm14
-	pxor	%xmm13,%xmm6
-	movdqu	64(%r12),%xmm11
-	cmpq	$80,%r14
-	je	.Lxts_enc_5
-	pxor	%xmm10,%xmm2
-	pshufd	$0x13,%xmm14,%xmm13
-	pxor	%xmm14,%xmm14
-	movdqa	%xmm6,%xmm5
-	movdqa	%xmm6,96(%rsp)
-	paddq	%xmm6,%xmm6
-	pand	%xmm12,%xmm13
-	pcmpgtd	%xmm6,%xmm14
-	pxor	%xmm13,%xmm6
-	movdqu	80(%r12),%xmm12
-	cmpq	$96,%r14
-	je	.Lxts_enc_6
-	pxor	%xmm11,%xmm3
-	movdqu	96(%r12),%xmm13
-	pxor	%xmm12,%xmm4
-	movdqa	%xmm6,112(%rsp)
-	leaq	112(%r12),%r12
-	pxor	%xmm13,%xmm5
-	leaq	128(%rsp),%rax
-	movl	%edx,%r10d
-
-	call	_bsaes_encrypt8
-
-	pxor	0(%rsp),%xmm15
-	pxor	16(%rsp),%xmm0
-	movdqu	%xmm15,0(%r13)
-	pxor	32(%rsp),%xmm3
-	movdqu	%xmm0,16(%r13)
-	pxor	48(%rsp),%xmm5
-	movdqu	%xmm3,32(%r13)
-	pxor	64(%rsp),%xmm2
-	movdqu	%xmm5,48(%r13)
-	pxor	80(%rsp),%xmm6
-	movdqu	%xmm2,64(%r13)
-	pxor	96(%rsp),%xmm1
-	movdqu	%xmm6,80(%r13)
-	movdqu	%xmm1,96(%r13)
-	leaq	112(%r13),%r13
-
-	movdqa	112(%rsp),%xmm6
-	jmp	.Lxts_enc_done
-.align	16
-.Lxts_enc_6:
-	pxor	%xmm11,%xmm3
-	leaq	96(%r12),%r12
-	pxor	%xmm12,%xmm4
-	leaq	128(%rsp),%rax
-	movl	%edx,%r10d
-
-	call	_bsaes_encrypt8
-
-	pxor	0(%rsp),%xmm15
-	pxor	16(%rsp),%xmm0
-	movdqu	%xmm15,0(%r13)
-	pxor	32(%rsp),%xmm3
-	movdqu	%xmm0,16(%r13)
-	pxor	48(%rsp),%xmm5
-	movdqu	%xmm3,32(%r13)
-	pxor	64(%rsp),%xmm2
-	movdqu	%xmm5,48(%r13)
-	pxor	80(%rsp),%xmm6
-	movdqu	%xmm2,64(%r13)
-	movdqu	%xmm6,80(%r13)
-	leaq	96(%r13),%r13
-
-	movdqa	96(%rsp),%xmm6
-	jmp	.Lxts_enc_done
-.align	16
-.Lxts_enc_5:
-	pxor	%xmm10,%xmm2
-	leaq	80(%r12),%r12
-	pxor	%xmm11,%xmm3
-	leaq	128(%rsp),%rax
-	movl	%edx,%r10d
-
-	call	_bsaes_encrypt8
-
-	pxor	0(%rsp),%xmm15
-	pxor	16(%rsp),%xmm0
-	movdqu	%xmm15,0(%r13)
-	pxor	32(%rsp),%xmm3
-	movdqu	%xmm0,16(%r13)
-	pxor	48(%rsp),%xmm5
-	movdqu	%xmm3,32(%r13)
-	pxor	64(%rsp),%xmm2
-	movdqu	%xmm5,48(%r13)
-	movdqu	%xmm2,64(%r13)
-	leaq	80(%r13),%r13
-
-	movdqa	80(%rsp),%xmm6
-	jmp	.Lxts_enc_done
-.align	16
-.Lxts_enc_4:
-	pxor	%xmm9,%xmm1
-	leaq	64(%r12),%r12
-	pxor	%xmm10,%xmm2
-	leaq	128(%rsp),%rax
-	movl	%edx,%r10d
-
-	call	_bsaes_encrypt8
-
-	pxor	0(%rsp),%xmm15
-	pxor	16(%rsp),%xmm0
-	movdqu	%xmm15,0(%r13)
-	pxor	32(%rsp),%xmm3
-	movdqu	%xmm0,16(%r13)
-	pxor	48(%rsp),%xmm5
-	movdqu	%xmm3,32(%r13)
-	movdqu	%xmm5,48(%r13)
-	leaq	64(%r13),%r13
-
-	movdqa	64(%rsp),%xmm6
-	jmp	.Lxts_enc_done
-.align	16
-.Lxts_enc_3:
-	pxor	%xmm8,%xmm0
-	leaq	48(%r12),%r12
-	pxor	%xmm9,%xmm1
-	leaq	128(%rsp),%rax
-	movl	%edx,%r10d
-
-	call	_bsaes_encrypt8
-
-	pxor	0(%rsp),%xmm15
-	pxor	16(%rsp),%xmm0
-	movdqu	%xmm15,0(%r13)
-	pxor	32(%rsp),%xmm3
-	movdqu	%xmm0,16(%r13)
-	movdqu	%xmm3,32(%r13)
-	leaq	48(%r13),%r13
-
-	movdqa	48(%rsp),%xmm6
-	jmp	.Lxts_enc_done
-.align	16
-.Lxts_enc_2:
-	pxor	%xmm7,%xmm15
-	leaq	32(%r12),%r12
-	pxor	%xmm8,%xmm0
-	leaq	128(%rsp),%rax
-	movl	%edx,%r10d
-
-	call	_bsaes_encrypt8
-
-	pxor	0(%rsp),%xmm15
-	pxor	16(%rsp),%xmm0
-	movdqu	%xmm15,0(%r13)
-	movdqu	%xmm0,16(%r13)
-	leaq	32(%r13),%r13
-
-	movdqa	32(%rsp),%xmm6
-	jmp	.Lxts_enc_done
-.align	16
-.Lxts_enc_1:
-	pxor	%xmm15,%xmm7
-	leaq	16(%r12),%r12
-	movdqa	%xmm7,32(%rbp)
-	leaq	32(%rbp),%rdi
-	leaq	32(%rbp),%rsi
-	leaq	(%r15),%rdx
-	call	asm_AES_encrypt
-	pxor	32(%rbp),%xmm15
-
-
-
-
-
-	movdqu	%xmm15,0(%r13)
-	leaq	16(%r13),%r13
-
-	movdqa	16(%rsp),%xmm6
-
-.Lxts_enc_done:
-	andl	$15,%ebx
-	jz	.Lxts_enc_ret
-	movq	%r13,%rdx
-
-.Lxts_enc_steal:
-	movzbl	(%r12),%eax
-	movzbl	-16(%rdx),%ecx
-	leaq	1(%r12),%r12
-	movb	%al,-16(%rdx)
-	movb	%cl,0(%rdx)
-	leaq	1(%rdx),%rdx
-	subl	$1,%ebx
-	jnz	.Lxts_enc_steal
-
-	movdqu	-16(%r13),%xmm15
-	leaq	32(%rbp),%rdi
-	pxor	%xmm6,%xmm15
-	leaq	32(%rbp),%rsi
-	movdqa	%xmm15,32(%rbp)
-	leaq	(%r15),%rdx
-	call	asm_AES_encrypt
-	pxor	32(%rbp),%xmm6
-	movdqu	%xmm6,-16(%r13)
-
-.Lxts_enc_ret:
-	leaq	(%rsp),%rax
-	pxor	%xmm0,%xmm0
-.Lxts_enc_bzero:
-	movdqa	%xmm0,0(%rax)
-	movdqa	%xmm0,16(%rax)
-	leaq	32(%rax),%rax
-	cmpq	%rax,%rbp
-	ja	.Lxts_enc_bzero
-
-	leaq	120(%rbp),%rax
-.cfi_def_cfa	%rax,8
-	movq	-48(%rax),%r15
-.cfi_restore	%r15
-	movq	-40(%rax),%r14
-.cfi_restore	%r14
-	movq	-32(%rax),%r13
-.cfi_restore	%r13
-	movq	-24(%rax),%r12
-.cfi_restore	%r12
-	movq	-16(%rax),%rbx
-.cfi_restore	%rbx
-	movq	-8(%rax),%rbp
-.cfi_restore	%rbp
-	leaq	(%rax),%rsp
-.cfi_def_cfa_register	%rsp
-.Lxts_enc_epilogue:
-	.byte	0xf3,0xc3
-.cfi_endproc	
-.size	bsaes_xts_encrypt,.-bsaes_xts_encrypt
-
-.globl	bsaes_xts_decrypt
-.type	bsaes_xts_decrypt,@function
-.align	16
-bsaes_xts_decrypt:
-.cfi_startproc	
-	movq	%rsp,%rax
-.Lxts_dec_prologue:
-	pushq	%rbp
-.cfi_adjust_cfa_offset	8
-.cfi_offset	%rbp,-16
-	pushq	%rbx
-.cfi_adjust_cfa_offset	8
-.cfi_offset	%rbx,-24
-	pushq	%r12
-.cfi_adjust_cfa_offset	8
-.cfi_offset	%r12,-32
-	pushq	%r13
-.cfi_adjust_cfa_offset	8
-.cfi_offset	%r13,-40
-	pushq	%r14
-.cfi_adjust_cfa_offset	8
-.cfi_offset	%r14,-48
-	pushq	%r15
-.cfi_adjust_cfa_offset	8
-.cfi_offset	%r15,-56
-	leaq	-72(%rsp),%rsp
-.cfi_adjust_cfa_offset	0x48
-	movq	%rsp,%rbp
-	movq	%rdi,%r12
-	movq	%rsi,%r13
-	movq	%rdx,%r14
-	movq	%rcx,%r15
-
-	leaq	(%r9),%rdi
-	leaq	32(%rbp),%rsi
-	leaq	(%r8),%rdx
-	call	asm_AES_encrypt
-
-	movl	240(%r15),%eax
-	movq	%r14,%rbx
-
-	movl	%eax,%edx
-	shlq	$7,%rax
-	subq	$96,%rax
-	subq	%rax,%rsp
-
-	movq	%rsp,%rax
-	movq	%r15,%rcx
-	movl	%edx,%r10d
-	call	_bsaes_key_convert
-	pxor	(%rsp),%xmm7
-	movdqa	%xmm6,(%rax)
-	movdqa	%xmm7,(%rsp)
-
-	xorl	%eax,%eax
-	andq	$-16,%r14
-	testl	$15,%ebx
-	setnz	%al
-	shlq	$4,%rax
-	subq	%rax,%r14
-
-	subq	$0x80,%rsp
-	movdqa	32(%rbp),%xmm6
-
-	pxor	%xmm14,%xmm14
-	movdqa	.Lxts_magic(%rip),%xmm12
-	pcmpgtd	%xmm6,%xmm14
-
-	subq	$0x80,%r14
-	jc	.Lxts_dec_short
-	jmp	.Lxts_dec_loop
-
-.align	16
-.Lxts_dec_loop:
-	pshufd	$0x13,%xmm14,%xmm13
-	pxor	%xmm14,%xmm14
-	movdqa	%xmm6,%xmm15
-	movdqa	%xmm6,0(%rsp)
-	paddq	%xmm6,%xmm6
-	pand	%xmm12,%xmm13
-	pcmpgtd	%xmm6,%xmm14
-	pxor	%xmm13,%xmm6
-	pshufd	$0x13,%xmm14,%xmm13
-	pxor	%xmm14,%xmm14
-	movdqa	%xmm6,%xmm0
-	movdqa	%xmm6,16(%rsp)
-	paddq	%xmm6,%xmm6
-	pand	%xmm12,%xmm13
-	pcmpgtd	%xmm6,%xmm14
-	pxor	%xmm13,%xmm6
-	movdqu	0(%r12),%xmm7
-	pshufd	$0x13,%xmm14,%xmm13
-	pxor	%xmm14,%xmm14
-	movdqa	%xmm6,%xmm1
-	movdqa	%xmm6,32(%rsp)
-	paddq	%xmm6,%xmm6
-	pand	%xmm12,%xmm13
-	pcmpgtd	%xmm6,%xmm14
-	pxor	%xmm13,%xmm6
-	movdqu	16(%r12),%xmm8
-	pxor	%xmm7,%xmm15
-	pshufd	$0x13,%xmm14,%xmm13
-	pxor	%xmm14,%xmm14
-	movdqa	%xmm6,%xmm2
-	movdqa	%xmm6,48(%rsp)
-	paddq	%xmm6,%xmm6
-	pand	%xmm12,%xmm13
-	pcmpgtd	%xmm6,%xmm14
-	pxor	%xmm13,%xmm6
-	movdqu	32(%r12),%xmm9
-	pxor	%xmm8,%xmm0
-	pshufd	$0x13,%xmm14,%xmm13
-	pxor	%xmm14,%xmm14
-	movdqa	%xmm6,%xmm3
-	movdqa	%xmm6,64(%rsp)
-	paddq	%xmm6,%xmm6
-	pand	%xmm12,%xmm13
-	pcmpgtd	%xmm6,%xmm14
-	pxor	%xmm13,%xmm6
-	movdqu	48(%r12),%xmm10
-	pxor	%xmm9,%xmm1
-	pshufd	$0x13,%xmm14,%xmm13
-	pxor	%xmm14,%xmm14
-	movdqa	%xmm6,%xmm4
-	movdqa	%xmm6,80(%rsp)
-	paddq	%xmm6,%xmm6
-	pand	%xmm12,%xmm13
-	pcmpgtd	%xmm6,%xmm14
-	pxor	%xmm13,%xmm6
-	movdqu	64(%r12),%xmm11
-	pxor	%xmm10,%xmm2
-	pshufd	$0x13,%xmm14,%xmm13
-	pxor	%xmm14,%xmm14
-	movdqa	%xmm6,%xmm5
-	movdqa	%xmm6,96(%rsp)
-	paddq	%xmm6,%xmm6
-	pand	%xmm12,%xmm13
-	pcmpgtd	%xmm6,%xmm14
-	pxor	%xmm13,%xmm6
-	movdqu	80(%r12),%xmm12
-	pxor	%xmm11,%xmm3
-	movdqu	96(%r12),%xmm13
-	pxor	%xmm12,%xmm4
-	movdqu	112(%r12),%xmm14
-	leaq	128(%r12),%r12
-	movdqa	%xmm6,112(%rsp)
-	pxor	%xmm13,%xmm5
-	leaq	128(%rsp),%rax
-	pxor	%xmm14,%xmm6
-	movl	%edx,%r10d
-
-	call	_bsaes_decrypt8
-
-	pxor	0(%rsp),%xmm15
-	pxor	16(%rsp),%xmm0
-	movdqu	%xmm15,0(%r13)
-	pxor	32(%rsp),%xmm5
-	movdqu	%xmm0,16(%r13)
-	pxor	48(%rsp),%xmm3
-	movdqu	%xmm5,32(%r13)
-	pxor	64(%rsp),%xmm1
-	movdqu	%xmm3,48(%r13)
-	pxor	80(%rsp),%xmm6
-	movdqu	%xmm1,64(%r13)
-	pxor	96(%rsp),%xmm2
-	movdqu	%xmm6,80(%r13)
-	pxor	112(%rsp),%xmm4
-	movdqu	%xmm2,96(%r13)
-	movdqu	%xmm4,112(%r13)
-	leaq	128(%r13),%r13
-
-	movdqa	112(%rsp),%xmm6
-	pxor	%xmm14,%xmm14
-	movdqa	.Lxts_magic(%rip),%xmm12
-	pcmpgtd	%xmm6,%xmm14
-	pshufd	$0x13,%xmm14,%xmm13
-	pxor	%xmm14,%xmm14
-	paddq	%xmm6,%xmm6
-	pand	%xmm12,%xmm13
-	pcmpgtd	%xmm6,%xmm14
-	pxor	%xmm13,%xmm6
-
-	subq	$0x80,%r14
-	jnc	.Lxts_dec_loop
-
-.Lxts_dec_short:
-	addq	$0x80,%r14
-	jz	.Lxts_dec_done
-	pshufd	$0x13,%xmm14,%xmm13
-	pxor	%xmm14,%xmm14
-	movdqa	%xmm6,%xmm15
-	movdqa	%xmm6,0(%rsp)
-	paddq	%xmm6,%xmm6
-	pand	%xmm12,%xmm13
-	pcmpgtd	%xmm6,%xmm14
-	pxor	%xmm13,%xmm6
-	pshufd	$0x13,%xmm14,%xmm13
-	pxor	%xmm14,%xmm14
-	movdqa	%xmm6,%xmm0
-	movdqa	%xmm6,16(%rsp)
-	paddq	%xmm6,%xmm6
-	pand	%xmm12,%xmm13
-	pcmpgtd	%xmm6,%xmm14
-	pxor	%xmm13,%xmm6
-	movdqu	0(%r12),%xmm7
-	cmpq	$16,%r14
-	je	.Lxts_dec_1
-	pshufd	$0x13,%xmm14,%xmm13
-	pxor	%xmm14,%xmm14
-	movdqa	%xmm6,%xmm1
-	movdqa	%xmm6,32(%rsp)
-	paddq	%xmm6,%xmm6
-	pand	%xmm12,%xmm13
-	pcmpgtd	%xmm6,%xmm14
-	pxor	%xmm13,%xmm6
-	movdqu	16(%r12),%xmm8
-	cmpq	$32,%r14
-	je	.Lxts_dec_2
-	pxor	%xmm7,%xmm15
-	pshufd	$0x13,%xmm14,%xmm13
-	pxor	%xmm14,%xmm14
-	movdqa	%xmm6,%xmm2
-	movdqa	%xmm6,48(%rsp)
-	paddq	%xmm6,%xmm6
-	pand	%xmm12,%xmm13
-	pcmpgtd	%xmm6,%xmm14
-	pxor	%xmm13,%xmm6
-	movdqu	32(%r12),%xmm9
-	cmpq	$48,%r14
-	je	.Lxts_dec_3
-	pxor	%xmm8,%xmm0
-	pshufd	$0x13,%xmm14,%xmm13
-	pxor	%xmm14,%xmm14
-	movdqa	%xmm6,%xmm3
-	movdqa	%xmm6,64(%rsp)
-	paddq	%xmm6,%xmm6
-	pand	%xmm12,%xmm13
-	pcmpgtd	%xmm6,%xmm14
-	pxor	%xmm13,%xmm6
-	movdqu	48(%r12),%xmm10
-	cmpq	$64,%r14
-	je	.Lxts_dec_4
-	pxor	%xmm9,%xmm1
-	pshufd	$0x13,%xmm14,%xmm13
-	pxor	%xmm14,%xmm14
-	movdqa	%xmm6,%xmm4
-	movdqa	%xmm6,80(%rsp)
-	paddq	%xmm6,%xmm6
-	pand	%xmm12,%xmm13
-	pcmpgtd	%xmm6,%xmm14
-	pxor	%xmm13,%xmm6
-	movdqu	64(%r12),%xmm11
-	cmpq	$80,%r14
-	je	.Lxts_dec_5
-	pxor	%xmm10,%xmm2
-	pshufd	$0x13,%xmm14,%xmm13
-	pxor	%xmm14,%xmm14
-	movdqa	%xmm6,%xmm5
-	movdqa	%xmm6,96(%rsp)
-	paddq	%xmm6,%xmm6
-	pand	%xmm12,%xmm13
-	pcmpgtd	%xmm6,%xmm14
-	pxor	%xmm13,%xmm6
-	movdqu	80(%r12),%xmm12
-	cmpq	$96,%r14
-	je	.Lxts_dec_6
-	pxor	%xmm11,%xmm3
-	movdqu	96(%r12),%xmm13
-	pxor	%xmm12,%xmm4
-	movdqa	%xmm6,112(%rsp)
-	leaq	112(%r12),%r12
-	pxor	%xmm13,%xmm5
-	leaq	128(%rsp),%rax
-	movl	%edx,%r10d
-
-	call	_bsaes_decrypt8
-
-	pxor	0(%rsp),%xmm15
-	pxor	16(%rsp),%xmm0
-	movdqu	%xmm15,0(%r13)
-	pxor	32(%rsp),%xmm5
-	movdqu	%xmm0,16(%r13)
-	pxor	48(%rsp),%xmm3
-	movdqu	%xmm5,32(%r13)
-	pxor	64(%rsp),%xmm1
-	movdqu	%xmm3,48(%r13)
-	pxor	80(%rsp),%xmm6
-	movdqu	%xmm1,64(%r13)
-	pxor	96(%rsp),%xmm2
-	movdqu	%xmm6,80(%r13)
-	movdqu	%xmm2,96(%r13)
-	leaq	112(%r13),%r13
-
-	movdqa	112(%rsp),%xmm6
-	jmp	.Lxts_dec_done
-.align	16
-.Lxts_dec_6:
-	pxor	%xmm11,%xmm3
-	leaq	96(%r12),%r12
-	pxor	%xmm12,%xmm4
-	leaq	128(%rsp),%rax
-	movl	%edx,%r10d
-
-	call	_bsaes_decrypt8
-
-	pxor	0(%rsp),%xmm15
-	pxor	16(%rsp),%xmm0
-	movdqu	%xmm15,0(%r13)
-	pxor	32(%rsp),%xmm5
-	movdqu	%xmm0,16(%r13)
-	pxor	48(%rsp),%xmm3
-	movdqu	%xmm5,32(%r13)
-	pxor	64(%rsp),%xmm1
-	movdqu	%xmm3,48(%r13)
-	pxor	80(%rsp),%xmm6
-	movdqu	%xmm1,64(%r13)
-	movdqu	%xmm6,80(%r13)
-	leaq	96(%r13),%r13
-
-	movdqa	96(%rsp),%xmm6
-	jmp	.Lxts_dec_done
-.align	16
-.Lxts_dec_5:
-	pxor	%xmm10,%xmm2
-	leaq	80(%r12),%r12
-	pxor	%xmm11,%xmm3
-	leaq	128(%rsp),%rax
-	movl	%edx,%r10d
-
-	call	_bsaes_decrypt8
-
-	pxor	0(%rsp),%xmm15
-	pxor	16(%rsp),%xmm0
-	movdqu	%xmm15,0(%r13)
-	pxor	32(%rsp),%xmm5
-	movdqu	%xmm0,16(%r13)
-	pxor	48(%rsp),%xmm3
-	movdqu	%xmm5,32(%r13)
-	pxor	64(%rsp),%xmm1
-	movdqu	%xmm3,48(%r13)
-	movdqu	%xmm1,64(%r13)
-	leaq	80(%r13),%r13
-
-	movdqa	80(%rsp),%xmm6
-	jmp	.Lxts_dec_done
-.align	16
-.Lxts_dec_4:
-	pxor	%xmm9,%xmm1
-	leaq	64(%r12),%r12
-	pxor	%xmm10,%xmm2
-	leaq	128(%rsp),%rax
-	movl	%edx,%r10d
-
-	call	_bsaes_decrypt8
-
-	pxor	0(%rsp),%xmm15
-	pxor	16(%rsp),%xmm0
-	movdqu	%xmm15,0(%r13)
-	pxor	32(%rsp),%xmm5
-	movdqu	%xmm0,16(%r13)
-	pxor	48(%rsp),%xmm3
-	movdqu	%xmm5,32(%r13)
-	movdqu	%xmm3,48(%r13)
-	leaq	64(%r13),%r13
-
-	movdqa	64(%rsp),%xmm6
-	jmp	.Lxts_dec_done
-.align	16
-.Lxts_dec_3:
-	pxor	%xmm8,%xmm0
-	leaq	48(%r12),%r12
-	pxor	%xmm9,%xmm1
-	leaq	128(%rsp),%rax
-	movl	%edx,%r10d
-
-	call	_bsaes_decrypt8
-
-	pxor	0(%rsp),%xmm15
-	pxor	16(%rsp),%xmm0
-	movdqu	%xmm15,0(%r13)
-	pxor	32(%rsp),%xmm5
-	movdqu	%xmm0,16(%r13)
-	movdqu	%xmm5,32(%r13)
-	leaq	48(%r13),%r13
-
-	movdqa	48(%rsp),%xmm6
-	jmp	.Lxts_dec_done
-.align	16
-.Lxts_dec_2:
-	pxor	%xmm7,%xmm15
-	leaq	32(%r12),%r12
-	pxor	%xmm8,%xmm0
-	leaq	128(%rsp),%rax
-	movl	%edx,%r10d
-
-	call	_bsaes_decrypt8
-
-	pxor	0(%rsp),%xmm15
-	pxor	16(%rsp),%xmm0
-	movdqu	%xmm15,0(%r13)
-	movdqu	%xmm0,16(%r13)
-	leaq	32(%r13),%r13
-
-	movdqa	32(%rsp),%xmm6
-	jmp	.Lxts_dec_done
-.align	16
-.Lxts_dec_1:
-	pxor	%xmm15,%xmm7
-	leaq	16(%r12),%r12
-	movdqa	%xmm7,32(%rbp)
-	leaq	32(%rbp),%rdi
-	leaq	32(%rbp),%rsi
-	leaq	(%r15),%rdx
-	call	asm_AES_decrypt
-	pxor	32(%rbp),%xmm15
-
-
-
-
-
-	movdqu	%xmm15,0(%r13)
-	leaq	16(%r13),%r13
-
-	movdqa	16(%rsp),%xmm6
-
-.Lxts_dec_done:
-	andl	$15,%ebx
-	jz	.Lxts_dec_ret
-
-	pxor	%xmm14,%xmm14
-	movdqa	.Lxts_magic(%rip),%xmm12
-	pcmpgtd	%xmm6,%xmm14
-	pshufd	$0x13,%xmm14,%xmm13
-	movdqa	%xmm6,%xmm5
-	paddq	%xmm6,%xmm6
-	pand	%xmm12,%xmm13
-	movdqu	(%r12),%xmm15
-	pxor	%xmm13,%xmm6
-
-	leaq	32(%rbp),%rdi
-	pxor	%xmm6,%xmm15
-	leaq	32(%rbp),%rsi
-	movdqa	%xmm15,32(%rbp)
-	leaq	(%r15),%rdx
-	call	asm_AES_decrypt
-	pxor	32(%rbp),%xmm6
-	movq	%r13,%rdx
-	movdqu	%xmm6,(%r13)
-
-.Lxts_dec_steal:
-	movzbl	16(%r12),%eax
-	movzbl	(%rdx),%ecx
-	leaq	1(%r12),%r12
-	movb	%al,(%rdx)
-	movb	%cl,16(%rdx)
-	leaq	1(%rdx),%rdx
-	subl	$1,%ebx
-	jnz	.Lxts_dec_steal
-
-	movdqu	(%r13),%xmm15
-	leaq	32(%rbp),%rdi
-	pxor	%xmm5,%xmm15
-	leaq	32(%rbp),%rsi
-	movdqa	%xmm15,32(%rbp)
-	leaq	(%r15),%rdx
-	call	asm_AES_decrypt
-	pxor	32(%rbp),%xmm5
-	movdqu	%xmm5,(%r13)
-
-.Lxts_dec_ret:
-	leaq	(%rsp),%rax
-	pxor	%xmm0,%xmm0
-.Lxts_dec_bzero:
-	movdqa	%xmm0,0(%rax)
-	movdqa	%xmm0,16(%rax)
-	leaq	32(%rax),%rax
-	cmpq	%rax,%rbp
-	ja	.Lxts_dec_bzero
-
-	leaq	120(%rbp),%rax
-.cfi_def_cfa	%rax,8
-	movq	-48(%rax),%r15
-.cfi_restore	%r15
-	movq	-40(%rax),%r14
-.cfi_restore	%r14
-	movq	-32(%rax),%r13
-.cfi_restore	%r13
-	movq	-24(%rax),%r12
-.cfi_restore	%r12
-	movq	-16(%rax),%rbx
-.cfi_restore	%rbx
-	movq	-8(%rax),%rbp
-.cfi_restore	%rbp
-	leaq	(%rax),%rsp
-.cfi_def_cfa_register	%rsp
-.Lxts_dec_epilogue:
-	.byte	0xf3,0xc3
-.cfi_endproc	
-.size	bsaes_xts_decrypt,.-bsaes_xts_decrypt
-.type	_bsaes_const,@object
-.align	64
-_bsaes_const:
-.LM0ISR:
-.quad	0x0a0e0206070b0f03, 0x0004080c0d010509
-.LISRM0:
-.quad	0x01040b0e0205080f, 0x0306090c00070a0d
-.LISR:
-.quad	0x0504070602010003, 0x0f0e0d0c080b0a09
-.LBS0:
-.quad	0x5555555555555555, 0x5555555555555555
-.LBS1:
-.quad	0x3333333333333333, 0x3333333333333333
-.LBS2:
-.quad	0x0f0f0f0f0f0f0f0f, 0x0f0f0f0f0f0f0f0f
-.LSR:
-.quad	0x0504070600030201, 0x0f0e0d0c0a09080b
-.LSRM0:
-.quad	0x0304090e00050a0f, 0x01060b0c0207080d
-.LM0SR:
-.quad	0x0a0e02060f03070b, 0x0004080c05090d01
-.LSWPUP:
-.quad	0x0706050403020100, 0x0c0d0e0f0b0a0908
-.LSWPUPM0SR:
-.quad	0x0a0d02060c03070b, 0x0004080f05090e01
-.LADD1:
-.quad	0x0000000000000000, 0x0000000100000000
-.LADD2:
-.quad	0x0000000000000000, 0x0000000200000000
-.LADD3:
-.quad	0x0000000000000000, 0x0000000300000000
-.LADD4:
-.quad	0x0000000000000000, 0x0000000400000000
-.LADD5:
-.quad	0x0000000000000000, 0x0000000500000000
-.LADD6:
-.quad	0x0000000000000000, 0x0000000600000000
-.LADD7:
-.quad	0x0000000000000000, 0x0000000700000000
-.LADD8:
-.quad	0x0000000000000000, 0x0000000800000000
-.Lxts_magic:
-.long	0x87,0,1,0
-.Lmasks:
-.quad	0x0101010101010101, 0x0101010101010101
-.quad	0x0202020202020202, 0x0202020202020202
-.quad	0x0404040404040404, 0x0404040404040404
-.quad	0x0808080808080808, 0x0808080808080808
-.LM0:
-.quad	0x02060a0e03070b0f, 0x0004080c0105090d
-.L63:
-.quad	0x6363636363636363, 0x6363636363636363
-.byte	66,105,116,45,115,108,105,99,101,100,32,65,69,83,32,102,111,114,32,120,56,54,95,54,52,47,83,83,83,69,51,44,32,69,109,105,108,105,97,32,75,195,164,115,112,101,114,44,32,80,101,116,101,114,32,83,99,104,119,97,98,101,44,32,65,110,100,121,32,80,111,108,121,97,107,111,118,0
-.align	64
-.size	_bsaes_const,.-_bsaes_const
diff --git a/deps/openssl/config/archs/BSD-x86_64/asm_avx2/crypto/bn/rsaz-x86_64.s b/deps/openssl/config/archs/BSD-x86_64/asm_avx2/crypto/bn/rsaz-x86_64.s
index f8e4a80588..7876e0b8f9 100644
--- a/deps/openssl/config/archs/BSD-x86_64/asm_avx2/crypto/bn/rsaz-x86_64.s
+++ b/deps/openssl/config/archs/BSD-x86_64/asm_avx2/crypto/bn/rsaz-x86_64.s
@@ -29,7 +29,7 @@ rsaz_512_sqr:
 	subq	$128+24,%rsp
 .cfi_adjust_cfa_offset	128+24
 .Lsqr_body:
-	movq	%rdx,%rbp
+.byte	102,72,15,110,202
 	movq	(%rsi),%rdx
 	movq	8(%rsi),%rax
 	movq	%rcx,128(%rsp)
@@ -44,6 +44,7 @@ rsaz_512_sqr:
 	movl	%r8d,128+8(%rsp)
 
 	movq	%rdx,%rbx
+	movq	%rax,%rbp
 	mulq	%rdx
 	movq	%rax,%r8
 	movq	16(%rsi),%rax
@@ -82,31 +83,29 @@ rsaz_512_sqr:
 	mulq	%rbx
 	addq	%rax,%r14
 	movq	%rbx,%rax
-	movq	%rdx,%r15
-	adcq	$0,%r15
+	adcq	$0,%rdx
 
+	xorq	%rcx,%rcx
 	addq	%r8,%r8
-	movq	%r9,%rcx
-	adcq	%r9,%r9
+	movq	%rdx,%r15
+	adcq	$0,%rcx
 
 	mulq	%rax
-	movq	%rax,(%rsp)
-	addq	%rdx,%r8
-	adcq	$0,%r9
+	addq	%r8,%rdx
+	adcq	$0,%rcx
 
-	movq	%r8,8(%rsp)
-	shrq	$63,%rcx
+	movq	%rax,(%rsp)
+	movq	%rdx,8(%rsp)
 
 
-	movq	8(%rsi),%r8
 	movq	16(%rsi),%rax
-	mulq	%r8
+	mulq	%rbp
 	addq	%rax,%r10
 	movq	24(%rsi),%rax
 	movq	%rdx,%rbx
 	adcq	$0,%rbx
 
-	mulq	%r8
+	mulq	%rbp
 	addq	%rax,%r11
 	movq	32(%rsi),%rax
 	adcq	$0,%rdx
@@ -114,7 +113,7 @@ rsaz_512_sqr:
 	movq	%rdx,%rbx
 	adcq	$0,%rbx
 
-	mulq	%r8
+	mulq	%rbp
 	addq	%rax,%r12
 	movq	40(%rsi),%rax
 	adcq	$0,%rdx
@@ -122,7 +121,7 @@ rsaz_512_sqr:
 	movq	%rdx,%rbx
 	adcq	$0,%rbx
 
-	mulq	%r8
+	mulq	%rbp
 	addq	%rax,%r13
 	movq	48(%rsi),%rax
 	adcq	$0,%rdx
@@ -130,7 +129,7 @@ rsaz_512_sqr:
 	movq	%rdx,%rbx
 	adcq	$0,%rbx
 
-	mulq	%r8
+	mulq	%rbp
 	addq	%rax,%r14
 	movq	56(%rsi),%rax
 	adcq	$0,%rdx
@@ -138,39 +137,39 @@ rsaz_512_sqr:
 	movq	%rdx,%rbx
 	adcq	$0,%rbx
 
-	mulq	%r8
+	mulq	%rbp
 	addq	%rax,%r15
-	movq	%r8,%rax
+	movq	%rbp,%rax
 	adcq	$0,%rdx
 	addq	%rbx,%r15
-	movq	%rdx,%r8
-	movq	%r10,%rdx
-	adcq	$0,%r8
+	adcq	$0,%rdx
 
-	addq	%rdx,%rdx
-	leaq	(%rcx,%r10,2),%r10
-	movq	%r11,%rbx
-	adcq	%r11,%r11
+	xorq	%rbx,%rbx
+	addq	%r9,%r9
+	movq	%rdx,%r8
+	adcq	%r10,%r10
+	adcq	$0,%rbx
 
 	mulq	%rax
+
+	addq	%rcx,%rax
+	movq	16(%rsi),%rbp
 	addq	%rax,%r9
+	movq	24(%rsi),%rax
 	adcq	%rdx,%r10
-	adcq	$0,%r11
+	adcq	$0,%rbx
 
 	movq	%r9,16(%rsp)
 	movq	%r10,24(%rsp)
-	shrq	$63,%rbx
 
 
-	movq	16(%rsi),%r9
-	movq	24(%rsi),%rax
-	mulq	%r9
+	mulq	%rbp
 	addq	%rax,%r12
 	movq	32(%rsi),%rax
 	movq	%rdx,%rcx
 	adcq	$0,%rcx
 
-	mulq	%r9
+	mulq	%rbp
 	addq	%rax,%r13
 	movq	40(%rsi),%rax
 	adcq	$0,%rdx
@@ -178,7 +177,7 @@ rsaz_512_sqr:
 	movq	%rdx,%rcx
 	adcq	$0,%rcx
 
-	mulq	%r9
+	mulq	%rbp
 	addq	%rax,%r14
 	movq	48(%rsi),%rax
 	adcq	$0,%rdx
@@ -186,9 +185,7 @@ rsaz_512_sqr:
 	movq	%rdx,%rcx
 	adcq	$0,%rcx
 
-	mulq	%r9
-	movq	%r12,%r10
-	leaq	(%rbx,%r12,2),%r12
+	mulq	%rbp
 	addq	%rax,%r15
 	movq	56(%rsi),%rax
 	adcq	$0,%rdx
@@ -196,36 +193,40 @@ rsaz_512_sqr:
 	movq	%rdx,%rcx
 	adcq	$0,%rcx
 
-	mulq	%r9
-	shrq	$63,%r10
+	mulq	%rbp
 	addq	%rax,%r8
-	movq	%r9,%rax
+	movq	%rbp,%rax
 	adcq	$0,%rdx
 	addq	%rcx,%r8
-	movq	%rdx,%r9
-	adcq	$0,%r9
+	adcq	$0,%rdx
 
-	movq	%r13,%rcx
-	leaq	(%r10,%r13,2),%r13
+	xorq	%rcx,%rcx
+	addq	%r11,%r11
+	movq	%rdx,%r9
+	adcq	%r12,%r12
+	adcq	$0,%rcx
 
 	mulq	%rax
+
+	addq	%rbx,%rax
+	movq	24(%rsi),%r10
 	addq	%rax,%r11
+	movq	32(%rsi),%rax
 	adcq	%rdx,%r12
-	adcq	$0,%r13
+	adcq	$0,%rcx
 
 	movq	%r11,32(%rsp)
 	movq	%r12,40(%rsp)
-	shrq	$63,%rcx
 
 
-	movq	24(%rsi),%r10
-	movq	32(%rsi),%rax
+	movq	%rax,%r11
 	mulq	%r10
 	addq	%rax,%r14
 	movq	40(%rsi),%rax
 	movq	%rdx,%rbx
 	adcq	$0,%rbx
 
+	movq	%rax,%r12
 	mulq	%r10
 	addq	%rax,%r15
 	movq	48(%rsi),%rax
@@ -234,9 +235,8 @@ rsaz_512_sqr:
 	movq	%rdx,%rbx
 	adcq	$0,%rbx
 
+	movq	%rax,%rbp
 	mulq	%r10
-	movq	%r14,%r12
-	leaq	(%rcx,%r14,2),%r14
 	addq	%rax,%r8
 	movq	56(%rsi),%rax
 	adcq	$0,%rdx
@@ -245,32 +245,33 @@ rsaz_512_sqr:
 	adcq	$0,%rbx
 
 	mulq	%r10
-	shrq	$63,%r12
 	addq	%rax,%r9
 	movq	%r10,%rax
 	adcq	$0,%rdx
 	addq	%rbx,%r9
-	movq	%rdx,%r10
-	adcq	$0,%r10
+	adcq	$0,%rdx
 
-	movq	%r15,%rbx
-	leaq	(%r12,%r15,2),%r15
+	xorq	%rbx,%rbx
+	addq	%r13,%r13
+	movq	%rdx,%r10
+	adcq	%r14,%r14
+	adcq	$0,%rbx
 
 	mulq	%rax
+
+	addq	%rcx,%rax
 	addq	%rax,%r13
+	movq	%r12,%rax
 	adcq	%rdx,%r14
-	adcq	$0,%r15
+	adcq	$0,%rbx
 
 	movq	%r13,48(%rsp)
 	movq	%r14,56(%rsp)
-	shrq	$63,%rbx
 
 
-	movq	32(%rsi),%r11
-	movq	40(%rsi),%rax
 	mulq	%r11
 	addq	%rax,%r8
-	movq	48(%rsi),%rax
+	movq	%rbp,%rax
 	movq	%rdx,%rcx
 	adcq	$0,%rcx
 
@@ -278,97 +279,99 @@ rsaz_512_sqr:
 	addq	%rax,%r9
 	movq	56(%rsi),%rax
 	adcq	$0,%rdx
-	movq	%r8,%r12
-	leaq	(%rbx,%r8,2),%r8
 	addq	%rcx,%r9
 	movq	%rdx,%rcx
 	adcq	$0,%rcx
 
+	movq	%rax,%r14
 	mulq	%r11
-	shrq	$63,%r12
 	addq	%rax,%r10
 	movq	%r11,%rax
 	adcq	$0,%rdx
 	addq	%rcx,%r10
-	movq	%rdx,%r11
-	adcq	$0,%r11
+	adcq	$0,%rdx
 
-	movq	%r9,%rcx
-	leaq	(%r12,%r9,2),%r9
+	xorq	%rcx,%rcx
+	addq	%r15,%r15
+	movq	%rdx,%r11
+	adcq	%r8,%r8
+	adcq	$0,%rcx
 
 	mulq	%rax
+
+	addq	%rbx,%rax
 	addq	%rax,%r15
+	movq	%rbp,%rax
 	adcq	%rdx,%r8
-	adcq	$0,%r9
+	adcq	$0,%rcx
 
 	movq	%r15,64(%rsp)
 	movq	%r8,72(%rsp)
-	shrq	$63,%rcx
 
 
-	movq	40(%rsi),%r12
-	movq	48(%rsi),%rax
 	mulq	%r12
 	addq	%rax,%r10
-	movq	56(%rsi),%rax
+	movq	%r14,%rax
 	movq	%rdx,%rbx
 	adcq	$0,%rbx
 
 	mulq	%r12
 	addq	%rax,%r11
 	movq	%r12,%rax
-	movq	%r10,%r15
-	leaq	(%rcx,%r10,2),%r10
 	adcq	$0,%rdx
-	shrq	$63,%r15
 	addq	%rbx,%r11
-	movq	%rdx,%r12
-	adcq	$0,%r12
+	adcq	$0,%rdx
 
-	movq	%r11,%rbx
-	leaq	(%r15,%r11,2),%r11
+	xorq	%rbx,%rbx
+	addq	%r9,%r9
+	movq	%rdx,%r12
+	adcq	%r10,%r10
+	adcq	$0,%rbx
 
 	mulq	%rax
+
+	addq	%rcx,%rax
 	addq	%rax,%r9
+	movq	%r14,%rax
 	adcq	%rdx,%r10
-	adcq	$0,%r11
+	adcq	$0,%rbx
 
 	movq	%r9,80(%rsp)
 	movq	%r10,88(%rsp)
 
 
-	movq	48(%rsi),%r13
-	movq	56(%rsi),%rax
-	mulq	%r13
+	mulq	%rbp
 	addq	%rax,%r12
-	movq	%r13,%rax
-	movq	%rdx,%r13
-	adcq	$0,%r13
+	movq	%rbp,%rax
+	adcq	$0,%rdx
 
-	xorq	%r14,%r14
-	shlq	$1,%rbx
+	xorq	%rcx,%rcx
+	addq	%r11,%r11
+	movq	%rdx,%r13
 	adcq	%r12,%r12
-	adcq	%r13,%r13
-	adcq	%r14,%r14
+	adcq	$0,%rcx
 
 	mulq	%rax
+
+	addq	%rbx,%rax
 	addq	%rax,%r11
+	movq	%r14,%rax
 	adcq	%rdx,%r12
-	adcq	$0,%r13
+	adcq	$0,%rcx
 
 	movq	%r11,96(%rsp)
 	movq	%r12,104(%rsp)
 
 
-	movq	56(%rsi),%rax
-	mulq	%rax
-	addq	%rax,%r13
-	adcq	$0,%rdx
+	xorq	%rbx,%rbx
+	addq	%r13,%r13
+	adcq	$0,%rbx
 
-	addq	%rdx,%r14
+	mulq	%rax
 
-	movq	%r13,112(%rsp)
-	movq	%r14,120(%rsp)
+	addq	%rcx,%rax
+	addq	%r13,%rax
+	adcq	%rbx,%rdx
 
 	movq	(%rsp),%r8
 	movq	8(%rsp),%r9
@@ -378,6 +381,10 @@ rsaz_512_sqr:
 	movq	40(%rsp),%r13
 	movq	48(%rsp),%r14
 	movq	56(%rsp),%r15
+.byte	102,72,15,126,205
+
+	movq	%rax,112(%rsp)
+	movq	%rdx,120(%rsp)
 
 	call	__rsaz_512_reduce
 
@@ -406,9 +413,9 @@ rsaz_512_sqr:
 .Loop_sqrx:
 	movl	%r8d,128+8(%rsp)
 .byte	102,72,15,110,199
-.byte	102,72,15,110,205
 
 	mulxq	%rax,%r8,%r9
+	movq	%rax,%rbx
 
 	mulxq	16(%rsi),%rcx,%r10
 	xorq	%rbp,%rbp
@@ -416,40 +423,39 @@ rsaz_512_sqr:
 	mulxq	24(%rsi),%rax,%r11
 	adcxq	%rcx,%r9
 
-	mulxq	32(%rsi),%rcx,%r12
+.byte	0xc4,0x62,0xf3,0xf6,0xa6,0x20,0x00,0x00,0x00
 	adcxq	%rax,%r10
 
-	mulxq	40(%rsi),%rax,%r13
+.byte	0xc4,0x62,0xfb,0xf6,0xae,0x28,0x00,0x00,0x00
 	adcxq	%rcx,%r11
 
-.byte	0xc4,0x62,0xf3,0xf6,0xb6,0x30,0x00,0x00,0x00
+	mulxq	48(%rsi),%rcx,%r14
 	adcxq	%rax,%r12
 	adcxq	%rcx,%r13
 
-.byte	0xc4,0x62,0xfb,0xf6,0xbe,0x38,0x00,0x00,0x00
+	mulxq	56(%rsi),%rax,%r15
 	adcxq	%rax,%r14
 	adcxq	%rbp,%r15
 
-	movq	%r9,%rcx
-	shldq	$1,%r8,%r9
-	shlq	$1,%r8
-
-	xorl	%ebp,%ebp
-	mulxq	%rdx,%rax,%rdx
-	adcxq	%rdx,%r8
-	movq	8(%rsi),%rdx
-	adcxq	%rbp,%r9
+	mulxq	%rdx,%rax,%rdi
+	movq	%rbx,%rdx
+	xorq	%rcx,%rcx
+	adoxq	%r8,%r8
+	adcxq	%rdi,%r8
+	adoxq	%rbp,%rcx
+	adcxq	%rbp,%rcx
 
 	movq	%rax,(%rsp)
 	movq	%r8,8(%rsp)
 
 
-	mulxq	16(%rsi),%rax,%rbx
+.byte	0xc4,0xe2,0xfb,0xf6,0x9e,0x10,0x00,0x00,0x00
 	adoxq	%rax,%r10
 	adcxq	%rbx,%r11
 
-.byte	0xc4,0x62,0xc3,0xf6,0x86,0x18,0x00,0x00,0x00
+	mulxq	24(%rsi),%rdi,%r8
 	adoxq	%rdi,%r11
+.byte	0x66
 	adcxq	%r8,%r12
 
 	mulxq	32(%rsi),%rax,%rbx
@@ -467,24 +473,25 @@ rsaz_512_sqr:
 .byte	0xc4,0x62,0xc3,0xf6,0x86,0x38,0x00,0x00,0x00
 	adoxq	%rdi,%r15
 	adcxq	%rbp,%r8
+	mulxq	%rdx,%rax,%rdi
 	adoxq	%rbp,%r8
+.byte	0x48,0x8b,0x96,0x10,0x00,0x00,0x00
 
-	movq	%r11,%rbx
-	shldq	$1,%r10,%r11
-	shldq	$1,%rcx,%r10
+	xorq	%rbx,%rbx
+	adoxq	%r9,%r9
 
-	xorl	%ebp,%ebp
-	mulxq	%rdx,%rax,%rcx
-	movq	16(%rsi),%rdx
+	adcxq	%rcx,%rax
+	adoxq	%r10,%r10
 	adcxq	%rax,%r9
-	adcxq	%rcx,%r10
-	adcxq	%rbp,%r11
+	adoxq	%rbp,%rbx
+	adcxq	%rdi,%r10
+	adcxq	%rbp,%rbx
 
 	movq	%r9,16(%rsp)
 .byte	0x4c,0x89,0x94,0x24,0x18,0x00,0x00,0x00
 
 
-.byte	0xc4,0x62,0xc3,0xf6,0x8e,0x18,0x00,0x00,0x00
+	mulxq	24(%rsi),%rdi,%r9
 	adoxq	%rdi,%r12
 	adcxq	%r9,%r13
 
@@ -492,7 +499,7 @@ rsaz_512_sqr:
 	adoxq	%rax,%r13
 	adcxq	%rcx,%r14
 
-	mulxq	40(%rsi),%rdi,%r9
+.byte	0xc4,0x62,0xc3,0xf6,0x8e,0x28,0x00,0x00,0x00
 	adoxq	%rdi,%r14
 	adcxq	%r9,%r15
 
@@ -500,27 +507,28 @@ rsaz_512_sqr:
 	adoxq	%rax,%r15
 	adcxq	%rcx,%r8
 
-.byte	0xc4,0x62,0xc3,0xf6,0x8e,0x38,0x00,0x00,0x00
+	mulxq	56(%rsi),%rdi,%r9
 	adoxq	%rdi,%r8
 	adcxq	%rbp,%r9
+	mulxq	%rdx,%rax,%rdi
 	adoxq	%rbp,%r9
+	movq	24(%rsi),%rdx
 
-	movq	%r13,%rcx
-	shldq	$1,%r12,%r13
-	shldq	$1,%rbx,%r12
+	xorq	%rcx,%rcx
+	adoxq	%r11,%r11
 
-	xorl	%ebp,%ebp
-	mulxq	%rdx,%rax,%rdx
+	adcxq	%rbx,%rax
+	adoxq	%r12,%r12
 	adcxq	%rax,%r11
-	adcxq	%rdx,%r12
-	movq	24(%rsi),%rdx
-	adcxq	%rbp,%r13
+	adoxq	%rbp,%rcx
+	adcxq	%rdi,%r12
+	adcxq	%rbp,%rcx
 
 	movq	%r11,32(%rsp)
-.byte	0x4c,0x89,0xa4,0x24,0x28,0x00,0x00,0x00
+	movq	%r12,40(%rsp)
 
 
-.byte	0xc4,0xe2,0xfb,0xf6,0x9e,0x20,0x00,0x00,0x00
+	mulxq	32(%rsi),%rax,%rbx
 	adoxq	%rax,%r14
 	adcxq	%rbx,%r15
 
@@ -535,25 +543,25 @@ rsaz_512_sqr:
 	mulxq	56(%rsi),%rdi,%r10
 	adoxq	%rdi,%r9
 	adcxq	%rbp,%r10
+	mulxq	%rdx,%rax,%rdi
 	adoxq	%rbp,%r10
+	movq	32(%rsi),%rdx
 
-.byte	0x66
-	movq	%r15,%rbx
-	shldq	$1,%r14,%r15
-	shldq	$1,%rcx,%r14
+	xorq	%rbx,%rbx
+	adoxq	%r13,%r13
 
-	xorl	%ebp,%ebp
-	mulxq	%rdx,%rax,%rdx
+	adcxq	%rcx,%rax
+	adoxq	%r14,%r14
 	adcxq	%rax,%r13
-	adcxq	%rdx,%r14
-	movq	32(%rsi),%rdx
-	adcxq	%rbp,%r15
+	adoxq	%rbp,%rbx
+	adcxq	%rdi,%r14
+	adcxq	%rbp,%rbx
 
 	movq	%r13,48(%rsp)
 	movq	%r14,56(%rsp)
 
 
-.byte	0xc4,0x62,0xc3,0xf6,0x9e,0x28,0x00,0x00,0x00
+	mulxq	40(%rsi),%rdi,%r11
 	adoxq	%rdi,%r8
 	adcxq	%r11,%r9
 
@@ -564,18 +572,19 @@ rsaz_512_sqr:
 	mulxq	56(%rsi),%rdi,%r11
 	adoxq	%rdi,%r10
 	adcxq	%rbp,%r11
+	mulxq	%rdx,%rax,%rdi
+	movq	40(%rsi),%rdx
 	adoxq	%rbp,%r11
 
-	movq	%r9,%rcx
-	shldq	$1,%r8,%r9
-	shldq	$1,%rbx,%r8
+	xorq	%rcx,%rcx
+	adoxq	%r15,%r15
 
-	xorl	%ebp,%ebp
-	mulxq	%rdx,%rax,%rdx
+	adcxq	%rbx,%rax
+	adoxq	%r8,%r8
 	adcxq	%rax,%r15
-	adcxq	%rdx,%r8
-	movq	40(%rsi),%rdx
-	adcxq	%rbp,%r9
+	adoxq	%rbp,%rcx
+	adcxq	%rdi,%r8
+	adcxq	%rbp,%rcx
 
 	movq	%r15,64(%rsp)
 	movq	%r8,72(%rsp)
@@ -588,18 +597,19 @@ rsaz_512_sqr:
 .byte	0xc4,0x62,0xc3,0xf6,0xa6,0x38,0x00,0x00,0x00
 	adoxq	%rdi,%r11
 	adcxq	%rbp,%r12
+	mulxq	%rdx,%rax,%rdi
 	adoxq	%rbp,%r12
+	movq	48(%rsi),%rdx
 
-	movq	%r11,%rbx
-	shldq	$1,%r10,%r11
-	shldq	$1,%rcx,%r10
+	xorq	%rbx,%rbx
+	adoxq	%r9,%r9
 
-	xorl	%ebp,%ebp
-	mulxq	%rdx,%rax,%rdx
+	adcxq	%rcx,%rax
+	adoxq	%r10,%r10
 	adcxq	%rax,%r9
-	adcxq	%rdx,%r10
-	movq	48(%rsi),%rdx
-	adcxq	%rbp,%r11
+	adcxq	%rdi,%r10
+	adoxq	%rbp,%rbx
+	adcxq	%rbp,%rbx
 
 	movq	%r9,80(%rsp)
 	movq	%r10,88(%rsp)
@@ -609,31 +619,31 @@ rsaz_512_sqr:
 	adoxq	%rax,%r12
 	adoxq	%rbp,%r13
 
-	xorq	%r14,%r14
-	shldq	$1,%r13,%r14
-	shldq	$1,%r12,%r13
-	shldq	$1,%rbx,%r12
+	mulxq	%rdx,%rax,%rdi
+	xorq	%rcx,%rcx
+	movq	56(%rsi),%rdx
+	adoxq	%r11,%r11
 
-	xorl	%ebp,%ebp
-	mulxq	%rdx,%rax,%rdx
+	adcxq	%rbx,%rax
+	adoxq	%r12,%r12
 	adcxq	%rax,%r11
-	adcxq	%rdx,%r12
-	movq	56(%rsi),%rdx
-	adcxq	%rbp,%r13
+	adoxq	%rbp,%rcx
+	adcxq	%rdi,%r12
+	adcxq	%rbp,%rcx
 
 .byte	0x4c,0x89,0x9c,0x24,0x60,0x00,0x00,0x00
 .byte	0x4c,0x89,0xa4,0x24,0x68,0x00,0x00,0x00
 
 
 	mulxq	%rdx,%rax,%rdx
-	adoxq	%rax,%r13
-	adoxq	%rbp,%rdx
+	xorq	%rbx,%rbx
+	adoxq	%r13,%r13
 
-.byte	0x66
-	addq	%rdx,%r14
+	adcxq	%rcx,%rax
+	adoxq	%rbp,%rbx
+	adcxq	%r13,%rax
+	adcxq	%rdx,%rbx
 
-	movq	%r13,112(%rsp)
-	movq	%r14,120(%rsp)
 .byte	102,72,15,126,199
 .byte	102,72,15,126,205
 
@@ -647,6 +657,9 @@ rsaz_512_sqr:
 	movq	48(%rsp),%r14
 	movq	56(%rsp),%r15
 
+	movq	%rax,112(%rsp)
+	movq	%rbx,120(%rsp)
+
 	call	__rsaz_512_reducex
 
 	addq	64(%rsp),%r8
@@ -1440,6 +1453,7 @@ rsaz_512_mul_by_one:
 .type	__rsaz_512_reduce,@function
 .align	32
 __rsaz_512_reduce:
+.cfi_startproc
 	movq	%r8,%rbx
 	imulq	128+8(%rsp),%rbx
 	movq	0(%rbp),%rax
@@ -1519,10 +1533,12 @@ __rsaz_512_reduce:
 	jne	.Lreduction_loop
 
 	.byte	0xf3,0xc3
+.cfi_endproc
 .size	__rsaz_512_reduce,.-__rsaz_512_reduce
 .type	__rsaz_512_reducex,@function
 .align	32
 __rsaz_512_reducex:
+.cfi_startproc
 
 	imulq	%r8,%rdx
 	xorq	%rsi,%rsi
@@ -1575,10 +1591,12 @@ __rsaz_512_reducex:
 	jne	.Lreduction_loopx
 
 	.byte	0xf3,0xc3
+.cfi_endproc
 .size	__rsaz_512_reducex,.-__rsaz_512_reducex
 .type	__rsaz_512_subtract,@function
 .align	32
 __rsaz_512_subtract:
+.cfi_startproc
 	movq	%r8,(%rdi)
 	movq	%r9,8(%rdi)
 	movq	%r10,16(%rdi)
@@ -1632,10 +1650,12 @@ __rsaz_512_subtract:
 	movq	%r15,56(%rdi)
 
 	.byte	0xf3,0xc3
+.cfi_endproc
 .size	__rsaz_512_subtract,.-__rsaz_512_subtract
 .type	__rsaz_512_mul,@function
 .align	32
 __rsaz_512_mul:
+.cfi_startproc
 	leaq	8(%rsp),%rdi
 
 	movq	(%rsi),%rax
@@ -1774,10 +1794,12 @@ __rsaz_512_mul:
 	movq	%r15,56(%rdi)
 
 	.byte	0xf3,0xc3
+.cfi_endproc
 .size	__rsaz_512_mul,.-__rsaz_512_mul
 .type	__rsaz_512_mulx,@function
 .align	32
 __rsaz_512_mulx:
+.cfi_startproc
 	mulxq	(%rsi),%rbx,%r8
 	movq	$-6,%rcx
 
@@ -1894,11 +1916,13 @@ __rsaz_512_mulx:
 	movq	%r15,8+64+56(%rsp)
 
 	.byte	0xf3,0xc3
+.cfi_endproc
 .size	__rsaz_512_mulx,.-__rsaz_512_mulx
 .globl	rsaz_512_scatter4
 .type	rsaz_512_scatter4,@function
 .align	16
 rsaz_512_scatter4:
+.cfi_startproc
 	leaq	(%rdi,%rdx,8),%rdi
 	movl	$8,%r9d
 	jmp	.Loop_scatter
@@ -1911,12 +1935,14 @@ rsaz_512_scatter4:
 	decl	%r9d
 	jnz	.Loop_scatter
 	.byte	0xf3,0xc3
+.cfi_endproc
 .size	rsaz_512_scatter4,.-rsaz_512_scatter4
 
 .globl	rsaz_512_gather4
 .type	rsaz_512_gather4,@function
 .align	16
 rsaz_512_gather4:
+.cfi_startproc
 	movd	%edx,%xmm8
 	movdqa	.Linc+16(%rip),%xmm1
 	movdqa	.Linc(%rip),%xmm0
@@ -1980,6 +2006,7 @@ rsaz_512_gather4:
 	jnz	.Loop_gather
 	.byte	0xf3,0xc3
 .LSEH_end_rsaz_512_gather4:
+.cfi_endproc
 .size	rsaz_512_gather4,.-rsaz_512_gather4
 
 .align	64
diff --git a/deps/openssl/config/archs/BSD-x86_64/asm_avx2/crypto/bn/x86_64-mont5.s b/deps/openssl/config/archs/BSD-x86_64/asm_avx2/crypto/bn/x86_64-mont5.s
index df4b6610a0..40a60a3c8f 100644
--- a/deps/openssl/config/archs/BSD-x86_64/asm_avx2/crypto/bn/x86_64-mont5.s
+++ b/deps/openssl/config/archs/BSD-x86_64/asm_avx2/crypto/bn/x86_64-mont5.s
@@ -550,6 +550,7 @@ bn_mul4x_mont_gather5:
 .type	mul4x_internal,@function
 .align	32
 mul4x_internal:
+.cfi_startproc
 	shlq	$5,%r9
 	movd	8(%rax),%xmm5
 	leaq	.Linc(%rip),%rax
@@ -1071,6 +1072,7 @@ mul4x_internal:
 	movq	16(%rbp),%r14
 	movq	24(%rbp),%r15
 	jmp	.Lsqr4x_sub_entry
+.cfi_endproc
 .size	mul4x_internal,.-mul4x_internal
 .globl	bn_power5
 .type	bn_power5,@function
@@ -1213,6 +1215,7 @@ bn_power5:
 .align	32
 bn_sqr8x_internal:
 __bn_sqr8x_internal:
+.cfi_startproc
 
 
 
@@ -1987,10 +1990,12 @@ __bn_sqr8x_reduction:
 	cmpq	%rdx,%rdi
 	jb	.L8x_reduction_loop
 	.byte	0xf3,0xc3
+.cfi_endproc
 .size	bn_sqr8x_internal,.-bn_sqr8x_internal
 .type	__bn_post4x_internal,@function
 .align	32
 __bn_post4x_internal:
+.cfi_startproc
 	movq	0(%rbp),%r12
 	leaq	(%rdi,%r9,1),%rbx
 	movq	%r9,%rcx
@@ -2041,15 +2046,18 @@ __bn_post4x_internal:
 	movq	%r9,%r10
 	negq	%r9
 	.byte	0xf3,0xc3
+.cfi_endproc
 .size	__bn_post4x_internal,.-__bn_post4x_internal
 .globl	bn_from_montgomery
 .type	bn_from_montgomery,@function
 .align	32
 bn_from_montgomery:
+.cfi_startproc
 	testl	$7,%r9d
 	jz	bn_from_mont8x
 	xorl	%eax,%eax
 	.byte	0xf3,0xc3
+.cfi_endproc
 .size	bn_from_montgomery,.-bn_from_montgomery
 
 .type	bn_from_mont8x,@function
@@ -2333,6 +2341,7 @@ bn_mulx4x_mont_gather5:
 .type	mulx4x_internal,@function
 .align	32
 mulx4x_internal:
+.cfi_startproc
 	movq	%r9,8(%rsp)
 	movq	%r9,%r10
 	negq	%r9
@@ -2751,6 +2760,7 @@ mulx4x_internal:
 	movq	16(%rbp),%r14
 	movq	24(%rbp),%r15
 	jmp	.Lsqrx4x_sub_entry
+.cfi_endproc
 .size	mulx4x_internal,.-mulx4x_internal
 .type	bn_powerx5,@function
 .align	32
@@ -3509,6 +3519,7 @@ __bn_sqrx8x_reduction:
 .size	bn_sqrx8x_internal,.-bn_sqrx8x_internal
 .align	32
 __bn_postx4x_internal:
+.cfi_startproc
 	movq	0(%rbp),%r12
 	movq	%rcx,%r10
 	movq	%rcx,%r9
@@ -3556,11 +3567,13 @@ __bn_postx4x_internal:
 	negq	%r9
 
 	.byte	0xf3,0xc3
+.cfi_endproc
 .size	__bn_postx4x_internal,.-__bn_postx4x_internal
 .globl	bn_get_bits5
 .type	bn_get_bits5,@function
 .align	16
 bn_get_bits5:
+.cfi_startproc
 	leaq	0(%rdi),%r10
 	leaq	1(%rdi),%r11
 	movl	%esi,%ecx
@@ -3574,12 +3587,14 @@ bn_get_bits5:
 	shrl	%cl,%eax
 	andl	$31,%eax
 	.byte	0xf3,0xc3
+.cfi_endproc
 .size	bn_get_bits5,.-bn_get_bits5
 
 .globl	bn_scatter5
 .type	bn_scatter5,@function
 .align	16
 bn_scatter5:
+.cfi_startproc
 	cmpl	$0,%esi
 	jz	.Lscatter_epilogue
 	leaq	(%rdx,%rcx,8),%rdx
@@ -3592,6 +3607,7 @@ bn_scatter5:
 	jnz	.Lscatter
 .Lscatter_epilogue:
 	.byte	0xf3,0xc3
+.cfi_endproc
 .size	bn_scatter5,.-bn_scatter5
 
 .globl	bn_gather5
@@ -3599,6 +3615,7 @@ bn_scatter5:
 .align	32
 bn_gather5:
 .LSEH_begin_bn_gather5:
+.cfi_startproc
 
 .byte	0x4c,0x8d,0x14,0x24
 .byte	0x48,0x81,0xec,0x08,0x01,0x00,0x00
@@ -3756,6 +3773,7 @@ bn_gather5:
 	leaq	(%r10),%rsp
 	.byte	0xf3,0xc3
 .LSEH_end_bn_gather5:
+.cfi_endproc
 .size	bn_gather5,.-bn_gather5
 .align	64
 .Linc:
diff --git a/deps/openssl/config/archs/BSD-x86_64/asm_avx2/crypto/buildinf.h b/deps/openssl/config/archs/BSD-x86_64/asm_avx2/crypto/buildinf.h
index c9ffd0c3c0..6cb84c034f 100644
--- a/deps/openssl/config/archs/BSD-x86_64/asm_avx2/crypto/buildinf.h
+++ b/deps/openssl/config/archs/BSD-x86_64/asm_avx2/crypto/buildinf.h
@@ -11,7 +11,7 @@
  */
 
 #define PLATFORM "platform: BSD-x86_64"
-#define DATE "built on: Fri Sep 13 15:57:48 2019 UTC"
+#define DATE "built on: Wed Mar 18 21:05:08 2020 UTC"
 
 /*
  * Generate compiler_flags as an array of individual characters. This is a
@@ -36,12 +36,12 @@ static const char compiler_flags[] = {
     '5','6','_','A','S','M',' ','-','D','S','H','A','5','1','2','_',
     'A','S','M',' ','-','D','K','E','C','C','A','K','1','6','0','0',
     '_','A','S','M',' ','-','D','R','C','4','_','A','S','M',' ','-',
-    'D','M','D','5','_','A','S','M',' ','-','D','V','P','A','E','S',
-    '_','A','S','M',' ','-','D','G','H','A','S','H','_','A','S','M',
-    ' ','-','D','E','C','P','_','N','I','S','T','Z','2','5','6','_',
-    'A','S','M',' ','-','D','X','2','5','5','1','9','_','A','S','M',
-    ' ','-','D','P','O','L','Y','1','3','0','5','_','A','S','M',' ',
-    '-','D','_','T','H','R','E','A','D','_','S','A','F','E',' ','-',
-    'D','_','R','E','E','N','T','R','A','N','T',' ','-','D','N','D',
-    'E','B','U','G','\0'
+    'D','M','D','5','_','A','S','M',' ','-','D','A','E','S','N','I',
+    '_','A','S','M',' ','-','D','V','P','A','E','S','_','A','S','M',
+    ' ','-','D','G','H','A','S','H','_','A','S','M',' ','-','D','E',
+    'C','P','_','N','I','S','T','Z','2','5','6','_','A','S','M',' ',
+    '-','D','X','2','5','5','1','9','_','A','S','M',' ','-','D','P',
+    'O','L','Y','1','3','0','5','_','A','S','M',' ','-','D','_','T',
+    'H','R','E','A','D','_','S','A','F','E',' ','-','D','_','R','E',
+    'E','N','T','R','A','N','T',' ','-','D','N','D','E','B','U','G','\0'
 };
diff --git a/deps/openssl/config/archs/BSD-x86_64/asm_avx2/crypto/camellia/cmll-x86_64.s b/deps/openssl/config/archs/BSD-x86_64/asm_avx2/crypto/camellia/cmll-x86_64.s
index 405566b01c..eeb20dd229 100644
--- a/deps/openssl/config/archs/BSD-x86_64/asm_avx2/crypto/camellia/cmll-x86_64.s
+++ b/deps/openssl/config/archs/BSD-x86_64/asm_avx2/crypto/camellia/cmll-x86_64.s
@@ -5,11 +5,13 @@
 .type	Camellia_EncryptBlock,@function
 .align	16
 Camellia_EncryptBlock:
+.cfi_startproc
 	movl	$128,%eax
 	subl	%edi,%eax
 	movl	$3,%edi
 	adcl	$0,%edi
 	jmp	.Lenc_rounds
+.cfi_endproc
 .size	Camellia_EncryptBlock,.-Camellia_EncryptBlock
 
 .globl	Camellia_EncryptBlock_Rounds
@@ -83,6 +85,7 @@ Camellia_EncryptBlock_Rounds:
 .type	_x86_64_Camellia_encrypt,@function
 .align	16
 _x86_64_Camellia_encrypt:
+.cfi_startproc
 	xorl	0(%r14),%r9d
 	xorl	4(%r14),%r8d
 	xorl	8(%r14),%r11d
@@ -285,6 +288,7 @@ _x86_64_Camellia_encrypt:
 	movl	%edx,%r11d
 
 .byte	0xf3,0xc3
+.cfi_endproc
 .size	_x86_64_Camellia_encrypt,.-_x86_64_Camellia_encrypt
 
 
@@ -292,11 +296,13 @@ _x86_64_Camellia_encrypt:
 .type	Camellia_DecryptBlock,@function
 .align	16
 Camellia_DecryptBlock:
+.cfi_startproc
 	movl	$128,%eax
 	subl	%edi,%eax
 	movl	$3,%edi
 	adcl	$0,%edi
 	jmp	.Ldec_rounds
+.cfi_endproc
 .size	Camellia_DecryptBlock,.-Camellia_DecryptBlock
 
 .globl	Camellia_DecryptBlock_Rounds
@@ -370,6 +376,7 @@ Camellia_DecryptBlock_Rounds:
 .type	_x86_64_Camellia_decrypt,@function
 .align	16
 _x86_64_Camellia_decrypt:
+.cfi_startproc
 	xorl	0(%r14),%r9d
 	xorl	4(%r14),%r8d
 	xorl	8(%r14),%r11d
@@ -573,6 +580,7 @@ _x86_64_Camellia_decrypt:
 	movl	%ebx,%r11d
 
 .byte	0xf3,0xc3
+.cfi_endproc
 .size	_x86_64_Camellia_decrypt,.-_x86_64_Camellia_decrypt
 .globl	Camellia_Ekeygen
 .type	Camellia_Ekeygen,@function
diff --git a/deps/openssl/config/archs/BSD-x86_64/asm_avx2/crypto/ec/ecp_nistz256-x86_64.s b/deps/openssl/config/archs/BSD-x86_64/asm_avx2/crypto/ec/ecp_nistz256-x86_64.s
index 62b9ac6616..5c9e405041 100644
--- a/deps/openssl/config/archs/BSD-x86_64/asm_avx2/crypto/ec/ecp_nistz256-x86_64.s
+++ b/deps/openssl/config/archs/BSD-x86_64/asm_avx2/crypto/ec/ecp_nistz256-x86_64.s
@@ -3874,10 +3874,12 @@ ecp_nistz256_ord_sqr_montx:
 .type	ecp_nistz256_to_mont,@function
 .align	32
 ecp_nistz256_to_mont:
+.cfi_startproc
 	movl	$0x80100,%ecx
 	andl	OPENSSL_ia32cap_P+8(%rip),%ecx
 	leaq	.LRR(%rip),%rdx
 	jmp	.Lmul_mont
+.cfi_endproc
 .size	ecp_nistz256_to_mont,.-ecp_nistz256_to_mont
 
 
@@ -4821,6 +4823,7 @@ ecp_nistz256_from_mont:
 .type	ecp_nistz256_scatter_w5,@function
 .align	32
 ecp_nistz256_scatter_w5:
+.cfi_startproc
 	leal	-3(%rdx,%rdx,2),%edx
 	movdqa	0(%rsi),%xmm0
 	shll	$5,%edx
@@ -4837,6 +4840,7 @@ ecp_nistz256_scatter_w5:
 	movdqa	%xmm5,80(%rdi,%rdx,1)
 
 	.byte	0xf3,0xc3
+.cfi_endproc
 .size	ecp_nistz256_scatter_w5,.-ecp_nistz256_scatter_w5
 
 
@@ -4910,6 +4914,7 @@ ecp_nistz256_gather_w5:
 .type	ecp_nistz256_scatter_w7,@function
 .align	32
 ecp_nistz256_scatter_w7:
+.cfi_startproc
 	movdqu	0(%rsi),%xmm0
 	shll	$6,%edx
 	movdqu	16(%rsi),%xmm1
@@ -4921,6 +4926,7 @@ ecp_nistz256_scatter_w7:
 	movdqa	%xmm3,48(%rdi,%rdx,1)
 
 	.byte	0xf3,0xc3
+.cfi_endproc
 .size	ecp_nistz256_scatter_w7,.-ecp_nistz256_scatter_w7
 
 
@@ -5655,26 +5661,16 @@ ecp_nistz256_point_add:
 	orq	%r8,%r12
 	orq	%r9,%r12
 
-.byte	0x3e
-	jnz	.Ladd_proceedq
 .byte	102,73,15,126,208
 .byte	102,73,15,126,217
-	testq	%r8,%r8
-	jnz	.Ladd_proceedq
-	testq	%r9,%r9
-	jz	.Ladd_doubleq
 
-.byte	102,72,15,126,199
-	pxor	%xmm0,%xmm0
-	movdqu	%xmm0,0(%rdi)
-	movdqu	%xmm0,16(%rdi)
-	movdqu	%xmm0,32(%rdi)
-	movdqu	%xmm0,48(%rdi)
-	movdqu	%xmm0,64(%rdi)
-	movdqu	%xmm0,80(%rdi)
-	jmp	.Ladd_doneq
+	orq	%r8,%r12
+	orq	%r9,%r12
+
+
+.byte	0x3e
+	jnz	.Ladd_proceedq
 
-.align	32
 .Ladd_doubleq:
 .byte	102,72,15,126,206
 .byte	102,72,15,126,199
@@ -6774,26 +6770,16 @@ ecp_nistz256_point_addx:
 	orq	%r8,%r12
 	orq	%r9,%r12
 
-.byte	0x3e
-	jnz	.Ladd_proceedx
 .byte	102,73,15,126,208
 .byte	102,73,15,126,217
-	testq	%r8,%r8
-	jnz	.Ladd_proceedx
-	testq	%r9,%r9
-	jz	.Ladd_doublex
 
-.byte	102,72,15,126,199
-	pxor	%xmm0,%xmm0
-	movdqu	%xmm0,0(%rdi)
-	movdqu	%xmm0,16(%rdi)
-	movdqu	%xmm0,32(%rdi)
-	movdqu	%xmm0,48(%rdi)
-	movdqu	%xmm0,64(%rdi)
-	movdqu	%xmm0,80(%rdi)
-	jmp	.Ladd_donex
+	orq	%r8,%r12
+	orq	%r9,%r12
+
+
+.byte	0x3e
+	jnz	.Ladd_proceedx
 
-.align	32
 .Ladd_doublex:
 .byte	102,72,15,126,206
 .byte	102,72,15,126,199
diff --git a/deps/openssl/config/archs/BSD-x86_64/asm_avx2/crypto/ec/x25519-x86_64.s b/deps/openssl/config/archs/BSD-x86_64/asm_avx2/crypto/ec/x25519-x86_64.s
index 2a18eaee28..1788e568cd 100644
--- a/deps/openssl/config/archs/BSD-x86_64/asm_avx2/crypto/ec/x25519-x86_64.s
+++ b/deps/openssl/config/archs/BSD-x86_64/asm_avx2/crypto/ec/x25519-x86_64.s
@@ -400,12 +400,14 @@ x25519_fe51_mul121666:
 .type	x25519_fe64_eligible,@function
 .align	32
 x25519_fe64_eligible:
+.cfi_startproc
 	movl	OPENSSL_ia32cap_P+8(%rip),%ecx
 	xorl	%eax,%eax
 	andl	$0x80100,%ecx
 	cmpl	$0x80100,%ecx
 	cmovel	%ecx,%eax
 	.byte	0xf3,0xc3
+.cfi_endproc
 .size	x25519_fe64_eligible,.-x25519_fe64_eligible
 
 .globl	x25519_fe64_mul
@@ -648,6 +650,7 @@ x25519_fe64_sqr:
 .align	32
 x25519_fe64_mul121666:
 .Lfe64_mul121666_body:
+.cfi_startproc
 	movl	$121666,%edx
 	mulxq	0(%rsi),%r8,%rcx
 	mulxq	8(%rsi),%r9,%rax
@@ -676,6 +679,7 @@ x25519_fe64_mul121666:
 
 .Lfe64_mul121666_epilogue:
 	.byte	0xf3,0xc3
+.cfi_endproc
 .size	x25519_fe64_mul121666,.-x25519_fe64_mul121666
 
 .globl	x25519_fe64_add
@@ -683,6 +687,7 @@ x25519_fe64_mul121666:
 .align	32
 x25519_fe64_add:
 .Lfe64_add_body:
+.cfi_startproc
 	movq	0(%rsi),%r8
 	movq	8(%rsi),%r9
 	movq	16(%rsi),%r10
@@ -711,6 +716,7 @@ x25519_fe64_add:
 
 .Lfe64_add_epilogue:
 	.byte	0xf3,0xc3
+.cfi_endproc
 .size	x25519_fe64_add,.-x25519_fe64_add
 
 .globl	x25519_fe64_sub
@@ -718,6 +724,7 @@ x25519_fe64_add:
 .align	32
 x25519_fe64_sub:
 .Lfe64_sub_body:
+.cfi_startproc
 	movq	0(%rsi),%r8
 	movq	8(%rsi),%r9
 	movq	16(%rsi),%r10
@@ -746,6 +753,7 @@ x25519_fe64_sub:
 
 .Lfe64_sub_epilogue:
 	.byte	0xf3,0xc3
+.cfi_endproc
 .size	x25519_fe64_sub,.-x25519_fe64_sub
 
 .globl	x25519_fe64_tobytes
@@ -753,6 +761,7 @@ x25519_fe64_sub:
 .align	32
 x25519_fe64_tobytes:
 .Lfe64_to_body:
+.cfi_startproc
 	movq	0(%rsi),%r8
 	movq	8(%rsi),%r9
 	movq	16(%rsi),%r10
@@ -788,5 +797,6 @@ x25519_fe64_tobytes:
 
 .Lfe64_to_epilogue:
 	.byte	0xf3,0xc3
+.cfi_endproc
 .size	x25519_fe64_tobytes,.-x25519_fe64_tobytes
 .byte	88,50,53,53,49,57,32,112,114,105,109,105,116,105,118,101,115,32,102,111,114,32,120,56,54,95,54,52,44,32,67,82,89,80,84,79,71,65,77,83,32,98,121,32,60,97,112,112,114,111,64,111,112,101,110,115,115,108,46,111,114,103,62,0
diff --git a/deps/openssl/config/archs/BSD-x86_64/asm_avx2/crypto/include/internal/bn_conf.h b/deps/openssl/config/archs/BSD-x86_64/asm_avx2/crypto/include/internal/bn_conf.h
index 34bd8b78b4..5312ef5a7a 100644
--- a/deps/openssl/config/archs/BSD-x86_64/asm_avx2/crypto/include/internal/bn_conf.h
+++ b/deps/openssl/config/archs/BSD-x86_64/asm_avx2/crypto/include/internal/bn_conf.h
@@ -1,5 +1,5 @@
 /* WARNING: do not edit! */
-/* Generated by Makefile from crypto/include/internal/bn_conf.h.in */
+/* Generated by Makefile from include/crypto/bn_conf.h.in */
 /*
  * Copyright 2016 The OpenSSL Project Authors. All Rights Reserved.
  *
@@ -9,8 +9,8 @@
  * https://www.openssl.org/source/license.html
  */
 
-#ifndef HEADER_BN_CONF_H
-# define HEADER_BN_CONF_H
+#ifndef OSSL_CRYPTO_BN_CONF_H
+# define OSSL_CRYPTO_BN_CONF_H
 
 /*
  * The contents of this file are not used in the UEFI build, as
diff --git a/deps/openssl/config/archs/BSD-x86_64/asm_avx2/crypto/include/internal/dso_conf.h b/deps/openssl/config/archs/BSD-x86_64/asm_avx2/crypto/include/internal/dso_conf.h
index 252266ec2a..4b1167c3d8 100644
--- a/deps/openssl/config/archs/BSD-x86_64/asm_avx2/crypto/include/internal/dso_conf.h
+++ b/deps/openssl/config/archs/BSD-x86_64/asm_avx2/crypto/include/internal/dso_conf.h
@@ -1,5 +1,5 @@
 /* WARNING: do not edit! */
-/* Generated by Makefile from crypto/include/internal/dso_conf.h.in */
+/* Generated by Makefile from include/crypto/dso_conf.h.in */
 /*
  * Copyright 2016-2019 The OpenSSL Project Authors. All Rights Reserved.
  *
@@ -9,8 +9,8 @@
  * https://www.openssl.org/source/license.html
  */
 
-#ifndef HEADER_DSO_CONF_H
-# define HEADER_DSO_CONF_H
+#ifndef OSSL_CRYPTO_DSO_CONF_H
+# define OSSL_CRYPTO_DSO_CONF_H
 # define DSO_DLFCN
 # define HAVE_DLFCN_H
 # define DSO_EXTENSION ".so"
diff --git a/deps/openssl/config/archs/BSD-x86_64/asm_avx2/crypto/modes/aesni-gcm-x86_64.s b/deps/openssl/config/archs/BSD-x86_64/asm_avx2/crypto/modes/aesni-gcm-x86_64.s
index 6a7a9577c7..01d89630a4 100644
--- a/deps/openssl/config/archs/BSD-x86_64/asm_avx2/crypto/modes/aesni-gcm-x86_64.s
+++ b/deps/openssl/config/archs/BSD-x86_64/asm_avx2/crypto/modes/aesni-gcm-x86_64.s
@@ -3,6 +3,7 @@
 .type	_aesni_ctr32_ghash_6x,@function
 .align	32
 _aesni_ctr32_ghash_6x:
+.cfi_startproc
 	vmovdqu	32(%r11),%xmm2
 	subq	$6,%rdx
 	vpxor	%xmm4,%xmm4,%xmm4
@@ -310,6 +311,7 @@ _aesni_ctr32_ghash_6x:
 	vpxor	%xmm4,%xmm8,%xmm8
 
 	.byte	0xf3,0xc3
+.cfi_endproc
 .size	_aesni_ctr32_ghash_6x,.-_aesni_ctr32_ghash_6x
 .globl	aesni_gcm_decrypt
 .type	aesni_gcm_decrypt,@function
@@ -416,6 +418,7 @@ aesni_gcm_decrypt:
 .type	_aesni_ctr32_6x,@function
 .align	32
 _aesni_ctr32_6x:
+.cfi_startproc
 	vmovdqu	0-128(%rcx),%xmm4
 	vmovdqu	32(%r11),%xmm2
 	leaq	-1(%rbp),%r13
@@ -502,6 +505,7 @@ _aesni_ctr32_6x:
 	vpshufb	%xmm0,%xmm1,%xmm1
 	vpxor	%xmm4,%xmm14,%xmm14
 	jmp	.Loop_ctr32
+.cfi_endproc
 .size	_aesni_ctr32_6x,.-_aesni_ctr32_6x
 
 .globl	aesni_gcm_encrypt
diff --git a/deps/openssl/config/archs/BSD-x86_64/asm_avx2/crypto/poly1305/poly1305-x86_64.s b/deps/openssl/config/archs/BSD-x86_64/asm_avx2/crypto/poly1305/poly1305-x86_64.s
index 6f4cac8d39..2636c52bbe 100644
--- a/deps/openssl/config/archs/BSD-x86_64/asm_avx2/crypto/poly1305/poly1305-x86_64.s
+++ b/deps/openssl/config/archs/BSD-x86_64/asm_avx2/crypto/poly1305/poly1305-x86_64.s
@@ -12,6 +12,7 @@
 .type	poly1305_init,@function
 .align	32
 poly1305_init:
+.cfi_startproc
 	xorq	%rax,%rax
 	movq	%rax,0(%rdi)
 	movq	%rax,8(%rdi)
@@ -42,6 +43,7 @@ poly1305_init:
 	movl	$1,%eax
 .Lno_key:
 	.byte	0xf3,0xc3
+.cfi_endproc
 .size	poly1305_init,.-poly1305_init
 
 .type	poly1305_blocks,@function
@@ -162,6 +164,7 @@ poly1305_blocks:
 .type	poly1305_emit,@function
 .align	32
 poly1305_emit:
+.cfi_startproc
 .Lemit:
 	movq	0(%rdi),%r8
 	movq	8(%rdi),%r9
@@ -182,10 +185,12 @@ poly1305_emit:
 	movq	%rcx,8(%rsi)
 
 	.byte	0xf3,0xc3
+.cfi_endproc
 .size	poly1305_emit,.-poly1305_emit
 .type	__poly1305_block,@function
 .align	32
 __poly1305_block:
+.cfi_startproc
 	mulq	%r14
 	movq	%rax,%r9
 	movq	%r11,%rax
@@ -225,11 +230,13 @@ __poly1305_block:
 	adcq	$0,%rbx
 	adcq	$0,%rbp
 	.byte	0xf3,0xc3
+.cfi_endproc
 .size	__poly1305_block,.-__poly1305_block
 
 .type	__poly1305_init_avx,@function
 .align	32
 __poly1305_init_avx:
+.cfi_startproc
 	movq	%r11,%r14
 	movq	%r12,%rbx
 	xorq	%rbp,%rbp
@@ -387,6 +394,7 @@ __poly1305_init_avx:
 
 	leaq	-48-64(%rdi),%rdi
 	.byte	0xf3,0xc3
+.cfi_endproc
 .size	__poly1305_init_avx,.-__poly1305_init_avx
 
 .type	poly1305_blocks_avx,@function
@@ -1227,6 +1235,7 @@ poly1305_blocks_avx:
 .type	poly1305_emit_avx,@function
 .align	32
 poly1305_emit_avx:
+.cfi_startproc
 	cmpl	$0,20(%rdi)
 	je	.Lemit
 
@@ -1277,6 +1286,7 @@ poly1305_emit_avx:
 	movq	%rcx,8(%rsi)
 
 	.byte	0xf3,0xc3
+.cfi_endproc
 .size	poly1305_emit_avx,.-poly1305_emit_avx
 .type	poly1305_blocks_avx2,@function
 .align	32
@@ -1959,6 +1969,7 @@ poly1305_blocks_avx2:
 .type	xor128_encrypt_n_pad,@function
 .align	16
 xor128_encrypt_n_pad:
+.cfi_startproc
 	subq	%rdx,%rsi
 	subq	%rdx,%rdi
 	movq	%rcx,%r10
@@ -2000,12 +2011,14 @@ xor128_encrypt_n_pad:
 .Ldone_enc:
 	movq	%rdx,%rax
 	.byte	0xf3,0xc3
+.cfi_endproc
 .size	xor128_encrypt_n_pad,.-xor128_encrypt_n_pad
 
 .globl	xor128_decrypt_n_pad
 .type	xor128_decrypt_n_pad,@function
 .align	16
 xor128_decrypt_n_pad:
+.cfi_startproc
 	subq	%rdx,%rsi
 	subq	%rdx,%rdi
 	movq	%rcx,%r10
@@ -2051,4 +2064,5 @@ xor128_decrypt_n_pad:
 .Ldone_dec:
 	movq	%rdx,%rax
 	.byte	0xf3,0xc3
+.cfi_endproc
 .size	xor128_decrypt_n_pad,.-xor128_decrypt_n_pad
diff --git a/deps/openssl/config/archs/BSD-x86_64/asm_avx2/crypto/rc4/rc4-x86_64.s b/deps/openssl/config/archs/BSD-x86_64/asm_avx2/crypto/rc4/rc4-x86_64.s
index fba70351d4..b97c757550 100644
--- a/deps/openssl/config/archs/BSD-x86_64/asm_avx2/crypto/rc4/rc4-x86_64.s
+++ b/deps/openssl/config/archs/BSD-x86_64/asm_avx2/crypto/rc4/rc4-x86_64.s
@@ -4,11 +4,12 @@
 .globl	RC4
 .type	RC4,@function
 .align	16
-RC4:	orq	%rsi,%rsi
+RC4:
+.cfi_startproc
+	orq	%rsi,%rsi
 	jne	.Lentry
 	.byte	0xf3,0xc3
 .Lentry:
-.cfi_startproc	
 	pushq	%rbx
 .cfi_adjust_cfa_offset	8
 .cfi_offset	%rbx,-16
@@ -533,6 +534,7 @@ RC4:	orq	%rsi,%rsi
 .type	RC4_set_key,@function
 .align	16
 RC4_set_key:
+.cfi_startproc
 	leaq	8(%rdi),%rdi
 	leaq	(%rdx,%rsi,1),%rdx
 	negq	%rsi
@@ -599,12 +601,14 @@ RC4_set_key:
 	movl	%eax,-8(%rdi)
 	movl	%eax,-4(%rdi)
 	.byte	0xf3,0xc3
+.cfi_endproc
 .size	RC4_set_key,.-RC4_set_key
 
 .globl	RC4_options
 .type	RC4_options,@function
 .align	16
 RC4_options:
+.cfi_startproc
 	leaq	.Lopts(%rip),%rax
 	movl	OPENSSL_ia32cap_P(%rip),%edx
 	btl	$20,%edx
@@ -617,6 +621,7 @@ RC4_options:
 	addq	$12,%rax
 .Ldone:
 	.byte	0xf3,0xc3
+.cfi_endproc
 .align	64
 .Lopts:
 .byte	114,99,52,40,56,120,44,105,110,116,41,0
diff --git a/deps/openssl/config/archs/BSD-x86_64/asm_avx2/crypto/sha/keccak1600-x86_64.s b/deps/openssl/config/archs/BSD-x86_64/asm_avx2/crypto/sha/keccak1600-x86_64.s
index e511f25035..09617d014b 100644
--- a/deps/openssl/config/archs/BSD-x86_64/asm_avx2/crypto/sha/keccak1600-x86_64.s
+++ b/deps/openssl/config/archs/BSD-x86_64/asm_avx2/crypto/sha/keccak1600-x86_64.s
@@ -3,6 +3,7 @@
 .type	__KeccakF1600,@function
 .align	32
 __KeccakF1600:
+.cfi_startproc
 	movq	60(%rdi),%rax
 	movq	68(%rdi),%rbx
 	movq	76(%rdi),%rcx
@@ -255,6 +256,7 @@ __KeccakF1600:
 
 	leaq	-192(%r15),%r15
 	.byte	0xf3,0xc3
+.cfi_endproc
 .size	__KeccakF1600,.-__KeccakF1600
 
 .type	KeccakF1600,@function
diff --git a/deps/openssl/config/archs/BSD-x86_64/asm_avx2/crypto/sha/sha1-x86_64.s b/deps/openssl/config/archs/BSD-x86_64/asm_avx2/crypto/sha/sha1-x86_64.s
index e436521a04..98541727e5 100644
--- a/deps/openssl/config/archs/BSD-x86_64/asm_avx2/crypto/sha/sha1-x86_64.s
+++ b/deps/openssl/config/archs/BSD-x86_64/asm_avx2/crypto/sha/sha1-x86_64.s
@@ -1421,8 +1421,8 @@ _shaext_shortcut:
 	pshufd	$27,%xmm1,%xmm1
 	movdqu	%xmm0,(%rdi)
 	movd	%xmm1,16(%rdi)
-.cfi_endproc	
 	.byte	0xf3,0xc3
+.cfi_endproc
 .size	sha1_block_data_order_shaext,.-sha1_block_data_order_shaext
 .type	sha1_block_data_order_ssse3,@function
 .align	16
diff --git a/deps/openssl/config/archs/BSD-x86_64/asm_avx2/crypto/sha/sha256-x86_64.s b/deps/openssl/config/archs/BSD-x86_64/asm_avx2/crypto/sha/sha256-x86_64.s
index 42b24df18e..9357385da3 100644
--- a/deps/openssl/config/archs/BSD-x86_64/asm_avx2/crypto/sha/sha256-x86_64.s
+++ b/deps/openssl/config/archs/BSD-x86_64/asm_avx2/crypto/sha/sha256-x86_64.s
@@ -1775,6 +1775,7 @@ K256:
 .align	64
 sha256_block_data_order_shaext:
 _shaext_shortcut:
+.cfi_startproc
 	leaq	K256+128(%rip),%rcx
 	movdqu	(%rdi),%xmm1
 	movdqu	16(%rdi),%xmm2
@@ -1977,6 +1978,7 @@ _shaext_shortcut:
 	movdqu	%xmm1,(%rdi)
 	movdqu	%xmm2,16(%rdi)
 	.byte	0xf3,0xc3
+.cfi_endproc
 .size	sha256_block_data_order_shaext,.-sha256_block_data_order_shaext
 .type	sha256_block_data_order_ssse3,@function
 .align	64
@@ -4238,7 +4240,15 @@ sha256_block_data_order_avx2:
 	vmovdqa	%ymm4,0(%rsp)
 	xorl	%r14d,%r14d
 	vmovdqa	%ymm5,32(%rsp)
+
+	movq	88(%rsp),%rdi
+.cfi_def_cfa	%rdi,8
 	leaq	-64(%rsp),%rsp
+
+
+
+	movq	%rdi,-8(%rsp)
+.cfi_escape	0x0f,0x05,0x77,0x78,0x06,0x23,0x08
 	movl	%ebx,%edi
 	vmovdqa	%ymm6,0(%rsp)
 	xorl	%ecx,%edi
@@ -4250,6 +4260,12 @@ sha256_block_data_order_avx2:
 .align	16
 .Lavx2_00_47:
 	leaq	-64(%rsp),%rsp
+.cfi_escape	0x0f,0x05,0x77,0x38,0x06,0x23,0x08
+
+	pushq	64-8(%rsp)
+.cfi_escape	0x0f,0x05,0x77,0x00,0x06,0x23,0x08
+	leaq	8(%rsp),%rsp
+.cfi_escape	0x0f,0x05,0x77,0x78,0x06,0x23,0x08
 	vpalignr	$4,%ymm0,%ymm1,%ymm4
 	addl	0+128(%rsp),%r11d
 	andl	%r8d,%r12d
@@ -4505,6 +4521,12 @@ sha256_block_data_order_avx2:
 	movl	%r9d,%r12d
 	vmovdqa	%ymm6,32(%rsp)
 	leaq	-64(%rsp),%rsp
+.cfi_escape	0x0f,0x05,0x77,0x38,0x06,0x23,0x08
+
+	pushq	64-8(%rsp)
+.cfi_escape	0x0f,0x05,0x77,0x00,0x06,0x23,0x08
+	leaq	8(%rsp),%rsp
+.cfi_escape	0x0f,0x05,0x77,0x78,0x06,0x23,0x08
 	vpalignr	$4,%ymm2,%ymm3,%ymm4
 	addl	0+128(%rsp),%r11d
 	andl	%r8d,%r12d
@@ -5380,6 +5402,8 @@ sha256_block_data_order_avx2:
 
 	leaq	448(%rsp),%rsp
 
+.cfi_escape	0x0f,0x06,0x77,0xd8,0x00,0x06,0x23,0x08
+
 	addl	0(%rdi),%eax
 	addl	4(%rdi),%ebx
 	addl	8(%rdi),%ecx
@@ -5405,9 +5429,11 @@ sha256_block_data_order_avx2:
 	jbe	.Loop_avx2
 	leaq	(%rsp),%rbp
 
+
+.cfi_escape	0x0f,0x06,0x76,0xd8,0x00,0x06,0x23,0x08
+
 .Ldone_avx2:
-	leaq	(%rbp),%rsp
-	movq	88(%rsp),%rsi
+	movq	88(%rbp),%rsi
 .cfi_def_cfa	%rsi,8
 	vzeroupper
 	movq	-48(%rsi),%r15
diff --git a/deps/openssl/config/archs/BSD-x86_64/asm_avx2/crypto/sha/sha512-x86_64.s b/deps/openssl/config/archs/BSD-x86_64/asm_avx2/crypto/sha/sha512-x86_64.s
index 5931a2a932..939f1ca71c 100644
--- a/deps/openssl/config/archs/BSD-x86_64/asm_avx2/crypto/sha/sha512-x86_64.s
+++ b/deps/openssl/config/archs/BSD-x86_64/asm_avx2/crypto/sha/sha512-x86_64.s
@@ -4165,7 +4165,15 @@ sha512_block_data_order_avx2:
 	vmovdqa	%ymm10,64(%rsp)
 	vpaddq	64(%rbp),%ymm6,%ymm10
 	vmovdqa	%ymm11,96(%rsp)
+
+	movq	152(%rsp),%rdi
+.cfi_def_cfa	%rdi,8
 	leaq	-128(%rsp),%rsp
+
+
+
+	movq	%rdi,-8(%rsp)
+.cfi_escape	0x0f,0x05,0x77,0x78,0x06,0x23,0x08
 	vpaddq	96(%rbp),%ymm7,%ymm11
 	vmovdqa	%ymm8,0(%rsp)
 	xorq	%r14,%r14
@@ -4181,6 +4189,12 @@ sha512_block_data_order_avx2:
 .align	16
 .Lavx2_00_47:
 	leaq	-128(%rsp),%rsp
+.cfi_escape	0x0f,0x06,0x77,0xf8,0x00,0x06,0x23,0x08
+
+	pushq	128-8(%rsp)
+.cfi_escape	0x0f,0x05,0x77,0x00,0x06,0x23,0x08
+	leaq	8(%rsp),%rsp
+.cfi_escape	0x0f,0x05,0x77,0x78,0x06,0x23,0x08
 	vpalignr	$8,%ymm0,%ymm1,%ymm8
 	addq	0+256(%rsp),%r11
 	andq	%r8,%r12
@@ -4474,6 +4488,12 @@ sha512_block_data_order_avx2:
 	movq	%r9,%r12
 	vmovdqa	%ymm10,96(%rsp)
 	leaq	-128(%rsp),%rsp
+.cfi_escape	0x0f,0x06,0x77,0xf8,0x00,0x06,0x23,0x08
+
+	pushq	128-8(%rsp)
+.cfi_escape	0x0f,0x05,0x77,0x00,0x06,0x23,0x08
+	leaq	8(%rsp),%rsp
+.cfi_escape	0x0f,0x05,0x77,0x78,0x06,0x23,0x08
 	vpalignr	$8,%ymm4,%ymm5,%ymm8
 	addq	0+256(%rsp),%r11
 	andq	%r8,%r12
@@ -5387,6 +5407,8 @@ sha512_block_data_order_avx2:
 
 	leaq	1152(%rsp),%rsp
 
+.cfi_escape	0x0f,0x06,0x77,0x98,0x01,0x06,0x23,0x08
+
 	addq	0(%rdi),%rax
 	addq	8(%rdi),%rbx
 	addq	16(%rdi),%rcx
@@ -5412,9 +5434,11 @@ sha512_block_data_order_avx2:
 	jbe	.Loop_avx2
 	leaq	(%rsp),%rbp
 
+
+.cfi_escape	0x0f,0x06,0x76,0x98,0x01,0x06,0x23,0x08
+
 .Ldone_avx2:
-	leaq	(%rbp),%rsp
-	movq	152(%rsp),%rsi
+	movq	152(%rbp),%rsi
 .cfi_def_cfa	%rsi,8
 	vzeroupper
 	movq	-48(%rsi),%r15
diff --git a/deps/openssl/config/archs/BSD-x86_64/asm_avx2/crypto/x86_64cpuid.s b/deps/openssl/config/archs/BSD-x86_64/asm_avx2/crypto/x86_64cpuid.s
index fd17eaaba4..9268ce8c9a 100644
--- a/deps/openssl/config/archs/BSD-x86_64/asm_avx2/crypto/x86_64cpuid.s
+++ b/deps/openssl/config/archs/BSD-x86_64/asm_avx2/crypto/x86_64cpuid.s
@@ -12,6 +12,7 @@
 .type	OPENSSL_atomic_add,@function
 .align	16
 OPENSSL_atomic_add:
+.cfi_startproc
 	movl	(%rdi),%eax
 .Lspin:	leaq	(%rsi,%rax,1),%r8
 .byte	0xf0
@@ -20,16 +21,19 @@ OPENSSL_atomic_add:
 	movl	%r8d,%eax
 .byte	0x48,0x98
 	.byte	0xf3,0xc3
+.cfi_endproc
 .size	OPENSSL_atomic_add,.-OPENSSL_atomic_add
 
 .globl	OPENSSL_rdtsc
 .type	OPENSSL_rdtsc,@function
 .align	16
 OPENSSL_rdtsc:
+.cfi_startproc
 	rdtsc
 	shlq	$32,%rdx
 	orq	%rdx,%rax
 	.byte	0xf3,0xc3
+.cfi_endproc
 .size	OPENSSL_rdtsc,.-OPENSSL_rdtsc
 
 .globl	OPENSSL_ia32_cpuid
@@ -205,6 +209,7 @@ OPENSSL_ia32_cpuid:
 .type	OPENSSL_cleanse,@function
 .align	16
 OPENSSL_cleanse:
+.cfi_startproc
 	xorq	%rax,%rax
 	cmpq	$15,%rsi
 	jae	.Lot
@@ -234,12 +239,14 @@ OPENSSL_cleanse:
 	cmpq	$0,%rsi
 	jne	.Little
 	.byte	0xf3,0xc3
+.cfi_endproc
 .size	OPENSSL_cleanse,.-OPENSSL_cleanse
 
 .globl	CRYPTO_memcmp
 .type	CRYPTO_memcmp,@function
 .align	16
 CRYPTO_memcmp:
+.cfi_startproc
 	xorq	%rax,%rax
 	xorq	%r10,%r10
 	cmpq	$0,%rdx
@@ -268,11 +275,13 @@ CRYPTO_memcmp:
 	shrq	$63,%rax
 .Lno_data:
 	.byte	0xf3,0xc3
+.cfi_endproc
 .size	CRYPTO_memcmp,.-CRYPTO_memcmp
 .globl	OPENSSL_wipe_cpu
 .type	OPENSSL_wipe_cpu,@function
 .align	16
 OPENSSL_wipe_cpu:
+.cfi_startproc
 	pxor	%xmm0,%xmm0
 	pxor	%xmm1,%xmm1
 	pxor	%xmm2,%xmm2
@@ -299,11 +308,13 @@ OPENSSL_wipe_cpu:
 	xorq	%r11,%r11
 	leaq	8(%rsp),%rax
 	.byte	0xf3,0xc3
+.cfi_endproc
 .size	OPENSSL_wipe_cpu,.-OPENSSL_wipe_cpu
 .globl	OPENSSL_instrument_bus
 .type	OPENSSL_instrument_bus,@function
 .align	16
 OPENSSL_instrument_bus:
+.cfi_startproc
 	movq	%rdi,%r10
 	movq	%rsi,%rcx
 	movq	%rsi,%r11
@@ -330,12 +341,14 @@ OPENSSL_instrument_bus:
 
 	movq	%r11,%rax
 	.byte	0xf3,0xc3
+.cfi_endproc
 .size	OPENSSL_instrument_bus,.-OPENSSL_instrument_bus
 
 .globl	OPENSSL_instrument_bus2
 .type	OPENSSL_instrument_bus2,@function
 .align	16
 OPENSSL_instrument_bus2:
+.cfi_startproc
 	movq	%rdi,%r10
 	movq	%rsi,%rcx
 	movq	%rdx,%r11
@@ -378,11 +391,13 @@ OPENSSL_instrument_bus2:
 	movq	8(%rsp),%rax
 	subq	%rcx,%rax
 	.byte	0xf3,0xc3
+.cfi_endproc
 .size	OPENSSL_instrument_bus2,.-OPENSSL_instrument_bus2
 .globl	OPENSSL_ia32_rdrand_bytes
 .type	OPENSSL_ia32_rdrand_bytes,@function
 .align	16
 OPENSSL_ia32_rdrand_bytes:
+.cfi_startproc
 	xorq	%rax,%rax
 	cmpq	$0,%rsi
 	je	.Ldone_rdrand_bytes
@@ -419,11 +434,13 @@ OPENSSL_ia32_rdrand_bytes:
 .Ldone_rdrand_bytes:
 	xorq	%r10,%r10
 	.byte	0xf3,0xc3
+.cfi_endproc
 .size	OPENSSL_ia32_rdrand_bytes,.-OPENSSL_ia32_rdrand_bytes
 .globl	OPENSSL_ia32_rdseed_bytes
 .type	OPENSSL_ia32_rdseed_bytes,@function
 .align	16
 OPENSSL_ia32_rdseed_bytes:
+.cfi_startproc
 	xorq	%rax,%rax
 	cmpq	$0,%rsi
 	je	.Ldone_rdseed_bytes
@@ -460,4 +477,5 @@ OPENSSL_ia32_rdseed_bytes:
 .Ldone_rdseed_bytes:
 	xorq	%r10,%r10
 	.byte	0xf3,0xc3
+.cfi_endproc
 .size	OPENSSL_ia32_rdseed_bytes,.-OPENSSL_ia32_rdseed_bytes
diff --git a/deps/openssl/config/archs/BSD-x86_64/asm_avx2/include/openssl/opensslconf.h b/deps/openssl/config/archs/BSD-x86_64/asm_avx2/include/openssl/opensslconf.h
index 6094de421e..80bda2b852 100644
--- a/deps/openssl/config/archs/BSD-x86_64/asm_avx2/include/openssl/opensslconf.h
+++ b/deps/openssl/config/archs/BSD-x86_64/asm_avx2/include/openssl/opensslconf.h
@@ -93,9 +93,6 @@ extern "C" {
 #ifndef OPENSSL_NO_DYNAMIC_ENGINE
 # define OPENSSL_NO_DYNAMIC_ENGINE
 #endif
-#ifndef OPENSSL_NO_AFALGENG
-# define OPENSSL_NO_AFALGENG
-#endif
 
 
 /*
diff --git a/deps/openssl/config/archs/BSD-x86_64/asm_avx2/include/progs.h b/deps/openssl/config/archs/BSD-x86_64/asm_avx2/include/progs.h
index 9b3d270e20..308c65601b 100644
--- a/deps/openssl/config/archs/BSD-x86_64/asm_avx2/include/progs.h
+++ b/deps/openssl/config/archs/BSD-x86_64/asm_avx2/include/progs.h
@@ -2,7 +2,7 @@
  * WARNING: do not edit!
  * Generated by apps/progs.pl
  *
- * Copyright 1995-2019 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 1995-2020 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
diff --git a/deps/openssl/config/archs/BSD-x86_64/asm_avx2/openssl-cl.gypi b/deps/openssl/config/archs/BSD-x86_64/asm_avx2/openssl-cl.gypi
index 046ed1ab79..6ced0528ca 100644
--- a/deps/openssl/config/archs/BSD-x86_64/asm_avx2/openssl-cl.gypi
+++ b/deps/openssl/config/archs/BSD-x86_64/asm_avx2/openssl-cl.gypi
@@ -15,6 +15,7 @@
       'KECCAK1600_ASM',
       'RC4_ASM',
       'MD5_ASM',
+      'AESNI_ASM',
       'VPAES_ASM',
       'GHASH_ASM',
       'ECP_NISTZ256_ASM',
diff --git a/deps/openssl/config/archs/BSD-x86_64/asm_avx2/openssl.gypi b/deps/openssl/config/archs/BSD-x86_64/asm_avx2/openssl.gypi
index e9ccff9647..d56ffb9186 100644
--- a/deps/openssl/config/archs/BSD-x86_64/asm_avx2/openssl.gypi
+++ b/deps/openssl/config/archs/BSD-x86_64/asm_avx2/openssl.gypi
@@ -723,6 +723,7 @@
       'KECCAK1600_ASM',
       'RC4_ASM',
       'MD5_ASM',
+      'AESNI_ASM',
       'VPAES_ASM',
       'GHASH_ASM',
       'ECP_NISTZ256_ASM',
diff --git a/deps/openssl/config/archs/BSD-x86_64/no-asm/configdata.pm b/deps/openssl/config/archs/BSD-x86_64/no-asm/configdata.pm
index 84e3b18753..23a0ff1905 100644
--- a/deps/openssl/config/archs/BSD-x86_64/no-asm/configdata.pm
+++ b/deps/openssl/config/archs/BSD-x86_64/no-asm/configdata.pm
@@ -54,7 +54,7 @@ our %config = (
   minor => "1.1",
   openssl_algorithm_defines => [ "OPENSSL_NO_COMP", "OPENSSL_NO_MD2", "OPENSSL_NO_RC5" ],
   openssl_api_defines => [  ],
-  openssl_other_defines => [ "OPENSSL_RAND_SEED_OS", "OPENSSL_NO_AFALGENG", "OPENSSL_NO_ASAN", "OPENSSL_NO_ASM", "OPENSSL_NO_CRYPTO_MDEBUG", "OPENSSL_NO_CRYPTO_MDEBUG_BACKTRACE", "OPENSSL_NO_EC_NISTP_64_GCC_128", "OPENSSL_NO_EGD", "OPENSSL_NO_EXTERNAL_TESTS", "OPENSSL_NO_FUZZ_AFL", "OPENSSL_NO_FUZZ_LIBFUZZER", "OPENSSL_NO_HEARTBEATS", "OPENSSL_NO_MSAN", "OPENSSL_NO_SCTP", "OPENSSL_NO_SSL3", "OPENSSL_NO_SSL3_METHOD", "OPENSSL_NO_UBSAN", "OPENSSL_NO_UNIT_TEST", "OPENSSL_NO_WEAK_SSL_CIPHERS", "OPENSSL_NO_DYNAMIC_ENGINE", "OPENSSL_NO_AFALGENG" ],
+  openssl_other_defines => [ "OPENSSL_RAND_SEED_OS", "OPENSSL_NO_AFALGENG", "OPENSSL_NO_ASAN", "OPENSSL_NO_ASM", "OPENSSL_NO_CRYPTO_MDEBUG", "OPENSSL_NO_CRYPTO_MDEBUG_BACKTRACE", "OPENSSL_NO_EC_NISTP_64_GCC_128", "OPENSSL_NO_EGD", "OPENSSL_NO_EXTERNAL_TESTS", "OPENSSL_NO_FUZZ_AFL", "OPENSSL_NO_FUZZ_LIBFUZZER", "OPENSSL_NO_HEARTBEATS", "OPENSSL_NO_MSAN", "OPENSSL_NO_SCTP", "OPENSSL_NO_SSL3", "OPENSSL_NO_SSL3_METHOD", "OPENSSL_NO_UBSAN", "OPENSSL_NO_UNIT_TEST", "OPENSSL_NO_WEAK_SSL_CIPHERS", "OPENSSL_NO_DYNAMIC_ENGINE" ],
   openssl_sys_defines => [  ],
   openssl_thread_defines => [ "OPENSSL_THREADS" ],
   openssldir => "",
@@ -110,8 +110,8 @@ our %config = (
   sourcedir => ".",
   target => "BSD-x86_64",
   tdirs => [ "ossl_shim" ],
-  version => "1.1.1d",
-  version_num => "0x1010104fL",
+  version => "1.1.1e",
+  version_num => "0x1010105fL",
 );
 
 our %target = (
@@ -233,6 +233,7 @@ our @disablables = (
   "dgram",
   "dh",
   "dsa",
+  "dso",
   "dtls",
   "dynamic-engine",
   "ec",
@@ -350,8 +351,8 @@ our %unified_info = (
         {
             "" =>
                 [
-                    "crypto/include/internal/bn_conf.h",
-                    "crypto/include/internal/dso_conf.h",
+                    "include/crypto/bn_conf.h",
+                    "include/crypto/dso_conf.h",
                     "include/openssl/opensslconf.h",
                 ],
             "apps/asn1pars.o" =>
@@ -619,14 +620,6 @@ our %unified_info = (
                     "crypto/perlasm/cbc.pl",
                     "crypto/perlasm/x86asm.pl",
                 ],
-            "crypto/include/internal/bn_conf.h" =>
-                [
-                    "configdata.pm",
-                ],
-            "crypto/include/internal/dso_conf.h" =>
-                [
-                    "configdata.pm",
-                ],
             "crypto/rc4/rc4-586.s" =>
                 [
                     "crypto/perlasm/x86asm.pl",
@@ -702,6 +695,14 @@ our %unified_info = (
                 [
                     "libcrypto",
                 ],
+            "include/crypto/bn_conf.h" =>
+                [
+                    "configdata.pm",
+                ],
+            "include/crypto/dso_conf.h" =>
+                [
+                    "configdata.pm",
+                ],
             "include/openssl/opensslconf.h" =>
                 [
                     "configdata.pm",
@@ -1499,6 +1500,12 @@ our %unified_info = (
                     "libcrypto",
                     "test/libtestutil.a",
                 ],
+            "test/ssl_ctx_test" =>
+                [
+                    "libcrypto",
+                    "libssl",
+                    "test/libtestutil.a",
+                ],
             "test/ssl_test" =>
                 [
                     "libcrypto",
@@ -3218,7 +3225,6 @@ our %unified_info = (
                             "test/testutil/cb.o",
                             "test/testutil/driver.o",
                             "test/testutil/format_output.o",
-                            "test/testutil/init.o",
                             "test/testutil/main.o",
                             "test/testutil/output_helpers.o",
                             "test/testutil/random.o",
@@ -3226,6 +3232,7 @@ our %unified_info = (
                             "test/testutil/tap_bio.o",
                             "test/testutil/test_cleanup.o",
                             "test/testutil/tests.o",
+                            "test/testutil/testutil_init.o",
                         ],
                     "products" =>
                         {
@@ -3724,14 +3731,6 @@ our %unified_info = (
                 [
                     "crypto/ia64cpuid.S",
                 ],
-            "crypto/include/internal/bn_conf.h" =>
-                [
-                    "crypto/include/internal/bn_conf.h.in",
-                ],
-            "crypto/include/internal/dso_conf.h" =>
-                [
-                    "crypto/include/internal/dso_conf.h.in",
-                ],
             "crypto/md5/md5-586.s" =>
                 [
                     "crypto/md5/asm/md5-586.pl",
@@ -4172,6 +4171,14 @@ our %unified_info = (
                     "engines/asm/e_padlock-x86_64.pl",
                     "\$(PERLASM_SCHEME)",
                 ],
+            "include/crypto/bn_conf.h" =>
+                [
+                    "include/crypto/bn_conf.h.in",
+                ],
+            "include/crypto/dso_conf.h" =>
+                [
+                    "include/crypto/dso_conf.h.in",
+                ],
             "include/openssl/opensslconf.h" =>
                 [
                     "include/openssl/opensslconf.h.in",
@@ -4866,49 +4873,41 @@ our %unified_info = (
             "crypto/aes/aes_cbc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/aes/aes_cfb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/aes/aes_core.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/aes/aes_ecb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/aes/aes_ige.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/aes/aes_misc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/aes/aes_ofb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/aes/aes_wrap.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/aes/aesfx-sparcv9.o" =>
@@ -4930,7 +4929,6 @@ our %unified_info = (
             "crypto/aria/aria.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/arm64cpuid.o" =>
@@ -4944,613 +4942,511 @@ our %unified_info = (
             "crypto/asn1/a_bitstr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_d2i_fp.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_digest.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_dup.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_gentm.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_i2d_fp.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_int.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_mbstr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_object.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_octet.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_print.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_sign.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_strex.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_strnid.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_time.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_type.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_utctm.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_utf8.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_verify.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/ameth_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/asn1_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/asn1_gen.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/asn1_item_list.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/asn1_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/asn1_par.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/asn_mime.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/asn_moid.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/asn_mstbl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/asn_pack.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/bio_asn1.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/bio_ndef.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/d2i_pr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/d2i_pu.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/evp_asn1.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/f_int.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/f_string.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/i2d_pr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/i2d_pu.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/n_pkey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/nsseq.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/p5_pbe.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/p5_pbev2.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/p5_scrypt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/p8_pkey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/t_bitst.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/t_pkey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/t_spki.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/tasn_dec.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/tasn_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/tasn_fre.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/tasn_new.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/tasn_prn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/tasn_scn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/tasn_typ.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/tasn_utl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/x_algor.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/x_bignum.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/x_info.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/x_int64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/x_long.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/x_pkey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/x_sig.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/x_spki.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/x_val.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/async/arch/async_null.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/async/arch/async_posix.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/async/arch/async_win.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/async/async.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/async/async_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/async/async_wait.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bf/bf_cfb64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bf/bf_ecb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bf/bf_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bf/bf_ofb64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bf/bf_skey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/b_addr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/b_dump.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/b_print.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/b_sock.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/b_sock2.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bf_buff.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bf_lbuf.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bf_nbio.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bf_null.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bio_cb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bio_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bio_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bio_meth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bss_acpt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bss_bio.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bss_conn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bss_dgram.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bss_fd.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bss_file.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bss_log.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bss_mem.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bss_null.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bss_sock.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/blake2/blake2b.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/blake2/blake2s.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/blake2/m_blake2b.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/blake2/m_blake2s.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/armv4-gf2m.o" =>
@@ -5568,188 +5464,157 @@ our %unified_info = (
             "crypto/bn/bn_add.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_asm.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_blind.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_const.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_ctx.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_depr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_dh.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_div.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_exp.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto",
                 ],
             "crypto/bn/bn_exp2.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_gcd.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_gf2m.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_intern.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_kron.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_mod.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_mont.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_mpi.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_mul.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_nist.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_prime.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_print.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_rand.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_recp.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_shift.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_sqr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_sqrt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_srp.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_word.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_x931p.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/mips-mont.o" =>
@@ -5779,13 +5644,11 @@ our %unified_info = (
             "crypto/buffer/buf_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/buffer/buffer.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/buildinf.h" =>
@@ -5795,43 +5658,36 @@ our %unified_info = (
             "crypto/camellia/camellia.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/camellia/cmll_cbc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/camellia/cmll_cfb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/camellia/cmll_ctr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/camellia/cmll_ecb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/camellia/cmll_misc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/camellia/cmll_ofb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/camellia/cmllt4-sparcv9.o" =>
@@ -5841,31 +5697,26 @@ our %unified_info = (
             "crypto/cast/c_cfb64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cast/c_ecb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cast/c_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cast/c_ofb64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cast/c_skey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/chacha/chacha-armv4.o" =>
@@ -5883,278 +5734,232 @@ our %unified_info = (
             "crypto/chacha/chacha_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cmac/cm_ameth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cmac/cm_pmeth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cmac/cmac.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_asn1.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_att.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_cd.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_dd.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_env.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_ess.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_io.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_kari.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_pwri.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_sd.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_smime.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/conf/conf_api.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/conf/conf_def.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/conf/conf_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/conf/conf_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/conf/conf_mall.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/conf/conf_mod.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/conf/conf_sap.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/conf/conf_ssl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cpt_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cryptlib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ct/ct_b64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ct/ct_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ct/ct_log.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ct/ct_oct.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ct/ct_policy.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ct/ct_prn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ct/ct_sct.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ct/ct_sct_ctx.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ct/ct_vfy.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ct/ct_x509v3.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ctype.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cversion.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto",
                 ],
             "crypto/des/cbc_cksm.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/cbc_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/cfb64ede.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/cfb64enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/cfb_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/des_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/dest4-sparcv9.o" =>
@@ -6164,301 +5969,251 @@ our %unified_info = (
             "crypto/des/ecb3_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/ecb_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/fcrypt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/fcrypt_b.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/ofb64ede.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/ofb64enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/ofb_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/pcbc_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/qud_cksm.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/rand_key.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/set_key.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/str2key.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/xcbc_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_ameth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_asn1.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_check.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_depr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_gen.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_kdf.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_key.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_meth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_pmeth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_prn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_rfc5114.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_rfc7919.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dsa/dsa_ameth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dsa/dsa_asn1.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dsa/dsa_depr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dsa/dsa_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dsa/dsa_gen.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dsa/dsa_key.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dsa/dsa_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dsa/dsa_meth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dsa/dsa_ossl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dsa/dsa_pmeth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dsa/dsa_prn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dsa/dsa_sign.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dsa/dsa_vrf.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dso/dso_dl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dso/dso_dlfcn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dso/dso_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dso/dso_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dso/dso_openssl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dso/dso_vms.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dso/dso_win32.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ebcdic.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/curve25519.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/curve448/arch_32/f_impl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto/ec/curve448/arch_32",
                     "crypto/ec/curve448",
@@ -6466,7 +6221,6 @@ our %unified_info = (
             "crypto/ec/curve448/curve448.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto/ec/curve448/arch_32",
                     "crypto/ec/curve448",
@@ -6474,7 +6228,6 @@ our %unified_info = (
             "crypto/ec/curve448/curve448_tables.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto/ec/curve448/arch_32",
                     "crypto/ec/curve448",
@@ -6482,7 +6235,6 @@ our %unified_info = (
             "crypto/ec/curve448/eddsa.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto/ec/curve448/arch_32",
                     "crypto/ec/curve448",
@@ -6490,7 +6242,6 @@ our %unified_info = (
             "crypto/ec/curve448/f_generic.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto/ec/curve448/arch_32",
                     "crypto/ec/curve448",
@@ -6498,7 +6249,6 @@ our %unified_info = (
             "crypto/ec/curve448/scalar.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto/ec/curve448/arch_32",
                     "crypto/ec/curve448",
@@ -6506,163 +6256,136 @@ our %unified_info = (
             "crypto/ec/ec2_oct.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec2_smpl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec_ameth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec_asn1.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec_check.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec_curve.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec_cvt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec_key.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec_kmeth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec_mult.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec_oct.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec_pmeth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec_print.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecdh_kdf.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecdh_ossl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecdsa_ossl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecdsa_sign.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecdsa_vrf.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/eck_prn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecp_mont.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecp_nist.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecp_nistp224.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecp_nistp256.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecp_nistp521.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecp_nistputil.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecp_nistz256-armv4.o" =>
@@ -6680,229 +6403,191 @@ our %unified_info = (
             "crypto/ec/ecp_oct.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecp_smpl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecx_meth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/eng_all.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/eng_cnf.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/eng_ctrl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/eng_devcrypto.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/eng_dyn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/eng_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/eng_fat.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/eng_init.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/eng_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/eng_list.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/eng_openssl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/eng_pkey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/eng_rdrand.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/eng_table.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/tb_asnmth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/tb_cipher.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/tb_dh.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/tb_digest.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/tb_dsa.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/tb_eckey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/tb_pkmeth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/tb_rand.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/tb_rsa.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/err/err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/err/err_all.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/err/err_prn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/bio_b64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/bio_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/bio_md.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/bio_ok.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/c_allc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/c_alld.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/cmeth_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/digest.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/e_aes.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto",
                     "crypto/modes",
@@ -6910,21 +6595,18 @@ our %unified_info = (
             "crypto/evp/e_aes_cbc_hmac_sha1.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto/modes",
                 ],
             "crypto/evp/e_aes_cbc_hmac_sha256.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto/modes",
                 ],
             "crypto/evp/e_aria.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto",
                     "crypto/modes",
@@ -6932,13 +6614,11 @@ our %unified_info = (
             "crypto/evp/e_bf.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/e_camellia.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto",
                     "crypto/modes",
@@ -6946,81 +6626,68 @@ our %unified_info = (
             "crypto/evp/e_cast.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/e_chacha20_poly1305.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/e_des.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto",
                 ],
             "crypto/evp/e_des3.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto",
                 ],
             "crypto/evp/e_idea.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/e_null.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/e_old.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/e_rc2.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/e_rc4.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/e_rc4_hmac_md5.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/e_rc5.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/e_seed.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/e_sm4.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto",
                     "crypto/modes",
@@ -7028,328 +6695,267 @@ our %unified_info = (
             "crypto/evp/e_xcbc_d.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/encode.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/evp_cnf.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/evp_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/evp_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/evp_key.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/evp_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/evp_pbe.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/evp_pkey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/m_md2.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/m_md4.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/m_md5.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/m_md5_sha1.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/m_mdc2.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/m_null.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/m_ripemd.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/m_sha1.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/m_sha3.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto",
                 ],
             "crypto/evp/m_sigver.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/m_wp.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/names.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/p5_crpt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/p5_crpt2.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/p_dec.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/p_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/p_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/p_open.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/p_seal.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/p_sign.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/p_verify.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/pbe_scrypt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/pmeth_fn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/pmeth_gn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/pmeth_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ex_data.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/getenv.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/hmac/hm_ameth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/hmac/hm_pmeth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/hmac/hmac.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/idea/i_cbc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/idea/i_cfb64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/idea/i_ecb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/idea/i_ofb64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/idea/i_skey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
-            "crypto/include/internal/bn_conf.h" =>
-                [
-                    ".",
-                ],
-            "crypto/include/internal/dso_conf.h" =>
-                [
-                    ".",
-                ],
             "crypto/init.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/kdf/hkdf.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/kdf/kdf_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/kdf/scrypt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/kdf/tls1_prf.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/lhash/lh_stats.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/lhash/lhash.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/md4/md4_dgst.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/md4/md4_one.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/md5/md5-sparcv9.o" =>
@@ -7359,85 +6965,71 @@ our %unified_info = (
             "crypto/md5/md5_dgst.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/md5/md5_one.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/mdc2/mdc2_one.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/mdc2/mdc2dgst.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/mem.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/mem_clr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/mem_dbg.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/mem_sec.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/modes/cbc128.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/modes/ccm128.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/modes/cfb128.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/modes/ctr128.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/modes/cts128.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/modes/gcm128.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto",
                 ],
@@ -7460,361 +7052,301 @@ our %unified_info = (
             "crypto/modes/ocb128.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/modes/ofb128.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/modes/wrap128.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/modes/xts128.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/o_dir.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/o_fips.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/o_fopen.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/o_init.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/o_str.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/o_time.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/objects/o_names.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/objects/obj_dat.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/objects/obj_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/objects/obj_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/objects/obj_xref.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ocsp/ocsp_asn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ocsp/ocsp_cl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ocsp/ocsp_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ocsp/ocsp_ext.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ocsp/ocsp_ht.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ocsp/ocsp_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ocsp/ocsp_prn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ocsp/ocsp_srv.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ocsp/ocsp_vfy.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ocsp/v3_ocsp.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pem/pem_all.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pem/pem_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pem/pem_info.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pem/pem_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pem/pem_oth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pem/pem_pk8.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pem/pem_pkey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pem/pem_sign.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pem/pem_x509.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pem/pem_xaux.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pem/pvkfmt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_add.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_asn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_attr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_crpt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_crt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_decr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_init.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_key.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_kiss.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_mutl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_npas.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_p8d.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_p8e.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_sbag.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_utl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/pk12err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs7/bio_pk7.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs7/pk7_asn1.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs7/pk7_attr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs7/pk7_doit.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs7/pk7_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs7/pk7_mime.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs7/pk7_smime.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs7/pkcs7err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/poly1305/poly1305-armv4.o" =>
@@ -7836,259 +7368,216 @@ our %unified_info = (
             "crypto/poly1305/poly1305.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/poly1305/poly1305_ameth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/poly1305/poly1305_pmeth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rand/drbg_ctr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rand/drbg_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rand/rand_egd.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rand/rand_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rand/rand_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rand/rand_unix.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rand/rand_vms.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rand/rand_win.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rand/randfile.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rc2/rc2_cbc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rc2/rc2_ecb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rc2/rc2_skey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rc2/rc2cfb64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rc2/rc2ofb64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rc4/rc4_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rc4/rc4_skey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ripemd/rmd_dgst.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ripemd/rmd_one.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_ameth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_asn1.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_chk.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_crpt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_depr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_gen.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_meth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_mp.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_none.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_oaep.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_ossl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_pk1.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_pmeth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_prn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_pss.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_saos.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_sign.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_ssl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_x931.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_x931g.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/s390xcpuid.o" =>
@@ -8098,31 +7587,26 @@ our %unified_info = (
             "crypto/seed/seed.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/seed/seed_cbc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/seed/seed_cfb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/seed/seed_ecb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/seed/seed_ofb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sha/keccak1600-armv4.o" =>
@@ -8132,7 +7616,6 @@ our %unified_info = (
             "crypto/sha/keccak1600.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sha/sha1-armv4-large.o" =>
@@ -8158,13 +7641,11 @@ our %unified_info = (
             "crypto/sha/sha1_one.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sha/sha1dgst.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sha/sha256-armv4.o" =>
@@ -8190,7 +7671,6 @@ our %unified_info = (
             "crypto/sha/sha256.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sha/sha512-armv4.o" =>
@@ -8216,709 +7696,591 @@ our %unified_info = (
             "crypto/sha/sha512.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/siphash/siphash.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/siphash/siphash_ameth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/siphash/siphash_pmeth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sm2/sm2_crypt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sm2/sm2_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sm2/sm2_pmeth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sm2/sm2_sign.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sm3/m_sm3.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sm3/sm3.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sm4/sm4.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/srp/srp_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/srp/srp_vfy.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/stack/stack.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/store/loader_file.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/store/store_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/store/store_init.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/store/store_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/store/store_register.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/store/store_strings.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/threads_none.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/threads_pthread.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/threads_win.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ts/ts_asn1.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ts/ts_conf.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ts/ts_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ts/ts_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ts/ts_req_print.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ts/ts_req_utils.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ts/ts_rsp_print.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ts/ts_rsp_sign.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ts/ts_rsp_utils.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ts/ts_rsp_verify.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ts/ts_verify_ctx.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/txt_db/txt_db.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ui/ui_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ui/ui_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ui/ui_null.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ui/ui_openssl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ui/ui_util.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/uid.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/whrlpool/wp_block.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/whrlpool/wp_dgst.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/by_dir.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/by_file.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/t_crl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/t_req.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/t_x509.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_att.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_cmp.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_d2.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_def.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_ext.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_lu.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_meth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_obj.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_r2x.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_req.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_set.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_trs.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_txt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_v3.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_vfy.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_vpm.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509cset.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509name.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509rset.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509spki.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509type.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x_all.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x_attrib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x_crl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x_exten.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x_name.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x_pubkey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x_req.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x_x509.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x_x509a.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/pcy_cache.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/pcy_data.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/pcy_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/pcy_map.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/pcy_node.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/pcy_tree.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_addr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_admis.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_akey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_akeya.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_alt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_asid.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_bcons.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_bitst.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_conf.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_cpols.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_crld.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_enum.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_extku.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_genn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_ia5.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_info.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_int.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_ncons.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_pci.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_pcia.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_pcons.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_pku.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_pmaps.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_prn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_purp.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_skey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_sxnet.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_tlsf.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_utl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "engines/e_capi.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "engines/e_padlock.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "fuzz/asn1.o" =>
@@ -8969,6 +8331,14 @@ our %unified_info = (
                 [
                     "include",
                 ],
+            "include/crypto/bn_conf.h" =>
+                [
+                    ".",
+                ],
+            "include/crypto/dso_conf.h" =>
+                [
+                    ".",
+                ],
             "include/openssl/opensslconf.h" =>
                 [
                     ".",
@@ -9213,7 +8583,6 @@ our %unified_info = (
                 [
                     ".",
                     "include",
-                    "crypto/include",
                 ],
             "test/asn1_string_table_test.o" =>
                 [
@@ -9539,7 +8908,6 @@ our %unified_info = (
                 [
                     ".",
                     "include",
-                    "crypto/include",
                 ],
             "test/cipher_overhead_test.o" =>
                 [
@@ -9585,7 +8953,6 @@ our %unified_info = (
             "test/ctype_internal_test.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "test/curve448_internal_test.o" =>
@@ -9651,7 +9018,6 @@ our %unified_info = (
                 [
                     "include",
                     "crypto/ec",
-                    "crypto/include",
                 ],
             "test/ecdsatest.o" =>
                 [
@@ -9676,7 +9042,6 @@ our %unified_info = (
             "test/evp_extra_test.o" =>
                 [
                     "include",
-                    "crypto/include",
                 ],
             "test/evp_test.o" =>
                 [
@@ -9774,7 +9139,6 @@ our %unified_info = (
                 [
                     ".",
                     "include",
-                    "crypto/include",
                 ],
             "test/rc2test.o" =>
                 [
@@ -9824,18 +9188,15 @@ our %unified_info = (
                 [
                     ".",
                     "include",
-                    "crypto/include",
                 ],
             "test/sm2_internal_test.o" =>
                 [
                     "include",
-                    "crypto/include",
                 ],
             "test/sm4_internal_test.o" =>
                 [
                     ".",
                     "include",
-                    "crypto/include",
                 ],
             "test/srptest.o" =>
                 [
@@ -9846,6 +9207,10 @@ our %unified_info = (
                     ".",
                     "include",
                 ],
+            "test/ssl_ctx_test.o" =>
+                [
+                    "include",
+                ],
             "test/ssl_test.o" =>
                 [
                     "include",
@@ -9909,10 +9274,6 @@ our %unified_info = (
                 [
                     "include",
                 ],
-            "test/testutil/init.o" =>
-                [
-                    "include",
-                ],
             "test/testutil/main.o" =>
                 [
                     "include",
@@ -9941,6 +9302,10 @@ our %unified_info = (
                 [
                     "include",
                 ],
+            "test/testutil/testutil_init.o" =>
+                [
+                    "include",
+                ],
             "test/threadstest.o" =>
                 [
                     "include",
@@ -10205,6 +9570,7 @@ our %unified_info = (
             "test/sm4_internal_test",
             "test/srptest",
             "test/ssl_cert_table_internal_test",
+            "test/ssl_ctx_test",
             "test/ssl_test",
             "test/ssl_test_ctx_test",
             "test/sslapitest",
@@ -15100,7 +14466,6 @@ our %unified_info = (
                     "test/testutil/cb.o",
                     "test/testutil/driver.o",
                     "test/testutil/format_output.o",
-                    "test/testutil/init.o",
                     "test/testutil/main.o",
                     "test/testutil/output_helpers.o",
                     "test/testutil/random.o",
@@ -15108,6 +14473,7 @@ our %unified_info = (
                     "test/testutil/tap_bio.o",
                     "test/testutil/test_cleanup.o",
                     "test/testutil/tests.o",
+                    "test/testutil/testutil_init.o",
                 ],
             "test/md2test" =>
                 [
@@ -15335,6 +14701,14 @@ our %unified_info = (
                 [
                     "test/ssl_cert_table_internal_test.c",
                 ],
+            "test/ssl_ctx_test" =>
+                [
+                    "test/ssl_ctx_test.o",
+                ],
+            "test/ssl_ctx_test.o" =>
+                [
+                    "test/ssl_ctx_test.c",
+                ],
             "test/ssl_test" =>
                 [
                     "test/handshake_helper.o",
@@ -15437,10 +14811,6 @@ our %unified_info = (
                 [
                     "test/testutil/format_output.c",
                 ],
-            "test/testutil/init.o" =>
-                [
-                    "test/testutil/init.c",
-                ],
             "test/testutil/main.o" =>
                 [
                     "test/testutil/main.c",
@@ -15469,6 +14839,10 @@ our %unified_info = (
                 [
                     "test/testutil/tests.c",
                 ],
+            "test/testutil/testutil_init.o" =>
+                [
+                    "test/testutil/testutil_init.c",
+                ],
             "test/threadstest" =>
                 [
                     "test/threadstest.o",
diff --git a/deps/openssl/config/archs/BSD-x86_64/no-asm/crypto/buildinf.h b/deps/openssl/config/archs/BSD-x86_64/no-asm/crypto/buildinf.h
index 7702df5969..06c423068a 100644
--- a/deps/openssl/config/archs/BSD-x86_64/no-asm/crypto/buildinf.h
+++ b/deps/openssl/config/archs/BSD-x86_64/no-asm/crypto/buildinf.h
@@ -11,7 +11,7 @@
  */
 
 #define PLATFORM "platform: BSD-x86_64"
-#define DATE "built on: Fri Sep 13 15:58:03 2019 UTC"
+#define DATE "built on: Wed Mar 18 21:05:17 2020 UTC"
 
 /*
  * Generate compiler_flags as an array of individual characters. This is a
diff --git a/deps/openssl/config/archs/BSD-x86_64/no-asm/crypto/include/internal/bn_conf.h b/deps/openssl/config/archs/BSD-x86_64/no-asm/crypto/include/internal/bn_conf.h
index 34bd8b78b4..5312ef5a7a 100644
--- a/deps/openssl/config/archs/BSD-x86_64/no-asm/crypto/include/internal/bn_conf.h
+++ b/deps/openssl/config/archs/BSD-x86_64/no-asm/crypto/include/internal/bn_conf.h
@@ -1,5 +1,5 @@
 /* WARNING: do not edit! */
-/* Generated by Makefile from crypto/include/internal/bn_conf.h.in */
+/* Generated by Makefile from include/crypto/bn_conf.h.in */
 /*
  * Copyright 2016 The OpenSSL Project Authors. All Rights Reserved.
  *
@@ -9,8 +9,8 @@
  * https://www.openssl.org/source/license.html
  */
 
-#ifndef HEADER_BN_CONF_H
-# define HEADER_BN_CONF_H
+#ifndef OSSL_CRYPTO_BN_CONF_H
+# define OSSL_CRYPTO_BN_CONF_H
 
 /*
  * The contents of this file are not used in the UEFI build, as
diff --git a/deps/openssl/config/archs/BSD-x86_64/no-asm/crypto/include/internal/dso_conf.h b/deps/openssl/config/archs/BSD-x86_64/no-asm/crypto/include/internal/dso_conf.h
index 252266ec2a..4b1167c3d8 100644
--- a/deps/openssl/config/archs/BSD-x86_64/no-asm/crypto/include/internal/dso_conf.h
+++ b/deps/openssl/config/archs/BSD-x86_64/no-asm/crypto/include/internal/dso_conf.h
@@ -1,5 +1,5 @@
 /* WARNING: do not edit! */
-/* Generated by Makefile from crypto/include/internal/dso_conf.h.in */
+/* Generated by Makefile from include/crypto/dso_conf.h.in */
 /*
  * Copyright 2016-2019 The OpenSSL Project Authors. All Rights Reserved.
  *
@@ -9,8 +9,8 @@
  * https://www.openssl.org/source/license.html
  */
 
-#ifndef HEADER_DSO_CONF_H
-# define HEADER_DSO_CONF_H
+#ifndef OSSL_CRYPTO_DSO_CONF_H
+# define OSSL_CRYPTO_DSO_CONF_H
 # define DSO_DLFCN
 # define HAVE_DLFCN_H
 # define DSO_EXTENSION ".so"
diff --git a/deps/openssl/config/archs/BSD-x86_64/no-asm/include/openssl/opensslconf.h b/deps/openssl/config/archs/BSD-x86_64/no-asm/include/openssl/opensslconf.h
index df65780e39..ecb2a2aa8b 100644
--- a/deps/openssl/config/archs/BSD-x86_64/no-asm/include/openssl/opensslconf.h
+++ b/deps/openssl/config/archs/BSD-x86_64/no-asm/include/openssl/opensslconf.h
@@ -96,9 +96,6 @@ extern "C" {
 #ifndef OPENSSL_NO_DYNAMIC_ENGINE
 # define OPENSSL_NO_DYNAMIC_ENGINE
 #endif
-#ifndef OPENSSL_NO_AFALGENG
-# define OPENSSL_NO_AFALGENG
-#endif
 
 
 /*
diff --git a/deps/openssl/config/archs/BSD-x86_64/no-asm/include/progs.h b/deps/openssl/config/archs/BSD-x86_64/no-asm/include/progs.h
index 9b3d270e20..308c65601b 100644
--- a/deps/openssl/config/archs/BSD-x86_64/no-asm/include/progs.h
+++ b/deps/openssl/config/archs/BSD-x86_64/no-asm/include/progs.h
@@ -2,7 +2,7 @@
  * WARNING: do not edit!
  * Generated by apps/progs.pl
  *
- * Copyright 1995-2019 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 1995-2020 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
diff --git a/deps/openssl/config/archs/VC-WIN32/asm/configdata.pm b/deps/openssl/config/archs/VC-WIN32/asm/configdata.pm
index ecd5ebea5f..1354452500 100644
--- a/deps/openssl/config/archs/VC-WIN32/asm/configdata.pm
+++ b/deps/openssl/config/archs/VC-WIN32/asm/configdata.pm
@@ -15,7 +15,7 @@ our %config = (
   ARFLAGS => [ "/nologo" ],
   AS => "nasm",
   CC => "gcc",
-  CFLAGS => [ "/W3 /wd4090 /nologo /O2 /WX" ],
+  CFLAGS => [ "/W3 /wd4090 /nologo /O2" ],
   CPP => "\$(CC) /EP /C",
   CPPDEFINES => [  ],
   CPPFLAGS => [  ],
@@ -53,13 +53,13 @@ our %config = (
   export_var_as_fn => "1",
   includes => [  ],
   lflags => [  ],
-  lib_defines => [ "OPENSSL_PIC", "OPENSSL_CPUID_OBJ", "OPENSSL_BN_ASM_PART_WORDS", "OPENSSL_IA32_SSE2", "OPENSSL_BN_ASM_MONT", "OPENSSL_BN_ASM_GF2m", "SHA1_ASM", "SHA256_ASM", "SHA512_ASM", "RC4_ASM", "MD5_ASM", "RMD160_ASM", "VPAES_ASM", "WHIRLPOOL_ASM", "GHASH_ASM", "ECP_NISTZ256_ASM", "POLY1305_ASM" ],
+  lib_defines => [ "OPENSSL_PIC", "OPENSSL_CPUID_OBJ", "OPENSSL_BN_ASM_PART_WORDS", "OPENSSL_IA32_SSE2", "OPENSSL_BN_ASM_MONT", "OPENSSL_BN_ASM_GF2m", "SHA1_ASM", "SHA256_ASM", "SHA512_ASM", "RC4_ASM", "MD5_ASM", "RMD160_ASM", "AESNI_ASM", "VPAES_ASM", "WHIRLPOOL_ASM", "GHASH_ASM", "ECP_NISTZ256_ASM", "POLY1305_ASM" ],
   libdir => "",
   major => "1",
   minor => "1.1",
   openssl_algorithm_defines => [ "OPENSSL_NO_COMP", "OPENSSL_NO_MD2", "OPENSSL_NO_RC5" ],
   openssl_api_defines => [  ],
-  openssl_other_defines => [ "OPENSSL_RAND_SEED_OS", "OPENSSL_NO_AFALGENG", "OPENSSL_NO_ASAN", "OPENSSL_NO_CRYPTO_MDEBUG", "OPENSSL_NO_CRYPTO_MDEBUG_BACKTRACE", "OPENSSL_NO_DEVCRYPTOENG", "OPENSSL_NO_EC_NISTP_64_GCC_128", "OPENSSL_NO_EGD", "OPENSSL_NO_EXTERNAL_TESTS", "OPENSSL_NO_FUZZ_AFL", "OPENSSL_NO_FUZZ_LIBFUZZER", "OPENSSL_NO_HEARTBEATS", "OPENSSL_NO_MSAN", "OPENSSL_NO_SCTP", "OPENSSL_NO_SSL3", "OPENSSL_NO_SSL3_METHOD", "OPENSSL_NO_UBSAN", "OPENSSL_NO_UNIT_TEST", "OPENSSL_NO_WEAK_SSL_CIPHERS", "OPENSSL_NO_DYNAMIC_ENGINE", "OPENSSL_NO_AFALGENG" ],
+  openssl_other_defines => [ "OPENSSL_RAND_SEED_OS", "OPENSSL_NO_AFALGENG", "OPENSSL_NO_ASAN", "OPENSSL_NO_CRYPTO_MDEBUG", "OPENSSL_NO_CRYPTO_MDEBUG_BACKTRACE", "OPENSSL_NO_DEVCRYPTOENG", "OPENSSL_NO_EC_NISTP_64_GCC_128", "OPENSSL_NO_EGD", "OPENSSL_NO_EXTERNAL_TESTS", "OPENSSL_NO_FUZZ_AFL", "OPENSSL_NO_FUZZ_LIBFUZZER", "OPENSSL_NO_HEARTBEATS", "OPENSSL_NO_MSAN", "OPENSSL_NO_SCTP", "OPENSSL_NO_SSL3", "OPENSSL_NO_SSL3_METHOD", "OPENSSL_NO_UBSAN", "OPENSSL_NO_UNIT_TEST", "OPENSSL_NO_WEAK_SSL_CIPHERS", "OPENSSL_NO_DYNAMIC_ENGINE" ],
   openssl_sys_defines => [ "OPENSSL_SYS_WIN32" ],
   openssl_thread_defines => [ "OPENSSL_THREADS" ],
   openssldir => "",
@@ -115,8 +115,8 @@ our %config = (
   sourcedir => ".",
   target => "VC-WIN32",
   tdirs => [ "ossl_shim" ],
-  version => "1.1.1d",
-  version_num => "0x1010104fL",
+  version => "1.1.1e",
+  version_num => "0x1010105fL",
 );
 
 our %target = (
@@ -125,14 +125,14 @@ our %target = (
   AS => "nasm",
   ASFLAGS => "",
   CC => "cl",
-  CFLAGS => "/W3 /wd4090 /nologo /O2 /WX",
+  CFLAGS => "/W3 /wd4090 /nologo /O2",
   CPP => "\$(CC) /EP /C",
   HASHBANGPERL => "/usr/bin/env perl",
   LD => "link",
   LDFLAGS => "/nologo /debug",
   MT => "mt",
   MTFLAGS => "-nologo",
-  RANLIB => "CODE(0x56535777ac98)",
+  RANLIB => "CODE(0x5567c34c1cd8)",
   RC => "rc",
   _conf_fname_int => [ "Configurations/00-base-templates.conf", "Configurations/00-base-templates.conf", "Configurations/10-main.conf", "Configurations/10-main.conf", "Configurations/00-base-templates.conf", "Configurations/10-main.conf", "Configurations/shared-info.pl" ],
   aes_asm_src => "aes_core.c aes_cbc.c vpaes-x86.s aesni-x86.s",
@@ -257,6 +257,7 @@ our @disablables = (
   "dgram",
   "dh",
   "dsa",
+  "dso",
   "dtls",
   "dynamic-engine",
   "ec",
@@ -374,8 +375,8 @@ our %unified_info = (
         {
             "" =>
                 [
-                    "crypto/include/internal/bn_conf.h",
-                    "crypto/include/internal/dso_conf.h",
+                    "include/crypto/bn_conf.h",
+                    "include/crypto/dso_conf.h",
                     "include/openssl/opensslconf.h",
                 ],
             "apps/asn1pars.o" =>
@@ -643,14 +644,6 @@ our %unified_info = (
                     "crypto/perlasm/cbc.pl",
                     "crypto/perlasm/x86asm.pl",
                 ],
-            "crypto/include/internal/bn_conf.h" =>
-                [
-                    "configdata.pm",
-                ],
-            "crypto/include/internal/dso_conf.h" =>
-                [
-                    "configdata.pm",
-                ],
             "crypto/rc4/rc4-586.s" =>
                 [
                     "crypto/perlasm/x86asm.pl",
@@ -726,6 +719,14 @@ our %unified_info = (
                 [
                     "libcrypto",
                 ],
+            "include/crypto/bn_conf.h" =>
+                [
+                    "configdata.pm",
+                ],
+            "include/crypto/dso_conf.h" =>
+                [
+                    "configdata.pm",
+                ],
             "include/openssl/opensslconf.h" =>
                 [
                     "configdata.pm",
@@ -1523,6 +1524,12 @@ our %unified_info = (
                     "libcrypto",
                     "test/libtestutil.a",
                 ],
+            "test/ssl_ctx_test" =>
+                [
+                    "libcrypto",
+                    "libssl",
+                    "test/libtestutil.a",
+                ],
             "test/ssl_test" =>
                 [
                     "libcrypto",
@@ -3254,7 +3261,6 @@ our %unified_info = (
                             "test/testutil/cb.o",
                             "test/testutil/driver.o",
                             "test/testutil/format_output.o",
-                            "test/testutil/init.o",
                             "test/testutil/main.o",
                             "test/testutil/output_helpers.o",
                             "test/testutil/random.o",
@@ -3262,6 +3268,7 @@ our %unified_info = (
                             "test/testutil/tap_bio.o",
                             "test/testutil/test_cleanup.o",
                             "test/testutil/tests.o",
+                            "test/testutil/testutil_init.o",
                         ],
                     "products" =>
                         {
@@ -3755,14 +3762,6 @@ our %unified_info = (
                 [
                     "crypto/ia64cpuid.S",
                 ],
-            "crypto/include/internal/bn_conf.h" =>
-                [
-                    "crypto/include/internal/bn_conf.h.in",
-                ],
-            "crypto/include/internal/dso_conf.h" =>
-                [
-                    "crypto/include/internal/dso_conf.h.in",
-                ],
             "crypto/md5/md5-586.s" =>
                 [
                     "crypto/md5/asm/md5-586.pl",
@@ -4203,6 +4202,14 @@ our %unified_info = (
                     "engines/asm/e_padlock-x86_64.pl",
                     "\$(PERLASM_SCHEME)",
                 ],
+            "include/crypto/bn_conf.h" =>
+                [
+                    "include/crypto/bn_conf.h.in",
+                ],
+            "include/crypto/dso_conf.h" =>
+                [
+                    "include/crypto/dso_conf.h.in",
+                ],
             "include/openssl/opensslconf.h" =>
                 [
                     "include/openssl/opensslconf.h.in",
@@ -4912,49 +4919,41 @@ our %unified_info = (
             "crypto/aes/aes_cbc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/aes/aes_cfb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/aes/aes_core.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/aes/aes_ecb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/aes/aes_ige.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/aes/aes_misc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/aes/aes_ofb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/aes/aes_wrap.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/aes/aesfx-sparcv9.o" =>
@@ -4964,7 +4963,6 @@ our %unified_info = (
             "crypto/aes/aesni-x86.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/aes/aest4-sparcv9.o" =>
@@ -4982,13 +4980,11 @@ our %unified_info = (
             "crypto/aes/vpaes-x86.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/aria/aria.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/arm64cpuid.o" =>
@@ -5002,613 +4998,511 @@ our %unified_info = (
             "crypto/asn1/a_bitstr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_d2i_fp.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_digest.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_dup.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_gentm.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_i2d_fp.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_int.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_mbstr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_object.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_octet.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_print.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_sign.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_strex.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_strnid.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_time.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_type.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_utctm.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_utf8.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_verify.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/ameth_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/asn1_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/asn1_gen.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/asn1_item_list.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/asn1_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/asn1_par.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/asn_mime.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/asn_moid.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/asn_mstbl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/asn_pack.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/bio_asn1.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/bio_ndef.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/d2i_pr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/d2i_pu.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/evp_asn1.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/f_int.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/f_string.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/i2d_pr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/i2d_pu.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/n_pkey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/nsseq.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/p5_pbe.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/p5_pbev2.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/p5_scrypt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/p8_pkey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/t_bitst.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/t_pkey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/t_spki.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/tasn_dec.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/tasn_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/tasn_fre.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/tasn_new.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/tasn_prn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/tasn_scn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/tasn_typ.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/tasn_utl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/x_algor.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/x_bignum.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/x_info.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/x_int64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/x_long.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/x_pkey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/x_sig.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/x_spki.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/x_val.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/async/arch/async_null.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/async/arch/async_posix.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/async/arch/async_win.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/async/async.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/async/async_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/async/async_wait.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bf/bf-586.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bf/bf_cfb64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bf/bf_ecb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bf/bf_ofb64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bf/bf_skey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/b_addr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/b_dump.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/b_print.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/b_sock.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/b_sock2.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bf_buff.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bf_lbuf.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bf_nbio.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bf_null.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bio_cb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bio_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bio_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bio_meth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bss_acpt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bss_bio.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bss_conn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bss_dgram.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bss_fd.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bss_file.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bss_log.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bss_mem.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bss_null.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bss_sock.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/blake2/blake2b.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/blake2/blake2s.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/blake2/m_blake2b.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/blake2/m_blake2s.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/armv4-gf2m.o" =>
@@ -5622,7 +5516,6 @@ our %unified_info = (
             "crypto/bn/bn-586.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn-mips.o" =>
@@ -5632,188 +5525,157 @@ our %unified_info = (
             "crypto/bn/bn_add.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_blind.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_const.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_ctx.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_depr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_dh.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_div.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_exp.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto",
                 ],
             "crypto/bn/bn_exp2.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_gcd.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_gf2m.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_intern.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_kron.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_mod.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_mont.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_mpi.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_mul.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_nist.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_prime.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_print.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_rand.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_recp.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_shift.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_sqr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_sqrt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_srp.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_word.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_x931p.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/co-586.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/mips-mont.o" =>
@@ -5843,25 +5705,21 @@ our %unified_info = (
             "crypto/bn/x86-gf2m.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/x86-mont.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/buffer/buf_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/buffer/buffer.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/buildinf.h" =>
@@ -5871,31 +5729,26 @@ our %unified_info = (
             "crypto/camellia/cmll-x86.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/camellia/cmll_cfb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/camellia/cmll_ctr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/camellia/cmll_ecb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/camellia/cmll_ofb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/camellia/cmllt4-sparcv9.o" =>
@@ -5905,31 +5758,26 @@ our %unified_info = (
             "crypto/cast/c_cfb64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cast/c_ecb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cast/c_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cast/c_ofb64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cast/c_skey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/chacha/chacha-armv4.o" =>
@@ -5947,284 +5795,237 @@ our %unified_info = (
             "crypto/chacha/chacha-x86.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cmac/cm_ameth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cmac/cm_pmeth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cmac/cmac.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_asn1.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_att.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_cd.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_dd.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_env.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_ess.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_io.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_kari.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_pwri.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_sd.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_smime.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/conf/conf_api.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/conf/conf_def.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/conf/conf_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/conf/conf_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/conf/conf_mall.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/conf/conf_mod.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/conf/conf_sap.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/conf/conf_ssl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cpt_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cryptlib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ct/ct_b64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ct/ct_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ct/ct_log.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ct/ct_oct.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ct/ct_policy.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ct/ct_prn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ct/ct_sct.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ct/ct_sct_ctx.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ct/ct_vfy.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ct/ct_x509v3.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ctype.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cversion.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto",
                 ],
             "crypto/des/cbc_cksm.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/cbc_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/cfb64ede.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/cfb64enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/cfb_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/crypt586.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/des-586.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/dest4-sparcv9.o" =>
@@ -6234,295 +6035,246 @@ our %unified_info = (
             "crypto/des/ecb3_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/ecb_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/fcrypt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/ofb64ede.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/ofb64enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/ofb_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/pcbc_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/qud_cksm.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/rand_key.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/set_key.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/str2key.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/xcbc_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_ameth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_asn1.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_check.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_depr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_gen.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_kdf.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_key.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_meth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_pmeth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_prn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_rfc5114.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_rfc7919.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dsa/dsa_ameth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dsa/dsa_asn1.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dsa/dsa_depr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dsa/dsa_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dsa/dsa_gen.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dsa/dsa_key.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dsa/dsa_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dsa/dsa_meth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dsa/dsa_ossl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dsa/dsa_pmeth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dsa/dsa_prn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dsa/dsa_sign.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dsa/dsa_vrf.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dso/dso_dl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dso/dso_dlfcn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dso/dso_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dso/dso_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dso/dso_openssl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dso/dso_vms.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dso/dso_win32.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ebcdic.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/curve25519.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/curve448/arch_32/f_impl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto/ec/curve448/arch_32",
                     "crypto/ec/curve448",
@@ -6530,7 +6282,6 @@ our %unified_info = (
             "crypto/ec/curve448/curve448.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto/ec/curve448/arch_32",
                     "crypto/ec/curve448",
@@ -6538,7 +6289,6 @@ our %unified_info = (
             "crypto/ec/curve448/curve448_tables.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto/ec/curve448/arch_32",
                     "crypto/ec/curve448",
@@ -6546,7 +6296,6 @@ our %unified_info = (
             "crypto/ec/curve448/eddsa.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto/ec/curve448/arch_32",
                     "crypto/ec/curve448",
@@ -6554,7 +6303,6 @@ our %unified_info = (
             "crypto/ec/curve448/f_generic.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto/ec/curve448/arch_32",
                     "crypto/ec/curve448",
@@ -6562,7 +6310,6 @@ our %unified_info = (
             "crypto/ec/curve448/scalar.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto/ec/curve448/arch_32",
                     "crypto/ec/curve448",
@@ -6570,163 +6317,136 @@ our %unified_info = (
             "crypto/ec/ec2_oct.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec2_smpl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec_ameth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec_asn1.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec_check.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec_curve.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec_cvt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec_key.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec_kmeth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec_mult.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec_oct.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec_pmeth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec_print.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecdh_kdf.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecdh_ossl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecdsa_ossl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecdsa_sign.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecdsa_vrf.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/eck_prn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecp_mont.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecp_nist.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecp_nistp224.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecp_nistp256.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecp_nistp521.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecp_nistputil.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecp_nistz256-armv4.o" =>
@@ -6744,235 +6464,196 @@ our %unified_info = (
             "crypto/ec/ecp_nistz256-x86.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecp_nistz256.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecp_oct.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecp_smpl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecx_meth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/eng_all.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/eng_cnf.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/eng_ctrl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/eng_dyn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/eng_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/eng_fat.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/eng_init.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/eng_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/eng_list.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/eng_openssl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/eng_pkey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/eng_rdrand.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/eng_table.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/tb_asnmth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/tb_cipher.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/tb_dh.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/tb_digest.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/tb_dsa.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/tb_eckey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/tb_pkmeth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/tb_rand.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/tb_rsa.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/err/err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/err/err_all.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/err/err_prn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/bio_b64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/bio_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/bio_md.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/bio_ok.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/c_allc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/c_alld.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/cmeth_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/digest.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/e_aes.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto",
                     "crypto/modes",
@@ -6980,21 +6661,18 @@ our %unified_info = (
             "crypto/evp/e_aes_cbc_hmac_sha1.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto/modes",
                 ],
             "crypto/evp/e_aes_cbc_hmac_sha256.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto/modes",
                 ],
             "crypto/evp/e_aria.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto",
                     "crypto/modes",
@@ -7002,13 +6680,11 @@ our %unified_info = (
             "crypto/evp/e_bf.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/e_camellia.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto",
                     "crypto/modes",
@@ -7016,81 +6692,68 @@ our %unified_info = (
             "crypto/evp/e_cast.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/e_chacha20_poly1305.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/e_des.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto",
                 ],
             "crypto/evp/e_des3.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto",
                 ],
             "crypto/evp/e_idea.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/e_null.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/e_old.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/e_rc2.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/e_rc4.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/e_rc4_hmac_md5.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/e_rc5.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/e_seed.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/e_sm4.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto",
                     "crypto/modes",
@@ -7098,334 +6761,272 @@ our %unified_info = (
             "crypto/evp/e_xcbc_d.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/encode.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/evp_cnf.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/evp_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/evp_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/evp_key.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/evp_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/evp_pbe.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/evp_pkey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/m_md2.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/m_md4.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/m_md5.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/m_md5_sha1.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/m_mdc2.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/m_null.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/m_ripemd.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/m_sha1.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/m_sha3.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto",
                 ],
             "crypto/evp/m_sigver.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/m_wp.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/names.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/p5_crpt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/p5_crpt2.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/p_dec.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/p_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/p_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/p_open.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/p_seal.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/p_sign.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/p_verify.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/pbe_scrypt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/pmeth_fn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/pmeth_gn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/pmeth_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ex_data.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/getenv.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/hmac/hm_ameth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/hmac/hm_pmeth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/hmac/hmac.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/idea/i_cbc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/idea/i_cfb64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/idea/i_ecb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/idea/i_ofb64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/idea/i_skey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
-            "crypto/include/internal/bn_conf.h" =>
-                [
-                    ".",
-                ],
-            "crypto/include/internal/dso_conf.h" =>
-                [
-                    ".",
-                ],
             "crypto/init.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/kdf/hkdf.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/kdf/kdf_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/kdf/scrypt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/kdf/tls1_prf.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/lhash/lh_stats.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/lhash/lhash.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/md4/md4_dgst.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/md4/md4_one.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/md5/md5-586.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/md5/md5-sparcv9.o" =>
@@ -7435,79 +7036,66 @@ our %unified_info = (
             "crypto/md5/md5_dgst.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/md5/md5_one.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/mdc2/mdc2_one.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/mdc2/mdc2dgst.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/mem.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/mem_dbg.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/mem_sec.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/modes/cbc128.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/modes/ccm128.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/modes/cfb128.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/modes/ctr128.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/modes/cts128.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/modes/gcm128.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto",
                 ],
@@ -7526,7 +7114,6 @@ our %unified_info = (
             "crypto/modes/ghash-x86.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/modes/ghashv8-armx.o" =>
@@ -7536,361 +7123,301 @@ our %unified_info = (
             "crypto/modes/ocb128.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/modes/ofb128.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/modes/wrap128.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/modes/xts128.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/o_dir.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/o_fips.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/o_fopen.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/o_init.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/o_str.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/o_time.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/objects/o_names.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/objects/obj_dat.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/objects/obj_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/objects/obj_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/objects/obj_xref.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ocsp/ocsp_asn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ocsp/ocsp_cl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ocsp/ocsp_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ocsp/ocsp_ext.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ocsp/ocsp_ht.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ocsp/ocsp_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ocsp/ocsp_prn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ocsp/ocsp_srv.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ocsp/ocsp_vfy.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ocsp/v3_ocsp.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pem/pem_all.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pem/pem_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pem/pem_info.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pem/pem_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pem/pem_oth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pem/pem_pk8.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pem/pem_pkey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pem/pem_sign.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pem/pem_x509.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pem/pem_xaux.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pem/pvkfmt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_add.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_asn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_attr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_crpt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_crt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_decr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_init.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_key.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_kiss.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_mutl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_npas.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_p8d.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_p8e.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_sbag.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_utl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/pk12err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs7/bio_pk7.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs7/pk7_asn1.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs7/pk7_attr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs7/pk7_doit.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs7/pk7_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs7/pk7_mime.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs7/pk7_smime.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs7/pkcs7err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/poly1305/poly1305-armv4.o" =>
@@ -7912,265 +7439,221 @@ our %unified_info = (
             "crypto/poly1305/poly1305-x86.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/poly1305/poly1305.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/poly1305/poly1305_ameth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/poly1305/poly1305_pmeth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rand/drbg_ctr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rand/drbg_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rand/rand_egd.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rand/rand_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rand/rand_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rand/rand_unix.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rand/rand_vms.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rand/rand_win.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rand/randfile.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rc2/rc2_cbc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rc2/rc2_ecb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rc2/rc2_skey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rc2/rc2cfb64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rc2/rc2ofb64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rc4/rc4-586.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ripemd/rmd-586.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ripemd/rmd_dgst.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ripemd/rmd_one.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_ameth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_asn1.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_chk.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_crpt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_depr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_gen.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_meth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_mp.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_none.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_oaep.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_ossl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_pk1.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_pmeth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_prn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_pss.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_saos.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_sign.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_ssl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_x931.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_x931g.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/s390xcpuid.o" =>
@@ -8180,31 +7663,26 @@ our %unified_info = (
             "crypto/seed/seed.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/seed/seed_cbc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/seed/seed_cfb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/seed/seed_ecb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/seed/seed_ofb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sha/keccak1600-armv4.o" =>
@@ -8214,13 +7692,11 @@ our %unified_info = (
             "crypto/sha/keccak1600.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sha/sha1-586.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sha/sha1-armv4-large.o" =>
@@ -8246,19 +7722,16 @@ our %unified_info = (
             "crypto/sha/sha1_one.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sha/sha1dgst.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sha/sha256-586.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sha/sha256-armv4.o" =>
@@ -8284,13 +7757,11 @@ our %unified_info = (
             "crypto/sha/sha256.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sha/sha512-586.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sha/sha512-armv4.o" =>
@@ -8316,727 +7787,606 @@ our %unified_info = (
             "crypto/sha/sha512.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/siphash/siphash.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/siphash/siphash_ameth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/siphash/siphash_pmeth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sm2/sm2_crypt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sm2/sm2_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sm2/sm2_pmeth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sm2/sm2_sign.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sm3/m_sm3.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sm3/sm3.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sm4/sm4.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/srp/srp_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/srp/srp_vfy.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/stack/stack.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/store/loader_file.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/store/store_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/store/store_init.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/store/store_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/store/store_register.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/store/store_strings.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/threads_none.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/threads_pthread.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/threads_win.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ts/ts_asn1.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ts/ts_conf.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ts/ts_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ts/ts_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ts/ts_req_print.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ts/ts_req_utils.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ts/ts_rsp_print.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ts/ts_rsp_sign.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ts/ts_rsp_utils.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ts/ts_rsp_verify.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ts/ts_verify_ctx.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/txt_db/txt_db.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ui/ui_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ui/ui_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ui/ui_null.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ui/ui_openssl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ui/ui_util.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/uid.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/whrlpool/wp-mmx.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/whrlpool/wp_block.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/whrlpool/wp_dgst.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/by_dir.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/by_file.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/t_crl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/t_req.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/t_x509.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_att.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_cmp.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_d2.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_def.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_ext.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_lu.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_meth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_obj.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_r2x.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_req.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_set.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_trs.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_txt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_v3.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_vfy.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_vpm.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509cset.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509name.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509rset.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509spki.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509type.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x_all.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x_attrib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x_crl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x_exten.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x_name.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x_pubkey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x_req.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x_x509.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x_x509a.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/pcy_cache.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/pcy_data.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/pcy_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/pcy_map.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/pcy_node.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/pcy_tree.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_addr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_admis.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_akey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_akeya.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_alt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_asid.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_bcons.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_bitst.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_conf.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_cpols.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_crld.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_enum.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_extku.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_genn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_ia5.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_info.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_int.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_ncons.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_pci.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_pcia.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_pcons.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_pku.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_pmaps.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_prn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_purp.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_skey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_sxnet.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_tlsf.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_utl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x86cpuid.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "engines/e_capi.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "engines/e_padlock-x86.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "engines/e_padlock.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "fuzz/asn1.o" =>
@@ -9087,6 +8437,14 @@ our %unified_info = (
                 [
                     "include",
                 ],
+            "include/crypto/bn_conf.h" =>
+                [
+                    ".",
+                ],
+            "include/crypto/dso_conf.h" =>
+                [
+                    ".",
+                ],
             "include/openssl/opensslconf.h" =>
                 [
                     ".",
@@ -9331,7 +8689,6 @@ our %unified_info = (
                 [
                     ".",
                     "include",
-                    "crypto/include",
                 ],
             "test/asn1_string_table_test.o" =>
                 [
@@ -9657,7 +9014,6 @@ our %unified_info = (
                 [
                     ".",
                     "include",
-                    "crypto/include",
                 ],
             "test/cipher_overhead_test.o" =>
                 [
@@ -9703,7 +9059,6 @@ our %unified_info = (
             "test/ctype_internal_test.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "test/curve448_internal_test.o" =>
@@ -9769,7 +9124,6 @@ our %unified_info = (
                 [
                     "include",
                     "crypto/ec",
-                    "crypto/include",
                 ],
             "test/ecdsatest.o" =>
                 [
@@ -9794,7 +9148,6 @@ our %unified_info = (
             "test/evp_extra_test.o" =>
                 [
                     "include",
-                    "crypto/include",
                 ],
             "test/evp_test.o" =>
                 [
@@ -9892,7 +9245,6 @@ our %unified_info = (
                 [
                     ".",
                     "include",
-                    "crypto/include",
                 ],
             "test/rc2test.o" =>
                 [
@@ -9942,18 +9294,15 @@ our %unified_info = (
                 [
                     ".",
                     "include",
-                    "crypto/include",
                 ],
             "test/sm2_internal_test.o" =>
                 [
                     "include",
-                    "crypto/include",
                 ],
             "test/sm4_internal_test.o" =>
                 [
                     ".",
                     "include",
-                    "crypto/include",
                 ],
             "test/srptest.o" =>
                 [
@@ -9964,6 +9313,10 @@ our %unified_info = (
                     ".",
                     "include",
                 ],
+            "test/ssl_ctx_test.o" =>
+                [
+                    "include",
+                ],
             "test/ssl_test.o" =>
                 [
                     "include",
@@ -10027,10 +9380,6 @@ our %unified_info = (
                 [
                     "include",
                 ],
-            "test/testutil/init.o" =>
-                [
-                    "include",
-                ],
             "test/testutil/main.o" =>
                 [
                     "include",
@@ -10059,6 +9408,10 @@ our %unified_info = (
                 [
                     "include",
                 ],
+            "test/testutil/testutil_init.o" =>
+                [
+                    "include",
+                ],
             "test/threadstest.o" =>
                 [
                     "include",
@@ -10323,6 +9676,7 @@ our %unified_info = (
             "test/sm4_internal_test",
             "test/srptest",
             "test/ssl_cert_table_internal_test",
+            "test/ssl_ctx_test",
             "test/ssl_test",
             "test/ssl_test_ctx_test",
             "test/sslapitest",
@@ -15256,7 +14610,6 @@ our %unified_info = (
                     "test/testutil/cb.o",
                     "test/testutil/driver.o",
                     "test/testutil/format_output.o",
-                    "test/testutil/init.o",
                     "test/testutil/main.o",
                     "test/testutil/output_helpers.o",
                     "test/testutil/random.o",
@@ -15264,6 +14617,7 @@ our %unified_info = (
                     "test/testutil/tap_bio.o",
                     "test/testutil/test_cleanup.o",
                     "test/testutil/tests.o",
+                    "test/testutil/testutil_init.o",
                 ],
             "test/md2test" =>
                 [
@@ -15491,6 +14845,14 @@ our %unified_info = (
                 [
                     "test/ssl_cert_table_internal_test.c",
                 ],
+            "test/ssl_ctx_test" =>
+                [
+                    "test/ssl_ctx_test.o",
+                ],
+            "test/ssl_ctx_test.o" =>
+                [
+                    "test/ssl_ctx_test.c",
+                ],
             "test/ssl_test" =>
                 [
                     "test/handshake_helper.o",
@@ -15593,10 +14955,6 @@ our %unified_info = (
                 [
                     "test/testutil/format_output.c",
                 ],
-            "test/testutil/init.o" =>
-                [
-                    "test/testutil/init.c",
-                ],
             "test/testutil/main.o" =>
                 [
                     "test/testutil/main.c",
@@ -15625,6 +14983,10 @@ our %unified_info = (
                 [
                     "test/testutil/tests.c",
                 ],
+            "test/testutil/testutil_init.o" =>
+                [
+                    "test/testutil/testutil_init.c",
+                ],
             "test/threadstest" =>
                 [
                     "test/threadstest.o",
diff --git a/deps/openssl/config/archs/VC-WIN32/asm/crypto/aes/aes-586.asm b/deps/openssl/config/archs/VC-WIN32/asm/crypto/aes/aes-586.asm
deleted file mode 100644
index 7a17e847c6..0000000000
--- a/deps/openssl/config/archs/VC-WIN32/asm/crypto/aes/aes-586.asm
+++ /dev/null
@@ -1,3211 +0,0 @@
-%ifidn __OUTPUT_FORMAT__,obj
-section	code	use32 class=code align=64
-%elifidn __OUTPUT_FORMAT__,win32
-$@feat.00 equ 1
-section	.text	code align=64
-%else
-section	.text	code
-%endif
-align	16
-__x86_AES_encrypt_compact:
-	mov	DWORD [20+esp],edi
-	xor	eax,DWORD [edi]
-	xor	ebx,DWORD [4+edi]
-	xor	ecx,DWORD [8+edi]
-	xor	edx,DWORD [12+edi]
-	mov	esi,DWORD [240+edi]
-	lea	esi,[esi*1+esi-2]
-	lea	esi,[esi*8+edi]
-	mov	DWORD [24+esp],esi
-	mov	edi,DWORD [ebp-128]
-	mov	esi,DWORD [ebp-96]
-	mov	edi,DWORD [ebp-64]
-	mov	esi,DWORD [ebp-32]
-	mov	edi,DWORD [ebp]
-	mov	esi,DWORD [32+ebp]
-	mov	edi,DWORD [64+ebp]
-	mov	esi,DWORD [96+ebp]
-align	16
-L$000loop:
-	mov	esi,eax
-	and	esi,255
-	movzx	esi,BYTE [esi*1+ebp-128]
-	movzx	edi,bh
-	movzx	edi,BYTE [edi*1+ebp-128]
-	shl	edi,8
-	xor	esi,edi
-	mov	edi,ecx
-	shr	edi,16
-	and	edi,255
-	movzx	edi,BYTE [edi*1+ebp-128]
-	shl	edi,16
-	xor	esi,edi
-	mov	edi,edx
-	shr	edi,24
-	movzx	edi,BYTE [edi*1+ebp-128]
-	shl	edi,24
-	xor	esi,edi
-	mov	DWORD [4+esp],esi
-	mov	esi,ebx
-	and	esi,255
-	shr	ebx,16
-	movzx	esi,BYTE [esi*1+ebp-128]
-	movzx	edi,ch
-	movzx	edi,BYTE [edi*1+ebp-128]
-	shl	edi,8
-	xor	esi,edi
-	mov	edi,edx
-	shr	edi,16
-	and	edi,255
-	movzx	edi,BYTE [edi*1+ebp-128]
-	shl	edi,16
-	xor	esi,edi
-	mov	edi,eax
-	shr	edi,24
-	movzx	edi,BYTE [edi*1+ebp-128]
-	shl	edi,24
-	xor	esi,edi
-	mov	DWORD [8+esp],esi
-	mov	esi,ecx
-	and	esi,255
-	shr	ecx,24
-	movzx	esi,BYTE [esi*1+ebp-128]
-	movzx	edi,dh
-	movzx	edi,BYTE [edi*1+ebp-128]
-	shl	edi,8
-	xor	esi,edi
-	mov	edi,eax
-	shr	edi,16
-	and	edx,255
-	and	edi,255
-	movzx	edi,BYTE [edi*1+ebp-128]
-	shl	edi,16
-	xor	esi,edi
-	movzx	edi,bh
-	movzx	edi,BYTE [edi*1+ebp-128]
-	shl	edi,24
-	xor	esi,edi
-	and	edx,255
-	movzx	edx,BYTE [edx*1+ebp-128]
-	movzx	eax,ah
-	movzx	eax,BYTE [eax*1+ebp-128]
-	shl	eax,8
-	xor	edx,eax
-	mov	eax,DWORD [4+esp]
-	and	ebx,255
-	movzx	ebx,BYTE [ebx*1+ebp-128]
-	shl	ebx,16
-	xor	edx,ebx
-	mov	ebx,DWORD [8+esp]
-	movzx	ecx,BYTE [ecx*1+ebp-128]
-	shl	ecx,24
-	xor	edx,ecx
-	mov	ecx,esi
-	mov	ebp,2155905152
-	and	ebp,ecx
-	lea	edi,[ecx*1+ecx]
-	mov	esi,ebp
-	shr	ebp,7
-	and	edi,4278124286
-	sub	esi,ebp
-	mov	ebp,ecx
-	and	esi,454761243
-	ror	ebp,16
-	xor	esi,edi
-	mov	edi,ecx
-	xor	ecx,esi
-	ror	edi,24
-	xor	esi,ebp
-	rol	ecx,24
-	xor	esi,edi
-	mov	ebp,2155905152
-	xor	ecx,esi
-	and	ebp,edx
-	lea	edi,[edx*1+edx]
-	mov	esi,ebp
-	shr	ebp,7
-	and	edi,4278124286
-	sub	esi,ebp
-	mov	ebp,edx
-	and	esi,454761243
-	ror	ebp,16
-	xor	esi,edi
-	mov	edi,edx
-	xor	edx,esi
-	ror	edi,24
-	xor	esi,ebp
-	rol	edx,24
-	xor	esi,edi
-	mov	ebp,2155905152
-	xor	edx,esi
-	and	ebp,eax
-	lea	edi,[eax*1+eax]
-	mov	esi,ebp
-	shr	ebp,7
-	and	edi,4278124286
-	sub	esi,ebp
-	mov	ebp,eax
-	and	esi,454761243
-	ror	ebp,16
-	xor	esi,edi
-	mov	edi,eax
-	xor	eax,esi
-	ror	edi,24
-	xor	esi,ebp
-	rol	eax,24
-	xor	esi,edi
-	mov	ebp,2155905152
-	xor	eax,esi
-	and	ebp,ebx
-	lea	edi,[ebx*1+ebx]
-	mov	esi,ebp
-	shr	ebp,7
-	and	edi,4278124286
-	sub	esi,ebp
-	mov	ebp,ebx
-	and	esi,454761243
-	ror	ebp,16
-	xor	esi,edi
-	mov	edi,ebx
-	xor	ebx,esi
-	ror	edi,24
-	xor	esi,ebp
-	rol	ebx,24
-	xor	esi,edi
-	xor	ebx,esi
-	mov	edi,DWORD [20+esp]
-	mov	ebp,DWORD [28+esp]
-	add	edi,16
-	xor	eax,DWORD [edi]
-	xor	ebx,DWORD [4+edi]
-	xor	ecx,DWORD [8+edi]
-	xor	edx,DWORD [12+edi]
-	cmp	edi,DWORD [24+esp]
-	mov	DWORD [20+esp],edi
-	jb	NEAR L$000loop
-	mov	esi,eax
-	and	esi,255
-	movzx	esi,BYTE [esi*1+ebp-128]
-	movzx	edi,bh
-	movzx	edi,BYTE [edi*1+ebp-128]
-	shl	edi,8
-	xor	esi,edi
-	mov	edi,ecx
-	shr	edi,16
-	and	edi,255
-	movzx	edi,BYTE [edi*1+ebp-128]
-	shl	edi,16
-	xor	esi,edi
-	mov	edi,edx
-	shr	edi,24
-	movzx	edi,BYTE [edi*1+ebp-128]
-	shl	edi,24
-	xor	esi,edi
-	mov	DWORD [4+esp],esi
-	mov	esi,ebx
-	and	esi,255
-	shr	ebx,16
-	movzx	esi,BYTE [esi*1+ebp-128]
-	movzx	edi,ch
-	movzx	edi,BYTE [edi*1+ebp-128]
-	shl	edi,8
-	xor	esi,edi
-	mov	edi,edx
-	shr	edi,16
-	and	edi,255
-	movzx	edi,BYTE [edi*1+ebp-128]
-	shl	edi,16
-	xor	esi,edi
-	mov	edi,eax
-	shr	edi,24
-	movzx	edi,BYTE [edi*1+ebp-128]
-	shl	edi,24
-	xor	esi,edi
-	mov	DWORD [8+esp],esi
-	mov	esi,ecx
-	and	esi,255
-	shr	ecx,24
-	movzx	esi,BYTE [esi*1+ebp-128]
-	movzx	edi,dh
-	movzx	edi,BYTE [edi*1+ebp-128]
-	shl	edi,8
-	xor	esi,edi
-	mov	edi,eax
-	shr	edi,16
-	and	edx,255
-	and	edi,255
-	movzx	edi,BYTE [edi*1+ebp-128]
-	shl	edi,16
-	xor	esi,edi
-	movzx	edi,bh
-	movzx	edi,BYTE [edi*1+ebp-128]
-	shl	edi,24
-	xor	esi,edi
-	mov	edi,DWORD [20+esp]
-	and	edx,255
-	movzx	edx,BYTE [edx*1+ebp-128]
-	movzx	eax,ah
-	movzx	eax,BYTE [eax*1+ebp-128]
-	shl	eax,8
-	xor	edx,eax
-	mov	eax,DWORD [4+esp]
-	and	ebx,255
-	movzx	ebx,BYTE [ebx*1+ebp-128]
-	shl	ebx,16
-	xor	edx,ebx
-	mov	ebx,DWORD [8+esp]
-	movzx	ecx,BYTE [ecx*1+ebp-128]
-	shl	ecx,24
-	xor	edx,ecx
-	mov	ecx,esi
-	xor	eax,DWORD [16+edi]
-	xor	ebx,DWORD [20+edi]
-	xor	ecx,DWORD [24+edi]
-	xor	edx,DWORD [28+edi]
-	ret
-align	16
-__sse_AES_encrypt_compact:
-	pxor	mm0,[edi]
-	pxor	mm4,[8+edi]
-	mov	esi,DWORD [240+edi]
-	lea	esi,[esi*1+esi-2]
-	lea	esi,[esi*8+edi]
-	mov	DWORD [24+esp],esi
-	mov	eax,454761243
-	mov	DWORD [8+esp],eax
-	mov	DWORD [12+esp],eax
-	mov	eax,DWORD [ebp-128]
-	mov	ebx,DWORD [ebp-96]
-	mov	ecx,DWORD [ebp-64]
-	mov	edx,DWORD [ebp-32]
-	mov	eax,DWORD [ebp]
-	mov	ebx,DWORD [32+ebp]
-	mov	ecx,DWORD [64+ebp]
-	mov	edx,DWORD [96+ebp]
-align	16
-L$001loop:
-	pshufw	mm1,mm0,8
-	pshufw	mm5,mm4,13
-	movd	eax,mm1
-	movd	ebx,mm5
-	mov	DWORD [20+esp],edi
-	movzx	esi,al
-	movzx	edx,ah
-	pshufw	mm2,mm0,13
-	movzx	ecx,BYTE [esi*1+ebp-128]
-	movzx	edi,bl
-	movzx	edx,BYTE [edx*1+ebp-128]
-	shr	eax,16
-	shl	edx,8
-	movzx	esi,BYTE [edi*1+ebp-128]
-	movzx	edi,bh
-	shl	esi,16
-	pshufw	mm6,mm4,8
-	or	ecx,esi
-	movzx	esi,BYTE [edi*1+ebp-128]
-	movzx	edi,ah
-	shl	esi,24
-	shr	ebx,16
-	or	edx,esi
-	movzx	esi,BYTE [edi*1+ebp-128]
-	movzx	edi,bh
-	shl	esi,8
-	or	ecx,esi
-	movzx	esi,BYTE [edi*1+ebp-128]
-	movzx	edi,al
-	shl	esi,24
-	or	ecx,esi
-	movzx	esi,BYTE [edi*1+ebp-128]
-	movzx	edi,bl
-	movd	eax,mm2
-	movd	mm0,ecx
-	movzx	ecx,BYTE [edi*1+ebp-128]
-	movzx	edi,ah
-	shl	ecx,16
-	movd	ebx,mm6
-	or	ecx,esi
-	movzx	esi,BYTE [edi*1+ebp-128]
-	movzx	edi,bh
-	shl	esi,24
-	or	ecx,esi
-	movzx	esi,BYTE [edi*1+ebp-128]
-	movzx	edi,bl
-	shl	esi,8
-	shr	ebx,16
-	or	ecx,esi
-	movzx	esi,BYTE [edi*1+ebp-128]
-	movzx	edi,al
-	shr	eax,16
-	movd	mm1,ecx
-	movzx	ecx,BYTE [edi*1+ebp-128]
-	movzx	edi,ah
-	shl	ecx,16
-	and	eax,255
-	or	ecx,esi
-	punpckldq	mm0,mm1
-	movzx	esi,BYTE [edi*1+ebp-128]
-	movzx	edi,bh
-	shl	esi,24
-	and	ebx,255
-	movzx	eax,BYTE [eax*1+ebp-128]
-	or	ecx,esi
-	shl	eax,16
-	movzx	esi,BYTE [edi*1+ebp-128]
-	or	edx,eax
-	shl	esi,8
-	movzx	ebx,BYTE [ebx*1+ebp-128]
-	or	ecx,esi
-	or	edx,ebx
-	mov	edi,DWORD [20+esp]
-	movd	mm4,ecx
-	movd	mm5,edx
-	punpckldq	mm4,mm5
-	add	edi,16
-	cmp	edi,DWORD [24+esp]
-	ja	NEAR L$002out
-	movq	mm2,[8+esp]
-	pxor	mm3,mm3
-	pxor	mm7,mm7
-	movq	mm1,mm0
-	movq	mm5,mm4
-	pcmpgtb	mm3,mm0
-	pcmpgtb	mm7,mm4
-	pand	mm3,mm2
-	pand	mm7,mm2
-	pshufw	mm2,mm0,177
-	pshufw	mm6,mm4,177
-	paddb	mm0,mm0
-	paddb	mm4,mm4
-	pxor	mm0,mm3
-	pxor	mm4,mm7
-	pshufw	mm3,mm2,177
-	pshufw	mm7,mm6,177
-	pxor	mm1,mm0
-	pxor	mm5,mm4
-	pxor	mm0,mm2
-	pxor	mm4,mm6
-	movq	mm2,mm3
-	movq	mm6,mm7
-	pslld	mm3,8
-	pslld	mm7,8
-	psrld	mm2,24
-	psrld	mm6,24
-	pxor	mm0,mm3
-	pxor	mm4,mm7
-	pxor	mm0,mm2
-	pxor	mm4,mm6
-	movq	mm3,mm1
-	movq	mm7,mm5
-	movq	mm2,[edi]
-	movq	mm6,[8+edi]
-	psrld	mm1,8
-	psrld	mm5,8
-	mov	eax,DWORD [ebp-128]
-	pslld	mm3,24
-	pslld	mm7,24
-	mov	ebx,DWORD [ebp-64]
-	pxor	mm0,mm1
-	pxor	mm4,mm5
-	mov	ecx,DWORD [ebp]
-	pxor	mm0,mm3
-	pxor	mm4,mm7
-	mov	edx,DWORD [64+ebp]
-	pxor	mm0,mm2
-	pxor	mm4,mm6
-	jmp	NEAR L$001loop
-align	16
-L$002out:
-	pxor	mm0,[edi]
-	pxor	mm4,[8+edi]
-	ret
-align	16
-__x86_AES_encrypt:
-	mov	DWORD [20+esp],edi
-	xor	eax,DWORD [edi]
-	xor	ebx,DWORD [4+edi]
-	xor	ecx,DWORD [8+edi]
-	xor	edx,DWORD [12+edi]
-	mov	esi,DWORD [240+edi]
-	lea	esi,[esi*1+esi-2]
-	lea	esi,[esi*8+edi]
-	mov	DWORD [24+esp],esi
-align	16
-L$003loop:
-	mov	esi,eax
-	and	esi,255
-	mov	esi,DWORD [esi*8+ebp]
-	movzx	edi,bh
-	xor	esi,DWORD [3+edi*8+ebp]
-	mov	edi,ecx
-	shr	edi,16
-	and	edi,255
-	xor	esi,DWORD [2+edi*8+ebp]
-	mov	edi,edx
-	shr	edi,24
-	xor	esi,DWORD [1+edi*8+ebp]
-	mov	DWORD [4+esp],esi
-	mov	esi,ebx
-	and	esi,255
-	shr	ebx,16
-	mov	esi,DWORD [esi*8+ebp]
-	movzx	edi,ch
-	xor	esi,DWORD [3+edi*8+ebp]
-	mov	edi,edx
-	shr	edi,16
-	and	edi,255
-	xor	esi,DWORD [2+edi*8+ebp]
-	mov	edi,eax
-	shr	edi,24
-	xor	esi,DWORD [1+edi*8+ebp]
-	mov	DWORD [8+esp],esi
-	mov	esi,ecx
-	and	esi,255
-	shr	ecx,24
-	mov	esi,DWORD [esi*8+ebp]
-	movzx	edi,dh
-	xor	esi,DWORD [3+edi*8+ebp]
-	mov	edi,eax
-	shr	edi,16
-	and	edx,255
-	and	edi,255
-	xor	esi,DWORD [2+edi*8+ebp]
-	movzx	edi,bh
-	xor	esi,DWORD [1+edi*8+ebp]
-	mov	edi,DWORD [20+esp]
-	mov	edx,DWORD [edx*8+ebp]
-	movzx	eax,ah
-	xor	edx,DWORD [3+eax*8+ebp]
-	mov	eax,DWORD [4+esp]
-	and	ebx,255
-	xor	edx,DWORD [2+ebx*8+ebp]
-	mov	ebx,DWORD [8+esp]
-	xor	edx,DWORD [1+ecx*8+ebp]
-	mov	ecx,esi
-	add	edi,16
-	xor	eax,DWORD [edi]
-	xor	ebx,DWORD [4+edi]
-	xor	ecx,DWORD [8+edi]
-	xor	edx,DWORD [12+edi]
-	cmp	edi,DWORD [24+esp]
-	mov	DWORD [20+esp],edi
-	jb	NEAR L$003loop
-	mov	esi,eax
-	and	esi,255
-	mov	esi,DWORD [2+esi*8+ebp]
-	and	esi,255
-	movzx	edi,bh
-	mov	edi,DWORD [edi*8+ebp]
-	and	edi,65280
-	xor	esi,edi
-	mov	edi,ecx
-	shr	edi,16
-	and	edi,255
-	mov	edi,DWORD [edi*8+ebp]
-	and	edi,16711680
-	xor	esi,edi
-	mov	edi,edx
-	shr	edi,24
-	mov	edi,DWORD [2+edi*8+ebp]
-	and	edi,4278190080
-	xor	esi,edi
-	mov	DWORD [4+esp],esi
-	mov	esi,ebx
-	and	esi,255
-	shr	ebx,16
-	mov	esi,DWORD [2+esi*8+ebp]
-	and	esi,255
-	movzx	edi,ch
-	mov	edi,DWORD [edi*8+ebp]
-	and	edi,65280
-	xor	esi,edi
-	mov	edi,edx
-	shr	edi,16
-	and	edi,255
-	mov	edi,DWORD [edi*8+ebp]
-	and	edi,16711680
-	xor	esi,edi
-	mov	edi,eax
-	shr	edi,24
-	mov	edi,DWORD [2+edi*8+ebp]
-	and	edi,4278190080
-	xor	esi,edi
-	mov	DWORD [8+esp],esi
-	mov	esi,ecx
-	and	esi,255
-	shr	ecx,24
-	mov	esi,DWORD [2+esi*8+ebp]
-	and	esi,255
-	movzx	edi,dh
-	mov	edi,DWORD [edi*8+ebp]
-	and	edi,65280
-	xor	esi,edi
-	mov	edi,eax
-	shr	edi,16
-	and	edx,255
-	and	edi,255
-	mov	edi,DWORD [edi*8+ebp]
-	and	edi,16711680
-	xor	esi,edi
-	movzx	edi,bh
-	mov	edi,DWORD [2+edi*8+ebp]
-	and	edi,4278190080
-	xor	esi,edi
-	mov	edi,DWORD [20+esp]
-	and	edx,255
-	mov	edx,DWORD [2+edx*8+ebp]
-	and	edx,255
-	movzx	eax,ah
-	mov	eax,DWORD [eax*8+ebp]
-	and	eax,65280
-	xor	edx,eax
-	mov	eax,DWORD [4+esp]
-	and	ebx,255
-	mov	ebx,DWORD [ebx*8+ebp]
-	and	ebx,16711680
-	xor	edx,ebx
-	mov	ebx,DWORD [8+esp]
-	mov	ecx,DWORD [2+ecx*8+ebp]
-	and	ecx,4278190080
-	xor	edx,ecx
-	mov	ecx,esi
-	add	edi,16
-	xor	eax,DWORD [edi]
-	xor	ebx,DWORD [4+edi]
-	xor	ecx,DWORD [8+edi]
-	xor	edx,DWORD [12+edi]
-	ret
-align	64
-L$AES_Te:
-dd	2774754246,2774754246
-dd	2222750968,2222750968
-dd	2574743534,2574743534
-dd	2373680118,2373680118
-dd	234025727,234025727
-dd	3177933782,3177933782
-dd	2976870366,2976870366
-dd	1422247313,1422247313
-dd	1345335392,1345335392
-dd	50397442,50397442
-dd	2842126286,2842126286
-dd	2099981142,2099981142
-dd	436141799,436141799
-dd	1658312629,1658312629
-dd	3870010189,3870010189
-dd	2591454956,2591454956
-dd	1170918031,1170918031
-dd	2642575903,2642575903
-dd	1086966153,1086966153
-dd	2273148410,2273148410
-dd	368769775,368769775
-dd	3948501426,3948501426
-dd	3376891790,3376891790
-dd	200339707,200339707
-dd	3970805057,3970805057
-dd	1742001331,1742001331
-dd	4255294047,4255294047
-dd	3937382213,3937382213
-dd	3214711843,3214711843
-dd	4154762323,4154762323
-dd	2524082916,2524082916
-dd	1539358875,1539358875
-dd	3266819957,3266819957
-dd	486407649,486407649
-dd	2928907069,2928907069
-dd	1780885068,1780885068
-dd	1513502316,1513502316
-dd	1094664062,1094664062
-dd	49805301,49805301
-dd	1338821763,1338821763
-dd	1546925160,1546925160
-dd	4104496465,4104496465
-dd	887481809,887481809
-dd	150073849,150073849
-dd	2473685474,2473685474
-dd	1943591083,1943591083
-dd	1395732834,1395732834
-dd	1058346282,1058346282
-dd	201589768,201589768
-dd	1388824469,1388824469
-dd	1696801606,1696801606
-dd	1589887901,1589887901
-dd	672667696,672667696
-dd	2711000631,2711000631
-dd	251987210,251987210
-dd	3046808111,3046808111
-dd	151455502,151455502
-dd	907153956,907153956
-dd	2608889883,2608889883
-dd	1038279391,1038279391
-dd	652995533,652995533
-dd	1764173646,1764173646
-dd	3451040383,3451040383
-dd	2675275242,2675275242
-dd	453576978,453576978
-dd	2659418909,2659418909
-dd	1949051992,1949051992
-dd	773462580,773462580
-dd	756751158,756751158
-dd	2993581788,2993581788
-dd	3998898868,3998898868
-dd	4221608027,4221608027
-dd	4132590244,4132590244
-dd	1295727478,1295727478
-dd	1641469623,1641469623
-dd	3467883389,3467883389
-dd	2066295122,2066295122
-dd	1055122397,1055122397
-dd	1898917726,1898917726
-dd	2542044179,2542044179
-dd	4115878822,4115878822
-dd	1758581177,1758581177
-dd	0,0
-dd	753790401,753790401
-dd	1612718144,1612718144
-dd	536673507,536673507
-dd	3367088505,3367088505
-dd	3982187446,3982187446
-dd	3194645204,3194645204
-dd	1187761037,1187761037
-dd	3653156455,3653156455
-dd	1262041458,1262041458
-dd	3729410708,3729410708
-dd	3561770136,3561770136
-dd	3898103984,3898103984
-dd	1255133061,1255133061
-dd	1808847035,1808847035
-dd	720367557,720367557
-dd	3853167183,3853167183
-dd	385612781,385612781
-dd	3309519750,3309519750
-dd	3612167578,3612167578
-dd	1429418854,1429418854
-dd	2491778321,2491778321
-dd	3477423498,3477423498
-dd	284817897,284817897
-dd	100794884,100794884
-dd	2172616702,2172616702
-dd	4031795360,4031795360
-dd	1144798328,1144798328
-dd	3131023141,3131023141
-dd	3819481163,3819481163
-dd	4082192802,4082192802
-dd	4272137053,4272137053
-dd	3225436288,3225436288
-dd	2324664069,2324664069
-dd	2912064063,2912064063
-dd	3164445985,3164445985
-dd	1211644016,1211644016
-dd	83228145,83228145
-dd	3753688163,3753688163
-dd	3249976951,3249976951
-dd	1977277103,1977277103
-dd	1663115586,1663115586
-dd	806359072,806359072
-dd	452984805,452984805
-dd	250868733,250868733
-dd	1842533055,1842533055
-dd	1288555905,1288555905
-dd	336333848,336333848
-dd	890442534,890442534
-dd	804056259,804056259
-dd	3781124030,3781124030
-dd	2727843637,2727843637
-dd	3427026056,3427026056
-dd	957814574,957814574
-dd	1472513171,1472513171
-dd	4071073621,4071073621
-dd	2189328124,2189328124
-dd	1195195770,1195195770
-dd	2892260552,2892260552
-dd	3881655738,3881655738
-dd	723065138,723065138
-dd	2507371494,2507371494
-dd	2690670784,2690670784
-dd	2558624025,2558624025
-dd	3511635870,3511635870
-dd	2145180835,2145180835
-dd	1713513028,1713513028
-dd	2116692564,2116692564
-dd	2878378043,2878378043
-dd	2206763019,2206763019
-dd	3393603212,3393603212
-dd	703524551,703524551
-dd	3552098411,3552098411
-dd	1007948840,1007948840
-dd	2044649127,2044649127
-dd	3797835452,3797835452
-dd	487262998,487262998
-dd	1994120109,1994120109
-dd	1004593371,1004593371
-dd	1446130276,1446130276
-dd	1312438900,1312438900
-dd	503974420,503974420
-dd	3679013266,3679013266
-dd	168166924,168166924
-dd	1814307912,1814307912
-dd	3831258296,3831258296
-dd	1573044895,1573044895
-dd	1859376061,1859376061
-dd	4021070915,4021070915
-dd	2791465668,2791465668
-dd	2828112185,2828112185
-dd	2761266481,2761266481
-dd	937747667,937747667
-dd	2339994098,2339994098
-dd	854058965,854058965
-dd	1137232011,1137232011
-dd	1496790894,1496790894
-dd	3077402074,3077402074
-dd	2358086913,2358086913
-dd	1691735473,1691735473
-dd	3528347292,3528347292
-dd	3769215305,3769215305
-dd	3027004632,3027004632
-dd	4199962284,4199962284
-dd	133494003,133494003
-dd	636152527,636152527
-dd	2942657994,2942657994
-dd	2390391540,2390391540
-dd	3920539207,3920539207
-dd	403179536,403179536
-dd	3585784431,3585784431
-dd	2289596656,2289596656
-dd	1864705354,1864705354
-dd	1915629148,1915629148
-dd	605822008,605822008
-dd	4054230615,4054230615
-dd	3350508659,3350508659
-dd	1371981463,1371981463
-dd	602466507,602466507
-dd	2094914977,2094914977
-dd	2624877800,2624877800
-dd	555687742,555687742
-dd	3712699286,3712699286
-dd	3703422305,3703422305
-dd	2257292045,2257292045
-dd	2240449039,2240449039
-dd	2423288032,2423288032
-dd	1111375484,1111375484
-dd	3300242801,3300242801
-dd	2858837708,2858837708
-dd	3628615824,3628615824
-dd	84083462,84083462
-dd	32962295,32962295
-dd	302911004,302911004
-dd	2741068226,2741068226
-dd	1597322602,1597322602
-dd	4183250862,4183250862
-dd	3501832553,3501832553
-dd	2441512471,2441512471
-dd	1489093017,1489093017
-dd	656219450,656219450
-dd	3114180135,3114180135
-dd	954327513,954327513
-dd	335083755,335083755
-dd	3013122091,3013122091
-dd	856756514,856756514
-dd	3144247762,3144247762
-dd	1893325225,1893325225
-dd	2307821063,2307821063
-dd	2811532339,2811532339
-dd	3063651117,3063651117
-dd	572399164,572399164
-dd	2458355477,2458355477
-dd	552200649,552200649
-dd	1238290055,1238290055
-dd	4283782570,4283782570
-dd	2015897680,2015897680
-dd	2061492133,2061492133
-dd	2408352771,2408352771
-dd	4171342169,4171342169
-dd	2156497161,2156497161
-dd	386731290,386731290
-dd	3669999461,3669999461
-dd	837215959,837215959
-dd	3326231172,3326231172
-dd	3093850320,3093850320
-dd	3275833730,3275833730
-dd	2962856233,2962856233
-dd	1999449434,1999449434
-dd	286199582,286199582
-dd	3417354363,3417354363
-dd	4233385128,4233385128
-dd	3602627437,3602627437
-dd	974525996,974525996
-db	99,124,119,123,242,107,111,197
-db	48,1,103,43,254,215,171,118
-db	202,130,201,125,250,89,71,240
-db	173,212,162,175,156,164,114,192
-db	183,253,147,38,54,63,247,204
-db	52,165,229,241,113,216,49,21
-db	4,199,35,195,24,150,5,154
-db	7,18,128,226,235,39,178,117
-db	9,131,44,26,27,110,90,160
-db	82,59,214,179,41,227,47,132
-db	83,209,0,237,32,252,177,91
-db	106,203,190,57,74,76,88,207
-db	208,239,170,251,67,77,51,133
-db	69,249,2,127,80,60,159,168
-db	81,163,64,143,146,157,56,245
-db	188,182,218,33,16,255,243,210
-db	205,12,19,236,95,151,68,23
-db	196,167,126,61,100,93,25,115
-db	96,129,79,220,34,42,144,136
-db	70,238,184,20,222,94,11,219
-db	224,50,58,10,73,6,36,92
-db	194,211,172,98,145,149,228,121
-db	231,200,55,109,141,213,78,169
-db	108,86,244,234,101,122,174,8
-db	186,120,37,46,28,166,180,198
-db	232,221,116,31,75,189,139,138
-db	112,62,181,102,72,3,246,14
-db	97,53,87,185,134,193,29,158
-db	225,248,152,17,105,217,142,148
-db	155,30,135,233,206,85,40,223
-db	140,161,137,13,191,230,66,104
-db	65,153,45,15,176,84,187,22
-db	99,124,119,123,242,107,111,197
-db	48,1,103,43,254,215,171,118
-db	202,130,201,125,250,89,71,240
-db	173,212,162,175,156,164,114,192
-db	183,253,147,38,54,63,247,204
-db	52,165,229,241,113,216,49,21
-db	4,199,35,195,24,150,5,154
-db	7,18,128,226,235,39,178,117
-db	9,131,44,26,27,110,90,160
-db	82,59,214,179,41,227,47,132
-db	83,209,0,237,32,252,177,91
-db	106,203,190,57,74,76,88,207
-db	208,239,170,251,67,77,51,133
-db	69,249,2,127,80,60,159,168
-db	81,163,64,143,146,157,56,245
-db	188,182,218,33,16,255,243,210
-db	205,12,19,236,95,151,68,23
-db	196,167,126,61,100,93,25,115
-db	96,129,79,220,34,42,144,136
-db	70,238,184,20,222,94,11,219
-db	224,50,58,10,73,6,36,92
-db	194,211,172,98,145,149,228,121
-db	231,200,55,109,141,213,78,169
-db	108,86,244,234,101,122,174,8
-db	186,120,37,46,28,166,180,198
-db	232,221,116,31,75,189,139,138
-db	112,62,181,102,72,3,246,14
-db	97,53,87,185,134,193,29,158
-db	225,248,152,17,105,217,142,148
-db	155,30,135,233,206,85,40,223
-db	140,161,137,13,191,230,66,104
-db	65,153,45,15,176,84,187,22
-db	99,124,119,123,242,107,111,197
-db	48,1,103,43,254,215,171,118
-db	202,130,201,125,250,89,71,240
-db	173,212,162,175,156,164,114,192
-db	183,253,147,38,54,63,247,204
-db	52,165,229,241,113,216,49,21
-db	4,199,35,195,24,150,5,154
-db	7,18,128,226,235,39,178,117
-db	9,131,44,26,27,110,90,160
-db	82,59,214,179,41,227,47,132
-db	83,209,0,237,32,252,177,91
-db	106,203,190,57,74,76,88,207
-db	208,239,170,251,67,77,51,133
-db	69,249,2,127,80,60,159,168
-db	81,163,64,143,146,157,56,245
-db	188,182,218,33,16,255,243,210
-db	205,12,19,236,95,151,68,23
-db	196,167,126,61,100,93,25,115
-db	96,129,79,220,34,42,144,136
-db	70,238,184,20,222,94,11,219
-db	224,50,58,10,73,6,36,92
-db	194,211,172,98,145,149,228,121
-db	231,200,55,109,141,213,78,169
-db	108,86,244,234,101,122,174,8
-db	186,120,37,46,28,166,180,198
-db	232,221,116,31,75,189,139,138
-db	112,62,181,102,72,3,246,14
-db	97,53,87,185,134,193,29,158
-db	225,248,152,17,105,217,142,148
-db	155,30,135,233,206,85,40,223
-db	140,161,137,13,191,230,66,104
-db	65,153,45,15,176,84,187,22
-db	99,124,119,123,242,107,111,197
-db	48,1,103,43,254,215,171,118
-db	202,130,201,125,250,89,71,240
-db	173,212,162,175,156,164,114,192
-db	183,253,147,38,54,63,247,204
-db	52,165,229,241,113,216,49,21
-db	4,199,35,195,24,150,5,154
-db	7,18,128,226,235,39,178,117
-db	9,131,44,26,27,110,90,160
-db	82,59,214,179,41,227,47,132
-db	83,209,0,237,32,252,177,91
-db	106,203,190,57,74,76,88,207
-db	208,239,170,251,67,77,51,133
-db	69,249,2,127,80,60,159,168
-db	81,163,64,143,146,157,56,245
-db	188,182,218,33,16,255,243,210
-db	205,12,19,236,95,151,68,23
-db	196,167,126,61,100,93,25,115
-db	96,129,79,220,34,42,144,136
-db	70,238,184,20,222,94,11,219
-db	224,50,58,10,73,6,36,92
-db	194,211,172,98,145,149,228,121
-db	231,200,55,109,141,213,78,169
-db	108,86,244,234,101,122,174,8
-db	186,120,37,46,28,166,180,198
-db	232,221,116,31,75,189,139,138
-db	112,62,181,102,72,3,246,14
-db	97,53,87,185,134,193,29,158
-db	225,248,152,17,105,217,142,148
-db	155,30,135,233,206,85,40,223
-db	140,161,137,13,191,230,66,104
-db	65,153,45,15,176,84,187,22
-dd	1,2,4,8
-dd	16,32,64,128
-dd	27,54,0,0
-dd	0,0,0,0
-global	_AES_encrypt
-align	16
-_AES_encrypt:
-L$_AES_encrypt_begin:
-	push	ebp
-	push	ebx
-	push	esi
-	push	edi
-	mov	esi,DWORD [20+esp]
-	mov	edi,DWORD [28+esp]
-	mov	eax,esp
-	sub	esp,36
-	and	esp,-64
-	lea	ebx,[edi-127]
-	sub	ebx,esp
-	neg	ebx
-	and	ebx,960
-	sub	esp,ebx
-	add	esp,4
-	mov	DWORD [28+esp],eax
-	call	L$004pic_point
-L$004pic_point:
-	pop	ebp
-	lea	eax,[_OPENSSL_ia32cap_P]
-	lea	ebp,[(L$AES_Te-L$004pic_point)+ebp]
-	lea	ebx,[764+esp]
-	sub	ebx,ebp
-	and	ebx,768
-	lea	ebp,[2176+ebx*1+ebp]
-	bt	DWORD [eax],25
-	jnc	NEAR L$005x86
-	movq	mm0,[esi]
-	movq	mm4,[8+esi]
-	call	__sse_AES_encrypt_compact
-	mov	esp,DWORD [28+esp]
-	mov	esi,DWORD [24+esp]
-	movq	[esi],mm0
-	movq	[8+esi],mm4
-	emms
-	pop	edi
-	pop	esi
-	pop	ebx
-	pop	ebp
-	ret
-align	16
-L$005x86:
-	mov	DWORD [24+esp],ebp
-	mov	eax,DWORD [esi]
-	mov	ebx,DWORD [4+esi]
-	mov	ecx,DWORD [8+esi]
-	mov	edx,DWORD [12+esi]
-	call	__x86_AES_encrypt_compact
-	mov	esp,DWORD [28+esp]
-	mov	esi,DWORD [24+esp]
-	mov	DWORD [esi],eax
-	mov	DWORD [4+esi],ebx
-	mov	DWORD [8+esi],ecx
-	mov	DWORD [12+esi],edx
-	pop	edi
-	pop	esi
-	pop	ebx
-	pop	ebp
-	ret
-align	16
-__x86_AES_decrypt_compact:
-	mov	DWORD [20+esp],edi
-	xor	eax,DWORD [edi]
-	xor	ebx,DWORD [4+edi]
-	xor	ecx,DWORD [8+edi]
-	xor	edx,DWORD [12+edi]
-	mov	esi,DWORD [240+edi]
-	lea	esi,[esi*1+esi-2]
-	lea	esi,[esi*8+edi]
-	mov	DWORD [24+esp],esi
-	mov	edi,DWORD [ebp-128]
-	mov	esi,DWORD [ebp-96]
-	mov	edi,DWORD [ebp-64]
-	mov	esi,DWORD [ebp-32]
-	mov	edi,DWORD [ebp]
-	mov	esi,DWORD [32+ebp]
-	mov	edi,DWORD [64+ebp]
-	mov	esi,DWORD [96+ebp]
-align	16
-L$006loop:
-	mov	esi,eax
-	and	esi,255
-	movzx	esi,BYTE [esi*1+ebp-128]
-	movzx	edi,dh
-	movzx	edi,BYTE [edi*1+ebp-128]
-	shl	edi,8
-	xor	esi,edi
-	mov	edi,ecx
-	shr	edi,16
-	and	edi,255
-	movzx	edi,BYTE [edi*1+ebp-128]
-	shl	edi,16
-	xor	esi,edi
-	mov	edi,ebx
-	shr	edi,24
-	movzx	edi,BYTE [edi*1+ebp-128]
-	shl	edi,24
-	xor	esi,edi
-	mov	DWORD [4+esp],esi
-	mov	esi,ebx
-	and	esi,255
-	movzx	esi,BYTE [esi*1+ebp-128]
-	movzx	edi,ah
-	movzx	edi,BYTE [edi*1+ebp-128]
-	shl	edi,8
-	xor	esi,edi
-	mov	edi,edx
-	shr	edi,16
-	and	edi,255
-	movzx	edi,BYTE [edi*1+ebp-128]
-	shl	edi,16
-	xor	esi,edi
-	mov	edi,ecx
-	shr	edi,24
-	movzx	edi,BYTE [edi*1+ebp-128]
-	shl	edi,24
-	xor	esi,edi
-	mov	DWORD [8+esp],esi
-	mov	esi,ecx
-	and	esi,255
-	movzx	esi,BYTE [esi*1+ebp-128]
-	movzx	edi,bh
-	movzx	edi,BYTE [edi*1+ebp-128]
-	shl	edi,8
-	xor	esi,edi
-	mov	edi,eax
-	shr	edi,16
-	and	edi,255
-	movzx	edi,BYTE [edi*1+ebp-128]
-	shl	edi,16
-	xor	esi,edi
-	mov	edi,edx
-	shr	edi,24
-	movzx	edi,BYTE [edi*1+ebp-128]
-	shl	edi,24
-	xor	esi,edi
-	and	edx,255
-	movzx	edx,BYTE [edx*1+ebp-128]
-	movzx	ecx,ch
-	movzx	ecx,BYTE [ecx*1+ebp-128]
-	shl	ecx,8
-	xor	edx,ecx
-	mov	ecx,esi
-	shr	ebx,16
-	and	ebx,255
-	movzx	ebx,BYTE [ebx*1+ebp-128]
-	shl	ebx,16
-	xor	edx,ebx
-	shr	eax,24
-	movzx	eax,BYTE [eax*1+ebp-128]
-	shl	eax,24
-	xor	edx,eax
-	mov	edi,2155905152
-	and	edi,ecx
-	mov	esi,edi
-	shr	edi,7
-	lea	eax,[ecx*1+ecx]
-	sub	esi,edi
-	and	eax,4278124286
-	and	esi,454761243
-	xor	eax,esi
-	mov	edi,2155905152
-	and	edi,eax
-	mov	esi,edi
-	shr	edi,7
-	lea	ebx,[eax*1+eax]
-	sub	esi,edi
-	and	ebx,4278124286
-	and	esi,454761243
-	xor	eax,ecx
-	xor	ebx,esi
-	mov	edi,2155905152
-	and	edi,ebx
-	mov	esi,edi
-	shr	edi,7
-	lea	ebp,[ebx*1+ebx]
-	sub	esi,edi
-	and	ebp,4278124286
-	and	esi,454761243
-	xor	ebx,ecx
-	rol	ecx,8
-	xor	ebp,esi
-	xor	ecx,eax
-	xor	eax,ebp
-	xor	ecx,ebx
-	xor	ebx,ebp
-	rol	eax,24
-	xor	ecx,ebp
-	rol	ebx,16
-	xor	ecx,eax
-	rol	ebp,8
-	xor	ecx,ebx
-	mov	eax,DWORD [4+esp]
-	xor	ecx,ebp
-	mov	DWORD [12+esp],ecx
-	mov	edi,2155905152
-	and	edi,edx
-	mov	esi,edi
-	shr	edi,7
-	lea	ebx,[edx*1+edx]
-	sub	esi,edi
-	and	ebx,4278124286
-	and	esi,454761243
-	xor	ebx,esi
-	mov	edi,2155905152
-	and	edi,ebx
-	mov	esi,edi
-	shr	edi,7
-	lea	ecx,[ebx*1+ebx]
-	sub	esi,edi
-	and	ecx,4278124286
-	and	esi,454761243
-	xor	ebx,edx
-	xor	ecx,esi
-	mov	edi,2155905152
-	and	edi,ecx
-	mov	esi,edi
-	shr	edi,7
-	lea	ebp,[ecx*1+ecx]
-	sub	esi,edi
-	and	ebp,4278124286
-	and	esi,454761243
-	xor	ecx,edx
-	rol	edx,8
-	xor	ebp,esi
-	xor	edx,ebx
-	xor	ebx,ebp
-	xor	edx,ecx
-	xor	ecx,ebp
-	rol	ebx,24
-	xor	edx,ebp
-	rol	ecx,16
-	xor	edx,ebx
-	rol	ebp,8
-	xor	edx,ecx
-	mov	ebx,DWORD [8+esp]
-	xor	edx,ebp
-	mov	DWORD [16+esp],edx
-	mov	edi,2155905152
-	and	edi,eax
-	mov	esi,edi
-	shr	edi,7
-	lea	ecx,[eax*1+eax]
-	sub	esi,edi
-	and	ecx,4278124286
-	and	esi,454761243
-	xor	ecx,esi
-	mov	edi,2155905152
-	and	edi,ecx
-	mov	esi,edi
-	shr	edi,7
-	lea	edx,[ecx*1+ecx]
-	sub	esi,edi
-	and	edx,4278124286
-	and	esi,454761243
-	xor	ecx,eax
-	xor	edx,esi
-	mov	edi,2155905152
-	and	edi,edx
-	mov	esi,edi
-	shr	edi,7
-	lea	ebp,[edx*1+edx]
-	sub	esi,edi
-	and	ebp,4278124286
-	and	esi,454761243
-	xor	edx,eax
-	rol	eax,8
-	xor	ebp,esi
-	xor	eax,ecx
-	xor	ecx,ebp
-	xor	eax,edx
-	xor	edx,ebp
-	rol	ecx,24
-	xor	eax,ebp
-	rol	edx,16
-	xor	eax,ecx
-	rol	ebp,8
-	xor	eax,edx
-	xor	eax,ebp
-	mov	edi,2155905152
-	and	edi,ebx
-	mov	esi,edi
-	shr	edi,7
-	lea	ecx,[ebx*1+ebx]
-	sub	esi,edi
-	and	ecx,4278124286
-	and	esi,454761243
-	xor	ecx,esi
-	mov	edi,2155905152
-	and	edi,ecx
-	mov	esi,edi
-	shr	edi,7
-	lea	edx,[ecx*1+ecx]
-	sub	esi,edi
-	and	edx,4278124286
-	and	esi,454761243
-	xor	ecx,ebx
-	xor	edx,esi
-	mov	edi,2155905152
-	and	edi,edx
-	mov	esi,edi
-	shr	edi,7
-	lea	ebp,[edx*1+edx]
-	sub	esi,edi
-	and	ebp,4278124286
-	and	esi,454761243
-	xor	edx,ebx
-	rol	ebx,8
-	xor	ebp,esi
-	xor	ebx,ecx
-	xor	ecx,ebp
-	xor	ebx,edx
-	xor	edx,ebp
-	rol	ecx,24
-	xor	ebx,ebp
-	rol	edx,16
-	xor	ebx,ecx
-	rol	ebp,8
-	xor	ebx,edx
-	mov	ecx,DWORD [12+esp]
-	xor	ebx,ebp
-	mov	edx,DWORD [16+esp]
-	mov	edi,DWORD [20+esp]
-	mov	ebp,DWORD [28+esp]
-	add	edi,16
-	xor	eax,DWORD [edi]
-	xor	ebx,DWORD [4+edi]
-	xor	ecx,DWORD [8+edi]
-	xor	edx,DWORD [12+edi]
-	cmp	edi,DWORD [24+esp]
-	mov	DWORD [20+esp],edi
-	jb	NEAR L$006loop
-	mov	esi,eax
-	and	esi,255
-	movzx	esi,BYTE [esi*1+ebp-128]
-	movzx	edi,dh
-	movzx	edi,BYTE [edi*1+ebp-128]
-	shl	edi,8
-	xor	esi,edi
-	mov	edi,ecx
-	shr	edi,16
-	and	edi,255
-	movzx	edi,BYTE [edi*1+ebp-128]
-	shl	edi,16
-	xor	esi,edi
-	mov	edi,ebx
-	shr	edi,24
-	movzx	edi,BYTE [edi*1+ebp-128]
-	shl	edi,24
-	xor	esi,edi
-	mov	DWORD [4+esp],esi
-	mov	esi,ebx
-	and	esi,255
-	movzx	esi,BYTE [esi*1+ebp-128]
-	movzx	edi,ah
-	movzx	edi,BYTE [edi*1+ebp-128]
-	shl	edi,8
-	xor	esi,edi
-	mov	edi,edx
-	shr	edi,16
-	and	edi,255
-	movzx	edi,BYTE [edi*1+ebp-128]
-	shl	edi,16
-	xor	esi,edi
-	mov	edi,ecx
-	shr	edi,24
-	movzx	edi,BYTE [edi*1+ebp-128]
-	shl	edi,24
-	xor	esi,edi
-	mov	DWORD [8+esp],esi
-	mov	esi,ecx
-	and	esi,255
-	movzx	esi,BYTE [esi*1+ebp-128]
-	movzx	edi,bh
-	movzx	edi,BYTE [edi*1+ebp-128]
-	shl	edi,8
-	xor	esi,edi
-	mov	edi,eax
-	shr	edi,16
-	and	edi,255
-	movzx	edi,BYTE [edi*1+ebp-128]
-	shl	edi,16
-	xor	esi,edi
-	mov	edi,edx
-	shr	edi,24
-	movzx	edi,BYTE [edi*1+ebp-128]
-	shl	edi,24
-	xor	esi,edi
-	mov	edi,DWORD [20+esp]
-	and	edx,255
-	movzx	edx,BYTE [edx*1+ebp-128]
-	movzx	ecx,ch
-	movzx	ecx,BYTE [ecx*1+ebp-128]
-	shl	ecx,8
-	xor	edx,ecx
-	mov	ecx,esi
-	shr	ebx,16
-	and	ebx,255
-	movzx	ebx,BYTE [ebx*1+ebp-128]
-	shl	ebx,16
-	xor	edx,ebx
-	mov	ebx,DWORD [8+esp]
-	shr	eax,24
-	movzx	eax,BYTE [eax*1+ebp-128]
-	shl	eax,24
-	xor	edx,eax
-	mov	eax,DWORD [4+esp]
-	xor	eax,DWORD [16+edi]
-	xor	ebx,DWORD [20+edi]
-	xor	ecx,DWORD [24+edi]
-	xor	edx,DWORD [28+edi]
-	ret
-align	16
-__sse_AES_decrypt_compact:
-	pxor	mm0,[edi]
-	pxor	mm4,[8+edi]
-	mov	esi,DWORD [240+edi]
-	lea	esi,[esi*1+esi-2]
-	lea	esi,[esi*8+edi]
-	mov	DWORD [24+esp],esi
-	mov	eax,454761243
-	mov	DWORD [8+esp],eax
-	mov	DWORD [12+esp],eax
-	mov	eax,DWORD [ebp-128]
-	mov	ebx,DWORD [ebp-96]
-	mov	ecx,DWORD [ebp-64]
-	mov	edx,DWORD [ebp-32]
-	mov	eax,DWORD [ebp]
-	mov	ebx,DWORD [32+ebp]
-	mov	ecx,DWORD [64+ebp]
-	mov	edx,DWORD [96+ebp]
-align	16
-L$007loop:
-	pshufw	mm1,mm0,12
-	pshufw	mm5,mm4,9
-	movd	eax,mm1
-	movd	ebx,mm5
-	mov	DWORD [20+esp],edi
-	movzx	esi,al
-	movzx	edx,ah
-	pshufw	mm2,mm0,6
-	movzx	ecx,BYTE [esi*1+ebp-128]
-	movzx	edi,bl
-	movzx	edx,BYTE [edx*1+ebp-128]
-	shr	eax,16
-	shl	edx,8
-	movzx	esi,BYTE [edi*1+ebp-128]
-	movzx	edi,bh
-	shl	esi,16
-	pshufw	mm6,mm4,3
-	or	ecx,esi
-	movzx	esi,BYTE [edi*1+ebp-128]
-	movzx	edi,ah
-	shl	esi,24
-	shr	ebx,16
-	or	edx,esi
-	movzx	esi,BYTE [edi*1+ebp-128]
-	movzx	edi,bh
-	shl	esi,24
-	or	ecx,esi
-	movzx	esi,BYTE [edi*1+ebp-128]
-	movzx	edi,al
-	shl	esi,8
-	movd	eax,mm2
-	or	ecx,esi
-	movzx	esi,BYTE [edi*1+ebp-128]
-	movzx	edi,bl
-	shl	esi,16
-	movd	ebx,mm6
-	movd	mm0,ecx
-	movzx	ecx,BYTE [edi*1+ebp-128]
-	movzx	edi,al
-	or	ecx,esi
-	movzx	esi,BYTE [edi*1+ebp-128]
-	movzx	edi,bl
-	or	edx,esi
-	movzx	esi,BYTE [edi*1+ebp-128]
-	movzx	edi,ah
-	shl	esi,16
-	shr	eax,16
-	or	edx,esi
-	movzx	esi,BYTE [edi*1+ebp-128]
-	movzx	edi,bh
-	shr	ebx,16
-	shl	esi,8
-	movd	mm1,edx
-	movzx	edx,BYTE [edi*1+ebp-128]
-	movzx	edi,bh
-	shl	edx,24
-	and	ebx,255
-	or	edx,esi
-	punpckldq	mm0,mm1
-	movzx	esi,BYTE [edi*1+ebp-128]
-	movzx	edi,al
-	shl	esi,8
-	movzx	eax,ah
-	movzx	ebx,BYTE [ebx*1+ebp-128]
-	or	ecx,esi
-	movzx	esi,BYTE [edi*1+ebp-128]
-	or	edx,ebx
-	shl	esi,16
-	movzx	eax,BYTE [eax*1+ebp-128]
-	or	edx,esi
-	shl	eax,24
-	or	ecx,eax
-	mov	edi,DWORD [20+esp]
-	movd	mm4,edx
-	movd	mm5,ecx
-	punpckldq	mm4,mm5
-	add	edi,16
-	cmp	edi,DWORD [24+esp]
-	ja	NEAR L$008out
-	movq	mm3,mm0
-	movq	mm7,mm4
-	pshufw	mm2,mm0,228
-	pshufw	mm6,mm4,228
-	movq	mm1,mm0
-	movq	mm5,mm4
-	pshufw	mm0,mm0,177
-	pshufw	mm4,mm4,177
-	pslld	mm2,8
-	pslld	mm6,8
-	psrld	mm3,8
-	psrld	mm7,8
-	pxor	mm0,mm2
-	pxor	mm4,mm6
-	pxor	mm0,mm3
-	pxor	mm4,mm7
-	pslld	mm2,16
-	pslld	mm6,16
-	psrld	mm3,16
-	psrld	mm7,16
-	pxor	mm0,mm2
-	pxor	mm4,mm6
-	pxor	mm0,mm3
-	pxor	mm4,mm7
-	movq	mm3,[8+esp]
-	pxor	mm2,mm2
-	pxor	mm6,mm6
-	pcmpgtb	mm2,mm1
-	pcmpgtb	mm6,mm5
-	pand	mm2,mm3
-	pand	mm6,mm3
-	paddb	mm1,mm1
-	paddb	mm5,mm5
-	pxor	mm1,mm2
-	pxor	mm5,mm6
-	movq	mm3,mm1
-	movq	mm7,mm5
-	movq	mm2,mm1
-	movq	mm6,mm5
-	pxor	mm0,mm1
-	pxor	mm4,mm5
-	pslld	mm3,24
-	pslld	mm7,24
-	psrld	mm2,8
-	psrld	mm6,8
-	pxor	mm0,mm3
-	pxor	mm4,mm7
-	pxor	mm0,mm2
-	pxor	mm4,mm6
-	movq	mm2,[8+esp]
-	pxor	mm3,mm3
-	pxor	mm7,mm7
-	pcmpgtb	mm3,mm1
-	pcmpgtb	mm7,mm5
-	pand	mm3,mm2
-	pand	mm7,mm2
-	paddb	mm1,mm1
-	paddb	mm5,mm5
-	pxor	mm1,mm3
-	pxor	mm5,mm7
-	pshufw	mm3,mm1,177
-	pshufw	mm7,mm5,177
-	pxor	mm0,mm1
-	pxor	mm4,mm5
-	pxor	mm0,mm3
-	pxor	mm4,mm7
-	pxor	mm3,mm3
-	pxor	mm7,mm7
-	pcmpgtb	mm3,mm1
-	pcmpgtb	mm7,mm5
-	pand	mm3,mm2
-	pand	mm7,mm2
-	paddb	mm1,mm1
-	paddb	mm5,mm5
-	pxor	mm1,mm3
-	pxor	mm5,mm7
-	pxor	mm0,mm1
-	pxor	mm4,mm5
-	movq	mm3,mm1
-	movq	mm7,mm5
-	pshufw	mm2,mm1,177
-	pshufw	mm6,mm5,177
-	pxor	mm0,mm2
-	pxor	mm4,mm6
-	pslld	mm1,8
-	pslld	mm5,8
-	psrld	mm3,8
-	psrld	mm7,8
-	movq	mm2,[edi]
-	movq	mm6,[8+edi]
-	pxor	mm0,mm1
-	pxor	mm4,mm5
-	pxor	mm0,mm3
-	pxor	mm4,mm7
-	mov	eax,DWORD [ebp-128]
-	pslld	mm1,16
-	pslld	mm5,16
-	mov	ebx,DWORD [ebp-64]
-	psrld	mm3,16
-	psrld	mm7,16
-	mov	ecx,DWORD [ebp]
-	pxor	mm0,mm1
-	pxor	mm4,mm5
-	mov	edx,DWORD [64+ebp]
-	pxor	mm0,mm3
-	pxor	mm4,mm7
-	pxor	mm0,mm2
-	pxor	mm4,mm6
-	jmp	NEAR L$007loop
-align	16
-L$008out:
-	pxor	mm0,[edi]
-	pxor	mm4,[8+edi]
-	ret
-align	16
-__x86_AES_decrypt:
-	mov	DWORD [20+esp],edi
-	xor	eax,DWORD [edi]
-	xor	ebx,DWORD [4+edi]
-	xor	ecx,DWORD [8+edi]
-	xor	edx,DWORD [12+edi]
-	mov	esi,DWORD [240+edi]
-	lea	esi,[esi*1+esi-2]
-	lea	esi,[esi*8+edi]
-	mov	DWORD [24+esp],esi
-align	16
-L$009loop:
-	mov	esi,eax
-	and	esi,255
-	mov	esi,DWORD [esi*8+ebp]
-	movzx	edi,dh
-	xor	esi,DWORD [3+edi*8+ebp]
-	mov	edi,ecx
-	shr	edi,16
-	and	edi,255
-	xor	esi,DWORD [2+edi*8+ebp]
-	mov	edi,ebx
-	shr	edi,24
-	xor	esi,DWORD [1+edi*8+ebp]
-	mov	DWORD [4+esp],esi
-	mov	esi,ebx
-	and	esi,255
-	mov	esi,DWORD [esi*8+ebp]
-	movzx	edi,ah
-	xor	esi,DWORD [3+edi*8+ebp]
-	mov	edi,edx
-	shr	edi,16
-	and	edi,255
-	xor	esi,DWORD [2+edi*8+ebp]
-	mov	edi,ecx
-	shr	edi,24
-	xor	esi,DWORD [1+edi*8+ebp]
-	mov	DWORD [8+esp],esi
-	mov	esi,ecx
-	and	esi,255
-	mov	esi,DWORD [esi*8+ebp]
-	movzx	edi,bh
-	xor	esi,DWORD [3+edi*8+ebp]
-	mov	edi,eax
-	shr	edi,16
-	and	edi,255
-	xor	esi,DWORD [2+edi*8+ebp]
-	mov	edi,edx
-	shr	edi,24
-	xor	esi,DWORD [1+edi*8+ebp]
-	mov	edi,DWORD [20+esp]
-	and	edx,255
-	mov	edx,DWORD [edx*8+ebp]
-	movzx	ecx,ch
-	xor	edx,DWORD [3+ecx*8+ebp]
-	mov	ecx,esi
-	shr	ebx,16
-	and	ebx,255
-	xor	edx,DWORD [2+ebx*8+ebp]
-	mov	ebx,DWORD [8+esp]
-	shr	eax,24
-	xor	edx,DWORD [1+eax*8+ebp]
-	mov	eax,DWORD [4+esp]
-	add	edi,16
-	xor	eax,DWORD [edi]
-	xor	ebx,DWORD [4+edi]
-	xor	ecx,DWORD [8+edi]
-	xor	edx,DWORD [12+edi]
-	cmp	edi,DWORD [24+esp]
-	mov	DWORD [20+esp],edi
-	jb	NEAR L$009loop
-	lea	ebp,[2176+ebp]
-	mov	edi,DWORD [ebp-128]
-	mov	esi,DWORD [ebp-96]
-	mov	edi,DWORD [ebp-64]
-	mov	esi,DWORD [ebp-32]
-	mov	edi,DWORD [ebp]
-	mov	esi,DWORD [32+ebp]
-	mov	edi,DWORD [64+ebp]
-	mov	esi,DWORD [96+ebp]
-	lea	ebp,[ebp-128]
-	mov	esi,eax
-	and	esi,255
-	movzx	esi,BYTE [esi*1+ebp]
-	movzx	edi,dh
-	movzx	edi,BYTE [edi*1+ebp]
-	shl	edi,8
-	xor	esi,edi
-	mov	edi,ecx
-	shr	edi,16
-	and	edi,255
-	movzx	edi,BYTE [edi*1+ebp]
-	shl	edi,16
-	xor	esi,edi
-	mov	edi,ebx
-	shr	edi,24
-	movzx	edi,BYTE [edi*1+ebp]
-	shl	edi,24
-	xor	esi,edi
-	mov	DWORD [4+esp],esi
-	mov	esi,ebx
-	and	esi,255
-	movzx	esi,BYTE [esi*1+ebp]
-	movzx	edi,ah
-	movzx	edi,BYTE [edi*1+ebp]
-	shl	edi,8
-	xor	esi,edi
-	mov	edi,edx
-	shr	edi,16
-	and	edi,255
-	movzx	edi,BYTE [edi*1+ebp]
-	shl	edi,16
-	xor	esi,edi
-	mov	edi,ecx
-	shr	edi,24
-	movzx	edi,BYTE [edi*1+ebp]
-	shl	edi,24
-	xor	esi,edi
-	mov	DWORD [8+esp],esi
-	mov	esi,ecx
-	and	esi,255
-	movzx	esi,BYTE [esi*1+ebp]
-	movzx	edi,bh
-	movzx	edi,BYTE [edi*1+ebp]
-	shl	edi,8
-	xor	esi,edi
-	mov	edi,eax
-	shr	edi,16
-	and	edi,255
-	movzx	edi,BYTE [edi*1+ebp]
-	shl	edi,16
-	xor	esi,edi
-	mov	edi,edx
-	shr	edi,24
-	movzx	edi,BYTE [edi*1+ebp]
-	shl	edi,24
-	xor	esi,edi
-	mov	edi,DWORD [20+esp]
-	and	edx,255
-	movzx	edx,BYTE [edx*1+ebp]
-	movzx	ecx,ch
-	movzx	ecx,BYTE [ecx*1+ebp]
-	shl	ecx,8
-	xor	edx,ecx
-	mov	ecx,esi
-	shr	ebx,16
-	and	ebx,255
-	movzx	ebx,BYTE [ebx*1+ebp]
-	shl	ebx,16
-	xor	edx,ebx
-	mov	ebx,DWORD [8+esp]
-	shr	eax,24
-	movzx	eax,BYTE [eax*1+ebp]
-	shl	eax,24
-	xor	edx,eax
-	mov	eax,DWORD [4+esp]
-	lea	ebp,[ebp-2048]
-	add	edi,16
-	xor	eax,DWORD [edi]
-	xor	ebx,DWORD [4+edi]
-	xor	ecx,DWORD [8+edi]
-	xor	edx,DWORD [12+edi]
-	ret
-align	64
-L$AES_Td:
-dd	1353184337,1353184337
-dd	1399144830,1399144830
-dd	3282310938,3282310938
-dd	2522752826,2522752826
-dd	3412831035,3412831035
-dd	4047871263,4047871263
-dd	2874735276,2874735276
-dd	2466505547,2466505547
-dd	1442459680,1442459680
-dd	4134368941,4134368941
-dd	2440481928,2440481928
-dd	625738485,625738485
-dd	4242007375,4242007375
-dd	3620416197,3620416197
-dd	2151953702,2151953702
-dd	2409849525,2409849525
-dd	1230680542,1230680542
-dd	1729870373,1729870373
-dd	2551114309,2551114309
-dd	3787521629,3787521629
-dd	41234371,41234371
-dd	317738113,317738113
-dd	2744600205,2744600205
-dd	3338261355,3338261355
-dd	3881799427,3881799427
-dd	2510066197,2510066197
-dd	3950669247,3950669247
-dd	3663286933,3663286933
-dd	763608788,763608788
-dd	3542185048,3542185048
-dd	694804553,694804553
-dd	1154009486,1154009486
-dd	1787413109,1787413109
-dd	2021232372,2021232372
-dd	1799248025,1799248025
-dd	3715217703,3715217703
-dd	3058688446,3058688446
-dd	397248752,397248752
-dd	1722556617,1722556617
-dd	3023752829,3023752829
-dd	407560035,407560035
-dd	2184256229,2184256229
-dd	1613975959,1613975959
-dd	1165972322,1165972322
-dd	3765920945,3765920945
-dd	2226023355,2226023355
-dd	480281086,480281086
-dd	2485848313,2485848313
-dd	1483229296,1483229296
-dd	436028815,436028815
-dd	2272059028,2272059028
-dd	3086515026,3086515026
-dd	601060267,601060267
-dd	3791801202,3791801202
-dd	1468997603,1468997603
-dd	715871590,715871590
-dd	120122290,120122290
-dd	63092015,63092015
-dd	2591802758,2591802758
-dd	2768779219,2768779219
-dd	4068943920,4068943920
-dd	2997206819,2997206819
-dd	3127509762,3127509762
-dd	1552029421,1552029421
-dd	723308426,723308426
-dd	2461301159,2461301159
-dd	4042393587,4042393587
-dd	2715969870,2715969870
-dd	3455375973,3455375973
-dd	3586000134,3586000134
-dd	526529745,526529745
-dd	2331944644,2331944644
-dd	2639474228,2639474228
-dd	2689987490,2689987490
-dd	853641733,853641733
-dd	1978398372,1978398372
-dd	971801355,971801355
-dd	2867814464,2867814464
-dd	111112542,111112542
-dd	1360031421,1360031421
-dd	4186579262,4186579262
-dd	1023860118,1023860118
-dd	2919579357,2919579357
-dd	1186850381,1186850381
-dd	3045938321,3045938321
-dd	90031217,90031217
-dd	1876166148,1876166148
-dd	4279586912,4279586912
-dd	620468249,620468249
-dd	2548678102,2548678102
-dd	3426959497,3426959497
-dd	2006899047,2006899047
-dd	3175278768,3175278768
-dd	2290845959,2290845959
-dd	945494503,945494503
-dd	3689859193,3689859193
-dd	1191869601,1191869601
-dd	3910091388,3910091388
-dd	3374220536,3374220536
-dd	0,0
-dd	2206629897,2206629897
-dd	1223502642,1223502642
-dd	2893025566,2893025566
-dd	1316117100,1316117100
-dd	4227796733,4227796733
-dd	1446544655,1446544655
-dd	517320253,517320253
-dd	658058550,658058550
-dd	1691946762,1691946762
-dd	564550760,564550760
-dd	3511966619,3511966619
-dd	976107044,976107044
-dd	2976320012,2976320012
-dd	266819475,266819475
-dd	3533106868,3533106868
-dd	2660342555,2660342555
-dd	1338359936,1338359936
-dd	2720062561,2720062561
-dd	1766553434,1766553434
-dd	370807324,370807324
-dd	179999714,179999714
-dd	3844776128,3844776128
-dd	1138762300,1138762300
-dd	488053522,488053522
-dd	185403662,185403662
-dd	2915535858,2915535858
-dd	3114841645,3114841645
-dd	3366526484,3366526484
-dd	2233069911,2233069911
-dd	1275557295,1275557295
-dd	3151862254,3151862254
-dd	4250959779,4250959779
-dd	2670068215,2670068215
-dd	3170202204,3170202204
-dd	3309004356,3309004356
-dd	880737115,880737115
-dd	1982415755,1982415755
-dd	3703972811,3703972811
-dd	1761406390,1761406390
-dd	1676797112,1676797112
-dd	3403428311,3403428311
-dd	277177154,277177154
-dd	1076008723,1076008723
-dd	538035844,538035844
-dd	2099530373,2099530373
-dd	4164795346,4164795346
-dd	288553390,288553390
-dd	1839278535,1839278535
-dd	1261411869,1261411869
-dd	4080055004,4080055004
-dd	3964831245,3964831245
-dd	3504587127,3504587127
-dd	1813426987,1813426987
-dd	2579067049,2579067049
-dd	4199060497,4199060497
-dd	577038663,577038663
-dd	3297574056,3297574056
-dd	440397984,440397984
-dd	3626794326,3626794326
-dd	4019204898,4019204898
-dd	3343796615,3343796615
-dd	3251714265,3251714265
-dd	4272081548,4272081548
-dd	906744984,906744984
-dd	3481400742,3481400742
-dd	685669029,685669029
-dd	646887386,646887386
-dd	2764025151,2764025151
-dd	3835509292,3835509292
-dd	227702864,227702864
-dd	2613862250,2613862250
-dd	1648787028,1648787028
-dd	3256061430,3256061430
-dd	3904428176,3904428176
-dd	1593260334,1593260334
-dd	4121936770,4121936770
-dd	3196083615,3196083615
-dd	2090061929,2090061929
-dd	2838353263,2838353263
-dd	3004310991,3004310991
-dd	999926984,999926984
-dd	2809993232,2809993232
-dd	1852021992,1852021992
-dd	2075868123,2075868123
-dd	158869197,158869197
-dd	4095236462,4095236462
-dd	28809964,28809964
-dd	2828685187,2828685187
-dd	1701746150,1701746150
-dd	2129067946,2129067946
-dd	147831841,147831841
-dd	3873969647,3873969647
-dd	3650873274,3650873274
-dd	3459673930,3459673930
-dd	3557400554,3557400554
-dd	3598495785,3598495785
-dd	2947720241,2947720241
-dd	824393514,824393514
-dd	815048134,815048134
-dd	3227951669,3227951669
-dd	935087732,935087732
-dd	2798289660,2798289660
-dd	2966458592,2966458592
-dd	366520115,366520115
-dd	1251476721,1251476721
-dd	4158319681,4158319681
-dd	240176511,240176511
-dd	804688151,804688151
-dd	2379631990,2379631990
-dd	1303441219,1303441219
-dd	1414376140,1414376140
-dd	3741619940,3741619940
-dd	3820343710,3820343710
-dd	461924940,461924940
-dd	3089050817,3089050817
-dd	2136040774,2136040774
-dd	82468509,82468509
-dd	1563790337,1563790337
-dd	1937016826,1937016826
-dd	776014843,776014843
-dd	1511876531,1511876531
-dd	1389550482,1389550482
-dd	861278441,861278441
-dd	323475053,323475053
-dd	2355222426,2355222426
-dd	2047648055,2047648055
-dd	2383738969,2383738969
-dd	2302415851,2302415851
-dd	3995576782,3995576782
-dd	902390199,902390199
-dd	3991215329,3991215329
-dd	1018251130,1018251130
-dd	1507840668,1507840668
-dd	1064563285,1064563285
-dd	2043548696,2043548696
-dd	3208103795,3208103795
-dd	3939366739,3939366739
-dd	1537932639,1537932639
-dd	342834655,342834655
-dd	2262516856,2262516856
-dd	2180231114,2180231114
-dd	1053059257,1053059257
-dd	741614648,741614648
-dd	1598071746,1598071746
-dd	1925389590,1925389590
-dd	203809468,203809468
-dd	2336832552,2336832552
-dd	1100287487,1100287487
-dd	1895934009,1895934009
-dd	3736275976,3736275976
-dd	2632234200,2632234200
-dd	2428589668,2428589668
-dd	1636092795,1636092795
-dd	1890988757,1890988757
-dd	1952214088,1952214088
-dd	1113045200,1113045200
-db	82,9,106,213,48,54,165,56
-db	191,64,163,158,129,243,215,251
-db	124,227,57,130,155,47,255,135
-db	52,142,67,68,196,222,233,203
-db	84,123,148,50,166,194,35,61
-db	238,76,149,11,66,250,195,78
-db	8,46,161,102,40,217,36,178
-db	118,91,162,73,109,139,209,37
-db	114,248,246,100,134,104,152,22
-db	212,164,92,204,93,101,182,146
-db	108,112,72,80,253,237,185,218
-db	94,21,70,87,167,141,157,132
-db	144,216,171,0,140,188,211,10
-db	247,228,88,5,184,179,69,6
-db	208,44,30,143,202,63,15,2
-db	193,175,189,3,1,19,138,107
-db	58,145,17,65,79,103,220,234
-db	151,242,207,206,240,180,230,115
-db	150,172,116,34,231,173,53,133
-db	226,249,55,232,28,117,223,110
-db	71,241,26,113,29,41,197,137
-db	111,183,98,14,170,24,190,27
-db	252,86,62,75,198,210,121,32
-db	154,219,192,254,120,205,90,244
-db	31,221,168,51,136,7,199,49
-db	177,18,16,89,39,128,236,95
-db	96,81,127,169,25,181,74,13
-db	45,229,122,159,147,201,156,239
-db	160,224,59,77,174,42,245,176
-db	200,235,187,60,131,83,153,97
-db	23,43,4,126,186,119,214,38
-db	225,105,20,99,85,33,12,125
-db	82,9,106,213,48,54,165,56
-db	191,64,163,158,129,243,215,251
-db	124,227,57,130,155,47,255,135
-db	52,142,67,68,196,222,233,203
-db	84,123,148,50,166,194,35,61
-db	238,76,149,11,66,250,195,78
-db	8,46,161,102,40,217,36,178
-db	118,91,162,73,109,139,209,37
-db	114,248,246,100,134,104,152,22
-db	212,164,92,204,93,101,182,146
-db	108,112,72,80,253,237,185,218
-db	94,21,70,87,167,141,157,132
-db	144,216,171,0,140,188,211,10
-db	247,228,88,5,184,179,69,6
-db	208,44,30,143,202,63,15,2
-db	193,175,189,3,1,19,138,107
-db	58,145,17,65,79,103,220,234
-db	151,242,207,206,240,180,230,115
-db	150,172,116,34,231,173,53,133
-db	226,249,55,232,28,117,223,110
-db	71,241,26,113,29,41,197,137
-db	111,183,98,14,170,24,190,27
-db	252,86,62,75,198,210,121,32
-db	154,219,192,254,120,205,90,244
-db	31,221,168,51,136,7,199,49
-db	177,18,16,89,39,128,236,95
-db	96,81,127,169,25,181,74,13
-db	45,229,122,159,147,201,156,239
-db	160,224,59,77,174,42,245,176
-db	200,235,187,60,131,83,153,97
-db	23,43,4,126,186,119,214,38
-db	225,105,20,99,85,33,12,125
-db	82,9,106,213,48,54,165,56
-db	191,64,163,158,129,243,215,251
-db	124,227,57,130,155,47,255,135
-db	52,142,67,68,196,222,233,203
-db	84,123,148,50,166,194,35,61
-db	238,76,149,11,66,250,195,78
-db	8,46,161,102,40,217,36,178
-db	118,91,162,73,109,139,209,37
-db	114,248,246,100,134,104,152,22
-db	212,164,92,204,93,101,182,146
-db	108,112,72,80,253,237,185,218
-db	94,21,70,87,167,141,157,132
-db	144,216,171,0,140,188,211,10
-db	247,228,88,5,184,179,69,6
-db	208,44,30,143,202,63,15,2
-db	193,175,189,3,1,19,138,107
-db	58,145,17,65,79,103,220,234
-db	151,242,207,206,240,180,230,115
-db	150,172,116,34,231,173,53,133
-db	226,249,55,232,28,117,223,110
-db	71,241,26,113,29,41,197,137
-db	111,183,98,14,170,24,190,27
-db	252,86,62,75,198,210,121,32
-db	154,219,192,254,120,205,90,244
-db	31,221,168,51,136,7,199,49
-db	177,18,16,89,39,128,236,95
-db	96,81,127,169,25,181,74,13
-db	45,229,122,159,147,201,156,239
-db	160,224,59,77,174,42,245,176
-db	200,235,187,60,131,83,153,97
-db	23,43,4,126,186,119,214,38
-db	225,105,20,99,85,33,12,125
-db	82,9,106,213,48,54,165,56
-db	191,64,163,158,129,243,215,251
-db	124,227,57,130,155,47,255,135
-db	52,142,67,68,196,222,233,203
-db	84,123,148,50,166,194,35,61
-db	238,76,149,11,66,250,195,78
-db	8,46,161,102,40,217,36,178
-db	118,91,162,73,109,139,209,37
-db	114,248,246,100,134,104,152,22
-db	212,164,92,204,93,101,182,146
-db	108,112,72,80,253,237,185,218
-db	94,21,70,87,167,141,157,132
-db	144,216,171,0,140,188,211,10
-db	247,228,88,5,184,179,69,6
-db	208,44,30,143,202,63,15,2
-db	193,175,189,3,1,19,138,107
-db	58,145,17,65,79,103,220,234
-db	151,242,207,206,240,180,230,115
-db	150,172,116,34,231,173,53,133
-db	226,249,55,232,28,117,223,110
-db	71,241,26,113,29,41,197,137
-db	111,183,98,14,170,24,190,27
-db	252,86,62,75,198,210,121,32
-db	154,219,192,254,120,205,90,244
-db	31,221,168,51,136,7,199,49
-db	177,18,16,89,39,128,236,95
-db	96,81,127,169,25,181,74,13
-db	45,229,122,159,147,201,156,239
-db	160,224,59,77,174,42,245,176
-db	200,235,187,60,131,83,153,97
-db	23,43,4,126,186,119,214,38
-db	225,105,20,99,85,33,12,125
-global	_AES_decrypt
-align	16
-_AES_decrypt:
-L$_AES_decrypt_begin:
-	push	ebp
-	push	ebx
-	push	esi
-	push	edi
-	mov	esi,DWORD [20+esp]
-	mov	edi,DWORD [28+esp]
-	mov	eax,esp
-	sub	esp,36
-	and	esp,-64
-	lea	ebx,[edi-127]
-	sub	ebx,esp
-	neg	ebx
-	and	ebx,960
-	sub	esp,ebx
-	add	esp,4
-	mov	DWORD [28+esp],eax
-	call	L$010pic_point
-L$010pic_point:
-	pop	ebp
-	lea	eax,[_OPENSSL_ia32cap_P]
-	lea	ebp,[(L$AES_Td-L$010pic_point)+ebp]
-	lea	ebx,[764+esp]
-	sub	ebx,ebp
-	and	ebx,768
-	lea	ebp,[2176+ebx*1+ebp]
-	bt	DWORD [eax],25
-	jnc	NEAR L$011x86
-	movq	mm0,[esi]
-	movq	mm4,[8+esi]
-	call	__sse_AES_decrypt_compact
-	mov	esp,DWORD [28+esp]
-	mov	esi,DWORD [24+esp]
-	movq	[esi],mm0
-	movq	[8+esi],mm4
-	emms
-	pop	edi
-	pop	esi
-	pop	ebx
-	pop	ebp
-	ret
-align	16
-L$011x86:
-	mov	DWORD [24+esp],ebp
-	mov	eax,DWORD [esi]
-	mov	ebx,DWORD [4+esi]
-	mov	ecx,DWORD [8+esi]
-	mov	edx,DWORD [12+esi]
-	call	__x86_AES_decrypt_compact
-	mov	esp,DWORD [28+esp]
-	mov	esi,DWORD [24+esp]
-	mov	DWORD [esi],eax
-	mov	DWORD [4+esi],ebx
-	mov	DWORD [8+esi],ecx
-	mov	DWORD [12+esi],edx
-	pop	edi
-	pop	esi
-	pop	ebx
-	pop	ebp
-	ret
-global	_AES_cbc_encrypt
-align	16
-_AES_cbc_encrypt:
-L$_AES_cbc_encrypt_begin:
-	push	ebp
-	push	ebx
-	push	esi
-	push	edi
-	mov	ecx,DWORD [28+esp]
-	cmp	ecx,0
-	je	NEAR L$012drop_out
-	call	L$013pic_point
-L$013pic_point:
-	pop	ebp
-	lea	eax,[_OPENSSL_ia32cap_P]
-	cmp	DWORD [40+esp],0
-	lea	ebp,[(L$AES_Te-L$013pic_point)+ebp]
-	jne	NEAR L$014picked_te
-	lea	ebp,[(L$AES_Td-L$AES_Te)+ebp]
-L$014picked_te:
-	pushfd
-	cld
-	cmp	ecx,512
-	jb	NEAR L$015slow_way
-	test	ecx,15
-	jnz	NEAR L$015slow_way
-	bt	DWORD [eax],28
-	jc	NEAR L$015slow_way
-	lea	esi,[esp-324]
-	and	esi,-64
-	mov	eax,ebp
-	lea	ebx,[2304+ebp]
-	mov	edx,esi
-	and	eax,4095
-	and	ebx,4095
-	and	edx,4095
-	cmp	edx,ebx
-	jb	NEAR L$016tbl_break_out
-	sub	edx,ebx
-	sub	esi,edx
-	jmp	NEAR L$017tbl_ok
-align	4
-L$016tbl_break_out:
-	sub	edx,eax
-	and	edx,4095
-	add	edx,384
-	sub	esi,edx
-align	4
-L$017tbl_ok:
-	lea	edx,[24+esp]
-	xchg	esp,esi
-	add	esp,4
-	mov	DWORD [24+esp],ebp
-	mov	DWORD [28+esp],esi
-	mov	eax,DWORD [edx]
-	mov	ebx,DWORD [4+edx]
-	mov	edi,DWORD [12+edx]
-	mov	esi,DWORD [16+edx]
-	mov	edx,DWORD [20+edx]
-	mov	DWORD [32+esp],eax
-	mov	DWORD [36+esp],ebx
-	mov	DWORD [40+esp],ecx
-	mov	DWORD [44+esp],edi
-	mov	DWORD [48+esp],esi
-	mov	DWORD [316+esp],0
-	mov	ebx,edi
-	mov	ecx,61
-	sub	ebx,ebp
-	mov	esi,edi
-	and	ebx,4095
-	lea	edi,[76+esp]
-	cmp	ebx,2304
-	jb	NEAR L$018do_copy
-	cmp	ebx,3852
-	jb	NEAR L$019skip_copy
-align	4
-L$018do_copy:
-	mov	DWORD [44+esp],edi
-dd	2784229001
-L$019skip_copy:
-	mov	edi,16
-align	4
-L$020prefetch_tbl:
-	mov	eax,DWORD [ebp]
-	mov	ebx,DWORD [32+ebp]
-	mov	ecx,DWORD [64+ebp]
-	mov	esi,DWORD [96+ebp]
-	lea	ebp,[128+ebp]
-	sub	edi,1
-	jnz	NEAR L$020prefetch_tbl
-	sub	ebp,2048
-	mov	esi,DWORD [32+esp]
-	mov	edi,DWORD [48+esp]
-	cmp	edx,0
-	je	NEAR L$021fast_decrypt
-	mov	eax,DWORD [edi]
-	mov	ebx,DWORD [4+edi]
-align	16
-L$022fast_enc_loop:
-	mov	ecx,DWORD [8+edi]
-	mov	edx,DWORD [12+edi]
-	xor	eax,DWORD [esi]
-	xor	ebx,DWORD [4+esi]
-	xor	ecx,DWORD [8+esi]
-	xor	edx,DWORD [12+esi]
-	mov	edi,DWORD [44+esp]
-	call	__x86_AES_encrypt
-	mov	esi,DWORD [32+esp]
-	mov	edi,DWORD [36+esp]
-	mov	DWORD [edi],eax
-	mov	DWORD [4+edi],ebx
-	mov	DWORD [8+edi],ecx
-	mov	DWORD [12+edi],edx
-	lea	esi,[16+esi]
-	mov	ecx,DWORD [40+esp]
-	mov	DWORD [32+esp],esi
-	lea	edx,[16+edi]
-	mov	DWORD [36+esp],edx
-	sub	ecx,16
-	mov	DWORD [40+esp],ecx
-	jnz	NEAR L$022fast_enc_loop
-	mov	esi,DWORD [48+esp]
-	mov	ecx,DWORD [8+edi]
-	mov	edx,DWORD [12+edi]
-	mov	DWORD [esi],eax
-	mov	DWORD [4+esi],ebx
-	mov	DWORD [8+esi],ecx
-	mov	DWORD [12+esi],edx
-	cmp	DWORD [316+esp],0
-	mov	edi,DWORD [44+esp]
-	je	NEAR L$023skip_ezero
-	mov	ecx,60
-	xor	eax,eax
-align	4
-dd	2884892297
-L$023skip_ezero:
-	mov	esp,DWORD [28+esp]
-	popfd
-L$012drop_out:
-	pop	edi
-	pop	esi
-	pop	ebx
-	pop	ebp
-	ret
-	pushfd
-align	16
-L$021fast_decrypt:
-	cmp	esi,DWORD [36+esp]
-	je	NEAR L$024fast_dec_in_place
-	mov	DWORD [52+esp],edi
-align	4
-align	16
-L$025fast_dec_loop:
-	mov	eax,DWORD [esi]
-	mov	ebx,DWORD [4+esi]
-	mov	ecx,DWORD [8+esi]
-	mov	edx,DWORD [12+esi]
-	mov	edi,DWORD [44+esp]
-	call	__x86_AES_decrypt
-	mov	edi,DWORD [52+esp]
-	mov	esi,DWORD [40+esp]
-	xor	eax,DWORD [edi]
-	xor	ebx,DWORD [4+edi]
-	xor	ecx,DWORD [8+edi]
-	xor	edx,DWORD [12+edi]
-	mov	edi,DWORD [36+esp]
-	mov	esi,DWORD [32+esp]
-	mov	DWORD [edi],eax
-	mov	DWORD [4+edi],ebx
-	mov	DWORD [8+edi],ecx
-	mov	DWORD [12+edi],edx
-	mov	ecx,DWORD [40+esp]
-	mov	DWORD [52+esp],esi
-	lea	esi,[16+esi]
-	mov	DWORD [32+esp],esi
-	lea	edi,[16+edi]
-	mov	DWORD [36+esp],edi
-	sub	ecx,16
-	mov	DWORD [40+esp],ecx
-	jnz	NEAR L$025fast_dec_loop
-	mov	edi,DWORD [52+esp]
-	mov	esi,DWORD [48+esp]
-	mov	eax,DWORD [edi]
-	mov	ebx,DWORD [4+edi]
-	mov	ecx,DWORD [8+edi]
-	mov	edx,DWORD [12+edi]
-	mov	DWORD [esi],eax
-	mov	DWORD [4+esi],ebx
-	mov	DWORD [8+esi],ecx
-	mov	DWORD [12+esi],edx
-	jmp	NEAR L$026fast_dec_out
-align	16
-L$024fast_dec_in_place:
-L$027fast_dec_in_place_loop:
-	mov	eax,DWORD [esi]
-	mov	ebx,DWORD [4+esi]
-	mov	ecx,DWORD [8+esi]
-	mov	edx,DWORD [12+esi]
-	lea	edi,[60+esp]
-	mov	DWORD [edi],eax
-	mov	DWORD [4+edi],ebx
-	mov	DWORD [8+edi],ecx
-	mov	DWORD [12+edi],edx
-	mov	edi,DWORD [44+esp]
-	call	__x86_AES_decrypt
-	mov	edi,DWORD [48+esp]
-	mov	esi,DWORD [36+esp]
-	xor	eax,DWORD [edi]
-	xor	ebx,DWORD [4+edi]
-	xor	ecx,DWORD [8+edi]
-	xor	edx,DWORD [12+edi]
-	mov	DWORD [esi],eax
-	mov	DWORD [4+esi],ebx
-	mov	DWORD [8+esi],ecx
-	mov	DWORD [12+esi],edx
-	lea	esi,[16+esi]
-	mov	DWORD [36+esp],esi
-	lea	esi,[60+esp]
-	mov	eax,DWORD [esi]
-	mov	ebx,DWORD [4+esi]
-	mov	ecx,DWORD [8+esi]
-	mov	edx,DWORD [12+esi]
-	mov	DWORD [edi],eax
-	mov	DWORD [4+edi],ebx
-	mov	DWORD [8+edi],ecx
-	mov	DWORD [12+edi],edx
-	mov	esi,DWORD [32+esp]
-	mov	ecx,DWORD [40+esp]
-	lea	esi,[16+esi]
-	mov	DWORD [32+esp],esi
-	sub	ecx,16
-	mov	DWORD [40+esp],ecx
-	jnz	NEAR L$027fast_dec_in_place_loop
-align	4
-L$026fast_dec_out:
-	cmp	DWORD [316+esp],0
-	mov	edi,DWORD [44+esp]
-	je	NEAR L$028skip_dzero
-	mov	ecx,60
-	xor	eax,eax
-align	4
-dd	2884892297
-L$028skip_dzero:
-	mov	esp,DWORD [28+esp]
-	popfd
-	pop	edi
-	pop	esi
-	pop	ebx
-	pop	ebp
-	ret
-	pushfd
-align	16
-L$015slow_way:
-	mov	eax,DWORD [eax]
-	mov	edi,DWORD [36+esp]
-	lea	esi,[esp-80]
-	and	esi,-64
-	lea	ebx,[edi-143]
-	sub	ebx,esi
-	neg	ebx
-	and	ebx,960
-	sub	esi,ebx
-	lea	ebx,[768+esi]
-	sub	ebx,ebp
-	and	ebx,768
-	lea	ebp,[2176+ebx*1+ebp]
-	lea	edx,[24+esp]
-	xchg	esp,esi
-	add	esp,4
-	mov	DWORD [24+esp],ebp
-	mov	DWORD [28+esp],esi
-	mov	DWORD [52+esp],eax
-	mov	eax,DWORD [edx]
-	mov	ebx,DWORD [4+edx]
-	mov	esi,DWORD [16+edx]
-	mov	edx,DWORD [20+edx]
-	mov	DWORD [32+esp],eax
-	mov	DWORD [36+esp],ebx
-	mov	DWORD [40+esp],ecx
-	mov	DWORD [44+esp],edi
-	mov	DWORD [48+esp],esi
-	mov	edi,esi
-	mov	esi,eax
-	cmp	edx,0
-	je	NEAR L$029slow_decrypt
-	cmp	ecx,16
-	mov	edx,ebx
-	jb	NEAR L$030slow_enc_tail
-	bt	DWORD [52+esp],25
-	jnc	NEAR L$031slow_enc_x86
-	movq	mm0,[edi]
-	movq	mm4,[8+edi]
-align	16
-L$032slow_enc_loop_sse:
-	pxor	mm0,[esi]
-	pxor	mm4,[8+esi]
-	mov	edi,DWORD [44+esp]
-	call	__sse_AES_encrypt_compact
-	mov	esi,DWORD [32+esp]
-	mov	edi,DWORD [36+esp]
-	mov	ecx,DWORD [40+esp]
-	movq	[edi],mm0
-	movq	[8+edi],mm4
-	lea	esi,[16+esi]
-	mov	DWORD [32+esp],esi
-	lea	edx,[16+edi]
-	mov	DWORD [36+esp],edx
-	sub	ecx,16
-	cmp	ecx,16
-	mov	DWORD [40+esp],ecx
-	jae	NEAR L$032slow_enc_loop_sse
-	test	ecx,15
-	jnz	NEAR L$030slow_enc_tail
-	mov	esi,DWORD [48+esp]
-	movq	[esi],mm0
-	movq	[8+esi],mm4
-	emms
-	mov	esp,DWORD [28+esp]
-	popfd
-	pop	edi
-	pop	esi
-	pop	ebx
-	pop	ebp
-	ret
-	pushfd
-align	16
-L$031slow_enc_x86:
-	mov	eax,DWORD [edi]
-	mov	ebx,DWORD [4+edi]
-align	4
-L$033slow_enc_loop_x86:
-	mov	ecx,DWORD [8+edi]
-	mov	edx,DWORD [12+edi]
-	xor	eax,DWORD [esi]
-	xor	ebx,DWORD [4+esi]
-	xor	ecx,DWORD [8+esi]
-	xor	edx,DWORD [12+esi]
-	mov	edi,DWORD [44+esp]
-	call	__x86_AES_encrypt_compact
-	mov	esi,DWORD [32+esp]
-	mov	edi,DWORD [36+esp]
-	mov	DWORD [edi],eax
-	mov	DWORD [4+edi],ebx
-	mov	DWORD [8+edi],ecx
-	mov	DWORD [12+edi],edx
-	mov	ecx,DWORD [40+esp]
-	lea	esi,[16+esi]
-	mov	DWORD [32+esp],esi
-	lea	edx,[16+edi]
-	mov	DWORD [36+esp],edx
-	sub	ecx,16
-	cmp	ecx,16
-	mov	DWORD [40+esp],ecx
-	jae	NEAR L$033slow_enc_loop_x86
-	test	ecx,15
-	jnz	NEAR L$030slow_enc_tail
-	mov	esi,DWORD [48+esp]
-	mov	ecx,DWORD [8+edi]
-	mov	edx,DWORD [12+edi]
-	mov	DWORD [esi],eax
-	mov	DWORD [4+esi],ebx
-	mov	DWORD [8+esi],ecx
-	mov	DWORD [12+esi],edx
-	mov	esp,DWORD [28+esp]
-	popfd
-	pop	edi
-	pop	esi
-	pop	ebx
-	pop	ebp
-	ret
-	pushfd
-align	16
-L$030slow_enc_tail:
-	emms
-	mov	edi,edx
-	mov	ebx,16
-	sub	ebx,ecx
-	cmp	edi,esi
-	je	NEAR L$034enc_in_place
-align	4
-dd	2767451785
-	jmp	NEAR L$035enc_skip_in_place
-L$034enc_in_place:
-	lea	edi,[ecx*1+edi]
-L$035enc_skip_in_place:
-	mov	ecx,ebx
-	xor	eax,eax
-align	4
-dd	2868115081
-	mov	edi,DWORD [48+esp]
-	mov	esi,edx
-	mov	eax,DWORD [edi]
-	mov	ebx,DWORD [4+edi]
-	mov	DWORD [40+esp],16
-	jmp	NEAR L$033slow_enc_loop_x86
-align	16
-L$029slow_decrypt:
-	bt	DWORD [52+esp],25
-	jnc	NEAR L$036slow_dec_loop_x86
-align	4
-L$037slow_dec_loop_sse:
-	movq	mm0,[esi]
-	movq	mm4,[8+esi]
-	mov	edi,DWORD [44+esp]
-	call	__sse_AES_decrypt_compact
-	mov	esi,DWORD [32+esp]
-	lea	eax,[60+esp]
-	mov	ebx,DWORD [36+esp]
-	mov	ecx,DWORD [40+esp]
-	mov	edi,DWORD [48+esp]
-	movq	mm1,[esi]
-	movq	mm5,[8+esi]
-	pxor	mm0,[edi]
-	pxor	mm4,[8+edi]
-	movq	[edi],mm1
-	movq	[8+edi],mm5
-	sub	ecx,16
-	jc	NEAR L$038slow_dec_partial_sse
-	movq	[ebx],mm0
-	movq	[8+ebx],mm4
-	lea	ebx,[16+ebx]
-	mov	DWORD [36+esp],ebx
-	lea	esi,[16+esi]
-	mov	DWORD [32+esp],esi
-	mov	DWORD [40+esp],ecx
-	jnz	NEAR L$037slow_dec_loop_sse
-	emms
-	mov	esp,DWORD [28+esp]
-	popfd
-	pop	edi
-	pop	esi
-	pop	ebx
-	pop	ebp
-	ret
-	pushfd
-align	16
-L$038slow_dec_partial_sse:
-	movq	[eax],mm0
-	movq	[8+eax],mm4
-	emms
-	add	ecx,16
-	mov	edi,ebx
-	mov	esi,eax
-align	4
-dd	2767451785
-	mov	esp,DWORD [28+esp]
-	popfd
-	pop	edi
-	pop	esi
-	pop	ebx
-	pop	ebp
-	ret
-	pushfd
-align	16
-L$036slow_dec_loop_x86:
-	mov	eax,DWORD [esi]
-	mov	ebx,DWORD [4+esi]
-	mov	ecx,DWORD [8+esi]
-	mov	edx,DWORD [12+esi]
-	lea	edi,[60+esp]
-	mov	DWORD [edi],eax
-	mov	DWORD [4+edi],ebx
-	mov	DWORD [8+edi],ecx
-	mov	DWORD [12+edi],edx
-	mov	edi,DWORD [44+esp]
-	call	__x86_AES_decrypt_compact
-	mov	edi,DWORD [48+esp]
-	mov	esi,DWORD [40+esp]
-	xor	eax,DWORD [edi]
-	xor	ebx,DWORD [4+edi]
-	xor	ecx,DWORD [8+edi]
-	xor	edx,DWORD [12+edi]
-	sub	esi,16
-	jc	NEAR L$039slow_dec_partial_x86
-	mov	DWORD [40+esp],esi
-	mov	esi,DWORD [36+esp]
-	mov	DWORD [esi],eax
-	mov	DWORD [4+esi],ebx
-	mov	DWORD [8+esi],ecx
-	mov	DWORD [12+esi],edx
-	lea	esi,[16+esi]
-	mov	DWORD [36+esp],esi
-	lea	esi,[60+esp]
-	mov	eax,DWORD [esi]
-	mov	ebx,DWORD [4+esi]
-	mov	ecx,DWORD [8+esi]
-	mov	edx,DWORD [12+esi]
-	mov	DWORD [edi],eax
-	mov	DWORD [4+edi],ebx
-	mov	DWORD [8+edi],ecx
-	mov	DWORD [12+edi],edx
-	mov	esi,DWORD [32+esp]
-	lea	esi,[16+esi]
-	mov	DWORD [32+esp],esi
-	jnz	NEAR L$036slow_dec_loop_x86
-	mov	esp,DWORD [28+esp]
-	popfd
-	pop	edi
-	pop	esi
-	pop	ebx
-	pop	ebp
-	ret
-	pushfd
-align	16
-L$039slow_dec_partial_x86:
-	lea	esi,[60+esp]
-	mov	DWORD [esi],eax
-	mov	DWORD [4+esi],ebx
-	mov	DWORD [8+esi],ecx
-	mov	DWORD [12+esi],edx
-	mov	esi,DWORD [32+esp]
-	mov	eax,DWORD [esi]
-	mov	ebx,DWORD [4+esi]
-	mov	ecx,DWORD [8+esi]
-	mov	edx,DWORD [12+esi]
-	mov	DWORD [edi],eax
-	mov	DWORD [4+edi],ebx
-	mov	DWORD [8+edi],ecx
-	mov	DWORD [12+edi],edx
-	mov	ecx,DWORD [40+esp]
-	mov	edi,DWORD [36+esp]
-	lea	esi,[60+esp]
-align	4
-dd	2767451785
-	mov	esp,DWORD [28+esp]
-	popfd
-	pop	edi
-	pop	esi
-	pop	ebx
-	pop	ebp
-	ret
-align	16
-__x86_AES_set_encrypt_key:
-	push	ebp
-	push	ebx
-	push	esi
-	push	edi
-	mov	esi,DWORD [24+esp]
-	mov	edi,DWORD [32+esp]
-	test	esi,-1
-	jz	NEAR L$040badpointer
-	test	edi,-1
-	jz	NEAR L$040badpointer
-	call	L$041pic_point
-L$041pic_point:
-	pop	ebp
-	lea	ebp,[(L$AES_Te-L$041pic_point)+ebp]
-	lea	ebp,[2176+ebp]
-	mov	eax,DWORD [ebp-128]
-	mov	ebx,DWORD [ebp-96]
-	mov	ecx,DWORD [ebp-64]
-	mov	edx,DWORD [ebp-32]
-	mov	eax,DWORD [ebp]
-	mov	ebx,DWORD [32+ebp]
-	mov	ecx,DWORD [64+ebp]
-	mov	edx,DWORD [96+ebp]
-	mov	ecx,DWORD [28+esp]
-	cmp	ecx,128
-	je	NEAR L$04210rounds
-	cmp	ecx,192
-	je	NEAR L$04312rounds
-	cmp	ecx,256
-	je	NEAR L$04414rounds
-	mov	eax,-2
-	jmp	NEAR L$045exit
-L$04210rounds:
-	mov	eax,DWORD [esi]
-	mov	ebx,DWORD [4+esi]
-	mov	ecx,DWORD [8+esi]
-	mov	edx,DWORD [12+esi]
-	mov	DWORD [edi],eax
-	mov	DWORD [4+edi],ebx
-	mov	DWORD [8+edi],ecx
-	mov	DWORD [12+edi],edx
-	xor	ecx,ecx
-	jmp	NEAR L$04610shortcut
-align	4
-L$04710loop:
-	mov	eax,DWORD [edi]
-	mov	edx,DWORD [12+edi]
-L$04610shortcut:
-	movzx	esi,dl
-	movzx	ebx,BYTE [esi*1+ebp-128]
-	movzx	esi,dh
-	shl	ebx,24
-	xor	eax,ebx
-	movzx	ebx,BYTE [esi*1+ebp-128]
-	shr	edx,16
-	movzx	esi,dl
-	xor	eax,ebx
-	movzx	ebx,BYTE [esi*1+ebp-128]
-	movzx	esi,dh
-	shl	ebx,8
-	xor	eax,ebx
-	movzx	ebx,BYTE [esi*1+ebp-128]
-	shl	ebx,16
-	xor	eax,ebx
-	xor	eax,DWORD [896+ecx*4+ebp]
-	mov	DWORD [16+edi],eax
-	xor	eax,DWORD [4+edi]
-	mov	DWORD [20+edi],eax
-	xor	eax,DWORD [8+edi]
-	mov	DWORD [24+edi],eax
-	xor	eax,DWORD [12+edi]
-	mov	DWORD [28+edi],eax
-	inc	ecx
-	add	edi,16
-	cmp	ecx,10
-	jl	NEAR L$04710loop
-	mov	DWORD [80+edi],10
-	xor	eax,eax
-	jmp	NEAR L$045exit
-L$04312rounds:
-	mov	eax,DWORD [esi]
-	mov	ebx,DWORD [4+esi]
-	mov	ecx,DWORD [8+esi]
-	mov	edx,DWORD [12+esi]
-	mov	DWORD [edi],eax
-	mov	DWORD [4+edi],ebx
-	mov	DWORD [8+edi],ecx
-	mov	DWORD [12+edi],edx
-	mov	ecx,DWORD [16+esi]
-	mov	edx,DWORD [20+esi]
-	mov	DWORD [16+edi],ecx
-	mov	DWORD [20+edi],edx
-	xor	ecx,ecx
-	jmp	NEAR L$04812shortcut
-align	4
-L$04912loop:
-	mov	eax,DWORD [edi]
-	mov	edx,DWORD [20+edi]
-L$04812shortcut:
-	movzx	esi,dl
-	movzx	ebx,BYTE [esi*1+ebp-128]
-	movzx	esi,dh
-	shl	ebx,24
-	xor	eax,ebx
-	movzx	ebx,BYTE [esi*1+ebp-128]
-	shr	edx,16
-	movzx	esi,dl
-	xor	eax,ebx
-	movzx	ebx,BYTE [esi*1+ebp-128]
-	movzx	esi,dh
-	shl	ebx,8
-	xor	eax,ebx
-	movzx	ebx,BYTE [esi*1+ebp-128]
-	shl	ebx,16
-	xor	eax,ebx
-	xor	eax,DWORD [896+ecx*4+ebp]
-	mov	DWORD [24+edi],eax
-	xor	eax,DWORD [4+edi]
-	mov	DWORD [28+edi],eax
-	xor	eax,DWORD [8+edi]
-	mov	DWORD [32+edi],eax
-	xor	eax,DWORD [12+edi]
-	mov	DWORD [36+edi],eax
-	cmp	ecx,7
-	je	NEAR L$05012break
-	inc	ecx
-	xor	eax,DWORD [16+edi]
-	mov	DWORD [40+edi],eax
-	xor	eax,DWORD [20+edi]
-	mov	DWORD [44+edi],eax
-	add	edi,24
-	jmp	NEAR L$04912loop
-L$05012break:
-	mov	DWORD [72+edi],12
-	xor	eax,eax
-	jmp	NEAR L$045exit
-L$04414rounds:
-	mov	eax,DWORD [esi]
-	mov	ebx,DWORD [4+esi]
-	mov	ecx,DWORD [8+esi]
-	mov	edx,DWORD [12+esi]
-	mov	DWORD [edi],eax
-	mov	DWORD [4+edi],ebx
-	mov	DWORD [8+edi],ecx
-	mov	DWORD [12+edi],edx
-	mov	eax,DWORD [16+esi]
-	mov	ebx,DWORD [20+esi]
-	mov	ecx,DWORD [24+esi]
-	mov	edx,DWORD [28+esi]
-	mov	DWORD [16+edi],eax
-	mov	DWORD [20+edi],ebx
-	mov	DWORD [24+edi],ecx
-	mov	DWORD [28+edi],edx
-	xor	ecx,ecx
-	jmp	NEAR L$05114shortcut
-align	4
-L$05214loop:
-	mov	edx,DWORD [28+edi]
-L$05114shortcut:
-	mov	eax,DWORD [edi]
-	movzx	esi,dl
-	movzx	ebx,BYTE [esi*1+ebp-128]
-	movzx	esi,dh
-	shl	ebx,24
-	xor	eax,ebx
-	movzx	ebx,BYTE [esi*1+ebp-128]
-	shr	edx,16
-	movzx	esi,dl
-	xor	eax,ebx
-	movzx	ebx,BYTE [esi*1+ebp-128]
-	movzx	esi,dh
-	shl	ebx,8
-	xor	eax,ebx
-	movzx	ebx,BYTE [esi*1+ebp-128]
-	shl	ebx,16
-	xor	eax,ebx
-	xor	eax,DWORD [896+ecx*4+ebp]
-	mov	DWORD [32+edi],eax
-	xor	eax,DWORD [4+edi]
-	mov	DWORD [36+edi],eax
-	xor	eax,DWORD [8+edi]
-	mov	DWORD [40+edi],eax
-	xor	eax,DWORD [12+edi]
-	mov	DWORD [44+edi],eax
-	cmp	ecx,6
-	je	NEAR L$05314break
-	inc	ecx
-	mov	edx,eax
-	mov	eax,DWORD [16+edi]
-	movzx	esi,dl
-	movzx	ebx,BYTE [esi*1+ebp-128]
-	movzx	esi,dh
-	xor	eax,ebx
-	movzx	ebx,BYTE [esi*1+ebp-128]
-	shr	edx,16
-	shl	ebx,8
-	movzx	esi,dl
-	xor	eax,ebx
-	movzx	ebx,BYTE [esi*1+ebp-128]
-	movzx	esi,dh
-	shl	ebx,16
-	xor	eax,ebx
-	movzx	ebx,BYTE [esi*1+ebp-128]
-	shl	ebx,24
-	xor	eax,ebx
-	mov	DWORD [48+edi],eax
-	xor	eax,DWORD [20+edi]
-	mov	DWORD [52+edi],eax
-	xor	eax,DWORD [24+edi]
-	mov	DWORD [56+edi],eax
-	xor	eax,DWORD [28+edi]
-	mov	DWORD [60+edi],eax
-	add	edi,32
-	jmp	NEAR L$05214loop
-L$05314break:
-	mov	DWORD [48+edi],14
-	xor	eax,eax
-	jmp	NEAR L$045exit
-L$040badpointer:
-	mov	eax,-1
-L$045exit:
-	pop	edi
-	pop	esi
-	pop	ebx
-	pop	ebp
-	ret
-global	_AES_set_encrypt_key
-align	16
-_AES_set_encrypt_key:
-L$_AES_set_encrypt_key_begin:
-	call	__x86_AES_set_encrypt_key
-	ret
-global	_AES_set_decrypt_key
-align	16
-_AES_set_decrypt_key:
-L$_AES_set_decrypt_key_begin:
-	call	__x86_AES_set_encrypt_key
-	cmp	eax,0
-	je	NEAR L$054proceed
-	ret
-L$054proceed:
-	push	ebp
-	push	ebx
-	push	esi
-	push	edi
-	mov	esi,DWORD [28+esp]
-	mov	ecx,DWORD [240+esi]
-	lea	ecx,[ecx*4]
-	lea	edi,[ecx*4+esi]
-align	4
-L$055invert:
-	mov	eax,DWORD [esi]
-	mov	ebx,DWORD [4+esi]
-	mov	ecx,DWORD [edi]
-	mov	edx,DWORD [4+edi]
-	mov	DWORD [edi],eax
-	mov	DWORD [4+edi],ebx
-	mov	DWORD [esi],ecx
-	mov	DWORD [4+esi],edx
-	mov	eax,DWORD [8+esi]
-	mov	ebx,DWORD [12+esi]
-	mov	ecx,DWORD [8+edi]
-	mov	edx,DWORD [12+edi]
-	mov	DWORD [8+edi],eax
-	mov	DWORD [12+edi],ebx
-	mov	DWORD [8+esi],ecx
-	mov	DWORD [12+esi],edx
-	add	esi,16
-	sub	edi,16
-	cmp	esi,edi
-	jne	NEAR L$055invert
-	mov	edi,DWORD [28+esp]
-	mov	esi,DWORD [240+edi]
-	lea	esi,[esi*1+esi-2]
-	lea	esi,[esi*8+edi]
-	mov	DWORD [28+esp],esi
-	mov	eax,DWORD [16+edi]
-align	4
-L$056permute:
-	add	edi,16
-	mov	ebp,2155905152
-	and	ebp,eax
-	lea	ebx,[eax*1+eax]
-	mov	esi,ebp
-	shr	ebp,7
-	sub	esi,ebp
-	and	ebx,4278124286
-	and	esi,454761243
-	xor	ebx,esi
-	mov	ebp,2155905152
-	and	ebp,ebx
-	lea	ecx,[ebx*1+ebx]
-	mov	esi,ebp
-	shr	ebp,7
-	sub	esi,ebp
-	and	ecx,4278124286
-	and	esi,454761243
-	xor	ebx,eax
-	xor	ecx,esi
-	mov	ebp,2155905152
-	and	ebp,ecx
-	lea	edx,[ecx*1+ecx]
-	mov	esi,ebp
-	shr	ebp,7
-	xor	ecx,eax
-	sub	esi,ebp
-	and	edx,4278124286
-	and	esi,454761243
-	rol	eax,8
-	xor	edx,esi
-	mov	ebp,DWORD [4+edi]
-	xor	eax,ebx
-	xor	ebx,edx
-	xor	eax,ecx
-	rol	ebx,24
-	xor	ecx,edx
-	xor	eax,edx
-	rol	ecx,16
-	xor	eax,ebx
-	rol	edx,8
-	xor	eax,ecx
-	mov	ebx,ebp
-	xor	eax,edx
-	mov	DWORD [edi],eax
-	mov	ebp,2155905152
-	and	ebp,ebx
-	lea	ecx,[ebx*1+ebx]
-	mov	esi,ebp
-	shr	ebp,7
-	sub	esi,ebp
-	and	ecx,4278124286
-	and	esi,454761243
-	xor	ecx,esi
-	mov	ebp,2155905152
-	and	ebp,ecx
-	lea	edx,[ecx*1+ecx]
-	mov	esi,ebp
-	shr	ebp,7
-	sub	esi,ebp
-	and	edx,4278124286
-	and	esi,454761243
-	xor	ecx,ebx
-	xor	edx,esi
-	mov	ebp,2155905152
-	and	ebp,edx
-	lea	eax,[edx*1+edx]
-	mov	esi,ebp
-	shr	ebp,7
-	xor	edx,ebx
-	sub	esi,ebp
-	and	eax,4278124286
-	and	esi,454761243
-	rol	ebx,8
-	xor	eax,esi
-	mov	ebp,DWORD [8+edi]
-	xor	ebx,ecx
-	xor	ecx,eax
-	xor	ebx,edx
-	rol	ecx,24
-	xor	edx,eax
-	xor	ebx,eax
-	rol	edx,16
-	xor	ebx,ecx
-	rol	eax,8
-	xor	ebx,edx
-	mov	ecx,ebp
-	xor	ebx,eax
-	mov	DWORD [4+edi],ebx
-	mov	ebp,2155905152
-	and	ebp,ecx
-	lea	edx,[ecx*1+ecx]
-	mov	esi,ebp
-	shr	ebp,7
-	sub	esi,ebp
-	and	edx,4278124286
-	and	esi,454761243
-	xor	edx,esi
-	mov	ebp,2155905152
-	and	ebp,edx
-	lea	eax,[edx*1+edx]
-	mov	esi,ebp
-	shr	ebp,7
-	sub	esi,ebp
-	and	eax,4278124286
-	and	esi,454761243
-	xor	edx,ecx
-	xor	eax,esi
-	mov	ebp,2155905152
-	and	ebp,eax
-	lea	ebx,[eax*1+eax]
-	mov	esi,ebp
-	shr	ebp,7
-	xor	eax,ecx
-	sub	esi,ebp
-	and	ebx,4278124286
-	and	esi,454761243
-	rol	ecx,8
-	xor	ebx,esi
-	mov	ebp,DWORD [12+edi]
-	xor	ecx,edx
-	xor	edx,ebx
-	xor	ecx,eax
-	rol	edx,24
-	xor	eax,ebx
-	xor	ecx,ebx
-	rol	eax,16
-	xor	ecx,edx
-	rol	ebx,8
-	xor	ecx,eax
-	mov	edx,ebp
-	xor	ecx,ebx
-	mov	DWORD [8+edi],ecx
-	mov	ebp,2155905152
-	and	ebp,edx
-	lea	eax,[edx*1+edx]
-	mov	esi,ebp
-	shr	ebp,7
-	sub	esi,ebp
-	and	eax,4278124286
-	and	esi,454761243
-	xor	eax,esi
-	mov	ebp,2155905152
-	and	ebp,eax
-	lea	ebx,[eax*1+eax]
-	mov	esi,ebp
-	shr	ebp,7
-	sub	esi,ebp
-	and	ebx,4278124286
-	and	esi,454761243
-	xor	eax,edx
-	xor	ebx,esi
-	mov	ebp,2155905152
-	and	ebp,ebx
-	lea	ecx,[ebx*1+ebx]
-	mov	esi,ebp
-	shr	ebp,7
-	xor	ebx,edx
-	sub	esi,ebp
-	and	ecx,4278124286
-	and	esi,454761243
-	rol	edx,8
-	xor	ecx,esi
-	mov	ebp,DWORD [16+edi]
-	xor	edx,eax
-	xor	eax,ecx
-	xor	edx,ebx
-	rol	eax,24
-	xor	ebx,ecx
-	xor	edx,ecx
-	rol	ebx,16
-	xor	edx,eax
-	rol	ecx,8
-	xor	edx,ebx
-	mov	eax,ebp
-	xor	edx,ecx
-	mov	DWORD [12+edi],edx
-	cmp	edi,DWORD [28+esp]
-	jb	NEAR L$056permute
-	xor	eax,eax
-	pop	edi
-	pop	esi
-	pop	ebx
-	pop	ebp
-	ret
-db	65,69,83,32,102,111,114,32,120,56,54,44,32,67,82,89
-db	80,84,79,71,65,77,83,32,98,121,32,60,97,112,112,114
-db	111,64,111,112,101,110,115,115,108,46,111,114,103,62,0
-segment	.bss
-common	_OPENSSL_ia32cap_P 16
diff --git a/deps/openssl/config/archs/VC-WIN32/asm/crypto/buildinf.h b/deps/openssl/config/archs/VC-WIN32/asm/crypto/buildinf.h
index b0dfdc7a56..a0e422963d 100644
--- a/deps/openssl/config/archs/VC-WIN32/asm/crypto/buildinf.h
+++ b/deps/openssl/config/archs/VC-WIN32/asm/crypto/buildinf.h
@@ -11,7 +11,7 @@
  */
 
 #define PLATFORM "platform: "
-#define DATE "built on: Fri Sep 13 16:03:33 2019 UTC"
+#define DATE "built on: Wed Mar 18 21:11:00 2020 UTC"
 
 /*
  * Generate compiler_flags as an array of individual characters. This is a
diff --git a/deps/openssl/config/archs/VC-WIN32/asm/crypto/ec/ecp_nistz256-x86.asm b/deps/openssl/config/archs/VC-WIN32/asm/crypto/ec/ecp_nistz256-x86.asm
index 7383523877..96071a300e 100644
--- a/deps/openssl/config/archs/VC-WIN32/asm/crypto/ec/ecp_nistz256-x86.asm
+++ b/deps/openssl/config/archs/VC-WIN32/asm/crypto/ec/ecp_nistz256-x86.asm
@@ -4386,19 +4386,15 @@ L$009pic:
 	or	eax,DWORD [4+edi]
 	or	eax,DWORD [8+edi]
 	or	eax,DWORD [12+edi]
+	mov	ebx,DWORD [576+esp]
+	not	ebx
+	or	eax,ebx
+	mov	ebx,DWORD [580+esp]
+	not	ebx
+	or	eax,ebx
+	or	eax,DWORD [584+esp]
 db	62
 	jnz	NEAR L$010add_proceed
-	mov	eax,DWORD [576+esp]
-	and	eax,DWORD [580+esp]
-	mov	ebx,DWORD [584+esp]
-	jz	NEAR L$010add_proceed
-	test	ebx,ebx
-	jz	NEAR L$011add_double
-	mov	edi,DWORD [616+esp]
-	xor	eax,eax
-	mov	ecx,24
-db	252,243,171
-	jmp	NEAR L$012add_done
 align	16
 L$011add_double:
 	mov	esi,DWORD [620+esp]
diff --git a/deps/openssl/config/archs/VC-WIN32/asm/crypto/include/internal/bn_conf.h b/deps/openssl/config/archs/VC-WIN32/asm/crypto/include/internal/bn_conf.h
index ce324699ae..2242cd2fc0 100644
--- a/deps/openssl/config/archs/VC-WIN32/asm/crypto/include/internal/bn_conf.h
+++ b/deps/openssl/config/archs/VC-WIN32/asm/crypto/include/internal/bn_conf.h
@@ -1,5 +1,5 @@
 /* WARNING: do not edit! */
-/* Generated by makefile from crypto/include/internal/bn_conf.h.in */
+/* Generated by makefile from include/crypto/bn_conf.h.in */
 /*
  * Copyright 2016 The OpenSSL Project Authors. All Rights Reserved.
  *
@@ -9,8 +9,8 @@
  * https://www.openssl.org/source/license.html
  */
 
-#ifndef HEADER_BN_CONF_H
-# define HEADER_BN_CONF_H
+#ifndef OSSL_CRYPTO_BN_CONF_H
+# define OSSL_CRYPTO_BN_CONF_H
 
 /*
  * The contents of this file are not used in the UEFI build, as
diff --git a/deps/openssl/config/archs/VC-WIN32/asm/crypto/include/internal/dso_conf.h b/deps/openssl/config/archs/VC-WIN32/asm/crypto/include/internal/dso_conf.h
index c3b41df01e..0c96ce7363 100644
--- a/deps/openssl/config/archs/VC-WIN32/asm/crypto/include/internal/dso_conf.h
+++ b/deps/openssl/config/archs/VC-WIN32/asm/crypto/include/internal/dso_conf.h
@@ -1,5 +1,5 @@
 /* WARNING: do not edit! */
-/* Generated by makefile from crypto/include/internal/dso_conf.h.in */
+/* Generated by makefile from include/crypto/dso_conf.h.in */
 /*
  * Copyright 2016-2019 The OpenSSL Project Authors. All Rights Reserved.
  *
@@ -9,8 +9,8 @@
  * https://www.openssl.org/source/license.html
  */
 
-#ifndef HEADER_DSO_CONF_H
-# define HEADER_DSO_CONF_H
+#ifndef OSSL_CRYPTO_DSO_CONF_H
+# define OSSL_CRYPTO_DSO_CONF_H
 # define DSO_WIN32
 # define DSO_EXTENSION ".dll"
 #endif
diff --git a/deps/openssl/config/archs/VC-WIN32/asm/include/openssl/opensslconf.h b/deps/openssl/config/archs/VC-WIN32/asm/include/openssl/opensslconf.h
index e0b784dfe0..8fb667373a 100644
--- a/deps/openssl/config/archs/VC-WIN32/asm/include/openssl/opensslconf.h
+++ b/deps/openssl/config/archs/VC-WIN32/asm/include/openssl/opensslconf.h
@@ -99,9 +99,6 @@ extern "C" {
 #ifndef OPENSSL_NO_DYNAMIC_ENGINE
 # define OPENSSL_NO_DYNAMIC_ENGINE
 #endif
-#ifndef OPENSSL_NO_AFALGENG
-# define OPENSSL_NO_AFALGENG
-#endif
 
 
 /*
diff --git a/deps/openssl/config/archs/VC-WIN32/asm/include/progs.h b/deps/openssl/config/archs/VC-WIN32/asm/include/progs.h
index 9b3d270e20..308c65601b 100644
--- a/deps/openssl/config/archs/VC-WIN32/asm/include/progs.h
+++ b/deps/openssl/config/archs/VC-WIN32/asm/include/progs.h
@@ -2,7 +2,7 @@
  * WARNING: do not edit!
  * Generated by apps/progs.pl
  *
- * Copyright 1995-2019 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 1995-2020 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
diff --git a/deps/openssl/config/archs/VC-WIN32/asm/openssl-cl.gypi b/deps/openssl/config/archs/VC-WIN32/asm/openssl-cl.gypi
index 5028da71f3..f15a17c0be 100644
--- a/deps/openssl/config/archs/VC-WIN32/asm/openssl-cl.gypi
+++ b/deps/openssl/config/archs/VC-WIN32/asm/openssl-cl.gypi
@@ -20,6 +20,7 @@
       'RC4_ASM',
       'MD5_ASM',
       'RMD160_ASM',
+      'AESNI_ASM',
       'VPAES_ASM',
       'WHIRLPOOL_ASM',
       'GHASH_ASM',
@@ -28,9 +29,9 @@
     ],
     'openssl_cflags_VC-WIN32': [
       '-Wa,--noexecstack',
-      '/W3 /wd4090 /nologo /O2 /WX',
+      '/W3 /wd4090 /nologo /O2',
       '/Gs0 /GF /Gy',
-      '/W3 /wd4090 /nologo /O2 /WX',
+      '/W3 /wd4090 /nologo /O2',
     ],
     'openssl_ex_libs_VC-WIN32': [
       'ws2_32.lib gdi32.lib advapi32.lib crypt32.lib user32.lib',
diff --git a/deps/openssl/config/archs/VC-WIN32/asm/openssl.gypi b/deps/openssl/config/archs/VC-WIN32/asm/openssl.gypi
index a718f985ec..4b319c319a 100644
--- a/deps/openssl/config/archs/VC-WIN32/asm/openssl.gypi
+++ b/deps/openssl/config/archs/VC-WIN32/asm/openssl.gypi
@@ -717,6 +717,7 @@
       'RC4_ASM',
       'MD5_ASM',
       'RMD160_ASM',
+      'AESNI_ASM',
       'VPAES_ASM',
       'WHIRLPOOL_ASM',
       'GHASH_ASM',
@@ -725,9 +726,9 @@
     ],
     'openssl_cflags_VC-WIN32': [
       '-Wa,--noexecstack',
-      '/W3 /wd4090 /nologo /O2 /WX',
+      '/W3 /wd4090 /nologo /O2',
       '/Gs0 /GF /Gy',
-      '/W3 /wd4090 /nologo /O2 /WX',
+      '/W3 /wd4090 /nologo /O2',
     ],
     'openssl_ex_libs_VC-WIN32': [
       'ws2_32.lib gdi32.lib advapi32.lib crypt32.lib user32.lib',
diff --git a/deps/openssl/config/archs/VC-WIN32/asm_avx2/configdata.pm b/deps/openssl/config/archs/VC-WIN32/asm_avx2/configdata.pm
index f0ae44934c..14713dbff0 100644
--- a/deps/openssl/config/archs/VC-WIN32/asm_avx2/configdata.pm
+++ b/deps/openssl/config/archs/VC-WIN32/asm_avx2/configdata.pm
@@ -15,7 +15,7 @@ our %config = (
   ARFLAGS => [ "/nologo" ],
   AS => "nasm",
   CC => "../config/fake_gcc.pl",
-  CFLAGS => [ "/W3 /wd4090 /nologo /O2 /WX" ],
+  CFLAGS => [ "/W3 /wd4090 /nologo /O2" ],
   CPP => "\$(CC) /EP /C",
   CPPDEFINES => [  ],
   CPPFLAGS => [  ],
@@ -53,13 +53,13 @@ our %config = (
   export_var_as_fn => "1",
   includes => [  ],
   lflags => [  ],
-  lib_defines => [ "OPENSSL_PIC", "OPENSSL_CPUID_OBJ", "OPENSSL_BN_ASM_PART_WORDS", "OPENSSL_IA32_SSE2", "OPENSSL_BN_ASM_MONT", "OPENSSL_BN_ASM_GF2m", "SHA1_ASM", "SHA256_ASM", "SHA512_ASM", "RC4_ASM", "MD5_ASM", "RMD160_ASM", "VPAES_ASM", "WHIRLPOOL_ASM", "GHASH_ASM", "ECP_NISTZ256_ASM", "POLY1305_ASM" ],
+  lib_defines => [ "OPENSSL_PIC", "OPENSSL_CPUID_OBJ", "OPENSSL_BN_ASM_PART_WORDS", "OPENSSL_IA32_SSE2", "OPENSSL_BN_ASM_MONT", "OPENSSL_BN_ASM_GF2m", "SHA1_ASM", "SHA256_ASM", "SHA512_ASM", "RC4_ASM", "MD5_ASM", "RMD160_ASM", "AESNI_ASM", "VPAES_ASM", "WHIRLPOOL_ASM", "GHASH_ASM", "ECP_NISTZ256_ASM", "POLY1305_ASM" ],
   libdir => "",
   major => "1",
   minor => "1.1",
   openssl_algorithm_defines => [ "OPENSSL_NO_COMP", "OPENSSL_NO_MD2", "OPENSSL_NO_RC5" ],
   openssl_api_defines => [  ],
-  openssl_other_defines => [ "OPENSSL_RAND_SEED_OS", "OPENSSL_NO_AFALGENG", "OPENSSL_NO_ASAN", "OPENSSL_NO_CRYPTO_MDEBUG", "OPENSSL_NO_CRYPTO_MDEBUG_BACKTRACE", "OPENSSL_NO_DEVCRYPTOENG", "OPENSSL_NO_EC_NISTP_64_GCC_128", "OPENSSL_NO_EGD", "OPENSSL_NO_EXTERNAL_TESTS", "OPENSSL_NO_FUZZ_AFL", "OPENSSL_NO_FUZZ_LIBFUZZER", "OPENSSL_NO_HEARTBEATS", "OPENSSL_NO_MSAN", "OPENSSL_NO_SCTP", "OPENSSL_NO_SSL3", "OPENSSL_NO_SSL3_METHOD", "OPENSSL_NO_UBSAN", "OPENSSL_NO_UNIT_TEST", "OPENSSL_NO_WEAK_SSL_CIPHERS", "OPENSSL_NO_DYNAMIC_ENGINE", "OPENSSL_NO_AFALGENG" ],
+  openssl_other_defines => [ "OPENSSL_RAND_SEED_OS", "OPENSSL_NO_AFALGENG", "OPENSSL_NO_ASAN", "OPENSSL_NO_CRYPTO_MDEBUG", "OPENSSL_NO_CRYPTO_MDEBUG_BACKTRACE", "OPENSSL_NO_DEVCRYPTOENG", "OPENSSL_NO_EC_NISTP_64_GCC_128", "OPENSSL_NO_EGD", "OPENSSL_NO_EXTERNAL_TESTS", "OPENSSL_NO_FUZZ_AFL", "OPENSSL_NO_FUZZ_LIBFUZZER", "OPENSSL_NO_HEARTBEATS", "OPENSSL_NO_MSAN", "OPENSSL_NO_SCTP", "OPENSSL_NO_SSL3", "OPENSSL_NO_SSL3_METHOD", "OPENSSL_NO_UBSAN", "OPENSSL_NO_UNIT_TEST", "OPENSSL_NO_WEAK_SSL_CIPHERS", "OPENSSL_NO_DYNAMIC_ENGINE" ],
   openssl_sys_defines => [ "OPENSSL_SYS_WIN32" ],
   openssl_thread_defines => [ "OPENSSL_THREADS" ],
   openssldir => "",
@@ -115,8 +115,8 @@ our %config = (
   sourcedir => ".",
   target => "VC-WIN32",
   tdirs => [ "ossl_shim" ],
-  version => "1.1.1d",
-  version_num => "0x1010104fL",
+  version => "1.1.1e",
+  version_num => "0x1010105fL",
 );
 
 our %target = (
@@ -125,14 +125,14 @@ our %target = (
   AS => "nasm",
   ASFLAGS => "",
   CC => "cl",
-  CFLAGS => "/W3 /wd4090 /nologo /O2 /WX",
+  CFLAGS => "/W3 /wd4090 /nologo /O2",
   CPP => "\$(CC) /EP /C",
   HASHBANGPERL => "/usr/bin/env perl",
   LD => "link",
   LDFLAGS => "/nologo /debug",
   MT => "mt",
   MTFLAGS => "-nologo",
-  RANLIB => "CODE(0x55a934dbe798)",
+  RANLIB => "CODE(0x56041fcde128)",
   RC => "rc",
   _conf_fname_int => [ "Configurations/00-base-templates.conf", "Configurations/00-base-templates.conf", "Configurations/10-main.conf", "Configurations/10-main.conf", "Configurations/00-base-templates.conf", "Configurations/10-main.conf", "Configurations/shared-info.pl" ],
   aes_asm_src => "aes_core.c aes_cbc.c vpaes-x86.s aesni-x86.s",
@@ -257,6 +257,7 @@ our @disablables = (
   "dgram",
   "dh",
   "dsa",
+  "dso",
   "dtls",
   "dynamic-engine",
   "ec",
@@ -374,8 +375,8 @@ our %unified_info = (
         {
             "" =>
                 [
-                    "crypto/include/internal/bn_conf.h",
-                    "crypto/include/internal/dso_conf.h",
+                    "include/crypto/bn_conf.h",
+                    "include/crypto/dso_conf.h",
                     "include/openssl/opensslconf.h",
                 ],
             "apps/asn1pars.o" =>
@@ -643,14 +644,6 @@ our %unified_info = (
                     "crypto/perlasm/cbc.pl",
                     "crypto/perlasm/x86asm.pl",
                 ],
-            "crypto/include/internal/bn_conf.h" =>
-                [
-                    "configdata.pm",
-                ],
-            "crypto/include/internal/dso_conf.h" =>
-                [
-                    "configdata.pm",
-                ],
             "crypto/rc4/rc4-586.s" =>
                 [
                     "crypto/perlasm/x86asm.pl",
@@ -726,6 +719,14 @@ our %unified_info = (
                 [
                     "libcrypto",
                 ],
+            "include/crypto/bn_conf.h" =>
+                [
+                    "configdata.pm",
+                ],
+            "include/crypto/dso_conf.h" =>
+                [
+                    "configdata.pm",
+                ],
             "include/openssl/opensslconf.h" =>
                 [
                     "configdata.pm",
@@ -1523,6 +1524,12 @@ our %unified_info = (
                     "libcrypto",
                     "test/libtestutil.a",
                 ],
+            "test/ssl_ctx_test" =>
+                [
+                    "libcrypto",
+                    "libssl",
+                    "test/libtestutil.a",
+                ],
             "test/ssl_test" =>
                 [
                     "libcrypto",
@@ -3254,7 +3261,6 @@ our %unified_info = (
                             "test/testutil/cb.o",
                             "test/testutil/driver.o",
                             "test/testutil/format_output.o",
-                            "test/testutil/init.o",
                             "test/testutil/main.o",
                             "test/testutil/output_helpers.o",
                             "test/testutil/random.o",
@@ -3262,6 +3268,7 @@ our %unified_info = (
                             "test/testutil/tap_bio.o",
                             "test/testutil/test_cleanup.o",
                             "test/testutil/tests.o",
+                            "test/testutil/testutil_init.o",
                         ],
                     "products" =>
                         {
@@ -3755,14 +3762,6 @@ our %unified_info = (
                 [
                     "crypto/ia64cpuid.S",
                 ],
-            "crypto/include/internal/bn_conf.h" =>
-                [
-                    "crypto/include/internal/bn_conf.h.in",
-                ],
-            "crypto/include/internal/dso_conf.h" =>
-                [
-                    "crypto/include/internal/dso_conf.h.in",
-                ],
             "crypto/md5/md5-586.s" =>
                 [
                     "crypto/md5/asm/md5-586.pl",
@@ -4203,6 +4202,14 @@ our %unified_info = (
                     "engines/asm/e_padlock-x86_64.pl",
                     "\$(PERLASM_SCHEME)",
                 ],
+            "include/crypto/bn_conf.h" =>
+                [
+                    "include/crypto/bn_conf.h.in",
+                ],
+            "include/crypto/dso_conf.h" =>
+                [
+                    "include/crypto/dso_conf.h.in",
+                ],
             "include/openssl/opensslconf.h" =>
                 [
                     "include/openssl/opensslconf.h.in",
@@ -4912,49 +4919,41 @@ our %unified_info = (
             "crypto/aes/aes_cbc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/aes/aes_cfb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/aes/aes_core.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/aes/aes_ecb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/aes/aes_ige.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/aes/aes_misc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/aes/aes_ofb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/aes/aes_wrap.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/aes/aesfx-sparcv9.o" =>
@@ -4964,7 +4963,6 @@ our %unified_info = (
             "crypto/aes/aesni-x86.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/aes/aest4-sparcv9.o" =>
@@ -4982,13 +4980,11 @@ our %unified_info = (
             "crypto/aes/vpaes-x86.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/aria/aria.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/arm64cpuid.o" =>
@@ -5002,613 +4998,511 @@ our %unified_info = (
             "crypto/asn1/a_bitstr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_d2i_fp.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_digest.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_dup.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_gentm.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_i2d_fp.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_int.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_mbstr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_object.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_octet.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_print.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_sign.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_strex.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_strnid.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_time.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_type.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_utctm.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_utf8.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_verify.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/ameth_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/asn1_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/asn1_gen.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/asn1_item_list.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/asn1_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/asn1_par.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/asn_mime.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/asn_moid.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/asn_mstbl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/asn_pack.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/bio_asn1.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/bio_ndef.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/d2i_pr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/d2i_pu.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/evp_asn1.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/f_int.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/f_string.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/i2d_pr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/i2d_pu.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/n_pkey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/nsseq.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/p5_pbe.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/p5_pbev2.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/p5_scrypt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/p8_pkey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/t_bitst.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/t_pkey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/t_spki.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/tasn_dec.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/tasn_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/tasn_fre.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/tasn_new.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/tasn_prn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/tasn_scn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/tasn_typ.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/tasn_utl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/x_algor.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/x_bignum.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/x_info.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/x_int64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/x_long.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/x_pkey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/x_sig.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/x_spki.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/x_val.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/async/arch/async_null.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/async/arch/async_posix.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/async/arch/async_win.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/async/async.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/async/async_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/async/async_wait.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bf/bf-586.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bf/bf_cfb64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bf/bf_ecb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bf/bf_ofb64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bf/bf_skey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/b_addr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/b_dump.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/b_print.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/b_sock.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/b_sock2.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bf_buff.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bf_lbuf.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bf_nbio.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bf_null.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bio_cb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bio_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bio_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bio_meth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bss_acpt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bss_bio.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bss_conn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bss_dgram.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bss_fd.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bss_file.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bss_log.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bss_mem.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bss_null.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bss_sock.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/blake2/blake2b.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/blake2/blake2s.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/blake2/m_blake2b.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/blake2/m_blake2s.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/armv4-gf2m.o" =>
@@ -5622,7 +5516,6 @@ our %unified_info = (
             "crypto/bn/bn-586.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn-mips.o" =>
@@ -5632,188 +5525,157 @@ our %unified_info = (
             "crypto/bn/bn_add.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_blind.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_const.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_ctx.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_depr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_dh.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_div.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_exp.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto",
                 ],
             "crypto/bn/bn_exp2.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_gcd.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_gf2m.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_intern.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_kron.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_mod.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_mont.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_mpi.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_mul.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_nist.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_prime.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_print.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_rand.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_recp.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_shift.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_sqr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_sqrt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_srp.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_word.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_x931p.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/co-586.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/mips-mont.o" =>
@@ -5843,25 +5705,21 @@ our %unified_info = (
             "crypto/bn/x86-gf2m.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/x86-mont.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/buffer/buf_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/buffer/buffer.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/buildinf.h" =>
@@ -5871,31 +5729,26 @@ our %unified_info = (
             "crypto/camellia/cmll-x86.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/camellia/cmll_cfb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/camellia/cmll_ctr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/camellia/cmll_ecb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/camellia/cmll_ofb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/camellia/cmllt4-sparcv9.o" =>
@@ -5905,31 +5758,26 @@ our %unified_info = (
             "crypto/cast/c_cfb64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cast/c_ecb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cast/c_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cast/c_ofb64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cast/c_skey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/chacha/chacha-armv4.o" =>
@@ -5947,284 +5795,237 @@ our %unified_info = (
             "crypto/chacha/chacha-x86.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cmac/cm_ameth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cmac/cm_pmeth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cmac/cmac.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_asn1.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_att.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_cd.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_dd.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_env.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_ess.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_io.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_kari.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_pwri.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_sd.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_smime.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/conf/conf_api.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/conf/conf_def.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/conf/conf_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/conf/conf_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/conf/conf_mall.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/conf/conf_mod.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/conf/conf_sap.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/conf/conf_ssl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cpt_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cryptlib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ct/ct_b64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ct/ct_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ct/ct_log.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ct/ct_oct.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ct/ct_policy.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ct/ct_prn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ct/ct_sct.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ct/ct_sct_ctx.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ct/ct_vfy.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ct/ct_x509v3.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ctype.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cversion.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto",
                 ],
             "crypto/des/cbc_cksm.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/cbc_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/cfb64ede.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/cfb64enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/cfb_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/crypt586.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/des-586.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/dest4-sparcv9.o" =>
@@ -6234,295 +6035,246 @@ our %unified_info = (
             "crypto/des/ecb3_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/ecb_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/fcrypt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/ofb64ede.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/ofb64enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/ofb_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/pcbc_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/qud_cksm.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/rand_key.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/set_key.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/str2key.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/xcbc_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_ameth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_asn1.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_check.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_depr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_gen.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_kdf.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_key.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_meth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_pmeth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_prn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_rfc5114.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_rfc7919.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dsa/dsa_ameth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dsa/dsa_asn1.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dsa/dsa_depr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dsa/dsa_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dsa/dsa_gen.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dsa/dsa_key.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dsa/dsa_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dsa/dsa_meth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dsa/dsa_ossl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dsa/dsa_pmeth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dsa/dsa_prn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dsa/dsa_sign.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dsa/dsa_vrf.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dso/dso_dl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dso/dso_dlfcn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dso/dso_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dso/dso_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dso/dso_openssl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dso/dso_vms.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dso/dso_win32.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ebcdic.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/curve25519.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/curve448/arch_32/f_impl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto/ec/curve448/arch_32",
                     "crypto/ec/curve448",
@@ -6530,7 +6282,6 @@ our %unified_info = (
             "crypto/ec/curve448/curve448.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto/ec/curve448/arch_32",
                     "crypto/ec/curve448",
@@ -6538,7 +6289,6 @@ our %unified_info = (
             "crypto/ec/curve448/curve448_tables.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto/ec/curve448/arch_32",
                     "crypto/ec/curve448",
@@ -6546,7 +6296,6 @@ our %unified_info = (
             "crypto/ec/curve448/eddsa.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto/ec/curve448/arch_32",
                     "crypto/ec/curve448",
@@ -6554,7 +6303,6 @@ our %unified_info = (
             "crypto/ec/curve448/f_generic.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto/ec/curve448/arch_32",
                     "crypto/ec/curve448",
@@ -6562,7 +6310,6 @@ our %unified_info = (
             "crypto/ec/curve448/scalar.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto/ec/curve448/arch_32",
                     "crypto/ec/curve448",
@@ -6570,163 +6317,136 @@ our %unified_info = (
             "crypto/ec/ec2_oct.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec2_smpl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec_ameth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec_asn1.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec_check.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec_curve.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec_cvt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec_key.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec_kmeth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec_mult.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec_oct.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec_pmeth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec_print.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecdh_kdf.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecdh_ossl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecdsa_ossl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecdsa_sign.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecdsa_vrf.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/eck_prn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecp_mont.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecp_nist.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecp_nistp224.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecp_nistp256.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecp_nistp521.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecp_nistputil.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecp_nistz256-armv4.o" =>
@@ -6744,235 +6464,196 @@ our %unified_info = (
             "crypto/ec/ecp_nistz256-x86.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecp_nistz256.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecp_oct.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecp_smpl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecx_meth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/eng_all.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/eng_cnf.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/eng_ctrl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/eng_dyn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/eng_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/eng_fat.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/eng_init.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/eng_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/eng_list.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/eng_openssl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/eng_pkey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/eng_rdrand.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/eng_table.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/tb_asnmth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/tb_cipher.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/tb_dh.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/tb_digest.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/tb_dsa.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/tb_eckey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/tb_pkmeth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/tb_rand.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/tb_rsa.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/err/err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/err/err_all.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/err/err_prn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/bio_b64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/bio_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/bio_md.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/bio_ok.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/c_allc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/c_alld.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/cmeth_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/digest.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/e_aes.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto",
                     "crypto/modes",
@@ -6980,21 +6661,18 @@ our %unified_info = (
             "crypto/evp/e_aes_cbc_hmac_sha1.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto/modes",
                 ],
             "crypto/evp/e_aes_cbc_hmac_sha256.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto/modes",
                 ],
             "crypto/evp/e_aria.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto",
                     "crypto/modes",
@@ -7002,13 +6680,11 @@ our %unified_info = (
             "crypto/evp/e_bf.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/e_camellia.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto",
                     "crypto/modes",
@@ -7016,81 +6692,68 @@ our %unified_info = (
             "crypto/evp/e_cast.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/e_chacha20_poly1305.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/e_des.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto",
                 ],
             "crypto/evp/e_des3.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto",
                 ],
             "crypto/evp/e_idea.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/e_null.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/e_old.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/e_rc2.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/e_rc4.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/e_rc4_hmac_md5.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/e_rc5.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/e_seed.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/e_sm4.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto",
                     "crypto/modes",
@@ -7098,334 +6761,272 @@ our %unified_info = (
             "crypto/evp/e_xcbc_d.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/encode.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/evp_cnf.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/evp_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/evp_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/evp_key.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/evp_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/evp_pbe.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/evp_pkey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/m_md2.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/m_md4.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/m_md5.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/m_md5_sha1.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/m_mdc2.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/m_null.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/m_ripemd.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/m_sha1.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/m_sha3.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto",
                 ],
             "crypto/evp/m_sigver.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/m_wp.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/names.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/p5_crpt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/p5_crpt2.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/p_dec.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/p_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/p_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/p_open.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/p_seal.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/p_sign.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/p_verify.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/pbe_scrypt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/pmeth_fn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/pmeth_gn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/pmeth_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ex_data.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/getenv.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/hmac/hm_ameth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/hmac/hm_pmeth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/hmac/hmac.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/idea/i_cbc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/idea/i_cfb64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/idea/i_ecb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/idea/i_ofb64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/idea/i_skey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
-            "crypto/include/internal/bn_conf.h" =>
-                [
-                    ".",
-                ],
-            "crypto/include/internal/dso_conf.h" =>
-                [
-                    ".",
-                ],
             "crypto/init.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/kdf/hkdf.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/kdf/kdf_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/kdf/scrypt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/kdf/tls1_prf.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/lhash/lh_stats.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/lhash/lhash.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/md4/md4_dgst.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/md4/md4_one.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/md5/md5-586.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/md5/md5-sparcv9.o" =>
@@ -7435,79 +7036,66 @@ our %unified_info = (
             "crypto/md5/md5_dgst.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/md5/md5_one.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/mdc2/mdc2_one.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/mdc2/mdc2dgst.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/mem.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/mem_dbg.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/mem_sec.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/modes/cbc128.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/modes/ccm128.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/modes/cfb128.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/modes/ctr128.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/modes/cts128.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/modes/gcm128.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto",
                 ],
@@ -7526,7 +7114,6 @@ our %unified_info = (
             "crypto/modes/ghash-x86.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/modes/ghashv8-armx.o" =>
@@ -7536,361 +7123,301 @@ our %unified_info = (
             "crypto/modes/ocb128.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/modes/ofb128.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/modes/wrap128.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/modes/xts128.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/o_dir.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/o_fips.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/o_fopen.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/o_init.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/o_str.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/o_time.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/objects/o_names.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/objects/obj_dat.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/objects/obj_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/objects/obj_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/objects/obj_xref.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ocsp/ocsp_asn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ocsp/ocsp_cl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ocsp/ocsp_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ocsp/ocsp_ext.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ocsp/ocsp_ht.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ocsp/ocsp_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ocsp/ocsp_prn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ocsp/ocsp_srv.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ocsp/ocsp_vfy.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ocsp/v3_ocsp.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pem/pem_all.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pem/pem_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pem/pem_info.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pem/pem_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pem/pem_oth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pem/pem_pk8.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pem/pem_pkey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pem/pem_sign.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pem/pem_x509.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pem/pem_xaux.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pem/pvkfmt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_add.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_asn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_attr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_crpt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_crt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_decr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_init.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_key.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_kiss.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_mutl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_npas.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_p8d.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_p8e.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_sbag.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_utl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/pk12err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs7/bio_pk7.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs7/pk7_asn1.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs7/pk7_attr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs7/pk7_doit.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs7/pk7_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs7/pk7_mime.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs7/pk7_smime.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs7/pkcs7err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/poly1305/poly1305-armv4.o" =>
@@ -7912,265 +7439,221 @@ our %unified_info = (
             "crypto/poly1305/poly1305-x86.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/poly1305/poly1305.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/poly1305/poly1305_ameth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/poly1305/poly1305_pmeth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rand/drbg_ctr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rand/drbg_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rand/rand_egd.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rand/rand_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rand/rand_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rand/rand_unix.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rand/rand_vms.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rand/rand_win.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rand/randfile.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rc2/rc2_cbc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rc2/rc2_ecb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rc2/rc2_skey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rc2/rc2cfb64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rc2/rc2ofb64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rc4/rc4-586.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ripemd/rmd-586.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ripemd/rmd_dgst.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ripemd/rmd_one.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_ameth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_asn1.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_chk.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_crpt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_depr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_gen.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_meth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_mp.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_none.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_oaep.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_ossl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_pk1.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_pmeth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_prn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_pss.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_saos.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_sign.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_ssl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_x931.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_x931g.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/s390xcpuid.o" =>
@@ -8180,31 +7663,26 @@ our %unified_info = (
             "crypto/seed/seed.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/seed/seed_cbc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/seed/seed_cfb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/seed/seed_ecb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/seed/seed_ofb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sha/keccak1600-armv4.o" =>
@@ -8214,13 +7692,11 @@ our %unified_info = (
             "crypto/sha/keccak1600.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sha/sha1-586.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sha/sha1-armv4-large.o" =>
@@ -8246,19 +7722,16 @@ our %unified_info = (
             "crypto/sha/sha1_one.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sha/sha1dgst.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sha/sha256-586.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sha/sha256-armv4.o" =>
@@ -8284,13 +7757,11 @@ our %unified_info = (
             "crypto/sha/sha256.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sha/sha512-586.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sha/sha512-armv4.o" =>
@@ -8316,727 +7787,606 @@ our %unified_info = (
             "crypto/sha/sha512.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/siphash/siphash.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/siphash/siphash_ameth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/siphash/siphash_pmeth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sm2/sm2_crypt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sm2/sm2_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sm2/sm2_pmeth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sm2/sm2_sign.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sm3/m_sm3.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sm3/sm3.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sm4/sm4.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/srp/srp_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/srp/srp_vfy.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/stack/stack.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/store/loader_file.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/store/store_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/store/store_init.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/store/store_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/store/store_register.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/store/store_strings.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/threads_none.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/threads_pthread.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/threads_win.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ts/ts_asn1.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ts/ts_conf.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ts/ts_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ts/ts_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ts/ts_req_print.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ts/ts_req_utils.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ts/ts_rsp_print.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ts/ts_rsp_sign.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ts/ts_rsp_utils.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ts/ts_rsp_verify.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ts/ts_verify_ctx.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/txt_db/txt_db.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ui/ui_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ui/ui_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ui/ui_null.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ui/ui_openssl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ui/ui_util.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/uid.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/whrlpool/wp-mmx.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/whrlpool/wp_block.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/whrlpool/wp_dgst.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/by_dir.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/by_file.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/t_crl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/t_req.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/t_x509.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_att.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_cmp.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_d2.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_def.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_ext.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_lu.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_meth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_obj.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_r2x.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_req.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_set.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_trs.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_txt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_v3.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_vfy.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_vpm.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509cset.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509name.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509rset.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509spki.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509type.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x_all.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x_attrib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x_crl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x_exten.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x_name.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x_pubkey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x_req.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x_x509.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x_x509a.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/pcy_cache.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/pcy_data.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/pcy_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/pcy_map.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/pcy_node.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/pcy_tree.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_addr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_admis.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_akey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_akeya.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_alt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_asid.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_bcons.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_bitst.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_conf.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_cpols.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_crld.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_enum.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_extku.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_genn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_ia5.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_info.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_int.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_ncons.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_pci.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_pcia.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_pcons.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_pku.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_pmaps.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_prn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_purp.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_skey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_sxnet.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_tlsf.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_utl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x86cpuid.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "engines/e_capi.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "engines/e_padlock-x86.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "engines/e_padlock.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "fuzz/asn1.o" =>
@@ -9087,6 +8437,14 @@ our %unified_info = (
                 [
                     "include",
                 ],
+            "include/crypto/bn_conf.h" =>
+                [
+                    ".",
+                ],
+            "include/crypto/dso_conf.h" =>
+                [
+                    ".",
+                ],
             "include/openssl/opensslconf.h" =>
                 [
                     ".",
@@ -9331,7 +8689,6 @@ our %unified_info = (
                 [
                     ".",
                     "include",
-                    "crypto/include",
                 ],
             "test/asn1_string_table_test.o" =>
                 [
@@ -9657,7 +9014,6 @@ our %unified_info = (
                 [
                     ".",
                     "include",
-                    "crypto/include",
                 ],
             "test/cipher_overhead_test.o" =>
                 [
@@ -9703,7 +9059,6 @@ our %unified_info = (
             "test/ctype_internal_test.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "test/curve448_internal_test.o" =>
@@ -9769,7 +9124,6 @@ our %unified_info = (
                 [
                     "include",
                     "crypto/ec",
-                    "crypto/include",
                 ],
             "test/ecdsatest.o" =>
                 [
@@ -9794,7 +9148,6 @@ our %unified_info = (
             "test/evp_extra_test.o" =>
                 [
                     "include",
-                    "crypto/include",
                 ],
             "test/evp_test.o" =>
                 [
@@ -9892,7 +9245,6 @@ our %unified_info = (
                 [
                     ".",
                     "include",
-                    "crypto/include",
                 ],
             "test/rc2test.o" =>
                 [
@@ -9942,18 +9294,15 @@ our %unified_info = (
                 [
                     ".",
                     "include",
-                    "crypto/include",
                 ],
             "test/sm2_internal_test.o" =>
                 [
                     "include",
-                    "crypto/include",
                 ],
             "test/sm4_internal_test.o" =>
                 [
                     ".",
                     "include",
-                    "crypto/include",
                 ],
             "test/srptest.o" =>
                 [
@@ -9964,6 +9313,10 @@ our %unified_info = (
                     ".",
                     "include",
                 ],
+            "test/ssl_ctx_test.o" =>
+                [
+                    "include",
+                ],
             "test/ssl_test.o" =>
                 [
                     "include",
@@ -10027,10 +9380,6 @@ our %unified_info = (
                 [
                     "include",
                 ],
-            "test/testutil/init.o" =>
-                [
-                    "include",
-                ],
             "test/testutil/main.o" =>
                 [
                     "include",
@@ -10059,6 +9408,10 @@ our %unified_info = (
                 [
                     "include",
                 ],
+            "test/testutil/testutil_init.o" =>
+                [
+                    "include",
+                ],
             "test/threadstest.o" =>
                 [
                     "include",
@@ -10323,6 +9676,7 @@ our %unified_info = (
             "test/sm4_internal_test",
             "test/srptest",
             "test/ssl_cert_table_internal_test",
+            "test/ssl_ctx_test",
             "test/ssl_test",
             "test/ssl_test_ctx_test",
             "test/sslapitest",
@@ -15256,7 +14610,6 @@ our %unified_info = (
                     "test/testutil/cb.o",
                     "test/testutil/driver.o",
                     "test/testutil/format_output.o",
-                    "test/testutil/init.o",
                     "test/testutil/main.o",
                     "test/testutil/output_helpers.o",
                     "test/testutil/random.o",
@@ -15264,6 +14617,7 @@ our %unified_info = (
                     "test/testutil/tap_bio.o",
                     "test/testutil/test_cleanup.o",
                     "test/testutil/tests.o",
+                    "test/testutil/testutil_init.o",
                 ],
             "test/md2test" =>
                 [
@@ -15491,6 +14845,14 @@ our %unified_info = (
                 [
                     "test/ssl_cert_table_internal_test.c",
                 ],
+            "test/ssl_ctx_test" =>
+                [
+                    "test/ssl_ctx_test.o",
+                ],
+            "test/ssl_ctx_test.o" =>
+                [
+                    "test/ssl_ctx_test.c",
+                ],
             "test/ssl_test" =>
                 [
                     "test/handshake_helper.o",
@@ -15593,10 +14955,6 @@ our %unified_info = (
                 [
                     "test/testutil/format_output.c",
                 ],
-            "test/testutil/init.o" =>
-                [
-                    "test/testutil/init.c",
-                ],
             "test/testutil/main.o" =>
                 [
                     "test/testutil/main.c",
@@ -15625,6 +14983,10 @@ our %unified_info = (
                 [
                     "test/testutil/tests.c",
                 ],
+            "test/testutil/testutil_init.o" =>
+                [
+                    "test/testutil/testutil_init.c",
+                ],
             "test/threadstest" =>
                 [
                     "test/threadstest.o",
diff --git a/deps/openssl/config/archs/VC-WIN32/asm_avx2/crypto/aes/aes-586.asm b/deps/openssl/config/archs/VC-WIN32/asm_avx2/crypto/aes/aes-586.asm
deleted file mode 100644
index 7a17e847c6..0000000000
--- a/deps/openssl/config/archs/VC-WIN32/asm_avx2/crypto/aes/aes-586.asm
+++ /dev/null
@@ -1,3211 +0,0 @@
-%ifidn __OUTPUT_FORMAT__,obj
-section	code	use32 class=code align=64
-%elifidn __OUTPUT_FORMAT__,win32
-$@feat.00 equ 1
-section	.text	code align=64
-%else
-section	.text	code
-%endif
-align	16
-__x86_AES_encrypt_compact:
-	mov	DWORD [20+esp],edi
-	xor	eax,DWORD [edi]
-	xor	ebx,DWORD [4+edi]
-	xor	ecx,DWORD [8+edi]
-	xor	edx,DWORD [12+edi]
-	mov	esi,DWORD [240+edi]
-	lea	esi,[esi*1+esi-2]
-	lea	esi,[esi*8+edi]
-	mov	DWORD [24+esp],esi
-	mov	edi,DWORD [ebp-128]
-	mov	esi,DWORD [ebp-96]
-	mov	edi,DWORD [ebp-64]
-	mov	esi,DWORD [ebp-32]
-	mov	edi,DWORD [ebp]
-	mov	esi,DWORD [32+ebp]
-	mov	edi,DWORD [64+ebp]
-	mov	esi,DWORD [96+ebp]
-align	16
-L$000loop:
-	mov	esi,eax
-	and	esi,255
-	movzx	esi,BYTE [esi*1+ebp-128]
-	movzx	edi,bh
-	movzx	edi,BYTE [edi*1+ebp-128]
-	shl	edi,8
-	xor	esi,edi
-	mov	edi,ecx
-	shr	edi,16
-	and	edi,255
-	movzx	edi,BYTE [edi*1+ebp-128]
-	shl	edi,16
-	xor	esi,edi
-	mov	edi,edx
-	shr	edi,24
-	movzx	edi,BYTE [edi*1+ebp-128]
-	shl	edi,24
-	xor	esi,edi
-	mov	DWORD [4+esp],esi
-	mov	esi,ebx
-	and	esi,255
-	shr	ebx,16
-	movzx	esi,BYTE [esi*1+ebp-128]
-	movzx	edi,ch
-	movzx	edi,BYTE [edi*1+ebp-128]
-	shl	edi,8
-	xor	esi,edi
-	mov	edi,edx
-	shr	edi,16
-	and	edi,255
-	movzx	edi,BYTE [edi*1+ebp-128]
-	shl	edi,16
-	xor	esi,edi
-	mov	edi,eax
-	shr	edi,24
-	movzx	edi,BYTE [edi*1+ebp-128]
-	shl	edi,24
-	xor	esi,edi
-	mov	DWORD [8+esp],esi
-	mov	esi,ecx
-	and	esi,255
-	shr	ecx,24
-	movzx	esi,BYTE [esi*1+ebp-128]
-	movzx	edi,dh
-	movzx	edi,BYTE [edi*1+ebp-128]
-	shl	edi,8
-	xor	esi,edi
-	mov	edi,eax
-	shr	edi,16
-	and	edx,255
-	and	edi,255
-	movzx	edi,BYTE [edi*1+ebp-128]
-	shl	edi,16
-	xor	esi,edi
-	movzx	edi,bh
-	movzx	edi,BYTE [edi*1+ebp-128]
-	shl	edi,24
-	xor	esi,edi
-	and	edx,255
-	movzx	edx,BYTE [edx*1+ebp-128]
-	movzx	eax,ah
-	movzx	eax,BYTE [eax*1+ebp-128]
-	shl	eax,8
-	xor	edx,eax
-	mov	eax,DWORD [4+esp]
-	and	ebx,255
-	movzx	ebx,BYTE [ebx*1+ebp-128]
-	shl	ebx,16
-	xor	edx,ebx
-	mov	ebx,DWORD [8+esp]
-	movzx	ecx,BYTE [ecx*1+ebp-128]
-	shl	ecx,24
-	xor	edx,ecx
-	mov	ecx,esi
-	mov	ebp,2155905152
-	and	ebp,ecx
-	lea	edi,[ecx*1+ecx]
-	mov	esi,ebp
-	shr	ebp,7
-	and	edi,4278124286
-	sub	esi,ebp
-	mov	ebp,ecx
-	and	esi,454761243
-	ror	ebp,16
-	xor	esi,edi
-	mov	edi,ecx
-	xor	ecx,esi
-	ror	edi,24
-	xor	esi,ebp
-	rol	ecx,24
-	xor	esi,edi
-	mov	ebp,2155905152
-	xor	ecx,esi
-	and	ebp,edx
-	lea	edi,[edx*1+edx]
-	mov	esi,ebp
-	shr	ebp,7
-	and	edi,4278124286
-	sub	esi,ebp
-	mov	ebp,edx
-	and	esi,454761243
-	ror	ebp,16
-	xor	esi,edi
-	mov	edi,edx
-	xor	edx,esi
-	ror	edi,24
-	xor	esi,ebp
-	rol	edx,24
-	xor	esi,edi
-	mov	ebp,2155905152
-	xor	edx,esi
-	and	ebp,eax
-	lea	edi,[eax*1+eax]
-	mov	esi,ebp
-	shr	ebp,7
-	and	edi,4278124286
-	sub	esi,ebp
-	mov	ebp,eax
-	and	esi,454761243
-	ror	ebp,16
-	xor	esi,edi
-	mov	edi,eax
-	xor	eax,esi
-	ror	edi,24
-	xor	esi,ebp
-	rol	eax,24
-	xor	esi,edi
-	mov	ebp,2155905152
-	xor	eax,esi
-	and	ebp,ebx
-	lea	edi,[ebx*1+ebx]
-	mov	esi,ebp
-	shr	ebp,7
-	and	edi,4278124286
-	sub	esi,ebp
-	mov	ebp,ebx
-	and	esi,454761243
-	ror	ebp,16
-	xor	esi,edi
-	mov	edi,ebx
-	xor	ebx,esi
-	ror	edi,24
-	xor	esi,ebp
-	rol	ebx,24
-	xor	esi,edi
-	xor	ebx,esi
-	mov	edi,DWORD [20+esp]
-	mov	ebp,DWORD [28+esp]
-	add	edi,16
-	xor	eax,DWORD [edi]
-	xor	ebx,DWORD [4+edi]
-	xor	ecx,DWORD [8+edi]
-	xor	edx,DWORD [12+edi]
-	cmp	edi,DWORD [24+esp]
-	mov	DWORD [20+esp],edi
-	jb	NEAR L$000loop
-	mov	esi,eax
-	and	esi,255
-	movzx	esi,BYTE [esi*1+ebp-128]
-	movzx	edi,bh
-	movzx	edi,BYTE [edi*1+ebp-128]
-	shl	edi,8
-	xor	esi,edi
-	mov	edi,ecx
-	shr	edi,16
-	and	edi,255
-	movzx	edi,BYTE [edi*1+ebp-128]
-	shl	edi,16
-	xor	esi,edi
-	mov	edi,edx
-	shr	edi,24
-	movzx	edi,BYTE [edi*1+ebp-128]
-	shl	edi,24
-	xor	esi,edi
-	mov	DWORD [4+esp],esi
-	mov	esi,ebx
-	and	esi,255
-	shr	ebx,16
-	movzx	esi,BYTE [esi*1+ebp-128]
-	movzx	edi,ch
-	movzx	edi,BYTE [edi*1+ebp-128]
-	shl	edi,8
-	xor	esi,edi
-	mov	edi,edx
-	shr	edi,16
-	and	edi,255
-	movzx	edi,BYTE [edi*1+ebp-128]
-	shl	edi,16
-	xor	esi,edi
-	mov	edi,eax
-	shr	edi,24
-	movzx	edi,BYTE [edi*1+ebp-128]
-	shl	edi,24
-	xor	esi,edi
-	mov	DWORD [8+esp],esi
-	mov	esi,ecx
-	and	esi,255
-	shr	ecx,24
-	movzx	esi,BYTE [esi*1+ebp-128]
-	movzx	edi,dh
-	movzx	edi,BYTE [edi*1+ebp-128]
-	shl	edi,8
-	xor	esi,edi
-	mov	edi,eax
-	shr	edi,16
-	and	edx,255
-	and	edi,255
-	movzx	edi,BYTE [edi*1+ebp-128]
-	shl	edi,16
-	xor	esi,edi
-	movzx	edi,bh
-	movzx	edi,BYTE [edi*1+ebp-128]
-	shl	edi,24
-	xor	esi,edi
-	mov	edi,DWORD [20+esp]
-	and	edx,255
-	movzx	edx,BYTE [edx*1+ebp-128]
-	movzx	eax,ah
-	movzx	eax,BYTE [eax*1+ebp-128]
-	shl	eax,8
-	xor	edx,eax
-	mov	eax,DWORD [4+esp]
-	and	ebx,255
-	movzx	ebx,BYTE [ebx*1+ebp-128]
-	shl	ebx,16
-	xor	edx,ebx
-	mov	ebx,DWORD [8+esp]
-	movzx	ecx,BYTE [ecx*1+ebp-128]
-	shl	ecx,24
-	xor	edx,ecx
-	mov	ecx,esi
-	xor	eax,DWORD [16+edi]
-	xor	ebx,DWORD [20+edi]
-	xor	ecx,DWORD [24+edi]
-	xor	edx,DWORD [28+edi]
-	ret
-align	16
-__sse_AES_encrypt_compact:
-	pxor	mm0,[edi]
-	pxor	mm4,[8+edi]
-	mov	esi,DWORD [240+edi]
-	lea	esi,[esi*1+esi-2]
-	lea	esi,[esi*8+edi]
-	mov	DWORD [24+esp],esi
-	mov	eax,454761243
-	mov	DWORD [8+esp],eax
-	mov	DWORD [12+esp],eax
-	mov	eax,DWORD [ebp-128]
-	mov	ebx,DWORD [ebp-96]
-	mov	ecx,DWORD [ebp-64]
-	mov	edx,DWORD [ebp-32]
-	mov	eax,DWORD [ebp]
-	mov	ebx,DWORD [32+ebp]
-	mov	ecx,DWORD [64+ebp]
-	mov	edx,DWORD [96+ebp]
-align	16
-L$001loop:
-	pshufw	mm1,mm0,8
-	pshufw	mm5,mm4,13
-	movd	eax,mm1
-	movd	ebx,mm5
-	mov	DWORD [20+esp],edi
-	movzx	esi,al
-	movzx	edx,ah
-	pshufw	mm2,mm0,13
-	movzx	ecx,BYTE [esi*1+ebp-128]
-	movzx	edi,bl
-	movzx	edx,BYTE [edx*1+ebp-128]
-	shr	eax,16
-	shl	edx,8
-	movzx	esi,BYTE [edi*1+ebp-128]
-	movzx	edi,bh
-	shl	esi,16
-	pshufw	mm6,mm4,8
-	or	ecx,esi
-	movzx	esi,BYTE [edi*1+ebp-128]
-	movzx	edi,ah
-	shl	esi,24
-	shr	ebx,16
-	or	edx,esi
-	movzx	esi,BYTE [edi*1+ebp-128]
-	movzx	edi,bh
-	shl	esi,8
-	or	ecx,esi
-	movzx	esi,BYTE [edi*1+ebp-128]
-	movzx	edi,al
-	shl	esi,24
-	or	ecx,esi
-	movzx	esi,BYTE [edi*1+ebp-128]
-	movzx	edi,bl
-	movd	eax,mm2
-	movd	mm0,ecx
-	movzx	ecx,BYTE [edi*1+ebp-128]
-	movzx	edi,ah
-	shl	ecx,16
-	movd	ebx,mm6
-	or	ecx,esi
-	movzx	esi,BYTE [edi*1+ebp-128]
-	movzx	edi,bh
-	shl	esi,24
-	or	ecx,esi
-	movzx	esi,BYTE [edi*1+ebp-128]
-	movzx	edi,bl
-	shl	esi,8
-	shr	ebx,16
-	or	ecx,esi
-	movzx	esi,BYTE [edi*1+ebp-128]
-	movzx	edi,al
-	shr	eax,16
-	movd	mm1,ecx
-	movzx	ecx,BYTE [edi*1+ebp-128]
-	movzx	edi,ah
-	shl	ecx,16
-	and	eax,255
-	or	ecx,esi
-	punpckldq	mm0,mm1
-	movzx	esi,BYTE [edi*1+ebp-128]
-	movzx	edi,bh
-	shl	esi,24
-	and	ebx,255
-	movzx	eax,BYTE [eax*1+ebp-128]
-	or	ecx,esi
-	shl	eax,16
-	movzx	esi,BYTE [edi*1+ebp-128]
-	or	edx,eax
-	shl	esi,8
-	movzx	ebx,BYTE [ebx*1+ebp-128]
-	or	ecx,esi
-	or	edx,ebx
-	mov	edi,DWORD [20+esp]
-	movd	mm4,ecx
-	movd	mm5,edx
-	punpckldq	mm4,mm5
-	add	edi,16
-	cmp	edi,DWORD [24+esp]
-	ja	NEAR L$002out
-	movq	mm2,[8+esp]
-	pxor	mm3,mm3
-	pxor	mm7,mm7
-	movq	mm1,mm0
-	movq	mm5,mm4
-	pcmpgtb	mm3,mm0
-	pcmpgtb	mm7,mm4
-	pand	mm3,mm2
-	pand	mm7,mm2
-	pshufw	mm2,mm0,177
-	pshufw	mm6,mm4,177
-	paddb	mm0,mm0
-	paddb	mm4,mm4
-	pxor	mm0,mm3
-	pxor	mm4,mm7
-	pshufw	mm3,mm2,177
-	pshufw	mm7,mm6,177
-	pxor	mm1,mm0
-	pxor	mm5,mm4
-	pxor	mm0,mm2
-	pxor	mm4,mm6
-	movq	mm2,mm3
-	movq	mm6,mm7
-	pslld	mm3,8
-	pslld	mm7,8
-	psrld	mm2,24
-	psrld	mm6,24
-	pxor	mm0,mm3
-	pxor	mm4,mm7
-	pxor	mm0,mm2
-	pxor	mm4,mm6
-	movq	mm3,mm1
-	movq	mm7,mm5
-	movq	mm2,[edi]
-	movq	mm6,[8+edi]
-	psrld	mm1,8
-	psrld	mm5,8
-	mov	eax,DWORD [ebp-128]
-	pslld	mm3,24
-	pslld	mm7,24
-	mov	ebx,DWORD [ebp-64]
-	pxor	mm0,mm1
-	pxor	mm4,mm5
-	mov	ecx,DWORD [ebp]
-	pxor	mm0,mm3
-	pxor	mm4,mm7
-	mov	edx,DWORD [64+ebp]
-	pxor	mm0,mm2
-	pxor	mm4,mm6
-	jmp	NEAR L$001loop
-align	16
-L$002out:
-	pxor	mm0,[edi]
-	pxor	mm4,[8+edi]
-	ret
-align	16
-__x86_AES_encrypt:
-	mov	DWORD [20+esp],edi
-	xor	eax,DWORD [edi]
-	xor	ebx,DWORD [4+edi]
-	xor	ecx,DWORD [8+edi]
-	xor	edx,DWORD [12+edi]
-	mov	esi,DWORD [240+edi]
-	lea	esi,[esi*1+esi-2]
-	lea	esi,[esi*8+edi]
-	mov	DWORD [24+esp],esi
-align	16
-L$003loop:
-	mov	esi,eax
-	and	esi,255
-	mov	esi,DWORD [esi*8+ebp]
-	movzx	edi,bh
-	xor	esi,DWORD [3+edi*8+ebp]
-	mov	edi,ecx
-	shr	edi,16
-	and	edi,255
-	xor	esi,DWORD [2+edi*8+ebp]
-	mov	edi,edx
-	shr	edi,24
-	xor	esi,DWORD [1+edi*8+ebp]
-	mov	DWORD [4+esp],esi
-	mov	esi,ebx
-	and	esi,255
-	shr	ebx,16
-	mov	esi,DWORD [esi*8+ebp]
-	movzx	edi,ch
-	xor	esi,DWORD [3+edi*8+ebp]
-	mov	edi,edx
-	shr	edi,16
-	and	edi,255
-	xor	esi,DWORD [2+edi*8+ebp]
-	mov	edi,eax
-	shr	edi,24
-	xor	esi,DWORD [1+edi*8+ebp]
-	mov	DWORD [8+esp],esi
-	mov	esi,ecx
-	and	esi,255
-	shr	ecx,24
-	mov	esi,DWORD [esi*8+ebp]
-	movzx	edi,dh
-	xor	esi,DWORD [3+edi*8+ebp]
-	mov	edi,eax
-	shr	edi,16
-	and	edx,255
-	and	edi,255
-	xor	esi,DWORD [2+edi*8+ebp]
-	movzx	edi,bh
-	xor	esi,DWORD [1+edi*8+ebp]
-	mov	edi,DWORD [20+esp]
-	mov	edx,DWORD [edx*8+ebp]
-	movzx	eax,ah
-	xor	edx,DWORD [3+eax*8+ebp]
-	mov	eax,DWORD [4+esp]
-	and	ebx,255
-	xor	edx,DWORD [2+ebx*8+ebp]
-	mov	ebx,DWORD [8+esp]
-	xor	edx,DWORD [1+ecx*8+ebp]
-	mov	ecx,esi
-	add	edi,16
-	xor	eax,DWORD [edi]
-	xor	ebx,DWORD [4+edi]
-	xor	ecx,DWORD [8+edi]
-	xor	edx,DWORD [12+edi]
-	cmp	edi,DWORD [24+esp]
-	mov	DWORD [20+esp],edi
-	jb	NEAR L$003loop
-	mov	esi,eax
-	and	esi,255
-	mov	esi,DWORD [2+esi*8+ebp]
-	and	esi,255
-	movzx	edi,bh
-	mov	edi,DWORD [edi*8+ebp]
-	and	edi,65280
-	xor	esi,edi
-	mov	edi,ecx
-	shr	edi,16
-	and	edi,255
-	mov	edi,DWORD [edi*8+ebp]
-	and	edi,16711680
-	xor	esi,edi
-	mov	edi,edx
-	shr	edi,24
-	mov	edi,DWORD [2+edi*8+ebp]
-	and	edi,4278190080
-	xor	esi,edi
-	mov	DWORD [4+esp],esi
-	mov	esi,ebx
-	and	esi,255
-	shr	ebx,16
-	mov	esi,DWORD [2+esi*8+ebp]
-	and	esi,255
-	movzx	edi,ch
-	mov	edi,DWORD [edi*8+ebp]
-	and	edi,65280
-	xor	esi,edi
-	mov	edi,edx
-	shr	edi,16
-	and	edi,255
-	mov	edi,DWORD [edi*8+ebp]
-	and	edi,16711680
-	xor	esi,edi
-	mov	edi,eax
-	shr	edi,24
-	mov	edi,DWORD [2+edi*8+ebp]
-	and	edi,4278190080
-	xor	esi,edi
-	mov	DWORD [8+esp],esi
-	mov	esi,ecx
-	and	esi,255
-	shr	ecx,24
-	mov	esi,DWORD [2+esi*8+ebp]
-	and	esi,255
-	movzx	edi,dh
-	mov	edi,DWORD [edi*8+ebp]
-	and	edi,65280
-	xor	esi,edi
-	mov	edi,eax
-	shr	edi,16
-	and	edx,255
-	and	edi,255
-	mov	edi,DWORD [edi*8+ebp]
-	and	edi,16711680
-	xor	esi,edi
-	movzx	edi,bh
-	mov	edi,DWORD [2+edi*8+ebp]
-	and	edi,4278190080
-	xor	esi,edi
-	mov	edi,DWORD [20+esp]
-	and	edx,255
-	mov	edx,DWORD [2+edx*8+ebp]
-	and	edx,255
-	movzx	eax,ah
-	mov	eax,DWORD [eax*8+ebp]
-	and	eax,65280
-	xor	edx,eax
-	mov	eax,DWORD [4+esp]
-	and	ebx,255
-	mov	ebx,DWORD [ebx*8+ebp]
-	and	ebx,16711680
-	xor	edx,ebx
-	mov	ebx,DWORD [8+esp]
-	mov	ecx,DWORD [2+ecx*8+ebp]
-	and	ecx,4278190080
-	xor	edx,ecx
-	mov	ecx,esi
-	add	edi,16
-	xor	eax,DWORD [edi]
-	xor	ebx,DWORD [4+edi]
-	xor	ecx,DWORD [8+edi]
-	xor	edx,DWORD [12+edi]
-	ret
-align	64
-L$AES_Te:
-dd	2774754246,2774754246
-dd	2222750968,2222750968
-dd	2574743534,2574743534
-dd	2373680118,2373680118
-dd	234025727,234025727
-dd	3177933782,3177933782
-dd	2976870366,2976870366
-dd	1422247313,1422247313
-dd	1345335392,1345335392
-dd	50397442,50397442
-dd	2842126286,2842126286
-dd	2099981142,2099981142
-dd	436141799,436141799
-dd	1658312629,1658312629
-dd	3870010189,3870010189
-dd	2591454956,2591454956
-dd	1170918031,1170918031
-dd	2642575903,2642575903
-dd	1086966153,1086966153
-dd	2273148410,2273148410
-dd	368769775,368769775
-dd	3948501426,3948501426
-dd	3376891790,3376891790
-dd	200339707,200339707
-dd	3970805057,3970805057
-dd	1742001331,1742001331
-dd	4255294047,4255294047
-dd	3937382213,3937382213
-dd	3214711843,3214711843
-dd	4154762323,4154762323
-dd	2524082916,2524082916
-dd	1539358875,1539358875
-dd	3266819957,3266819957
-dd	486407649,486407649
-dd	2928907069,2928907069
-dd	1780885068,1780885068
-dd	1513502316,1513502316
-dd	1094664062,1094664062
-dd	49805301,49805301
-dd	1338821763,1338821763
-dd	1546925160,1546925160
-dd	4104496465,4104496465
-dd	887481809,887481809
-dd	150073849,150073849
-dd	2473685474,2473685474
-dd	1943591083,1943591083
-dd	1395732834,1395732834
-dd	1058346282,1058346282
-dd	201589768,201589768
-dd	1388824469,1388824469
-dd	1696801606,1696801606
-dd	1589887901,1589887901
-dd	672667696,672667696
-dd	2711000631,2711000631
-dd	251987210,251987210
-dd	3046808111,3046808111
-dd	151455502,151455502
-dd	907153956,907153956
-dd	2608889883,2608889883
-dd	1038279391,1038279391
-dd	652995533,652995533
-dd	1764173646,1764173646
-dd	3451040383,3451040383
-dd	2675275242,2675275242
-dd	453576978,453576978
-dd	2659418909,2659418909
-dd	1949051992,1949051992
-dd	773462580,773462580
-dd	756751158,756751158
-dd	2993581788,2993581788
-dd	3998898868,3998898868
-dd	4221608027,4221608027
-dd	4132590244,4132590244
-dd	1295727478,1295727478
-dd	1641469623,1641469623
-dd	3467883389,3467883389
-dd	2066295122,2066295122
-dd	1055122397,1055122397
-dd	1898917726,1898917726
-dd	2542044179,2542044179
-dd	4115878822,4115878822
-dd	1758581177,1758581177
-dd	0,0
-dd	753790401,753790401
-dd	1612718144,1612718144
-dd	536673507,536673507
-dd	3367088505,3367088505
-dd	3982187446,3982187446
-dd	3194645204,3194645204
-dd	1187761037,1187761037
-dd	3653156455,3653156455
-dd	1262041458,1262041458
-dd	3729410708,3729410708
-dd	3561770136,3561770136
-dd	3898103984,3898103984
-dd	1255133061,1255133061
-dd	1808847035,1808847035
-dd	720367557,720367557
-dd	3853167183,3853167183
-dd	385612781,385612781
-dd	3309519750,3309519750
-dd	3612167578,3612167578
-dd	1429418854,1429418854
-dd	2491778321,2491778321
-dd	3477423498,3477423498
-dd	284817897,284817897
-dd	100794884,100794884
-dd	2172616702,2172616702
-dd	4031795360,4031795360
-dd	1144798328,1144798328
-dd	3131023141,3131023141
-dd	3819481163,3819481163
-dd	4082192802,4082192802
-dd	4272137053,4272137053
-dd	3225436288,3225436288
-dd	2324664069,2324664069
-dd	2912064063,2912064063
-dd	3164445985,3164445985
-dd	1211644016,1211644016
-dd	83228145,83228145
-dd	3753688163,3753688163
-dd	3249976951,3249976951
-dd	1977277103,1977277103
-dd	1663115586,1663115586
-dd	806359072,806359072
-dd	452984805,452984805
-dd	250868733,250868733
-dd	1842533055,1842533055
-dd	1288555905,1288555905
-dd	336333848,336333848
-dd	890442534,890442534
-dd	804056259,804056259
-dd	3781124030,3781124030
-dd	2727843637,2727843637
-dd	3427026056,3427026056
-dd	957814574,957814574
-dd	1472513171,1472513171
-dd	4071073621,4071073621
-dd	2189328124,2189328124
-dd	1195195770,1195195770
-dd	2892260552,2892260552
-dd	3881655738,3881655738
-dd	723065138,723065138
-dd	2507371494,2507371494
-dd	2690670784,2690670784
-dd	2558624025,2558624025
-dd	3511635870,3511635870
-dd	2145180835,2145180835
-dd	1713513028,1713513028
-dd	2116692564,2116692564
-dd	2878378043,2878378043
-dd	2206763019,2206763019
-dd	3393603212,3393603212
-dd	703524551,703524551
-dd	3552098411,3552098411
-dd	1007948840,1007948840
-dd	2044649127,2044649127
-dd	3797835452,3797835452
-dd	487262998,487262998
-dd	1994120109,1994120109
-dd	1004593371,1004593371
-dd	1446130276,1446130276
-dd	1312438900,1312438900
-dd	503974420,503974420
-dd	3679013266,3679013266
-dd	168166924,168166924
-dd	1814307912,1814307912
-dd	3831258296,3831258296
-dd	1573044895,1573044895
-dd	1859376061,1859376061
-dd	4021070915,4021070915
-dd	2791465668,2791465668
-dd	2828112185,2828112185
-dd	2761266481,2761266481
-dd	937747667,937747667
-dd	2339994098,2339994098
-dd	854058965,854058965
-dd	1137232011,1137232011
-dd	1496790894,1496790894
-dd	3077402074,3077402074
-dd	2358086913,2358086913
-dd	1691735473,1691735473
-dd	3528347292,3528347292
-dd	3769215305,3769215305
-dd	3027004632,3027004632
-dd	4199962284,4199962284
-dd	133494003,133494003
-dd	636152527,636152527
-dd	2942657994,2942657994
-dd	2390391540,2390391540
-dd	3920539207,3920539207
-dd	403179536,403179536
-dd	3585784431,3585784431
-dd	2289596656,2289596656
-dd	1864705354,1864705354
-dd	1915629148,1915629148
-dd	605822008,605822008
-dd	4054230615,4054230615
-dd	3350508659,3350508659
-dd	1371981463,1371981463
-dd	602466507,602466507
-dd	2094914977,2094914977
-dd	2624877800,2624877800
-dd	555687742,555687742
-dd	3712699286,3712699286
-dd	3703422305,3703422305
-dd	2257292045,2257292045
-dd	2240449039,2240449039
-dd	2423288032,2423288032
-dd	1111375484,1111375484
-dd	3300242801,3300242801
-dd	2858837708,2858837708
-dd	3628615824,3628615824
-dd	84083462,84083462
-dd	32962295,32962295
-dd	302911004,302911004
-dd	2741068226,2741068226
-dd	1597322602,1597322602
-dd	4183250862,4183250862
-dd	3501832553,3501832553
-dd	2441512471,2441512471
-dd	1489093017,1489093017
-dd	656219450,656219450
-dd	3114180135,3114180135
-dd	954327513,954327513
-dd	335083755,335083755
-dd	3013122091,3013122091
-dd	856756514,856756514
-dd	3144247762,3144247762
-dd	1893325225,1893325225
-dd	2307821063,2307821063
-dd	2811532339,2811532339
-dd	3063651117,3063651117
-dd	572399164,572399164
-dd	2458355477,2458355477
-dd	552200649,552200649
-dd	1238290055,1238290055
-dd	4283782570,4283782570
-dd	2015897680,2015897680
-dd	2061492133,2061492133
-dd	2408352771,2408352771
-dd	4171342169,4171342169
-dd	2156497161,2156497161
-dd	386731290,386731290
-dd	3669999461,3669999461
-dd	837215959,837215959
-dd	3326231172,3326231172
-dd	3093850320,3093850320
-dd	3275833730,3275833730
-dd	2962856233,2962856233
-dd	1999449434,1999449434
-dd	286199582,286199582
-dd	3417354363,3417354363
-dd	4233385128,4233385128
-dd	3602627437,3602627437
-dd	974525996,974525996
-db	99,124,119,123,242,107,111,197
-db	48,1,103,43,254,215,171,118
-db	202,130,201,125,250,89,71,240
-db	173,212,162,175,156,164,114,192
-db	183,253,147,38,54,63,247,204
-db	52,165,229,241,113,216,49,21
-db	4,199,35,195,24,150,5,154
-db	7,18,128,226,235,39,178,117
-db	9,131,44,26,27,110,90,160
-db	82,59,214,179,41,227,47,132
-db	83,209,0,237,32,252,177,91
-db	106,203,190,57,74,76,88,207
-db	208,239,170,251,67,77,51,133
-db	69,249,2,127,80,60,159,168
-db	81,163,64,143,146,157,56,245
-db	188,182,218,33,16,255,243,210
-db	205,12,19,236,95,151,68,23
-db	196,167,126,61,100,93,25,115
-db	96,129,79,220,34,42,144,136
-db	70,238,184,20,222,94,11,219
-db	224,50,58,10,73,6,36,92
-db	194,211,172,98,145,149,228,121
-db	231,200,55,109,141,213,78,169
-db	108,86,244,234,101,122,174,8
-db	186,120,37,46,28,166,180,198
-db	232,221,116,31,75,189,139,138
-db	112,62,181,102,72,3,246,14
-db	97,53,87,185,134,193,29,158
-db	225,248,152,17,105,217,142,148
-db	155,30,135,233,206,85,40,223
-db	140,161,137,13,191,230,66,104
-db	65,153,45,15,176,84,187,22
-db	99,124,119,123,242,107,111,197
-db	48,1,103,43,254,215,171,118
-db	202,130,201,125,250,89,71,240
-db	173,212,162,175,156,164,114,192
-db	183,253,147,38,54,63,247,204
-db	52,165,229,241,113,216,49,21
-db	4,199,35,195,24,150,5,154
-db	7,18,128,226,235,39,178,117
-db	9,131,44,26,27,110,90,160
-db	82,59,214,179,41,227,47,132
-db	83,209,0,237,32,252,177,91
-db	106,203,190,57,74,76,88,207
-db	208,239,170,251,67,77,51,133
-db	69,249,2,127,80,60,159,168
-db	81,163,64,143,146,157,56,245
-db	188,182,218,33,16,255,243,210
-db	205,12,19,236,95,151,68,23
-db	196,167,126,61,100,93,25,115
-db	96,129,79,220,34,42,144,136
-db	70,238,184,20,222,94,11,219
-db	224,50,58,10,73,6,36,92
-db	194,211,172,98,145,149,228,121
-db	231,200,55,109,141,213,78,169
-db	108,86,244,234,101,122,174,8
-db	186,120,37,46,28,166,180,198
-db	232,221,116,31,75,189,139,138
-db	112,62,181,102,72,3,246,14
-db	97,53,87,185,134,193,29,158
-db	225,248,152,17,105,217,142,148
-db	155,30,135,233,206,85,40,223
-db	140,161,137,13,191,230,66,104
-db	65,153,45,15,176,84,187,22
-db	99,124,119,123,242,107,111,197
-db	48,1,103,43,254,215,171,118
-db	202,130,201,125,250,89,71,240
-db	173,212,162,175,156,164,114,192
-db	183,253,147,38,54,63,247,204
-db	52,165,229,241,113,216,49,21
-db	4,199,35,195,24,150,5,154
-db	7,18,128,226,235,39,178,117
-db	9,131,44,26,27,110,90,160
-db	82,59,214,179,41,227,47,132
-db	83,209,0,237,32,252,177,91
-db	106,203,190,57,74,76,88,207
-db	208,239,170,251,67,77,51,133
-db	69,249,2,127,80,60,159,168
-db	81,163,64,143,146,157,56,245
-db	188,182,218,33,16,255,243,210
-db	205,12,19,236,95,151,68,23
-db	196,167,126,61,100,93,25,115
-db	96,129,79,220,34,42,144,136
-db	70,238,184,20,222,94,11,219
-db	224,50,58,10,73,6,36,92
-db	194,211,172,98,145,149,228,121
-db	231,200,55,109,141,213,78,169
-db	108,86,244,234,101,122,174,8
-db	186,120,37,46,28,166,180,198
-db	232,221,116,31,75,189,139,138
-db	112,62,181,102,72,3,246,14
-db	97,53,87,185,134,193,29,158
-db	225,248,152,17,105,217,142,148
-db	155,30,135,233,206,85,40,223
-db	140,161,137,13,191,230,66,104
-db	65,153,45,15,176,84,187,22
-db	99,124,119,123,242,107,111,197
-db	48,1,103,43,254,215,171,118
-db	202,130,201,125,250,89,71,240
-db	173,212,162,175,156,164,114,192
-db	183,253,147,38,54,63,247,204
-db	52,165,229,241,113,216,49,21
-db	4,199,35,195,24,150,5,154
-db	7,18,128,226,235,39,178,117
-db	9,131,44,26,27,110,90,160
-db	82,59,214,179,41,227,47,132
-db	83,209,0,237,32,252,177,91
-db	106,203,190,57,74,76,88,207
-db	208,239,170,251,67,77,51,133
-db	69,249,2,127,80,60,159,168
-db	81,163,64,143,146,157,56,245
-db	188,182,218,33,16,255,243,210
-db	205,12,19,236,95,151,68,23
-db	196,167,126,61,100,93,25,115
-db	96,129,79,220,34,42,144,136
-db	70,238,184,20,222,94,11,219
-db	224,50,58,10,73,6,36,92
-db	194,211,172,98,145,149,228,121
-db	231,200,55,109,141,213,78,169
-db	108,86,244,234,101,122,174,8
-db	186,120,37,46,28,166,180,198
-db	232,221,116,31,75,189,139,138
-db	112,62,181,102,72,3,246,14
-db	97,53,87,185,134,193,29,158
-db	225,248,152,17,105,217,142,148
-db	155,30,135,233,206,85,40,223
-db	140,161,137,13,191,230,66,104
-db	65,153,45,15,176,84,187,22
-dd	1,2,4,8
-dd	16,32,64,128
-dd	27,54,0,0
-dd	0,0,0,0
-global	_AES_encrypt
-align	16
-_AES_encrypt:
-L$_AES_encrypt_begin:
-	push	ebp
-	push	ebx
-	push	esi
-	push	edi
-	mov	esi,DWORD [20+esp]
-	mov	edi,DWORD [28+esp]
-	mov	eax,esp
-	sub	esp,36
-	and	esp,-64
-	lea	ebx,[edi-127]
-	sub	ebx,esp
-	neg	ebx
-	and	ebx,960
-	sub	esp,ebx
-	add	esp,4
-	mov	DWORD [28+esp],eax
-	call	L$004pic_point
-L$004pic_point:
-	pop	ebp
-	lea	eax,[_OPENSSL_ia32cap_P]
-	lea	ebp,[(L$AES_Te-L$004pic_point)+ebp]
-	lea	ebx,[764+esp]
-	sub	ebx,ebp
-	and	ebx,768
-	lea	ebp,[2176+ebx*1+ebp]
-	bt	DWORD [eax],25
-	jnc	NEAR L$005x86
-	movq	mm0,[esi]
-	movq	mm4,[8+esi]
-	call	__sse_AES_encrypt_compact
-	mov	esp,DWORD [28+esp]
-	mov	esi,DWORD [24+esp]
-	movq	[esi],mm0
-	movq	[8+esi],mm4
-	emms
-	pop	edi
-	pop	esi
-	pop	ebx
-	pop	ebp
-	ret
-align	16
-L$005x86:
-	mov	DWORD [24+esp],ebp
-	mov	eax,DWORD [esi]
-	mov	ebx,DWORD [4+esi]
-	mov	ecx,DWORD [8+esi]
-	mov	edx,DWORD [12+esi]
-	call	__x86_AES_encrypt_compact
-	mov	esp,DWORD [28+esp]
-	mov	esi,DWORD [24+esp]
-	mov	DWORD [esi],eax
-	mov	DWORD [4+esi],ebx
-	mov	DWORD [8+esi],ecx
-	mov	DWORD [12+esi],edx
-	pop	edi
-	pop	esi
-	pop	ebx
-	pop	ebp
-	ret
-align	16
-__x86_AES_decrypt_compact:
-	mov	DWORD [20+esp],edi
-	xor	eax,DWORD [edi]
-	xor	ebx,DWORD [4+edi]
-	xor	ecx,DWORD [8+edi]
-	xor	edx,DWORD [12+edi]
-	mov	esi,DWORD [240+edi]
-	lea	esi,[esi*1+esi-2]
-	lea	esi,[esi*8+edi]
-	mov	DWORD [24+esp],esi
-	mov	edi,DWORD [ebp-128]
-	mov	esi,DWORD [ebp-96]
-	mov	edi,DWORD [ebp-64]
-	mov	esi,DWORD [ebp-32]
-	mov	edi,DWORD [ebp]
-	mov	esi,DWORD [32+ebp]
-	mov	edi,DWORD [64+ebp]
-	mov	esi,DWORD [96+ebp]
-align	16
-L$006loop:
-	mov	esi,eax
-	and	esi,255
-	movzx	esi,BYTE [esi*1+ebp-128]
-	movzx	edi,dh
-	movzx	edi,BYTE [edi*1+ebp-128]
-	shl	edi,8
-	xor	esi,edi
-	mov	edi,ecx
-	shr	edi,16
-	and	edi,255
-	movzx	edi,BYTE [edi*1+ebp-128]
-	shl	edi,16
-	xor	esi,edi
-	mov	edi,ebx
-	shr	edi,24
-	movzx	edi,BYTE [edi*1+ebp-128]
-	shl	edi,24
-	xor	esi,edi
-	mov	DWORD [4+esp],esi
-	mov	esi,ebx
-	and	esi,255
-	movzx	esi,BYTE [esi*1+ebp-128]
-	movzx	edi,ah
-	movzx	edi,BYTE [edi*1+ebp-128]
-	shl	edi,8
-	xor	esi,edi
-	mov	edi,edx
-	shr	edi,16
-	and	edi,255
-	movzx	edi,BYTE [edi*1+ebp-128]
-	shl	edi,16
-	xor	esi,edi
-	mov	edi,ecx
-	shr	edi,24
-	movzx	edi,BYTE [edi*1+ebp-128]
-	shl	edi,24
-	xor	esi,edi
-	mov	DWORD [8+esp],esi
-	mov	esi,ecx
-	and	esi,255
-	movzx	esi,BYTE [esi*1+ebp-128]
-	movzx	edi,bh
-	movzx	edi,BYTE [edi*1+ebp-128]
-	shl	edi,8
-	xor	esi,edi
-	mov	edi,eax
-	shr	edi,16
-	and	edi,255
-	movzx	edi,BYTE [edi*1+ebp-128]
-	shl	edi,16
-	xor	esi,edi
-	mov	edi,edx
-	shr	edi,24
-	movzx	edi,BYTE [edi*1+ebp-128]
-	shl	edi,24
-	xor	esi,edi
-	and	edx,255
-	movzx	edx,BYTE [edx*1+ebp-128]
-	movzx	ecx,ch
-	movzx	ecx,BYTE [ecx*1+ebp-128]
-	shl	ecx,8
-	xor	edx,ecx
-	mov	ecx,esi
-	shr	ebx,16
-	and	ebx,255
-	movzx	ebx,BYTE [ebx*1+ebp-128]
-	shl	ebx,16
-	xor	edx,ebx
-	shr	eax,24
-	movzx	eax,BYTE [eax*1+ebp-128]
-	shl	eax,24
-	xor	edx,eax
-	mov	edi,2155905152
-	and	edi,ecx
-	mov	esi,edi
-	shr	edi,7
-	lea	eax,[ecx*1+ecx]
-	sub	esi,edi
-	and	eax,4278124286
-	and	esi,454761243
-	xor	eax,esi
-	mov	edi,2155905152
-	and	edi,eax
-	mov	esi,edi
-	shr	edi,7
-	lea	ebx,[eax*1+eax]
-	sub	esi,edi
-	and	ebx,4278124286
-	and	esi,454761243
-	xor	eax,ecx
-	xor	ebx,esi
-	mov	edi,2155905152
-	and	edi,ebx
-	mov	esi,edi
-	shr	edi,7
-	lea	ebp,[ebx*1+ebx]
-	sub	esi,edi
-	and	ebp,4278124286
-	and	esi,454761243
-	xor	ebx,ecx
-	rol	ecx,8
-	xor	ebp,esi
-	xor	ecx,eax
-	xor	eax,ebp
-	xor	ecx,ebx
-	xor	ebx,ebp
-	rol	eax,24
-	xor	ecx,ebp
-	rol	ebx,16
-	xor	ecx,eax
-	rol	ebp,8
-	xor	ecx,ebx
-	mov	eax,DWORD [4+esp]
-	xor	ecx,ebp
-	mov	DWORD [12+esp],ecx
-	mov	edi,2155905152
-	and	edi,edx
-	mov	esi,edi
-	shr	edi,7
-	lea	ebx,[edx*1+edx]
-	sub	esi,edi
-	and	ebx,4278124286
-	and	esi,454761243
-	xor	ebx,esi
-	mov	edi,2155905152
-	and	edi,ebx
-	mov	esi,edi
-	shr	edi,7
-	lea	ecx,[ebx*1+ebx]
-	sub	esi,edi
-	and	ecx,4278124286
-	and	esi,454761243
-	xor	ebx,edx
-	xor	ecx,esi
-	mov	edi,2155905152
-	and	edi,ecx
-	mov	esi,edi
-	shr	edi,7
-	lea	ebp,[ecx*1+ecx]
-	sub	esi,edi
-	and	ebp,4278124286
-	and	esi,454761243
-	xor	ecx,edx
-	rol	edx,8
-	xor	ebp,esi
-	xor	edx,ebx
-	xor	ebx,ebp
-	xor	edx,ecx
-	xor	ecx,ebp
-	rol	ebx,24
-	xor	edx,ebp
-	rol	ecx,16
-	xor	edx,ebx
-	rol	ebp,8
-	xor	edx,ecx
-	mov	ebx,DWORD [8+esp]
-	xor	edx,ebp
-	mov	DWORD [16+esp],edx
-	mov	edi,2155905152
-	and	edi,eax
-	mov	esi,edi
-	shr	edi,7
-	lea	ecx,[eax*1+eax]
-	sub	esi,edi
-	and	ecx,4278124286
-	and	esi,454761243
-	xor	ecx,esi
-	mov	edi,2155905152
-	and	edi,ecx
-	mov	esi,edi
-	shr	edi,7
-	lea	edx,[ecx*1+ecx]
-	sub	esi,edi
-	and	edx,4278124286
-	and	esi,454761243
-	xor	ecx,eax
-	xor	edx,esi
-	mov	edi,2155905152
-	and	edi,edx
-	mov	esi,edi
-	shr	edi,7
-	lea	ebp,[edx*1+edx]
-	sub	esi,edi
-	and	ebp,4278124286
-	and	esi,454761243
-	xor	edx,eax
-	rol	eax,8
-	xor	ebp,esi
-	xor	eax,ecx
-	xor	ecx,ebp
-	xor	eax,edx
-	xor	edx,ebp
-	rol	ecx,24
-	xor	eax,ebp
-	rol	edx,16
-	xor	eax,ecx
-	rol	ebp,8
-	xor	eax,edx
-	xor	eax,ebp
-	mov	edi,2155905152
-	and	edi,ebx
-	mov	esi,edi
-	shr	edi,7
-	lea	ecx,[ebx*1+ebx]
-	sub	esi,edi
-	and	ecx,4278124286
-	and	esi,454761243
-	xor	ecx,esi
-	mov	edi,2155905152
-	and	edi,ecx
-	mov	esi,edi
-	shr	edi,7
-	lea	edx,[ecx*1+ecx]
-	sub	esi,edi
-	and	edx,4278124286
-	and	esi,454761243
-	xor	ecx,ebx
-	xor	edx,esi
-	mov	edi,2155905152
-	and	edi,edx
-	mov	esi,edi
-	shr	edi,7
-	lea	ebp,[edx*1+edx]
-	sub	esi,edi
-	and	ebp,4278124286
-	and	esi,454761243
-	xor	edx,ebx
-	rol	ebx,8
-	xor	ebp,esi
-	xor	ebx,ecx
-	xor	ecx,ebp
-	xor	ebx,edx
-	xor	edx,ebp
-	rol	ecx,24
-	xor	ebx,ebp
-	rol	edx,16
-	xor	ebx,ecx
-	rol	ebp,8
-	xor	ebx,edx
-	mov	ecx,DWORD [12+esp]
-	xor	ebx,ebp
-	mov	edx,DWORD [16+esp]
-	mov	edi,DWORD [20+esp]
-	mov	ebp,DWORD [28+esp]
-	add	edi,16
-	xor	eax,DWORD [edi]
-	xor	ebx,DWORD [4+edi]
-	xor	ecx,DWORD [8+edi]
-	xor	edx,DWORD [12+edi]
-	cmp	edi,DWORD [24+esp]
-	mov	DWORD [20+esp],edi
-	jb	NEAR L$006loop
-	mov	esi,eax
-	and	esi,255
-	movzx	esi,BYTE [esi*1+ebp-128]
-	movzx	edi,dh
-	movzx	edi,BYTE [edi*1+ebp-128]
-	shl	edi,8
-	xor	esi,edi
-	mov	edi,ecx
-	shr	edi,16
-	and	edi,255
-	movzx	edi,BYTE [edi*1+ebp-128]
-	shl	edi,16
-	xor	esi,edi
-	mov	edi,ebx
-	shr	edi,24
-	movzx	edi,BYTE [edi*1+ebp-128]
-	shl	edi,24
-	xor	esi,edi
-	mov	DWORD [4+esp],esi
-	mov	esi,ebx
-	and	esi,255
-	movzx	esi,BYTE [esi*1+ebp-128]
-	movzx	edi,ah
-	movzx	edi,BYTE [edi*1+ebp-128]
-	shl	edi,8
-	xor	esi,edi
-	mov	edi,edx
-	shr	edi,16
-	and	edi,255
-	movzx	edi,BYTE [edi*1+ebp-128]
-	shl	edi,16
-	xor	esi,edi
-	mov	edi,ecx
-	shr	edi,24
-	movzx	edi,BYTE [edi*1+ebp-128]
-	shl	edi,24
-	xor	esi,edi
-	mov	DWORD [8+esp],esi
-	mov	esi,ecx
-	and	esi,255
-	movzx	esi,BYTE [esi*1+ebp-128]
-	movzx	edi,bh
-	movzx	edi,BYTE [edi*1+ebp-128]
-	shl	edi,8
-	xor	esi,edi
-	mov	edi,eax
-	shr	edi,16
-	and	edi,255
-	movzx	edi,BYTE [edi*1+ebp-128]
-	shl	edi,16
-	xor	esi,edi
-	mov	edi,edx
-	shr	edi,24
-	movzx	edi,BYTE [edi*1+ebp-128]
-	shl	edi,24
-	xor	esi,edi
-	mov	edi,DWORD [20+esp]
-	and	edx,255
-	movzx	edx,BYTE [edx*1+ebp-128]
-	movzx	ecx,ch
-	movzx	ecx,BYTE [ecx*1+ebp-128]
-	shl	ecx,8
-	xor	edx,ecx
-	mov	ecx,esi
-	shr	ebx,16
-	and	ebx,255
-	movzx	ebx,BYTE [ebx*1+ebp-128]
-	shl	ebx,16
-	xor	edx,ebx
-	mov	ebx,DWORD [8+esp]
-	shr	eax,24
-	movzx	eax,BYTE [eax*1+ebp-128]
-	shl	eax,24
-	xor	edx,eax
-	mov	eax,DWORD [4+esp]
-	xor	eax,DWORD [16+edi]
-	xor	ebx,DWORD [20+edi]
-	xor	ecx,DWORD [24+edi]
-	xor	edx,DWORD [28+edi]
-	ret
-align	16
-__sse_AES_decrypt_compact:
-	pxor	mm0,[edi]
-	pxor	mm4,[8+edi]
-	mov	esi,DWORD [240+edi]
-	lea	esi,[esi*1+esi-2]
-	lea	esi,[esi*8+edi]
-	mov	DWORD [24+esp],esi
-	mov	eax,454761243
-	mov	DWORD [8+esp],eax
-	mov	DWORD [12+esp],eax
-	mov	eax,DWORD [ebp-128]
-	mov	ebx,DWORD [ebp-96]
-	mov	ecx,DWORD [ebp-64]
-	mov	edx,DWORD [ebp-32]
-	mov	eax,DWORD [ebp]
-	mov	ebx,DWORD [32+ebp]
-	mov	ecx,DWORD [64+ebp]
-	mov	edx,DWORD [96+ebp]
-align	16
-L$007loop:
-	pshufw	mm1,mm0,12
-	pshufw	mm5,mm4,9
-	movd	eax,mm1
-	movd	ebx,mm5
-	mov	DWORD [20+esp],edi
-	movzx	esi,al
-	movzx	edx,ah
-	pshufw	mm2,mm0,6
-	movzx	ecx,BYTE [esi*1+ebp-128]
-	movzx	edi,bl
-	movzx	edx,BYTE [edx*1+ebp-128]
-	shr	eax,16
-	shl	edx,8
-	movzx	esi,BYTE [edi*1+ebp-128]
-	movzx	edi,bh
-	shl	esi,16
-	pshufw	mm6,mm4,3
-	or	ecx,esi
-	movzx	esi,BYTE [edi*1+ebp-128]
-	movzx	edi,ah
-	shl	esi,24
-	shr	ebx,16
-	or	edx,esi
-	movzx	esi,BYTE [edi*1+ebp-128]
-	movzx	edi,bh
-	shl	esi,24
-	or	ecx,esi
-	movzx	esi,BYTE [edi*1+ebp-128]
-	movzx	edi,al
-	shl	esi,8
-	movd	eax,mm2
-	or	ecx,esi
-	movzx	esi,BYTE [edi*1+ebp-128]
-	movzx	edi,bl
-	shl	esi,16
-	movd	ebx,mm6
-	movd	mm0,ecx
-	movzx	ecx,BYTE [edi*1+ebp-128]
-	movzx	edi,al
-	or	ecx,esi
-	movzx	esi,BYTE [edi*1+ebp-128]
-	movzx	edi,bl
-	or	edx,esi
-	movzx	esi,BYTE [edi*1+ebp-128]
-	movzx	edi,ah
-	shl	esi,16
-	shr	eax,16
-	or	edx,esi
-	movzx	esi,BYTE [edi*1+ebp-128]
-	movzx	edi,bh
-	shr	ebx,16
-	shl	esi,8
-	movd	mm1,edx
-	movzx	edx,BYTE [edi*1+ebp-128]
-	movzx	edi,bh
-	shl	edx,24
-	and	ebx,255
-	or	edx,esi
-	punpckldq	mm0,mm1
-	movzx	esi,BYTE [edi*1+ebp-128]
-	movzx	edi,al
-	shl	esi,8
-	movzx	eax,ah
-	movzx	ebx,BYTE [ebx*1+ebp-128]
-	or	ecx,esi
-	movzx	esi,BYTE [edi*1+ebp-128]
-	or	edx,ebx
-	shl	esi,16
-	movzx	eax,BYTE [eax*1+ebp-128]
-	or	edx,esi
-	shl	eax,24
-	or	ecx,eax
-	mov	edi,DWORD [20+esp]
-	movd	mm4,edx
-	movd	mm5,ecx
-	punpckldq	mm4,mm5
-	add	edi,16
-	cmp	edi,DWORD [24+esp]
-	ja	NEAR L$008out
-	movq	mm3,mm0
-	movq	mm7,mm4
-	pshufw	mm2,mm0,228
-	pshufw	mm6,mm4,228
-	movq	mm1,mm0
-	movq	mm5,mm4
-	pshufw	mm0,mm0,177
-	pshufw	mm4,mm4,177
-	pslld	mm2,8
-	pslld	mm6,8
-	psrld	mm3,8
-	psrld	mm7,8
-	pxor	mm0,mm2
-	pxor	mm4,mm6
-	pxor	mm0,mm3
-	pxor	mm4,mm7
-	pslld	mm2,16
-	pslld	mm6,16
-	psrld	mm3,16
-	psrld	mm7,16
-	pxor	mm0,mm2
-	pxor	mm4,mm6
-	pxor	mm0,mm3
-	pxor	mm4,mm7
-	movq	mm3,[8+esp]
-	pxor	mm2,mm2
-	pxor	mm6,mm6
-	pcmpgtb	mm2,mm1
-	pcmpgtb	mm6,mm5
-	pand	mm2,mm3
-	pand	mm6,mm3
-	paddb	mm1,mm1
-	paddb	mm5,mm5
-	pxor	mm1,mm2
-	pxor	mm5,mm6
-	movq	mm3,mm1
-	movq	mm7,mm5
-	movq	mm2,mm1
-	movq	mm6,mm5
-	pxor	mm0,mm1
-	pxor	mm4,mm5
-	pslld	mm3,24
-	pslld	mm7,24
-	psrld	mm2,8
-	psrld	mm6,8
-	pxor	mm0,mm3
-	pxor	mm4,mm7
-	pxor	mm0,mm2
-	pxor	mm4,mm6
-	movq	mm2,[8+esp]
-	pxor	mm3,mm3
-	pxor	mm7,mm7
-	pcmpgtb	mm3,mm1
-	pcmpgtb	mm7,mm5
-	pand	mm3,mm2
-	pand	mm7,mm2
-	paddb	mm1,mm1
-	paddb	mm5,mm5
-	pxor	mm1,mm3
-	pxor	mm5,mm7
-	pshufw	mm3,mm1,177
-	pshufw	mm7,mm5,177
-	pxor	mm0,mm1
-	pxor	mm4,mm5
-	pxor	mm0,mm3
-	pxor	mm4,mm7
-	pxor	mm3,mm3
-	pxor	mm7,mm7
-	pcmpgtb	mm3,mm1
-	pcmpgtb	mm7,mm5
-	pand	mm3,mm2
-	pand	mm7,mm2
-	paddb	mm1,mm1
-	paddb	mm5,mm5
-	pxor	mm1,mm3
-	pxor	mm5,mm7
-	pxor	mm0,mm1
-	pxor	mm4,mm5
-	movq	mm3,mm1
-	movq	mm7,mm5
-	pshufw	mm2,mm1,177
-	pshufw	mm6,mm5,177
-	pxor	mm0,mm2
-	pxor	mm4,mm6
-	pslld	mm1,8
-	pslld	mm5,8
-	psrld	mm3,8
-	psrld	mm7,8
-	movq	mm2,[edi]
-	movq	mm6,[8+edi]
-	pxor	mm0,mm1
-	pxor	mm4,mm5
-	pxor	mm0,mm3
-	pxor	mm4,mm7
-	mov	eax,DWORD [ebp-128]
-	pslld	mm1,16
-	pslld	mm5,16
-	mov	ebx,DWORD [ebp-64]
-	psrld	mm3,16
-	psrld	mm7,16
-	mov	ecx,DWORD [ebp]
-	pxor	mm0,mm1
-	pxor	mm4,mm5
-	mov	edx,DWORD [64+ebp]
-	pxor	mm0,mm3
-	pxor	mm4,mm7
-	pxor	mm0,mm2
-	pxor	mm4,mm6
-	jmp	NEAR L$007loop
-align	16
-L$008out:
-	pxor	mm0,[edi]
-	pxor	mm4,[8+edi]
-	ret
-align	16
-__x86_AES_decrypt:
-	mov	DWORD [20+esp],edi
-	xor	eax,DWORD [edi]
-	xor	ebx,DWORD [4+edi]
-	xor	ecx,DWORD [8+edi]
-	xor	edx,DWORD [12+edi]
-	mov	esi,DWORD [240+edi]
-	lea	esi,[esi*1+esi-2]
-	lea	esi,[esi*8+edi]
-	mov	DWORD [24+esp],esi
-align	16
-L$009loop:
-	mov	esi,eax
-	and	esi,255
-	mov	esi,DWORD [esi*8+ebp]
-	movzx	edi,dh
-	xor	esi,DWORD [3+edi*8+ebp]
-	mov	edi,ecx
-	shr	edi,16
-	and	edi,255
-	xor	esi,DWORD [2+edi*8+ebp]
-	mov	edi,ebx
-	shr	edi,24
-	xor	esi,DWORD [1+edi*8+ebp]
-	mov	DWORD [4+esp],esi
-	mov	esi,ebx
-	and	esi,255
-	mov	esi,DWORD [esi*8+ebp]
-	movzx	edi,ah
-	xor	esi,DWORD [3+edi*8+ebp]
-	mov	edi,edx
-	shr	edi,16
-	and	edi,255
-	xor	esi,DWORD [2+edi*8+ebp]
-	mov	edi,ecx
-	shr	edi,24
-	xor	esi,DWORD [1+edi*8+ebp]
-	mov	DWORD [8+esp],esi
-	mov	esi,ecx
-	and	esi,255
-	mov	esi,DWORD [esi*8+ebp]
-	movzx	edi,bh
-	xor	esi,DWORD [3+edi*8+ebp]
-	mov	edi,eax
-	shr	edi,16
-	and	edi,255
-	xor	esi,DWORD [2+edi*8+ebp]
-	mov	edi,edx
-	shr	edi,24
-	xor	esi,DWORD [1+edi*8+ebp]
-	mov	edi,DWORD [20+esp]
-	and	edx,255
-	mov	edx,DWORD [edx*8+ebp]
-	movzx	ecx,ch
-	xor	edx,DWORD [3+ecx*8+ebp]
-	mov	ecx,esi
-	shr	ebx,16
-	and	ebx,255
-	xor	edx,DWORD [2+ebx*8+ebp]
-	mov	ebx,DWORD [8+esp]
-	shr	eax,24
-	xor	edx,DWORD [1+eax*8+ebp]
-	mov	eax,DWORD [4+esp]
-	add	edi,16
-	xor	eax,DWORD [edi]
-	xor	ebx,DWORD [4+edi]
-	xor	ecx,DWORD [8+edi]
-	xor	edx,DWORD [12+edi]
-	cmp	edi,DWORD [24+esp]
-	mov	DWORD [20+esp],edi
-	jb	NEAR L$009loop
-	lea	ebp,[2176+ebp]
-	mov	edi,DWORD [ebp-128]
-	mov	esi,DWORD [ebp-96]
-	mov	edi,DWORD [ebp-64]
-	mov	esi,DWORD [ebp-32]
-	mov	edi,DWORD [ebp]
-	mov	esi,DWORD [32+ebp]
-	mov	edi,DWORD [64+ebp]
-	mov	esi,DWORD [96+ebp]
-	lea	ebp,[ebp-128]
-	mov	esi,eax
-	and	esi,255
-	movzx	esi,BYTE [esi*1+ebp]
-	movzx	edi,dh
-	movzx	edi,BYTE [edi*1+ebp]
-	shl	edi,8
-	xor	esi,edi
-	mov	edi,ecx
-	shr	edi,16
-	and	edi,255
-	movzx	edi,BYTE [edi*1+ebp]
-	shl	edi,16
-	xor	esi,edi
-	mov	edi,ebx
-	shr	edi,24
-	movzx	edi,BYTE [edi*1+ebp]
-	shl	edi,24
-	xor	esi,edi
-	mov	DWORD [4+esp],esi
-	mov	esi,ebx
-	and	esi,255
-	movzx	esi,BYTE [esi*1+ebp]
-	movzx	edi,ah
-	movzx	edi,BYTE [edi*1+ebp]
-	shl	edi,8
-	xor	esi,edi
-	mov	edi,edx
-	shr	edi,16
-	and	edi,255
-	movzx	edi,BYTE [edi*1+ebp]
-	shl	edi,16
-	xor	esi,edi
-	mov	edi,ecx
-	shr	edi,24
-	movzx	edi,BYTE [edi*1+ebp]
-	shl	edi,24
-	xor	esi,edi
-	mov	DWORD [8+esp],esi
-	mov	esi,ecx
-	and	esi,255
-	movzx	esi,BYTE [esi*1+ebp]
-	movzx	edi,bh
-	movzx	edi,BYTE [edi*1+ebp]
-	shl	edi,8
-	xor	esi,edi
-	mov	edi,eax
-	shr	edi,16
-	and	edi,255
-	movzx	edi,BYTE [edi*1+ebp]
-	shl	edi,16
-	xor	esi,edi
-	mov	edi,edx
-	shr	edi,24
-	movzx	edi,BYTE [edi*1+ebp]
-	shl	edi,24
-	xor	esi,edi
-	mov	edi,DWORD [20+esp]
-	and	edx,255
-	movzx	edx,BYTE [edx*1+ebp]
-	movzx	ecx,ch
-	movzx	ecx,BYTE [ecx*1+ebp]
-	shl	ecx,8
-	xor	edx,ecx
-	mov	ecx,esi
-	shr	ebx,16
-	and	ebx,255
-	movzx	ebx,BYTE [ebx*1+ebp]
-	shl	ebx,16
-	xor	edx,ebx
-	mov	ebx,DWORD [8+esp]
-	shr	eax,24
-	movzx	eax,BYTE [eax*1+ebp]
-	shl	eax,24
-	xor	edx,eax
-	mov	eax,DWORD [4+esp]
-	lea	ebp,[ebp-2048]
-	add	edi,16
-	xor	eax,DWORD [edi]
-	xor	ebx,DWORD [4+edi]
-	xor	ecx,DWORD [8+edi]
-	xor	edx,DWORD [12+edi]
-	ret
-align	64
-L$AES_Td:
-dd	1353184337,1353184337
-dd	1399144830,1399144830
-dd	3282310938,3282310938
-dd	2522752826,2522752826
-dd	3412831035,3412831035
-dd	4047871263,4047871263
-dd	2874735276,2874735276
-dd	2466505547,2466505547
-dd	1442459680,1442459680
-dd	4134368941,4134368941
-dd	2440481928,2440481928
-dd	625738485,625738485
-dd	4242007375,4242007375
-dd	3620416197,3620416197
-dd	2151953702,2151953702
-dd	2409849525,2409849525
-dd	1230680542,1230680542
-dd	1729870373,1729870373
-dd	2551114309,2551114309
-dd	3787521629,3787521629
-dd	41234371,41234371
-dd	317738113,317738113
-dd	2744600205,2744600205
-dd	3338261355,3338261355
-dd	3881799427,3881799427
-dd	2510066197,2510066197
-dd	3950669247,3950669247
-dd	3663286933,3663286933
-dd	763608788,763608788
-dd	3542185048,3542185048
-dd	694804553,694804553
-dd	1154009486,1154009486
-dd	1787413109,1787413109
-dd	2021232372,2021232372
-dd	1799248025,1799248025
-dd	3715217703,3715217703
-dd	3058688446,3058688446
-dd	397248752,397248752
-dd	1722556617,1722556617
-dd	3023752829,3023752829
-dd	407560035,407560035
-dd	2184256229,2184256229
-dd	1613975959,1613975959
-dd	1165972322,1165972322
-dd	3765920945,3765920945
-dd	2226023355,2226023355
-dd	480281086,480281086
-dd	2485848313,2485848313
-dd	1483229296,1483229296
-dd	436028815,436028815
-dd	2272059028,2272059028
-dd	3086515026,3086515026
-dd	601060267,601060267
-dd	3791801202,3791801202
-dd	1468997603,1468997603
-dd	715871590,715871590
-dd	120122290,120122290
-dd	63092015,63092015
-dd	2591802758,2591802758
-dd	2768779219,2768779219
-dd	4068943920,4068943920
-dd	2997206819,2997206819
-dd	3127509762,3127509762
-dd	1552029421,1552029421
-dd	723308426,723308426
-dd	2461301159,2461301159
-dd	4042393587,4042393587
-dd	2715969870,2715969870
-dd	3455375973,3455375973
-dd	3586000134,3586000134
-dd	526529745,526529745
-dd	2331944644,2331944644
-dd	2639474228,2639474228
-dd	2689987490,2689987490
-dd	853641733,853641733
-dd	1978398372,1978398372
-dd	971801355,971801355
-dd	2867814464,2867814464
-dd	111112542,111112542
-dd	1360031421,1360031421
-dd	4186579262,4186579262
-dd	1023860118,1023860118
-dd	2919579357,2919579357
-dd	1186850381,1186850381
-dd	3045938321,3045938321
-dd	90031217,90031217
-dd	1876166148,1876166148
-dd	4279586912,4279586912
-dd	620468249,620468249
-dd	2548678102,2548678102
-dd	3426959497,3426959497
-dd	2006899047,2006899047
-dd	3175278768,3175278768
-dd	2290845959,2290845959
-dd	945494503,945494503
-dd	3689859193,3689859193
-dd	1191869601,1191869601
-dd	3910091388,3910091388
-dd	3374220536,3374220536
-dd	0,0
-dd	2206629897,2206629897
-dd	1223502642,1223502642
-dd	2893025566,2893025566
-dd	1316117100,1316117100
-dd	4227796733,4227796733
-dd	1446544655,1446544655
-dd	517320253,517320253
-dd	658058550,658058550
-dd	1691946762,1691946762
-dd	564550760,564550760
-dd	3511966619,3511966619
-dd	976107044,976107044
-dd	2976320012,2976320012
-dd	266819475,266819475
-dd	3533106868,3533106868
-dd	2660342555,2660342555
-dd	1338359936,1338359936
-dd	2720062561,2720062561
-dd	1766553434,1766553434
-dd	370807324,370807324
-dd	179999714,179999714
-dd	3844776128,3844776128
-dd	1138762300,1138762300
-dd	488053522,488053522
-dd	185403662,185403662
-dd	2915535858,2915535858
-dd	3114841645,3114841645
-dd	3366526484,3366526484
-dd	2233069911,2233069911
-dd	1275557295,1275557295
-dd	3151862254,3151862254
-dd	4250959779,4250959779
-dd	2670068215,2670068215
-dd	3170202204,3170202204
-dd	3309004356,3309004356
-dd	880737115,880737115
-dd	1982415755,1982415755
-dd	3703972811,3703972811
-dd	1761406390,1761406390
-dd	1676797112,1676797112
-dd	3403428311,3403428311
-dd	277177154,277177154
-dd	1076008723,1076008723
-dd	538035844,538035844
-dd	2099530373,2099530373
-dd	4164795346,4164795346
-dd	288553390,288553390
-dd	1839278535,1839278535
-dd	1261411869,1261411869
-dd	4080055004,4080055004
-dd	3964831245,3964831245
-dd	3504587127,3504587127
-dd	1813426987,1813426987
-dd	2579067049,2579067049
-dd	4199060497,4199060497
-dd	577038663,577038663
-dd	3297574056,3297574056
-dd	440397984,440397984
-dd	3626794326,3626794326
-dd	4019204898,4019204898
-dd	3343796615,3343796615
-dd	3251714265,3251714265
-dd	4272081548,4272081548
-dd	906744984,906744984
-dd	3481400742,3481400742
-dd	685669029,685669029
-dd	646887386,646887386
-dd	2764025151,2764025151
-dd	3835509292,3835509292
-dd	227702864,227702864
-dd	2613862250,2613862250
-dd	1648787028,1648787028
-dd	3256061430,3256061430
-dd	3904428176,3904428176
-dd	1593260334,1593260334
-dd	4121936770,4121936770
-dd	3196083615,3196083615
-dd	2090061929,2090061929
-dd	2838353263,2838353263
-dd	3004310991,3004310991
-dd	999926984,999926984
-dd	2809993232,2809993232
-dd	1852021992,1852021992
-dd	2075868123,2075868123
-dd	158869197,158869197
-dd	4095236462,4095236462
-dd	28809964,28809964
-dd	2828685187,2828685187
-dd	1701746150,1701746150
-dd	2129067946,2129067946
-dd	147831841,147831841
-dd	3873969647,3873969647
-dd	3650873274,3650873274
-dd	3459673930,3459673930
-dd	3557400554,3557400554
-dd	3598495785,3598495785
-dd	2947720241,2947720241
-dd	824393514,824393514
-dd	815048134,815048134
-dd	3227951669,3227951669
-dd	935087732,935087732
-dd	2798289660,2798289660
-dd	2966458592,2966458592
-dd	366520115,366520115
-dd	1251476721,1251476721
-dd	4158319681,4158319681
-dd	240176511,240176511
-dd	804688151,804688151
-dd	2379631990,2379631990
-dd	1303441219,1303441219
-dd	1414376140,1414376140
-dd	3741619940,3741619940
-dd	3820343710,3820343710
-dd	461924940,461924940
-dd	3089050817,3089050817
-dd	2136040774,2136040774
-dd	82468509,82468509
-dd	1563790337,1563790337
-dd	1937016826,1937016826
-dd	776014843,776014843
-dd	1511876531,1511876531
-dd	1389550482,1389550482
-dd	861278441,861278441
-dd	323475053,323475053
-dd	2355222426,2355222426
-dd	2047648055,2047648055
-dd	2383738969,2383738969
-dd	2302415851,2302415851
-dd	3995576782,3995576782
-dd	902390199,902390199
-dd	3991215329,3991215329
-dd	1018251130,1018251130
-dd	1507840668,1507840668
-dd	1064563285,1064563285
-dd	2043548696,2043548696
-dd	3208103795,3208103795
-dd	3939366739,3939366739
-dd	1537932639,1537932639
-dd	342834655,342834655
-dd	2262516856,2262516856
-dd	2180231114,2180231114
-dd	1053059257,1053059257
-dd	741614648,741614648
-dd	1598071746,1598071746
-dd	1925389590,1925389590
-dd	203809468,203809468
-dd	2336832552,2336832552
-dd	1100287487,1100287487
-dd	1895934009,1895934009
-dd	3736275976,3736275976
-dd	2632234200,2632234200
-dd	2428589668,2428589668
-dd	1636092795,1636092795
-dd	1890988757,1890988757
-dd	1952214088,1952214088
-dd	1113045200,1113045200
-db	82,9,106,213,48,54,165,56
-db	191,64,163,158,129,243,215,251
-db	124,227,57,130,155,47,255,135
-db	52,142,67,68,196,222,233,203
-db	84,123,148,50,166,194,35,61
-db	238,76,149,11,66,250,195,78
-db	8,46,161,102,40,217,36,178
-db	118,91,162,73,109,139,209,37
-db	114,248,246,100,134,104,152,22
-db	212,164,92,204,93,101,182,146
-db	108,112,72,80,253,237,185,218
-db	94,21,70,87,167,141,157,132
-db	144,216,171,0,140,188,211,10
-db	247,228,88,5,184,179,69,6
-db	208,44,30,143,202,63,15,2
-db	193,175,189,3,1,19,138,107
-db	58,145,17,65,79,103,220,234
-db	151,242,207,206,240,180,230,115
-db	150,172,116,34,231,173,53,133
-db	226,249,55,232,28,117,223,110
-db	71,241,26,113,29,41,197,137
-db	111,183,98,14,170,24,190,27
-db	252,86,62,75,198,210,121,32
-db	154,219,192,254,120,205,90,244
-db	31,221,168,51,136,7,199,49
-db	177,18,16,89,39,128,236,95
-db	96,81,127,169,25,181,74,13
-db	45,229,122,159,147,201,156,239
-db	160,224,59,77,174,42,245,176
-db	200,235,187,60,131,83,153,97
-db	23,43,4,126,186,119,214,38
-db	225,105,20,99,85,33,12,125
-db	82,9,106,213,48,54,165,56
-db	191,64,163,158,129,243,215,251
-db	124,227,57,130,155,47,255,135
-db	52,142,67,68,196,222,233,203
-db	84,123,148,50,166,194,35,61
-db	238,76,149,11,66,250,195,78
-db	8,46,161,102,40,217,36,178
-db	118,91,162,73,109,139,209,37
-db	114,248,246,100,134,104,152,22
-db	212,164,92,204,93,101,182,146
-db	108,112,72,80,253,237,185,218
-db	94,21,70,87,167,141,157,132
-db	144,216,171,0,140,188,211,10
-db	247,228,88,5,184,179,69,6
-db	208,44,30,143,202,63,15,2
-db	193,175,189,3,1,19,138,107
-db	58,145,17,65,79,103,220,234
-db	151,242,207,206,240,180,230,115
-db	150,172,116,34,231,173,53,133
-db	226,249,55,232,28,117,223,110
-db	71,241,26,113,29,41,197,137
-db	111,183,98,14,170,24,190,27
-db	252,86,62,75,198,210,121,32
-db	154,219,192,254,120,205,90,244
-db	31,221,168,51,136,7,199,49
-db	177,18,16,89,39,128,236,95
-db	96,81,127,169,25,181,74,13
-db	45,229,122,159,147,201,156,239
-db	160,224,59,77,174,42,245,176
-db	200,235,187,60,131,83,153,97
-db	23,43,4,126,186,119,214,38
-db	225,105,20,99,85,33,12,125
-db	82,9,106,213,48,54,165,56
-db	191,64,163,158,129,243,215,251
-db	124,227,57,130,155,47,255,135
-db	52,142,67,68,196,222,233,203
-db	84,123,148,50,166,194,35,61
-db	238,76,149,11,66,250,195,78
-db	8,46,161,102,40,217,36,178
-db	118,91,162,73,109,139,209,37
-db	114,248,246,100,134,104,152,22
-db	212,164,92,204,93,101,182,146
-db	108,112,72,80,253,237,185,218
-db	94,21,70,87,167,141,157,132
-db	144,216,171,0,140,188,211,10
-db	247,228,88,5,184,179,69,6
-db	208,44,30,143,202,63,15,2
-db	193,175,189,3,1,19,138,107
-db	58,145,17,65,79,103,220,234
-db	151,242,207,206,240,180,230,115
-db	150,172,116,34,231,173,53,133
-db	226,249,55,232,28,117,223,110
-db	71,241,26,113,29,41,197,137
-db	111,183,98,14,170,24,190,27
-db	252,86,62,75,198,210,121,32
-db	154,219,192,254,120,205,90,244
-db	31,221,168,51,136,7,199,49
-db	177,18,16,89,39,128,236,95
-db	96,81,127,169,25,181,74,13
-db	45,229,122,159,147,201,156,239
-db	160,224,59,77,174,42,245,176
-db	200,235,187,60,131,83,153,97
-db	23,43,4,126,186,119,214,38
-db	225,105,20,99,85,33,12,125
-db	82,9,106,213,48,54,165,56
-db	191,64,163,158,129,243,215,251
-db	124,227,57,130,155,47,255,135
-db	52,142,67,68,196,222,233,203
-db	84,123,148,50,166,194,35,61
-db	238,76,149,11,66,250,195,78
-db	8,46,161,102,40,217,36,178
-db	118,91,162,73,109,139,209,37
-db	114,248,246,100,134,104,152,22
-db	212,164,92,204,93,101,182,146
-db	108,112,72,80,253,237,185,218
-db	94,21,70,87,167,141,157,132
-db	144,216,171,0,140,188,211,10
-db	247,228,88,5,184,179,69,6
-db	208,44,30,143,202,63,15,2
-db	193,175,189,3,1,19,138,107
-db	58,145,17,65,79,103,220,234
-db	151,242,207,206,240,180,230,115
-db	150,172,116,34,231,173,53,133
-db	226,249,55,232,28,117,223,110
-db	71,241,26,113,29,41,197,137
-db	111,183,98,14,170,24,190,27
-db	252,86,62,75,198,210,121,32
-db	154,219,192,254,120,205,90,244
-db	31,221,168,51,136,7,199,49
-db	177,18,16,89,39,128,236,95
-db	96,81,127,169,25,181,74,13
-db	45,229,122,159,147,201,156,239
-db	160,224,59,77,174,42,245,176
-db	200,235,187,60,131,83,153,97
-db	23,43,4,126,186,119,214,38
-db	225,105,20,99,85,33,12,125
-global	_AES_decrypt
-align	16
-_AES_decrypt:
-L$_AES_decrypt_begin:
-	push	ebp
-	push	ebx
-	push	esi
-	push	edi
-	mov	esi,DWORD [20+esp]
-	mov	edi,DWORD [28+esp]
-	mov	eax,esp
-	sub	esp,36
-	and	esp,-64
-	lea	ebx,[edi-127]
-	sub	ebx,esp
-	neg	ebx
-	and	ebx,960
-	sub	esp,ebx
-	add	esp,4
-	mov	DWORD [28+esp],eax
-	call	L$010pic_point
-L$010pic_point:
-	pop	ebp
-	lea	eax,[_OPENSSL_ia32cap_P]
-	lea	ebp,[(L$AES_Td-L$010pic_point)+ebp]
-	lea	ebx,[764+esp]
-	sub	ebx,ebp
-	and	ebx,768
-	lea	ebp,[2176+ebx*1+ebp]
-	bt	DWORD [eax],25
-	jnc	NEAR L$011x86
-	movq	mm0,[esi]
-	movq	mm4,[8+esi]
-	call	__sse_AES_decrypt_compact
-	mov	esp,DWORD [28+esp]
-	mov	esi,DWORD [24+esp]
-	movq	[esi],mm0
-	movq	[8+esi],mm4
-	emms
-	pop	edi
-	pop	esi
-	pop	ebx
-	pop	ebp
-	ret
-align	16
-L$011x86:
-	mov	DWORD [24+esp],ebp
-	mov	eax,DWORD [esi]
-	mov	ebx,DWORD [4+esi]
-	mov	ecx,DWORD [8+esi]
-	mov	edx,DWORD [12+esi]
-	call	__x86_AES_decrypt_compact
-	mov	esp,DWORD [28+esp]
-	mov	esi,DWORD [24+esp]
-	mov	DWORD [esi],eax
-	mov	DWORD [4+esi],ebx
-	mov	DWORD [8+esi],ecx
-	mov	DWORD [12+esi],edx
-	pop	edi
-	pop	esi
-	pop	ebx
-	pop	ebp
-	ret
-global	_AES_cbc_encrypt
-align	16
-_AES_cbc_encrypt:
-L$_AES_cbc_encrypt_begin:
-	push	ebp
-	push	ebx
-	push	esi
-	push	edi
-	mov	ecx,DWORD [28+esp]
-	cmp	ecx,0
-	je	NEAR L$012drop_out
-	call	L$013pic_point
-L$013pic_point:
-	pop	ebp
-	lea	eax,[_OPENSSL_ia32cap_P]
-	cmp	DWORD [40+esp],0
-	lea	ebp,[(L$AES_Te-L$013pic_point)+ebp]
-	jne	NEAR L$014picked_te
-	lea	ebp,[(L$AES_Td-L$AES_Te)+ebp]
-L$014picked_te:
-	pushfd
-	cld
-	cmp	ecx,512
-	jb	NEAR L$015slow_way
-	test	ecx,15
-	jnz	NEAR L$015slow_way
-	bt	DWORD [eax],28
-	jc	NEAR L$015slow_way
-	lea	esi,[esp-324]
-	and	esi,-64
-	mov	eax,ebp
-	lea	ebx,[2304+ebp]
-	mov	edx,esi
-	and	eax,4095
-	and	ebx,4095
-	and	edx,4095
-	cmp	edx,ebx
-	jb	NEAR L$016tbl_break_out
-	sub	edx,ebx
-	sub	esi,edx
-	jmp	NEAR L$017tbl_ok
-align	4
-L$016tbl_break_out:
-	sub	edx,eax
-	and	edx,4095
-	add	edx,384
-	sub	esi,edx
-align	4
-L$017tbl_ok:
-	lea	edx,[24+esp]
-	xchg	esp,esi
-	add	esp,4
-	mov	DWORD [24+esp],ebp
-	mov	DWORD [28+esp],esi
-	mov	eax,DWORD [edx]
-	mov	ebx,DWORD [4+edx]
-	mov	edi,DWORD [12+edx]
-	mov	esi,DWORD [16+edx]
-	mov	edx,DWORD [20+edx]
-	mov	DWORD [32+esp],eax
-	mov	DWORD [36+esp],ebx
-	mov	DWORD [40+esp],ecx
-	mov	DWORD [44+esp],edi
-	mov	DWORD [48+esp],esi
-	mov	DWORD [316+esp],0
-	mov	ebx,edi
-	mov	ecx,61
-	sub	ebx,ebp
-	mov	esi,edi
-	and	ebx,4095
-	lea	edi,[76+esp]
-	cmp	ebx,2304
-	jb	NEAR L$018do_copy
-	cmp	ebx,3852
-	jb	NEAR L$019skip_copy
-align	4
-L$018do_copy:
-	mov	DWORD [44+esp],edi
-dd	2784229001
-L$019skip_copy:
-	mov	edi,16
-align	4
-L$020prefetch_tbl:
-	mov	eax,DWORD [ebp]
-	mov	ebx,DWORD [32+ebp]
-	mov	ecx,DWORD [64+ebp]
-	mov	esi,DWORD [96+ebp]
-	lea	ebp,[128+ebp]
-	sub	edi,1
-	jnz	NEAR L$020prefetch_tbl
-	sub	ebp,2048
-	mov	esi,DWORD [32+esp]
-	mov	edi,DWORD [48+esp]
-	cmp	edx,0
-	je	NEAR L$021fast_decrypt
-	mov	eax,DWORD [edi]
-	mov	ebx,DWORD [4+edi]
-align	16
-L$022fast_enc_loop:
-	mov	ecx,DWORD [8+edi]
-	mov	edx,DWORD [12+edi]
-	xor	eax,DWORD [esi]
-	xor	ebx,DWORD [4+esi]
-	xor	ecx,DWORD [8+esi]
-	xor	edx,DWORD [12+esi]
-	mov	edi,DWORD [44+esp]
-	call	__x86_AES_encrypt
-	mov	esi,DWORD [32+esp]
-	mov	edi,DWORD [36+esp]
-	mov	DWORD [edi],eax
-	mov	DWORD [4+edi],ebx
-	mov	DWORD [8+edi],ecx
-	mov	DWORD [12+edi],edx
-	lea	esi,[16+esi]
-	mov	ecx,DWORD [40+esp]
-	mov	DWORD [32+esp],esi
-	lea	edx,[16+edi]
-	mov	DWORD [36+esp],edx
-	sub	ecx,16
-	mov	DWORD [40+esp],ecx
-	jnz	NEAR L$022fast_enc_loop
-	mov	esi,DWORD [48+esp]
-	mov	ecx,DWORD [8+edi]
-	mov	edx,DWORD [12+edi]
-	mov	DWORD [esi],eax
-	mov	DWORD [4+esi],ebx
-	mov	DWORD [8+esi],ecx
-	mov	DWORD [12+esi],edx
-	cmp	DWORD [316+esp],0
-	mov	edi,DWORD [44+esp]
-	je	NEAR L$023skip_ezero
-	mov	ecx,60
-	xor	eax,eax
-align	4
-dd	2884892297
-L$023skip_ezero:
-	mov	esp,DWORD [28+esp]
-	popfd
-L$012drop_out:
-	pop	edi
-	pop	esi
-	pop	ebx
-	pop	ebp
-	ret
-	pushfd
-align	16
-L$021fast_decrypt:
-	cmp	esi,DWORD [36+esp]
-	je	NEAR L$024fast_dec_in_place
-	mov	DWORD [52+esp],edi
-align	4
-align	16
-L$025fast_dec_loop:
-	mov	eax,DWORD [esi]
-	mov	ebx,DWORD [4+esi]
-	mov	ecx,DWORD [8+esi]
-	mov	edx,DWORD [12+esi]
-	mov	edi,DWORD [44+esp]
-	call	__x86_AES_decrypt
-	mov	edi,DWORD [52+esp]
-	mov	esi,DWORD [40+esp]
-	xor	eax,DWORD [edi]
-	xor	ebx,DWORD [4+edi]
-	xor	ecx,DWORD [8+edi]
-	xor	edx,DWORD [12+edi]
-	mov	edi,DWORD [36+esp]
-	mov	esi,DWORD [32+esp]
-	mov	DWORD [edi],eax
-	mov	DWORD [4+edi],ebx
-	mov	DWORD [8+edi],ecx
-	mov	DWORD [12+edi],edx
-	mov	ecx,DWORD [40+esp]
-	mov	DWORD [52+esp],esi
-	lea	esi,[16+esi]
-	mov	DWORD [32+esp],esi
-	lea	edi,[16+edi]
-	mov	DWORD [36+esp],edi
-	sub	ecx,16
-	mov	DWORD [40+esp],ecx
-	jnz	NEAR L$025fast_dec_loop
-	mov	edi,DWORD [52+esp]
-	mov	esi,DWORD [48+esp]
-	mov	eax,DWORD [edi]
-	mov	ebx,DWORD [4+edi]
-	mov	ecx,DWORD [8+edi]
-	mov	edx,DWORD [12+edi]
-	mov	DWORD [esi],eax
-	mov	DWORD [4+esi],ebx
-	mov	DWORD [8+esi],ecx
-	mov	DWORD [12+esi],edx
-	jmp	NEAR L$026fast_dec_out
-align	16
-L$024fast_dec_in_place:
-L$027fast_dec_in_place_loop:
-	mov	eax,DWORD [esi]
-	mov	ebx,DWORD [4+esi]
-	mov	ecx,DWORD [8+esi]
-	mov	edx,DWORD [12+esi]
-	lea	edi,[60+esp]
-	mov	DWORD [edi],eax
-	mov	DWORD [4+edi],ebx
-	mov	DWORD [8+edi],ecx
-	mov	DWORD [12+edi],edx
-	mov	edi,DWORD [44+esp]
-	call	__x86_AES_decrypt
-	mov	edi,DWORD [48+esp]
-	mov	esi,DWORD [36+esp]
-	xor	eax,DWORD [edi]
-	xor	ebx,DWORD [4+edi]
-	xor	ecx,DWORD [8+edi]
-	xor	edx,DWORD [12+edi]
-	mov	DWORD [esi],eax
-	mov	DWORD [4+esi],ebx
-	mov	DWORD [8+esi],ecx
-	mov	DWORD [12+esi],edx
-	lea	esi,[16+esi]
-	mov	DWORD [36+esp],esi
-	lea	esi,[60+esp]
-	mov	eax,DWORD [esi]
-	mov	ebx,DWORD [4+esi]
-	mov	ecx,DWORD [8+esi]
-	mov	edx,DWORD [12+esi]
-	mov	DWORD [edi],eax
-	mov	DWORD [4+edi],ebx
-	mov	DWORD [8+edi],ecx
-	mov	DWORD [12+edi],edx
-	mov	esi,DWORD [32+esp]
-	mov	ecx,DWORD [40+esp]
-	lea	esi,[16+esi]
-	mov	DWORD [32+esp],esi
-	sub	ecx,16
-	mov	DWORD [40+esp],ecx
-	jnz	NEAR L$027fast_dec_in_place_loop
-align	4
-L$026fast_dec_out:
-	cmp	DWORD [316+esp],0
-	mov	edi,DWORD [44+esp]
-	je	NEAR L$028skip_dzero
-	mov	ecx,60
-	xor	eax,eax
-align	4
-dd	2884892297
-L$028skip_dzero:
-	mov	esp,DWORD [28+esp]
-	popfd
-	pop	edi
-	pop	esi
-	pop	ebx
-	pop	ebp
-	ret
-	pushfd
-align	16
-L$015slow_way:
-	mov	eax,DWORD [eax]
-	mov	edi,DWORD [36+esp]
-	lea	esi,[esp-80]
-	and	esi,-64
-	lea	ebx,[edi-143]
-	sub	ebx,esi
-	neg	ebx
-	and	ebx,960
-	sub	esi,ebx
-	lea	ebx,[768+esi]
-	sub	ebx,ebp
-	and	ebx,768
-	lea	ebp,[2176+ebx*1+ebp]
-	lea	edx,[24+esp]
-	xchg	esp,esi
-	add	esp,4
-	mov	DWORD [24+esp],ebp
-	mov	DWORD [28+esp],esi
-	mov	DWORD [52+esp],eax
-	mov	eax,DWORD [edx]
-	mov	ebx,DWORD [4+edx]
-	mov	esi,DWORD [16+edx]
-	mov	edx,DWORD [20+edx]
-	mov	DWORD [32+esp],eax
-	mov	DWORD [36+esp],ebx
-	mov	DWORD [40+esp],ecx
-	mov	DWORD [44+esp],edi
-	mov	DWORD [48+esp],esi
-	mov	edi,esi
-	mov	esi,eax
-	cmp	edx,0
-	je	NEAR L$029slow_decrypt
-	cmp	ecx,16
-	mov	edx,ebx
-	jb	NEAR L$030slow_enc_tail
-	bt	DWORD [52+esp],25
-	jnc	NEAR L$031slow_enc_x86
-	movq	mm0,[edi]
-	movq	mm4,[8+edi]
-align	16
-L$032slow_enc_loop_sse:
-	pxor	mm0,[esi]
-	pxor	mm4,[8+esi]
-	mov	edi,DWORD [44+esp]
-	call	__sse_AES_encrypt_compact
-	mov	esi,DWORD [32+esp]
-	mov	edi,DWORD [36+esp]
-	mov	ecx,DWORD [40+esp]
-	movq	[edi],mm0
-	movq	[8+edi],mm4
-	lea	esi,[16+esi]
-	mov	DWORD [32+esp],esi
-	lea	edx,[16+edi]
-	mov	DWORD [36+esp],edx
-	sub	ecx,16
-	cmp	ecx,16
-	mov	DWORD [40+esp],ecx
-	jae	NEAR L$032slow_enc_loop_sse
-	test	ecx,15
-	jnz	NEAR L$030slow_enc_tail
-	mov	esi,DWORD [48+esp]
-	movq	[esi],mm0
-	movq	[8+esi],mm4
-	emms
-	mov	esp,DWORD [28+esp]
-	popfd
-	pop	edi
-	pop	esi
-	pop	ebx
-	pop	ebp
-	ret
-	pushfd
-align	16
-L$031slow_enc_x86:
-	mov	eax,DWORD [edi]
-	mov	ebx,DWORD [4+edi]
-align	4
-L$033slow_enc_loop_x86:
-	mov	ecx,DWORD [8+edi]
-	mov	edx,DWORD [12+edi]
-	xor	eax,DWORD [esi]
-	xor	ebx,DWORD [4+esi]
-	xor	ecx,DWORD [8+esi]
-	xor	edx,DWORD [12+esi]
-	mov	edi,DWORD [44+esp]
-	call	__x86_AES_encrypt_compact
-	mov	esi,DWORD [32+esp]
-	mov	edi,DWORD [36+esp]
-	mov	DWORD [edi],eax
-	mov	DWORD [4+edi],ebx
-	mov	DWORD [8+edi],ecx
-	mov	DWORD [12+edi],edx
-	mov	ecx,DWORD [40+esp]
-	lea	esi,[16+esi]
-	mov	DWORD [32+esp],esi
-	lea	edx,[16+edi]
-	mov	DWORD [36+esp],edx
-	sub	ecx,16
-	cmp	ecx,16
-	mov	DWORD [40+esp],ecx
-	jae	NEAR L$033slow_enc_loop_x86
-	test	ecx,15
-	jnz	NEAR L$030slow_enc_tail
-	mov	esi,DWORD [48+esp]
-	mov	ecx,DWORD [8+edi]
-	mov	edx,DWORD [12+edi]
-	mov	DWORD [esi],eax
-	mov	DWORD [4+esi],ebx
-	mov	DWORD [8+esi],ecx
-	mov	DWORD [12+esi],edx
-	mov	esp,DWORD [28+esp]
-	popfd
-	pop	edi
-	pop	esi
-	pop	ebx
-	pop	ebp
-	ret
-	pushfd
-align	16
-L$030slow_enc_tail:
-	emms
-	mov	edi,edx
-	mov	ebx,16
-	sub	ebx,ecx
-	cmp	edi,esi
-	je	NEAR L$034enc_in_place
-align	4
-dd	2767451785
-	jmp	NEAR L$035enc_skip_in_place
-L$034enc_in_place:
-	lea	edi,[ecx*1+edi]
-L$035enc_skip_in_place:
-	mov	ecx,ebx
-	xor	eax,eax
-align	4
-dd	2868115081
-	mov	edi,DWORD [48+esp]
-	mov	esi,edx
-	mov	eax,DWORD [edi]
-	mov	ebx,DWORD [4+edi]
-	mov	DWORD [40+esp],16
-	jmp	NEAR L$033slow_enc_loop_x86
-align	16
-L$029slow_decrypt:
-	bt	DWORD [52+esp],25
-	jnc	NEAR L$036slow_dec_loop_x86
-align	4
-L$037slow_dec_loop_sse:
-	movq	mm0,[esi]
-	movq	mm4,[8+esi]
-	mov	edi,DWORD [44+esp]
-	call	__sse_AES_decrypt_compact
-	mov	esi,DWORD [32+esp]
-	lea	eax,[60+esp]
-	mov	ebx,DWORD [36+esp]
-	mov	ecx,DWORD [40+esp]
-	mov	edi,DWORD [48+esp]
-	movq	mm1,[esi]
-	movq	mm5,[8+esi]
-	pxor	mm0,[edi]
-	pxor	mm4,[8+edi]
-	movq	[edi],mm1
-	movq	[8+edi],mm5
-	sub	ecx,16
-	jc	NEAR L$038slow_dec_partial_sse
-	movq	[ebx],mm0
-	movq	[8+ebx],mm4
-	lea	ebx,[16+ebx]
-	mov	DWORD [36+esp],ebx
-	lea	esi,[16+esi]
-	mov	DWORD [32+esp],esi
-	mov	DWORD [40+esp],ecx
-	jnz	NEAR L$037slow_dec_loop_sse
-	emms
-	mov	esp,DWORD [28+esp]
-	popfd
-	pop	edi
-	pop	esi
-	pop	ebx
-	pop	ebp
-	ret
-	pushfd
-align	16
-L$038slow_dec_partial_sse:
-	movq	[eax],mm0
-	movq	[8+eax],mm4
-	emms
-	add	ecx,16
-	mov	edi,ebx
-	mov	esi,eax
-align	4
-dd	2767451785
-	mov	esp,DWORD [28+esp]
-	popfd
-	pop	edi
-	pop	esi
-	pop	ebx
-	pop	ebp
-	ret
-	pushfd
-align	16
-L$036slow_dec_loop_x86:
-	mov	eax,DWORD [esi]
-	mov	ebx,DWORD [4+esi]
-	mov	ecx,DWORD [8+esi]
-	mov	edx,DWORD [12+esi]
-	lea	edi,[60+esp]
-	mov	DWORD [edi],eax
-	mov	DWORD [4+edi],ebx
-	mov	DWORD [8+edi],ecx
-	mov	DWORD [12+edi],edx
-	mov	edi,DWORD [44+esp]
-	call	__x86_AES_decrypt_compact
-	mov	edi,DWORD [48+esp]
-	mov	esi,DWORD [40+esp]
-	xor	eax,DWORD [edi]
-	xor	ebx,DWORD [4+edi]
-	xor	ecx,DWORD [8+edi]
-	xor	edx,DWORD [12+edi]
-	sub	esi,16
-	jc	NEAR L$039slow_dec_partial_x86
-	mov	DWORD [40+esp],esi
-	mov	esi,DWORD [36+esp]
-	mov	DWORD [esi],eax
-	mov	DWORD [4+esi],ebx
-	mov	DWORD [8+esi],ecx
-	mov	DWORD [12+esi],edx
-	lea	esi,[16+esi]
-	mov	DWORD [36+esp],esi
-	lea	esi,[60+esp]
-	mov	eax,DWORD [esi]
-	mov	ebx,DWORD [4+esi]
-	mov	ecx,DWORD [8+esi]
-	mov	edx,DWORD [12+esi]
-	mov	DWORD [edi],eax
-	mov	DWORD [4+edi],ebx
-	mov	DWORD [8+edi],ecx
-	mov	DWORD [12+edi],edx
-	mov	esi,DWORD [32+esp]
-	lea	esi,[16+esi]
-	mov	DWORD [32+esp],esi
-	jnz	NEAR L$036slow_dec_loop_x86
-	mov	esp,DWORD [28+esp]
-	popfd
-	pop	edi
-	pop	esi
-	pop	ebx
-	pop	ebp
-	ret
-	pushfd
-align	16
-L$039slow_dec_partial_x86:
-	lea	esi,[60+esp]
-	mov	DWORD [esi],eax
-	mov	DWORD [4+esi],ebx
-	mov	DWORD [8+esi],ecx
-	mov	DWORD [12+esi],edx
-	mov	esi,DWORD [32+esp]
-	mov	eax,DWORD [esi]
-	mov	ebx,DWORD [4+esi]
-	mov	ecx,DWORD [8+esi]
-	mov	edx,DWORD [12+esi]
-	mov	DWORD [edi],eax
-	mov	DWORD [4+edi],ebx
-	mov	DWORD [8+edi],ecx
-	mov	DWORD [12+edi],edx
-	mov	ecx,DWORD [40+esp]
-	mov	edi,DWORD [36+esp]
-	lea	esi,[60+esp]
-align	4
-dd	2767451785
-	mov	esp,DWORD [28+esp]
-	popfd
-	pop	edi
-	pop	esi
-	pop	ebx
-	pop	ebp
-	ret
-align	16
-__x86_AES_set_encrypt_key:
-	push	ebp
-	push	ebx
-	push	esi
-	push	edi
-	mov	esi,DWORD [24+esp]
-	mov	edi,DWORD [32+esp]
-	test	esi,-1
-	jz	NEAR L$040badpointer
-	test	edi,-1
-	jz	NEAR L$040badpointer
-	call	L$041pic_point
-L$041pic_point:
-	pop	ebp
-	lea	ebp,[(L$AES_Te-L$041pic_point)+ebp]
-	lea	ebp,[2176+ebp]
-	mov	eax,DWORD [ebp-128]
-	mov	ebx,DWORD [ebp-96]
-	mov	ecx,DWORD [ebp-64]
-	mov	edx,DWORD [ebp-32]
-	mov	eax,DWORD [ebp]
-	mov	ebx,DWORD [32+ebp]
-	mov	ecx,DWORD [64+ebp]
-	mov	edx,DWORD [96+ebp]
-	mov	ecx,DWORD [28+esp]
-	cmp	ecx,128
-	je	NEAR L$04210rounds
-	cmp	ecx,192
-	je	NEAR L$04312rounds
-	cmp	ecx,256
-	je	NEAR L$04414rounds
-	mov	eax,-2
-	jmp	NEAR L$045exit
-L$04210rounds:
-	mov	eax,DWORD [esi]
-	mov	ebx,DWORD [4+esi]
-	mov	ecx,DWORD [8+esi]
-	mov	edx,DWORD [12+esi]
-	mov	DWORD [edi],eax
-	mov	DWORD [4+edi],ebx
-	mov	DWORD [8+edi],ecx
-	mov	DWORD [12+edi],edx
-	xor	ecx,ecx
-	jmp	NEAR L$04610shortcut
-align	4
-L$04710loop:
-	mov	eax,DWORD [edi]
-	mov	edx,DWORD [12+edi]
-L$04610shortcut:
-	movzx	esi,dl
-	movzx	ebx,BYTE [esi*1+ebp-128]
-	movzx	esi,dh
-	shl	ebx,24
-	xor	eax,ebx
-	movzx	ebx,BYTE [esi*1+ebp-128]
-	shr	edx,16
-	movzx	esi,dl
-	xor	eax,ebx
-	movzx	ebx,BYTE [esi*1+ebp-128]
-	movzx	esi,dh
-	shl	ebx,8
-	xor	eax,ebx
-	movzx	ebx,BYTE [esi*1+ebp-128]
-	shl	ebx,16
-	xor	eax,ebx
-	xor	eax,DWORD [896+ecx*4+ebp]
-	mov	DWORD [16+edi],eax
-	xor	eax,DWORD [4+edi]
-	mov	DWORD [20+edi],eax
-	xor	eax,DWORD [8+edi]
-	mov	DWORD [24+edi],eax
-	xor	eax,DWORD [12+edi]
-	mov	DWORD [28+edi],eax
-	inc	ecx
-	add	edi,16
-	cmp	ecx,10
-	jl	NEAR L$04710loop
-	mov	DWORD [80+edi],10
-	xor	eax,eax
-	jmp	NEAR L$045exit
-L$04312rounds:
-	mov	eax,DWORD [esi]
-	mov	ebx,DWORD [4+esi]
-	mov	ecx,DWORD [8+esi]
-	mov	edx,DWORD [12+esi]
-	mov	DWORD [edi],eax
-	mov	DWORD [4+edi],ebx
-	mov	DWORD [8+edi],ecx
-	mov	DWORD [12+edi],edx
-	mov	ecx,DWORD [16+esi]
-	mov	edx,DWORD [20+esi]
-	mov	DWORD [16+edi],ecx
-	mov	DWORD [20+edi],edx
-	xor	ecx,ecx
-	jmp	NEAR L$04812shortcut
-align	4
-L$04912loop:
-	mov	eax,DWORD [edi]
-	mov	edx,DWORD [20+edi]
-L$04812shortcut:
-	movzx	esi,dl
-	movzx	ebx,BYTE [esi*1+ebp-128]
-	movzx	esi,dh
-	shl	ebx,24
-	xor	eax,ebx
-	movzx	ebx,BYTE [esi*1+ebp-128]
-	shr	edx,16
-	movzx	esi,dl
-	xor	eax,ebx
-	movzx	ebx,BYTE [esi*1+ebp-128]
-	movzx	esi,dh
-	shl	ebx,8
-	xor	eax,ebx
-	movzx	ebx,BYTE [esi*1+ebp-128]
-	shl	ebx,16
-	xor	eax,ebx
-	xor	eax,DWORD [896+ecx*4+ebp]
-	mov	DWORD [24+edi],eax
-	xor	eax,DWORD [4+edi]
-	mov	DWORD [28+edi],eax
-	xor	eax,DWORD [8+edi]
-	mov	DWORD [32+edi],eax
-	xor	eax,DWORD [12+edi]
-	mov	DWORD [36+edi],eax
-	cmp	ecx,7
-	je	NEAR L$05012break
-	inc	ecx
-	xor	eax,DWORD [16+edi]
-	mov	DWORD [40+edi],eax
-	xor	eax,DWORD [20+edi]
-	mov	DWORD [44+edi],eax
-	add	edi,24
-	jmp	NEAR L$04912loop
-L$05012break:
-	mov	DWORD [72+edi],12
-	xor	eax,eax
-	jmp	NEAR L$045exit
-L$04414rounds:
-	mov	eax,DWORD [esi]
-	mov	ebx,DWORD [4+esi]
-	mov	ecx,DWORD [8+esi]
-	mov	edx,DWORD [12+esi]
-	mov	DWORD [edi],eax
-	mov	DWORD [4+edi],ebx
-	mov	DWORD [8+edi],ecx
-	mov	DWORD [12+edi],edx
-	mov	eax,DWORD [16+esi]
-	mov	ebx,DWORD [20+esi]
-	mov	ecx,DWORD [24+esi]
-	mov	edx,DWORD [28+esi]
-	mov	DWORD [16+edi],eax
-	mov	DWORD [20+edi],ebx
-	mov	DWORD [24+edi],ecx
-	mov	DWORD [28+edi],edx
-	xor	ecx,ecx
-	jmp	NEAR L$05114shortcut
-align	4
-L$05214loop:
-	mov	edx,DWORD [28+edi]
-L$05114shortcut:
-	mov	eax,DWORD [edi]
-	movzx	esi,dl
-	movzx	ebx,BYTE [esi*1+ebp-128]
-	movzx	esi,dh
-	shl	ebx,24
-	xor	eax,ebx
-	movzx	ebx,BYTE [esi*1+ebp-128]
-	shr	edx,16
-	movzx	esi,dl
-	xor	eax,ebx
-	movzx	ebx,BYTE [esi*1+ebp-128]
-	movzx	esi,dh
-	shl	ebx,8
-	xor	eax,ebx
-	movzx	ebx,BYTE [esi*1+ebp-128]
-	shl	ebx,16
-	xor	eax,ebx
-	xor	eax,DWORD [896+ecx*4+ebp]
-	mov	DWORD [32+edi],eax
-	xor	eax,DWORD [4+edi]
-	mov	DWORD [36+edi],eax
-	xor	eax,DWORD [8+edi]
-	mov	DWORD [40+edi],eax
-	xor	eax,DWORD [12+edi]
-	mov	DWORD [44+edi],eax
-	cmp	ecx,6
-	je	NEAR L$05314break
-	inc	ecx
-	mov	edx,eax
-	mov	eax,DWORD [16+edi]
-	movzx	esi,dl
-	movzx	ebx,BYTE [esi*1+ebp-128]
-	movzx	esi,dh
-	xor	eax,ebx
-	movzx	ebx,BYTE [esi*1+ebp-128]
-	shr	edx,16
-	shl	ebx,8
-	movzx	esi,dl
-	xor	eax,ebx
-	movzx	ebx,BYTE [esi*1+ebp-128]
-	movzx	esi,dh
-	shl	ebx,16
-	xor	eax,ebx
-	movzx	ebx,BYTE [esi*1+ebp-128]
-	shl	ebx,24
-	xor	eax,ebx
-	mov	DWORD [48+edi],eax
-	xor	eax,DWORD [20+edi]
-	mov	DWORD [52+edi],eax
-	xor	eax,DWORD [24+edi]
-	mov	DWORD [56+edi],eax
-	xor	eax,DWORD [28+edi]
-	mov	DWORD [60+edi],eax
-	add	edi,32
-	jmp	NEAR L$05214loop
-L$05314break:
-	mov	DWORD [48+edi],14
-	xor	eax,eax
-	jmp	NEAR L$045exit
-L$040badpointer:
-	mov	eax,-1
-L$045exit:
-	pop	edi
-	pop	esi
-	pop	ebx
-	pop	ebp
-	ret
-global	_AES_set_encrypt_key
-align	16
-_AES_set_encrypt_key:
-L$_AES_set_encrypt_key_begin:
-	call	__x86_AES_set_encrypt_key
-	ret
-global	_AES_set_decrypt_key
-align	16
-_AES_set_decrypt_key:
-L$_AES_set_decrypt_key_begin:
-	call	__x86_AES_set_encrypt_key
-	cmp	eax,0
-	je	NEAR L$054proceed
-	ret
-L$054proceed:
-	push	ebp
-	push	ebx
-	push	esi
-	push	edi
-	mov	esi,DWORD [28+esp]
-	mov	ecx,DWORD [240+esi]
-	lea	ecx,[ecx*4]
-	lea	edi,[ecx*4+esi]
-align	4
-L$055invert:
-	mov	eax,DWORD [esi]
-	mov	ebx,DWORD [4+esi]
-	mov	ecx,DWORD [edi]
-	mov	edx,DWORD [4+edi]
-	mov	DWORD [edi],eax
-	mov	DWORD [4+edi],ebx
-	mov	DWORD [esi],ecx
-	mov	DWORD [4+esi],edx
-	mov	eax,DWORD [8+esi]
-	mov	ebx,DWORD [12+esi]
-	mov	ecx,DWORD [8+edi]
-	mov	edx,DWORD [12+edi]
-	mov	DWORD [8+edi],eax
-	mov	DWORD [12+edi],ebx
-	mov	DWORD [8+esi],ecx
-	mov	DWORD [12+esi],edx
-	add	esi,16
-	sub	edi,16
-	cmp	esi,edi
-	jne	NEAR L$055invert
-	mov	edi,DWORD [28+esp]
-	mov	esi,DWORD [240+edi]
-	lea	esi,[esi*1+esi-2]
-	lea	esi,[esi*8+edi]
-	mov	DWORD [28+esp],esi
-	mov	eax,DWORD [16+edi]
-align	4
-L$056permute:
-	add	edi,16
-	mov	ebp,2155905152
-	and	ebp,eax
-	lea	ebx,[eax*1+eax]
-	mov	esi,ebp
-	shr	ebp,7
-	sub	esi,ebp
-	and	ebx,4278124286
-	and	esi,454761243
-	xor	ebx,esi
-	mov	ebp,2155905152
-	and	ebp,ebx
-	lea	ecx,[ebx*1+ebx]
-	mov	esi,ebp
-	shr	ebp,7
-	sub	esi,ebp
-	and	ecx,4278124286
-	and	esi,454761243
-	xor	ebx,eax
-	xor	ecx,esi
-	mov	ebp,2155905152
-	and	ebp,ecx
-	lea	edx,[ecx*1+ecx]
-	mov	esi,ebp
-	shr	ebp,7
-	xor	ecx,eax
-	sub	esi,ebp
-	and	edx,4278124286
-	and	esi,454761243
-	rol	eax,8
-	xor	edx,esi
-	mov	ebp,DWORD [4+edi]
-	xor	eax,ebx
-	xor	ebx,edx
-	xor	eax,ecx
-	rol	ebx,24
-	xor	ecx,edx
-	xor	eax,edx
-	rol	ecx,16
-	xor	eax,ebx
-	rol	edx,8
-	xor	eax,ecx
-	mov	ebx,ebp
-	xor	eax,edx
-	mov	DWORD [edi],eax
-	mov	ebp,2155905152
-	and	ebp,ebx
-	lea	ecx,[ebx*1+ebx]
-	mov	esi,ebp
-	shr	ebp,7
-	sub	esi,ebp
-	and	ecx,4278124286
-	and	esi,454761243
-	xor	ecx,esi
-	mov	ebp,2155905152
-	and	ebp,ecx
-	lea	edx,[ecx*1+ecx]
-	mov	esi,ebp
-	shr	ebp,7
-	sub	esi,ebp
-	and	edx,4278124286
-	and	esi,454761243
-	xor	ecx,ebx
-	xor	edx,esi
-	mov	ebp,2155905152
-	and	ebp,edx
-	lea	eax,[edx*1+edx]
-	mov	esi,ebp
-	shr	ebp,7
-	xor	edx,ebx
-	sub	esi,ebp
-	and	eax,4278124286
-	and	esi,454761243
-	rol	ebx,8
-	xor	eax,esi
-	mov	ebp,DWORD [8+edi]
-	xor	ebx,ecx
-	xor	ecx,eax
-	xor	ebx,edx
-	rol	ecx,24
-	xor	edx,eax
-	xor	ebx,eax
-	rol	edx,16
-	xor	ebx,ecx
-	rol	eax,8
-	xor	ebx,edx
-	mov	ecx,ebp
-	xor	ebx,eax
-	mov	DWORD [4+edi],ebx
-	mov	ebp,2155905152
-	and	ebp,ecx
-	lea	edx,[ecx*1+ecx]
-	mov	esi,ebp
-	shr	ebp,7
-	sub	esi,ebp
-	and	edx,4278124286
-	and	esi,454761243
-	xor	edx,esi
-	mov	ebp,2155905152
-	and	ebp,edx
-	lea	eax,[edx*1+edx]
-	mov	esi,ebp
-	shr	ebp,7
-	sub	esi,ebp
-	and	eax,4278124286
-	and	esi,454761243
-	xor	edx,ecx
-	xor	eax,esi
-	mov	ebp,2155905152
-	and	ebp,eax
-	lea	ebx,[eax*1+eax]
-	mov	esi,ebp
-	shr	ebp,7
-	xor	eax,ecx
-	sub	esi,ebp
-	and	ebx,4278124286
-	and	esi,454761243
-	rol	ecx,8
-	xor	ebx,esi
-	mov	ebp,DWORD [12+edi]
-	xor	ecx,edx
-	xor	edx,ebx
-	xor	ecx,eax
-	rol	edx,24
-	xor	eax,ebx
-	xor	ecx,ebx
-	rol	eax,16
-	xor	ecx,edx
-	rol	ebx,8
-	xor	ecx,eax
-	mov	edx,ebp
-	xor	ecx,ebx
-	mov	DWORD [8+edi],ecx
-	mov	ebp,2155905152
-	and	ebp,edx
-	lea	eax,[edx*1+edx]
-	mov	esi,ebp
-	shr	ebp,7
-	sub	esi,ebp
-	and	eax,4278124286
-	and	esi,454761243
-	xor	eax,esi
-	mov	ebp,2155905152
-	and	ebp,eax
-	lea	ebx,[eax*1+eax]
-	mov	esi,ebp
-	shr	ebp,7
-	sub	esi,ebp
-	and	ebx,4278124286
-	and	esi,454761243
-	xor	eax,edx
-	xor	ebx,esi
-	mov	ebp,2155905152
-	and	ebp,ebx
-	lea	ecx,[ebx*1+ebx]
-	mov	esi,ebp
-	shr	ebp,7
-	xor	ebx,edx
-	sub	esi,ebp
-	and	ecx,4278124286
-	and	esi,454761243
-	rol	edx,8
-	xor	ecx,esi
-	mov	ebp,DWORD [16+edi]
-	xor	edx,eax
-	xor	eax,ecx
-	xor	edx,ebx
-	rol	eax,24
-	xor	ebx,ecx
-	xor	edx,ecx
-	rol	ebx,16
-	xor	edx,eax
-	rol	ecx,8
-	xor	edx,ebx
-	mov	eax,ebp
-	xor	edx,ecx
-	mov	DWORD [12+edi],edx
-	cmp	edi,DWORD [28+esp]
-	jb	NEAR L$056permute
-	xor	eax,eax
-	pop	edi
-	pop	esi
-	pop	ebx
-	pop	ebp
-	ret
-db	65,69,83,32,102,111,114,32,120,56,54,44,32,67,82,89
-db	80,84,79,71,65,77,83,32,98,121,32,60,97,112,112,114
-db	111,64,111,112,101,110,115,115,108,46,111,114,103,62,0
-segment	.bss
-common	_OPENSSL_ia32cap_P 16
diff --git a/deps/openssl/config/archs/VC-WIN32/asm_avx2/crypto/buildinf.h b/deps/openssl/config/archs/VC-WIN32/asm_avx2/crypto/buildinf.h
index 6aeb27ba40..77f65c3b54 100644
--- a/deps/openssl/config/archs/VC-WIN32/asm_avx2/crypto/buildinf.h
+++ b/deps/openssl/config/archs/VC-WIN32/asm_avx2/crypto/buildinf.h
@@ -11,7 +11,7 @@
  */
 
 #define PLATFORM "platform: "
-#define DATE "built on: Fri Sep 13 16:03:39 2019 UTC"
+#define DATE "built on: Wed Mar 18 21:11:06 2020 UTC"
 
 /*
  * Generate compiler_flags as an array of individual characters. This is a
diff --git a/deps/openssl/config/archs/VC-WIN32/asm_avx2/crypto/ec/ecp_nistz256-x86.asm b/deps/openssl/config/archs/VC-WIN32/asm_avx2/crypto/ec/ecp_nistz256-x86.asm
index 7383523877..96071a300e 100644
--- a/deps/openssl/config/archs/VC-WIN32/asm_avx2/crypto/ec/ecp_nistz256-x86.asm
+++ b/deps/openssl/config/archs/VC-WIN32/asm_avx2/crypto/ec/ecp_nistz256-x86.asm
@@ -4386,19 +4386,15 @@ L$009pic:
 	or	eax,DWORD [4+edi]
 	or	eax,DWORD [8+edi]
 	or	eax,DWORD [12+edi]
+	mov	ebx,DWORD [576+esp]
+	not	ebx
+	or	eax,ebx
+	mov	ebx,DWORD [580+esp]
+	not	ebx
+	or	eax,ebx
+	or	eax,DWORD [584+esp]
 db	62
 	jnz	NEAR L$010add_proceed
-	mov	eax,DWORD [576+esp]
-	and	eax,DWORD [580+esp]
-	mov	ebx,DWORD [584+esp]
-	jz	NEAR L$010add_proceed
-	test	ebx,ebx
-	jz	NEAR L$011add_double
-	mov	edi,DWORD [616+esp]
-	xor	eax,eax
-	mov	ecx,24
-db	252,243,171
-	jmp	NEAR L$012add_done
 align	16
 L$011add_double:
 	mov	esi,DWORD [620+esp]
diff --git a/deps/openssl/config/archs/VC-WIN32/asm_avx2/crypto/include/internal/bn_conf.h b/deps/openssl/config/archs/VC-WIN32/asm_avx2/crypto/include/internal/bn_conf.h
index ce324699ae..2242cd2fc0 100644
--- a/deps/openssl/config/archs/VC-WIN32/asm_avx2/crypto/include/internal/bn_conf.h
+++ b/deps/openssl/config/archs/VC-WIN32/asm_avx2/crypto/include/internal/bn_conf.h
@@ -1,5 +1,5 @@
 /* WARNING: do not edit! */
-/* Generated by makefile from crypto/include/internal/bn_conf.h.in */
+/* Generated by makefile from include/crypto/bn_conf.h.in */
 /*
  * Copyright 2016 The OpenSSL Project Authors. All Rights Reserved.
  *
@@ -9,8 +9,8 @@
  * https://www.openssl.org/source/license.html
  */
 
-#ifndef HEADER_BN_CONF_H
-# define HEADER_BN_CONF_H
+#ifndef OSSL_CRYPTO_BN_CONF_H
+# define OSSL_CRYPTO_BN_CONF_H
 
 /*
  * The contents of this file are not used in the UEFI build, as
diff --git a/deps/openssl/config/archs/VC-WIN32/asm_avx2/crypto/include/internal/dso_conf.h b/deps/openssl/config/archs/VC-WIN32/asm_avx2/crypto/include/internal/dso_conf.h
index c3b41df01e..0c96ce7363 100644
--- a/deps/openssl/config/archs/VC-WIN32/asm_avx2/crypto/include/internal/dso_conf.h
+++ b/deps/openssl/config/archs/VC-WIN32/asm_avx2/crypto/include/internal/dso_conf.h
@@ -1,5 +1,5 @@
 /* WARNING: do not edit! */
-/* Generated by makefile from crypto/include/internal/dso_conf.h.in */
+/* Generated by makefile from include/crypto/dso_conf.h.in */
 /*
  * Copyright 2016-2019 The OpenSSL Project Authors. All Rights Reserved.
  *
@@ -9,8 +9,8 @@
  * https://www.openssl.org/source/license.html
  */
 
-#ifndef HEADER_DSO_CONF_H
-# define HEADER_DSO_CONF_H
+#ifndef OSSL_CRYPTO_DSO_CONF_H
+# define OSSL_CRYPTO_DSO_CONF_H
 # define DSO_WIN32
 # define DSO_EXTENSION ".dll"
 #endif
diff --git a/deps/openssl/config/archs/VC-WIN32/asm_avx2/include/openssl/opensslconf.h b/deps/openssl/config/archs/VC-WIN32/asm_avx2/include/openssl/opensslconf.h
index e0b784dfe0..8fb667373a 100644
--- a/deps/openssl/config/archs/VC-WIN32/asm_avx2/include/openssl/opensslconf.h
+++ b/deps/openssl/config/archs/VC-WIN32/asm_avx2/include/openssl/opensslconf.h
@@ -99,9 +99,6 @@ extern "C" {
 #ifndef OPENSSL_NO_DYNAMIC_ENGINE
 # define OPENSSL_NO_DYNAMIC_ENGINE
 #endif
-#ifndef OPENSSL_NO_AFALGENG
-# define OPENSSL_NO_AFALGENG
-#endif
 
 
 /*
diff --git a/deps/openssl/config/archs/VC-WIN32/asm_avx2/include/progs.h b/deps/openssl/config/archs/VC-WIN32/asm_avx2/include/progs.h
index 9b3d270e20..308c65601b 100644
--- a/deps/openssl/config/archs/VC-WIN32/asm_avx2/include/progs.h
+++ b/deps/openssl/config/archs/VC-WIN32/asm_avx2/include/progs.h
@@ -2,7 +2,7 @@
  * WARNING: do not edit!
  * Generated by apps/progs.pl
  *
- * Copyright 1995-2019 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 1995-2020 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
diff --git a/deps/openssl/config/archs/VC-WIN32/asm_avx2/openssl-cl.gypi b/deps/openssl/config/archs/VC-WIN32/asm_avx2/openssl-cl.gypi
index 5028da71f3..f15a17c0be 100644
--- a/deps/openssl/config/archs/VC-WIN32/asm_avx2/openssl-cl.gypi
+++ b/deps/openssl/config/archs/VC-WIN32/asm_avx2/openssl-cl.gypi
@@ -20,6 +20,7 @@
       'RC4_ASM',
       'MD5_ASM',
       'RMD160_ASM',
+      'AESNI_ASM',
       'VPAES_ASM',
       'WHIRLPOOL_ASM',
       'GHASH_ASM',
@@ -28,9 +29,9 @@
     ],
     'openssl_cflags_VC-WIN32': [
       '-Wa,--noexecstack',
-      '/W3 /wd4090 /nologo /O2 /WX',
+      '/W3 /wd4090 /nologo /O2',
       '/Gs0 /GF /Gy',
-      '/W3 /wd4090 /nologo /O2 /WX',
+      '/W3 /wd4090 /nologo /O2',
     ],
     'openssl_ex_libs_VC-WIN32': [
       'ws2_32.lib gdi32.lib advapi32.lib crypt32.lib user32.lib',
diff --git a/deps/openssl/config/archs/VC-WIN32/asm_avx2/openssl.gypi b/deps/openssl/config/archs/VC-WIN32/asm_avx2/openssl.gypi
index a5bb5f58ee..0c3ab72e0a 100644
--- a/deps/openssl/config/archs/VC-WIN32/asm_avx2/openssl.gypi
+++ b/deps/openssl/config/archs/VC-WIN32/asm_avx2/openssl.gypi
@@ -717,6 +717,7 @@
       'RC4_ASM',
       'MD5_ASM',
       'RMD160_ASM',
+      'AESNI_ASM',
       'VPAES_ASM',
       'WHIRLPOOL_ASM',
       'GHASH_ASM',
@@ -725,9 +726,9 @@
     ],
     'openssl_cflags_VC-WIN32': [
       '-Wa,--noexecstack',
-      '/W3 /wd4090 /nologo /O2 /WX',
+      '/W3 /wd4090 /nologo /O2',
       '/Gs0 /GF /Gy',
-      '/W3 /wd4090 /nologo /O2 /WX',
+      '/W3 /wd4090 /nologo /O2',
     ],
     'openssl_ex_libs_VC-WIN32': [
       'ws2_32.lib gdi32.lib advapi32.lib crypt32.lib user32.lib',
diff --git a/deps/openssl/config/archs/VC-WIN32/no-asm/configdata.pm b/deps/openssl/config/archs/VC-WIN32/no-asm/configdata.pm
index 16ff6d9820..e2e28d7531 100644
--- a/deps/openssl/config/archs/VC-WIN32/no-asm/configdata.pm
+++ b/deps/openssl/config/archs/VC-WIN32/no-asm/configdata.pm
@@ -15,7 +15,7 @@ our %config = (
   ARFLAGS => [ "/nologo" ],
   AS => "nasm",
   CC => "cl",
-  CFLAGS => [ "/W3 /wd4090 /nologo /O2 /WX" ],
+  CFLAGS => [ "/W3 /wd4090 /nologo /O2" ],
   CPP => "\$(CC) /EP /C",
   CPPDEFINES => [  ],
   CPPFLAGS => [  ],
@@ -58,7 +58,7 @@ our %config = (
   minor => "1.1",
   openssl_algorithm_defines => [ "OPENSSL_NO_COMP", "OPENSSL_NO_MD2", "OPENSSL_NO_RC5" ],
   openssl_api_defines => [  ],
-  openssl_other_defines => [ "OPENSSL_RAND_SEED_OS", "OPENSSL_NO_AFALGENG", "OPENSSL_NO_ASAN", "OPENSSL_NO_ASM", "OPENSSL_NO_CRYPTO_MDEBUG", "OPENSSL_NO_CRYPTO_MDEBUG_BACKTRACE", "OPENSSL_NO_DEVCRYPTOENG", "OPENSSL_NO_EC_NISTP_64_GCC_128", "OPENSSL_NO_EGD", "OPENSSL_NO_EXTERNAL_TESTS", "OPENSSL_NO_FUZZ_AFL", "OPENSSL_NO_FUZZ_LIBFUZZER", "OPENSSL_NO_HEARTBEATS", "OPENSSL_NO_MSAN", "OPENSSL_NO_SCTP", "OPENSSL_NO_SSL3", "OPENSSL_NO_SSL3_METHOD", "OPENSSL_NO_UBSAN", "OPENSSL_NO_UNIT_TEST", "OPENSSL_NO_WEAK_SSL_CIPHERS", "OPENSSL_NO_DYNAMIC_ENGINE", "OPENSSL_NO_AFALGENG" ],
+  openssl_other_defines => [ "OPENSSL_RAND_SEED_OS", "OPENSSL_NO_AFALGENG", "OPENSSL_NO_ASAN", "OPENSSL_NO_ASM", "OPENSSL_NO_CRYPTO_MDEBUG", "OPENSSL_NO_CRYPTO_MDEBUG_BACKTRACE", "OPENSSL_NO_DEVCRYPTOENG", "OPENSSL_NO_EC_NISTP_64_GCC_128", "OPENSSL_NO_EGD", "OPENSSL_NO_EXTERNAL_TESTS", "OPENSSL_NO_FUZZ_AFL", "OPENSSL_NO_FUZZ_LIBFUZZER", "OPENSSL_NO_HEARTBEATS", "OPENSSL_NO_MSAN", "OPENSSL_NO_SCTP", "OPENSSL_NO_SSL3", "OPENSSL_NO_SSL3_METHOD", "OPENSSL_NO_UBSAN", "OPENSSL_NO_UNIT_TEST", "OPENSSL_NO_WEAK_SSL_CIPHERS", "OPENSSL_NO_DYNAMIC_ENGINE" ],
   openssl_sys_defines => [ "OPENSSL_SYS_WIN32" ],
   openssl_thread_defines => [ "OPENSSL_THREADS" ],
   openssldir => "",
@@ -114,8 +114,8 @@ our %config = (
   sourcedir => ".",
   target => "VC-WIN32",
   tdirs => [ "ossl_shim" ],
-  version => "1.1.1d",
-  version_num => "0x1010104fL",
+  version => "1.1.1e",
+  version_num => "0x1010105fL",
 );
 
 our %target = (
@@ -124,14 +124,14 @@ our %target = (
   AS => "nasm",
   ASFLAGS => "",
   CC => "cl",
-  CFLAGS => "/W3 /wd4090 /nologo /O2 /WX",
+  CFLAGS => "/W3 /wd4090 /nologo /O2",
   CPP => "\$(CC) /EP /C",
   HASHBANGPERL => "/usr/bin/env perl",
   LD => "link",
   LDFLAGS => "/nologo /debug",
   MT => "mt",
   MTFLAGS => "-nologo",
-  RANLIB => "CODE(0x55ddfff979c8)",
+  RANLIB => "CODE(0x55e705f67598)",
   RC => "rc",
   _conf_fname_int => [ "Configurations/00-base-templates.conf", "Configurations/00-base-templates.conf", "Configurations/10-main.conf", "Configurations/10-main.conf", "Configurations/10-main.conf", "Configurations/shared-info.pl" ],
   aes_asm_src => "aes_core.c aes_cbc.c",
@@ -254,6 +254,7 @@ our @disablables = (
   "dgram",
   "dh",
   "dsa",
+  "dso",
   "dtls",
   "dynamic-engine",
   "ec",
@@ -372,8 +373,8 @@ our %unified_info = (
         {
             "" =>
                 [
-                    "crypto/include/internal/bn_conf.h",
-                    "crypto/include/internal/dso_conf.h",
+                    "include/crypto/bn_conf.h",
+                    "include/crypto/dso_conf.h",
                     "include/openssl/opensslconf.h",
                 ],
             "apps/asn1pars.o" =>
@@ -641,14 +642,6 @@ our %unified_info = (
                     "crypto/perlasm/cbc.pl",
                     "crypto/perlasm/x86asm.pl",
                 ],
-            "crypto/include/internal/bn_conf.h" =>
-                [
-                    "configdata.pm",
-                ],
-            "crypto/include/internal/dso_conf.h" =>
-                [
-                    "configdata.pm",
-                ],
             "crypto/rc4/rc4-586.s" =>
                 [
                     "crypto/perlasm/x86asm.pl",
@@ -724,6 +717,14 @@ our %unified_info = (
                 [
                     "libcrypto",
                 ],
+            "include/crypto/bn_conf.h" =>
+                [
+                    "configdata.pm",
+                ],
+            "include/crypto/dso_conf.h" =>
+                [
+                    "configdata.pm",
+                ],
             "include/openssl/opensslconf.h" =>
                 [
                     "configdata.pm",
@@ -1521,6 +1522,12 @@ our %unified_info = (
                     "libcrypto",
                     "test/libtestutil.a",
                 ],
+            "test/ssl_ctx_test" =>
+                [
+                    "libcrypto",
+                    "libssl",
+                    "test/libtestutil.a",
+                ],
             "test/ssl_test" =>
                 [
                     "libcrypto",
@@ -3239,7 +3246,6 @@ our %unified_info = (
                             "test/testutil/cb.o",
                             "test/testutil/driver.o",
                             "test/testutil/format_output.o",
-                            "test/testutil/init.o",
                             "test/testutil/main.o",
                             "test/testutil/output_helpers.o",
                             "test/testutil/random.o",
@@ -3247,6 +3253,7 @@ our %unified_info = (
                             "test/testutil/tap_bio.o",
                             "test/testutil/test_cleanup.o",
                             "test/testutil/tests.o",
+                            "test/testutil/testutil_init.o",
                         ],
                     "products" =>
                         {
@@ -3740,14 +3747,6 @@ our %unified_info = (
                 [
                     "crypto/ia64cpuid.S",
                 ],
-            "crypto/include/internal/bn_conf.h" =>
-                [
-                    "crypto/include/internal/bn_conf.h.in",
-                ],
-            "crypto/include/internal/dso_conf.h" =>
-                [
-                    "crypto/include/internal/dso_conf.h.in",
-                ],
             "crypto/md5/md5-586.s" =>
                 [
                     "crypto/md5/asm/md5-586.pl",
@@ -4188,6 +4187,14 @@ our %unified_info = (
                     "engines/asm/e_padlock-x86_64.pl",
                     "\$(PERLASM_SCHEME)",
                 ],
+            "include/crypto/bn_conf.h" =>
+                [
+                    "include/crypto/bn_conf.h.in",
+                ],
+            "include/crypto/dso_conf.h" =>
+                [
+                    "include/crypto/dso_conf.h.in",
+                ],
             "include/openssl/opensslconf.h" =>
                 [
                     "include/openssl/opensslconf.h.in",
@@ -4897,49 +4904,41 @@ our %unified_info = (
             "crypto/aes/aes_cbc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/aes/aes_cfb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/aes/aes_core.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/aes/aes_ecb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/aes/aes_ige.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/aes/aes_misc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/aes/aes_ofb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/aes/aes_wrap.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/aes/aesfx-sparcv9.o" =>
@@ -4961,7 +4960,6 @@ our %unified_info = (
             "crypto/aria/aria.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/arm64cpuid.o" =>
@@ -4975,613 +4973,511 @@ our %unified_info = (
             "crypto/asn1/a_bitstr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_d2i_fp.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_digest.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_dup.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_gentm.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_i2d_fp.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_int.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_mbstr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_object.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_octet.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_print.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_sign.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_strex.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_strnid.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_time.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_type.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_utctm.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_utf8.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_verify.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/ameth_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/asn1_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/asn1_gen.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/asn1_item_list.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/asn1_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/asn1_par.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/asn_mime.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/asn_moid.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/asn_mstbl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/asn_pack.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/bio_asn1.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/bio_ndef.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/d2i_pr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/d2i_pu.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/evp_asn1.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/f_int.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/f_string.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/i2d_pr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/i2d_pu.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/n_pkey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/nsseq.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/p5_pbe.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/p5_pbev2.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/p5_scrypt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/p8_pkey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/t_bitst.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/t_pkey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/t_spki.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/tasn_dec.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/tasn_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/tasn_fre.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/tasn_new.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/tasn_prn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/tasn_scn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/tasn_typ.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/tasn_utl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/x_algor.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/x_bignum.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/x_info.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/x_int64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/x_long.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/x_pkey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/x_sig.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/x_spki.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/x_val.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/async/arch/async_null.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/async/arch/async_posix.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/async/arch/async_win.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/async/async.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/async/async_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/async/async_wait.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bf/bf_cfb64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bf/bf_ecb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bf/bf_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bf/bf_ofb64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bf/bf_skey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/b_addr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/b_dump.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/b_print.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/b_sock.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/b_sock2.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bf_buff.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bf_lbuf.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bf_nbio.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bf_null.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bio_cb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bio_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bio_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bio_meth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bss_acpt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bss_bio.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bss_conn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bss_dgram.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bss_fd.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bss_file.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bss_log.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bss_mem.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bss_null.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bss_sock.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/blake2/blake2b.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/blake2/blake2s.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/blake2/m_blake2b.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/blake2/m_blake2s.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/armv4-gf2m.o" =>
@@ -5599,188 +5495,157 @@ our %unified_info = (
             "crypto/bn/bn_add.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_asm.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_blind.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_const.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_ctx.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_depr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_dh.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_div.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_exp.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto",
                 ],
             "crypto/bn/bn_exp2.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_gcd.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_gf2m.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_intern.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_kron.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_mod.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_mont.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_mpi.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_mul.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_nist.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_prime.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_print.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_rand.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_recp.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_shift.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_sqr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_sqrt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_srp.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_word.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_x931p.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/mips-mont.o" =>
@@ -5810,13 +5675,11 @@ our %unified_info = (
             "crypto/buffer/buf_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/buffer/buffer.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/buildinf.h" =>
@@ -5826,43 +5689,36 @@ our %unified_info = (
             "crypto/camellia/camellia.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/camellia/cmll_cbc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/camellia/cmll_cfb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/camellia/cmll_ctr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/camellia/cmll_ecb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/camellia/cmll_misc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/camellia/cmll_ofb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/camellia/cmllt4-sparcv9.o" =>
@@ -5872,31 +5728,26 @@ our %unified_info = (
             "crypto/cast/c_cfb64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cast/c_ecb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cast/c_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cast/c_ofb64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cast/c_skey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/chacha/chacha-armv4.o" =>
@@ -5914,278 +5765,232 @@ our %unified_info = (
             "crypto/chacha/chacha_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cmac/cm_ameth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cmac/cm_pmeth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cmac/cmac.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_asn1.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_att.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_cd.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_dd.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_env.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_ess.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_io.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_kari.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_pwri.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_sd.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_smime.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/conf/conf_api.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/conf/conf_def.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/conf/conf_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/conf/conf_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/conf/conf_mall.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/conf/conf_mod.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/conf/conf_sap.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/conf/conf_ssl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cpt_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cryptlib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ct/ct_b64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ct/ct_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ct/ct_log.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ct/ct_oct.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ct/ct_policy.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ct/ct_prn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ct/ct_sct.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ct/ct_sct_ctx.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ct/ct_vfy.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ct/ct_x509v3.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ctype.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cversion.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto",
                 ],
             "crypto/des/cbc_cksm.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/cbc_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/cfb64ede.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/cfb64enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/cfb_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/des_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/dest4-sparcv9.o" =>
@@ -6195,301 +6000,251 @@ our %unified_info = (
             "crypto/des/ecb3_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/ecb_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/fcrypt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/fcrypt_b.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/ofb64ede.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/ofb64enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/ofb_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/pcbc_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/qud_cksm.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/rand_key.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/set_key.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/str2key.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/xcbc_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_ameth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_asn1.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_check.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_depr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_gen.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_kdf.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_key.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_meth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_pmeth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_prn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_rfc5114.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_rfc7919.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dsa/dsa_ameth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dsa/dsa_asn1.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dsa/dsa_depr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dsa/dsa_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dsa/dsa_gen.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dsa/dsa_key.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dsa/dsa_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dsa/dsa_meth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dsa/dsa_ossl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dsa/dsa_pmeth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dsa/dsa_prn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dsa/dsa_sign.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dsa/dsa_vrf.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dso/dso_dl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dso/dso_dlfcn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dso/dso_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dso/dso_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dso/dso_openssl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dso/dso_vms.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dso/dso_win32.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ebcdic.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/curve25519.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/curve448/arch_32/f_impl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto/ec/curve448/arch_32",
                     "crypto/ec/curve448",
@@ -6497,7 +6252,6 @@ our %unified_info = (
             "crypto/ec/curve448/curve448.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto/ec/curve448/arch_32",
                     "crypto/ec/curve448",
@@ -6505,7 +6259,6 @@ our %unified_info = (
             "crypto/ec/curve448/curve448_tables.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto/ec/curve448/arch_32",
                     "crypto/ec/curve448",
@@ -6513,7 +6266,6 @@ our %unified_info = (
             "crypto/ec/curve448/eddsa.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto/ec/curve448/arch_32",
                     "crypto/ec/curve448",
@@ -6521,7 +6273,6 @@ our %unified_info = (
             "crypto/ec/curve448/f_generic.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto/ec/curve448/arch_32",
                     "crypto/ec/curve448",
@@ -6529,7 +6280,6 @@ our %unified_info = (
             "crypto/ec/curve448/scalar.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto/ec/curve448/arch_32",
                     "crypto/ec/curve448",
@@ -6537,163 +6287,136 @@ our %unified_info = (
             "crypto/ec/ec2_oct.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec2_smpl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec_ameth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec_asn1.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec_check.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec_curve.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec_cvt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec_key.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec_kmeth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec_mult.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec_oct.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec_pmeth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec_print.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecdh_kdf.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecdh_ossl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecdsa_ossl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecdsa_sign.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecdsa_vrf.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/eck_prn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecp_mont.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecp_nist.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecp_nistp224.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecp_nistp256.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecp_nistp521.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecp_nistputil.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecp_nistz256-armv4.o" =>
@@ -6711,223 +6434,186 @@ our %unified_info = (
             "crypto/ec/ecp_oct.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecp_smpl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecx_meth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/eng_all.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/eng_cnf.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/eng_ctrl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/eng_dyn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/eng_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/eng_fat.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/eng_init.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/eng_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/eng_list.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/eng_openssl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/eng_pkey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/eng_rdrand.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/eng_table.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/tb_asnmth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/tb_cipher.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/tb_dh.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/tb_digest.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/tb_dsa.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/tb_eckey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/tb_pkmeth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/tb_rand.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/tb_rsa.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/err/err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/err/err_all.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/err/err_prn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/bio_b64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/bio_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/bio_md.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/bio_ok.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/c_allc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/c_alld.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/cmeth_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/digest.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/e_aes.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto",
                     "crypto/modes",
@@ -6935,21 +6621,18 @@ our %unified_info = (
             "crypto/evp/e_aes_cbc_hmac_sha1.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto/modes",
                 ],
             "crypto/evp/e_aes_cbc_hmac_sha256.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto/modes",
                 ],
             "crypto/evp/e_aria.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto",
                     "crypto/modes",
@@ -6957,13 +6640,11 @@ our %unified_info = (
             "crypto/evp/e_bf.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/e_camellia.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto",
                     "crypto/modes",
@@ -6971,81 +6652,68 @@ our %unified_info = (
             "crypto/evp/e_cast.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/e_chacha20_poly1305.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/e_des.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto",
                 ],
             "crypto/evp/e_des3.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto",
                 ],
             "crypto/evp/e_idea.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/e_null.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/e_old.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/e_rc2.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/e_rc4.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/e_rc4_hmac_md5.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/e_rc5.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/e_seed.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/e_sm4.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto",
                     "crypto/modes",
@@ -7053,328 +6721,267 @@ our %unified_info = (
             "crypto/evp/e_xcbc_d.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/encode.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/evp_cnf.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/evp_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/evp_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/evp_key.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/evp_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/evp_pbe.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/evp_pkey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/m_md2.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/m_md4.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/m_md5.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/m_md5_sha1.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/m_mdc2.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/m_null.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/m_ripemd.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/m_sha1.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/m_sha3.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto",
                 ],
             "crypto/evp/m_sigver.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/m_wp.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/names.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/p5_crpt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/p5_crpt2.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/p_dec.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/p_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/p_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/p_open.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/p_seal.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/p_sign.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/p_verify.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/pbe_scrypt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/pmeth_fn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/pmeth_gn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/pmeth_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ex_data.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/getenv.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/hmac/hm_ameth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/hmac/hm_pmeth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/hmac/hmac.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/idea/i_cbc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/idea/i_cfb64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/idea/i_ecb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/idea/i_ofb64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/idea/i_skey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
-            "crypto/include/internal/bn_conf.h" =>
-                [
-                    ".",
-                ],
-            "crypto/include/internal/dso_conf.h" =>
-                [
-                    ".",
-                ],
             "crypto/init.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/kdf/hkdf.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/kdf/kdf_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/kdf/scrypt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/kdf/tls1_prf.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/lhash/lh_stats.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/lhash/lhash.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/md4/md4_dgst.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/md4/md4_one.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/md5/md5-sparcv9.o" =>
@@ -7384,85 +6991,71 @@ our %unified_info = (
             "crypto/md5/md5_dgst.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/md5/md5_one.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/mdc2/mdc2_one.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/mdc2/mdc2dgst.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/mem.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/mem_clr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/mem_dbg.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/mem_sec.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/modes/cbc128.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/modes/ccm128.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/modes/cfb128.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/modes/ctr128.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/modes/cts128.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/modes/gcm128.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto",
                 ],
@@ -7485,361 +7078,301 @@ our %unified_info = (
             "crypto/modes/ocb128.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/modes/ofb128.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/modes/wrap128.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/modes/xts128.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/o_dir.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/o_fips.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/o_fopen.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/o_init.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/o_str.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/o_time.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/objects/o_names.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/objects/obj_dat.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/objects/obj_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/objects/obj_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/objects/obj_xref.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ocsp/ocsp_asn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ocsp/ocsp_cl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ocsp/ocsp_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ocsp/ocsp_ext.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ocsp/ocsp_ht.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ocsp/ocsp_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ocsp/ocsp_prn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ocsp/ocsp_srv.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ocsp/ocsp_vfy.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ocsp/v3_ocsp.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pem/pem_all.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pem/pem_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pem/pem_info.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pem/pem_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pem/pem_oth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pem/pem_pk8.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pem/pem_pkey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pem/pem_sign.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pem/pem_x509.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pem/pem_xaux.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pem/pvkfmt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_add.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_asn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_attr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_crpt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_crt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_decr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_init.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_key.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_kiss.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_mutl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_npas.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_p8d.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_p8e.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_sbag.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_utl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/pk12err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs7/bio_pk7.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs7/pk7_asn1.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs7/pk7_attr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs7/pk7_doit.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs7/pk7_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs7/pk7_mime.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs7/pk7_smime.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs7/pkcs7err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/poly1305/poly1305-armv4.o" =>
@@ -7861,259 +7394,216 @@ our %unified_info = (
             "crypto/poly1305/poly1305.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/poly1305/poly1305_ameth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/poly1305/poly1305_pmeth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rand/drbg_ctr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rand/drbg_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rand/rand_egd.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rand/rand_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rand/rand_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rand/rand_unix.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rand/rand_vms.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rand/rand_win.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rand/randfile.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rc2/rc2_cbc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rc2/rc2_ecb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rc2/rc2_skey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rc2/rc2cfb64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rc2/rc2ofb64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rc4/rc4_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rc4/rc4_skey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ripemd/rmd_dgst.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ripemd/rmd_one.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_ameth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_asn1.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_chk.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_crpt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_depr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_gen.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_meth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_mp.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_none.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_oaep.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_ossl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_pk1.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_pmeth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_prn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_pss.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_saos.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_sign.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_ssl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_x931.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_x931g.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/s390xcpuid.o" =>
@@ -8123,31 +7613,26 @@ our %unified_info = (
             "crypto/seed/seed.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/seed/seed_cbc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/seed/seed_cfb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/seed/seed_ecb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/seed/seed_ofb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sha/keccak1600-armv4.o" =>
@@ -8157,7 +7642,6 @@ our %unified_info = (
             "crypto/sha/keccak1600.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sha/sha1-armv4-large.o" =>
@@ -8183,13 +7667,11 @@ our %unified_info = (
             "crypto/sha/sha1_one.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sha/sha1dgst.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sha/sha256-armv4.o" =>
@@ -8215,7 +7697,6 @@ our %unified_info = (
             "crypto/sha/sha256.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sha/sha512-armv4.o" =>
@@ -8241,709 +7722,591 @@ our %unified_info = (
             "crypto/sha/sha512.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/siphash/siphash.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/siphash/siphash_ameth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/siphash/siphash_pmeth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sm2/sm2_crypt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sm2/sm2_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sm2/sm2_pmeth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sm2/sm2_sign.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sm3/m_sm3.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sm3/sm3.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sm4/sm4.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/srp/srp_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/srp/srp_vfy.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/stack/stack.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/store/loader_file.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/store/store_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/store/store_init.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/store/store_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/store/store_register.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/store/store_strings.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/threads_none.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/threads_pthread.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/threads_win.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ts/ts_asn1.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ts/ts_conf.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ts/ts_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ts/ts_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ts/ts_req_print.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ts/ts_req_utils.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ts/ts_rsp_print.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ts/ts_rsp_sign.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ts/ts_rsp_utils.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ts/ts_rsp_verify.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ts/ts_verify_ctx.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/txt_db/txt_db.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ui/ui_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ui/ui_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ui/ui_null.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ui/ui_openssl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ui/ui_util.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/uid.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/whrlpool/wp_block.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/whrlpool/wp_dgst.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/by_dir.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/by_file.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/t_crl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/t_req.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/t_x509.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_att.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_cmp.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_d2.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_def.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_ext.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_lu.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_meth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_obj.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_r2x.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_req.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_set.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_trs.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_txt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_v3.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_vfy.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_vpm.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509cset.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509name.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509rset.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509spki.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509type.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x_all.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x_attrib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x_crl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x_exten.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x_name.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x_pubkey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x_req.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x_x509.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x_x509a.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/pcy_cache.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/pcy_data.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/pcy_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/pcy_map.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/pcy_node.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/pcy_tree.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_addr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_admis.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_akey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_akeya.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_alt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_asid.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_bcons.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_bitst.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_conf.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_cpols.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_crld.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_enum.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_extku.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_genn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_ia5.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_info.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_int.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_ncons.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_pci.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_pcia.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_pcons.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_pku.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_pmaps.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_prn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_purp.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_skey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_sxnet.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_tlsf.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_utl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "engines/e_capi.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "engines/e_padlock.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "fuzz/asn1.o" =>
@@ -8994,6 +8357,14 @@ our %unified_info = (
                 [
                     "include",
                 ],
+            "include/crypto/bn_conf.h" =>
+                [
+                    ".",
+                ],
+            "include/crypto/dso_conf.h" =>
+                [
+                    ".",
+                ],
             "include/openssl/opensslconf.h" =>
                 [
                     ".",
@@ -9238,7 +8609,6 @@ our %unified_info = (
                 [
                     ".",
                     "include",
-                    "crypto/include",
                 ],
             "test/asn1_string_table_test.o" =>
                 [
@@ -9564,7 +8934,6 @@ our %unified_info = (
                 [
                     ".",
                     "include",
-                    "crypto/include",
                 ],
             "test/cipher_overhead_test.o" =>
                 [
@@ -9610,7 +8979,6 @@ our %unified_info = (
             "test/ctype_internal_test.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "test/curve448_internal_test.o" =>
@@ -9676,7 +9044,6 @@ our %unified_info = (
                 [
                     "include",
                     "crypto/ec",
-                    "crypto/include",
                 ],
             "test/ecdsatest.o" =>
                 [
@@ -9701,7 +9068,6 @@ our %unified_info = (
             "test/evp_extra_test.o" =>
                 [
                     "include",
-                    "crypto/include",
                 ],
             "test/evp_test.o" =>
                 [
@@ -9799,7 +9165,6 @@ our %unified_info = (
                 [
                     ".",
                     "include",
-                    "crypto/include",
                 ],
             "test/rc2test.o" =>
                 [
@@ -9849,18 +9214,15 @@ our %unified_info = (
                 [
                     ".",
                     "include",
-                    "crypto/include",
                 ],
             "test/sm2_internal_test.o" =>
                 [
                     "include",
-                    "crypto/include",
                 ],
             "test/sm4_internal_test.o" =>
                 [
                     ".",
                     "include",
-                    "crypto/include",
                 ],
             "test/srptest.o" =>
                 [
@@ -9871,6 +9233,10 @@ our %unified_info = (
                     ".",
                     "include",
                 ],
+            "test/ssl_ctx_test.o" =>
+                [
+                    "include",
+                ],
             "test/ssl_test.o" =>
                 [
                     "include",
@@ -9934,10 +9300,6 @@ our %unified_info = (
                 [
                     "include",
                 ],
-            "test/testutil/init.o" =>
-                [
-                    "include",
-                ],
             "test/testutil/main.o" =>
                 [
                     "include",
@@ -9966,6 +9328,10 @@ our %unified_info = (
                 [
                     "include",
                 ],
+            "test/testutil/testutil_init.o" =>
+                [
+                    "include",
+                ],
             "test/threadstest.o" =>
                 [
                     "include",
@@ -10230,6 +9596,7 @@ our %unified_info = (
             "test/sm4_internal_test",
             "test/srptest",
             "test/ssl_cert_table_internal_test",
+            "test/ssl_ctx_test",
             "test/ssl_test",
             "test/ssl_test_ctx_test",
             "test/sslapitest",
@@ -15098,7 +14465,6 @@ our %unified_info = (
                     "test/testutil/cb.o",
                     "test/testutil/driver.o",
                     "test/testutil/format_output.o",
-                    "test/testutil/init.o",
                     "test/testutil/main.o",
                     "test/testutil/output_helpers.o",
                     "test/testutil/random.o",
@@ -15106,6 +14472,7 @@ our %unified_info = (
                     "test/testutil/tap_bio.o",
                     "test/testutil/test_cleanup.o",
                     "test/testutil/tests.o",
+                    "test/testutil/testutil_init.o",
                 ],
             "test/md2test" =>
                 [
@@ -15333,6 +14700,14 @@ our %unified_info = (
                 [
                     "test/ssl_cert_table_internal_test.c",
                 ],
+            "test/ssl_ctx_test" =>
+                [
+                    "test/ssl_ctx_test.o",
+                ],
+            "test/ssl_ctx_test.o" =>
+                [
+                    "test/ssl_ctx_test.c",
+                ],
             "test/ssl_test" =>
                 [
                     "test/handshake_helper.o",
@@ -15435,10 +14810,6 @@ our %unified_info = (
                 [
                     "test/testutil/format_output.c",
                 ],
-            "test/testutil/init.o" =>
-                [
-                    "test/testutil/init.c",
-                ],
             "test/testutil/main.o" =>
                 [
                     "test/testutil/main.c",
@@ -15467,6 +14838,10 @@ our %unified_info = (
                 [
                     "test/testutil/tests.c",
                 ],
+            "test/testutil/testutil_init.o" =>
+                [
+                    "test/testutil/testutil_init.c",
+                ],
             "test/threadstest" =>
                 [
                     "test/threadstest.o",
diff --git a/deps/openssl/config/archs/VC-WIN32/no-asm/crypto/buildinf.h b/deps/openssl/config/archs/VC-WIN32/no-asm/crypto/buildinf.h
index 916cdacd50..71f5a9d1a1 100644
--- a/deps/openssl/config/archs/VC-WIN32/no-asm/crypto/buildinf.h
+++ b/deps/openssl/config/archs/VC-WIN32/no-asm/crypto/buildinf.h
@@ -11,7 +11,7 @@
  */
 
 #define PLATFORM "platform: "
-#define DATE "built on: Fri Sep 13 16:03:44 2019 UTC"
+#define DATE "built on: Wed Mar 18 21:11:12 2020 UTC"
 
 /*
  * Generate compiler_flags as an array of individual characters. This is a
diff --git a/deps/openssl/config/archs/VC-WIN32/no-asm/crypto/include/internal/bn_conf.h b/deps/openssl/config/archs/VC-WIN32/no-asm/crypto/include/internal/bn_conf.h
index ce324699ae..2242cd2fc0 100644
--- a/deps/openssl/config/archs/VC-WIN32/no-asm/crypto/include/internal/bn_conf.h
+++ b/deps/openssl/config/archs/VC-WIN32/no-asm/crypto/include/internal/bn_conf.h
@@ -1,5 +1,5 @@
 /* WARNING: do not edit! */
-/* Generated by makefile from crypto/include/internal/bn_conf.h.in */
+/* Generated by makefile from include/crypto/bn_conf.h.in */
 /*
  * Copyright 2016 The OpenSSL Project Authors. All Rights Reserved.
  *
@@ -9,8 +9,8 @@
  * https://www.openssl.org/source/license.html
  */
 
-#ifndef HEADER_BN_CONF_H
-# define HEADER_BN_CONF_H
+#ifndef OSSL_CRYPTO_BN_CONF_H
+# define OSSL_CRYPTO_BN_CONF_H
 
 /*
  * The contents of this file are not used in the UEFI build, as
diff --git a/deps/openssl/config/archs/VC-WIN32/no-asm/crypto/include/internal/dso_conf.h b/deps/openssl/config/archs/VC-WIN32/no-asm/crypto/include/internal/dso_conf.h
index c3b41df01e..0c96ce7363 100644
--- a/deps/openssl/config/archs/VC-WIN32/no-asm/crypto/include/internal/dso_conf.h
+++ b/deps/openssl/config/archs/VC-WIN32/no-asm/crypto/include/internal/dso_conf.h
@@ -1,5 +1,5 @@
 /* WARNING: do not edit! */
-/* Generated by makefile from crypto/include/internal/dso_conf.h.in */
+/* Generated by makefile from include/crypto/dso_conf.h.in */
 /*
  * Copyright 2016-2019 The OpenSSL Project Authors. All Rights Reserved.
  *
@@ -9,8 +9,8 @@
  * https://www.openssl.org/source/license.html
  */
 
-#ifndef HEADER_DSO_CONF_H
-# define HEADER_DSO_CONF_H
+#ifndef OSSL_CRYPTO_DSO_CONF_H
+# define OSSL_CRYPTO_DSO_CONF_H
 # define DSO_WIN32
 # define DSO_EXTENSION ".dll"
 #endif
diff --git a/deps/openssl/config/archs/VC-WIN32/no-asm/include/openssl/opensslconf.h b/deps/openssl/config/archs/VC-WIN32/no-asm/include/openssl/opensslconf.h
index 48cd14288a..24a8c49752 100644
--- a/deps/openssl/config/archs/VC-WIN32/no-asm/include/openssl/opensslconf.h
+++ b/deps/openssl/config/archs/VC-WIN32/no-asm/include/openssl/opensslconf.h
@@ -102,9 +102,6 @@ extern "C" {
 #ifndef OPENSSL_NO_DYNAMIC_ENGINE
 # define OPENSSL_NO_DYNAMIC_ENGINE
 #endif
-#ifndef OPENSSL_NO_AFALGENG
-# define OPENSSL_NO_AFALGENG
-#endif
 
 
 /*
diff --git a/deps/openssl/config/archs/VC-WIN32/no-asm/include/progs.h b/deps/openssl/config/archs/VC-WIN32/no-asm/include/progs.h
index 9b3d270e20..308c65601b 100644
--- a/deps/openssl/config/archs/VC-WIN32/no-asm/include/progs.h
+++ b/deps/openssl/config/archs/VC-WIN32/no-asm/include/progs.h
@@ -2,7 +2,7 @@
  * WARNING: do not edit!
  * Generated by apps/progs.pl
  *
- * Copyright 1995-2019 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 1995-2020 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
diff --git a/deps/openssl/config/archs/VC-WIN32/no-asm/openssl-cl.gypi b/deps/openssl/config/archs/VC-WIN32/no-asm/openssl-cl.gypi
index e4ddabd2bb..474ccf785b 100644
--- a/deps/openssl/config/archs/VC-WIN32/no-asm/openssl-cl.gypi
+++ b/deps/openssl/config/archs/VC-WIN32/no-asm/openssl-cl.gypi
@@ -11,9 +11,9 @@
       'OPENSSL_PIC',
     ],
     'openssl_cflags_VC-WIN32': [
-      '/W3 /wd4090 /nologo /O2 /WX',
+      '/W3 /wd4090 /nologo /O2',
       '/Gs0 /GF /Gy',
-      '/W3 /wd4090 /nologo /O2 /WX',
+      '/W3 /wd4090 /nologo /O2',
     ],
     'openssl_ex_libs_VC-WIN32': [
       'ws2_32.lib gdi32.lib advapi32.lib crypt32.lib user32.lib',
diff --git a/deps/openssl/config/archs/VC-WIN32/no-asm/openssl.gypi b/deps/openssl/config/archs/VC-WIN32/no-asm/openssl.gypi
index 2c843d9902..9776407687 100644
--- a/deps/openssl/config/archs/VC-WIN32/no-asm/openssl.gypi
+++ b/deps/openssl/config/archs/VC-WIN32/no-asm/openssl.gypi
@@ -695,9 +695,9 @@
       'OPENSSL_PIC',
     ],
     'openssl_cflags_VC-WIN32': [
-      '/W3 /wd4090 /nologo /O2 /WX',
+      '/W3 /wd4090 /nologo /O2',
       '/Gs0 /GF /Gy',
-      '/W3 /wd4090 /nologo /O2 /WX',
+      '/W3 /wd4090 /nologo /O2',
     ],
     'openssl_ex_libs_VC-WIN32': [
       'ws2_32.lib gdi32.lib advapi32.lib crypt32.lib user32.lib',
diff --git a/deps/openssl/config/archs/VC-WIN64-ARM/no-asm/configdata.pm b/deps/openssl/config/archs/VC-WIN64-ARM/no-asm/configdata.pm
index 1d006b56d6..949959ff10 100644
--- a/deps/openssl/config/archs/VC-WIN64-ARM/no-asm/configdata.pm
+++ b/deps/openssl/config/archs/VC-WIN64-ARM/no-asm/configdata.pm
@@ -57,7 +57,7 @@ our %config = (
   minor => "1.1",
   openssl_algorithm_defines => [ "OPENSSL_NO_COMP", "OPENSSL_NO_MD2", "OPENSSL_NO_RC5" ],
   openssl_api_defines => [  ],
-  openssl_other_defines => [ "OPENSSL_RAND_SEED_OS", "OPENSSL_NO_AFALGENG", "OPENSSL_NO_ASAN", "OPENSSL_NO_ASM", "OPENSSL_NO_CRYPTO_MDEBUG", "OPENSSL_NO_CRYPTO_MDEBUG_BACKTRACE", "OPENSSL_NO_DEVCRYPTOENG", "OPENSSL_NO_EC_NISTP_64_GCC_128", "OPENSSL_NO_EGD", "OPENSSL_NO_EXTERNAL_TESTS", "OPENSSL_NO_FUZZ_AFL", "OPENSSL_NO_FUZZ_LIBFUZZER", "OPENSSL_NO_HEARTBEATS", "OPENSSL_NO_MSAN", "OPENSSL_NO_SCTP", "OPENSSL_NO_SSL3", "OPENSSL_NO_SSL3_METHOD", "OPENSSL_NO_UBSAN", "OPENSSL_NO_UNIT_TEST", "OPENSSL_NO_WEAK_SSL_CIPHERS", "OPENSSL_NO_DYNAMIC_ENGINE", "OPENSSL_NO_AFALGENG" ],
+  openssl_other_defines => [ "OPENSSL_RAND_SEED_OS", "OPENSSL_NO_AFALGENG", "OPENSSL_NO_ASAN", "OPENSSL_NO_ASM", "OPENSSL_NO_CRYPTO_MDEBUG", "OPENSSL_NO_CRYPTO_MDEBUG_BACKTRACE", "OPENSSL_NO_DEVCRYPTOENG", "OPENSSL_NO_EC_NISTP_64_GCC_128", "OPENSSL_NO_EGD", "OPENSSL_NO_EXTERNAL_TESTS", "OPENSSL_NO_FUZZ_AFL", "OPENSSL_NO_FUZZ_LIBFUZZER", "OPENSSL_NO_HEARTBEATS", "OPENSSL_NO_MSAN", "OPENSSL_NO_SCTP", "OPENSSL_NO_SSL3", "OPENSSL_NO_SSL3_METHOD", "OPENSSL_NO_UBSAN", "OPENSSL_NO_UNIT_TEST", "OPENSSL_NO_WEAK_SSL_CIPHERS", "OPENSSL_NO_DYNAMIC_ENGINE" ],
   openssl_sys_defines => [  ],
   openssl_thread_defines => [ "OPENSSL_THREADS" ],
   openssldir => "",
@@ -113,8 +113,8 @@ our %config = (
   sourcedir => ".",
   target => "VC-WIN64-ARM",
   tdirs => [ "ossl_shim" ],
-  version => "1.1.1d",
-  version_num => "0x1010104fL",
+  version => "1.1.1e",
+  version_num => "0x1010105fL",
 );
 
 our %target = (
@@ -128,7 +128,7 @@ our %target = (
   LDFLAGS => "/nologo /debug",
   MT => "mt",
   MTFLAGS => "-nologo",
-  RANLIB => "CODE(0x55cd56acf3f8)",
+  RANLIB => "CODE(0x55748984a208)",
   RC => "rc",
   _conf_fname_int => [ "Configurations/00-base-templates.conf", "Configurations/00-base-templates.conf", "Configurations/10-main.conf", "Configurations/10-main.conf", "Configurations/50-win-onecore.conf", "Configurations/shared-info.pl" ],
   aes_asm_src => "aes_core.c aes_cbc.c",
@@ -248,6 +248,7 @@ our @disablables = (
   "dgram",
   "dh",
   "dsa",
+  "dso",
   "dtls",
   "dynamic-engine",
   "ec",
@@ -366,8 +367,8 @@ our %unified_info = (
         {
             "" =>
                 [
-                    "crypto/include/internal/bn_conf.h",
-                    "crypto/include/internal/dso_conf.h",
+                    "include/crypto/bn_conf.h",
+                    "include/crypto/dso_conf.h",
                     "include/openssl/opensslconf.h",
                 ],
             "apps/asn1pars.o" =>
@@ -635,14 +636,6 @@ our %unified_info = (
                     "crypto/perlasm/cbc.pl",
                     "crypto/perlasm/x86asm.pl",
                 ],
-            "crypto/include/internal/bn_conf.h" =>
-                [
-                    "configdata.pm",
-                ],
-            "crypto/include/internal/dso_conf.h" =>
-                [
-                    "configdata.pm",
-                ],
             "crypto/rc4/rc4-586.s" =>
                 [
                     "crypto/perlasm/x86asm.pl",
@@ -718,6 +711,14 @@ our %unified_info = (
                 [
                     "libcrypto",
                 ],
+            "include/crypto/bn_conf.h" =>
+                [
+                    "configdata.pm",
+                ],
+            "include/crypto/dso_conf.h" =>
+                [
+                    "configdata.pm",
+                ],
             "include/openssl/opensslconf.h" =>
                 [
                     "configdata.pm",
@@ -1515,6 +1516,12 @@ our %unified_info = (
                     "libcrypto",
                     "test/libtestutil.a",
                 ],
+            "test/ssl_ctx_test" =>
+                [
+                    "libcrypto",
+                    "libssl",
+                    "test/libtestutil.a",
+                ],
             "test/ssl_test" =>
                 [
                     "libcrypto",
@@ -3233,7 +3240,6 @@ our %unified_info = (
                             "test/testutil/cb.o",
                             "test/testutil/driver.o",
                             "test/testutil/format_output.o",
-                            "test/testutil/init.o",
                             "test/testutil/main.o",
                             "test/testutil/output_helpers.o",
                             "test/testutil/random.o",
@@ -3241,6 +3247,7 @@ our %unified_info = (
                             "test/testutil/tap_bio.o",
                             "test/testutil/test_cleanup.o",
                             "test/testutil/tests.o",
+                            "test/testutil/testutil_init.o",
                         ],
                     "products" =>
                         {
@@ -3734,14 +3741,6 @@ our %unified_info = (
                 [
                     "crypto/ia64cpuid.S",
                 ],
-            "crypto/include/internal/bn_conf.h" =>
-                [
-                    "crypto/include/internal/bn_conf.h.in",
-                ],
-            "crypto/include/internal/dso_conf.h" =>
-                [
-                    "crypto/include/internal/dso_conf.h.in",
-                ],
             "crypto/md5/md5-586.s" =>
                 [
                     "crypto/md5/asm/md5-586.pl",
@@ -4182,6 +4181,14 @@ our %unified_info = (
                     "engines/asm/e_padlock-x86_64.pl",
                     "\$(PERLASM_SCHEME)",
                 ],
+            "include/crypto/bn_conf.h" =>
+                [
+                    "include/crypto/bn_conf.h.in",
+                ],
+            "include/crypto/dso_conf.h" =>
+                [
+                    "include/crypto/dso_conf.h.in",
+                ],
             "include/openssl/opensslconf.h" =>
                 [
                     "include/openssl/opensslconf.h.in",
@@ -4891,49 +4898,41 @@ our %unified_info = (
             "crypto/aes/aes_cbc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/aes/aes_cfb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/aes/aes_core.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/aes/aes_ecb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/aes/aes_ige.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/aes/aes_misc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/aes/aes_ofb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/aes/aes_wrap.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/aes/aesfx-sparcv9.o" =>
@@ -4955,7 +4954,6 @@ our %unified_info = (
             "crypto/aria/aria.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/arm64cpuid.o" =>
@@ -4969,613 +4967,511 @@ our %unified_info = (
             "crypto/asn1/a_bitstr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_d2i_fp.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_digest.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_dup.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_gentm.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_i2d_fp.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_int.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_mbstr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_object.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_octet.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_print.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_sign.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_strex.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_strnid.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_time.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_type.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_utctm.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_utf8.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_verify.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/ameth_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/asn1_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/asn1_gen.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/asn1_item_list.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/asn1_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/asn1_par.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/asn_mime.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/asn_moid.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/asn_mstbl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/asn_pack.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/bio_asn1.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/bio_ndef.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/d2i_pr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/d2i_pu.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/evp_asn1.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/f_int.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/f_string.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/i2d_pr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/i2d_pu.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/n_pkey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/nsseq.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/p5_pbe.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/p5_pbev2.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/p5_scrypt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/p8_pkey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/t_bitst.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/t_pkey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/t_spki.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/tasn_dec.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/tasn_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/tasn_fre.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/tasn_new.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/tasn_prn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/tasn_scn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/tasn_typ.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/tasn_utl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/x_algor.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/x_bignum.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/x_info.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/x_int64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/x_long.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/x_pkey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/x_sig.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/x_spki.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/x_val.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/async/arch/async_null.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/async/arch/async_posix.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/async/arch/async_win.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/async/async.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/async/async_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/async/async_wait.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bf/bf_cfb64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bf/bf_ecb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bf/bf_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bf/bf_ofb64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bf/bf_skey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/b_addr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/b_dump.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/b_print.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/b_sock.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/b_sock2.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bf_buff.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bf_lbuf.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bf_nbio.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bf_null.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bio_cb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bio_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bio_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bio_meth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bss_acpt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bss_bio.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bss_conn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bss_dgram.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bss_fd.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bss_file.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bss_log.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bss_mem.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bss_null.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bss_sock.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/blake2/blake2b.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/blake2/blake2s.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/blake2/m_blake2b.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/blake2/m_blake2s.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/armv4-gf2m.o" =>
@@ -5593,188 +5489,157 @@ our %unified_info = (
             "crypto/bn/bn_add.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_asm.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_blind.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_const.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_ctx.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_depr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_dh.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_div.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_exp.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto",
                 ],
             "crypto/bn/bn_exp2.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_gcd.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_gf2m.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_intern.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_kron.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_mod.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_mont.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_mpi.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_mul.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_nist.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_prime.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_print.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_rand.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_recp.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_shift.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_sqr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_sqrt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_srp.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_word.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_x931p.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/mips-mont.o" =>
@@ -5804,13 +5669,11 @@ our %unified_info = (
             "crypto/buffer/buf_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/buffer/buffer.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/buildinf.h" =>
@@ -5820,43 +5683,36 @@ our %unified_info = (
             "crypto/camellia/camellia.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/camellia/cmll_cbc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/camellia/cmll_cfb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/camellia/cmll_ctr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/camellia/cmll_ecb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/camellia/cmll_misc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/camellia/cmll_ofb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/camellia/cmllt4-sparcv9.o" =>
@@ -5866,31 +5722,26 @@ our %unified_info = (
             "crypto/cast/c_cfb64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cast/c_ecb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cast/c_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cast/c_ofb64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cast/c_skey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/chacha/chacha-armv4.o" =>
@@ -5908,278 +5759,232 @@ our %unified_info = (
             "crypto/chacha/chacha_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cmac/cm_ameth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cmac/cm_pmeth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cmac/cmac.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_asn1.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_att.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_cd.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_dd.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_env.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_ess.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_io.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_kari.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_pwri.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_sd.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_smime.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/conf/conf_api.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/conf/conf_def.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/conf/conf_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/conf/conf_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/conf/conf_mall.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/conf/conf_mod.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/conf/conf_sap.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/conf/conf_ssl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cpt_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cryptlib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ct/ct_b64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ct/ct_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ct/ct_log.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ct/ct_oct.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ct/ct_policy.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ct/ct_prn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ct/ct_sct.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ct/ct_sct_ctx.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ct/ct_vfy.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ct/ct_x509v3.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ctype.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cversion.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto",
                 ],
             "crypto/des/cbc_cksm.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/cbc_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/cfb64ede.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/cfb64enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/cfb_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/des_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/dest4-sparcv9.o" =>
@@ -6189,301 +5994,251 @@ our %unified_info = (
             "crypto/des/ecb3_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/ecb_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/fcrypt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/fcrypt_b.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/ofb64ede.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/ofb64enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/ofb_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/pcbc_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/qud_cksm.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/rand_key.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/set_key.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/str2key.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/xcbc_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_ameth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_asn1.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_check.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_depr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_gen.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_kdf.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_key.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_meth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_pmeth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_prn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_rfc5114.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_rfc7919.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dsa/dsa_ameth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dsa/dsa_asn1.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dsa/dsa_depr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dsa/dsa_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dsa/dsa_gen.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dsa/dsa_key.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dsa/dsa_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dsa/dsa_meth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dsa/dsa_ossl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dsa/dsa_pmeth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dsa/dsa_prn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dsa/dsa_sign.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dsa/dsa_vrf.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dso/dso_dl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dso/dso_dlfcn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dso/dso_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dso/dso_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dso/dso_openssl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dso/dso_vms.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dso/dso_win32.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ebcdic.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/curve25519.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/curve448/arch_32/f_impl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto/ec/curve448/arch_32",
                     "crypto/ec/curve448",
@@ -6491,7 +6246,6 @@ our %unified_info = (
             "crypto/ec/curve448/curve448.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto/ec/curve448/arch_32",
                     "crypto/ec/curve448",
@@ -6499,7 +6253,6 @@ our %unified_info = (
             "crypto/ec/curve448/curve448_tables.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto/ec/curve448/arch_32",
                     "crypto/ec/curve448",
@@ -6507,7 +6260,6 @@ our %unified_info = (
             "crypto/ec/curve448/eddsa.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto/ec/curve448/arch_32",
                     "crypto/ec/curve448",
@@ -6515,7 +6267,6 @@ our %unified_info = (
             "crypto/ec/curve448/f_generic.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto/ec/curve448/arch_32",
                     "crypto/ec/curve448",
@@ -6523,7 +6274,6 @@ our %unified_info = (
             "crypto/ec/curve448/scalar.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto/ec/curve448/arch_32",
                     "crypto/ec/curve448",
@@ -6531,163 +6281,136 @@ our %unified_info = (
             "crypto/ec/ec2_oct.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec2_smpl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec_ameth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec_asn1.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec_check.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec_curve.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec_cvt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec_key.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec_kmeth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec_mult.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec_oct.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec_pmeth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec_print.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecdh_kdf.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecdh_ossl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecdsa_ossl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecdsa_sign.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecdsa_vrf.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/eck_prn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecp_mont.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecp_nist.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecp_nistp224.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecp_nistp256.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecp_nistp521.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecp_nistputil.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecp_nistz256-armv4.o" =>
@@ -6705,223 +6428,186 @@ our %unified_info = (
             "crypto/ec/ecp_oct.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecp_smpl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecx_meth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/eng_all.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/eng_cnf.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/eng_ctrl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/eng_dyn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/eng_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/eng_fat.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/eng_init.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/eng_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/eng_list.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/eng_openssl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/eng_pkey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/eng_rdrand.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/eng_table.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/tb_asnmth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/tb_cipher.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/tb_dh.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/tb_digest.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/tb_dsa.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/tb_eckey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/tb_pkmeth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/tb_rand.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/tb_rsa.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/err/err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/err/err_all.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/err/err_prn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/bio_b64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/bio_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/bio_md.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/bio_ok.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/c_allc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/c_alld.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/cmeth_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/digest.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/e_aes.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto",
                     "crypto/modes",
@@ -6929,21 +6615,18 @@ our %unified_info = (
             "crypto/evp/e_aes_cbc_hmac_sha1.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto/modes",
                 ],
             "crypto/evp/e_aes_cbc_hmac_sha256.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto/modes",
                 ],
             "crypto/evp/e_aria.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto",
                     "crypto/modes",
@@ -6951,13 +6634,11 @@ our %unified_info = (
             "crypto/evp/e_bf.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/e_camellia.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto",
                     "crypto/modes",
@@ -6965,81 +6646,68 @@ our %unified_info = (
             "crypto/evp/e_cast.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/e_chacha20_poly1305.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/e_des.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto",
                 ],
             "crypto/evp/e_des3.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto",
                 ],
             "crypto/evp/e_idea.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/e_null.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/e_old.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/e_rc2.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/e_rc4.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/e_rc4_hmac_md5.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/e_rc5.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/e_seed.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/e_sm4.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto",
                     "crypto/modes",
@@ -7047,328 +6715,267 @@ our %unified_info = (
             "crypto/evp/e_xcbc_d.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/encode.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/evp_cnf.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/evp_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/evp_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/evp_key.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/evp_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/evp_pbe.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/evp_pkey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/m_md2.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/m_md4.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/m_md5.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/m_md5_sha1.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/m_mdc2.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/m_null.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/m_ripemd.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/m_sha1.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/m_sha3.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto",
                 ],
             "crypto/evp/m_sigver.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/m_wp.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/names.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/p5_crpt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/p5_crpt2.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/p_dec.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/p_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/p_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/p_open.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/p_seal.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/p_sign.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/p_verify.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/pbe_scrypt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/pmeth_fn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/pmeth_gn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/pmeth_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ex_data.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/getenv.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/hmac/hm_ameth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/hmac/hm_pmeth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/hmac/hmac.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/idea/i_cbc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/idea/i_cfb64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/idea/i_ecb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/idea/i_ofb64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/idea/i_skey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
-            "crypto/include/internal/bn_conf.h" =>
-                [
-                    ".",
-                ],
-            "crypto/include/internal/dso_conf.h" =>
-                [
-                    ".",
-                ],
             "crypto/init.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/kdf/hkdf.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/kdf/kdf_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/kdf/scrypt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/kdf/tls1_prf.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/lhash/lh_stats.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/lhash/lhash.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/md4/md4_dgst.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/md4/md4_one.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/md5/md5-sparcv9.o" =>
@@ -7378,85 +6985,71 @@ our %unified_info = (
             "crypto/md5/md5_dgst.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/md5/md5_one.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/mdc2/mdc2_one.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/mdc2/mdc2dgst.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/mem.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/mem_clr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/mem_dbg.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/mem_sec.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/modes/cbc128.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/modes/ccm128.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/modes/cfb128.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/modes/ctr128.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/modes/cts128.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/modes/gcm128.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto",
                 ],
@@ -7479,361 +7072,301 @@ our %unified_info = (
             "crypto/modes/ocb128.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/modes/ofb128.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/modes/wrap128.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/modes/xts128.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/o_dir.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/o_fips.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/o_fopen.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/o_init.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/o_str.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/o_time.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/objects/o_names.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/objects/obj_dat.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/objects/obj_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/objects/obj_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/objects/obj_xref.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ocsp/ocsp_asn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ocsp/ocsp_cl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ocsp/ocsp_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ocsp/ocsp_ext.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ocsp/ocsp_ht.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ocsp/ocsp_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ocsp/ocsp_prn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ocsp/ocsp_srv.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ocsp/ocsp_vfy.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ocsp/v3_ocsp.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pem/pem_all.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pem/pem_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pem/pem_info.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pem/pem_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pem/pem_oth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pem/pem_pk8.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pem/pem_pkey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pem/pem_sign.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pem/pem_x509.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pem/pem_xaux.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pem/pvkfmt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_add.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_asn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_attr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_crpt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_crt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_decr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_init.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_key.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_kiss.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_mutl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_npas.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_p8d.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_p8e.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_sbag.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_utl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/pk12err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs7/bio_pk7.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs7/pk7_asn1.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs7/pk7_attr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs7/pk7_doit.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs7/pk7_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs7/pk7_mime.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs7/pk7_smime.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs7/pkcs7err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/poly1305/poly1305-armv4.o" =>
@@ -7855,259 +7388,216 @@ our %unified_info = (
             "crypto/poly1305/poly1305.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/poly1305/poly1305_ameth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/poly1305/poly1305_pmeth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rand/drbg_ctr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rand/drbg_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rand/rand_egd.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rand/rand_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rand/rand_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rand/rand_unix.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rand/rand_vms.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rand/rand_win.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rand/randfile.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rc2/rc2_cbc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rc2/rc2_ecb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rc2/rc2_skey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rc2/rc2cfb64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rc2/rc2ofb64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rc4/rc4_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rc4/rc4_skey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ripemd/rmd_dgst.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ripemd/rmd_one.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_ameth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_asn1.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_chk.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_crpt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_depr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_gen.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_meth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_mp.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_none.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_oaep.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_ossl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_pk1.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_pmeth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_prn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_pss.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_saos.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_sign.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_ssl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_x931.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_x931g.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/s390xcpuid.o" =>
@@ -8117,31 +7607,26 @@ our %unified_info = (
             "crypto/seed/seed.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/seed/seed_cbc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/seed/seed_cfb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/seed/seed_ecb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/seed/seed_ofb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sha/keccak1600-armv4.o" =>
@@ -8151,7 +7636,6 @@ our %unified_info = (
             "crypto/sha/keccak1600.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sha/sha1-armv4-large.o" =>
@@ -8177,13 +7661,11 @@ our %unified_info = (
             "crypto/sha/sha1_one.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sha/sha1dgst.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sha/sha256-armv4.o" =>
@@ -8209,7 +7691,6 @@ our %unified_info = (
             "crypto/sha/sha256.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sha/sha512-armv4.o" =>
@@ -8235,709 +7716,591 @@ our %unified_info = (
             "crypto/sha/sha512.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/siphash/siphash.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/siphash/siphash_ameth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/siphash/siphash_pmeth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sm2/sm2_crypt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sm2/sm2_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sm2/sm2_pmeth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sm2/sm2_sign.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sm3/m_sm3.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sm3/sm3.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sm4/sm4.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/srp/srp_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/srp/srp_vfy.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/stack/stack.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/store/loader_file.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/store/store_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/store/store_init.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/store/store_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/store/store_register.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/store/store_strings.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/threads_none.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/threads_pthread.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/threads_win.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ts/ts_asn1.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ts/ts_conf.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ts/ts_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ts/ts_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ts/ts_req_print.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ts/ts_req_utils.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ts/ts_rsp_print.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ts/ts_rsp_sign.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ts/ts_rsp_utils.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ts/ts_rsp_verify.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ts/ts_verify_ctx.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/txt_db/txt_db.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ui/ui_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ui/ui_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ui/ui_null.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ui/ui_openssl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ui/ui_util.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/uid.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/whrlpool/wp_block.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/whrlpool/wp_dgst.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/by_dir.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/by_file.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/t_crl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/t_req.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/t_x509.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_att.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_cmp.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_d2.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_def.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_ext.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_lu.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_meth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_obj.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_r2x.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_req.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_set.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_trs.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_txt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_v3.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_vfy.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_vpm.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509cset.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509name.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509rset.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509spki.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509type.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x_all.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x_attrib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x_crl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x_exten.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x_name.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x_pubkey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x_req.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x_x509.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x_x509a.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/pcy_cache.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/pcy_data.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/pcy_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/pcy_map.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/pcy_node.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/pcy_tree.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_addr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_admis.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_akey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_akeya.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_alt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_asid.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_bcons.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_bitst.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_conf.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_cpols.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_crld.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_enum.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_extku.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_genn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_ia5.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_info.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_int.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_ncons.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_pci.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_pcia.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_pcons.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_pku.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_pmaps.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_prn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_purp.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_skey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_sxnet.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_tlsf.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_utl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "engines/e_capi.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "engines/e_padlock.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "fuzz/asn1.o" =>
@@ -8988,6 +8351,14 @@ our %unified_info = (
                 [
                     "include",
                 ],
+            "include/crypto/bn_conf.h" =>
+                [
+                    ".",
+                ],
+            "include/crypto/dso_conf.h" =>
+                [
+                    ".",
+                ],
             "include/openssl/opensslconf.h" =>
                 [
                     ".",
@@ -9232,7 +8603,6 @@ our %unified_info = (
                 [
                     ".",
                     "include",
-                    "crypto/include",
                 ],
             "test/asn1_string_table_test.o" =>
                 [
@@ -9558,7 +8928,6 @@ our %unified_info = (
                 [
                     ".",
                     "include",
-                    "crypto/include",
                 ],
             "test/cipher_overhead_test.o" =>
                 [
@@ -9604,7 +8973,6 @@ our %unified_info = (
             "test/ctype_internal_test.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "test/curve448_internal_test.o" =>
@@ -9670,7 +9038,6 @@ our %unified_info = (
                 [
                     "include",
                     "crypto/ec",
-                    "crypto/include",
                 ],
             "test/ecdsatest.o" =>
                 [
@@ -9695,7 +9062,6 @@ our %unified_info = (
             "test/evp_extra_test.o" =>
                 [
                     "include",
-                    "crypto/include",
                 ],
             "test/evp_test.o" =>
                 [
@@ -9793,7 +9159,6 @@ our %unified_info = (
                 [
                     ".",
                     "include",
-                    "crypto/include",
                 ],
             "test/rc2test.o" =>
                 [
@@ -9843,18 +9208,15 @@ our %unified_info = (
                 [
                     ".",
                     "include",
-                    "crypto/include",
                 ],
             "test/sm2_internal_test.o" =>
                 [
                     "include",
-                    "crypto/include",
                 ],
             "test/sm4_internal_test.o" =>
                 [
                     ".",
                     "include",
-                    "crypto/include",
                 ],
             "test/srptest.o" =>
                 [
@@ -9865,6 +9227,10 @@ our %unified_info = (
                     ".",
                     "include",
                 ],
+            "test/ssl_ctx_test.o" =>
+                [
+                    "include",
+                ],
             "test/ssl_test.o" =>
                 [
                     "include",
@@ -9928,10 +9294,6 @@ our %unified_info = (
                 [
                     "include",
                 ],
-            "test/testutil/init.o" =>
-                [
-                    "include",
-                ],
             "test/testutil/main.o" =>
                 [
                     "include",
@@ -9960,6 +9322,10 @@ our %unified_info = (
                 [
                     "include",
                 ],
+            "test/testutil/testutil_init.o" =>
+                [
+                    "include",
+                ],
             "test/threadstest.o" =>
                 [
                     "include",
@@ -10224,6 +9590,7 @@ our %unified_info = (
             "test/sm4_internal_test",
             "test/srptest",
             "test/ssl_cert_table_internal_test",
+            "test/ssl_ctx_test",
             "test/ssl_test",
             "test/ssl_test_ctx_test",
             "test/sslapitest",
@@ -15092,7 +14459,6 @@ our %unified_info = (
                     "test/testutil/cb.o",
                     "test/testutil/driver.o",
                     "test/testutil/format_output.o",
-                    "test/testutil/init.o",
                     "test/testutil/main.o",
                     "test/testutil/output_helpers.o",
                     "test/testutil/random.o",
@@ -15100,6 +14466,7 @@ our %unified_info = (
                     "test/testutil/tap_bio.o",
                     "test/testutil/test_cleanup.o",
                     "test/testutil/tests.o",
+                    "test/testutil/testutil_init.o",
                 ],
             "test/md2test" =>
                 [
@@ -15327,6 +14694,14 @@ our %unified_info = (
                 [
                     "test/ssl_cert_table_internal_test.c",
                 ],
+            "test/ssl_ctx_test" =>
+                [
+                    "test/ssl_ctx_test.o",
+                ],
+            "test/ssl_ctx_test.o" =>
+                [
+                    "test/ssl_ctx_test.c",
+                ],
             "test/ssl_test" =>
                 [
                     "test/handshake_helper.o",
@@ -15429,10 +14804,6 @@ our %unified_info = (
                 [
                     "test/testutil/format_output.c",
                 ],
-            "test/testutil/init.o" =>
-                [
-                    "test/testutil/init.c",
-                ],
             "test/testutil/main.o" =>
                 [
                     "test/testutil/main.c",
@@ -15461,6 +14832,10 @@ our %unified_info = (
                 [
                     "test/testutil/tests.c",
                 ],
+            "test/testutil/testutil_init.o" =>
+                [
+                    "test/testutil/testutil_init.c",
+                ],
             "test/threadstest" =>
                 [
                     "test/threadstest.o",
diff --git a/deps/openssl/config/archs/VC-WIN64-ARM/no-asm/crypto/buildinf.h b/deps/openssl/config/archs/VC-WIN64-ARM/no-asm/crypto/buildinf.h
index 3e790eb5d6..95181bd2e5 100644
--- a/deps/openssl/config/archs/VC-WIN64-ARM/no-asm/crypto/buildinf.h
+++ b/deps/openssl/config/archs/VC-WIN64-ARM/no-asm/crypto/buildinf.h
@@ -11,7 +11,7 @@
  */
 
 #define PLATFORM "platform: VC-WIN64-ARM"
-#define DATE "built on: Fri Sep 13 16:03:47 2019 UTC"
+#define DATE "built on: Wed Mar 18 21:11:15 2020 UTC"
 
 /*
  * Generate compiler_flags as an array of individual characters. This is a
diff --git a/deps/openssl/config/archs/VC-WIN64-ARM/no-asm/crypto/include/internal/bn_conf.h b/deps/openssl/config/archs/VC-WIN64-ARM/no-asm/crypto/include/internal/bn_conf.h
index d803b51858..dab67d1b37 100644
--- a/deps/openssl/config/archs/VC-WIN64-ARM/no-asm/crypto/include/internal/bn_conf.h
+++ b/deps/openssl/config/archs/VC-WIN64-ARM/no-asm/crypto/include/internal/bn_conf.h
@@ -1,5 +1,5 @@
 /* WARNING: do not edit! */
-/* Generated by makefile from crypto/include/internal/bn_conf.h.in */
+/* Generated by makefile from include/crypto/bn_conf.h.in */
 /*
  * Copyright 2016 The OpenSSL Project Authors. All Rights Reserved.
  *
@@ -9,8 +9,8 @@
  * https://www.openssl.org/source/license.html
  */
 
-#ifndef HEADER_BN_CONF_H
-# define HEADER_BN_CONF_H
+#ifndef OSSL_CRYPTO_BN_CONF_H
+# define OSSL_CRYPTO_BN_CONF_H
 
 /*
  * The contents of this file are not used in the UEFI build, as
diff --git a/deps/openssl/config/archs/VC-WIN64-ARM/no-asm/crypto/include/internal/dso_conf.h b/deps/openssl/config/archs/VC-WIN64-ARM/no-asm/crypto/include/internal/dso_conf.h
index c3b41df01e..0c96ce7363 100644
--- a/deps/openssl/config/archs/VC-WIN64-ARM/no-asm/crypto/include/internal/dso_conf.h
+++ b/deps/openssl/config/archs/VC-WIN64-ARM/no-asm/crypto/include/internal/dso_conf.h
@@ -1,5 +1,5 @@
 /* WARNING: do not edit! */
-/* Generated by makefile from crypto/include/internal/dso_conf.h.in */
+/* Generated by makefile from include/crypto/dso_conf.h.in */
 /*
  * Copyright 2016-2019 The OpenSSL Project Authors. All Rights Reserved.
  *
@@ -9,8 +9,8 @@
  * https://www.openssl.org/source/license.html
  */
 
-#ifndef HEADER_DSO_CONF_H
-# define HEADER_DSO_CONF_H
+#ifndef OSSL_CRYPTO_DSO_CONF_H
+# define OSSL_CRYPTO_DSO_CONF_H
 # define DSO_WIN32
 # define DSO_EXTENSION ".dll"
 #endif
diff --git a/deps/openssl/config/archs/VC-WIN64-ARM/no-asm/include/openssl/opensslconf.h b/deps/openssl/config/archs/VC-WIN64-ARM/no-asm/include/openssl/opensslconf.h
index 8e89c3c501..edc97abafd 100644
--- a/deps/openssl/config/archs/VC-WIN64-ARM/no-asm/include/openssl/opensslconf.h
+++ b/deps/openssl/config/archs/VC-WIN64-ARM/no-asm/include/openssl/opensslconf.h
@@ -99,9 +99,6 @@ extern "C" {
 #ifndef OPENSSL_NO_DYNAMIC_ENGINE
 # define OPENSSL_NO_DYNAMIC_ENGINE
 #endif
-#ifndef OPENSSL_NO_AFALGENG
-# define OPENSSL_NO_AFALGENG
-#endif
 
 
 /*
diff --git a/deps/openssl/config/archs/VC-WIN64-ARM/no-asm/include/progs.h b/deps/openssl/config/archs/VC-WIN64-ARM/no-asm/include/progs.h
index 9b3d270e20..308c65601b 100644
--- a/deps/openssl/config/archs/VC-WIN64-ARM/no-asm/include/progs.h
+++ b/deps/openssl/config/archs/VC-WIN64-ARM/no-asm/include/progs.h
@@ -2,7 +2,7 @@
  * WARNING: do not edit!
  * Generated by apps/progs.pl
  *
- * Copyright 1995-2019 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 1995-2020 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
diff --git a/deps/openssl/config/archs/VC-WIN64A/asm/configdata.pm b/deps/openssl/config/archs/VC-WIN64A/asm/configdata.pm
index fd72727b52..84a7982deb 100644
--- a/deps/openssl/config/archs/VC-WIN64A/asm/configdata.pm
+++ b/deps/openssl/config/archs/VC-WIN64A/asm/configdata.pm
@@ -54,13 +54,13 @@ our %config = (
   export_var_as_fn => "1",
   includes => [  ],
   lflags => [  ],
-  lib_defines => [ "OPENSSL_PIC", "OPENSSL_CPUID_OBJ", "OPENSSL_IA32_SSE2", "OPENSSL_BN_ASM_MONT", "OPENSSL_BN_ASM_MONT5", "OPENSSL_BN_ASM_GF2m", "SHA1_ASM", "SHA256_ASM", "SHA512_ASM", "KECCAK1600_ASM", "RC4_ASM", "MD5_ASM", "VPAES_ASM", "GHASH_ASM", "ECP_NISTZ256_ASM", "X25519_ASM", "POLY1305_ASM" ],
+  lib_defines => [ "OPENSSL_PIC", "OPENSSL_CPUID_OBJ", "OPENSSL_IA32_SSE2", "OPENSSL_BN_ASM_MONT", "OPENSSL_BN_ASM_MONT5", "OPENSSL_BN_ASM_GF2m", "SHA1_ASM", "SHA256_ASM", "SHA512_ASM", "KECCAK1600_ASM", "RC4_ASM", "MD5_ASM", "AESNI_ASM", "VPAES_ASM", "GHASH_ASM", "ECP_NISTZ256_ASM", "X25519_ASM", "POLY1305_ASM" ],
   libdir => "",
   major => "1",
   minor => "1.1",
   openssl_algorithm_defines => [ "OPENSSL_NO_COMP", "OPENSSL_NO_MD2", "OPENSSL_NO_RC5" ],
   openssl_api_defines => [  ],
-  openssl_other_defines => [ "OPENSSL_RAND_SEED_OS", "OPENSSL_NO_AFALGENG", "OPENSSL_NO_ASAN", "OPENSSL_NO_CRYPTO_MDEBUG", "OPENSSL_NO_CRYPTO_MDEBUG_BACKTRACE", "OPENSSL_NO_DEVCRYPTOENG", "OPENSSL_NO_EC_NISTP_64_GCC_128", "OPENSSL_NO_EGD", "OPENSSL_NO_EXTERNAL_TESTS", "OPENSSL_NO_FUZZ_AFL", "OPENSSL_NO_FUZZ_LIBFUZZER", "OPENSSL_NO_HEARTBEATS", "OPENSSL_NO_MSAN", "OPENSSL_NO_SCTP", "OPENSSL_NO_SSL3", "OPENSSL_NO_SSL3_METHOD", "OPENSSL_NO_UBSAN", "OPENSSL_NO_UNIT_TEST", "OPENSSL_NO_WEAK_SSL_CIPHERS", "OPENSSL_NO_DYNAMIC_ENGINE", "OPENSSL_NO_AFALGENG" ],
+  openssl_other_defines => [ "OPENSSL_RAND_SEED_OS", "OPENSSL_NO_AFALGENG", "OPENSSL_NO_ASAN", "OPENSSL_NO_CRYPTO_MDEBUG", "OPENSSL_NO_CRYPTO_MDEBUG_BACKTRACE", "OPENSSL_NO_DEVCRYPTOENG", "OPENSSL_NO_EC_NISTP_64_GCC_128", "OPENSSL_NO_EGD", "OPENSSL_NO_EXTERNAL_TESTS", "OPENSSL_NO_FUZZ_AFL", "OPENSSL_NO_FUZZ_LIBFUZZER", "OPENSSL_NO_HEARTBEATS", "OPENSSL_NO_MSAN", "OPENSSL_NO_SCTP", "OPENSSL_NO_SSL3", "OPENSSL_NO_SSL3_METHOD", "OPENSSL_NO_UBSAN", "OPENSSL_NO_UNIT_TEST", "OPENSSL_NO_WEAK_SSL_CIPHERS", "OPENSSL_NO_DYNAMIC_ENGINE" ],
   openssl_sys_defines => [ "OPENSSL_SYS_WIN64A" ],
   openssl_thread_defines => [ "OPENSSL_THREADS" ],
   openssldir => "",
@@ -116,8 +116,8 @@ our %config = (
   sourcedir => ".",
   target => "VC-WIN64A",
   tdirs => [ "ossl_shim" ],
-  version => "1.1.1d",
-  version_num => "0x1010104fL",
+  version => "1.1.1e",
+  version_num => "0x1010105fL",
 );
 
 our %target = (
@@ -133,7 +133,7 @@ our %target = (
   LDFLAGS => "/nologo /debug",
   MT => "mt",
   MTFLAGS => "-nologo",
-  RANLIB => "CODE(0x560295a39668)",
+  RANLIB => "CODE(0x556e5b07ddf8)",
   RC => "rc",
   _conf_fname_int => [ "Configurations/00-base-templates.conf", "Configurations/00-base-templates.conf", "Configurations/10-main.conf", "Configurations/10-main.conf", "Configurations/10-main.conf", "Configurations/00-base-templates.conf", "Configurations/10-main.conf", "Configurations/shared-info.pl" ],
   aes_asm_src => "aes_core.c aes_cbc.c vpaes-x86_64.s aesni-x86_64.s aesni-sha1-x86_64.s aesni-sha256-x86_64.s aesni-mb-x86_64.s",
@@ -259,6 +259,7 @@ our @disablables = (
   "dgram",
   "dh",
   "dsa",
+  "dso",
   "dtls",
   "dynamic-engine",
   "ec",
@@ -376,8 +377,8 @@ our %unified_info = (
         {
             "" =>
                 [
-                    "crypto/include/internal/bn_conf.h",
-                    "crypto/include/internal/dso_conf.h",
+                    "include/crypto/bn_conf.h",
+                    "include/crypto/dso_conf.h",
                     "include/openssl/opensslconf.h",
                 ],
             "apps/asn1pars.o" =>
@@ -645,14 +646,6 @@ our %unified_info = (
                     "crypto/perlasm/cbc.pl",
                     "crypto/perlasm/x86asm.pl",
                 ],
-            "crypto/include/internal/bn_conf.h" =>
-                [
-                    "configdata.pm",
-                ],
-            "crypto/include/internal/dso_conf.h" =>
-                [
-                    "configdata.pm",
-                ],
             "crypto/rc4/rc4-586.s" =>
                 [
                     "crypto/perlasm/x86asm.pl",
@@ -728,6 +721,14 @@ our %unified_info = (
                 [
                     "libcrypto",
                 ],
+            "include/crypto/bn_conf.h" =>
+                [
+                    "configdata.pm",
+                ],
+            "include/crypto/dso_conf.h" =>
+                [
+                    "configdata.pm",
+                ],
             "include/openssl/opensslconf.h" =>
                 [
                     "configdata.pm",
@@ -1525,6 +1526,12 @@ our %unified_info = (
                     "libcrypto",
                     "test/libtestutil.a",
                 ],
+            "test/ssl_ctx_test" =>
+                [
+                    "libcrypto",
+                    "libssl",
+                    "test/libtestutil.a",
+                ],
             "test/ssl_test" =>
                 [
                     "libcrypto",
@@ -3266,7 +3273,6 @@ our %unified_info = (
                             "test/testutil/cb.o",
                             "test/testutil/driver.o",
                             "test/testutil/format_output.o",
-                            "test/testutil/init.o",
                             "test/testutil/main.o",
                             "test/testutil/output_helpers.o",
                             "test/testutil/random.o",
@@ -3274,6 +3280,7 @@ our %unified_info = (
                             "test/testutil/tap_bio.o",
                             "test/testutil/test_cleanup.o",
                             "test/testutil/tests.o",
+                            "test/testutil/testutil_init.o",
                         ],
                     "products" =>
                         {
@@ -3767,14 +3774,6 @@ our %unified_info = (
                 [
                     "crypto/ia64cpuid.S",
                 ],
-            "crypto/include/internal/bn_conf.h" =>
-                [
-                    "crypto/include/internal/bn_conf.h.in",
-                ],
-            "crypto/include/internal/dso_conf.h" =>
-                [
-                    "crypto/include/internal/dso_conf.h.in",
-                ],
             "crypto/md5/md5-586.s" =>
                 [
                     "crypto/md5/asm/md5-586.pl",
@@ -4215,6 +4214,14 @@ our %unified_info = (
                     "engines/asm/e_padlock-x86_64.pl",
                     "\$(PERLASM_SCHEME)",
                 ],
+            "include/crypto/bn_conf.h" =>
+                [
+                    "include/crypto/bn_conf.h.in",
+                ],
+            "include/crypto/dso_conf.h" =>
+                [
+                    "include/crypto/dso_conf.h.in",
+                ],
             "include/openssl/opensslconf.h" =>
                 [
                     "include/openssl/opensslconf.h.in",
@@ -4924,49 +4931,41 @@ our %unified_info = (
             "crypto/aes/aes_cbc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/aes/aes_cfb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/aes/aes_core.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/aes/aes_ecb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/aes/aes_ige.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/aes/aes_misc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/aes/aes_ofb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/aes/aes_wrap.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/aes/aesfx-sparcv9.o" =>
@@ -4976,25 +4975,21 @@ our %unified_info = (
             "crypto/aes/aesni-mb-x86_64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/aes/aesni-sha1-x86_64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/aes/aesni-sha256-x86_64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/aes/aesni-x86_64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/aes/aest4-sparcv9.o" =>
@@ -5012,13 +5007,11 @@ our %unified_info = (
             "crypto/aes/vpaes-x86_64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/aria/aria.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/arm64cpuid.o" =>
@@ -5032,613 +5025,511 @@ our %unified_info = (
             "crypto/asn1/a_bitstr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_d2i_fp.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_digest.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_dup.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_gentm.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_i2d_fp.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_int.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_mbstr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_object.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_octet.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_print.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_sign.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_strex.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_strnid.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_time.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_type.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_utctm.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_utf8.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_verify.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/ameth_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/asn1_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/asn1_gen.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/asn1_item_list.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/asn1_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/asn1_par.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/asn_mime.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/asn_moid.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/asn_mstbl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/asn_pack.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/bio_asn1.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/bio_ndef.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/d2i_pr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/d2i_pu.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/evp_asn1.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/f_int.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/f_string.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/i2d_pr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/i2d_pu.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/n_pkey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/nsseq.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/p5_pbe.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/p5_pbev2.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/p5_scrypt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/p8_pkey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/t_bitst.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/t_pkey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/t_spki.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/tasn_dec.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/tasn_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/tasn_fre.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/tasn_new.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/tasn_prn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/tasn_scn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/tasn_typ.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/tasn_utl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/x_algor.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/x_bignum.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/x_info.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/x_int64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/x_long.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/x_pkey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/x_sig.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/x_spki.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/x_val.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/async/arch/async_null.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/async/arch/async_posix.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/async/arch/async_win.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/async/async.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/async/async_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/async/async_wait.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bf/bf_cfb64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bf/bf_ecb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bf/bf_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bf/bf_ofb64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bf/bf_skey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/b_addr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/b_dump.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/b_print.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/b_sock.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/b_sock2.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bf_buff.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bf_lbuf.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bf_nbio.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bf_null.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bio_cb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bio_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bio_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bio_meth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bss_acpt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bss_bio.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bss_conn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bss_dgram.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bss_fd.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bss_file.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bss_log.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bss_mem.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bss_null.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bss_sock.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/blake2/blake2b.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/blake2/blake2s.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/blake2/m_blake2b.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/blake2/m_blake2s.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/armv4-gf2m.o" =>
@@ -5656,188 +5547,157 @@ our %unified_info = (
             "crypto/bn/bn_add.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_asm.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_blind.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_const.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_ctx.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_depr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_dh.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_div.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_exp.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto",
                 ],
             "crypto/bn/bn_exp2.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_gcd.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_gf2m.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_intern.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_kron.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_mod.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_mont.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_mpi.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_mul.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_nist.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_prime.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_print.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_rand.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_recp.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_shift.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_sqr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_sqrt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_srp.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_word.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_x931p.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/mips-mont.o" =>
@@ -5847,19 +5707,16 @@ our %unified_info = (
             "crypto/bn/rsaz-avx2.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/rsaz-x86_64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/rsaz_exp.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/sparct4-mont.o" =>
@@ -5885,31 +5742,26 @@ our %unified_info = (
             "crypto/bn/x86_64-gf2m.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/x86_64-mont.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/x86_64-mont5.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/buffer/buf_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/buffer/buffer.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/buildinf.h" =>
@@ -5919,37 +5771,31 @@ our %unified_info = (
             "crypto/camellia/cmll-x86_64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/camellia/cmll_cfb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/camellia/cmll_ctr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/camellia/cmll_ecb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/camellia/cmll_misc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/camellia/cmll_ofb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/camellia/cmllt4-sparcv9.o" =>
@@ -5959,31 +5805,26 @@ our %unified_info = (
             "crypto/cast/c_cfb64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cast/c_ecb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cast/c_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cast/c_ofb64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cast/c_skey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/chacha/chacha-armv4.o" =>
@@ -6001,278 +5842,232 @@ our %unified_info = (
             "crypto/chacha/chacha-x86_64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cmac/cm_ameth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cmac/cm_pmeth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cmac/cmac.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_asn1.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_att.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_cd.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_dd.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_env.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_ess.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_io.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_kari.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_pwri.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_sd.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_smime.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/conf/conf_api.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/conf/conf_def.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/conf/conf_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/conf/conf_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/conf/conf_mall.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/conf/conf_mod.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/conf/conf_sap.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/conf/conf_ssl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cpt_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cryptlib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ct/ct_b64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ct/ct_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ct/ct_log.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ct/ct_oct.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ct/ct_policy.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ct/ct_prn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ct/ct_sct.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ct/ct_sct_ctx.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ct/ct_vfy.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ct/ct_x509v3.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ctype.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cversion.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto",
                 ],
             "crypto/des/cbc_cksm.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/cbc_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/cfb64ede.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/cfb64enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/cfb_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/des_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/dest4-sparcv9.o" =>
@@ -6282,301 +6077,251 @@ our %unified_info = (
             "crypto/des/ecb3_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/ecb_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/fcrypt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/fcrypt_b.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/ofb64ede.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/ofb64enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/ofb_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/pcbc_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/qud_cksm.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/rand_key.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/set_key.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/str2key.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/xcbc_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_ameth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_asn1.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_check.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_depr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_gen.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_kdf.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_key.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_meth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_pmeth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_prn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_rfc5114.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_rfc7919.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dsa/dsa_ameth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dsa/dsa_asn1.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dsa/dsa_depr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dsa/dsa_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dsa/dsa_gen.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dsa/dsa_key.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dsa/dsa_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dsa/dsa_meth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dsa/dsa_ossl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dsa/dsa_pmeth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dsa/dsa_prn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dsa/dsa_sign.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dsa/dsa_vrf.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dso/dso_dl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dso/dso_dlfcn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dso/dso_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dso/dso_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dso/dso_openssl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dso/dso_vms.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dso/dso_win32.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ebcdic.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/curve25519.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/curve448/arch_32/f_impl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto/ec/curve448/arch_32",
                     "crypto/ec/curve448",
@@ -6584,7 +6329,6 @@ our %unified_info = (
             "crypto/ec/curve448/curve448.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto/ec/curve448/arch_32",
                     "crypto/ec/curve448",
@@ -6592,7 +6336,6 @@ our %unified_info = (
             "crypto/ec/curve448/curve448_tables.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto/ec/curve448/arch_32",
                     "crypto/ec/curve448",
@@ -6600,7 +6343,6 @@ our %unified_info = (
             "crypto/ec/curve448/eddsa.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto/ec/curve448/arch_32",
                     "crypto/ec/curve448",
@@ -6608,7 +6350,6 @@ our %unified_info = (
             "crypto/ec/curve448/f_generic.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto/ec/curve448/arch_32",
                     "crypto/ec/curve448",
@@ -6616,7 +6357,6 @@ our %unified_info = (
             "crypto/ec/curve448/scalar.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto/ec/curve448/arch_32",
                     "crypto/ec/curve448",
@@ -6624,163 +6364,136 @@ our %unified_info = (
             "crypto/ec/ec2_oct.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec2_smpl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec_ameth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec_asn1.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec_check.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec_curve.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec_cvt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec_key.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec_kmeth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec_mult.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec_oct.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec_pmeth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec_print.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecdh_kdf.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecdh_ossl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecdsa_ossl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecdsa_sign.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecdsa_vrf.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/eck_prn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecp_mont.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecp_nist.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecp_nistp224.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecp_nistp256.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecp_nistp521.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecp_nistputil.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecp_nistz256-armv4.o" =>
@@ -6798,241 +6511,201 @@ our %unified_info = (
             "crypto/ec/ecp_nistz256-x86_64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecp_nistz256.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecp_oct.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecp_smpl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecx_meth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/x25519-x86_64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/eng_all.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/eng_cnf.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/eng_ctrl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/eng_dyn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/eng_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/eng_fat.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/eng_init.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/eng_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/eng_list.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/eng_openssl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/eng_pkey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/eng_rdrand.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/eng_table.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/tb_asnmth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/tb_cipher.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/tb_dh.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/tb_digest.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/tb_dsa.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/tb_eckey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/tb_pkmeth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/tb_rand.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/tb_rsa.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/err/err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/err/err_all.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/err/err_prn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/bio_b64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/bio_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/bio_md.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/bio_ok.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/c_allc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/c_alld.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/cmeth_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/digest.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/e_aes.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto",
                     "crypto/modes",
@@ -7040,21 +6713,18 @@ our %unified_info = (
             "crypto/evp/e_aes_cbc_hmac_sha1.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto/modes",
                 ],
             "crypto/evp/e_aes_cbc_hmac_sha256.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto/modes",
                 ],
             "crypto/evp/e_aria.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto",
                     "crypto/modes",
@@ -7062,13 +6732,11 @@ our %unified_info = (
             "crypto/evp/e_bf.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/e_camellia.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto",
                     "crypto/modes",
@@ -7076,81 +6744,68 @@ our %unified_info = (
             "crypto/evp/e_cast.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/e_chacha20_poly1305.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/e_des.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto",
                 ],
             "crypto/evp/e_des3.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto",
                 ],
             "crypto/evp/e_idea.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/e_null.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/e_old.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/e_rc2.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/e_rc4.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/e_rc4_hmac_md5.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/e_rc5.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/e_seed.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/e_sm4.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto",
                     "crypto/modes",
@@ -7158,328 +6813,267 @@ our %unified_info = (
             "crypto/evp/e_xcbc_d.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/encode.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/evp_cnf.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/evp_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/evp_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/evp_key.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/evp_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/evp_pbe.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/evp_pkey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/m_md2.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/m_md4.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/m_md5.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/m_md5_sha1.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/m_mdc2.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/m_null.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/m_ripemd.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/m_sha1.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/m_sha3.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto",
                 ],
             "crypto/evp/m_sigver.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/m_wp.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/names.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/p5_crpt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/p5_crpt2.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/p_dec.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/p_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/p_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/p_open.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/p_seal.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/p_sign.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/p_verify.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/pbe_scrypt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/pmeth_fn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/pmeth_gn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/pmeth_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ex_data.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/getenv.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/hmac/hm_ameth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/hmac/hm_pmeth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/hmac/hmac.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/idea/i_cbc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/idea/i_cfb64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/idea/i_ecb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/idea/i_ofb64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/idea/i_skey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
-            "crypto/include/internal/bn_conf.h" =>
-                [
-                    ".",
-                ],
-            "crypto/include/internal/dso_conf.h" =>
-                [
-                    ".",
-                ],
             "crypto/init.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/kdf/hkdf.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/kdf/kdf_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/kdf/scrypt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/kdf/tls1_prf.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/lhash/lh_stats.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/lhash/lhash.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/md4/md4_dgst.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/md4/md4_one.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/md5/md5-sparcv9.o" =>
@@ -7489,91 +7083,76 @@ our %unified_info = (
             "crypto/md5/md5-x86_64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/md5/md5_dgst.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/md5/md5_one.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/mdc2/mdc2_one.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/mdc2/mdc2dgst.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/mem.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/mem_dbg.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/mem_sec.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/modes/aesni-gcm-x86_64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/modes/cbc128.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/modes/ccm128.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/modes/cfb128.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/modes/ctr128.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/modes/cts128.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/modes/gcm128.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto",
                 ],
@@ -7592,7 +7171,6 @@ our %unified_info = (
             "crypto/modes/ghash-x86_64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/modes/ghashv8-armx.o" =>
@@ -7602,361 +7180,301 @@ our %unified_info = (
             "crypto/modes/ocb128.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/modes/ofb128.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/modes/wrap128.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/modes/xts128.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/o_dir.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/o_fips.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/o_fopen.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/o_init.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/o_str.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/o_time.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/objects/o_names.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/objects/obj_dat.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/objects/obj_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/objects/obj_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/objects/obj_xref.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ocsp/ocsp_asn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ocsp/ocsp_cl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ocsp/ocsp_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ocsp/ocsp_ext.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ocsp/ocsp_ht.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ocsp/ocsp_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ocsp/ocsp_prn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ocsp/ocsp_srv.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ocsp/ocsp_vfy.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ocsp/v3_ocsp.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pem/pem_all.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pem/pem_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pem/pem_info.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pem/pem_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pem/pem_oth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pem/pem_pk8.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pem/pem_pkey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pem/pem_sign.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pem/pem_x509.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pem/pem_xaux.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pem/pvkfmt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_add.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_asn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_attr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_crpt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_crt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_decr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_init.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_key.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_kiss.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_mutl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_npas.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_p8d.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_p8e.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_sbag.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_utl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/pk12err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs7/bio_pk7.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs7/pk7_asn1.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs7/pk7_attr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs7/pk7_doit.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs7/pk7_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs7/pk7_mime.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs7/pk7_smime.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs7/pkcs7err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/poly1305/poly1305-armv4.o" =>
@@ -7978,265 +7496,221 @@ our %unified_info = (
             "crypto/poly1305/poly1305-x86_64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/poly1305/poly1305.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/poly1305/poly1305_ameth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/poly1305/poly1305_pmeth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rand/drbg_ctr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rand/drbg_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rand/rand_egd.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rand/rand_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rand/rand_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rand/rand_unix.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rand/rand_vms.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rand/rand_win.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rand/randfile.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rc2/rc2_cbc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rc2/rc2_ecb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rc2/rc2_skey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rc2/rc2cfb64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rc2/rc2ofb64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rc4/rc4-md5-x86_64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rc4/rc4-x86_64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ripemd/rmd_dgst.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ripemd/rmd_one.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_ameth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_asn1.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_chk.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_crpt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_depr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_gen.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_meth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_mp.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_none.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_oaep.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_ossl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_pk1.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_pmeth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_prn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_pss.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_saos.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_sign.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_ssl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_x931.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_x931g.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/s390xcpuid.o" =>
@@ -8246,31 +7720,26 @@ our %unified_info = (
             "crypto/seed/seed.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/seed/seed_cbc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/seed/seed_cfb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/seed/seed_ecb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/seed/seed_ofb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sha/keccak1600-armv4.o" =>
@@ -8280,7 +7749,6 @@ our %unified_info = (
             "crypto/sha/keccak1600-x86_64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sha/sha1-armv4-large.o" =>
@@ -8294,7 +7762,6 @@ our %unified_info = (
             "crypto/sha/sha1-mb-x86_64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sha/sha1-mips.o" =>
@@ -8312,19 +7779,16 @@ our %unified_info = (
             "crypto/sha/sha1-x86_64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sha/sha1_one.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sha/sha1dgst.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sha/sha256-armv4.o" =>
@@ -8338,7 +7802,6 @@ our %unified_info = (
             "crypto/sha/sha256-mb-x86_64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sha/sha256-mips.o" =>
@@ -8356,13 +7819,11 @@ our %unified_info = (
             "crypto/sha/sha256-x86_64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sha/sha256.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sha/sha512-armv4.o" =>
@@ -8388,727 +7849,606 @@ our %unified_info = (
             "crypto/sha/sha512-x86_64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sha/sha512.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/siphash/siphash.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/siphash/siphash_ameth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/siphash/siphash_pmeth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sm2/sm2_crypt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sm2/sm2_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sm2/sm2_pmeth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sm2/sm2_sign.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sm3/m_sm3.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sm3/sm3.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sm4/sm4.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/srp/srp_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/srp/srp_vfy.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/stack/stack.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/store/loader_file.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/store/store_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/store/store_init.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/store/store_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/store/store_register.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/store/store_strings.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/threads_none.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/threads_pthread.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/threads_win.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ts/ts_asn1.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ts/ts_conf.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ts/ts_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ts/ts_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ts/ts_req_print.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ts/ts_req_utils.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ts/ts_rsp_print.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ts/ts_rsp_sign.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ts/ts_rsp_utils.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ts/ts_rsp_verify.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ts/ts_verify_ctx.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/txt_db/txt_db.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ui/ui_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ui/ui_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ui/ui_null.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ui/ui_openssl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ui/ui_util.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/uid.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/whrlpool/wp-x86_64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/whrlpool/wp_dgst.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/by_dir.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/by_file.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/t_crl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/t_req.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/t_x509.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_att.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_cmp.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_d2.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_def.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_ext.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_lu.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_meth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_obj.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_r2x.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_req.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_set.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_trs.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_txt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_v3.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_vfy.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_vpm.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509cset.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509name.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509rset.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509spki.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509type.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x_all.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x_attrib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x_crl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x_exten.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x_name.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x_pubkey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x_req.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x_x509.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x_x509a.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/pcy_cache.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/pcy_data.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/pcy_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/pcy_map.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/pcy_node.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/pcy_tree.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_addr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_admis.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_akey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_akeya.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_alt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_asid.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_bcons.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_bitst.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_conf.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_cpols.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_crld.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_enum.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_extku.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_genn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_ia5.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_info.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_int.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_ncons.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_pci.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_pcia.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_pcons.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_pku.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_pmaps.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_prn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_purp.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_skey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_sxnet.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_tlsf.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_utl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x86_64cpuid.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "engines/e_capi.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "engines/e_padlock-x86_64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "engines/e_padlock.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "fuzz/asn1.o" =>
@@ -9159,6 +8499,14 @@ our %unified_info = (
                 [
                     "include",
                 ],
+            "include/crypto/bn_conf.h" =>
+                [
+                    ".",
+                ],
+            "include/crypto/dso_conf.h" =>
+                [
+                    ".",
+                ],
             "include/openssl/opensslconf.h" =>
                 [
                     ".",
@@ -9403,7 +8751,6 @@ our %unified_info = (
                 [
                     ".",
                     "include",
-                    "crypto/include",
                 ],
             "test/asn1_string_table_test.o" =>
                 [
@@ -9729,7 +9076,6 @@ our %unified_info = (
                 [
                     ".",
                     "include",
-                    "crypto/include",
                 ],
             "test/cipher_overhead_test.o" =>
                 [
@@ -9775,7 +9121,6 @@ our %unified_info = (
             "test/ctype_internal_test.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "test/curve448_internal_test.o" =>
@@ -9841,7 +9186,6 @@ our %unified_info = (
                 [
                     "include",
                     "crypto/ec",
-                    "crypto/include",
                 ],
             "test/ecdsatest.o" =>
                 [
@@ -9866,7 +9210,6 @@ our %unified_info = (
             "test/evp_extra_test.o" =>
                 [
                     "include",
-                    "crypto/include",
                 ],
             "test/evp_test.o" =>
                 [
@@ -9964,7 +9307,6 @@ our %unified_info = (
                 [
                     ".",
                     "include",
-                    "crypto/include",
                 ],
             "test/rc2test.o" =>
                 [
@@ -10014,18 +9356,15 @@ our %unified_info = (
                 [
                     ".",
                     "include",
-                    "crypto/include",
                 ],
             "test/sm2_internal_test.o" =>
                 [
                     "include",
-                    "crypto/include",
                 ],
             "test/sm4_internal_test.o" =>
                 [
                     ".",
                     "include",
-                    "crypto/include",
                 ],
             "test/srptest.o" =>
                 [
@@ -10036,6 +9375,10 @@ our %unified_info = (
                     ".",
                     "include",
                 ],
+            "test/ssl_ctx_test.o" =>
+                [
+                    "include",
+                ],
             "test/ssl_test.o" =>
                 [
                     "include",
@@ -10099,10 +9442,6 @@ our %unified_info = (
                 [
                     "include",
                 ],
-            "test/testutil/init.o" =>
-                [
-                    "include",
-                ],
             "test/testutil/main.o" =>
                 [
                     "include",
@@ -10131,6 +9470,10 @@ our %unified_info = (
                 [
                     "include",
                 ],
+            "test/testutil/testutil_init.o" =>
+                [
+                    "include",
+                ],
             "test/threadstest.o" =>
                 [
                     "include",
@@ -10395,6 +9738,7 @@ our %unified_info = (
             "test/sm4_internal_test",
             "test/srptest",
             "test/ssl_cert_table_internal_test",
+            "test/ssl_ctx_test",
             "test/ssl_test",
             "test/ssl_test_ctx_test",
             "test/sslapitest",
@@ -15378,7 +14722,6 @@ our %unified_info = (
                     "test/testutil/cb.o",
                     "test/testutil/driver.o",
                     "test/testutil/format_output.o",
-                    "test/testutil/init.o",
                     "test/testutil/main.o",
                     "test/testutil/output_helpers.o",
                     "test/testutil/random.o",
@@ -15386,6 +14729,7 @@ our %unified_info = (
                     "test/testutil/tap_bio.o",
                     "test/testutil/test_cleanup.o",
                     "test/testutil/tests.o",
+                    "test/testutil/testutil_init.o",
                 ],
             "test/md2test" =>
                 [
@@ -15613,6 +14957,14 @@ our %unified_info = (
                 [
                     "test/ssl_cert_table_internal_test.c",
                 ],
+            "test/ssl_ctx_test" =>
+                [
+                    "test/ssl_ctx_test.o",
+                ],
+            "test/ssl_ctx_test.o" =>
+                [
+                    "test/ssl_ctx_test.c",
+                ],
             "test/ssl_test" =>
                 [
                     "test/handshake_helper.o",
@@ -15715,10 +15067,6 @@ our %unified_info = (
                 [
                     "test/testutil/format_output.c",
                 ],
-            "test/testutil/init.o" =>
-                [
-                    "test/testutil/init.c",
-                ],
             "test/testutil/main.o" =>
                 [
                     "test/testutil/main.c",
@@ -15747,6 +15095,10 @@ our %unified_info = (
                 [
                     "test/testutil/tests.c",
                 ],
+            "test/testutil/testutil_init.o" =>
+                [
+                    "test/testutil/testutil_init.c",
+                ],
             "test/threadstest" =>
                 [
                     "test/threadstest.o",
diff --git a/deps/openssl/config/archs/VC-WIN64A/asm/crypto/aes/aes-x86_64.asm b/deps/openssl/config/archs/VC-WIN64A/asm/crypto/aes/aes-x86_64.asm
deleted file mode 100644
index c01e41b301..0000000000
--- a/deps/openssl/config/archs/VC-WIN64A/asm/crypto/aes/aes-x86_64.asm
+++ /dev/null
@@ -1,2960 +0,0 @@
-default	rel
-%define XMMWORD
-%define YMMWORD
-%define ZMMWORD
-section	.text code align=64
-
-
-ALIGN	16
-_x86_64_AES_encrypt:
-	xor	eax,DWORD[r15]
-	xor	ebx,DWORD[4+r15]
-	xor	ecx,DWORD[8+r15]
-	xor	edx,DWORD[12+r15]
-
-	mov	r13d,DWORD[240+r15]
-	sub	r13d,1
-	jmp	NEAR $L$enc_loop
-ALIGN	16
-$L$enc_loop:
-
-	movzx	esi,al
-	movzx	edi,bl
-	movzx	ebp,cl
-	mov	r10d,DWORD[rsi*8+r14]
-	mov	r11d,DWORD[rdi*8+r14]
-	mov	r12d,DWORD[rbp*8+r14]
-
-	movzx	esi,bh
-	movzx	edi,ch
-	movzx	ebp,dl
-	xor	r10d,DWORD[3+rsi*8+r14]
-	xor	r11d,DWORD[3+rdi*8+r14]
-	mov	r8d,DWORD[rbp*8+r14]
-
-	movzx	esi,dh
-	shr	ecx,16
-	movzx	ebp,ah
-	xor	r12d,DWORD[3+rsi*8+r14]
-	shr	edx,16
-	xor	r8d,DWORD[3+rbp*8+r14]
-
-	shr	ebx,16
-	lea	r15,[16+r15]
-	shr	eax,16
-
-	movzx	esi,cl
-	movzx	edi,dl
-	movzx	ebp,al
-	xor	r10d,DWORD[2+rsi*8+r14]
-	xor	r11d,DWORD[2+rdi*8+r14]
-	xor	r12d,DWORD[2+rbp*8+r14]
-
-	movzx	esi,dh
-	movzx	edi,ah
-	movzx	ebp,bl
-	xor	r10d,DWORD[1+rsi*8+r14]
-	xor	r11d,DWORD[1+rdi*8+r14]
-	xor	r8d,DWORD[2+rbp*8+r14]
-
-	mov	edx,DWORD[12+r15]
-	movzx	edi,bh
-	movzx	ebp,ch
-	mov	eax,DWORD[r15]
-	xor	r12d,DWORD[1+rdi*8+r14]
-	xor	r8d,DWORD[1+rbp*8+r14]
-
-	mov	ebx,DWORD[4+r15]
-	mov	ecx,DWORD[8+r15]
-	xor	eax,r10d
-	xor	ebx,r11d
-	xor	ecx,r12d
-	xor	edx,r8d
-	sub	r13d,1
-	jnz	NEAR $L$enc_loop
-	movzx	esi,al
-	movzx	edi,bl
-	movzx	ebp,cl
-	movzx	r10d,BYTE[2+rsi*8+r14]
-	movzx	r11d,BYTE[2+rdi*8+r14]
-	movzx	r12d,BYTE[2+rbp*8+r14]
-
-	movzx	esi,dl
-	movzx	edi,bh
-	movzx	ebp,ch
-	movzx	r8d,BYTE[2+rsi*8+r14]
-	mov	edi,DWORD[rdi*8+r14]
-	mov	ebp,DWORD[rbp*8+r14]
-
-	and	edi,0x0000ff00
-	and	ebp,0x0000ff00
-
-	xor	r10d,edi
-	xor	r11d,ebp
-	shr	ecx,16
-
-	movzx	esi,dh
-	movzx	edi,ah
-	shr	edx,16
-	mov	esi,DWORD[rsi*8+r14]
-	mov	edi,DWORD[rdi*8+r14]
-
-	and	esi,0x0000ff00
-	and	edi,0x0000ff00
-	shr	ebx,16
-	xor	r12d,esi
-	xor	r8d,edi
-	shr	eax,16
-
-	movzx	esi,cl
-	movzx	edi,dl
-	movzx	ebp,al
-	mov	esi,DWORD[rsi*8+r14]
-	mov	edi,DWORD[rdi*8+r14]
-	mov	ebp,DWORD[rbp*8+r14]
-
-	and	esi,0x00ff0000
-	and	edi,0x00ff0000
-	and	ebp,0x00ff0000
-
-	xor	r10d,esi
-	xor	r11d,edi
-	xor	r12d,ebp
-
-	movzx	esi,bl
-	movzx	edi,dh
-	movzx	ebp,ah
-	mov	esi,DWORD[rsi*8+r14]
-	mov	edi,DWORD[2+rdi*8+r14]
-	mov	ebp,DWORD[2+rbp*8+r14]
-
-	and	esi,0x00ff0000
-	and	edi,0xff000000
-	and	ebp,0xff000000
-
-	xor	r8d,esi
-	xor	r10d,edi
-	xor	r11d,ebp
-
-	movzx	esi,bh
-	movzx	edi,ch
-	mov	edx,DWORD[((16+12))+r15]
-	mov	esi,DWORD[2+rsi*8+r14]
-	mov	edi,DWORD[2+rdi*8+r14]
-	mov	eax,DWORD[((16+0))+r15]
-
-	and	esi,0xff000000
-	and	edi,0xff000000
-
-	xor	r12d,esi
-	xor	r8d,edi
-
-	mov	ebx,DWORD[((16+4))+r15]
-	mov	ecx,DWORD[((16+8))+r15]
-	xor	eax,r10d
-	xor	ebx,r11d
-	xor	ecx,r12d
-	xor	edx,r8d
-DB	0xf3,0xc3
-
-
-ALIGN	16
-_x86_64_AES_encrypt_compact:
-
-	lea	r8,[128+r14]
-	mov	edi,DWORD[((0-128))+r8]
-	mov	ebp,DWORD[((32-128))+r8]
-	mov	r10d,DWORD[((64-128))+r8]
-	mov	r11d,DWORD[((96-128))+r8]
-	mov	edi,DWORD[((128-128))+r8]
-	mov	ebp,DWORD[((160-128))+r8]
-	mov	r10d,DWORD[((192-128))+r8]
-	mov	r11d,DWORD[((224-128))+r8]
-	jmp	NEAR $L$enc_loop_compact
-ALIGN	16
-$L$enc_loop_compact:
-	xor	eax,DWORD[r15]
-	xor	ebx,DWORD[4+r15]
-	xor	ecx,DWORD[8+r15]
-	xor	edx,DWORD[12+r15]
-	lea	r15,[16+r15]
-	movzx	r10d,al
-	movzx	r11d,bl
-	movzx	r12d,cl
-	movzx	r8d,dl
-	movzx	esi,bh
-	movzx	edi,ch
-	shr	ecx,16
-	movzx	ebp,dh
-	movzx	r10d,BYTE[r10*1+r14]
-	movzx	r11d,BYTE[r11*1+r14]
-	movzx	r12d,BYTE[r12*1+r14]
-	movzx	r8d,BYTE[r8*1+r14]
-
-	movzx	r9d,BYTE[rsi*1+r14]
-	movzx	esi,ah
-	movzx	r13d,BYTE[rdi*1+r14]
-	movzx	edi,cl
-	movzx	ebp,BYTE[rbp*1+r14]
-	movzx	esi,BYTE[rsi*1+r14]
-
-	shl	r9d,8
-	shr	edx,16
-	shl	r13d,8
-	xor	r10d,r9d
-	shr	eax,16
-	movzx	r9d,dl
-	shr	ebx,16
-	xor	r11d,r13d
-	shl	ebp,8
-	movzx	r13d,al
-	movzx	edi,BYTE[rdi*1+r14]
-	xor	r12d,ebp
-
-	shl	esi,8
-	movzx	ebp,bl
-	shl	edi,16
-	xor	r8d,esi
-	movzx	r9d,BYTE[r9*1+r14]
-	movzx	esi,dh
-	movzx	r13d,BYTE[r13*1+r14]
-	xor	r10d,edi
-
-	shr	ecx,8
-	movzx	edi,ah
-	shl	r9d,16
-	shr	ebx,8
-	shl	r13d,16
-	xor	r11d,r9d
-	movzx	ebp,BYTE[rbp*1+r14]
-	movzx	esi,BYTE[rsi*1+r14]
-	movzx	edi,BYTE[rdi*1+r14]
-	movzx	edx,BYTE[rcx*1+r14]
-	movzx	ecx,BYTE[rbx*1+r14]
-
-	shl	ebp,16
-	xor	r12d,r13d
-	shl	esi,24
-	xor	r8d,ebp
-	shl	edi,24
-	xor	r10d,esi
-	shl	edx,24
-	xor	r11d,edi
-	shl	ecx,24
-	mov	eax,r10d
-	mov	ebx,r11d
-	xor	ecx,r12d
-	xor	edx,r8d
-	cmp	r15,QWORD[16+rsp]
-	je	NEAR $L$enc_compact_done
-	mov	r10d,0x80808080
-	mov	r11d,0x80808080
-	and	r10d,eax
-	and	r11d,ebx
-	mov	esi,r10d
-	mov	edi,r11d
-	shr	r10d,7
-	lea	r8d,[rax*1+rax]
-	shr	r11d,7
-	lea	r9d,[rbx*1+rbx]
-	sub	esi,r10d
-	sub	edi,r11d
-	and	r8d,0xfefefefe
-	and	r9d,0xfefefefe
-	and	esi,0x1b1b1b1b
-	and	edi,0x1b1b1b1b
-	mov	r10d,eax
-	mov	r11d,ebx
-	xor	r8d,esi
-	xor	r9d,edi
-
-	xor	eax,r8d
-	xor	ebx,r9d
-	mov	r12d,0x80808080
-	rol	eax,24
-	mov	ebp,0x80808080
-	rol	ebx,24
-	and	r12d,ecx
-	and	ebp,edx
-	xor	eax,r8d
-	xor	ebx,r9d
-	mov	esi,r12d
-	ror	r10d,16
-	mov	edi,ebp
-	ror	r11d,16
-	lea	r8d,[rcx*1+rcx]
-	shr	r12d,7
-	xor	eax,r10d
-	shr	ebp,7
-	xor	ebx,r11d
-	ror	r10d,8
-	lea	r9d,[rdx*1+rdx]
-	ror	r11d,8
-	sub	esi,r12d
-	sub	edi,ebp
-	xor	eax,r10d
-	xor	ebx,r11d
-
-	and	r8d,0xfefefefe
-	and	r9d,0xfefefefe
-	and	esi,0x1b1b1b1b
-	and	edi,0x1b1b1b1b
-	mov	r12d,ecx
-	mov	ebp,edx
-	xor	r8d,esi
-	xor	r9d,edi
-
-	ror	r12d,16
-	xor	ecx,r8d
-	ror	ebp,16
-	xor	edx,r9d
-	rol	ecx,24
-	mov	esi,DWORD[r14]
-	rol	edx,24
-	xor	ecx,r8d
-	mov	edi,DWORD[64+r14]
-	xor	edx,r9d
-	mov	r8d,DWORD[128+r14]
-	xor	ecx,r12d
-	ror	r12d,8
-	xor	edx,ebp
-	ror	ebp,8
-	xor	ecx,r12d
-	mov	r9d,DWORD[192+r14]
-	xor	edx,ebp
-	jmp	NEAR $L$enc_loop_compact
-ALIGN	16
-$L$enc_compact_done:
-	xor	eax,DWORD[r15]
-	xor	ebx,DWORD[4+r15]
-	xor	ecx,DWORD[8+r15]
-	xor	edx,DWORD[12+r15]
-DB	0xf3,0xc3
-
-
-global	AES_encrypt
-
-ALIGN	16
-global	asm_AES_encrypt
-
-asm_AES_encrypt:
-AES_encrypt:
-	mov	QWORD[8+rsp],rdi	;WIN64 prologue
-	mov	QWORD[16+rsp],rsi
-	mov	rax,rsp
-$L$SEH_begin_AES_encrypt:
-	mov	rdi,rcx
-	mov	rsi,rdx
-	mov	rdx,r8
-
-
-
-	mov	rax,rsp
-
-	push	rbx
-
-	push	rbp
-
-	push	r12
-
-	push	r13
-
-	push	r14
-
-	push	r15
-
-
-
-	lea	rcx,[((-63))+rdx]
-	and	rsp,-64
-	sub	rcx,rsp
-	neg	rcx
-	and	rcx,0x3c0
-	sub	rsp,rcx
-	sub	rsp,32
-
-	mov	QWORD[16+rsp],rsi
-	mov	QWORD[24+rsp],rax
-
-$L$enc_prologue:
-
-	mov	r15,rdx
-	mov	r13d,DWORD[240+r15]
-
-	mov	eax,DWORD[rdi]
-	mov	ebx,DWORD[4+rdi]
-	mov	ecx,DWORD[8+rdi]
-	mov	edx,DWORD[12+rdi]
-
-	shl	r13d,4
-	lea	rbp,[r13*1+r15]
-	mov	QWORD[rsp],r15
-	mov	QWORD[8+rsp],rbp
-
-
-	lea	r14,[(($L$AES_Te+2048))]
-	lea	rbp,[768+rsp]
-	sub	rbp,r14
-	and	rbp,0x300
-	lea	r14,[rbp*1+r14]
-
-	call	_x86_64_AES_encrypt_compact
-
-	mov	r9,QWORD[16+rsp]
-	mov	rsi,QWORD[24+rsp]
-
-	mov	DWORD[r9],eax
-	mov	DWORD[4+r9],ebx
-	mov	DWORD[8+r9],ecx
-	mov	DWORD[12+r9],edx
-
-	mov	r15,QWORD[((-48))+rsi]
-
-	mov	r14,QWORD[((-40))+rsi]
-
-	mov	r13,QWORD[((-32))+rsi]
-
-	mov	r12,QWORD[((-24))+rsi]
-
-	mov	rbp,QWORD[((-16))+rsi]
-
-	mov	rbx,QWORD[((-8))+rsi]
-
-	lea	rsp,[rsi]
-
-$L$enc_epilogue:
-	mov	rdi,QWORD[8+rsp]	;WIN64 epilogue
-	mov	rsi,QWORD[16+rsp]
-	DB	0F3h,0C3h		;repret
-
-$L$SEH_end_AES_encrypt:
-
-ALIGN	16
-_x86_64_AES_decrypt:
-	xor	eax,DWORD[r15]
-	xor	ebx,DWORD[4+r15]
-	xor	ecx,DWORD[8+r15]
-	xor	edx,DWORD[12+r15]
-
-	mov	r13d,DWORD[240+r15]
-	sub	r13d,1
-	jmp	NEAR $L$dec_loop
-ALIGN	16
-$L$dec_loop:
-
-	movzx	esi,al
-	movzx	edi,bl
-	movzx	ebp,cl
-	mov	r10d,DWORD[rsi*8+r14]
-	mov	r11d,DWORD[rdi*8+r14]
-	mov	r12d,DWORD[rbp*8+r14]
-
-	movzx	esi,dh
-	movzx	edi,ah
-	movzx	ebp,dl
-	xor	r10d,DWORD[3+rsi*8+r14]
-	xor	r11d,DWORD[3+rdi*8+r14]
-	mov	r8d,DWORD[rbp*8+r14]
-
-	movzx	esi,bh
-	shr	eax,16
-	movzx	ebp,ch
-	xor	r12d,DWORD[3+rsi*8+r14]
-	shr	edx,16
-	xor	r8d,DWORD[3+rbp*8+r14]
-
-	shr	ebx,16
-	lea	r15,[16+r15]
-	shr	ecx,16
-
-	movzx	esi,cl
-	movzx	edi,dl
-	movzx	ebp,al
-	xor	r10d,DWORD[2+rsi*8+r14]
-	xor	r11d,DWORD[2+rdi*8+r14]
-	xor	r12d,DWORD[2+rbp*8+r14]
-
-	movzx	esi,bh
-	movzx	edi,ch
-	movzx	ebp,bl
-	xor	r10d,DWORD[1+rsi*8+r14]
-	xor	r11d,DWORD[1+rdi*8+r14]
-	xor	r8d,DWORD[2+rbp*8+r14]
-
-	movzx	esi,dh
-	mov	edx,DWORD[12+r15]
-	movzx	ebp,ah
-	xor	r12d,DWORD[1+rsi*8+r14]
-	mov	eax,DWORD[r15]
-	xor	r8d,DWORD[1+rbp*8+r14]
-
-	xor	eax,r10d
-	mov	ebx,DWORD[4+r15]
-	mov	ecx,DWORD[8+r15]
-	xor	ecx,r12d
-	xor	ebx,r11d
-	xor	edx,r8d
-	sub	r13d,1
-	jnz	NEAR $L$dec_loop
-	lea	r14,[2048+r14]
-	movzx	esi,al
-	movzx	edi,bl
-	movzx	ebp,cl
-	movzx	r10d,BYTE[rsi*1+r14]
-	movzx	r11d,BYTE[rdi*1+r14]
-	movzx	r12d,BYTE[rbp*1+r14]
-
-	movzx	esi,dl
-	movzx	edi,dh
-	movzx	ebp,ah
-	movzx	r8d,BYTE[rsi*1+r14]
-	movzx	edi,BYTE[rdi*1+r14]
-	movzx	ebp,BYTE[rbp*1+r14]
-
-	shl	edi,8
-	shl	ebp,8
-
-	xor	r10d,edi
-	xor	r11d,ebp
-	shr	edx,16
-
-	movzx	esi,bh
-	movzx	edi,ch
-	shr	eax,16
-	movzx	esi,BYTE[rsi*1+r14]
-	movzx	edi,BYTE[rdi*1+r14]
-
-	shl	esi,8
-	shl	edi,8
-	shr	ebx,16
-	xor	r12d,esi
-	xor	r8d,edi
-	shr	ecx,16
-
-	movzx	esi,cl
-	movzx	edi,dl
-	movzx	ebp,al
-	movzx	esi,BYTE[rsi*1+r14]
-	movzx	edi,BYTE[rdi*1+r14]
-	movzx	ebp,BYTE[rbp*1+r14]
-
-	shl	esi,16
-	shl	edi,16
-	shl	ebp,16
-
-	xor	r10d,esi
-	xor	r11d,edi
-	xor	r12d,ebp
-
-	movzx	esi,bl
-	movzx	edi,bh
-	movzx	ebp,ch
-	movzx	esi,BYTE[rsi*1+r14]
-	movzx	edi,BYTE[rdi*1+r14]
-	movzx	ebp,BYTE[rbp*1+r14]
-
-	shl	esi,16
-	shl	edi,24
-	shl	ebp,24
-
-	xor	r8d,esi
-	xor	r10d,edi
-	xor	r11d,ebp
-
-	movzx	esi,dh
-	movzx	edi,ah
-	mov	edx,DWORD[((16+12))+r15]
-	movzx	esi,BYTE[rsi*1+r14]
-	movzx	edi,BYTE[rdi*1+r14]
-	mov	eax,DWORD[((16+0))+r15]
-
-	shl	esi,24
-	shl	edi,24
-
-	xor	r12d,esi
-	xor	r8d,edi
-
-	mov	ebx,DWORD[((16+4))+r15]
-	mov	ecx,DWORD[((16+8))+r15]
-	lea	r14,[((-2048))+r14]
-	xor	eax,r10d
-	xor	ebx,r11d
-	xor	ecx,r12d
-	xor	edx,r8d
-DB	0xf3,0xc3
-
-
-ALIGN	16
-_x86_64_AES_decrypt_compact:
-
-	lea	r8,[128+r14]
-	mov	edi,DWORD[((0-128))+r8]
-	mov	ebp,DWORD[((32-128))+r8]
-	mov	r10d,DWORD[((64-128))+r8]
-	mov	r11d,DWORD[((96-128))+r8]
-	mov	edi,DWORD[((128-128))+r8]
-	mov	ebp,DWORD[((160-128))+r8]
-	mov	r10d,DWORD[((192-128))+r8]
-	mov	r11d,DWORD[((224-128))+r8]
-	jmp	NEAR $L$dec_loop_compact
-
-ALIGN	16
-$L$dec_loop_compact:
-	xor	eax,DWORD[r15]
-	xor	ebx,DWORD[4+r15]
-	xor	ecx,DWORD[8+r15]
-	xor	edx,DWORD[12+r15]
-	lea	r15,[16+r15]
-	movzx	r10d,al
-	movzx	r11d,bl
-	movzx	r12d,cl
-	movzx	r8d,dl
-	movzx	esi,dh
-	movzx	edi,ah
-	shr	edx,16
-	movzx	ebp,bh
-	movzx	r10d,BYTE[r10*1+r14]
-	movzx	r11d,BYTE[r11*1+r14]
-	movzx	r12d,BYTE[r12*1+r14]
-	movzx	r8d,BYTE[r8*1+r14]
-
-	movzx	r9d,BYTE[rsi*1+r14]
-	movzx	esi,ch
-	movzx	r13d,BYTE[rdi*1+r14]
-	movzx	ebp,BYTE[rbp*1+r14]
-	movzx	esi,BYTE[rsi*1+r14]
-
-	shr	ecx,16
-	shl	r13d,8
-	shl	r9d,8
-	movzx	edi,cl
-	shr	eax,16
-	xor	r10d,r9d
-	shr	ebx,16
-	movzx	r9d,dl
-
-	shl	ebp,8
-	xor	r11d,r13d
-	shl	esi,8
-	movzx	r13d,al
-	movzx	edi,BYTE[rdi*1+r14]
-	xor	r12d,ebp
-	movzx	ebp,bl
-
-	shl	edi,16
-	xor	r8d,esi
-	movzx	r9d,BYTE[r9*1+r14]
-	movzx	esi,bh
-	movzx	ebp,BYTE[rbp*1+r14]
-	xor	r10d,edi
-	movzx	r13d,BYTE[r13*1+r14]
-	movzx	edi,ch
-
-	shl	ebp,16
-	shl	r9d,16
-	shl	r13d,16
-	xor	r8d,ebp
-	movzx	ebp,dh
-	xor	r11d,r9d
-	shr	eax,8
-	xor	r12d,r13d
-
-	movzx	esi,BYTE[rsi*1+r14]
-	movzx	ebx,BYTE[rdi*1+r14]
-	movzx	ecx,BYTE[rbp*1+r14]
-	movzx	edx,BYTE[rax*1+r14]
-
-	mov	eax,r10d
-	shl	esi,24
-	shl	ebx,24
-	shl	ecx,24
-	xor	eax,esi
-	shl	edx,24
-	xor	ebx,r11d
-	xor	ecx,r12d
-	xor	edx,r8d
-	cmp	r15,QWORD[16+rsp]
-	je	NEAR $L$dec_compact_done
-
-	mov	rsi,QWORD[((256+0))+r14]
-	shl	rbx,32
-	shl	rdx,32
-	mov	rdi,QWORD[((256+8))+r14]
-	or	rax,rbx
-	or	rcx,rdx
-	mov	rbp,QWORD[((256+16))+r14]
-	mov	r9,rsi
-	mov	r12,rsi
-	and	r9,rax
-	and	r12,rcx
-	mov	rbx,r9
-	mov	rdx,r12
-	shr	r9,7
-	lea	r8,[rax*1+rax]
-	shr	r12,7
-	lea	r11,[rcx*1+rcx]
-	sub	rbx,r9
-	sub	rdx,r12
-	and	r8,rdi
-	and	r11,rdi
-	and	rbx,rbp
-	and	rdx,rbp
-	xor	r8,rbx
-	xor	r11,rdx
-	mov	r10,rsi
-	mov	r13,rsi
-
-	and	r10,r8
-	and	r13,r11
-	mov	rbx,r10
-	mov	rdx,r13
-	shr	r10,7
-	lea	r9,[r8*1+r8]
-	shr	r13,7
-	lea	r12,[r11*1+r11]
-	sub	rbx,r10
-	sub	rdx,r13
-	and	r9,rdi
-	and	r12,rdi
-	and	rbx,rbp
-	and	rdx,rbp
-	xor	r9,rbx
-	xor	r12,rdx
-	mov	r10,rsi
-	mov	r13,rsi
-
-	and	r10,r9
-	and	r13,r12
-	mov	rbx,r10
-	mov	rdx,r13
-	shr	r10,7
-	xor	r8,rax
-	shr	r13,7
-	xor	r11,rcx
-	sub	rbx,r10
-	sub	rdx,r13
-	lea	r10,[r9*1+r9]
-	lea	r13,[r12*1+r12]
-	xor	r9,rax
-	xor	r12,rcx
-	and	r10,rdi
-	and	r13,rdi
-	and	rbx,rbp
-	and	rdx,rbp
-	xor	r10,rbx
-	xor	r13,rdx
-
-	xor	rax,r10
-	xor	rcx,r13
-	xor	r8,r10
-	xor	r11,r13
-	mov	rbx,rax
-	mov	rdx,rcx
-	xor	r9,r10
-	shr	rbx,32
-	xor	r12,r13
-	shr	rdx,32
-	xor	r10,r8
-	rol	eax,8
-	xor	r13,r11
-	rol	ecx,8
-	xor	r10,r9
-	rol	ebx,8
-	xor	r13,r12
-
-	rol	edx,8
-	xor	eax,r10d
-	shr	r10,32
-	xor	ecx,r13d
-	shr	r13,32
-	xor	ebx,r10d
-	xor	edx,r13d
-
-	mov	r10,r8
-	rol	r8d,24
-	mov	r13,r11
-	rol	r11d,24
-	shr	r10,32
-	xor	eax,r8d
-	shr	r13,32
-	xor	ecx,r11d
-	rol	r10d,24
-	mov	r8,r9
-	rol	r13d,24
-	mov	r11,r12
-	shr	r8,32
-	xor	ebx,r10d
-	shr	r11,32
-	xor	edx,r13d
-
-	mov	rsi,QWORD[r14]
-	rol	r9d,16
-	mov	rdi,QWORD[64+r14]
-	rol	r12d,16
-	mov	rbp,QWORD[128+r14]
-	rol	r8d,16
-	mov	r10,QWORD[192+r14]
-	xor	eax,r9d
-	rol	r11d,16
-	xor	ecx,r12d
-	mov	r13,QWORD[256+r14]
-	xor	ebx,r8d
-	xor	edx,r11d
-	jmp	NEAR $L$dec_loop_compact
-ALIGN	16
-$L$dec_compact_done:
-	xor	eax,DWORD[r15]
-	xor	ebx,DWORD[4+r15]
-	xor	ecx,DWORD[8+r15]
-	xor	edx,DWORD[12+r15]
-DB	0xf3,0xc3
-
-
-global	AES_decrypt
-
-ALIGN	16
-global	asm_AES_decrypt
-
-asm_AES_decrypt:
-AES_decrypt:
-	mov	QWORD[8+rsp],rdi	;WIN64 prologue
-	mov	QWORD[16+rsp],rsi
-	mov	rax,rsp
-$L$SEH_begin_AES_decrypt:
-	mov	rdi,rcx
-	mov	rsi,rdx
-	mov	rdx,r8
-
-
-
-	mov	rax,rsp
-
-	push	rbx
-
-	push	rbp
-
-	push	r12
-
-	push	r13
-
-	push	r14
-
-	push	r15
-
-
-
-	lea	rcx,[((-63))+rdx]
-	and	rsp,-64
-	sub	rcx,rsp
-	neg	rcx
-	and	rcx,0x3c0
-	sub	rsp,rcx
-	sub	rsp,32
-
-	mov	QWORD[16+rsp],rsi
-	mov	QWORD[24+rsp],rax
-
-$L$dec_prologue:
-
-	mov	r15,rdx
-	mov	r13d,DWORD[240+r15]
-
-	mov	eax,DWORD[rdi]
-	mov	ebx,DWORD[4+rdi]
-	mov	ecx,DWORD[8+rdi]
-	mov	edx,DWORD[12+rdi]
-
-	shl	r13d,4
-	lea	rbp,[r13*1+r15]
-	mov	QWORD[rsp],r15
-	mov	QWORD[8+rsp],rbp
-
-
-	lea	r14,[(($L$AES_Td+2048))]
-	lea	rbp,[768+rsp]
-	sub	rbp,r14
-	and	rbp,0x300
-	lea	r14,[rbp*1+r14]
-	shr	rbp,3
-	add	r14,rbp
-
-	call	_x86_64_AES_decrypt_compact
-
-	mov	r9,QWORD[16+rsp]
-	mov	rsi,QWORD[24+rsp]
-
-	mov	DWORD[r9],eax
-	mov	DWORD[4+r9],ebx
-	mov	DWORD[8+r9],ecx
-	mov	DWORD[12+r9],edx
-
-	mov	r15,QWORD[((-48))+rsi]
-
-	mov	r14,QWORD[((-40))+rsi]
-
-	mov	r13,QWORD[((-32))+rsi]
-
-	mov	r12,QWORD[((-24))+rsi]
-
-	mov	rbp,QWORD[((-16))+rsi]
-
-	mov	rbx,QWORD[((-8))+rsi]
-
-	lea	rsp,[rsi]
-
-$L$dec_epilogue:
-	mov	rdi,QWORD[8+rsp]	;WIN64 epilogue
-	mov	rsi,QWORD[16+rsp]
-	DB	0F3h,0C3h		;repret
-
-$L$SEH_end_AES_decrypt:
-global	AES_set_encrypt_key
-
-ALIGN	16
-AES_set_encrypt_key:
-	mov	QWORD[8+rsp],rdi	;WIN64 prologue
-	mov	QWORD[16+rsp],rsi
-	mov	rax,rsp
-$L$SEH_begin_AES_set_encrypt_key:
-	mov	rdi,rcx
-	mov	rsi,rdx
-	mov	rdx,r8
-
-
-
-	push	rbx
-
-	push	rbp
-
-	push	r12
-
-	push	r13
-
-	push	r14
-
-	push	r15
-
-	sub	rsp,8
-
-$L$enc_key_prologue:
-
-	call	_x86_64_AES_set_encrypt_key
-
-	mov	rbp,QWORD[40+rsp]
-
-	mov	rbx,QWORD[48+rsp]
-
-	add	rsp,56
-
-$L$enc_key_epilogue:
-	mov	rdi,QWORD[8+rsp]	;WIN64 epilogue
-	mov	rsi,QWORD[16+rsp]
-	DB	0F3h,0C3h		;repret
-
-$L$SEH_end_AES_set_encrypt_key:
-
-
-ALIGN	16
-_x86_64_AES_set_encrypt_key:
-
-	mov	ecx,esi
-	mov	rsi,rdi
-	mov	rdi,rdx
-
-	test	rsi,-1
-	jz	NEAR $L$badpointer
-	test	rdi,-1
-	jz	NEAR $L$badpointer
-
-	lea	rbp,[$L$AES_Te]
-	lea	rbp,[((2048+128))+rbp]
-
-
-	mov	eax,DWORD[((0-128))+rbp]
-	mov	ebx,DWORD[((32-128))+rbp]
-	mov	r8d,DWORD[((64-128))+rbp]
-	mov	edx,DWORD[((96-128))+rbp]
-	mov	eax,DWORD[((128-128))+rbp]
-	mov	ebx,DWORD[((160-128))+rbp]
-	mov	r8d,DWORD[((192-128))+rbp]
-	mov	edx,DWORD[((224-128))+rbp]
-
-	cmp	ecx,128
-	je	NEAR $L$10rounds
-	cmp	ecx,192
-	je	NEAR $L$12rounds
-	cmp	ecx,256
-	je	NEAR $L$14rounds
-	mov	rax,-2
-	jmp	NEAR $L$exit
-
-$L$10rounds:
-	mov	rax,QWORD[rsi]
-	mov	rdx,QWORD[8+rsi]
-	mov	QWORD[rdi],rax
-	mov	QWORD[8+rdi],rdx
-
-	shr	rdx,32
-	xor	ecx,ecx
-	jmp	NEAR $L$10shortcut
-ALIGN	4
-$L$10loop:
-	mov	eax,DWORD[rdi]
-	mov	edx,DWORD[12+rdi]
-$L$10shortcut:
-	movzx	esi,dl
-	movzx	ebx,BYTE[((-128))+rsi*1+rbp]
-	movzx	esi,dh
-	shl	ebx,24
-	xor	eax,ebx
-
-	movzx	ebx,BYTE[((-128))+rsi*1+rbp]
-	shr	edx,16
-	movzx	esi,dl
-	xor	eax,ebx
-
-	movzx	ebx,BYTE[((-128))+rsi*1+rbp]
-	movzx	esi,dh
-	shl	ebx,8
-	xor	eax,ebx
-
-	movzx	ebx,BYTE[((-128))+rsi*1+rbp]
-	shl	ebx,16
-	xor	eax,ebx
-
-	xor	eax,DWORD[((1024-128))+rcx*4+rbp]
-	mov	DWORD[16+rdi],eax
-	xor	eax,DWORD[4+rdi]
-	mov	DWORD[20+rdi],eax
-	xor	eax,DWORD[8+rdi]
-	mov	DWORD[24+rdi],eax
-	xor	eax,DWORD[12+rdi]
-	mov	DWORD[28+rdi],eax
-	add	ecx,1
-	lea	rdi,[16+rdi]
-	cmp	ecx,10
-	jl	NEAR $L$10loop
-
-	mov	DWORD[80+rdi],10
-	xor	rax,rax
-	jmp	NEAR $L$exit
-
-$L$12rounds:
-	mov	rax,QWORD[rsi]
-	mov	rbx,QWORD[8+rsi]
-	mov	rdx,QWORD[16+rsi]
-	mov	QWORD[rdi],rax
-	mov	QWORD[8+rdi],rbx
-	mov	QWORD[16+rdi],rdx
-
-	shr	rdx,32
-	xor	ecx,ecx
-	jmp	NEAR $L$12shortcut
-ALIGN	4
-$L$12loop:
-	mov	eax,DWORD[rdi]
-	mov	edx,DWORD[20+rdi]
-$L$12shortcut:
-	movzx	esi,dl
-	movzx	ebx,BYTE[((-128))+rsi*1+rbp]
-	movzx	esi,dh
-	shl	ebx,24
-	xor	eax,ebx
-
-	movzx	ebx,BYTE[((-128))+rsi*1+rbp]
-	shr	edx,16
-	movzx	esi,dl
-	xor	eax,ebx
-
-	movzx	ebx,BYTE[((-128))+rsi*1+rbp]
-	movzx	esi,dh
-	shl	ebx,8
-	xor	eax,ebx
-
-	movzx	ebx,BYTE[((-128))+rsi*1+rbp]
-	shl	ebx,16
-	xor	eax,ebx
-
-	xor	eax,DWORD[((1024-128))+rcx*4+rbp]
-	mov	DWORD[24+rdi],eax
-	xor	eax,DWORD[4+rdi]
-	mov	DWORD[28+rdi],eax
-	xor	eax,DWORD[8+rdi]
-	mov	DWORD[32+rdi],eax
-	xor	eax,DWORD[12+rdi]
-	mov	DWORD[36+rdi],eax
-
-	cmp	ecx,7
-	je	NEAR $L$12break
-	add	ecx,1
-
-	xor	eax,DWORD[16+rdi]
-	mov	DWORD[40+rdi],eax
-	xor	eax,DWORD[20+rdi]
-	mov	DWORD[44+rdi],eax
-
-	lea	rdi,[24+rdi]
-	jmp	NEAR $L$12loop
-$L$12break:
-	mov	DWORD[72+rdi],12
-	xor	rax,rax
-	jmp	NEAR $L$exit
-
-$L$14rounds:
-	mov	rax,QWORD[rsi]
-	mov	rbx,QWORD[8+rsi]
-	mov	rcx,QWORD[16+rsi]
-	mov	rdx,QWORD[24+rsi]
-	mov	QWORD[rdi],rax
-	mov	QWORD[8+rdi],rbx
-	mov	QWORD[16+rdi],rcx
-	mov	QWORD[24+rdi],rdx
-
-	shr	rdx,32
-	xor	ecx,ecx
-	jmp	NEAR $L$14shortcut
-ALIGN	4
-$L$14loop:
-	mov	eax,DWORD[rdi]
-	mov	edx,DWORD[28+rdi]
-$L$14shortcut:
-	movzx	esi,dl
-	movzx	ebx,BYTE[((-128))+rsi*1+rbp]
-	movzx	esi,dh
-	shl	ebx,24
-	xor	eax,ebx
-
-	movzx	ebx,BYTE[((-128))+rsi*1+rbp]
-	shr	edx,16
-	movzx	esi,dl
-	xor	eax,ebx
-
-	movzx	ebx,BYTE[((-128))+rsi*1+rbp]
-	movzx	esi,dh
-	shl	ebx,8
-	xor	eax,ebx
-
-	movzx	ebx,BYTE[((-128))+rsi*1+rbp]
-	shl	ebx,16
-	xor	eax,ebx
-
-	xor	eax,DWORD[((1024-128))+rcx*4+rbp]
-	mov	DWORD[32+rdi],eax
-	xor	eax,DWORD[4+rdi]
-	mov	DWORD[36+rdi],eax
-	xor	eax,DWORD[8+rdi]
-	mov	DWORD[40+rdi],eax
-	xor	eax,DWORD[12+rdi]
-	mov	DWORD[44+rdi],eax
-
-	cmp	ecx,6
-	je	NEAR $L$14break
-	add	ecx,1
-
-	mov	edx,eax
-	mov	eax,DWORD[16+rdi]
-	movzx	esi,dl
-	movzx	ebx,BYTE[((-128))+rsi*1+rbp]
-	movzx	esi,dh
-	xor	eax,ebx
-
-	movzx	ebx,BYTE[((-128))+rsi*1+rbp]
-	shr	edx,16
-	shl	ebx,8
-	movzx	esi,dl
-	xor	eax,ebx
-
-	movzx	ebx,BYTE[((-128))+rsi*1+rbp]
-	movzx	esi,dh
-	shl	ebx,16
-	xor	eax,ebx
-
-	movzx	ebx,BYTE[((-128))+rsi*1+rbp]
-	shl	ebx,24
-	xor	eax,ebx
-
-	mov	DWORD[48+rdi],eax
-	xor	eax,DWORD[20+rdi]
-	mov	DWORD[52+rdi],eax
-	xor	eax,DWORD[24+rdi]
-	mov	DWORD[56+rdi],eax
-	xor	eax,DWORD[28+rdi]
-	mov	DWORD[60+rdi],eax
-
-	lea	rdi,[32+rdi]
-	jmp	NEAR $L$14loop
-$L$14break:
-	mov	DWORD[48+rdi],14
-	xor	rax,rax
-	jmp	NEAR $L$exit
-
-$L$badpointer:
-	mov	rax,-1
-$L$exit:
-DB	0xf3,0xc3
-
-
-global	AES_set_decrypt_key
-
-ALIGN	16
-AES_set_decrypt_key:
-	mov	QWORD[8+rsp],rdi	;WIN64 prologue
-	mov	QWORD[16+rsp],rsi
-	mov	rax,rsp
-$L$SEH_begin_AES_set_decrypt_key:
-	mov	rdi,rcx
-	mov	rsi,rdx
-	mov	rdx,r8
-
-
-
-	push	rbx
-
-	push	rbp
-
-	push	r12
-
-	push	r13
-
-	push	r14
-
-	push	r15
-
-	push	rdx
-
-$L$dec_key_prologue:
-
-	call	_x86_64_AES_set_encrypt_key
-	mov	r8,QWORD[rsp]
-	cmp	eax,0
-	jne	NEAR $L$abort
-
-	mov	r14d,DWORD[240+r8]
-	xor	rdi,rdi
-	lea	rcx,[r14*4+rdi]
-	mov	rsi,r8
-	lea	rdi,[rcx*4+r8]
-ALIGN	4
-$L$invert:
-	mov	rax,QWORD[rsi]
-	mov	rbx,QWORD[8+rsi]
-	mov	rcx,QWORD[rdi]
-	mov	rdx,QWORD[8+rdi]
-	mov	QWORD[rdi],rax
-	mov	QWORD[8+rdi],rbx
-	mov	QWORD[rsi],rcx
-	mov	QWORD[8+rsi],rdx
-	lea	rsi,[16+rsi]
-	lea	rdi,[((-16))+rdi]
-	cmp	rdi,rsi
-	jne	NEAR $L$invert
-
-	lea	rax,[(($L$AES_Te+2048+1024))]
-
-	mov	rsi,QWORD[40+rax]
-	mov	rdi,QWORD[48+rax]
-	mov	rbp,QWORD[56+rax]
-
-	mov	r15,r8
-	sub	r14d,1
-ALIGN	4
-$L$permute:
-	lea	r15,[16+r15]
-	mov	rax,QWORD[r15]
-	mov	rcx,QWORD[8+r15]
-	mov	r9,rsi
-	mov	r12,rsi
-	and	r9,rax
-	and	r12,rcx
-	mov	rbx,r9
-	mov	rdx,r12
-	shr	r9,7
-	lea	r8,[rax*1+rax]
-	shr	r12,7
-	lea	r11,[rcx*1+rcx]
-	sub	rbx,r9
-	sub	rdx,r12
-	and	r8,rdi
-	and	r11,rdi
-	and	rbx,rbp
-	and	rdx,rbp
-	xor	r8,rbx
-	xor	r11,rdx
-	mov	r10,rsi
-	mov	r13,rsi
-
-	and	r10,r8
-	and	r13,r11
-	mov	rbx,r10
-	mov	rdx,r13
-	shr	r10,7
-	lea	r9,[r8*1+r8]
-	shr	r13,7
-	lea	r12,[r11*1+r11]
-	sub	rbx,r10
-	sub	rdx,r13
-	and	r9,rdi
-	and	r12,rdi
-	and	rbx,rbp
-	and	rdx,rbp
-	xor	r9,rbx
-	xor	r12,rdx
-	mov	r10,rsi
-	mov	r13,rsi
-
-	and	r10,r9
-	and	r13,r12
-	mov	rbx,r10
-	mov	rdx,r13
-	shr	r10,7
-	xor	r8,rax
-	shr	r13,7
-	xor	r11,rcx
-	sub	rbx,r10
-	sub	rdx,r13
-	lea	r10,[r9*1+r9]
-	lea	r13,[r12*1+r12]
-	xor	r9,rax
-	xor	r12,rcx
-	and	r10,rdi
-	and	r13,rdi
-	and	rbx,rbp
-	and	rdx,rbp
-	xor	r10,rbx
-	xor	r13,rdx
-
-	xor	rax,r10
-	xor	rcx,r13
-	xor	r8,r10
-	xor	r11,r13
-	mov	rbx,rax
-	mov	rdx,rcx
-	xor	r9,r10
-	shr	rbx,32
-	xor	r12,r13
-	shr	rdx,32
-	xor	r10,r8
-	rol	eax,8
-	xor	r13,r11
-	rol	ecx,8
-	xor	r10,r9
-	rol	ebx,8
-	xor	r13,r12
-
-	rol	edx,8
-	xor	eax,r10d
-	shr	r10,32
-	xor	ecx,r13d
-	shr	r13,32
-	xor	ebx,r10d
-	xor	edx,r13d
-
-	mov	r10,r8
-	rol	r8d,24
-	mov	r13,r11
-	rol	r11d,24
-	shr	r10,32
-	xor	eax,r8d
-	shr	r13,32
-	xor	ecx,r11d
-	rol	r10d,24
-	mov	r8,r9
-	rol	r13d,24
-	mov	r11,r12
-	shr	r8,32
-	xor	ebx,r10d
-	shr	r11,32
-	xor	edx,r13d
-
-
-	rol	r9d,16
-
-	rol	r12d,16
-
-	rol	r8d,16
-
-	xor	eax,r9d
-	rol	r11d,16
-	xor	ecx,r12d
-
-	xor	ebx,r8d
-	xor	edx,r11d
-	mov	DWORD[r15],eax
-	mov	DWORD[4+r15],ebx
-	mov	DWORD[8+r15],ecx
-	mov	DWORD[12+r15],edx
-	sub	r14d,1
-	jnz	NEAR $L$permute
-
-	xor	rax,rax
-$L$abort:
-	mov	r15,QWORD[8+rsp]
-
-	mov	r14,QWORD[16+rsp]
-
-	mov	r13,QWORD[24+rsp]
-
-	mov	r12,QWORD[32+rsp]
-
-	mov	rbp,QWORD[40+rsp]
-
-	mov	rbx,QWORD[48+rsp]
-
-	add	rsp,56
-
-$L$dec_key_epilogue:
-	mov	rdi,QWORD[8+rsp]	;WIN64 epilogue
-	mov	rsi,QWORD[16+rsp]
-	DB	0F3h,0C3h		;repret
-
-$L$SEH_end_AES_set_decrypt_key:
-global	AES_cbc_encrypt
-
-ALIGN	16
-EXTERN	OPENSSL_ia32cap_P
-global	asm_AES_cbc_encrypt
-
-asm_AES_cbc_encrypt:
-AES_cbc_encrypt:
-	mov	QWORD[8+rsp],rdi	;WIN64 prologue
-	mov	QWORD[16+rsp],rsi
-	mov	rax,rsp
-$L$SEH_begin_AES_cbc_encrypt:
-	mov	rdi,rcx
-	mov	rsi,rdx
-	mov	rdx,r8
-	mov	rcx,r9
-	mov	r8,QWORD[40+rsp]
-	mov	r9,QWORD[48+rsp]
-
-
-
-	cmp	rdx,0
-	je	NEAR $L$cbc_epilogue
-	pushfq
-
-
-
-	push	rbx
-
-	push	rbp
-
-	push	r12
-
-	push	r13
-
-	push	r14
-
-	push	r15
-
-$L$cbc_prologue:
-
-	cld
-	mov	r9d,r9d
-
-	lea	r14,[$L$AES_Te]
-	lea	r10,[$L$AES_Td]
-	cmp	r9,0
-	cmove	r14,r10
-
-
-	mov	r10d,DWORD[OPENSSL_ia32cap_P]
-	cmp	rdx,512
-	jb	NEAR $L$cbc_slow_prologue
-	test	rdx,15
-	jnz	NEAR $L$cbc_slow_prologue
-	bt	r10d,28
-	jc	NEAR $L$cbc_slow_prologue
-
-
-	lea	r15,[((-88-248))+rsp]
-	and	r15,-64
-
-
-	mov	r10,r14
-	lea	r11,[2304+r14]
-	mov	r12,r15
-	and	r10,0xFFF
-	and	r11,0xFFF
-	and	r12,0xFFF
-
-	cmp	r12,r11
-	jb	NEAR $L$cbc_te_break_out
-	sub	r12,r11
-	sub	r15,r12
-	jmp	NEAR $L$cbc_te_ok
-$L$cbc_te_break_out:
-	sub	r12,r10
-	and	r12,0xFFF
-	add	r12,320
-	sub	r15,r12
-ALIGN	4
-$L$cbc_te_ok:
-
-	xchg	r15,rsp
-
-
-	mov	QWORD[16+rsp],r15
-
-$L$cbc_fast_body:
-	mov	QWORD[24+rsp],rdi
-	mov	QWORD[32+rsp],rsi
-	mov	QWORD[40+rsp],rdx
-	mov	QWORD[48+rsp],rcx
-	mov	QWORD[56+rsp],r8
-	mov	DWORD[((80+240))+rsp],0
-	mov	rbp,r8
-	mov	rbx,r9
-	mov	r9,rsi
-	mov	r8,rdi
-	mov	r15,rcx
-
-	mov	eax,DWORD[240+r15]
-
-	mov	r10,r15
-	sub	r10,r14
-	and	r10,0xfff
-	cmp	r10,2304
-	jb	NEAR $L$cbc_do_ecopy
-	cmp	r10,4096-248
-	jb	NEAR $L$cbc_skip_ecopy
-ALIGN	4
-$L$cbc_do_ecopy:
-	mov	rsi,r15
-	lea	rdi,[80+rsp]
-	lea	r15,[80+rsp]
-	mov	ecx,240/8
-	DD	0x90A548F3
-	mov	DWORD[rdi],eax
-$L$cbc_skip_ecopy:
-	mov	QWORD[rsp],r15
-
-	mov	ecx,18
-ALIGN	4
-$L$cbc_prefetch_te:
-	mov	r10,QWORD[r14]
-	mov	r11,QWORD[32+r14]
-	mov	r12,QWORD[64+r14]
-	mov	r13,QWORD[96+r14]
-	lea	r14,[128+r14]
-	sub	ecx,1
-	jnz	NEAR $L$cbc_prefetch_te
-	lea	r14,[((-2304))+r14]
-
-	cmp	rbx,0
-	je	NEAR $L$FAST_DECRYPT
-
-
-	mov	eax,DWORD[rbp]
-	mov	ebx,DWORD[4+rbp]
-	mov	ecx,DWORD[8+rbp]
-	mov	edx,DWORD[12+rbp]
-
-ALIGN	4
-$L$cbc_fast_enc_loop:
-	xor	eax,DWORD[r8]
-	xor	ebx,DWORD[4+r8]
-	xor	ecx,DWORD[8+r8]
-	xor	edx,DWORD[12+r8]
-	mov	r15,QWORD[rsp]
-	mov	QWORD[24+rsp],r8
-
-	call	_x86_64_AES_encrypt
-
-	mov	r8,QWORD[24+rsp]
-	mov	r10,QWORD[40+rsp]
-	mov	DWORD[r9],eax
-	mov	DWORD[4+r9],ebx
-	mov	DWORD[8+r9],ecx
-	mov	DWORD[12+r9],edx
-
-	lea	r8,[16+r8]
-	lea	r9,[16+r9]
-	sub	r10,16
-	test	r10,-16
-	mov	QWORD[40+rsp],r10
-	jnz	NEAR $L$cbc_fast_enc_loop
-	mov	rbp,QWORD[56+rsp]
-	mov	DWORD[rbp],eax
-	mov	DWORD[4+rbp],ebx
-	mov	DWORD[8+rbp],ecx
-	mov	DWORD[12+rbp],edx
-
-	jmp	NEAR $L$cbc_fast_cleanup
-
-
-ALIGN	16
-$L$FAST_DECRYPT:
-	cmp	r9,r8
-	je	NEAR $L$cbc_fast_dec_in_place
-
-	mov	QWORD[64+rsp],rbp
-ALIGN	4
-$L$cbc_fast_dec_loop:
-	mov	eax,DWORD[r8]
-	mov	ebx,DWORD[4+r8]
-	mov	ecx,DWORD[8+r8]
-	mov	edx,DWORD[12+r8]
-	mov	r15,QWORD[rsp]
-	mov	QWORD[24+rsp],r8
-
-	call	_x86_64_AES_decrypt
-
-	mov	rbp,QWORD[64+rsp]
-	mov	r8,QWORD[24+rsp]
-	mov	r10,QWORD[40+rsp]
-	xor	eax,DWORD[rbp]
-	xor	ebx,DWORD[4+rbp]
-	xor	ecx,DWORD[8+rbp]
-	xor	edx,DWORD[12+rbp]
-	mov	rbp,r8
-
-	sub	r10,16
-	mov	QWORD[40+rsp],r10
-	mov	QWORD[64+rsp],rbp
-
-	mov	DWORD[r9],eax
-	mov	DWORD[4+r9],ebx
-	mov	DWORD[8+r9],ecx
-	mov	DWORD[12+r9],edx
-
-	lea	r8,[16+r8]
-	lea	r9,[16+r9]
-	jnz	NEAR $L$cbc_fast_dec_loop
-	mov	r12,QWORD[56+rsp]
-	mov	r10,QWORD[rbp]
-	mov	r11,QWORD[8+rbp]
-	mov	QWORD[r12],r10
-	mov	QWORD[8+r12],r11
-	jmp	NEAR $L$cbc_fast_cleanup
-
-ALIGN	16
-$L$cbc_fast_dec_in_place:
-	mov	r10,QWORD[rbp]
-	mov	r11,QWORD[8+rbp]
-	mov	QWORD[((0+64))+rsp],r10
-	mov	QWORD[((8+64))+rsp],r11
-ALIGN	4
-$L$cbc_fast_dec_in_place_loop:
-	mov	eax,DWORD[r8]
-	mov	ebx,DWORD[4+r8]
-	mov	ecx,DWORD[8+r8]
-	mov	edx,DWORD[12+r8]
-	mov	r15,QWORD[rsp]
-	mov	QWORD[24+rsp],r8
-
-	call	_x86_64_AES_decrypt
-
-	mov	r8,QWORD[24+rsp]
-	mov	r10,QWORD[40+rsp]
-	xor	eax,DWORD[((0+64))+rsp]
-	xor	ebx,DWORD[((4+64))+rsp]
-	xor	ecx,DWORD[((8+64))+rsp]
-	xor	edx,DWORD[((12+64))+rsp]
-
-	mov	r11,QWORD[r8]
-	mov	r12,QWORD[8+r8]
-	sub	r10,16
-	jz	NEAR $L$cbc_fast_dec_in_place_done
-
-	mov	QWORD[((0+64))+rsp],r11
-	mov	QWORD[((8+64))+rsp],r12
-
-	mov	DWORD[r9],eax
-	mov	DWORD[4+r9],ebx
-	mov	DWORD[8+r9],ecx
-	mov	DWORD[12+r9],edx
-
-	lea	r8,[16+r8]
-	lea	r9,[16+r9]
-	mov	QWORD[40+rsp],r10
-	jmp	NEAR $L$cbc_fast_dec_in_place_loop
-$L$cbc_fast_dec_in_place_done:
-	mov	rdi,QWORD[56+rsp]
-	mov	QWORD[rdi],r11
-	mov	QWORD[8+rdi],r12
-
-	mov	DWORD[r9],eax
-	mov	DWORD[4+r9],ebx
-	mov	DWORD[8+r9],ecx
-	mov	DWORD[12+r9],edx
-
-ALIGN	4
-$L$cbc_fast_cleanup:
-	cmp	DWORD[((80+240))+rsp],0
-	lea	rdi,[80+rsp]
-	je	NEAR $L$cbc_exit
-	mov	ecx,240/8
-	xor	rax,rax
-	DD	0x90AB48F3
-
-	jmp	NEAR $L$cbc_exit
-
-
-ALIGN	16
-$L$cbc_slow_prologue:
-
-
-	lea	rbp,[((-88))+rsp]
-	and	rbp,-64
-
-	lea	r10,[((-88-63))+rcx]
-	sub	r10,rbp
-	neg	r10
-	and	r10,0x3c0
-	sub	rbp,r10
-
-	xchg	rbp,rsp
-
-
-	mov	QWORD[16+rsp],rbp
-
-$L$cbc_slow_body:
-
-
-
-
-	mov	QWORD[56+rsp],r8
-	mov	rbp,r8
-	mov	rbx,r9
-	mov	r9,rsi
-	mov	r8,rdi
-	mov	r15,rcx
-	mov	r10,rdx
-
-	mov	eax,DWORD[240+r15]
-	mov	QWORD[rsp],r15
-	shl	eax,4
-	lea	rax,[rax*1+r15]
-	mov	QWORD[8+rsp],rax
-
-
-	lea	r14,[2048+r14]
-	lea	rax,[((768-8))+rsp]
-	sub	rax,r14
-	and	rax,0x300
-	lea	r14,[rax*1+r14]
-
-	cmp	rbx,0
-	je	NEAR $L$SLOW_DECRYPT
-
-
-	test	r10,-16
-	mov	eax,DWORD[rbp]
-	mov	ebx,DWORD[4+rbp]
-	mov	ecx,DWORD[8+rbp]
-	mov	edx,DWORD[12+rbp]
-	jz	NEAR $L$cbc_slow_enc_tail
-
-ALIGN	4
-$L$cbc_slow_enc_loop:
-	xor	eax,DWORD[r8]
-	xor	ebx,DWORD[4+r8]
-	xor	ecx,DWORD[8+r8]
-	xor	edx,DWORD[12+r8]
-	mov	r15,QWORD[rsp]
-	mov	QWORD[24+rsp],r8
-	mov	QWORD[32+rsp],r9
-	mov	QWORD[40+rsp],r10
-
-	call	_x86_64_AES_encrypt_compact
-
-	mov	r8,QWORD[24+rsp]
-	mov	r9,QWORD[32+rsp]
-	mov	r10,QWORD[40+rsp]
-	mov	DWORD[r9],eax
-	mov	DWORD[4+r9],ebx
-	mov	DWORD[8+r9],ecx
-	mov	DWORD[12+r9],edx
-
-	lea	r8,[16+r8]
-	lea	r9,[16+r9]
-	sub	r10,16
-	test	r10,-16
-	jnz	NEAR $L$cbc_slow_enc_loop
-	test	r10,15
-	jnz	NEAR $L$cbc_slow_enc_tail
-	mov	rbp,QWORD[56+rsp]
-	mov	DWORD[rbp],eax
-	mov	DWORD[4+rbp],ebx
-	mov	DWORD[8+rbp],ecx
-	mov	DWORD[12+rbp],edx
-
-	jmp	NEAR $L$cbc_exit
-
-ALIGN	4
-$L$cbc_slow_enc_tail:
-	mov	r11,rax
-	mov	r12,rcx
-	mov	rcx,r10
-	mov	rsi,r8
-	mov	rdi,r9
-	DD	0x9066A4F3
-	mov	rcx,16
-	sub	rcx,r10
-	xor	rax,rax
-	DD	0x9066AAF3
-	mov	r8,r9
-	mov	r10,16
-	mov	rax,r11
-	mov	rcx,r12
-	jmp	NEAR $L$cbc_slow_enc_loop
-
-ALIGN	16
-$L$SLOW_DECRYPT:
-	shr	rax,3
-	add	r14,rax
-
-	mov	r11,QWORD[rbp]
-	mov	r12,QWORD[8+rbp]
-	mov	QWORD[((0+64))+rsp],r11
-	mov	QWORD[((8+64))+rsp],r12
-
-ALIGN	4
-$L$cbc_slow_dec_loop:
-	mov	eax,DWORD[r8]
-	mov	ebx,DWORD[4+r8]
-	mov	ecx,DWORD[8+r8]
-	mov	edx,DWORD[12+r8]
-	mov	r15,QWORD[rsp]
-	mov	QWORD[24+rsp],r8
-	mov	QWORD[32+rsp],r9
-	mov	QWORD[40+rsp],r10
-
-	call	_x86_64_AES_decrypt_compact
-
-	mov	r8,QWORD[24+rsp]
-	mov	r9,QWORD[32+rsp]
-	mov	r10,QWORD[40+rsp]
-	xor	eax,DWORD[((0+64))+rsp]
-	xor	ebx,DWORD[((4+64))+rsp]
-	xor	ecx,DWORD[((8+64))+rsp]
-	xor	edx,DWORD[((12+64))+rsp]
-
-	mov	r11,QWORD[r8]
-	mov	r12,QWORD[8+r8]
-	sub	r10,16
-	jc	NEAR $L$cbc_slow_dec_partial
-	jz	NEAR $L$cbc_slow_dec_done
-
-	mov	QWORD[((0+64))+rsp],r11
-	mov	QWORD[((8+64))+rsp],r12
-
-	mov	DWORD[r9],eax
-	mov	DWORD[4+r9],ebx
-	mov	DWORD[8+r9],ecx
-	mov	DWORD[12+r9],edx
-
-	lea	r8,[16+r8]
-	lea	r9,[16+r9]
-	jmp	NEAR $L$cbc_slow_dec_loop
-$L$cbc_slow_dec_done:
-	mov	rdi,QWORD[56+rsp]
-	mov	QWORD[rdi],r11
-	mov	QWORD[8+rdi],r12
-
-	mov	DWORD[r9],eax
-	mov	DWORD[4+r9],ebx
-	mov	DWORD[8+r9],ecx
-	mov	DWORD[12+r9],edx
-
-	jmp	NEAR $L$cbc_exit
-
-ALIGN	4
-$L$cbc_slow_dec_partial:
-	mov	rdi,QWORD[56+rsp]
-	mov	QWORD[rdi],r11
-	mov	QWORD[8+rdi],r12
-
-	mov	DWORD[((0+64))+rsp],eax
-	mov	DWORD[((4+64))+rsp],ebx
-	mov	DWORD[((8+64))+rsp],ecx
-	mov	DWORD[((12+64))+rsp],edx
-
-	mov	rdi,r9
-	lea	rsi,[64+rsp]
-	lea	rcx,[16+r10]
-	DD	0x9066A4F3
-	jmp	NEAR $L$cbc_exit
-
-ALIGN	16
-$L$cbc_exit:
-	mov	rsi,QWORD[16+rsp]
-
-	mov	r15,QWORD[rsi]
-
-	mov	r14,QWORD[8+rsi]
-
-	mov	r13,QWORD[16+rsi]
-
-	mov	r12,QWORD[24+rsi]
-
-	mov	rbp,QWORD[32+rsi]
-
-	mov	rbx,QWORD[40+rsi]
-
-	lea	rsp,[48+rsi]
-
-$L$cbc_popfq:
-	popfq
-
-
-
-$L$cbc_epilogue:
-	mov	rdi,QWORD[8+rsp]	;WIN64 epilogue
-	mov	rsi,QWORD[16+rsp]
-	DB	0F3h,0C3h		;repret
-
-$L$SEH_end_AES_cbc_encrypt:
-ALIGN	64
-$L$AES_Te:
-	DD	0xa56363c6,0xa56363c6
-	DD	0x847c7cf8,0x847c7cf8
-	DD	0x997777ee,0x997777ee
-	DD	0x8d7b7bf6,0x8d7b7bf6
-	DD	0x0df2f2ff,0x0df2f2ff
-	DD	0xbd6b6bd6,0xbd6b6bd6
-	DD	0xb16f6fde,0xb16f6fde
-	DD	0x54c5c591,0x54c5c591
-	DD	0x50303060,0x50303060
-	DD	0x03010102,0x03010102
-	DD	0xa96767ce,0xa96767ce
-	DD	0x7d2b2b56,0x7d2b2b56
-	DD	0x19fefee7,0x19fefee7
-	DD	0x62d7d7b5,0x62d7d7b5
-	DD	0xe6abab4d,0xe6abab4d
-	DD	0x9a7676ec,0x9a7676ec
-	DD	0x45caca8f,0x45caca8f
-	DD	0x9d82821f,0x9d82821f
-	DD	0x40c9c989,0x40c9c989
-	DD	0x877d7dfa,0x877d7dfa
-	DD	0x15fafaef,0x15fafaef
-	DD	0xeb5959b2,0xeb5959b2
-	DD	0xc947478e,0xc947478e
-	DD	0x0bf0f0fb,0x0bf0f0fb
-	DD	0xecadad41,0xecadad41
-	DD	0x67d4d4b3,0x67d4d4b3
-	DD	0xfda2a25f,0xfda2a25f
-	DD	0xeaafaf45,0xeaafaf45
-	DD	0xbf9c9c23,0xbf9c9c23
-	DD	0xf7a4a453,0xf7a4a453
-	DD	0x967272e4,0x967272e4
-	DD	0x5bc0c09b,0x5bc0c09b
-	DD	0xc2b7b775,0xc2b7b775
-	DD	0x1cfdfde1,0x1cfdfde1
-	DD	0xae93933d,0xae93933d
-	DD	0x6a26264c,0x6a26264c
-	DD	0x5a36366c,0x5a36366c
-	DD	0x413f3f7e,0x413f3f7e
-	DD	0x02f7f7f5,0x02f7f7f5
-	DD	0x4fcccc83,0x4fcccc83
-	DD	0x5c343468,0x5c343468
-	DD	0xf4a5a551,0xf4a5a551
-	DD	0x34e5e5d1,0x34e5e5d1
-	DD	0x08f1f1f9,0x08f1f1f9
-	DD	0x937171e2,0x937171e2
-	DD	0x73d8d8ab,0x73d8d8ab
-	DD	0x53313162,0x53313162
-	DD	0x3f15152a,0x3f15152a
-	DD	0x0c040408,0x0c040408
-	DD	0x52c7c795,0x52c7c795
-	DD	0x65232346,0x65232346
-	DD	0x5ec3c39d,0x5ec3c39d
-	DD	0x28181830,0x28181830
-	DD	0xa1969637,0xa1969637
-	DD	0x0f05050a,0x0f05050a
-	DD	0xb59a9a2f,0xb59a9a2f
-	DD	0x0907070e,0x0907070e
-	DD	0x36121224,0x36121224
-	DD	0x9b80801b,0x9b80801b
-	DD	0x3de2e2df,0x3de2e2df
-	DD	0x26ebebcd,0x26ebebcd
-	DD	0x6927274e,0x6927274e
-	DD	0xcdb2b27f,0xcdb2b27f
-	DD	0x9f7575ea,0x9f7575ea
-	DD	0x1b090912,0x1b090912
-	DD	0x9e83831d,0x9e83831d
-	DD	0x742c2c58,0x742c2c58
-	DD	0x2e1a1a34,0x2e1a1a34
-	DD	0x2d1b1b36,0x2d1b1b36
-	DD	0xb26e6edc,0xb26e6edc
-	DD	0xee5a5ab4,0xee5a5ab4
-	DD	0xfba0a05b,0xfba0a05b
-	DD	0xf65252a4,0xf65252a4
-	DD	0x4d3b3b76,0x4d3b3b76
-	DD	0x61d6d6b7,0x61d6d6b7
-	DD	0xceb3b37d,0xceb3b37d
-	DD	0x7b292952,0x7b292952
-	DD	0x3ee3e3dd,0x3ee3e3dd
-	DD	0x712f2f5e,0x712f2f5e
-	DD	0x97848413,0x97848413
-	DD	0xf55353a6,0xf55353a6
-	DD	0x68d1d1b9,0x68d1d1b9
-	DD	0x00000000,0x00000000
-	DD	0x2cededc1,0x2cededc1
-	DD	0x60202040,0x60202040
-	DD	0x1ffcfce3,0x1ffcfce3
-	DD	0xc8b1b179,0xc8b1b179
-	DD	0xed5b5bb6,0xed5b5bb6
-	DD	0xbe6a6ad4,0xbe6a6ad4
-	DD	0x46cbcb8d,0x46cbcb8d
-	DD	0xd9bebe67,0xd9bebe67
-	DD	0x4b393972,0x4b393972
-	DD	0xde4a4a94,0xde4a4a94
-	DD	0xd44c4c98,0xd44c4c98
-	DD	0xe85858b0,0xe85858b0
-	DD	0x4acfcf85,0x4acfcf85
-	DD	0x6bd0d0bb,0x6bd0d0bb
-	DD	0x2aefefc5,0x2aefefc5
-	DD	0xe5aaaa4f,0xe5aaaa4f
-	DD	0x16fbfbed,0x16fbfbed
-	DD	0xc5434386,0xc5434386
-	DD	0xd74d4d9a,0xd74d4d9a
-	DD	0x55333366,0x55333366
-	DD	0x94858511,0x94858511
-	DD	0xcf45458a,0xcf45458a
-	DD	0x10f9f9e9,0x10f9f9e9
-	DD	0x06020204,0x06020204
-	DD	0x817f7ffe,0x817f7ffe
-	DD	0xf05050a0,0xf05050a0
-	DD	0x443c3c78,0x443c3c78
-	DD	0xba9f9f25,0xba9f9f25
-	DD	0xe3a8a84b,0xe3a8a84b
-	DD	0xf35151a2,0xf35151a2
-	DD	0xfea3a35d,0xfea3a35d
-	DD	0xc0404080,0xc0404080
-	DD	0x8a8f8f05,0x8a8f8f05
-	DD	0xad92923f,0xad92923f
-	DD	0xbc9d9d21,0xbc9d9d21
-	DD	0x48383870,0x48383870
-	DD	0x04f5f5f1,0x04f5f5f1
-	DD	0xdfbcbc63,0xdfbcbc63
-	DD	0xc1b6b677,0xc1b6b677
-	DD	0x75dadaaf,0x75dadaaf
-	DD	0x63212142,0x63212142
-	DD	0x30101020,0x30101020
-	DD	0x1affffe5,0x1affffe5
-	DD	0x0ef3f3fd,0x0ef3f3fd
-	DD	0x6dd2d2bf,0x6dd2d2bf
-	DD	0x4ccdcd81,0x4ccdcd81
-	DD	0x140c0c18,0x140c0c18
-	DD	0x35131326,0x35131326
-	DD	0x2fececc3,0x2fececc3
-	DD	0xe15f5fbe,0xe15f5fbe
-	DD	0xa2979735,0xa2979735
-	DD	0xcc444488,0xcc444488
-	DD	0x3917172e,0x3917172e
-	DD	0x57c4c493,0x57c4c493
-	DD	0xf2a7a755,0xf2a7a755
-	DD	0x827e7efc,0x827e7efc
-	DD	0x473d3d7a,0x473d3d7a
-	DD	0xac6464c8,0xac6464c8
-	DD	0xe75d5dba,0xe75d5dba
-	DD	0x2b191932,0x2b191932
-	DD	0x957373e6,0x957373e6
-	DD	0xa06060c0,0xa06060c0
-	DD	0x98818119,0x98818119
-	DD	0xd14f4f9e,0xd14f4f9e
-	DD	0x7fdcdca3,0x7fdcdca3
-	DD	0x66222244,0x66222244
-	DD	0x7e2a2a54,0x7e2a2a54
-	DD	0xab90903b,0xab90903b
-	DD	0x8388880b,0x8388880b
-	DD	0xca46468c,0xca46468c
-	DD	0x29eeeec7,0x29eeeec7
-	DD	0xd3b8b86b,0xd3b8b86b
-	DD	0x3c141428,0x3c141428
-	DD	0x79dedea7,0x79dedea7
-	DD	0xe25e5ebc,0xe25e5ebc
-	DD	0x1d0b0b16,0x1d0b0b16
-	DD	0x76dbdbad,0x76dbdbad
-	DD	0x3be0e0db,0x3be0e0db
-	DD	0x56323264,0x56323264
-	DD	0x4e3a3a74,0x4e3a3a74
-	DD	0x1e0a0a14,0x1e0a0a14
-	DD	0xdb494992,0xdb494992
-	DD	0x0a06060c,0x0a06060c
-	DD	0x6c242448,0x6c242448
-	DD	0xe45c5cb8,0xe45c5cb8
-	DD	0x5dc2c29f,0x5dc2c29f
-	DD	0x6ed3d3bd,0x6ed3d3bd
-	DD	0xefacac43,0xefacac43
-	DD	0xa66262c4,0xa66262c4
-	DD	0xa8919139,0xa8919139
-	DD	0xa4959531,0xa4959531
-	DD	0x37e4e4d3,0x37e4e4d3
-	DD	0x8b7979f2,0x8b7979f2
-	DD	0x32e7e7d5,0x32e7e7d5
-	DD	0x43c8c88b,0x43c8c88b
-	DD	0x5937376e,0x5937376e
-	DD	0xb76d6dda,0xb76d6dda
-	DD	0x8c8d8d01,0x8c8d8d01
-	DD	0x64d5d5b1,0x64d5d5b1
-	DD	0xd24e4e9c,0xd24e4e9c
-	DD	0xe0a9a949,0xe0a9a949
-	DD	0xb46c6cd8,0xb46c6cd8
-	DD	0xfa5656ac,0xfa5656ac
-	DD	0x07f4f4f3,0x07f4f4f3
-	DD	0x25eaeacf,0x25eaeacf
-	DD	0xaf6565ca,0xaf6565ca
-	DD	0x8e7a7af4,0x8e7a7af4
-	DD	0xe9aeae47,0xe9aeae47
-	DD	0x18080810,0x18080810
-	DD	0xd5baba6f,0xd5baba6f
-	DD	0x887878f0,0x887878f0
-	DD	0x6f25254a,0x6f25254a
-	DD	0x722e2e5c,0x722e2e5c
-	DD	0x241c1c38,0x241c1c38
-	DD	0xf1a6a657,0xf1a6a657
-	DD	0xc7b4b473,0xc7b4b473
-	DD	0x51c6c697,0x51c6c697
-	DD	0x23e8e8cb,0x23e8e8cb
-	DD	0x7cdddda1,0x7cdddda1
-	DD	0x9c7474e8,0x9c7474e8
-	DD	0x211f1f3e,0x211f1f3e
-	DD	0xdd4b4b96,0xdd4b4b96
-	DD	0xdcbdbd61,0xdcbdbd61
-	DD	0x868b8b0d,0x868b8b0d
-	DD	0x858a8a0f,0x858a8a0f
-	DD	0x907070e0,0x907070e0
-	DD	0x423e3e7c,0x423e3e7c
-	DD	0xc4b5b571,0xc4b5b571
-	DD	0xaa6666cc,0xaa6666cc
-	DD	0xd8484890,0xd8484890
-	DD	0x05030306,0x05030306
-	DD	0x01f6f6f7,0x01f6f6f7
-	DD	0x120e0e1c,0x120e0e1c
-	DD	0xa36161c2,0xa36161c2
-	DD	0x5f35356a,0x5f35356a
-	DD	0xf95757ae,0xf95757ae
-	DD	0xd0b9b969,0xd0b9b969
-	DD	0x91868617,0x91868617
-	DD	0x58c1c199,0x58c1c199
-	DD	0x271d1d3a,0x271d1d3a
-	DD	0xb99e9e27,0xb99e9e27
-	DD	0x38e1e1d9,0x38e1e1d9
-	DD	0x13f8f8eb,0x13f8f8eb
-	DD	0xb398982b,0xb398982b
-	DD	0x33111122,0x33111122
-	DD	0xbb6969d2,0xbb6969d2
-	DD	0x70d9d9a9,0x70d9d9a9
-	DD	0x898e8e07,0x898e8e07
-	DD	0xa7949433,0xa7949433
-	DD	0xb69b9b2d,0xb69b9b2d
-	DD	0x221e1e3c,0x221e1e3c
-	DD	0x92878715,0x92878715
-	DD	0x20e9e9c9,0x20e9e9c9
-	DD	0x49cece87,0x49cece87
-	DD	0xff5555aa,0xff5555aa
-	DD	0x78282850,0x78282850
-	DD	0x7adfdfa5,0x7adfdfa5
-	DD	0x8f8c8c03,0x8f8c8c03
-	DD	0xf8a1a159,0xf8a1a159
-	DD	0x80898909,0x80898909
-	DD	0x170d0d1a,0x170d0d1a
-	DD	0xdabfbf65,0xdabfbf65
-	DD	0x31e6e6d7,0x31e6e6d7
-	DD	0xc6424284,0xc6424284
-	DD	0xb86868d0,0xb86868d0
-	DD	0xc3414182,0xc3414182
-	DD	0xb0999929,0xb0999929
-	DD	0x772d2d5a,0x772d2d5a
-	DD	0x110f0f1e,0x110f0f1e
-	DD	0xcbb0b07b,0xcbb0b07b
-	DD	0xfc5454a8,0xfc5454a8
-	DD	0xd6bbbb6d,0xd6bbbb6d
-	DD	0x3a16162c,0x3a16162c
-DB	0x63,0x7c,0x77,0x7b,0xf2,0x6b,0x6f,0xc5
-DB	0x30,0x01,0x67,0x2b,0xfe,0xd7,0xab,0x76
-DB	0xca,0x82,0xc9,0x7d,0xfa,0x59,0x47,0xf0
-DB	0xad,0xd4,0xa2,0xaf,0x9c,0xa4,0x72,0xc0
-DB	0xb7,0xfd,0x93,0x26,0x36,0x3f,0xf7,0xcc
-DB	0x34,0xa5,0xe5,0xf1,0x71,0xd8,0x31,0x15
-DB	0x04,0xc7,0x23,0xc3,0x18,0x96,0x05,0x9a
-DB	0x07,0x12,0x80,0xe2,0xeb,0x27,0xb2,0x75
-DB	0x09,0x83,0x2c,0x1a,0x1b,0x6e,0x5a,0xa0
-DB	0x52,0x3b,0xd6,0xb3,0x29,0xe3,0x2f,0x84
-DB	0x53,0xd1,0x00,0xed,0x20,0xfc,0xb1,0x5b
-DB	0x6a,0xcb,0xbe,0x39,0x4a,0x4c,0x58,0xcf
-DB	0xd0,0xef,0xaa,0xfb,0x43,0x4d,0x33,0x85
-DB	0x45,0xf9,0x02,0x7f,0x50,0x3c,0x9f,0xa8
-DB	0x51,0xa3,0x40,0x8f,0x92,0x9d,0x38,0xf5
-DB	0xbc,0xb6,0xda,0x21,0x10,0xff,0xf3,0xd2
-DB	0xcd,0x0c,0x13,0xec,0x5f,0x97,0x44,0x17
-DB	0xc4,0xa7,0x7e,0x3d,0x64,0x5d,0x19,0x73
-DB	0x60,0x81,0x4f,0xdc,0x22,0x2a,0x90,0x88
-DB	0x46,0xee,0xb8,0x14,0xde,0x5e,0x0b,0xdb
-DB	0xe0,0x32,0x3a,0x0a,0x49,0x06,0x24,0x5c
-DB	0xc2,0xd3,0xac,0x62,0x91,0x95,0xe4,0x79
-DB	0xe7,0xc8,0x37,0x6d,0x8d,0xd5,0x4e,0xa9
-DB	0x6c,0x56,0xf4,0xea,0x65,0x7a,0xae,0x08
-DB	0xba,0x78,0x25,0x2e,0x1c,0xa6,0xb4,0xc6
-DB	0xe8,0xdd,0x74,0x1f,0x4b,0xbd,0x8b,0x8a
-DB	0x70,0x3e,0xb5,0x66,0x48,0x03,0xf6,0x0e
-DB	0x61,0x35,0x57,0xb9,0x86,0xc1,0x1d,0x9e
-DB	0xe1,0xf8,0x98,0x11,0x69,0xd9,0x8e,0x94
-DB	0x9b,0x1e,0x87,0xe9,0xce,0x55,0x28,0xdf
-DB	0x8c,0xa1,0x89,0x0d,0xbf,0xe6,0x42,0x68
-DB	0x41,0x99,0x2d,0x0f,0xb0,0x54,0xbb,0x16
-DB	0x63,0x7c,0x77,0x7b,0xf2,0x6b,0x6f,0xc5
-DB	0x30,0x01,0x67,0x2b,0xfe,0xd7,0xab,0x76
-DB	0xca,0x82,0xc9,0x7d,0xfa,0x59,0x47,0xf0
-DB	0xad,0xd4,0xa2,0xaf,0x9c,0xa4,0x72,0xc0
-DB	0xb7,0xfd,0x93,0x26,0x36,0x3f,0xf7,0xcc
-DB	0x34,0xa5,0xe5,0xf1,0x71,0xd8,0x31,0x15
-DB	0x04,0xc7,0x23,0xc3,0x18,0x96,0x05,0x9a
-DB	0x07,0x12,0x80,0xe2,0xeb,0x27,0xb2,0x75
-DB	0x09,0x83,0x2c,0x1a,0x1b,0x6e,0x5a,0xa0
-DB	0x52,0x3b,0xd6,0xb3,0x29,0xe3,0x2f,0x84
-DB	0x53,0xd1,0x00,0xed,0x20,0xfc,0xb1,0x5b
-DB	0x6a,0xcb,0xbe,0x39,0x4a,0x4c,0x58,0xcf
-DB	0xd0,0xef,0xaa,0xfb,0x43,0x4d,0x33,0x85
-DB	0x45,0xf9,0x02,0x7f,0x50,0x3c,0x9f,0xa8
-DB	0x51,0xa3,0x40,0x8f,0x92,0x9d,0x38,0xf5
-DB	0xbc,0xb6,0xda,0x21,0x10,0xff,0xf3,0xd2
-DB	0xcd,0x0c,0x13,0xec,0x5f,0x97,0x44,0x17
-DB	0xc4,0xa7,0x7e,0x3d,0x64,0x5d,0x19,0x73
-DB	0x60,0x81,0x4f,0xdc,0x22,0x2a,0x90,0x88
-DB	0x46,0xee,0xb8,0x14,0xde,0x5e,0x0b,0xdb
-DB	0xe0,0x32,0x3a,0x0a,0x49,0x06,0x24,0x5c
-DB	0xc2,0xd3,0xac,0x62,0x91,0x95,0xe4,0x79
-DB	0xe7,0xc8,0x37,0x6d,0x8d,0xd5,0x4e,0xa9
-DB	0x6c,0x56,0xf4,0xea,0x65,0x7a,0xae,0x08
-DB	0xba,0x78,0x25,0x2e,0x1c,0xa6,0xb4,0xc6
-DB	0xe8,0xdd,0x74,0x1f,0x4b,0xbd,0x8b,0x8a
-DB	0x70,0x3e,0xb5,0x66,0x48,0x03,0xf6,0x0e
-DB	0x61,0x35,0x57,0xb9,0x86,0xc1,0x1d,0x9e
-DB	0xe1,0xf8,0x98,0x11,0x69,0xd9,0x8e,0x94
-DB	0x9b,0x1e,0x87,0xe9,0xce,0x55,0x28,0xdf
-DB	0x8c,0xa1,0x89,0x0d,0xbf,0xe6,0x42,0x68
-DB	0x41,0x99,0x2d,0x0f,0xb0,0x54,0xbb,0x16
-DB	0x63,0x7c,0x77,0x7b,0xf2,0x6b,0x6f,0xc5
-DB	0x30,0x01,0x67,0x2b,0xfe,0xd7,0xab,0x76
-DB	0xca,0x82,0xc9,0x7d,0xfa,0x59,0x47,0xf0
-DB	0xad,0xd4,0xa2,0xaf,0x9c,0xa4,0x72,0xc0
-DB	0xb7,0xfd,0x93,0x26,0x36,0x3f,0xf7,0xcc
-DB	0x34,0xa5,0xe5,0xf1,0x71,0xd8,0x31,0x15
-DB	0x04,0xc7,0x23,0xc3,0x18,0x96,0x05,0x9a
-DB	0x07,0x12,0x80,0xe2,0xeb,0x27,0xb2,0x75
-DB	0x09,0x83,0x2c,0x1a,0x1b,0x6e,0x5a,0xa0
-DB	0x52,0x3b,0xd6,0xb3,0x29,0xe3,0x2f,0x84
-DB	0x53,0xd1,0x00,0xed,0x20,0xfc,0xb1,0x5b
-DB	0x6a,0xcb,0xbe,0x39,0x4a,0x4c,0x58,0xcf
-DB	0xd0,0xef,0xaa,0xfb,0x43,0x4d,0x33,0x85
-DB	0x45,0xf9,0x02,0x7f,0x50,0x3c,0x9f,0xa8
-DB	0x51,0xa3,0x40,0x8f,0x92,0x9d,0x38,0xf5
-DB	0xbc,0xb6,0xda,0x21,0x10,0xff,0xf3,0xd2
-DB	0xcd,0x0c,0x13,0xec,0x5f,0x97,0x44,0x17
-DB	0xc4,0xa7,0x7e,0x3d,0x64,0x5d,0x19,0x73
-DB	0x60,0x81,0x4f,0xdc,0x22,0x2a,0x90,0x88
-DB	0x46,0xee,0xb8,0x14,0xde,0x5e,0x0b,0xdb
-DB	0xe0,0x32,0x3a,0x0a,0x49,0x06,0x24,0x5c
-DB	0xc2,0xd3,0xac,0x62,0x91,0x95,0xe4,0x79
-DB	0xe7,0xc8,0x37,0x6d,0x8d,0xd5,0x4e,0xa9
-DB	0x6c,0x56,0xf4,0xea,0x65,0x7a,0xae,0x08
-DB	0xba,0x78,0x25,0x2e,0x1c,0xa6,0xb4,0xc6
-DB	0xe8,0xdd,0x74,0x1f,0x4b,0xbd,0x8b,0x8a
-DB	0x70,0x3e,0xb5,0x66,0x48,0x03,0xf6,0x0e
-DB	0x61,0x35,0x57,0xb9,0x86,0xc1,0x1d,0x9e
-DB	0xe1,0xf8,0x98,0x11,0x69,0xd9,0x8e,0x94
-DB	0x9b,0x1e,0x87,0xe9,0xce,0x55,0x28,0xdf
-DB	0x8c,0xa1,0x89,0x0d,0xbf,0xe6,0x42,0x68
-DB	0x41,0x99,0x2d,0x0f,0xb0,0x54,0xbb,0x16
-DB	0x63,0x7c,0x77,0x7b,0xf2,0x6b,0x6f,0xc5
-DB	0x30,0x01,0x67,0x2b,0xfe,0xd7,0xab,0x76
-DB	0xca,0x82,0xc9,0x7d,0xfa,0x59,0x47,0xf0
-DB	0xad,0xd4,0xa2,0xaf,0x9c,0xa4,0x72,0xc0
-DB	0xb7,0xfd,0x93,0x26,0x36,0x3f,0xf7,0xcc
-DB	0x34,0xa5,0xe5,0xf1,0x71,0xd8,0x31,0x15
-DB	0x04,0xc7,0x23,0xc3,0x18,0x96,0x05,0x9a
-DB	0x07,0x12,0x80,0xe2,0xeb,0x27,0xb2,0x75
-DB	0x09,0x83,0x2c,0x1a,0x1b,0x6e,0x5a,0xa0
-DB	0x52,0x3b,0xd6,0xb3,0x29,0xe3,0x2f,0x84
-DB	0x53,0xd1,0x00,0xed,0x20,0xfc,0xb1,0x5b
-DB	0x6a,0xcb,0xbe,0x39,0x4a,0x4c,0x58,0xcf
-DB	0xd0,0xef,0xaa,0xfb,0x43,0x4d,0x33,0x85
-DB	0x45,0xf9,0x02,0x7f,0x50,0x3c,0x9f,0xa8
-DB	0x51,0xa3,0x40,0x8f,0x92,0x9d,0x38,0xf5
-DB	0xbc,0xb6,0xda,0x21,0x10,0xff,0xf3,0xd2
-DB	0xcd,0x0c,0x13,0xec,0x5f,0x97,0x44,0x17
-DB	0xc4,0xa7,0x7e,0x3d,0x64,0x5d,0x19,0x73
-DB	0x60,0x81,0x4f,0xdc,0x22,0x2a,0x90,0x88
-DB	0x46,0xee,0xb8,0x14,0xde,0x5e,0x0b,0xdb
-DB	0xe0,0x32,0x3a,0x0a,0x49,0x06,0x24,0x5c
-DB	0xc2,0xd3,0xac,0x62,0x91,0x95,0xe4,0x79
-DB	0xe7,0xc8,0x37,0x6d,0x8d,0xd5,0x4e,0xa9
-DB	0x6c,0x56,0xf4,0xea,0x65,0x7a,0xae,0x08
-DB	0xba,0x78,0x25,0x2e,0x1c,0xa6,0xb4,0xc6
-DB	0xe8,0xdd,0x74,0x1f,0x4b,0xbd,0x8b,0x8a
-DB	0x70,0x3e,0xb5,0x66,0x48,0x03,0xf6,0x0e
-DB	0x61,0x35,0x57,0xb9,0x86,0xc1,0x1d,0x9e
-DB	0xe1,0xf8,0x98,0x11,0x69,0xd9,0x8e,0x94
-DB	0x9b,0x1e,0x87,0xe9,0xce,0x55,0x28,0xdf
-DB	0x8c,0xa1,0x89,0x0d,0xbf,0xe6,0x42,0x68
-DB	0x41,0x99,0x2d,0x0f,0xb0,0x54,0xbb,0x16
-	DD	0x00000001,0x00000002,0x00000004,0x00000008
-	DD	0x00000010,0x00000020,0x00000040,0x00000080
-	DD	0x0000001b,0x00000036,0x80808080,0x80808080
-	DD	0xfefefefe,0xfefefefe,0x1b1b1b1b,0x1b1b1b1b
-ALIGN	64
-$L$AES_Td:
-	DD	0x50a7f451,0x50a7f451
-	DD	0x5365417e,0x5365417e
-	DD	0xc3a4171a,0xc3a4171a
-	DD	0x965e273a,0x965e273a
-	DD	0xcb6bab3b,0xcb6bab3b
-	DD	0xf1459d1f,0xf1459d1f
-	DD	0xab58faac,0xab58faac
-	DD	0x9303e34b,0x9303e34b
-	DD	0x55fa3020,0x55fa3020
-	DD	0xf66d76ad,0xf66d76ad
-	DD	0x9176cc88,0x9176cc88
-	DD	0x254c02f5,0x254c02f5
-	DD	0xfcd7e54f,0xfcd7e54f
-	DD	0xd7cb2ac5,0xd7cb2ac5
-	DD	0x80443526,0x80443526
-	DD	0x8fa362b5,0x8fa362b5
-	DD	0x495ab1de,0x495ab1de
-	DD	0x671bba25,0x671bba25
-	DD	0x980eea45,0x980eea45
-	DD	0xe1c0fe5d,0xe1c0fe5d
-	DD	0x02752fc3,0x02752fc3
-	DD	0x12f04c81,0x12f04c81
-	DD	0xa397468d,0xa397468d
-	DD	0xc6f9d36b,0xc6f9d36b
-	DD	0xe75f8f03,0xe75f8f03
-	DD	0x959c9215,0x959c9215
-	DD	0xeb7a6dbf,0xeb7a6dbf
-	DD	0xda595295,0xda595295
-	DD	0x2d83bed4,0x2d83bed4
-	DD	0xd3217458,0xd3217458
-	DD	0x2969e049,0x2969e049
-	DD	0x44c8c98e,0x44c8c98e
-	DD	0x6a89c275,0x6a89c275
-	DD	0x78798ef4,0x78798ef4
-	DD	0x6b3e5899,0x6b3e5899
-	DD	0xdd71b927,0xdd71b927
-	DD	0xb64fe1be,0xb64fe1be
-	DD	0x17ad88f0,0x17ad88f0
-	DD	0x66ac20c9,0x66ac20c9
-	DD	0xb43ace7d,0xb43ace7d
-	DD	0x184adf63,0x184adf63
-	DD	0x82311ae5,0x82311ae5
-	DD	0x60335197,0x60335197
-	DD	0x457f5362,0x457f5362
-	DD	0xe07764b1,0xe07764b1
-	DD	0x84ae6bbb,0x84ae6bbb
-	DD	0x1ca081fe,0x1ca081fe
-	DD	0x942b08f9,0x942b08f9
-	DD	0x58684870,0x58684870
-	DD	0x19fd458f,0x19fd458f
-	DD	0x876cde94,0x876cde94
-	DD	0xb7f87b52,0xb7f87b52
-	DD	0x23d373ab,0x23d373ab
-	DD	0xe2024b72,0xe2024b72
-	DD	0x578f1fe3,0x578f1fe3
-	DD	0x2aab5566,0x2aab5566
-	DD	0x0728ebb2,0x0728ebb2
-	DD	0x03c2b52f,0x03c2b52f
-	DD	0x9a7bc586,0x9a7bc586
-	DD	0xa50837d3,0xa50837d3
-	DD	0xf2872830,0xf2872830
-	DD	0xb2a5bf23,0xb2a5bf23
-	DD	0xba6a0302,0xba6a0302
-	DD	0x5c8216ed,0x5c8216ed
-	DD	0x2b1ccf8a,0x2b1ccf8a
-	DD	0x92b479a7,0x92b479a7
-	DD	0xf0f207f3,0xf0f207f3
-	DD	0xa1e2694e,0xa1e2694e
-	DD	0xcdf4da65,0xcdf4da65
-	DD	0xd5be0506,0xd5be0506
-	DD	0x1f6234d1,0x1f6234d1
-	DD	0x8afea6c4,0x8afea6c4
-	DD	0x9d532e34,0x9d532e34
-	DD	0xa055f3a2,0xa055f3a2
-	DD	0x32e18a05,0x32e18a05
-	DD	0x75ebf6a4,0x75ebf6a4
-	DD	0x39ec830b,0x39ec830b
-	DD	0xaaef6040,0xaaef6040
-	DD	0x069f715e,0x069f715e
-	DD	0x51106ebd,0x51106ebd
-	DD	0xf98a213e,0xf98a213e
-	DD	0x3d06dd96,0x3d06dd96
-	DD	0xae053edd,0xae053edd
-	DD	0x46bde64d,0x46bde64d
-	DD	0xb58d5491,0xb58d5491
-	DD	0x055dc471,0x055dc471
-	DD	0x6fd40604,0x6fd40604
-	DD	0xff155060,0xff155060
-	DD	0x24fb9819,0x24fb9819
-	DD	0x97e9bdd6,0x97e9bdd6
-	DD	0xcc434089,0xcc434089
-	DD	0x779ed967,0x779ed967
-	DD	0xbd42e8b0,0xbd42e8b0
-	DD	0x888b8907,0x888b8907
-	DD	0x385b19e7,0x385b19e7
-	DD	0xdbeec879,0xdbeec879
-	DD	0x470a7ca1,0x470a7ca1
-	DD	0xe90f427c,0xe90f427c
-	DD	0xc91e84f8,0xc91e84f8
-	DD	0x00000000,0x00000000
-	DD	0x83868009,0x83868009
-	DD	0x48ed2b32,0x48ed2b32
-	DD	0xac70111e,0xac70111e
-	DD	0x4e725a6c,0x4e725a6c
-	DD	0xfbff0efd,0xfbff0efd
-	DD	0x5638850f,0x5638850f
-	DD	0x1ed5ae3d,0x1ed5ae3d
-	DD	0x27392d36,0x27392d36
-	DD	0x64d90f0a,0x64d90f0a
-	DD	0x21a65c68,0x21a65c68
-	DD	0xd1545b9b,0xd1545b9b
-	DD	0x3a2e3624,0x3a2e3624
-	DD	0xb1670a0c,0xb1670a0c
-	DD	0x0fe75793,0x0fe75793
-	DD	0xd296eeb4,0xd296eeb4
-	DD	0x9e919b1b,0x9e919b1b
-	DD	0x4fc5c080,0x4fc5c080
-	DD	0xa220dc61,0xa220dc61
-	DD	0x694b775a,0x694b775a
-	DD	0x161a121c,0x161a121c
-	DD	0x0aba93e2,0x0aba93e2
-	DD	0xe52aa0c0,0xe52aa0c0
-	DD	0x43e0223c,0x43e0223c
-	DD	0x1d171b12,0x1d171b12
-	DD	0x0b0d090e,0x0b0d090e
-	DD	0xadc78bf2,0xadc78bf2
-	DD	0xb9a8b62d,0xb9a8b62d
-	DD	0xc8a91e14,0xc8a91e14
-	DD	0x8519f157,0x8519f157
-	DD	0x4c0775af,0x4c0775af
-	DD	0xbbdd99ee,0xbbdd99ee
-	DD	0xfd607fa3,0xfd607fa3
-	DD	0x9f2601f7,0x9f2601f7
-	DD	0xbcf5725c,0xbcf5725c
-	DD	0xc53b6644,0xc53b6644
-	DD	0x347efb5b,0x347efb5b
-	DD	0x7629438b,0x7629438b
-	DD	0xdcc623cb,0xdcc623cb
-	DD	0x68fcedb6,0x68fcedb6
-	DD	0x63f1e4b8,0x63f1e4b8
-	DD	0xcadc31d7,0xcadc31d7
-	DD	0x10856342,0x10856342
-	DD	0x40229713,0x40229713
-	DD	0x2011c684,0x2011c684
-	DD	0x7d244a85,0x7d244a85
-	DD	0xf83dbbd2,0xf83dbbd2
-	DD	0x1132f9ae,0x1132f9ae
-	DD	0x6da129c7,0x6da129c7
-	DD	0x4b2f9e1d,0x4b2f9e1d
-	DD	0xf330b2dc,0xf330b2dc
-	DD	0xec52860d,0xec52860d
-	DD	0xd0e3c177,0xd0e3c177
-	DD	0x6c16b32b,0x6c16b32b
-	DD	0x99b970a9,0x99b970a9
-	DD	0xfa489411,0xfa489411
-	DD	0x2264e947,0x2264e947
-	DD	0xc48cfca8,0xc48cfca8
-	DD	0x1a3ff0a0,0x1a3ff0a0
-	DD	0xd82c7d56,0xd82c7d56
-	DD	0xef903322,0xef903322
-	DD	0xc74e4987,0xc74e4987
-	DD	0xc1d138d9,0xc1d138d9
-	DD	0xfea2ca8c,0xfea2ca8c
-	DD	0x360bd498,0x360bd498
-	DD	0xcf81f5a6,0xcf81f5a6
-	DD	0x28de7aa5,0x28de7aa5
-	DD	0x268eb7da,0x268eb7da
-	DD	0xa4bfad3f,0xa4bfad3f
-	DD	0xe49d3a2c,0xe49d3a2c
-	DD	0x0d927850,0x0d927850
-	DD	0x9bcc5f6a,0x9bcc5f6a
-	DD	0x62467e54,0x62467e54
-	DD	0xc2138df6,0xc2138df6
-	DD	0xe8b8d890,0xe8b8d890
-	DD	0x5ef7392e,0x5ef7392e
-	DD	0xf5afc382,0xf5afc382
-	DD	0xbe805d9f,0xbe805d9f
-	DD	0x7c93d069,0x7c93d069
-	DD	0xa92dd56f,0xa92dd56f
-	DD	0xb31225cf,0xb31225cf
-	DD	0x3b99acc8,0x3b99acc8
-	DD	0xa77d1810,0xa77d1810
-	DD	0x6e639ce8,0x6e639ce8
-	DD	0x7bbb3bdb,0x7bbb3bdb
-	DD	0x097826cd,0x097826cd
-	DD	0xf418596e,0xf418596e
-	DD	0x01b79aec,0x01b79aec
-	DD	0xa89a4f83,0xa89a4f83
-	DD	0x656e95e6,0x656e95e6
-	DD	0x7ee6ffaa,0x7ee6ffaa
-	DD	0x08cfbc21,0x08cfbc21
-	DD	0xe6e815ef,0xe6e815ef
-	DD	0xd99be7ba,0xd99be7ba
-	DD	0xce366f4a,0xce366f4a
-	DD	0xd4099fea,0xd4099fea
-	DD	0xd67cb029,0xd67cb029
-	DD	0xafb2a431,0xafb2a431
-	DD	0x31233f2a,0x31233f2a
-	DD	0x3094a5c6,0x3094a5c6
-	DD	0xc066a235,0xc066a235
-	DD	0x37bc4e74,0x37bc4e74
-	DD	0xa6ca82fc,0xa6ca82fc
-	DD	0xb0d090e0,0xb0d090e0
-	DD	0x15d8a733,0x15d8a733
-	DD	0x4a9804f1,0x4a9804f1
-	DD	0xf7daec41,0xf7daec41
-	DD	0x0e50cd7f,0x0e50cd7f
-	DD	0x2ff69117,0x2ff69117
-	DD	0x8dd64d76,0x8dd64d76
-	DD	0x4db0ef43,0x4db0ef43
-	DD	0x544daacc,0x544daacc
-	DD	0xdf0496e4,0xdf0496e4
-	DD	0xe3b5d19e,0xe3b5d19e
-	DD	0x1b886a4c,0x1b886a4c
-	DD	0xb81f2cc1,0xb81f2cc1
-	DD	0x7f516546,0x7f516546
-	DD	0x04ea5e9d,0x04ea5e9d
-	DD	0x5d358c01,0x5d358c01
-	DD	0x737487fa,0x737487fa
-	DD	0x2e410bfb,0x2e410bfb
-	DD	0x5a1d67b3,0x5a1d67b3
-	DD	0x52d2db92,0x52d2db92
-	DD	0x335610e9,0x335610e9
-	DD	0x1347d66d,0x1347d66d
-	DD	0x8c61d79a,0x8c61d79a
-	DD	0x7a0ca137,0x7a0ca137
-	DD	0x8e14f859,0x8e14f859
-	DD	0x893c13eb,0x893c13eb
-	DD	0xee27a9ce,0xee27a9ce
-	DD	0x35c961b7,0x35c961b7
-	DD	0xede51ce1,0xede51ce1
-	DD	0x3cb1477a,0x3cb1477a
-	DD	0x59dfd29c,0x59dfd29c
-	DD	0x3f73f255,0x3f73f255
-	DD	0x79ce1418,0x79ce1418
-	DD	0xbf37c773,0xbf37c773
-	DD	0xeacdf753,0xeacdf753
-	DD	0x5baafd5f,0x5baafd5f
-	DD	0x146f3ddf,0x146f3ddf
-	DD	0x86db4478,0x86db4478
-	DD	0x81f3afca,0x81f3afca
-	DD	0x3ec468b9,0x3ec468b9
-	DD	0x2c342438,0x2c342438
-	DD	0x5f40a3c2,0x5f40a3c2
-	DD	0x72c31d16,0x72c31d16
-	DD	0x0c25e2bc,0x0c25e2bc
-	DD	0x8b493c28,0x8b493c28
-	DD	0x41950dff,0x41950dff
-	DD	0x7101a839,0x7101a839
-	DD	0xdeb30c08,0xdeb30c08
-	DD	0x9ce4b4d8,0x9ce4b4d8
-	DD	0x90c15664,0x90c15664
-	DD	0x6184cb7b,0x6184cb7b
-	DD	0x70b632d5,0x70b632d5
-	DD	0x745c6c48,0x745c6c48
-	DD	0x4257b8d0,0x4257b8d0
-DB	0x52,0x09,0x6a,0xd5,0x30,0x36,0xa5,0x38
-DB	0xbf,0x40,0xa3,0x9e,0x81,0xf3,0xd7,0xfb
-DB	0x7c,0xe3,0x39,0x82,0x9b,0x2f,0xff,0x87
-DB	0x34,0x8e,0x43,0x44,0xc4,0xde,0xe9,0xcb
-DB	0x54,0x7b,0x94,0x32,0xa6,0xc2,0x23,0x3d
-DB	0xee,0x4c,0x95,0x0b,0x42,0xfa,0xc3,0x4e
-DB	0x08,0x2e,0xa1,0x66,0x28,0xd9,0x24,0xb2
-DB	0x76,0x5b,0xa2,0x49,0x6d,0x8b,0xd1,0x25
-DB	0x72,0xf8,0xf6,0x64,0x86,0x68,0x98,0x16
-DB	0xd4,0xa4,0x5c,0xcc,0x5d,0x65,0xb6,0x92
-DB	0x6c,0x70,0x48,0x50,0xfd,0xed,0xb9,0xda
-DB	0x5e,0x15,0x46,0x57,0xa7,0x8d,0x9d,0x84
-DB	0x90,0xd8,0xab,0x00,0x8c,0xbc,0xd3,0x0a
-DB	0xf7,0xe4,0x58,0x05,0xb8,0xb3,0x45,0x06
-DB	0xd0,0x2c,0x1e,0x8f,0xca,0x3f,0x0f,0x02
-DB	0xc1,0xaf,0xbd,0x03,0x01,0x13,0x8a,0x6b
-DB	0x3a,0x91,0x11,0x41,0x4f,0x67,0xdc,0xea
-DB	0x97,0xf2,0xcf,0xce,0xf0,0xb4,0xe6,0x73
-DB	0x96,0xac,0x74,0x22,0xe7,0xad,0x35,0x85
-DB	0xe2,0xf9,0x37,0xe8,0x1c,0x75,0xdf,0x6e
-DB	0x47,0xf1,0x1a,0x71,0x1d,0x29,0xc5,0x89
-DB	0x6f,0xb7,0x62,0x0e,0xaa,0x18,0xbe,0x1b
-DB	0xfc,0x56,0x3e,0x4b,0xc6,0xd2,0x79,0x20
-DB	0x9a,0xdb,0xc0,0xfe,0x78,0xcd,0x5a,0xf4
-DB	0x1f,0xdd,0xa8,0x33,0x88,0x07,0xc7,0x31
-DB	0xb1,0x12,0x10,0x59,0x27,0x80,0xec,0x5f
-DB	0x60,0x51,0x7f,0xa9,0x19,0xb5,0x4a,0x0d
-DB	0x2d,0xe5,0x7a,0x9f,0x93,0xc9,0x9c,0xef
-DB	0xa0,0xe0,0x3b,0x4d,0xae,0x2a,0xf5,0xb0
-DB	0xc8,0xeb,0xbb,0x3c,0x83,0x53,0x99,0x61
-DB	0x17,0x2b,0x04,0x7e,0xba,0x77,0xd6,0x26
-DB	0xe1,0x69,0x14,0x63,0x55,0x21,0x0c,0x7d
-	DD	0x80808080,0x80808080,0xfefefefe,0xfefefefe
-	DD	0x1b1b1b1b,0x1b1b1b1b,0,0
-DB	0x52,0x09,0x6a,0xd5,0x30,0x36,0xa5,0x38
-DB	0xbf,0x40,0xa3,0x9e,0x81,0xf3,0xd7,0xfb
-DB	0x7c,0xe3,0x39,0x82,0x9b,0x2f,0xff,0x87
-DB	0x34,0x8e,0x43,0x44,0xc4,0xde,0xe9,0xcb
-DB	0x54,0x7b,0x94,0x32,0xa6,0xc2,0x23,0x3d
-DB	0xee,0x4c,0x95,0x0b,0x42,0xfa,0xc3,0x4e
-DB	0x08,0x2e,0xa1,0x66,0x28,0xd9,0x24,0xb2
-DB	0x76,0x5b,0xa2,0x49,0x6d,0x8b,0xd1,0x25
-DB	0x72,0xf8,0xf6,0x64,0x86,0x68,0x98,0x16
-DB	0xd4,0xa4,0x5c,0xcc,0x5d,0x65,0xb6,0x92
-DB	0x6c,0x70,0x48,0x50,0xfd,0xed,0xb9,0xda
-DB	0x5e,0x15,0x46,0x57,0xa7,0x8d,0x9d,0x84
-DB	0x90,0xd8,0xab,0x00,0x8c,0xbc,0xd3,0x0a
-DB	0xf7,0xe4,0x58,0x05,0xb8,0xb3,0x45,0x06
-DB	0xd0,0x2c,0x1e,0x8f,0xca,0x3f,0x0f,0x02
-DB	0xc1,0xaf,0xbd,0x03,0x01,0x13,0x8a,0x6b
-DB	0x3a,0x91,0x11,0x41,0x4f,0x67,0xdc,0xea
-DB	0x97,0xf2,0xcf,0xce,0xf0,0xb4,0xe6,0x73
-DB	0x96,0xac,0x74,0x22,0xe7,0xad,0x35,0x85
-DB	0xe2,0xf9,0x37,0xe8,0x1c,0x75,0xdf,0x6e
-DB	0x47,0xf1,0x1a,0x71,0x1d,0x29,0xc5,0x89
-DB	0x6f,0xb7,0x62,0x0e,0xaa,0x18,0xbe,0x1b
-DB	0xfc,0x56,0x3e,0x4b,0xc6,0xd2,0x79,0x20
-DB	0x9a,0xdb,0xc0,0xfe,0x78,0xcd,0x5a,0xf4
-DB	0x1f,0xdd,0xa8,0x33,0x88,0x07,0xc7,0x31
-DB	0xb1,0x12,0x10,0x59,0x27,0x80,0xec,0x5f
-DB	0x60,0x51,0x7f,0xa9,0x19,0xb5,0x4a,0x0d
-DB	0x2d,0xe5,0x7a,0x9f,0x93,0xc9,0x9c,0xef
-DB	0xa0,0xe0,0x3b,0x4d,0xae,0x2a,0xf5,0xb0
-DB	0xc8,0xeb,0xbb,0x3c,0x83,0x53,0x99,0x61
-DB	0x17,0x2b,0x04,0x7e,0xba,0x77,0xd6,0x26
-DB	0xe1,0x69,0x14,0x63,0x55,0x21,0x0c,0x7d
-	DD	0x80808080,0x80808080,0xfefefefe,0xfefefefe
-	DD	0x1b1b1b1b,0x1b1b1b1b,0,0
-DB	0x52,0x09,0x6a,0xd5,0x30,0x36,0xa5,0x38
-DB	0xbf,0x40,0xa3,0x9e,0x81,0xf3,0xd7,0xfb
-DB	0x7c,0xe3,0x39,0x82,0x9b,0x2f,0xff,0x87
-DB	0x34,0x8e,0x43,0x44,0xc4,0xde,0xe9,0xcb
-DB	0x54,0x7b,0x94,0x32,0xa6,0xc2,0x23,0x3d
-DB	0xee,0x4c,0x95,0x0b,0x42,0xfa,0xc3,0x4e
-DB	0x08,0x2e,0xa1,0x66,0x28,0xd9,0x24,0xb2
-DB	0x76,0x5b,0xa2,0x49,0x6d,0x8b,0xd1,0x25
-DB	0x72,0xf8,0xf6,0x64,0x86,0x68,0x98,0x16
-DB	0xd4,0xa4,0x5c,0xcc,0x5d,0x65,0xb6,0x92
-DB	0x6c,0x70,0x48,0x50,0xfd,0xed,0xb9,0xda
-DB	0x5e,0x15,0x46,0x57,0xa7,0x8d,0x9d,0x84
-DB	0x90,0xd8,0xab,0x00,0x8c,0xbc,0xd3,0x0a
-DB	0xf7,0xe4,0x58,0x05,0xb8,0xb3,0x45,0x06
-DB	0xd0,0x2c,0x1e,0x8f,0xca,0x3f,0x0f,0x02
-DB	0xc1,0xaf,0xbd,0x03,0x01,0x13,0x8a,0x6b
-DB	0x3a,0x91,0x11,0x41,0x4f,0x67,0xdc,0xea
-DB	0x97,0xf2,0xcf,0xce,0xf0,0xb4,0xe6,0x73
-DB	0x96,0xac,0x74,0x22,0xe7,0xad,0x35,0x85
-DB	0xe2,0xf9,0x37,0xe8,0x1c,0x75,0xdf,0x6e
-DB	0x47,0xf1,0x1a,0x71,0x1d,0x29,0xc5,0x89
-DB	0x6f,0xb7,0x62,0x0e,0xaa,0x18,0xbe,0x1b
-DB	0xfc,0x56,0x3e,0x4b,0xc6,0xd2,0x79,0x20
-DB	0x9a,0xdb,0xc0,0xfe,0x78,0xcd,0x5a,0xf4
-DB	0x1f,0xdd,0xa8,0x33,0x88,0x07,0xc7,0x31
-DB	0xb1,0x12,0x10,0x59,0x27,0x80,0xec,0x5f
-DB	0x60,0x51,0x7f,0xa9,0x19,0xb5,0x4a,0x0d
-DB	0x2d,0xe5,0x7a,0x9f,0x93,0xc9,0x9c,0xef
-DB	0xa0,0xe0,0x3b,0x4d,0xae,0x2a,0xf5,0xb0
-DB	0xc8,0xeb,0xbb,0x3c,0x83,0x53,0x99,0x61
-DB	0x17,0x2b,0x04,0x7e,0xba,0x77,0xd6,0x26
-DB	0xe1,0x69,0x14,0x63,0x55,0x21,0x0c,0x7d
-	DD	0x80808080,0x80808080,0xfefefefe,0xfefefefe
-	DD	0x1b1b1b1b,0x1b1b1b1b,0,0
-DB	0x52,0x09,0x6a,0xd5,0x30,0x36,0xa5,0x38
-DB	0xbf,0x40,0xa3,0x9e,0x81,0xf3,0xd7,0xfb
-DB	0x7c,0xe3,0x39,0x82,0x9b,0x2f,0xff,0x87
-DB	0x34,0x8e,0x43,0x44,0xc4,0xde,0xe9,0xcb
-DB	0x54,0x7b,0x94,0x32,0xa6,0xc2,0x23,0x3d
-DB	0xee,0x4c,0x95,0x0b,0x42,0xfa,0xc3,0x4e
-DB	0x08,0x2e,0xa1,0x66,0x28,0xd9,0x24,0xb2
-DB	0x76,0x5b,0xa2,0x49,0x6d,0x8b,0xd1,0x25
-DB	0x72,0xf8,0xf6,0x64,0x86,0x68,0x98,0x16
-DB	0xd4,0xa4,0x5c,0xcc,0x5d,0x65,0xb6,0x92
-DB	0x6c,0x70,0x48,0x50,0xfd,0xed,0xb9,0xda
-DB	0x5e,0x15,0x46,0x57,0xa7,0x8d,0x9d,0x84
-DB	0x90,0xd8,0xab,0x00,0x8c,0xbc,0xd3,0x0a
-DB	0xf7,0xe4,0x58,0x05,0xb8,0xb3,0x45,0x06
-DB	0xd0,0x2c,0x1e,0x8f,0xca,0x3f,0x0f,0x02
-DB	0xc1,0xaf,0xbd,0x03,0x01,0x13,0x8a,0x6b
-DB	0x3a,0x91,0x11,0x41,0x4f,0x67,0xdc,0xea
-DB	0x97,0xf2,0xcf,0xce,0xf0,0xb4,0xe6,0x73
-DB	0x96,0xac,0x74,0x22,0xe7,0xad,0x35,0x85
-DB	0xe2,0xf9,0x37,0xe8,0x1c,0x75,0xdf,0x6e
-DB	0x47,0xf1,0x1a,0x71,0x1d,0x29,0xc5,0x89
-DB	0x6f,0xb7,0x62,0x0e,0xaa,0x18,0xbe,0x1b
-DB	0xfc,0x56,0x3e,0x4b,0xc6,0xd2,0x79,0x20
-DB	0x9a,0xdb,0xc0,0xfe,0x78,0xcd,0x5a,0xf4
-DB	0x1f,0xdd,0xa8,0x33,0x88,0x07,0xc7,0x31
-DB	0xb1,0x12,0x10,0x59,0x27,0x80,0xec,0x5f
-DB	0x60,0x51,0x7f,0xa9,0x19,0xb5,0x4a,0x0d
-DB	0x2d,0xe5,0x7a,0x9f,0x93,0xc9,0x9c,0xef
-DB	0xa0,0xe0,0x3b,0x4d,0xae,0x2a,0xf5,0xb0
-DB	0xc8,0xeb,0xbb,0x3c,0x83,0x53,0x99,0x61
-DB	0x17,0x2b,0x04,0x7e,0xba,0x77,0xd6,0x26
-DB	0xe1,0x69,0x14,0x63,0x55,0x21,0x0c,0x7d
-	DD	0x80808080,0x80808080,0xfefefefe,0xfefefefe
-	DD	0x1b1b1b1b,0x1b1b1b1b,0,0
-DB	65,69,83,32,102,111,114,32,120,56,54,95,54,52,44,32
-DB	67,82,89,80,84,79,71,65,77,83,32,98,121,32,60,97
-DB	112,112,114,111,64,111,112,101,110,115,115,108,46,111,114,103
-DB	62,0
-ALIGN	64
-EXTERN	__imp_RtlVirtualUnwind
-
-ALIGN	16
-block_se_handler:
-	push	rsi
-	push	rdi
-	push	rbx
-	push	rbp
-	push	r12
-	push	r13
-	push	r14
-	push	r15
-	pushfq
-	sub	rsp,64
-
-	mov	rax,QWORD[120+r8]
-	mov	rbx,QWORD[248+r8]
-
-	mov	rsi,QWORD[8+r9]
-	mov	r11,QWORD[56+r9]
-
-	mov	r10d,DWORD[r11]
-	lea	r10,[r10*1+rsi]
-	cmp	rbx,r10
-	jb	NEAR $L$in_block_prologue
-
-	mov	rax,QWORD[152+r8]
-
-	mov	r10d,DWORD[4+r11]
-	lea	r10,[r10*1+rsi]
-	cmp	rbx,r10
-	jae	NEAR $L$in_block_prologue
-
-	mov	rax,QWORD[24+rax]
-
-	mov	rbx,QWORD[((-8))+rax]
-	mov	rbp,QWORD[((-16))+rax]
-	mov	r12,QWORD[((-24))+rax]
-	mov	r13,QWORD[((-32))+rax]
-	mov	r14,QWORD[((-40))+rax]
-	mov	r15,QWORD[((-48))+rax]
-	mov	QWORD[144+r8],rbx
-	mov	QWORD[160+r8],rbp
-	mov	QWORD[216+r8],r12
-	mov	QWORD[224+r8],r13
-	mov	QWORD[232+r8],r14
-	mov	QWORD[240+r8],r15
-
-$L$in_block_prologue:
-	mov	rdi,QWORD[8+rax]
-	mov	rsi,QWORD[16+rax]
-	mov	QWORD[152+r8],rax
-	mov	QWORD[168+r8],rsi
-	mov	QWORD[176+r8],rdi
-
-	jmp	NEAR $L$common_seh_exit
-
-
-
-ALIGN	16
-key_se_handler:
-	push	rsi
-	push	rdi
-	push	rbx
-	push	rbp
-	push	r12
-	push	r13
-	push	r14
-	push	r15
-	pushfq
-	sub	rsp,64
-
-	mov	rax,QWORD[120+r8]
-	mov	rbx,QWORD[248+r8]
-
-	mov	rsi,QWORD[8+r9]
-	mov	r11,QWORD[56+r9]
-
-	mov	r10d,DWORD[r11]
-	lea	r10,[r10*1+rsi]
-	cmp	rbx,r10
-	jb	NEAR $L$in_key_prologue
-
-	mov	rax,QWORD[152+r8]
-
-	mov	r10d,DWORD[4+r11]
-	lea	r10,[r10*1+rsi]
-	cmp	rbx,r10
-	jae	NEAR $L$in_key_prologue
-
-	lea	rax,[56+rax]
-
-	mov	rbx,QWORD[((-8))+rax]
-	mov	rbp,QWORD[((-16))+rax]
-	mov	r12,QWORD[((-24))+rax]
-	mov	r13,QWORD[((-32))+rax]
-	mov	r14,QWORD[((-40))+rax]
-	mov	r15,QWORD[((-48))+rax]
-	mov	QWORD[144+r8],rbx
-	mov	QWORD[160+r8],rbp
-	mov	QWORD[216+r8],r12
-	mov	QWORD[224+r8],r13
-	mov	QWORD[232+r8],r14
-	mov	QWORD[240+r8],r15
-
-$L$in_key_prologue:
-	mov	rdi,QWORD[8+rax]
-	mov	rsi,QWORD[16+rax]
-	mov	QWORD[152+r8],rax
-	mov	QWORD[168+r8],rsi
-	mov	QWORD[176+r8],rdi
-
-	jmp	NEAR $L$common_seh_exit
-
-
-
-ALIGN	16
-cbc_se_handler:
-	push	rsi
-	push	rdi
-	push	rbx
-	push	rbp
-	push	r12
-	push	r13
-	push	r14
-	push	r15
-	pushfq
-	sub	rsp,64
-
-	mov	rax,QWORD[120+r8]
-	mov	rbx,QWORD[248+r8]
-
-	lea	r10,[$L$cbc_prologue]
-	cmp	rbx,r10
-	jb	NEAR $L$in_cbc_prologue
-
-	lea	r10,[$L$cbc_fast_body]
-	cmp	rbx,r10
-	jb	NEAR $L$in_cbc_frame_setup
-
-	lea	r10,[$L$cbc_slow_prologue]
-	cmp	rbx,r10
-	jb	NEAR $L$in_cbc_body
-
-	lea	r10,[$L$cbc_slow_body]
-	cmp	rbx,r10
-	jb	NEAR $L$in_cbc_frame_setup
-
-$L$in_cbc_body:
-	mov	rax,QWORD[152+r8]
-
-	lea	r10,[$L$cbc_epilogue]
-	cmp	rbx,r10
-	jae	NEAR $L$in_cbc_prologue
-
-	lea	rax,[8+rax]
-
-	lea	r10,[$L$cbc_popfq]
-	cmp	rbx,r10
-	jae	NEAR $L$in_cbc_prologue
-
-	mov	rax,QWORD[8+rax]
-	lea	rax,[56+rax]
-
-$L$in_cbc_frame_setup:
-	mov	rbx,QWORD[((-16))+rax]
-	mov	rbp,QWORD[((-24))+rax]
-	mov	r12,QWORD[((-32))+rax]
-	mov	r13,QWORD[((-40))+rax]
-	mov	r14,QWORD[((-48))+rax]
-	mov	r15,QWORD[((-56))+rax]
-	mov	QWORD[144+r8],rbx
-	mov	QWORD[160+r8],rbp
-	mov	QWORD[216+r8],r12
-	mov	QWORD[224+r8],r13
-	mov	QWORD[232+r8],r14
-	mov	QWORD[240+r8],r15
-
-$L$in_cbc_prologue:
-	mov	rdi,QWORD[8+rax]
-	mov	rsi,QWORD[16+rax]
-	mov	QWORD[152+r8],rax
-	mov	QWORD[168+r8],rsi
-	mov	QWORD[176+r8],rdi
-
-$L$common_seh_exit:
-
-	mov	rdi,QWORD[40+r9]
-	mov	rsi,r8
-	mov	ecx,154
-	DD	0xa548f3fc
-
-	mov	rsi,r9
-	xor	rcx,rcx
-	mov	rdx,QWORD[8+rsi]
-	mov	r8,QWORD[rsi]
-	mov	r9,QWORD[16+rsi]
-	mov	r10,QWORD[40+rsi]
-	lea	r11,[56+rsi]
-	lea	r12,[24+rsi]
-	mov	QWORD[32+rsp],r10
-	mov	QWORD[40+rsp],r11
-	mov	QWORD[48+rsp],r12
-	mov	QWORD[56+rsp],rcx
-	call	QWORD[__imp_RtlVirtualUnwind]
-
-	mov	eax,1
-	add	rsp,64
-	popfq
-	pop	r15
-	pop	r14
-	pop	r13
-	pop	r12
-	pop	rbp
-	pop	rbx
-	pop	rdi
-	pop	rsi
-	DB	0F3h,0C3h		;repret
-
-
-section	.pdata rdata align=4
-ALIGN	4
-	DD	$L$SEH_begin_AES_encrypt wrt ..imagebase
-	DD	$L$SEH_end_AES_encrypt wrt ..imagebase
-	DD	$L$SEH_info_AES_encrypt wrt ..imagebase
-
-	DD	$L$SEH_begin_AES_decrypt wrt ..imagebase
-	DD	$L$SEH_end_AES_decrypt wrt ..imagebase
-	DD	$L$SEH_info_AES_decrypt wrt ..imagebase
-
-	DD	$L$SEH_begin_AES_set_encrypt_key wrt ..imagebase
-	DD	$L$SEH_end_AES_set_encrypt_key wrt ..imagebase
-	DD	$L$SEH_info_AES_set_encrypt_key wrt ..imagebase
-
-	DD	$L$SEH_begin_AES_set_decrypt_key wrt ..imagebase
-	DD	$L$SEH_end_AES_set_decrypt_key wrt ..imagebase
-	DD	$L$SEH_info_AES_set_decrypt_key wrt ..imagebase
-
-	DD	$L$SEH_begin_AES_cbc_encrypt wrt ..imagebase
-	DD	$L$SEH_end_AES_cbc_encrypt wrt ..imagebase
-	DD	$L$SEH_info_AES_cbc_encrypt wrt ..imagebase
-
-section	.xdata rdata align=8
-ALIGN	8
-$L$SEH_info_AES_encrypt:
-DB	9,0,0,0
-	DD	block_se_handler wrt ..imagebase
-	DD	$L$enc_prologue wrt ..imagebase,$L$enc_epilogue wrt ..imagebase
-$L$SEH_info_AES_decrypt:
-DB	9,0,0,0
-	DD	block_se_handler wrt ..imagebase
-	DD	$L$dec_prologue wrt ..imagebase,$L$dec_epilogue wrt ..imagebase
-$L$SEH_info_AES_set_encrypt_key:
-DB	9,0,0,0
-	DD	key_se_handler wrt ..imagebase
-	DD	$L$enc_key_prologue wrt ..imagebase,$L$enc_key_epilogue wrt ..imagebase
-$L$SEH_info_AES_set_decrypt_key:
-DB	9,0,0,0
-	DD	key_se_handler wrt ..imagebase
-	DD	$L$dec_key_prologue wrt ..imagebase,$L$dec_key_epilogue wrt ..imagebase
-$L$SEH_info_AES_cbc_encrypt:
-DB	9,0,0,0
-	DD	cbc_se_handler wrt ..imagebase
diff --git a/deps/openssl/config/archs/VC-WIN64A/asm/crypto/aes/aesni-sha1-x86_64.asm b/deps/openssl/config/archs/VC-WIN64A/asm/crypto/aes/aesni-sha1-x86_64.asm
index 925d1be94a..ac71215c45 100644
--- a/deps/openssl/config/archs/VC-WIN64A/asm/crypto/aes/aesni-sha1-x86_64.asm
+++ b/deps/openssl/config/archs/VC-WIN64A/asm/crypto/aes/aesni-sha1-x86_64.asm
@@ -11,6 +11,7 @@ global	aesni_cbc_sha1_enc
 ALIGN	32
 aesni_cbc_sha1_enc:
 
+
 	mov	r10d,DWORD[((OPENSSL_ia32cap_P+0))]
 	mov	r11,QWORD[((OPENSSL_ia32cap_P+4))]
 	bt	r11,61
@@ -24,6 +25,7 @@ aesni_cbc_sha1_enc:
 	DB	0F3h,0C3h		;repret
 
 
+
 ALIGN	32
 aesni_cbc_sha1_enc_ssse3:
 	mov	QWORD[8+rsp],rdi	;WIN64 prologue
@@ -2809,6 +2811,7 @@ $L$SEH_begin_aesni_cbc_sha1_enc_shaext:
 	mov	r9,QWORD[48+rsp]
 
 
+
 	mov	r10,QWORD[56+rsp]
 	lea	rsp,[((-168))+rsp]
 	movaps	XMMWORD[(-8-160)+rax],xmm6
@@ -3133,6 +3136,7 @@ $L$epilogue_shaext:
 	mov	rdi,QWORD[8+rsp]	;WIN64 epilogue
 	mov	rsi,QWORD[16+rsp]
 	DB	0F3h,0C3h		;repret
+
 $L$SEH_end_aesni_cbc_sha1_enc_shaext:
 EXTERN	__imp_RtlVirtualUnwind
 
diff --git a/deps/openssl/config/archs/VC-WIN64A/asm/crypto/aes/aesni-sha256-x86_64.asm b/deps/openssl/config/archs/VC-WIN64A/asm/crypto/aes/aesni-sha256-x86_64.asm
index b5d50c74db..17e571d38b 100644
--- a/deps/openssl/config/archs/VC-WIN64A/asm/crypto/aes/aesni-sha256-x86_64.asm
+++ b/deps/openssl/config/archs/VC-WIN64A/asm/crypto/aes/aesni-sha256-x86_64.asm
@@ -10,6 +10,7 @@ global	aesni_cbc_sha256_enc
 
 ALIGN	16
 aesni_cbc_sha256_enc:
+
 	lea	r11,[OPENSSL_ia32cap_P]
 	mov	eax,1
 	cmp	rcx,0
@@ -37,6 +38,7 @@ $L$probe:
 	DB	0F3h,0C3h		;repret
 
 
+
 ALIGN	64
 
 K256:
@@ -4128,23 +4130,25 @@ $L$ower_avx2:
 	jbe	NEAR $L$oop_avx2
 	lea	rbp,[rsp]
 
+
+
+
 $L$done_avx2:
-	lea	rsp,[rbp]
-	mov	r8,QWORD[((64+32))+rsp]
-	mov	rsi,QWORD[120+rsp]
+	mov	r8,QWORD[((64+32))+rbp]
+	mov	rsi,QWORD[((64+56))+rbp]
 
 	vmovdqu	XMMWORD[r8],xmm8
 	vzeroall
-	movaps	xmm6,XMMWORD[128+rsp]
-	movaps	xmm7,XMMWORD[144+rsp]
-	movaps	xmm8,XMMWORD[160+rsp]
-	movaps	xmm9,XMMWORD[176+rsp]
-	movaps	xmm10,XMMWORD[192+rsp]
-	movaps	xmm11,XMMWORD[208+rsp]
-	movaps	xmm12,XMMWORD[224+rsp]
-	movaps	xmm13,XMMWORD[240+rsp]
-	movaps	xmm14,XMMWORD[256+rsp]
-	movaps	xmm15,XMMWORD[272+rsp]
+	movaps	xmm6,XMMWORD[128+rbp]
+	movaps	xmm7,XMMWORD[144+rbp]
+	movaps	xmm8,XMMWORD[160+rbp]
+	movaps	xmm9,XMMWORD[176+rbp]
+	movaps	xmm10,XMMWORD[192+rbp]
+	movaps	xmm11,XMMWORD[208+rbp]
+	movaps	xmm12,XMMWORD[224+rbp]
+	movaps	xmm13,XMMWORD[240+rbp]
+	movaps	xmm14,XMMWORD[256+rbp]
+	movaps	xmm15,XMMWORD[272+rbp]
 	mov	r15,QWORD[((-48))+rsi]
 
 	mov	r14,QWORD[((-40))+rsi]
@@ -4180,6 +4184,7 @@ $L$SEH_begin_aesni_cbc_sha256_enc_shaext:
 	mov	r9,QWORD[48+rsp]
 
 
+
 	mov	r10,QWORD[56+rsp]
 	lea	rsp,[((-168))+rsp]
 	movaps	XMMWORD[(-8-160)+rax],xmm6
@@ -4555,6 +4560,7 @@ $L$epilogue_shaext:
 	mov	rdi,QWORD[8+rsp]	;WIN64 epilogue
 	mov	rsi,QWORD[16+rsp]
 	DB	0F3h,0C3h		;repret
+
 $L$SEH_end_aesni_cbc_sha256_enc_shaext:
 EXTERN	__imp_RtlVirtualUnwind
 
diff --git a/deps/openssl/config/archs/VC-WIN64A/asm/crypto/aes/aesni-x86_64.asm b/deps/openssl/config/archs/VC-WIN64A/asm/crypto/aes/aesni-x86_64.asm
index 823ba771d0..f6027245a3 100644
--- a/deps/openssl/config/archs/VC-WIN64A/asm/crypto/aes/aesni-x86_64.asm
+++ b/deps/openssl/config/archs/VC-WIN64A/asm/crypto/aes/aesni-x86_64.asm
@@ -907,6 +907,7 @@ $L$SEH_begin_aesni_ccm64_encrypt_blocks:
 	mov	r9,QWORD[48+rsp]
 
 
+
 	lea	rsp,[((-88))+rsp]
 	movaps	XMMWORD[rsp],xmm6
 	movaps	XMMWORD[16+rsp],xmm7
@@ -983,6 +984,7 @@ $L$ccm64_enc_ret:
 	mov	rdi,QWORD[8+rsp]	;WIN64 epilogue
 	mov	rsi,QWORD[16+rsp]
 	DB	0F3h,0C3h		;repret
+
 $L$SEH_end_aesni_ccm64_encrypt_blocks:
 global	aesni_ccm64_decrypt_blocks
 
@@ -1000,6 +1002,7 @@ $L$SEH_begin_aesni_ccm64_decrypt_blocks:
 	mov	r9,QWORD[48+rsp]
 
 
+
 	lea	rsp,[((-88))+rsp]
 	movaps	XMMWORD[rsp],xmm6
 	movaps	XMMWORD[16+rsp],xmm7
@@ -1110,6 +1113,7 @@ $L$ccm64_dec_ret:
 	mov	rdi,QWORD[8+rsp]	;WIN64 epilogue
 	mov	rsi,QWORD[16+rsp]
 	DB	0F3h,0C3h		;repret
+
 $L$SEH_end_aesni_ccm64_decrypt_blocks:
 global	aesni_ctr32_encrypt_blocks
 
@@ -3019,6 +3023,7 @@ $L$SEH_end_aesni_ocb_encrypt:
 
 ALIGN	32
 __ocb_encrypt6:
+
 	pxor	xmm15,xmm9
 	movdqu	xmm11,XMMWORD[r12*1+rbx]
 	movdqa	xmm12,xmm10
@@ -3119,8 +3124,10 @@ DB	102,65,15,56,221,255
 
 
 
+
 ALIGN	32
 __ocb_encrypt4:
+
 	pxor	xmm15,xmm9
 	movdqu	xmm11,XMMWORD[r12*1+rbx]
 	movdqa	xmm12,xmm10
@@ -3188,8 +3195,10 @@ DB	102,65,15,56,221,237
 
 
 
+
 ALIGN	32
 __ocb_encrypt1:
+
 	pxor	xmm7,xmm15
 	pxor	xmm7,xmm9
 	pxor	xmm8,xmm2
@@ -3222,6 +3231,7 @@ DB	102,15,56,221,215
 	DB	0F3h,0C3h		;repret
 
 
+
 global	aesni_ocb_decrypt
 
 ALIGN	32
@@ -3493,6 +3503,7 @@ $L$SEH_end_aesni_ocb_decrypt:
 
 ALIGN	32
 __ocb_decrypt6:
+
 	pxor	xmm15,xmm9
 	movdqu	xmm11,XMMWORD[r12*1+rbx]
 	movdqa	xmm12,xmm10
@@ -3587,8 +3598,10 @@ DB	102,65,15,56,223,255
 
 
 
+
 ALIGN	32
 __ocb_decrypt4:
+
 	pxor	xmm15,xmm9
 	movdqu	xmm11,XMMWORD[r12*1+rbx]
 	movdqa	xmm12,xmm10
@@ -3652,8 +3665,10 @@ DB	102,65,15,56,223,237
 
 
 
+
 ALIGN	32
 __ocb_decrypt1:
+
 	pxor	xmm7,xmm15
 	pxor	xmm7,xmm9
 	pxor	xmm2,xmm7
@@ -3684,6 +3699,7 @@ DB	102,15,56,222,209
 DB	102,15,56,223,215
 	DB	0F3h,0C3h		;repret
 
+
 global	aesni_cbc_encrypt
 
 ALIGN	16
@@ -4662,7 +4678,6 @@ $L$enc_key_ret:
 	add	rsp,8
 
 	DB	0F3h,0C3h		;repret
-
 $L$SEH_end_set_encrypt_key:
 
 ALIGN	16
@@ -4735,6 +4750,7 @@ $L$key_expansion_256b:
 	DB	0F3h,0C3h		;repret
 
 
+
 ALIGN	64
 $L$bswap_mask:
 DB	15,14,13,12,11,10,9,8,7,6,5,4,3,2,1,0
diff --git a/deps/openssl/config/archs/VC-WIN64A/asm/crypto/aes/bsaes-x86_64.asm b/deps/openssl/config/archs/VC-WIN64A/asm/crypto/aes/bsaes-x86_64.asm
deleted file mode 100644
index 7cccb6a469..0000000000
--- a/deps/openssl/config/archs/VC-WIN64A/asm/crypto/aes/bsaes-x86_64.asm
+++ /dev/null
@@ -1,2821 +0,0 @@
-default	rel
-%define XMMWORD
-%define YMMWORD
-%define ZMMWORD
-section	.text code align=64
-
-
-EXTERN	asm_AES_encrypt
-EXTERN	asm_AES_decrypt
-
-
-ALIGN	64
-_bsaes_encrypt8:
-
-	lea	r11,[$L$BS0]
-
-	movdqa	xmm8,XMMWORD[rax]
-	lea	rax,[16+rax]
-	movdqa	xmm7,XMMWORD[80+r11]
-	pxor	xmm15,xmm8
-	pxor	xmm0,xmm8
-	pxor	xmm1,xmm8
-	pxor	xmm2,xmm8
-DB	102,68,15,56,0,255
-DB	102,15,56,0,199
-	pxor	xmm3,xmm8
-	pxor	xmm4,xmm8
-DB	102,15,56,0,207
-DB	102,15,56,0,215
-	pxor	xmm5,xmm8
-	pxor	xmm6,xmm8
-DB	102,15,56,0,223
-DB	102,15,56,0,231
-DB	102,15,56,0,239
-DB	102,15,56,0,247
-_bsaes_encrypt8_bitslice:
-	movdqa	xmm7,XMMWORD[r11]
-	movdqa	xmm8,XMMWORD[16+r11]
-	movdqa	xmm9,xmm5
-	psrlq	xmm5,1
-	movdqa	xmm10,xmm3
-	psrlq	xmm3,1
-	pxor	xmm5,xmm6
-	pxor	xmm3,xmm4
-	pand	xmm5,xmm7
-	pand	xmm3,xmm7
-	pxor	xmm6,xmm5
-	psllq	xmm5,1
-	pxor	xmm4,xmm3
-	psllq	xmm3,1
-	pxor	xmm5,xmm9
-	pxor	xmm3,xmm10
-	movdqa	xmm9,xmm1
-	psrlq	xmm1,1
-	movdqa	xmm10,xmm15
-	psrlq	xmm15,1
-	pxor	xmm1,xmm2
-	pxor	xmm15,xmm0
-	pand	xmm1,xmm7
-	pand	xmm15,xmm7
-	pxor	xmm2,xmm1
-	psllq	xmm1,1
-	pxor	xmm0,xmm15
-	psllq	xmm15,1
-	pxor	xmm1,xmm9
-	pxor	xmm15,xmm10
-	movdqa	xmm7,XMMWORD[32+r11]
-	movdqa	xmm9,xmm4
-	psrlq	xmm4,2
-	movdqa	xmm10,xmm3
-	psrlq	xmm3,2
-	pxor	xmm4,xmm6
-	pxor	xmm3,xmm5
-	pand	xmm4,xmm8
-	pand	xmm3,xmm8
-	pxor	xmm6,xmm4
-	psllq	xmm4,2
-	pxor	xmm5,xmm3
-	psllq	xmm3,2
-	pxor	xmm4,xmm9
-	pxor	xmm3,xmm10
-	movdqa	xmm9,xmm0
-	psrlq	xmm0,2
-	movdqa	xmm10,xmm15
-	psrlq	xmm15,2
-	pxor	xmm0,xmm2
-	pxor	xmm15,xmm1
-	pand	xmm0,xmm8
-	pand	xmm15,xmm8
-	pxor	xmm2,xmm0
-	psllq	xmm0,2
-	pxor	xmm1,xmm15
-	psllq	xmm15,2
-	pxor	xmm0,xmm9
-	pxor	xmm15,xmm10
-	movdqa	xmm9,xmm2
-	psrlq	xmm2,4
-	movdqa	xmm10,xmm1
-	psrlq	xmm1,4
-	pxor	xmm2,xmm6
-	pxor	xmm1,xmm5
-	pand	xmm2,xmm7
-	pand	xmm1,xmm7
-	pxor	xmm6,xmm2
-	psllq	xmm2,4
-	pxor	xmm5,xmm1
-	psllq	xmm1,4
-	pxor	xmm2,xmm9
-	pxor	xmm1,xmm10
-	movdqa	xmm9,xmm0
-	psrlq	xmm0,4
-	movdqa	xmm10,xmm15
-	psrlq	xmm15,4
-	pxor	xmm0,xmm4
-	pxor	xmm15,xmm3
-	pand	xmm0,xmm7
-	pand	xmm15,xmm7
-	pxor	xmm4,xmm0
-	psllq	xmm0,4
-	pxor	xmm3,xmm15
-	psllq	xmm15,4
-	pxor	xmm0,xmm9
-	pxor	xmm15,xmm10
-	dec	r10d
-	jmp	NEAR $L$enc_sbox
-ALIGN	16
-$L$enc_loop:
-	pxor	xmm15,XMMWORD[rax]
-	pxor	xmm0,XMMWORD[16+rax]
-	pxor	xmm1,XMMWORD[32+rax]
-	pxor	xmm2,XMMWORD[48+rax]
-DB	102,68,15,56,0,255
-DB	102,15,56,0,199
-	pxor	xmm3,XMMWORD[64+rax]
-	pxor	xmm4,XMMWORD[80+rax]
-DB	102,15,56,0,207
-DB	102,15,56,0,215
-	pxor	xmm5,XMMWORD[96+rax]
-	pxor	xmm6,XMMWORD[112+rax]
-DB	102,15,56,0,223
-DB	102,15,56,0,231
-DB	102,15,56,0,239
-DB	102,15,56,0,247
-	lea	rax,[128+rax]
-$L$enc_sbox:
-	pxor	xmm4,xmm5
-	pxor	xmm1,xmm0
-	pxor	xmm2,xmm15
-	pxor	xmm5,xmm1
-	pxor	xmm4,xmm15
-
-	pxor	xmm5,xmm2
-	pxor	xmm2,xmm6
-	pxor	xmm6,xmm4
-	pxor	xmm2,xmm3
-	pxor	xmm3,xmm4
-	pxor	xmm2,xmm0
-
-	pxor	xmm1,xmm6
-	pxor	xmm0,xmm4
-	movdqa	xmm10,xmm6
-	movdqa	xmm9,xmm0
-	movdqa	xmm8,xmm4
-	movdqa	xmm12,xmm1
-	movdqa	xmm11,xmm5
-
-	pxor	xmm10,xmm3
-	pxor	xmm9,xmm1
-	pxor	xmm8,xmm2
-	movdqa	xmm13,xmm10
-	pxor	xmm12,xmm3
-	movdqa	xmm7,xmm9
-	pxor	xmm11,xmm15
-	movdqa	xmm14,xmm10
-
-	por	xmm9,xmm8
-	por	xmm10,xmm11
-	pxor	xmm14,xmm7
-	pand	xmm13,xmm11
-	pxor	xmm11,xmm8
-	pand	xmm7,xmm8
-	pand	xmm14,xmm11
-	movdqa	xmm11,xmm2
-	pxor	xmm11,xmm15
-	pand	xmm12,xmm11
-	pxor	xmm10,xmm12
-	pxor	xmm9,xmm12
-	movdqa	xmm12,xmm6
-	movdqa	xmm11,xmm4
-	pxor	xmm12,xmm0
-	pxor	xmm11,xmm5
-	movdqa	xmm8,xmm12
-	pand	xmm12,xmm11
-	por	xmm8,xmm11
-	pxor	xmm7,xmm12
-	pxor	xmm10,xmm14
-	pxor	xmm9,xmm13
-	pxor	xmm8,xmm14
-	movdqa	xmm11,xmm1
-	pxor	xmm7,xmm13
-	movdqa	xmm12,xmm3
-	pxor	xmm8,xmm13
-	movdqa	xmm13,xmm0
-	pand	xmm11,xmm2
-	movdqa	xmm14,xmm6
-	pand	xmm12,xmm15
-	pand	xmm13,xmm4
-	por	xmm14,xmm5
-	pxor	xmm10,xmm11
-	pxor	xmm9,xmm12
-	pxor	xmm8,xmm13
-	pxor	xmm7,xmm14
-
-
-
-
-
-	movdqa	xmm11,xmm10
-	pand	xmm10,xmm8
-	pxor	xmm11,xmm9
-
-	movdqa	xmm13,xmm7
-	movdqa	xmm14,xmm11
-	pxor	xmm13,xmm10
-	pand	xmm14,xmm13
-
-	movdqa	xmm12,xmm8
-	pxor	xmm14,xmm9
-	pxor	xmm12,xmm7
-
-	pxor	xmm10,xmm9
-
-	pand	xmm12,xmm10
-
-	movdqa	xmm9,xmm13
-	pxor	xmm12,xmm7
-
-	pxor	xmm9,xmm12
-	pxor	xmm8,xmm12
-
-	pand	xmm9,xmm7
-
-	pxor	xmm13,xmm9
-	pxor	xmm8,xmm9
-
-	pand	xmm13,xmm14
-
-	pxor	xmm13,xmm11
-	movdqa	xmm11,xmm5
-	movdqa	xmm7,xmm4
-	movdqa	xmm9,xmm14
-	pxor	xmm9,xmm13
-	pand	xmm9,xmm5
-	pxor	xmm5,xmm4
-	pand	xmm4,xmm14
-	pand	xmm5,xmm13
-	pxor	xmm5,xmm4
-	pxor	xmm4,xmm9
-	pxor	xmm11,xmm15
-	pxor	xmm7,xmm2
-	pxor	xmm14,xmm12
-	pxor	xmm13,xmm8
-	movdqa	xmm10,xmm14
-	movdqa	xmm9,xmm12
-	pxor	xmm10,xmm13
-	pxor	xmm9,xmm8
-	pand	xmm10,xmm11
-	pand	xmm9,xmm15
-	pxor	xmm11,xmm7
-	pxor	xmm15,xmm2
-	pand	xmm7,xmm14
-	pand	xmm2,xmm12
-	pand	xmm11,xmm13
-	pand	xmm15,xmm8
-	pxor	xmm7,xmm11
-	pxor	xmm15,xmm2
-	pxor	xmm11,xmm10
-	pxor	xmm2,xmm9
-	pxor	xmm5,xmm11
-	pxor	xmm15,xmm11
-	pxor	xmm4,xmm7
-	pxor	xmm2,xmm7
-
-	movdqa	xmm11,xmm6
-	movdqa	xmm7,xmm0
-	pxor	xmm11,xmm3
-	pxor	xmm7,xmm1
-	movdqa	xmm10,xmm14
-	movdqa	xmm9,xmm12
-	pxor	xmm10,xmm13
-	pxor	xmm9,xmm8
-	pand	xmm10,xmm11
-	pand	xmm9,xmm3
-	pxor	xmm11,xmm7
-	pxor	xmm3,xmm1
-	pand	xmm7,xmm14
-	pand	xmm1,xmm12
-	pand	xmm11,xmm13
-	pand	xmm3,xmm8
-	pxor	xmm7,xmm11
-	pxor	xmm3,xmm1
-	pxor	xmm11,xmm10
-	pxor	xmm1,xmm9
-	pxor	xmm14,xmm12
-	pxor	xmm13,xmm8
-	movdqa	xmm10,xmm14
-	pxor	xmm10,xmm13
-	pand	xmm10,xmm6
-	pxor	xmm6,xmm0
-	pand	xmm0,xmm14
-	pand	xmm6,xmm13
-	pxor	xmm6,xmm0
-	pxor	xmm0,xmm10
-	pxor	xmm6,xmm11
-	pxor	xmm3,xmm11
-	pxor	xmm0,xmm7
-	pxor	xmm1,xmm7
-	pxor	xmm6,xmm15
-	pxor	xmm0,xmm5
-	pxor	xmm3,xmm6
-	pxor	xmm5,xmm15
-	pxor	xmm15,xmm0
-
-	pxor	xmm0,xmm4
-	pxor	xmm4,xmm1
-	pxor	xmm1,xmm2
-	pxor	xmm2,xmm4
-	pxor	xmm3,xmm4
-
-	pxor	xmm5,xmm2
-	dec	r10d
-	jl	NEAR $L$enc_done
-	pshufd	xmm7,xmm15,0x93
-	pshufd	xmm8,xmm0,0x93
-	pxor	xmm15,xmm7
-	pshufd	xmm9,xmm3,0x93
-	pxor	xmm0,xmm8
-	pshufd	xmm10,xmm5,0x93
-	pxor	xmm3,xmm9
-	pshufd	xmm11,xmm2,0x93
-	pxor	xmm5,xmm10
-	pshufd	xmm12,xmm6,0x93
-	pxor	xmm2,xmm11
-	pshufd	xmm13,xmm1,0x93
-	pxor	xmm6,xmm12
-	pshufd	xmm14,xmm4,0x93
-	pxor	xmm1,xmm13
-	pxor	xmm4,xmm14
-
-	pxor	xmm8,xmm15
-	pxor	xmm7,xmm4
-	pxor	xmm8,xmm4
-	pshufd	xmm15,xmm15,0x4E
-	pxor	xmm9,xmm0
-	pshufd	xmm0,xmm0,0x4E
-	pxor	xmm12,xmm2
-	pxor	xmm15,xmm7
-	pxor	xmm13,xmm6
-	pxor	xmm0,xmm8
-	pxor	xmm11,xmm5
-	pshufd	xmm7,xmm2,0x4E
-	pxor	xmm14,xmm1
-	pshufd	xmm8,xmm6,0x4E
-	pxor	xmm10,xmm3
-	pshufd	xmm2,xmm5,0x4E
-	pxor	xmm10,xmm4
-	pshufd	xmm6,xmm4,0x4E
-	pxor	xmm11,xmm4
-	pshufd	xmm5,xmm1,0x4E
-	pxor	xmm7,xmm11
-	pshufd	xmm1,xmm3,0x4E
-	pxor	xmm8,xmm12
-	pxor	xmm2,xmm10
-	pxor	xmm6,xmm14
-	pxor	xmm5,xmm13
-	movdqa	xmm3,xmm7
-	pxor	xmm1,xmm9
-	movdqa	xmm4,xmm8
-	movdqa	xmm7,XMMWORD[48+r11]
-	jnz	NEAR $L$enc_loop
-	movdqa	xmm7,XMMWORD[64+r11]
-	jmp	NEAR $L$enc_loop
-ALIGN	16
-$L$enc_done:
-	movdqa	xmm7,XMMWORD[r11]
-	movdqa	xmm8,XMMWORD[16+r11]
-	movdqa	xmm9,xmm1
-	psrlq	xmm1,1
-	movdqa	xmm10,xmm2
-	psrlq	xmm2,1
-	pxor	xmm1,xmm4
-	pxor	xmm2,xmm6
-	pand	xmm1,xmm7
-	pand	xmm2,xmm7
-	pxor	xmm4,xmm1
-	psllq	xmm1,1
-	pxor	xmm6,xmm2
-	psllq	xmm2,1
-	pxor	xmm1,xmm9
-	pxor	xmm2,xmm10
-	movdqa	xmm9,xmm3
-	psrlq	xmm3,1
-	movdqa	xmm10,xmm15
-	psrlq	xmm15,1
-	pxor	xmm3,xmm5
-	pxor	xmm15,xmm0
-	pand	xmm3,xmm7
-	pand	xmm15,xmm7
-	pxor	xmm5,xmm3
-	psllq	xmm3,1
-	pxor	xmm0,xmm15
-	psllq	xmm15,1
-	pxor	xmm3,xmm9
-	pxor	xmm15,xmm10
-	movdqa	xmm7,XMMWORD[32+r11]
-	movdqa	xmm9,xmm6
-	psrlq	xmm6,2
-	movdqa	xmm10,xmm2
-	psrlq	xmm2,2
-	pxor	xmm6,xmm4
-	pxor	xmm2,xmm1
-	pand	xmm6,xmm8
-	pand	xmm2,xmm8
-	pxor	xmm4,xmm6
-	psllq	xmm6,2
-	pxor	xmm1,xmm2
-	psllq	xmm2,2
-	pxor	xmm6,xmm9
-	pxor	xmm2,xmm10
-	movdqa	xmm9,xmm0
-	psrlq	xmm0,2
-	movdqa	xmm10,xmm15
-	psrlq	xmm15,2
-	pxor	xmm0,xmm5
-	pxor	xmm15,xmm3
-	pand	xmm0,xmm8
-	pand	xmm15,xmm8
-	pxor	xmm5,xmm0
-	psllq	xmm0,2
-	pxor	xmm3,xmm15
-	psllq	xmm15,2
-	pxor	xmm0,xmm9
-	pxor	xmm15,xmm10
-	movdqa	xmm9,xmm5
-	psrlq	xmm5,4
-	movdqa	xmm10,xmm3
-	psrlq	xmm3,4
-	pxor	xmm5,xmm4
-	pxor	xmm3,xmm1
-	pand	xmm5,xmm7
-	pand	xmm3,xmm7
-	pxor	xmm4,xmm5
-	psllq	xmm5,4
-	pxor	xmm1,xmm3
-	psllq	xmm3,4
-	pxor	xmm5,xmm9
-	pxor	xmm3,xmm10
-	movdqa	xmm9,xmm0
-	psrlq	xmm0,4
-	movdqa	xmm10,xmm15
-	psrlq	xmm15,4
-	pxor	xmm0,xmm6
-	pxor	xmm15,xmm2
-	pand	xmm0,xmm7
-	pand	xmm15,xmm7
-	pxor	xmm6,xmm0
-	psllq	xmm0,4
-	pxor	xmm2,xmm15
-	psllq	xmm15,4
-	pxor	xmm0,xmm9
-	pxor	xmm15,xmm10
-	movdqa	xmm7,XMMWORD[rax]
-	pxor	xmm3,xmm7
-	pxor	xmm5,xmm7
-	pxor	xmm2,xmm7
-	pxor	xmm6,xmm7
-	pxor	xmm1,xmm7
-	pxor	xmm4,xmm7
-	pxor	xmm15,xmm7
-	pxor	xmm0,xmm7
-	DB	0F3h,0C3h		;repret
-
-
-
-
-ALIGN	64
-_bsaes_decrypt8:
-
-	lea	r11,[$L$BS0]
-
-	movdqa	xmm8,XMMWORD[rax]
-	lea	rax,[16+rax]
-	movdqa	xmm7,XMMWORD[((-48))+r11]
-	pxor	xmm15,xmm8
-	pxor	xmm0,xmm8
-	pxor	xmm1,xmm8
-	pxor	xmm2,xmm8
-DB	102,68,15,56,0,255
-DB	102,15,56,0,199
-	pxor	xmm3,xmm8
-	pxor	xmm4,xmm8
-DB	102,15,56,0,207
-DB	102,15,56,0,215
-	pxor	xmm5,xmm8
-	pxor	xmm6,xmm8
-DB	102,15,56,0,223
-DB	102,15,56,0,231
-DB	102,15,56,0,239
-DB	102,15,56,0,247
-	movdqa	xmm7,XMMWORD[r11]
-	movdqa	xmm8,XMMWORD[16+r11]
-	movdqa	xmm9,xmm5
-	psrlq	xmm5,1
-	movdqa	xmm10,xmm3
-	psrlq	xmm3,1
-	pxor	xmm5,xmm6
-	pxor	xmm3,xmm4
-	pand	xmm5,xmm7
-	pand	xmm3,xmm7
-	pxor	xmm6,xmm5
-	psllq	xmm5,1
-	pxor	xmm4,xmm3
-	psllq	xmm3,1
-	pxor	xmm5,xmm9
-	pxor	xmm3,xmm10
-	movdqa	xmm9,xmm1
-	psrlq	xmm1,1
-	movdqa	xmm10,xmm15
-	psrlq	xmm15,1
-	pxor	xmm1,xmm2
-	pxor	xmm15,xmm0
-	pand	xmm1,xmm7
-	pand	xmm15,xmm7
-	pxor	xmm2,xmm1
-	psllq	xmm1,1
-	pxor	xmm0,xmm15
-	psllq	xmm15,1
-	pxor	xmm1,xmm9
-	pxor	xmm15,xmm10
-	movdqa	xmm7,XMMWORD[32+r11]
-	movdqa	xmm9,xmm4
-	psrlq	xmm4,2
-	movdqa	xmm10,xmm3
-	psrlq	xmm3,2
-	pxor	xmm4,xmm6
-	pxor	xmm3,xmm5
-	pand	xmm4,xmm8
-	pand	xmm3,xmm8
-	pxor	xmm6,xmm4
-	psllq	xmm4,2
-	pxor	xmm5,xmm3
-	psllq	xmm3,2
-	pxor	xmm4,xmm9
-	pxor	xmm3,xmm10
-	movdqa	xmm9,xmm0
-	psrlq	xmm0,2
-	movdqa	xmm10,xmm15
-	psrlq	xmm15,2
-	pxor	xmm0,xmm2
-	pxor	xmm15,xmm1
-	pand	xmm0,xmm8
-	pand	xmm15,xmm8
-	pxor	xmm2,xmm0
-	psllq	xmm0,2
-	pxor	xmm1,xmm15
-	psllq	xmm15,2
-	pxor	xmm0,xmm9
-	pxor	xmm15,xmm10
-	movdqa	xmm9,xmm2
-	psrlq	xmm2,4
-	movdqa	xmm10,xmm1
-	psrlq	xmm1,4
-	pxor	xmm2,xmm6
-	pxor	xmm1,xmm5
-	pand	xmm2,xmm7
-	pand	xmm1,xmm7
-	pxor	xmm6,xmm2
-	psllq	xmm2,4
-	pxor	xmm5,xmm1
-	psllq	xmm1,4
-	pxor	xmm2,xmm9
-	pxor	xmm1,xmm10
-	movdqa	xmm9,xmm0
-	psrlq	xmm0,4
-	movdqa	xmm10,xmm15
-	psrlq	xmm15,4
-	pxor	xmm0,xmm4
-	pxor	xmm15,xmm3
-	pand	xmm0,xmm7
-	pand	xmm15,xmm7
-	pxor	xmm4,xmm0
-	psllq	xmm0,4
-	pxor	xmm3,xmm15
-	psllq	xmm15,4
-	pxor	xmm0,xmm9
-	pxor	xmm15,xmm10
-	dec	r10d
-	jmp	NEAR $L$dec_sbox
-ALIGN	16
-$L$dec_loop:
-	pxor	xmm15,XMMWORD[rax]
-	pxor	xmm0,XMMWORD[16+rax]
-	pxor	xmm1,XMMWORD[32+rax]
-	pxor	xmm2,XMMWORD[48+rax]
-DB	102,68,15,56,0,255
-DB	102,15,56,0,199
-	pxor	xmm3,XMMWORD[64+rax]
-	pxor	xmm4,XMMWORD[80+rax]
-DB	102,15,56,0,207
-DB	102,15,56,0,215
-	pxor	xmm5,XMMWORD[96+rax]
-	pxor	xmm6,XMMWORD[112+rax]
-DB	102,15,56,0,223
-DB	102,15,56,0,231
-DB	102,15,56,0,239
-DB	102,15,56,0,247
-	lea	rax,[128+rax]
-$L$dec_sbox:
-	pxor	xmm2,xmm3
-
-	pxor	xmm3,xmm6
-	pxor	xmm1,xmm6
-	pxor	xmm5,xmm3
-	pxor	xmm6,xmm5
-	pxor	xmm0,xmm6
-
-	pxor	xmm15,xmm0
-	pxor	xmm1,xmm4
-	pxor	xmm2,xmm15
-	pxor	xmm4,xmm15
-	pxor	xmm0,xmm2
-	movdqa	xmm10,xmm2
-	movdqa	xmm9,xmm6
-	movdqa	xmm8,xmm0
-	movdqa	xmm12,xmm3
-	movdqa	xmm11,xmm4
-
-	pxor	xmm10,xmm15
-	pxor	xmm9,xmm3
-	pxor	xmm8,xmm5
-	movdqa	xmm13,xmm10
-	pxor	xmm12,xmm15
-	movdqa	xmm7,xmm9
-	pxor	xmm11,xmm1
-	movdqa	xmm14,xmm10
-
-	por	xmm9,xmm8
-	por	xmm10,xmm11
-	pxor	xmm14,xmm7
-	pand	xmm13,xmm11
-	pxor	xmm11,xmm8
-	pand	xmm7,xmm8
-	pand	xmm14,xmm11
-	movdqa	xmm11,xmm5
-	pxor	xmm11,xmm1
-	pand	xmm12,xmm11
-	pxor	xmm10,xmm12
-	pxor	xmm9,xmm12
-	movdqa	xmm12,xmm2
-	movdqa	xmm11,xmm0
-	pxor	xmm12,xmm6
-	pxor	xmm11,xmm4
-	movdqa	xmm8,xmm12
-	pand	xmm12,xmm11
-	por	xmm8,xmm11
-	pxor	xmm7,xmm12
-	pxor	xmm10,xmm14
-	pxor	xmm9,xmm13
-	pxor	xmm8,xmm14
-	movdqa	xmm11,xmm3
-	pxor	xmm7,xmm13
-	movdqa	xmm12,xmm15
-	pxor	xmm8,xmm13
-	movdqa	xmm13,xmm6
-	pand	xmm11,xmm5
-	movdqa	xmm14,xmm2
-	pand	xmm12,xmm1
-	pand	xmm13,xmm0
-	por	xmm14,xmm4
-	pxor	xmm10,xmm11
-	pxor	xmm9,xmm12
-	pxor	xmm8,xmm13
-	pxor	xmm7,xmm14
-
-
-
-
-
-	movdqa	xmm11,xmm10
-	pand	xmm10,xmm8
-	pxor	xmm11,xmm9
-
-	movdqa	xmm13,xmm7
-	movdqa	xmm14,xmm11
-	pxor	xmm13,xmm10
-	pand	xmm14,xmm13
-
-	movdqa	xmm12,xmm8
-	pxor	xmm14,xmm9
-	pxor	xmm12,xmm7
-
-	pxor	xmm10,xmm9
-
-	pand	xmm12,xmm10
-
-	movdqa	xmm9,xmm13
-	pxor	xmm12,xmm7
-
-	pxor	xmm9,xmm12
-	pxor	xmm8,xmm12
-
-	pand	xmm9,xmm7
-
-	pxor	xmm13,xmm9
-	pxor	xmm8,xmm9
-
-	pand	xmm13,xmm14
-
-	pxor	xmm13,xmm11
-	movdqa	xmm11,xmm4
-	movdqa	xmm7,xmm0
-	movdqa	xmm9,xmm14
-	pxor	xmm9,xmm13
-	pand	xmm9,xmm4
-	pxor	xmm4,xmm0
-	pand	xmm0,xmm14
-	pand	xmm4,xmm13
-	pxor	xmm4,xmm0
-	pxor	xmm0,xmm9
-	pxor	xmm11,xmm1
-	pxor	xmm7,xmm5
-	pxor	xmm14,xmm12
-	pxor	xmm13,xmm8
-	movdqa	xmm10,xmm14
-	movdqa	xmm9,xmm12
-	pxor	xmm10,xmm13
-	pxor	xmm9,xmm8
-	pand	xmm10,xmm11
-	pand	xmm9,xmm1
-	pxor	xmm11,xmm7
-	pxor	xmm1,xmm5
-	pand	xmm7,xmm14
-	pand	xmm5,xmm12
-	pand	xmm11,xmm13
-	pand	xmm1,xmm8
-	pxor	xmm7,xmm11
-	pxor	xmm1,xmm5
-	pxor	xmm11,xmm10
-	pxor	xmm5,xmm9
-	pxor	xmm4,xmm11
-	pxor	xmm1,xmm11
-	pxor	xmm0,xmm7
-	pxor	xmm5,xmm7
-
-	movdqa	xmm11,xmm2
-	movdqa	xmm7,xmm6
-	pxor	xmm11,xmm15
-	pxor	xmm7,xmm3
-	movdqa	xmm10,xmm14
-	movdqa	xmm9,xmm12
-	pxor	xmm10,xmm13
-	pxor	xmm9,xmm8
-	pand	xmm10,xmm11
-	pand	xmm9,xmm15
-	pxor	xmm11,xmm7
-	pxor	xmm15,xmm3
-	pand	xmm7,xmm14
-	pand	xmm3,xmm12
-	pand	xmm11,xmm13
-	pand	xmm15,xmm8
-	pxor	xmm7,xmm11
-	pxor	xmm15,xmm3
-	pxor	xmm11,xmm10
-	pxor	xmm3,xmm9
-	pxor	xmm14,xmm12
-	pxor	xmm13,xmm8
-	movdqa	xmm10,xmm14
-	pxor	xmm10,xmm13
-	pand	xmm10,xmm2
-	pxor	xmm2,xmm6
-	pand	xmm6,xmm14
-	pand	xmm2,xmm13
-	pxor	xmm2,xmm6
-	pxor	xmm6,xmm10
-	pxor	xmm2,xmm11
-	pxor	xmm15,xmm11
-	pxor	xmm6,xmm7
-	pxor	xmm3,xmm7
-	pxor	xmm0,xmm6
-	pxor	xmm5,xmm4
-
-	pxor	xmm3,xmm0
-	pxor	xmm1,xmm6
-	pxor	xmm4,xmm6
-	pxor	xmm3,xmm1
-	pxor	xmm6,xmm15
-	pxor	xmm3,xmm4
-	pxor	xmm2,xmm5
-	pxor	xmm5,xmm0
-	pxor	xmm2,xmm3
-
-	pxor	xmm3,xmm15
-	pxor	xmm6,xmm2
-	dec	r10d
-	jl	NEAR $L$dec_done
-
-	pshufd	xmm7,xmm15,0x4E
-	pshufd	xmm13,xmm2,0x4E
-	pxor	xmm7,xmm15
-	pshufd	xmm14,xmm4,0x4E
-	pxor	xmm13,xmm2
-	pshufd	xmm8,xmm0,0x4E
-	pxor	xmm14,xmm4
-	pshufd	xmm9,xmm5,0x4E
-	pxor	xmm8,xmm0
-	pshufd	xmm10,xmm3,0x4E
-	pxor	xmm9,xmm5
-	pxor	xmm15,xmm13
-	pxor	xmm0,xmm13
-	pshufd	xmm11,xmm1,0x4E
-	pxor	xmm10,xmm3
-	pxor	xmm5,xmm7
-	pxor	xmm3,xmm8
-	pshufd	xmm12,xmm6,0x4E
-	pxor	xmm11,xmm1
-	pxor	xmm0,xmm14
-	pxor	xmm1,xmm9
-	pxor	xmm12,xmm6
-
-	pxor	xmm5,xmm14
-	pxor	xmm3,xmm13
-	pxor	xmm1,xmm13
-	pxor	xmm6,xmm10
-	pxor	xmm2,xmm11
-	pxor	xmm1,xmm14
-	pxor	xmm6,xmm14
-	pxor	xmm4,xmm12
-	pshufd	xmm7,xmm15,0x93
-	pshufd	xmm8,xmm0,0x93
-	pxor	xmm15,xmm7
-	pshufd	xmm9,xmm5,0x93
-	pxor	xmm0,xmm8
-	pshufd	xmm10,xmm3,0x93
-	pxor	xmm5,xmm9
-	pshufd	xmm11,xmm1,0x93
-	pxor	xmm3,xmm10
-	pshufd	xmm12,xmm6,0x93
-	pxor	xmm1,xmm11
-	pshufd	xmm13,xmm2,0x93
-	pxor	xmm6,xmm12
-	pshufd	xmm14,xmm4,0x93
-	pxor	xmm2,xmm13
-	pxor	xmm4,xmm14
-
-	pxor	xmm8,xmm15
-	pxor	xmm7,xmm4
-	pxor	xmm8,xmm4
-	pshufd	xmm15,xmm15,0x4E
-	pxor	xmm9,xmm0
-	pshufd	xmm0,xmm0,0x4E
-	pxor	xmm12,xmm1
-	pxor	xmm15,xmm7
-	pxor	xmm13,xmm6
-	pxor	xmm0,xmm8
-	pxor	xmm11,xmm3
-	pshufd	xmm7,xmm1,0x4E
-	pxor	xmm14,xmm2
-	pshufd	xmm8,xmm6,0x4E
-	pxor	xmm10,xmm5
-	pshufd	xmm1,xmm3,0x4E
-	pxor	xmm10,xmm4
-	pshufd	xmm6,xmm4,0x4E
-	pxor	xmm11,xmm4
-	pshufd	xmm3,xmm2,0x4E
-	pxor	xmm7,xmm11
-	pshufd	xmm2,xmm5,0x4E
-	pxor	xmm8,xmm12
-	pxor	xmm10,xmm1
-	pxor	xmm6,xmm14
-	pxor	xmm13,xmm3
-	movdqa	xmm3,xmm7
-	pxor	xmm2,xmm9
-	movdqa	xmm5,xmm13
-	movdqa	xmm4,xmm8
-	movdqa	xmm1,xmm2
-	movdqa	xmm2,xmm10
-	movdqa	xmm7,XMMWORD[((-16))+r11]
-	jnz	NEAR $L$dec_loop
-	movdqa	xmm7,XMMWORD[((-32))+r11]
-	jmp	NEAR $L$dec_loop
-ALIGN	16
-$L$dec_done:
-	movdqa	xmm7,XMMWORD[r11]
-	movdqa	xmm8,XMMWORD[16+r11]
-	movdqa	xmm9,xmm2
-	psrlq	xmm2,1
-	movdqa	xmm10,xmm1
-	psrlq	xmm1,1
-	pxor	xmm2,xmm4
-	pxor	xmm1,xmm6
-	pand	xmm2,xmm7
-	pand	xmm1,xmm7
-	pxor	xmm4,xmm2
-	psllq	xmm2,1
-	pxor	xmm6,xmm1
-	psllq	xmm1,1
-	pxor	xmm2,xmm9
-	pxor	xmm1,xmm10
-	movdqa	xmm9,xmm5
-	psrlq	xmm5,1
-	movdqa	xmm10,xmm15
-	psrlq	xmm15,1
-	pxor	xmm5,xmm3
-	pxor	xmm15,xmm0
-	pand	xmm5,xmm7
-	pand	xmm15,xmm7
-	pxor	xmm3,xmm5
-	psllq	xmm5,1
-	pxor	xmm0,xmm15
-	psllq	xmm15,1
-	pxor	xmm5,xmm9
-	pxor	xmm15,xmm10
-	movdqa	xmm7,XMMWORD[32+r11]
-	movdqa	xmm9,xmm6
-	psrlq	xmm6,2
-	movdqa	xmm10,xmm1
-	psrlq	xmm1,2
-	pxor	xmm6,xmm4
-	pxor	xmm1,xmm2
-	pand	xmm6,xmm8
-	pand	xmm1,xmm8
-	pxor	xmm4,xmm6
-	psllq	xmm6,2
-	pxor	xmm2,xmm1
-	psllq	xmm1,2
-	pxor	xmm6,xmm9
-	pxor	xmm1,xmm10
-	movdqa	xmm9,xmm0
-	psrlq	xmm0,2
-	movdqa	xmm10,xmm15
-	psrlq	xmm15,2
-	pxor	xmm0,xmm3
-	pxor	xmm15,xmm5
-	pand	xmm0,xmm8
-	pand	xmm15,xmm8
-	pxor	xmm3,xmm0
-	psllq	xmm0,2
-	pxor	xmm5,xmm15
-	psllq	xmm15,2
-	pxor	xmm0,xmm9
-	pxor	xmm15,xmm10
-	movdqa	xmm9,xmm3
-	psrlq	xmm3,4
-	movdqa	xmm10,xmm5
-	psrlq	xmm5,4
-	pxor	xmm3,xmm4
-	pxor	xmm5,xmm2
-	pand	xmm3,xmm7
-	pand	xmm5,xmm7
-	pxor	xmm4,xmm3
-	psllq	xmm3,4
-	pxor	xmm2,xmm5
-	psllq	xmm5,4
-	pxor	xmm3,xmm9
-	pxor	xmm5,xmm10
-	movdqa	xmm9,xmm0
-	psrlq	xmm0,4
-	movdqa	xmm10,xmm15
-	psrlq	xmm15,4
-	pxor	xmm0,xmm6
-	pxor	xmm15,xmm1
-	pand	xmm0,xmm7
-	pand	xmm15,xmm7
-	pxor	xmm6,xmm0
-	psllq	xmm0,4
-	pxor	xmm1,xmm15
-	psllq	xmm15,4
-	pxor	xmm0,xmm9
-	pxor	xmm15,xmm10
-	movdqa	xmm7,XMMWORD[rax]
-	pxor	xmm5,xmm7
-	pxor	xmm3,xmm7
-	pxor	xmm1,xmm7
-	pxor	xmm6,xmm7
-	pxor	xmm2,xmm7
-	pxor	xmm4,xmm7
-	pxor	xmm15,xmm7
-	pxor	xmm0,xmm7
-	DB	0F3h,0C3h		;repret
-
-
-
-ALIGN	16
-_bsaes_key_convert:
-
-	lea	r11,[$L$masks]
-	movdqu	xmm7,XMMWORD[rcx]
-	lea	rcx,[16+rcx]
-	movdqa	xmm0,XMMWORD[r11]
-	movdqa	xmm1,XMMWORD[16+r11]
-	movdqa	xmm2,XMMWORD[32+r11]
-	movdqa	xmm3,XMMWORD[48+r11]
-	movdqa	xmm4,XMMWORD[64+r11]
-	pcmpeqd	xmm5,xmm5
-
-	movdqu	xmm6,XMMWORD[rcx]
-	movdqa	XMMWORD[rax],xmm7
-	lea	rax,[16+rax]
-	dec	r10d
-	jmp	NEAR $L$key_loop
-ALIGN	16
-$L$key_loop:
-DB	102,15,56,0,244
-
-	movdqa	xmm8,xmm0
-	movdqa	xmm9,xmm1
-
-	pand	xmm8,xmm6
-	pand	xmm9,xmm6
-	movdqa	xmm10,xmm2
-	pcmpeqb	xmm8,xmm0
-	psllq	xmm0,4
-	movdqa	xmm11,xmm3
-	pcmpeqb	xmm9,xmm1
-	psllq	xmm1,4
-
-	pand	xmm10,xmm6
-	pand	xmm11,xmm6
-	movdqa	xmm12,xmm0
-	pcmpeqb	xmm10,xmm2
-	psllq	xmm2,4
-	movdqa	xmm13,xmm1
-	pcmpeqb	xmm11,xmm3
-	psllq	xmm3,4
-
-	movdqa	xmm14,xmm2
-	movdqa	xmm15,xmm3
-	pxor	xmm8,xmm5
-	pxor	xmm9,xmm5
-
-	pand	xmm12,xmm6
-	pand	xmm13,xmm6
-	movdqa	XMMWORD[rax],xmm8
-	pcmpeqb	xmm12,xmm0
-	psrlq	xmm0,4
-	movdqa	XMMWORD[16+rax],xmm9
-	pcmpeqb	xmm13,xmm1
-	psrlq	xmm1,4
-	lea	rcx,[16+rcx]
-
-	pand	xmm14,xmm6
-	pand	xmm15,xmm6
-	movdqa	XMMWORD[32+rax],xmm10
-	pcmpeqb	xmm14,xmm2
-	psrlq	xmm2,4
-	movdqa	XMMWORD[48+rax],xmm11
-	pcmpeqb	xmm15,xmm3
-	psrlq	xmm3,4
-	movdqu	xmm6,XMMWORD[rcx]
-
-	pxor	xmm13,xmm5
-	pxor	xmm14,xmm5
-	movdqa	XMMWORD[64+rax],xmm12
-	movdqa	XMMWORD[80+rax],xmm13
-	movdqa	XMMWORD[96+rax],xmm14
-	movdqa	XMMWORD[112+rax],xmm15
-	lea	rax,[128+rax]
-	dec	r10d
-	jnz	NEAR $L$key_loop
-
-	movdqa	xmm7,XMMWORD[80+r11]
-
-	DB	0F3h,0C3h		;repret
-
-
-EXTERN	asm_AES_cbc_encrypt
-global	bsaes_cbc_encrypt
-
-ALIGN	16
-bsaes_cbc_encrypt:
-
-	mov	r11d,DWORD[48+rsp]
-	cmp	r11d,0
-	jne	NEAR asm_AES_cbc_encrypt
-	cmp	r8,128
-	jb	NEAR asm_AES_cbc_encrypt
-
-	mov	rax,rsp
-$L$cbc_dec_prologue:
-	push	rbp
-
-	push	rbx
-
-	push	r12
-
-	push	r13
-
-	push	r14
-
-	push	r15
-
-	lea	rsp,[((-72))+rsp]
-
-	mov	r10,QWORD[160+rsp]
-	lea	rsp,[((-160))+rsp]
-	movaps	XMMWORD[64+rsp],xmm6
-	movaps	XMMWORD[80+rsp],xmm7
-	movaps	XMMWORD[96+rsp],xmm8
-	movaps	XMMWORD[112+rsp],xmm9
-	movaps	XMMWORD[128+rsp],xmm10
-	movaps	XMMWORD[144+rsp],xmm11
-	movaps	XMMWORD[160+rsp],xmm12
-	movaps	XMMWORD[176+rsp],xmm13
-	movaps	XMMWORD[192+rsp],xmm14
-	movaps	XMMWORD[208+rsp],xmm15
-$L$cbc_dec_body:
-	mov	rbp,rsp
-
-	mov	eax,DWORD[240+r9]
-	mov	r12,rcx
-	mov	r13,rdx
-	mov	r14,r8
-	mov	r15,r9
-	mov	rbx,r10
-	shr	r14,4
-
-	mov	edx,eax
-	shl	rax,7
-	sub	rax,96
-	sub	rsp,rax
-
-	mov	rax,rsp
-	mov	rcx,r15
-	mov	r10d,edx
-	call	_bsaes_key_convert
-	pxor	xmm7,XMMWORD[rsp]
-	movdqa	XMMWORD[rax],xmm6
-	movdqa	XMMWORD[rsp],xmm7
-
-	movdqu	xmm14,XMMWORD[rbx]
-	sub	r14,8
-$L$cbc_dec_loop:
-	movdqu	xmm15,XMMWORD[r12]
-	movdqu	xmm0,XMMWORD[16+r12]
-	movdqu	xmm1,XMMWORD[32+r12]
-	movdqu	xmm2,XMMWORD[48+r12]
-	movdqu	xmm3,XMMWORD[64+r12]
-	movdqu	xmm4,XMMWORD[80+r12]
-	mov	rax,rsp
-	movdqu	xmm5,XMMWORD[96+r12]
-	mov	r10d,edx
-	movdqu	xmm6,XMMWORD[112+r12]
-	movdqa	XMMWORD[32+rbp],xmm14
-
-	call	_bsaes_decrypt8
-
-	pxor	xmm15,XMMWORD[32+rbp]
-	movdqu	xmm7,XMMWORD[r12]
-	movdqu	xmm8,XMMWORD[16+r12]
-	pxor	xmm0,xmm7
-	movdqu	xmm9,XMMWORD[32+r12]
-	pxor	xmm5,xmm8
-	movdqu	xmm10,XMMWORD[48+r12]
-	pxor	xmm3,xmm9
-	movdqu	xmm11,XMMWORD[64+r12]
-	pxor	xmm1,xmm10
-	movdqu	xmm12,XMMWORD[80+r12]
-	pxor	xmm6,xmm11
-	movdqu	xmm13,XMMWORD[96+r12]
-	pxor	xmm2,xmm12
-	movdqu	xmm14,XMMWORD[112+r12]
-	pxor	xmm4,xmm13
-	movdqu	XMMWORD[r13],xmm15
-	lea	r12,[128+r12]
-	movdqu	XMMWORD[16+r13],xmm0
-	movdqu	XMMWORD[32+r13],xmm5
-	movdqu	XMMWORD[48+r13],xmm3
-	movdqu	XMMWORD[64+r13],xmm1
-	movdqu	XMMWORD[80+r13],xmm6
-	movdqu	XMMWORD[96+r13],xmm2
-	movdqu	XMMWORD[112+r13],xmm4
-	lea	r13,[128+r13]
-	sub	r14,8
-	jnc	NEAR $L$cbc_dec_loop
-
-	add	r14,8
-	jz	NEAR $L$cbc_dec_done
-
-	movdqu	xmm15,XMMWORD[r12]
-	mov	rax,rsp
-	mov	r10d,edx
-	cmp	r14,2
-	jb	NEAR $L$cbc_dec_one
-	movdqu	xmm0,XMMWORD[16+r12]
-	je	NEAR $L$cbc_dec_two
-	movdqu	xmm1,XMMWORD[32+r12]
-	cmp	r14,4
-	jb	NEAR $L$cbc_dec_three
-	movdqu	xmm2,XMMWORD[48+r12]
-	je	NEAR $L$cbc_dec_four
-	movdqu	xmm3,XMMWORD[64+r12]
-	cmp	r14,6
-	jb	NEAR $L$cbc_dec_five
-	movdqu	xmm4,XMMWORD[80+r12]
-	je	NEAR $L$cbc_dec_six
-	movdqu	xmm5,XMMWORD[96+r12]
-	movdqa	XMMWORD[32+rbp],xmm14
-	call	_bsaes_decrypt8
-	pxor	xmm15,XMMWORD[32+rbp]
-	movdqu	xmm7,XMMWORD[r12]
-	movdqu	xmm8,XMMWORD[16+r12]
-	pxor	xmm0,xmm7
-	movdqu	xmm9,XMMWORD[32+r12]
-	pxor	xmm5,xmm8
-	movdqu	xmm10,XMMWORD[48+r12]
-	pxor	xmm3,xmm9
-	movdqu	xmm11,XMMWORD[64+r12]
-	pxor	xmm1,xmm10
-	movdqu	xmm12,XMMWORD[80+r12]
-	pxor	xmm6,xmm11
-	movdqu	xmm14,XMMWORD[96+r12]
-	pxor	xmm2,xmm12
-	movdqu	XMMWORD[r13],xmm15
-	movdqu	XMMWORD[16+r13],xmm0
-	movdqu	XMMWORD[32+r13],xmm5
-	movdqu	XMMWORD[48+r13],xmm3
-	movdqu	XMMWORD[64+r13],xmm1
-	movdqu	XMMWORD[80+r13],xmm6
-	movdqu	XMMWORD[96+r13],xmm2
-	jmp	NEAR $L$cbc_dec_done
-ALIGN	16
-$L$cbc_dec_six:
-	movdqa	XMMWORD[32+rbp],xmm14
-	call	_bsaes_decrypt8
-	pxor	xmm15,XMMWORD[32+rbp]
-	movdqu	xmm7,XMMWORD[r12]
-	movdqu	xmm8,XMMWORD[16+r12]
-	pxor	xmm0,xmm7
-	movdqu	xmm9,XMMWORD[32+r12]
-	pxor	xmm5,xmm8
-	movdqu	xmm10,XMMWORD[48+r12]
-	pxor	xmm3,xmm9
-	movdqu	xmm11,XMMWORD[64+r12]
-	pxor	xmm1,xmm10
-	movdqu	xmm14,XMMWORD[80+r12]
-	pxor	xmm6,xmm11
-	movdqu	XMMWORD[r13],xmm15
-	movdqu	XMMWORD[16+r13],xmm0
-	movdqu	XMMWORD[32+r13],xmm5
-	movdqu	XMMWORD[48+r13],xmm3
-	movdqu	XMMWORD[64+r13],xmm1
-	movdqu	XMMWORD[80+r13],xmm6
-	jmp	NEAR $L$cbc_dec_done
-ALIGN	16
-$L$cbc_dec_five:
-	movdqa	XMMWORD[32+rbp],xmm14
-	call	_bsaes_decrypt8
-	pxor	xmm15,XMMWORD[32+rbp]
-	movdqu	xmm7,XMMWORD[r12]
-	movdqu	xmm8,XMMWORD[16+r12]
-	pxor	xmm0,xmm7
-	movdqu	xmm9,XMMWORD[32+r12]
-	pxor	xmm5,xmm8
-	movdqu	xmm10,XMMWORD[48+r12]
-	pxor	xmm3,xmm9
-	movdqu	xmm14,XMMWORD[64+r12]
-	pxor	xmm1,xmm10
-	movdqu	XMMWORD[r13],xmm15
-	movdqu	XMMWORD[16+r13],xmm0
-	movdqu	XMMWORD[32+r13],xmm5
-	movdqu	XMMWORD[48+r13],xmm3
-	movdqu	XMMWORD[64+r13],xmm1
-	jmp	NEAR $L$cbc_dec_done
-ALIGN	16
-$L$cbc_dec_four:
-	movdqa	XMMWORD[32+rbp],xmm14
-	call	_bsaes_decrypt8
-	pxor	xmm15,XMMWORD[32+rbp]
-	movdqu	xmm7,XMMWORD[r12]
-	movdqu	xmm8,XMMWORD[16+r12]
-	pxor	xmm0,xmm7
-	movdqu	xmm9,XMMWORD[32+r12]
-	pxor	xmm5,xmm8
-	movdqu	xmm14,XMMWORD[48+r12]
-	pxor	xmm3,xmm9
-	movdqu	XMMWORD[r13],xmm15
-	movdqu	XMMWORD[16+r13],xmm0
-	movdqu	XMMWORD[32+r13],xmm5
-	movdqu	XMMWORD[48+r13],xmm3
-	jmp	NEAR $L$cbc_dec_done
-ALIGN	16
-$L$cbc_dec_three:
-	movdqa	XMMWORD[32+rbp],xmm14
-	call	_bsaes_decrypt8
-	pxor	xmm15,XMMWORD[32+rbp]
-	movdqu	xmm7,XMMWORD[r12]
-	movdqu	xmm8,XMMWORD[16+r12]
-	pxor	xmm0,xmm7
-	movdqu	xmm14,XMMWORD[32+r12]
-	pxor	xmm5,xmm8
-	movdqu	XMMWORD[r13],xmm15
-	movdqu	XMMWORD[16+r13],xmm0
-	movdqu	XMMWORD[32+r13],xmm5
-	jmp	NEAR $L$cbc_dec_done
-ALIGN	16
-$L$cbc_dec_two:
-	movdqa	XMMWORD[32+rbp],xmm14
-	call	_bsaes_decrypt8
-	pxor	xmm15,XMMWORD[32+rbp]
-	movdqu	xmm7,XMMWORD[r12]
-	movdqu	xmm14,XMMWORD[16+r12]
-	pxor	xmm0,xmm7
-	movdqu	XMMWORD[r13],xmm15
-	movdqu	XMMWORD[16+r13],xmm0
-	jmp	NEAR $L$cbc_dec_done
-ALIGN	16
-$L$cbc_dec_one:
-	lea	rcx,[r12]
-	lea	rdx,[32+rbp]
-	lea	r8,[r15]
-	call	asm_AES_decrypt
-	pxor	xmm14,XMMWORD[32+rbp]
-	movdqu	XMMWORD[r13],xmm14
-	movdqa	xmm14,xmm15
-
-$L$cbc_dec_done:
-	movdqu	XMMWORD[rbx],xmm14
-	lea	rax,[rsp]
-	pxor	xmm0,xmm0
-$L$cbc_dec_bzero:
-	movdqa	XMMWORD[rax],xmm0
-	movdqa	XMMWORD[16+rax],xmm0
-	lea	rax,[32+rax]
-	cmp	rbp,rax
-	ja	NEAR $L$cbc_dec_bzero
-
-	lea	rax,[120+rbp]
-
-	movaps	xmm6,XMMWORD[64+rbp]
-	movaps	xmm7,XMMWORD[80+rbp]
-	movaps	xmm8,XMMWORD[96+rbp]
-	movaps	xmm9,XMMWORD[112+rbp]
-	movaps	xmm10,XMMWORD[128+rbp]
-	movaps	xmm11,XMMWORD[144+rbp]
-	movaps	xmm12,XMMWORD[160+rbp]
-	movaps	xmm13,XMMWORD[176+rbp]
-	movaps	xmm14,XMMWORD[192+rbp]
-	movaps	xmm15,XMMWORD[208+rbp]
-	lea	rax,[160+rax]
-$L$cbc_dec_tail:
-	mov	r15,QWORD[((-48))+rax]
-
-	mov	r14,QWORD[((-40))+rax]
-
-	mov	r13,QWORD[((-32))+rax]
-
-	mov	r12,QWORD[((-24))+rax]
-
-	mov	rbx,QWORD[((-16))+rax]
-
-	mov	rbp,QWORD[((-8))+rax]
-
-	lea	rsp,[rax]
-
-$L$cbc_dec_epilogue:
-	DB	0F3h,0C3h		;repret
-
-
-
-global	bsaes_ctr32_encrypt_blocks
-
-ALIGN	16
-bsaes_ctr32_encrypt_blocks:
-
-	mov	rax,rsp
-$L$ctr_enc_prologue:
-	push	rbp
-
-	push	rbx
-
-	push	r12
-
-	push	r13
-
-	push	r14
-
-	push	r15
-
-	lea	rsp,[((-72))+rsp]
-
-	mov	r10,QWORD[160+rsp]
-	lea	rsp,[((-160))+rsp]
-	movaps	XMMWORD[64+rsp],xmm6
-	movaps	XMMWORD[80+rsp],xmm7
-	movaps	XMMWORD[96+rsp],xmm8
-	movaps	XMMWORD[112+rsp],xmm9
-	movaps	XMMWORD[128+rsp],xmm10
-	movaps	XMMWORD[144+rsp],xmm11
-	movaps	XMMWORD[160+rsp],xmm12
-	movaps	XMMWORD[176+rsp],xmm13
-	movaps	XMMWORD[192+rsp],xmm14
-	movaps	XMMWORD[208+rsp],xmm15
-$L$ctr_enc_body:
-	mov	rbp,rsp
-
-	movdqu	xmm0,XMMWORD[r10]
-	mov	eax,DWORD[240+r9]
-	mov	r12,rcx
-	mov	r13,rdx
-	mov	r14,r8
-	mov	r15,r9
-	movdqa	XMMWORD[32+rbp],xmm0
-	cmp	r8,8
-	jb	NEAR $L$ctr_enc_short
-
-	mov	ebx,eax
-	shl	rax,7
-	sub	rax,96
-	sub	rsp,rax
-
-	mov	rax,rsp
-	mov	rcx,r15
-	mov	r10d,ebx
-	call	_bsaes_key_convert
-	pxor	xmm7,xmm6
-	movdqa	XMMWORD[rax],xmm7
-
-	movdqa	xmm8,XMMWORD[rsp]
-	lea	r11,[$L$ADD1]
-	movdqa	xmm15,XMMWORD[32+rbp]
-	movdqa	xmm7,XMMWORD[((-32))+r11]
-DB	102,68,15,56,0,199
-DB	102,68,15,56,0,255
-	movdqa	XMMWORD[rsp],xmm8
-	jmp	NEAR $L$ctr_enc_loop
-ALIGN	16
-$L$ctr_enc_loop:
-	movdqa	XMMWORD[32+rbp],xmm15
-	movdqa	xmm0,xmm15
-	movdqa	xmm1,xmm15
-	paddd	xmm0,XMMWORD[r11]
-	movdqa	xmm2,xmm15
-	paddd	xmm1,XMMWORD[16+r11]
-	movdqa	xmm3,xmm15
-	paddd	xmm2,XMMWORD[32+r11]
-	movdqa	xmm4,xmm15
-	paddd	xmm3,XMMWORD[48+r11]
-	movdqa	xmm5,xmm15
-	paddd	xmm4,XMMWORD[64+r11]
-	movdqa	xmm6,xmm15
-	paddd	xmm5,XMMWORD[80+r11]
-	paddd	xmm6,XMMWORD[96+r11]
-
-
-
-	movdqa	xmm8,XMMWORD[rsp]
-	lea	rax,[16+rsp]
-	movdqa	xmm7,XMMWORD[((-16))+r11]
-	pxor	xmm15,xmm8
-	pxor	xmm0,xmm8
-	pxor	xmm1,xmm8
-	pxor	xmm2,xmm8
-DB	102,68,15,56,0,255
-DB	102,15,56,0,199
-	pxor	xmm3,xmm8
-	pxor	xmm4,xmm8
-DB	102,15,56,0,207
-DB	102,15,56,0,215
-	pxor	xmm5,xmm8
-	pxor	xmm6,xmm8
-DB	102,15,56,0,223
-DB	102,15,56,0,231
-DB	102,15,56,0,239
-DB	102,15,56,0,247
-	lea	r11,[$L$BS0]
-	mov	r10d,ebx
-
-	call	_bsaes_encrypt8_bitslice
-
-	sub	r14,8
-	jc	NEAR $L$ctr_enc_loop_done
-
-	movdqu	xmm7,XMMWORD[r12]
-	movdqu	xmm8,XMMWORD[16+r12]
-	movdqu	xmm9,XMMWORD[32+r12]
-	movdqu	xmm10,XMMWORD[48+r12]
-	movdqu	xmm11,XMMWORD[64+r12]
-	movdqu	xmm12,XMMWORD[80+r12]
-	movdqu	xmm13,XMMWORD[96+r12]
-	movdqu	xmm14,XMMWORD[112+r12]
-	lea	r12,[128+r12]
-	pxor	xmm7,xmm15
-	movdqa	xmm15,XMMWORD[32+rbp]
-	pxor	xmm0,xmm8
-	movdqu	XMMWORD[r13],xmm7
-	pxor	xmm3,xmm9
-	movdqu	XMMWORD[16+r13],xmm0
-	pxor	xmm5,xmm10
-	movdqu	XMMWORD[32+r13],xmm3
-	pxor	xmm2,xmm11
-	movdqu	XMMWORD[48+r13],xmm5
-	pxor	xmm6,xmm12
-	movdqu	XMMWORD[64+r13],xmm2
-	pxor	xmm1,xmm13
-	movdqu	XMMWORD[80+r13],xmm6
-	pxor	xmm4,xmm14
-	movdqu	XMMWORD[96+r13],xmm1
-	lea	r11,[$L$ADD1]
-	movdqu	XMMWORD[112+r13],xmm4
-	lea	r13,[128+r13]
-	paddd	xmm15,XMMWORD[112+r11]
-	jnz	NEAR $L$ctr_enc_loop
-
-	jmp	NEAR $L$ctr_enc_done
-ALIGN	16
-$L$ctr_enc_loop_done:
-	add	r14,8
-	movdqu	xmm7,XMMWORD[r12]
-	pxor	xmm15,xmm7
-	movdqu	XMMWORD[r13],xmm15
-	cmp	r14,2
-	jb	NEAR $L$ctr_enc_done
-	movdqu	xmm8,XMMWORD[16+r12]
-	pxor	xmm0,xmm8
-	movdqu	XMMWORD[16+r13],xmm0
-	je	NEAR $L$ctr_enc_done
-	movdqu	xmm9,XMMWORD[32+r12]
-	pxor	xmm3,xmm9
-	movdqu	XMMWORD[32+r13],xmm3
-	cmp	r14,4
-	jb	NEAR $L$ctr_enc_done
-	movdqu	xmm10,XMMWORD[48+r12]
-	pxor	xmm5,xmm10
-	movdqu	XMMWORD[48+r13],xmm5
-	je	NEAR $L$ctr_enc_done
-	movdqu	xmm11,XMMWORD[64+r12]
-	pxor	xmm2,xmm11
-	movdqu	XMMWORD[64+r13],xmm2
-	cmp	r14,6
-	jb	NEAR $L$ctr_enc_done
-	movdqu	xmm12,XMMWORD[80+r12]
-	pxor	xmm6,xmm12
-	movdqu	XMMWORD[80+r13],xmm6
-	je	NEAR $L$ctr_enc_done
-	movdqu	xmm13,XMMWORD[96+r12]
-	pxor	xmm1,xmm13
-	movdqu	XMMWORD[96+r13],xmm1
-	jmp	NEAR $L$ctr_enc_done
-
-ALIGN	16
-$L$ctr_enc_short:
-	lea	rcx,[32+rbp]
-	lea	rdx,[48+rbp]
-	lea	r8,[r15]
-	call	asm_AES_encrypt
-	movdqu	xmm0,XMMWORD[r12]
-	lea	r12,[16+r12]
-	mov	eax,DWORD[44+rbp]
-	bswap	eax
-	pxor	xmm0,XMMWORD[48+rbp]
-	inc	eax
-	movdqu	XMMWORD[r13],xmm0
-	bswap	eax
-	lea	r13,[16+r13]
-	mov	DWORD[44+rsp],eax
-	dec	r14
-	jnz	NEAR $L$ctr_enc_short
-
-$L$ctr_enc_done:
-	lea	rax,[rsp]
-	pxor	xmm0,xmm0
-$L$ctr_enc_bzero:
-	movdqa	XMMWORD[rax],xmm0
-	movdqa	XMMWORD[16+rax],xmm0
-	lea	rax,[32+rax]
-	cmp	rbp,rax
-	ja	NEAR $L$ctr_enc_bzero
-
-	lea	rax,[120+rbp]
-
-	movaps	xmm6,XMMWORD[64+rbp]
-	movaps	xmm7,XMMWORD[80+rbp]
-	movaps	xmm8,XMMWORD[96+rbp]
-	movaps	xmm9,XMMWORD[112+rbp]
-	movaps	xmm10,XMMWORD[128+rbp]
-	movaps	xmm11,XMMWORD[144+rbp]
-	movaps	xmm12,XMMWORD[160+rbp]
-	movaps	xmm13,XMMWORD[176+rbp]
-	movaps	xmm14,XMMWORD[192+rbp]
-	movaps	xmm15,XMMWORD[208+rbp]
-	lea	rax,[160+rax]
-$L$ctr_enc_tail:
-	mov	r15,QWORD[((-48))+rax]
-
-	mov	r14,QWORD[((-40))+rax]
-
-	mov	r13,QWORD[((-32))+rax]
-
-	mov	r12,QWORD[((-24))+rax]
-
-	mov	rbx,QWORD[((-16))+rax]
-
-	mov	rbp,QWORD[((-8))+rax]
-
-	lea	rsp,[rax]
-
-$L$ctr_enc_epilogue:
-	DB	0F3h,0C3h		;repret
-
-
-global	bsaes_xts_encrypt
-
-ALIGN	16
-bsaes_xts_encrypt:
-
-	mov	rax,rsp
-$L$xts_enc_prologue:
-	push	rbp
-
-	push	rbx
-
-	push	r12
-
-	push	r13
-
-	push	r14
-
-	push	r15
-
-	lea	rsp,[((-72))+rsp]
-
-	mov	r10,QWORD[160+rsp]
-	mov	r11,QWORD[168+rsp]
-	lea	rsp,[((-160))+rsp]
-	movaps	XMMWORD[64+rsp],xmm6
-	movaps	XMMWORD[80+rsp],xmm7
-	movaps	XMMWORD[96+rsp],xmm8
-	movaps	XMMWORD[112+rsp],xmm9
-	movaps	XMMWORD[128+rsp],xmm10
-	movaps	XMMWORD[144+rsp],xmm11
-	movaps	XMMWORD[160+rsp],xmm12
-	movaps	XMMWORD[176+rsp],xmm13
-	movaps	XMMWORD[192+rsp],xmm14
-	movaps	XMMWORD[208+rsp],xmm15
-$L$xts_enc_body:
-	mov	rbp,rsp
-
-	mov	r12,rcx
-	mov	r13,rdx
-	mov	r14,r8
-	mov	r15,r9
-
-	lea	rcx,[r11]
-	lea	rdx,[32+rbp]
-	lea	r8,[r10]
-	call	asm_AES_encrypt
-
-	mov	eax,DWORD[240+r15]
-	mov	rbx,r14
-
-	mov	edx,eax
-	shl	rax,7
-	sub	rax,96
-	sub	rsp,rax
-
-	mov	rax,rsp
-	mov	rcx,r15
-	mov	r10d,edx
-	call	_bsaes_key_convert
-	pxor	xmm7,xmm6
-	movdqa	XMMWORD[rax],xmm7
-
-	and	r14,-16
-	sub	rsp,0x80
-	movdqa	xmm6,XMMWORD[32+rbp]
-
-	pxor	xmm14,xmm14
-	movdqa	xmm12,XMMWORD[$L$xts_magic]
-	pcmpgtd	xmm14,xmm6
-
-	sub	r14,0x80
-	jc	NEAR $L$xts_enc_short
-	jmp	NEAR $L$xts_enc_loop
-
-ALIGN	16
-$L$xts_enc_loop:
-	pshufd	xmm13,xmm14,0x13
-	pxor	xmm14,xmm14
-	movdqa	xmm15,xmm6
-	movdqa	XMMWORD[rsp],xmm6
-	paddq	xmm6,xmm6
-	pand	xmm13,xmm12
-	pcmpgtd	xmm14,xmm6
-	pxor	xmm6,xmm13
-	pshufd	xmm13,xmm14,0x13
-	pxor	xmm14,xmm14
-	movdqa	xmm0,xmm6
-	movdqa	XMMWORD[16+rsp],xmm6
-	paddq	xmm6,xmm6
-	pand	xmm13,xmm12
-	pcmpgtd	xmm14,xmm6
-	pxor	xmm6,xmm13
-	movdqu	xmm7,XMMWORD[r12]
-	pshufd	xmm13,xmm14,0x13
-	pxor	xmm14,xmm14
-	movdqa	xmm1,xmm6
-	movdqa	XMMWORD[32+rsp],xmm6
-	paddq	xmm6,xmm6
-	pand	xmm13,xmm12
-	pcmpgtd	xmm14,xmm6
-	pxor	xmm6,xmm13
-	movdqu	xmm8,XMMWORD[16+r12]
-	pxor	xmm15,xmm7
-	pshufd	xmm13,xmm14,0x13
-	pxor	xmm14,xmm14
-	movdqa	xmm2,xmm6
-	movdqa	XMMWORD[48+rsp],xmm6
-	paddq	xmm6,xmm6
-	pand	xmm13,xmm12
-	pcmpgtd	xmm14,xmm6
-	pxor	xmm6,xmm13
-	movdqu	xmm9,XMMWORD[32+r12]
-	pxor	xmm0,xmm8
-	pshufd	xmm13,xmm14,0x13
-	pxor	xmm14,xmm14
-	movdqa	xmm3,xmm6
-	movdqa	XMMWORD[64+rsp],xmm6
-	paddq	xmm6,xmm6
-	pand	xmm13,xmm12
-	pcmpgtd	xmm14,xmm6
-	pxor	xmm6,xmm13
-	movdqu	xmm10,XMMWORD[48+r12]
-	pxor	xmm1,xmm9
-	pshufd	xmm13,xmm14,0x13
-	pxor	xmm14,xmm14
-	movdqa	xmm4,xmm6
-	movdqa	XMMWORD[80+rsp],xmm6
-	paddq	xmm6,xmm6
-	pand	xmm13,xmm12
-	pcmpgtd	xmm14,xmm6
-	pxor	xmm6,xmm13
-	movdqu	xmm11,XMMWORD[64+r12]
-	pxor	xmm2,xmm10
-	pshufd	xmm13,xmm14,0x13
-	pxor	xmm14,xmm14
-	movdqa	xmm5,xmm6
-	movdqa	XMMWORD[96+rsp],xmm6
-	paddq	xmm6,xmm6
-	pand	xmm13,xmm12
-	pcmpgtd	xmm14,xmm6
-	pxor	xmm6,xmm13
-	movdqu	xmm12,XMMWORD[80+r12]
-	pxor	xmm3,xmm11
-	movdqu	xmm13,XMMWORD[96+r12]
-	pxor	xmm4,xmm12
-	movdqu	xmm14,XMMWORD[112+r12]
-	lea	r12,[128+r12]
-	movdqa	XMMWORD[112+rsp],xmm6
-	pxor	xmm5,xmm13
-	lea	rax,[128+rsp]
-	pxor	xmm6,xmm14
-	mov	r10d,edx
-
-	call	_bsaes_encrypt8
-
-	pxor	xmm15,XMMWORD[rsp]
-	pxor	xmm0,XMMWORD[16+rsp]
-	movdqu	XMMWORD[r13],xmm15
-	pxor	xmm3,XMMWORD[32+rsp]
-	movdqu	XMMWORD[16+r13],xmm0
-	pxor	xmm5,XMMWORD[48+rsp]
-	movdqu	XMMWORD[32+r13],xmm3
-	pxor	xmm2,XMMWORD[64+rsp]
-	movdqu	XMMWORD[48+r13],xmm5
-	pxor	xmm6,XMMWORD[80+rsp]
-	movdqu	XMMWORD[64+r13],xmm2
-	pxor	xmm1,XMMWORD[96+rsp]
-	movdqu	XMMWORD[80+r13],xmm6
-	pxor	xmm4,XMMWORD[112+rsp]
-	movdqu	XMMWORD[96+r13],xmm1
-	movdqu	XMMWORD[112+r13],xmm4
-	lea	r13,[128+r13]
-
-	movdqa	xmm6,XMMWORD[112+rsp]
-	pxor	xmm14,xmm14
-	movdqa	xmm12,XMMWORD[$L$xts_magic]
-	pcmpgtd	xmm14,xmm6
-	pshufd	xmm13,xmm14,0x13
-	pxor	xmm14,xmm14
-	paddq	xmm6,xmm6
-	pand	xmm13,xmm12
-	pcmpgtd	xmm14,xmm6
-	pxor	xmm6,xmm13
-
-	sub	r14,0x80
-	jnc	NEAR $L$xts_enc_loop
-
-$L$xts_enc_short:
-	add	r14,0x80
-	jz	NEAR $L$xts_enc_done
-	pshufd	xmm13,xmm14,0x13
-	pxor	xmm14,xmm14
-	movdqa	xmm15,xmm6
-	movdqa	XMMWORD[rsp],xmm6
-	paddq	xmm6,xmm6
-	pand	xmm13,xmm12
-	pcmpgtd	xmm14,xmm6
-	pxor	xmm6,xmm13
-	pshufd	xmm13,xmm14,0x13
-	pxor	xmm14,xmm14
-	movdqa	xmm0,xmm6
-	movdqa	XMMWORD[16+rsp],xmm6
-	paddq	xmm6,xmm6
-	pand	xmm13,xmm12
-	pcmpgtd	xmm14,xmm6
-	pxor	xmm6,xmm13
-	movdqu	xmm7,XMMWORD[r12]
-	cmp	r14,16
-	je	NEAR $L$xts_enc_1
-	pshufd	xmm13,xmm14,0x13
-	pxor	xmm14,xmm14
-	movdqa	xmm1,xmm6
-	movdqa	XMMWORD[32+rsp],xmm6
-	paddq	xmm6,xmm6
-	pand	xmm13,xmm12
-	pcmpgtd	xmm14,xmm6
-	pxor	xmm6,xmm13
-	movdqu	xmm8,XMMWORD[16+r12]
-	cmp	r14,32
-	je	NEAR $L$xts_enc_2
-	pxor	xmm15,xmm7
-	pshufd	xmm13,xmm14,0x13
-	pxor	xmm14,xmm14
-	movdqa	xmm2,xmm6
-	movdqa	XMMWORD[48+rsp],xmm6
-	paddq	xmm6,xmm6
-	pand	xmm13,xmm12
-	pcmpgtd	xmm14,xmm6
-	pxor	xmm6,xmm13
-	movdqu	xmm9,XMMWORD[32+r12]
-	cmp	r14,48
-	je	NEAR $L$xts_enc_3
-	pxor	xmm0,xmm8
-	pshufd	xmm13,xmm14,0x13
-	pxor	xmm14,xmm14
-	movdqa	xmm3,xmm6
-	movdqa	XMMWORD[64+rsp],xmm6
-	paddq	xmm6,xmm6
-	pand	xmm13,xmm12
-	pcmpgtd	xmm14,xmm6
-	pxor	xmm6,xmm13
-	movdqu	xmm10,XMMWORD[48+r12]
-	cmp	r14,64
-	je	NEAR $L$xts_enc_4
-	pxor	xmm1,xmm9
-	pshufd	xmm13,xmm14,0x13
-	pxor	xmm14,xmm14
-	movdqa	xmm4,xmm6
-	movdqa	XMMWORD[80+rsp],xmm6
-	paddq	xmm6,xmm6
-	pand	xmm13,xmm12
-	pcmpgtd	xmm14,xmm6
-	pxor	xmm6,xmm13
-	movdqu	xmm11,XMMWORD[64+r12]
-	cmp	r14,80
-	je	NEAR $L$xts_enc_5
-	pxor	xmm2,xmm10
-	pshufd	xmm13,xmm14,0x13
-	pxor	xmm14,xmm14
-	movdqa	xmm5,xmm6
-	movdqa	XMMWORD[96+rsp],xmm6
-	paddq	xmm6,xmm6
-	pand	xmm13,xmm12
-	pcmpgtd	xmm14,xmm6
-	pxor	xmm6,xmm13
-	movdqu	xmm12,XMMWORD[80+r12]
-	cmp	r14,96
-	je	NEAR $L$xts_enc_6
-	pxor	xmm3,xmm11
-	movdqu	xmm13,XMMWORD[96+r12]
-	pxor	xmm4,xmm12
-	movdqa	XMMWORD[112+rsp],xmm6
-	lea	r12,[112+r12]
-	pxor	xmm5,xmm13
-	lea	rax,[128+rsp]
-	mov	r10d,edx
-
-	call	_bsaes_encrypt8
-
-	pxor	xmm15,XMMWORD[rsp]
-	pxor	xmm0,XMMWORD[16+rsp]
-	movdqu	XMMWORD[r13],xmm15
-	pxor	xmm3,XMMWORD[32+rsp]
-	movdqu	XMMWORD[16+r13],xmm0
-	pxor	xmm5,XMMWORD[48+rsp]
-	movdqu	XMMWORD[32+r13],xmm3
-	pxor	xmm2,XMMWORD[64+rsp]
-	movdqu	XMMWORD[48+r13],xmm5
-	pxor	xmm6,XMMWORD[80+rsp]
-	movdqu	XMMWORD[64+r13],xmm2
-	pxor	xmm1,XMMWORD[96+rsp]
-	movdqu	XMMWORD[80+r13],xmm6
-	movdqu	XMMWORD[96+r13],xmm1
-	lea	r13,[112+r13]
-
-	movdqa	xmm6,XMMWORD[112+rsp]
-	jmp	NEAR $L$xts_enc_done
-ALIGN	16
-$L$xts_enc_6:
-	pxor	xmm3,xmm11
-	lea	r12,[96+r12]
-	pxor	xmm4,xmm12
-	lea	rax,[128+rsp]
-	mov	r10d,edx
-
-	call	_bsaes_encrypt8
-
-	pxor	xmm15,XMMWORD[rsp]
-	pxor	xmm0,XMMWORD[16+rsp]
-	movdqu	XMMWORD[r13],xmm15
-	pxor	xmm3,XMMWORD[32+rsp]
-	movdqu	XMMWORD[16+r13],xmm0
-	pxor	xmm5,XMMWORD[48+rsp]
-	movdqu	XMMWORD[32+r13],xmm3
-	pxor	xmm2,XMMWORD[64+rsp]
-	movdqu	XMMWORD[48+r13],xmm5
-	pxor	xmm6,XMMWORD[80+rsp]
-	movdqu	XMMWORD[64+r13],xmm2
-	movdqu	XMMWORD[80+r13],xmm6
-	lea	r13,[96+r13]
-
-	movdqa	xmm6,XMMWORD[96+rsp]
-	jmp	NEAR $L$xts_enc_done
-ALIGN	16
-$L$xts_enc_5:
-	pxor	xmm2,xmm10
-	lea	r12,[80+r12]
-	pxor	xmm3,xmm11
-	lea	rax,[128+rsp]
-	mov	r10d,edx
-
-	call	_bsaes_encrypt8
-
-	pxor	xmm15,XMMWORD[rsp]
-	pxor	xmm0,XMMWORD[16+rsp]
-	movdqu	XMMWORD[r13],xmm15
-	pxor	xmm3,XMMWORD[32+rsp]
-	movdqu	XMMWORD[16+r13],xmm0
-	pxor	xmm5,XMMWORD[48+rsp]
-	movdqu	XMMWORD[32+r13],xmm3
-	pxor	xmm2,XMMWORD[64+rsp]
-	movdqu	XMMWORD[48+r13],xmm5
-	movdqu	XMMWORD[64+r13],xmm2
-	lea	r13,[80+r13]
-
-	movdqa	xmm6,XMMWORD[80+rsp]
-	jmp	NEAR $L$xts_enc_done
-ALIGN	16
-$L$xts_enc_4:
-	pxor	xmm1,xmm9
-	lea	r12,[64+r12]
-	pxor	xmm2,xmm10
-	lea	rax,[128+rsp]
-	mov	r10d,edx
-
-	call	_bsaes_encrypt8
-
-	pxor	xmm15,XMMWORD[rsp]
-	pxor	xmm0,XMMWORD[16+rsp]
-	movdqu	XMMWORD[r13],xmm15
-	pxor	xmm3,XMMWORD[32+rsp]
-	movdqu	XMMWORD[16+r13],xmm0
-	pxor	xmm5,XMMWORD[48+rsp]
-	movdqu	XMMWORD[32+r13],xmm3
-	movdqu	XMMWORD[48+r13],xmm5
-	lea	r13,[64+r13]
-
-	movdqa	xmm6,XMMWORD[64+rsp]
-	jmp	NEAR $L$xts_enc_done
-ALIGN	16
-$L$xts_enc_3:
-	pxor	xmm0,xmm8
-	lea	r12,[48+r12]
-	pxor	xmm1,xmm9
-	lea	rax,[128+rsp]
-	mov	r10d,edx
-
-	call	_bsaes_encrypt8
-
-	pxor	xmm15,XMMWORD[rsp]
-	pxor	xmm0,XMMWORD[16+rsp]
-	movdqu	XMMWORD[r13],xmm15
-	pxor	xmm3,XMMWORD[32+rsp]
-	movdqu	XMMWORD[16+r13],xmm0
-	movdqu	XMMWORD[32+r13],xmm3
-	lea	r13,[48+r13]
-
-	movdqa	xmm6,XMMWORD[48+rsp]
-	jmp	NEAR $L$xts_enc_done
-ALIGN	16
-$L$xts_enc_2:
-	pxor	xmm15,xmm7
-	lea	r12,[32+r12]
-	pxor	xmm0,xmm8
-	lea	rax,[128+rsp]
-	mov	r10d,edx
-
-	call	_bsaes_encrypt8
-
-	pxor	xmm15,XMMWORD[rsp]
-	pxor	xmm0,XMMWORD[16+rsp]
-	movdqu	XMMWORD[r13],xmm15
-	movdqu	XMMWORD[16+r13],xmm0
-	lea	r13,[32+r13]
-
-	movdqa	xmm6,XMMWORD[32+rsp]
-	jmp	NEAR $L$xts_enc_done
-ALIGN	16
-$L$xts_enc_1:
-	pxor	xmm7,xmm15
-	lea	r12,[16+r12]
-	movdqa	XMMWORD[32+rbp],xmm7
-	lea	rcx,[32+rbp]
-	lea	rdx,[32+rbp]
-	lea	r8,[r15]
-	call	asm_AES_encrypt
-	pxor	xmm15,XMMWORD[32+rbp]
-
-
-
-
-
-	movdqu	XMMWORD[r13],xmm15
-	lea	r13,[16+r13]
-
-	movdqa	xmm6,XMMWORD[16+rsp]
-
-$L$xts_enc_done:
-	and	ebx,15
-	jz	NEAR $L$xts_enc_ret
-	mov	rdx,r13
-
-$L$xts_enc_steal:
-	movzx	eax,BYTE[r12]
-	movzx	ecx,BYTE[((-16))+rdx]
-	lea	r12,[1+r12]
-	mov	BYTE[((-16))+rdx],al
-	mov	BYTE[rdx],cl
-	lea	rdx,[1+rdx]
-	sub	ebx,1
-	jnz	NEAR $L$xts_enc_steal
-
-	movdqu	xmm15,XMMWORD[((-16))+r13]
-	lea	rcx,[32+rbp]
-	pxor	xmm15,xmm6
-	lea	rdx,[32+rbp]
-	movdqa	XMMWORD[32+rbp],xmm15
-	lea	r8,[r15]
-	call	asm_AES_encrypt
-	pxor	xmm6,XMMWORD[32+rbp]
-	movdqu	XMMWORD[(-16)+r13],xmm6
-
-$L$xts_enc_ret:
-	lea	rax,[rsp]
-	pxor	xmm0,xmm0
-$L$xts_enc_bzero:
-	movdqa	XMMWORD[rax],xmm0
-	movdqa	XMMWORD[16+rax],xmm0
-	lea	rax,[32+rax]
-	cmp	rbp,rax
-	ja	NEAR $L$xts_enc_bzero
-
-	lea	rax,[120+rbp]
-
-	movaps	xmm6,XMMWORD[64+rbp]
-	movaps	xmm7,XMMWORD[80+rbp]
-	movaps	xmm8,XMMWORD[96+rbp]
-	movaps	xmm9,XMMWORD[112+rbp]
-	movaps	xmm10,XMMWORD[128+rbp]
-	movaps	xmm11,XMMWORD[144+rbp]
-	movaps	xmm12,XMMWORD[160+rbp]
-	movaps	xmm13,XMMWORD[176+rbp]
-	movaps	xmm14,XMMWORD[192+rbp]
-	movaps	xmm15,XMMWORD[208+rbp]
-	lea	rax,[160+rax]
-$L$xts_enc_tail:
-	mov	r15,QWORD[((-48))+rax]
-
-	mov	r14,QWORD[((-40))+rax]
-
-	mov	r13,QWORD[((-32))+rax]
-
-	mov	r12,QWORD[((-24))+rax]
-
-	mov	rbx,QWORD[((-16))+rax]
-
-	mov	rbp,QWORD[((-8))+rax]
-
-	lea	rsp,[rax]
-
-$L$xts_enc_epilogue:
-	DB	0F3h,0C3h		;repret
-
-
-
-global	bsaes_xts_decrypt
-
-ALIGN	16
-bsaes_xts_decrypt:
-
-	mov	rax,rsp
-$L$xts_dec_prologue:
-	push	rbp
-
-	push	rbx
-
-	push	r12
-
-	push	r13
-
-	push	r14
-
-	push	r15
-
-	lea	rsp,[((-72))+rsp]
-
-	mov	r10,QWORD[160+rsp]
-	mov	r11,QWORD[168+rsp]
-	lea	rsp,[((-160))+rsp]
-	movaps	XMMWORD[64+rsp],xmm6
-	movaps	XMMWORD[80+rsp],xmm7
-	movaps	XMMWORD[96+rsp],xmm8
-	movaps	XMMWORD[112+rsp],xmm9
-	movaps	XMMWORD[128+rsp],xmm10
-	movaps	XMMWORD[144+rsp],xmm11
-	movaps	XMMWORD[160+rsp],xmm12
-	movaps	XMMWORD[176+rsp],xmm13
-	movaps	XMMWORD[192+rsp],xmm14
-	movaps	XMMWORD[208+rsp],xmm15
-$L$xts_dec_body:
-	mov	rbp,rsp
-	mov	r12,rcx
-	mov	r13,rdx
-	mov	r14,r8
-	mov	r15,r9
-
-	lea	rcx,[r11]
-	lea	rdx,[32+rbp]
-	lea	r8,[r10]
-	call	asm_AES_encrypt
-
-	mov	eax,DWORD[240+r15]
-	mov	rbx,r14
-
-	mov	edx,eax
-	shl	rax,7
-	sub	rax,96
-	sub	rsp,rax
-
-	mov	rax,rsp
-	mov	rcx,r15
-	mov	r10d,edx
-	call	_bsaes_key_convert
-	pxor	xmm7,XMMWORD[rsp]
-	movdqa	XMMWORD[rax],xmm6
-	movdqa	XMMWORD[rsp],xmm7
-
-	xor	eax,eax
-	and	r14,-16
-	test	ebx,15
-	setnz	al
-	shl	rax,4
-	sub	r14,rax
-
-	sub	rsp,0x80
-	movdqa	xmm6,XMMWORD[32+rbp]
-
-	pxor	xmm14,xmm14
-	movdqa	xmm12,XMMWORD[$L$xts_magic]
-	pcmpgtd	xmm14,xmm6
-
-	sub	r14,0x80
-	jc	NEAR $L$xts_dec_short
-	jmp	NEAR $L$xts_dec_loop
-
-ALIGN	16
-$L$xts_dec_loop:
-	pshufd	xmm13,xmm14,0x13
-	pxor	xmm14,xmm14
-	movdqa	xmm15,xmm6
-	movdqa	XMMWORD[rsp],xmm6
-	paddq	xmm6,xmm6
-	pand	xmm13,xmm12
-	pcmpgtd	xmm14,xmm6
-	pxor	xmm6,xmm13
-	pshufd	xmm13,xmm14,0x13
-	pxor	xmm14,xmm14
-	movdqa	xmm0,xmm6
-	movdqa	XMMWORD[16+rsp],xmm6
-	paddq	xmm6,xmm6
-	pand	xmm13,xmm12
-	pcmpgtd	xmm14,xmm6
-	pxor	xmm6,xmm13
-	movdqu	xmm7,XMMWORD[r12]
-	pshufd	xmm13,xmm14,0x13
-	pxor	xmm14,xmm14
-	movdqa	xmm1,xmm6
-	movdqa	XMMWORD[32+rsp],xmm6
-	paddq	xmm6,xmm6
-	pand	xmm13,xmm12
-	pcmpgtd	xmm14,xmm6
-	pxor	xmm6,xmm13
-	movdqu	xmm8,XMMWORD[16+r12]
-	pxor	xmm15,xmm7
-	pshufd	xmm13,xmm14,0x13
-	pxor	xmm14,xmm14
-	movdqa	xmm2,xmm6
-	movdqa	XMMWORD[48+rsp],xmm6
-	paddq	xmm6,xmm6
-	pand	xmm13,xmm12
-	pcmpgtd	xmm14,xmm6
-	pxor	xmm6,xmm13
-	movdqu	xmm9,XMMWORD[32+r12]
-	pxor	xmm0,xmm8
-	pshufd	xmm13,xmm14,0x13
-	pxor	xmm14,xmm14
-	movdqa	xmm3,xmm6
-	movdqa	XMMWORD[64+rsp],xmm6
-	paddq	xmm6,xmm6
-	pand	xmm13,xmm12
-	pcmpgtd	xmm14,xmm6
-	pxor	xmm6,xmm13
-	movdqu	xmm10,XMMWORD[48+r12]
-	pxor	xmm1,xmm9
-	pshufd	xmm13,xmm14,0x13
-	pxor	xmm14,xmm14
-	movdqa	xmm4,xmm6
-	movdqa	XMMWORD[80+rsp],xmm6
-	paddq	xmm6,xmm6
-	pand	xmm13,xmm12
-	pcmpgtd	xmm14,xmm6
-	pxor	xmm6,xmm13
-	movdqu	xmm11,XMMWORD[64+r12]
-	pxor	xmm2,xmm10
-	pshufd	xmm13,xmm14,0x13
-	pxor	xmm14,xmm14
-	movdqa	xmm5,xmm6
-	movdqa	XMMWORD[96+rsp],xmm6
-	paddq	xmm6,xmm6
-	pand	xmm13,xmm12
-	pcmpgtd	xmm14,xmm6
-	pxor	xmm6,xmm13
-	movdqu	xmm12,XMMWORD[80+r12]
-	pxor	xmm3,xmm11
-	movdqu	xmm13,XMMWORD[96+r12]
-	pxor	xmm4,xmm12
-	movdqu	xmm14,XMMWORD[112+r12]
-	lea	r12,[128+r12]
-	movdqa	XMMWORD[112+rsp],xmm6
-	pxor	xmm5,xmm13
-	lea	rax,[128+rsp]
-	pxor	xmm6,xmm14
-	mov	r10d,edx
-
-	call	_bsaes_decrypt8
-
-	pxor	xmm15,XMMWORD[rsp]
-	pxor	xmm0,XMMWORD[16+rsp]
-	movdqu	XMMWORD[r13],xmm15
-	pxor	xmm5,XMMWORD[32+rsp]
-	movdqu	XMMWORD[16+r13],xmm0
-	pxor	xmm3,XMMWORD[48+rsp]
-	movdqu	XMMWORD[32+r13],xmm5
-	pxor	xmm1,XMMWORD[64+rsp]
-	movdqu	XMMWORD[48+r13],xmm3
-	pxor	xmm6,XMMWORD[80+rsp]
-	movdqu	XMMWORD[64+r13],xmm1
-	pxor	xmm2,XMMWORD[96+rsp]
-	movdqu	XMMWORD[80+r13],xmm6
-	pxor	xmm4,XMMWORD[112+rsp]
-	movdqu	XMMWORD[96+r13],xmm2
-	movdqu	XMMWORD[112+r13],xmm4
-	lea	r13,[128+r13]
-
-	movdqa	xmm6,XMMWORD[112+rsp]
-	pxor	xmm14,xmm14
-	movdqa	xmm12,XMMWORD[$L$xts_magic]
-	pcmpgtd	xmm14,xmm6
-	pshufd	xmm13,xmm14,0x13
-	pxor	xmm14,xmm14
-	paddq	xmm6,xmm6
-	pand	xmm13,xmm12
-	pcmpgtd	xmm14,xmm6
-	pxor	xmm6,xmm13
-
-	sub	r14,0x80
-	jnc	NEAR $L$xts_dec_loop
-
-$L$xts_dec_short:
-	add	r14,0x80
-	jz	NEAR $L$xts_dec_done
-	pshufd	xmm13,xmm14,0x13
-	pxor	xmm14,xmm14
-	movdqa	xmm15,xmm6
-	movdqa	XMMWORD[rsp],xmm6
-	paddq	xmm6,xmm6
-	pand	xmm13,xmm12
-	pcmpgtd	xmm14,xmm6
-	pxor	xmm6,xmm13
-	pshufd	xmm13,xmm14,0x13
-	pxor	xmm14,xmm14
-	movdqa	xmm0,xmm6
-	movdqa	XMMWORD[16+rsp],xmm6
-	paddq	xmm6,xmm6
-	pand	xmm13,xmm12
-	pcmpgtd	xmm14,xmm6
-	pxor	xmm6,xmm13
-	movdqu	xmm7,XMMWORD[r12]
-	cmp	r14,16
-	je	NEAR $L$xts_dec_1
-	pshufd	xmm13,xmm14,0x13
-	pxor	xmm14,xmm14
-	movdqa	xmm1,xmm6
-	movdqa	XMMWORD[32+rsp],xmm6
-	paddq	xmm6,xmm6
-	pand	xmm13,xmm12
-	pcmpgtd	xmm14,xmm6
-	pxor	xmm6,xmm13
-	movdqu	xmm8,XMMWORD[16+r12]
-	cmp	r14,32
-	je	NEAR $L$xts_dec_2
-	pxor	xmm15,xmm7
-	pshufd	xmm13,xmm14,0x13
-	pxor	xmm14,xmm14
-	movdqa	xmm2,xmm6
-	movdqa	XMMWORD[48+rsp],xmm6
-	paddq	xmm6,xmm6
-	pand	xmm13,xmm12
-	pcmpgtd	xmm14,xmm6
-	pxor	xmm6,xmm13
-	movdqu	xmm9,XMMWORD[32+r12]
-	cmp	r14,48
-	je	NEAR $L$xts_dec_3
-	pxor	xmm0,xmm8
-	pshufd	xmm13,xmm14,0x13
-	pxor	xmm14,xmm14
-	movdqa	xmm3,xmm6
-	movdqa	XMMWORD[64+rsp],xmm6
-	paddq	xmm6,xmm6
-	pand	xmm13,xmm12
-	pcmpgtd	xmm14,xmm6
-	pxor	xmm6,xmm13
-	movdqu	xmm10,XMMWORD[48+r12]
-	cmp	r14,64
-	je	NEAR $L$xts_dec_4
-	pxor	xmm1,xmm9
-	pshufd	xmm13,xmm14,0x13
-	pxor	xmm14,xmm14
-	movdqa	xmm4,xmm6
-	movdqa	XMMWORD[80+rsp],xmm6
-	paddq	xmm6,xmm6
-	pand	xmm13,xmm12
-	pcmpgtd	xmm14,xmm6
-	pxor	xmm6,xmm13
-	movdqu	xmm11,XMMWORD[64+r12]
-	cmp	r14,80
-	je	NEAR $L$xts_dec_5
-	pxor	xmm2,xmm10
-	pshufd	xmm13,xmm14,0x13
-	pxor	xmm14,xmm14
-	movdqa	xmm5,xmm6
-	movdqa	XMMWORD[96+rsp],xmm6
-	paddq	xmm6,xmm6
-	pand	xmm13,xmm12
-	pcmpgtd	xmm14,xmm6
-	pxor	xmm6,xmm13
-	movdqu	xmm12,XMMWORD[80+r12]
-	cmp	r14,96
-	je	NEAR $L$xts_dec_6
-	pxor	xmm3,xmm11
-	movdqu	xmm13,XMMWORD[96+r12]
-	pxor	xmm4,xmm12
-	movdqa	XMMWORD[112+rsp],xmm6
-	lea	r12,[112+r12]
-	pxor	xmm5,xmm13
-	lea	rax,[128+rsp]
-	mov	r10d,edx
-
-	call	_bsaes_decrypt8
-
-	pxor	xmm15,XMMWORD[rsp]
-	pxor	xmm0,XMMWORD[16+rsp]
-	movdqu	XMMWORD[r13],xmm15
-	pxor	xmm5,XMMWORD[32+rsp]
-	movdqu	XMMWORD[16+r13],xmm0
-	pxor	xmm3,XMMWORD[48+rsp]
-	movdqu	XMMWORD[32+r13],xmm5
-	pxor	xmm1,XMMWORD[64+rsp]
-	movdqu	XMMWORD[48+r13],xmm3
-	pxor	xmm6,XMMWORD[80+rsp]
-	movdqu	XMMWORD[64+r13],xmm1
-	pxor	xmm2,XMMWORD[96+rsp]
-	movdqu	XMMWORD[80+r13],xmm6
-	movdqu	XMMWORD[96+r13],xmm2
-	lea	r13,[112+r13]
-
-	movdqa	xmm6,XMMWORD[112+rsp]
-	jmp	NEAR $L$xts_dec_done
-ALIGN	16
-$L$xts_dec_6:
-	pxor	xmm3,xmm11
-	lea	r12,[96+r12]
-	pxor	xmm4,xmm12
-	lea	rax,[128+rsp]
-	mov	r10d,edx
-
-	call	_bsaes_decrypt8
-
-	pxor	xmm15,XMMWORD[rsp]
-	pxor	xmm0,XMMWORD[16+rsp]
-	movdqu	XMMWORD[r13],xmm15
-	pxor	xmm5,XMMWORD[32+rsp]
-	movdqu	XMMWORD[16+r13],xmm0
-	pxor	xmm3,XMMWORD[48+rsp]
-	movdqu	XMMWORD[32+r13],xmm5
-	pxor	xmm1,XMMWORD[64+rsp]
-	movdqu	XMMWORD[48+r13],xmm3
-	pxor	xmm6,XMMWORD[80+rsp]
-	movdqu	XMMWORD[64+r13],xmm1
-	movdqu	XMMWORD[80+r13],xmm6
-	lea	r13,[96+r13]
-
-	movdqa	xmm6,XMMWORD[96+rsp]
-	jmp	NEAR $L$xts_dec_done
-ALIGN	16
-$L$xts_dec_5:
-	pxor	xmm2,xmm10
-	lea	r12,[80+r12]
-	pxor	xmm3,xmm11
-	lea	rax,[128+rsp]
-	mov	r10d,edx
-
-	call	_bsaes_decrypt8
-
-	pxor	xmm15,XMMWORD[rsp]
-	pxor	xmm0,XMMWORD[16+rsp]
-	movdqu	XMMWORD[r13],xmm15
-	pxor	xmm5,XMMWORD[32+rsp]
-	movdqu	XMMWORD[16+r13],xmm0
-	pxor	xmm3,XMMWORD[48+rsp]
-	movdqu	XMMWORD[32+r13],xmm5
-	pxor	xmm1,XMMWORD[64+rsp]
-	movdqu	XMMWORD[48+r13],xmm3
-	movdqu	XMMWORD[64+r13],xmm1
-	lea	r13,[80+r13]
-
-	movdqa	xmm6,XMMWORD[80+rsp]
-	jmp	NEAR $L$xts_dec_done
-ALIGN	16
-$L$xts_dec_4:
-	pxor	xmm1,xmm9
-	lea	r12,[64+r12]
-	pxor	xmm2,xmm10
-	lea	rax,[128+rsp]
-	mov	r10d,edx
-
-	call	_bsaes_decrypt8
-
-	pxor	xmm15,XMMWORD[rsp]
-	pxor	xmm0,XMMWORD[16+rsp]
-	movdqu	XMMWORD[r13],xmm15
-	pxor	xmm5,XMMWORD[32+rsp]
-	movdqu	XMMWORD[16+r13],xmm0
-	pxor	xmm3,XMMWORD[48+rsp]
-	movdqu	XMMWORD[32+r13],xmm5
-	movdqu	XMMWORD[48+r13],xmm3
-	lea	r13,[64+r13]
-
-	movdqa	xmm6,XMMWORD[64+rsp]
-	jmp	NEAR $L$xts_dec_done
-ALIGN	16
-$L$xts_dec_3:
-	pxor	xmm0,xmm8
-	lea	r12,[48+r12]
-	pxor	xmm1,xmm9
-	lea	rax,[128+rsp]
-	mov	r10d,edx
-
-	call	_bsaes_decrypt8
-
-	pxor	xmm15,XMMWORD[rsp]
-	pxor	xmm0,XMMWORD[16+rsp]
-	movdqu	XMMWORD[r13],xmm15
-	pxor	xmm5,XMMWORD[32+rsp]
-	movdqu	XMMWORD[16+r13],xmm0
-	movdqu	XMMWORD[32+r13],xmm5
-	lea	r13,[48+r13]
-
-	movdqa	xmm6,XMMWORD[48+rsp]
-	jmp	NEAR $L$xts_dec_done
-ALIGN	16
-$L$xts_dec_2:
-	pxor	xmm15,xmm7
-	lea	r12,[32+r12]
-	pxor	xmm0,xmm8
-	lea	rax,[128+rsp]
-	mov	r10d,edx
-
-	call	_bsaes_decrypt8
-
-	pxor	xmm15,XMMWORD[rsp]
-	pxor	xmm0,XMMWORD[16+rsp]
-	movdqu	XMMWORD[r13],xmm15
-	movdqu	XMMWORD[16+r13],xmm0
-	lea	r13,[32+r13]
-
-	movdqa	xmm6,XMMWORD[32+rsp]
-	jmp	NEAR $L$xts_dec_done
-ALIGN	16
-$L$xts_dec_1:
-	pxor	xmm7,xmm15
-	lea	r12,[16+r12]
-	movdqa	XMMWORD[32+rbp],xmm7
-	lea	rcx,[32+rbp]
-	lea	rdx,[32+rbp]
-	lea	r8,[r15]
-	call	asm_AES_decrypt
-	pxor	xmm15,XMMWORD[32+rbp]
-
-
-
-
-
-	movdqu	XMMWORD[r13],xmm15
-	lea	r13,[16+r13]
-
-	movdqa	xmm6,XMMWORD[16+rsp]
-
-$L$xts_dec_done:
-	and	ebx,15
-	jz	NEAR $L$xts_dec_ret
-
-	pxor	xmm14,xmm14
-	movdqa	xmm12,XMMWORD[$L$xts_magic]
-	pcmpgtd	xmm14,xmm6
-	pshufd	xmm13,xmm14,0x13
-	movdqa	xmm5,xmm6
-	paddq	xmm6,xmm6
-	pand	xmm13,xmm12
-	movdqu	xmm15,XMMWORD[r12]
-	pxor	xmm6,xmm13
-
-	lea	rcx,[32+rbp]
-	pxor	xmm15,xmm6
-	lea	rdx,[32+rbp]
-	movdqa	XMMWORD[32+rbp],xmm15
-	lea	r8,[r15]
-	call	asm_AES_decrypt
-	pxor	xmm6,XMMWORD[32+rbp]
-	mov	rdx,r13
-	movdqu	XMMWORD[r13],xmm6
-
-$L$xts_dec_steal:
-	movzx	eax,BYTE[16+r12]
-	movzx	ecx,BYTE[rdx]
-	lea	r12,[1+r12]
-	mov	BYTE[rdx],al
-	mov	BYTE[16+rdx],cl
-	lea	rdx,[1+rdx]
-	sub	ebx,1
-	jnz	NEAR $L$xts_dec_steal
-
-	movdqu	xmm15,XMMWORD[r13]
-	lea	rcx,[32+rbp]
-	pxor	xmm15,xmm5
-	lea	rdx,[32+rbp]
-	movdqa	XMMWORD[32+rbp],xmm15
-	lea	r8,[r15]
-	call	asm_AES_decrypt
-	pxor	xmm5,XMMWORD[32+rbp]
-	movdqu	XMMWORD[r13],xmm5
-
-$L$xts_dec_ret:
-	lea	rax,[rsp]
-	pxor	xmm0,xmm0
-$L$xts_dec_bzero:
-	movdqa	XMMWORD[rax],xmm0
-	movdqa	XMMWORD[16+rax],xmm0
-	lea	rax,[32+rax]
-	cmp	rbp,rax
-	ja	NEAR $L$xts_dec_bzero
-
-	lea	rax,[120+rbp]
-
-	movaps	xmm6,XMMWORD[64+rbp]
-	movaps	xmm7,XMMWORD[80+rbp]
-	movaps	xmm8,XMMWORD[96+rbp]
-	movaps	xmm9,XMMWORD[112+rbp]
-	movaps	xmm10,XMMWORD[128+rbp]
-	movaps	xmm11,XMMWORD[144+rbp]
-	movaps	xmm12,XMMWORD[160+rbp]
-	movaps	xmm13,XMMWORD[176+rbp]
-	movaps	xmm14,XMMWORD[192+rbp]
-	movaps	xmm15,XMMWORD[208+rbp]
-	lea	rax,[160+rax]
-$L$xts_dec_tail:
-	mov	r15,QWORD[((-48))+rax]
-
-	mov	r14,QWORD[((-40))+rax]
-
-	mov	r13,QWORD[((-32))+rax]
-
-	mov	r12,QWORD[((-24))+rax]
-
-	mov	rbx,QWORD[((-16))+rax]
-
-	mov	rbp,QWORD[((-8))+rax]
-
-	lea	rsp,[rax]
-
-$L$xts_dec_epilogue:
-	DB	0F3h,0C3h		;repret
-
-
-
-ALIGN	64
-_bsaes_const:
-$L$M0ISR:
-	DQ	0x0a0e0206070b0f03,0x0004080c0d010509
-$L$ISRM0:
-	DQ	0x01040b0e0205080f,0x0306090c00070a0d
-$L$ISR:
-	DQ	0x0504070602010003,0x0f0e0d0c080b0a09
-$L$BS0:
-	DQ	0x5555555555555555,0x5555555555555555
-$L$BS1:
-	DQ	0x3333333333333333,0x3333333333333333
-$L$BS2:
-	DQ	0x0f0f0f0f0f0f0f0f,0x0f0f0f0f0f0f0f0f
-$L$SR:
-	DQ	0x0504070600030201,0x0f0e0d0c0a09080b
-$L$SRM0:
-	DQ	0x0304090e00050a0f,0x01060b0c0207080d
-$L$M0SR:
-	DQ	0x0a0e02060f03070b,0x0004080c05090d01
-$L$SWPUP:
-	DQ	0x0706050403020100,0x0c0d0e0f0b0a0908
-$L$SWPUPM0SR:
-	DQ	0x0a0d02060c03070b,0x0004080f05090e01
-$L$ADD1:
-	DQ	0x0000000000000000,0x0000000100000000
-$L$ADD2:
-	DQ	0x0000000000000000,0x0000000200000000
-$L$ADD3:
-	DQ	0x0000000000000000,0x0000000300000000
-$L$ADD4:
-	DQ	0x0000000000000000,0x0000000400000000
-$L$ADD5:
-	DQ	0x0000000000000000,0x0000000500000000
-$L$ADD6:
-	DQ	0x0000000000000000,0x0000000600000000
-$L$ADD7:
-	DQ	0x0000000000000000,0x0000000700000000
-$L$ADD8:
-	DQ	0x0000000000000000,0x0000000800000000
-$L$xts_magic:
-	DD	0x87,0,1,0
-$L$masks:
-	DQ	0x0101010101010101,0x0101010101010101
-	DQ	0x0202020202020202,0x0202020202020202
-	DQ	0x0404040404040404,0x0404040404040404
-	DQ	0x0808080808080808,0x0808080808080808
-$L$M0:
-	DQ	0x02060a0e03070b0f,0x0004080c0105090d
-$L$63:
-	DQ	0x6363636363636363,0x6363636363636363
-DB	66,105,116,45,115,108,105,99,101,100,32,65,69,83,32,102
-DB	111,114,32,120,56,54,95,54,52,47,83,83,83,69,51,44
-DB	32,69,109,105,108,105,97,32,75,195,164,115,112,101,114,44
-DB	32,80,101,116,101,114,32,83,99,104,119,97,98,101,44,32
-DB	65,110,100,121,32,80,111,108,121,97,107,111,118,0
-ALIGN	64
-
-EXTERN	__imp_RtlVirtualUnwind
-
-ALIGN	16
-se_handler:
-	push	rsi
-	push	rdi
-	push	rbx
-	push	rbp
-	push	r12
-	push	r13
-	push	r14
-	push	r15
-	pushfq
-	sub	rsp,64
-
-	mov	rax,QWORD[120+r8]
-	mov	rbx,QWORD[248+r8]
-
-	mov	rsi,QWORD[8+r9]
-	mov	r11,QWORD[56+r9]
-
-	mov	r10d,DWORD[r11]
-	lea	r10,[r10*1+rsi]
-	cmp	rbx,r10
-	jbe	NEAR $L$in_prologue
-
-	mov	r10d,DWORD[4+r11]
-	lea	r10,[r10*1+rsi]
-	cmp	rbx,r10
-	jae	NEAR $L$in_prologue
-
-	mov	r10d,DWORD[8+r11]
-	lea	r10,[r10*1+rsi]
-	cmp	rbx,r10
-	jae	NEAR $L$in_tail
-
-	mov	rax,QWORD[160+r8]
-
-	lea	rsi,[64+rax]
-	lea	rdi,[512+r8]
-	mov	ecx,20
-	DD	0xa548f3fc
-	lea	rax,[((160+120))+rax]
-
-$L$in_tail:
-	mov	rbp,QWORD[((-48))+rax]
-	mov	rbx,QWORD[((-40))+rax]
-	mov	r12,QWORD[((-32))+rax]
-	mov	r13,QWORD[((-24))+rax]
-	mov	r14,QWORD[((-16))+rax]
-	mov	r15,QWORD[((-8))+rax]
-	mov	QWORD[144+r8],rbx
-	mov	QWORD[160+r8],rbp
-	mov	QWORD[216+r8],r12
-	mov	QWORD[224+r8],r13
-	mov	QWORD[232+r8],r14
-	mov	QWORD[240+r8],r15
-
-$L$in_prologue:
-	mov	QWORD[152+r8],rax
-
-	mov	rdi,QWORD[40+r9]
-	mov	rsi,r8
-	mov	ecx,154
-	DD	0xa548f3fc
-
-	mov	rsi,r9
-	xor	rcx,rcx
-	mov	rdx,QWORD[8+rsi]
-	mov	r8,QWORD[rsi]
-	mov	r9,QWORD[16+rsi]
-	mov	r10,QWORD[40+rsi]
-	lea	r11,[56+rsi]
-	lea	r12,[24+rsi]
-	mov	QWORD[32+rsp],r10
-	mov	QWORD[40+rsp],r11
-	mov	QWORD[48+rsp],r12
-	mov	QWORD[56+rsp],rcx
-	call	QWORD[__imp_RtlVirtualUnwind]
-
-	mov	eax,1
-	add	rsp,64
-	popfq
-	pop	r15
-	pop	r14
-	pop	r13
-	pop	r12
-	pop	rbp
-	pop	rbx
-	pop	rdi
-	pop	rsi
-	DB	0F3h,0C3h		;repret
-
-
-section	.pdata rdata align=4
-ALIGN	4
-	DD	$L$cbc_dec_prologue wrt ..imagebase
-	DD	$L$cbc_dec_epilogue wrt ..imagebase
-	DD	$L$cbc_dec_info wrt ..imagebase
-
-	DD	$L$ctr_enc_prologue wrt ..imagebase
-	DD	$L$ctr_enc_epilogue wrt ..imagebase
-	DD	$L$ctr_enc_info wrt ..imagebase
-
-	DD	$L$xts_enc_prologue wrt ..imagebase
-	DD	$L$xts_enc_epilogue wrt ..imagebase
-	DD	$L$xts_enc_info wrt ..imagebase
-
-	DD	$L$xts_dec_prologue wrt ..imagebase
-	DD	$L$xts_dec_epilogue wrt ..imagebase
-	DD	$L$xts_dec_info wrt ..imagebase
-
-section	.xdata rdata align=8
-ALIGN	8
-$L$cbc_dec_info:
-DB	9,0,0,0
-	DD	se_handler wrt ..imagebase
-	DD	$L$cbc_dec_body wrt ..imagebase,$L$cbc_dec_epilogue wrt ..imagebase
-	DD	$L$cbc_dec_tail wrt ..imagebase
-	DD	0
-$L$ctr_enc_info:
-DB	9,0,0,0
-	DD	se_handler wrt ..imagebase
-	DD	$L$ctr_enc_body wrt ..imagebase,$L$ctr_enc_epilogue wrt ..imagebase
-	DD	$L$ctr_enc_tail wrt ..imagebase
-	DD	0
-$L$xts_enc_info:
-DB	9,0,0,0
-	DD	se_handler wrt ..imagebase
-	DD	$L$xts_enc_body wrt ..imagebase,$L$xts_enc_epilogue wrt ..imagebase
-	DD	$L$xts_enc_tail wrt ..imagebase
-	DD	0
-$L$xts_dec_info:
-DB	9,0,0,0
-	DD	se_handler wrt ..imagebase
-	DD	$L$xts_dec_body wrt ..imagebase,$L$xts_dec_epilogue wrt ..imagebase
-	DD	$L$xts_dec_tail wrt ..imagebase
-	DD	0
diff --git a/deps/openssl/config/archs/VC-WIN64A/asm/crypto/bn/rsaz-x86_64.asm b/deps/openssl/config/archs/VC-WIN64A/asm/crypto/bn/rsaz-x86_64.asm
index 603a8d17b8..a474c5d9a6 100644
--- a/deps/openssl/config/archs/VC-WIN64A/asm/crypto/bn/rsaz-x86_64.asm
+++ b/deps/openssl/config/archs/VC-WIN64A/asm/crypto/bn/rsaz-x86_64.asm
@@ -39,7 +39,7 @@ $L$SEH_begin_rsaz_512_sqr:
 	sub	rsp,128+24
 
 $L$sqr_body:
-	mov	rbp,rdx
+DB	102,72,15,110,202
 	mov	rdx,QWORD[rsi]
 	mov	rax,QWORD[8+rsi]
 	mov	QWORD[128+rsp],rcx
@@ -54,6 +54,7 @@ $L$oop_sqr:
 	mov	DWORD[((128+8))+rsp],r8d
 
 	mov	rbx,rdx
+	mov	rbp,rax
 	mul	rdx
 	mov	r8,rax
 	mov	rax,QWORD[16+rsi]
@@ -92,31 +93,29 @@ $L$oop_sqr:
 	mul	rbx
 	add	r14,rax
 	mov	rax,rbx
-	mov	r15,rdx
-	adc	r15,0
+	adc	rdx,0
 
+	xor	rcx,rcx
 	add	r8,r8
-	mov	rcx,r9
-	adc	r9,r9
+	mov	r15,rdx
+	adc	rcx,0
 
 	mul	rax
-	mov	QWORD[rsp],rax
-	add	r8,rdx
-	adc	r9,0
+	add	rdx,r8
+	adc	rcx,0
 
-	mov	QWORD[8+rsp],r8
-	shr	rcx,63
+	mov	QWORD[rsp],rax
+	mov	QWORD[8+rsp],rdx
 
 
-	mov	r8,QWORD[8+rsi]
 	mov	rax,QWORD[16+rsi]
-	mul	r8
+	mul	rbp
 	add	r10,rax
 	mov	rax,QWORD[24+rsi]
 	mov	rbx,rdx
 	adc	rbx,0
 
-	mul	r8
+	mul	rbp
 	add	r11,rax
 	mov	rax,QWORD[32+rsi]
 	adc	rdx,0
@@ -124,7 +123,7 @@ $L$oop_sqr:
 	mov	rbx,rdx
 	adc	rbx,0
 
-	mul	r8
+	mul	rbp
 	add	r12,rax
 	mov	rax,QWORD[40+rsi]
 	adc	rdx,0
@@ -132,7 +131,7 @@ $L$oop_sqr:
 	mov	rbx,rdx
 	adc	rbx,0
 
-	mul	r8
+	mul	rbp
 	add	r13,rax
 	mov	rax,QWORD[48+rsi]
 	adc	rdx,0
@@ -140,7 +139,7 @@ $L$oop_sqr:
 	mov	rbx,rdx
 	adc	rbx,0
 
-	mul	r8
+	mul	rbp
 	add	r14,rax
 	mov	rax,QWORD[56+rsi]
 	adc	rdx,0
@@ -148,39 +147,39 @@ $L$oop_sqr:
 	mov	rbx,rdx
 	adc	rbx,0
 
-	mul	r8
+	mul	rbp
 	add	r15,rax
-	mov	rax,r8
+	mov	rax,rbp
 	adc	rdx,0
 	add	r15,rbx
-	mov	r8,rdx
-	mov	rdx,r10
-	adc	r8,0
+	adc	rdx,0
 
-	add	rdx,rdx
-	lea	r10,[r10*2+rcx]
-	mov	rbx,r11
-	adc	r11,r11
+	xor	rbx,rbx
+	add	r9,r9
+	mov	r8,rdx
+	adc	r10,r10
+	adc	rbx,0
 
 	mul	rax
+
+	add	rax,rcx
+	mov	rbp,QWORD[16+rsi]
 	add	r9,rax
+	mov	rax,QWORD[24+rsi]
 	adc	r10,rdx
-	adc	r11,0
+	adc	rbx,0
 
 	mov	QWORD[16+rsp],r9
 	mov	QWORD[24+rsp],r10
-	shr	rbx,63
 
 
-	mov	r9,QWORD[16+rsi]
-	mov	rax,QWORD[24+rsi]
-	mul	r9
+	mul	rbp
 	add	r12,rax
 	mov	rax,QWORD[32+rsi]
 	mov	rcx,rdx
 	adc	rcx,0
 
-	mul	r9
+	mul	rbp
 	add	r13,rax
 	mov	rax,QWORD[40+rsi]
 	adc	rdx,0
@@ -188,7 +187,7 @@ $L$oop_sqr:
 	mov	rcx,rdx
 	adc	rcx,0
 
-	mul	r9
+	mul	rbp
 	add	r14,rax
 	mov	rax,QWORD[48+rsi]
 	adc	rdx,0
@@ -196,9 +195,7 @@ $L$oop_sqr:
 	mov	rcx,rdx
 	adc	rcx,0
 
-	mul	r9
-	mov	r10,r12
-	lea	r12,[r12*2+rbx]
+	mul	rbp
 	add	r15,rax
 	mov	rax,QWORD[56+rsi]
 	adc	rdx,0
@@ -206,36 +203,40 @@ $L$oop_sqr:
 	mov	rcx,rdx
 	adc	rcx,0
 
-	mul	r9
-	shr	r10,63
+	mul	rbp
 	add	r8,rax
-	mov	rax,r9
+	mov	rax,rbp
 	adc	rdx,0
 	add	r8,rcx
-	mov	r9,rdx
-	adc	r9,0
+	adc	rdx,0
 
-	mov	rcx,r13
-	lea	r13,[r13*2+r10]
+	xor	rcx,rcx
+	add	r11,r11
+	mov	r9,rdx
+	adc	r12,r12
+	adc	rcx,0
 
 	mul	rax
+
+	add	rax,rbx
+	mov	r10,QWORD[24+rsi]
 	add	r11,rax
+	mov	rax,QWORD[32+rsi]
 	adc	r12,rdx
-	adc	r13,0
+	adc	rcx,0
 
 	mov	QWORD[32+rsp],r11
 	mov	QWORD[40+rsp],r12
-	shr	rcx,63
 
 
-	mov	r10,QWORD[24+rsi]
-	mov	rax,QWORD[32+rsi]
+	mov	r11,rax
 	mul	r10
 	add	r14,rax
 	mov	rax,QWORD[40+rsi]
 	mov	rbx,rdx
 	adc	rbx,0
 
+	mov	r12,rax
 	mul	r10
 	add	r15,rax
 	mov	rax,QWORD[48+rsi]
@@ -244,9 +245,8 @@ $L$oop_sqr:
 	mov	rbx,rdx
 	adc	rbx,0
 
+	mov	rbp,rax
 	mul	r10
-	mov	r12,r14
-	lea	r14,[r14*2+rcx]
 	add	r8,rax
 	mov	rax,QWORD[56+rsi]
 	adc	rdx,0
@@ -255,32 +255,33 @@ $L$oop_sqr:
 	adc	rbx,0
 
 	mul	r10
-	shr	r12,63
 	add	r9,rax
 	mov	rax,r10
 	adc	rdx,0
 	add	r9,rbx
-	mov	r10,rdx
-	adc	r10,0
+	adc	rdx,0
 
-	mov	rbx,r15
-	lea	r15,[r15*2+r12]
+	xor	rbx,rbx
+	add	r13,r13
+	mov	r10,rdx
+	adc	r14,r14
+	adc	rbx,0
 
 	mul	rax
+
+	add	rax,rcx
 	add	r13,rax
+	mov	rax,r12
 	adc	r14,rdx
-	adc	r15,0
+	adc	rbx,0
 
 	mov	QWORD[48+rsp],r13
 	mov	QWORD[56+rsp],r14
-	shr	rbx,63
 
 
-	mov	r11,QWORD[32+rsi]
-	mov	rax,QWORD[40+rsi]
 	mul	r11
 	add	r8,rax
-	mov	rax,QWORD[48+rsi]
+	mov	rax,rbp
 	mov	rcx,rdx
 	adc	rcx,0
 
@@ -288,97 +289,99 @@ $L$oop_sqr:
 	add	r9,rax
 	mov	rax,QWORD[56+rsi]
 	adc	rdx,0
-	mov	r12,r8
-	lea	r8,[r8*2+rbx]
 	add	r9,rcx
 	mov	rcx,rdx
 	adc	rcx,0
 
+	mov	r14,rax
 	mul	r11
-	shr	r12,63
 	add	r10,rax
 	mov	rax,r11
 	adc	rdx,0
 	add	r10,rcx
-	mov	r11,rdx
-	adc	r11,0
+	adc	rdx,0
 
-	mov	rcx,r9
-	lea	r9,[r9*2+r12]
+	xor	rcx,rcx
+	add	r15,r15
+	mov	r11,rdx
+	adc	r8,r8
+	adc	rcx,0
 
 	mul	rax
+
+	add	rax,rbx
 	add	r15,rax
+	mov	rax,rbp
 	adc	r8,rdx
-	adc	r9,0
+	adc	rcx,0
 
 	mov	QWORD[64+rsp],r15
 	mov	QWORD[72+rsp],r8
-	shr	rcx,63
 
 
-	mov	r12,QWORD[40+rsi]
-	mov	rax,QWORD[48+rsi]
 	mul	r12
 	add	r10,rax
-	mov	rax,QWORD[56+rsi]
+	mov	rax,r14
 	mov	rbx,rdx
 	adc	rbx,0
 
 	mul	r12
 	add	r11,rax
 	mov	rax,r12
-	mov	r15,r10
-	lea	r10,[r10*2+rcx]
 	adc	rdx,0
-	shr	r15,63
 	add	r11,rbx
-	mov	r12,rdx
-	adc	r12,0
+	adc	rdx,0
 
-	mov	rbx,r11
-	lea	r11,[r11*2+r15]
+	xor	rbx,rbx
+	add	r9,r9
+	mov	r12,rdx
+	adc	r10,r10
+	adc	rbx,0
 
 	mul	rax
+
+	add	rax,rcx
 	add	r9,rax
+	mov	rax,r14
 	adc	r10,rdx
-	adc	r11,0
+	adc	rbx,0
 
 	mov	QWORD[80+rsp],r9
 	mov	QWORD[88+rsp],r10
 
 
-	mov	r13,QWORD[48+rsi]
-	mov	rax,QWORD[56+rsi]
-	mul	r13
+	mul	rbp
 	add	r12,rax
-	mov	rax,r13
-	mov	r13,rdx
-	adc	r13,0
+	mov	rax,rbp
+	adc	rdx,0
 
-	xor	r14,r14
-	shl	rbx,1
+	xor	rcx,rcx
+	add	r11,r11
+	mov	r13,rdx
 	adc	r12,r12
-	adc	r13,r13
-	adc	r14,r14
+	adc	rcx,0
 
 	mul	rax
+
+	add	rax,rbx
 	add	r11,rax
+	mov	rax,r14
 	adc	r12,rdx
-	adc	r13,0
+	adc	rcx,0
 
 	mov	QWORD[96+rsp],r11
 	mov	QWORD[104+rsp],r12
 
 
-	mov	rax,QWORD[56+rsi]
-	mul	rax
-	add	r13,rax
-	adc	rdx,0
+	xor	rbx,rbx
+	add	r13,r13
+	adc	rbx,0
 
-	add	r14,rdx
+	mul	rax
 
-	mov	QWORD[112+rsp],r13
-	mov	QWORD[120+rsp],r14
+	add	rax,rcx
+	add	rax,r13
+	adc	rdx,rbx
 
 	mov	r8,QWORD[rsp]
 	mov	r9,QWORD[8+rsp]
@@ -388,6 +391,10 @@ $L$oop_sqr:
 	mov	r13,QWORD[40+rsp]
 	mov	r14,QWORD[48+rsp]
 	mov	r15,QWORD[56+rsp]
+DB	102,72,15,126,205
+
+	mov	QWORD[112+rsp],rax
+	mov	QWORD[120+rsp],rdx
 
 	call	__rsaz_512_reduce
 
@@ -416,9 +423,9 @@ ALIGN	32
 $L$oop_sqrx:
 	mov	DWORD[((128+8))+rsp],r8d
 DB	102,72,15,110,199
-DB	102,72,15,110,205
 
 	mulx	r9,r8,rax
+	mov	rbx,rax
 
 	mulx	r10,rcx,QWORD[16+rsi]
 	xor	rbp,rbp
@@ -426,40 +433,39 @@ DB	102,72,15,110,205
 	mulx	r11,rax,QWORD[24+rsi]
 	adcx	r9,rcx
 
-	mulx	r12,rcx,QWORD[32+rsi]
+DB	0xc4,0x62,0xf3,0xf6,0xa6,0x20,0x00,0x00,0x00
 	adcx	r10,rax
 
-	mulx	r13,rax,QWORD[40+rsi]
+DB	0xc4,0x62,0xfb,0xf6,0xae,0x28,0x00,0x00,0x00
 	adcx	r11,rcx
 
-DB	0xc4,0x62,0xf3,0xf6,0xb6,0x30,0x00,0x00,0x00
+	mulx	r14,rcx,QWORD[48+rsi]
 	adcx	r12,rax
 	adcx	r13,rcx
 
-DB	0xc4,0x62,0xfb,0xf6,0xbe,0x38,0x00,0x00,0x00
+	mulx	r15,rax,QWORD[56+rsi]
 	adcx	r14,rax
 	adcx	r15,rbp
 
-	mov	rcx,r9
-	shld	r9,r8,1
-	shl	r8,1
-
-	xor	ebp,ebp
-	mulx	rdx,rax,rdx
-	adcx	r8,rdx
-	mov	rdx,QWORD[8+rsi]
-	adcx	r9,rbp
+	mulx	rdi,rax,rdx
+	mov	rdx,rbx
+	xor	rcx,rcx
+	adox	r8,r8
+	adcx	r8,rdi
+	adox	rcx,rbp
+	adcx	rcx,rbp
 
 	mov	QWORD[rsp],rax
 	mov	QWORD[8+rsp],r8
 
 
-	mulx	rbx,rax,QWORD[16+rsi]
+DB	0xc4,0xe2,0xfb,0xf6,0x9e,0x10,0x00,0x00,0x00
 	adox	r10,rax
 	adcx	r11,rbx
 
-DB	0xc4,0x62,0xc3,0xf6,0x86,0x18,0x00,0x00,0x00
+	mulx	r8,rdi,QWORD[24+rsi]
 	adox	r11,rdi
+DB	0x66
 	adcx	r12,r8
 
 	mulx	rbx,rax,QWORD[32+rsi]
@@ -477,24 +483,25 @@ DB	0xc4,0xe2,0xfb,0xf6,0x9e,0x30,0x00,0x00,0x00
 DB	0xc4,0x62,0xc3,0xf6,0x86,0x38,0x00,0x00,0x00
 	adox	r15,rdi
 	adcx	r8,rbp
+	mulx	rdi,rax,rdx
 	adox	r8,rbp
+DB	0x48,0x8b,0x96,0x10,0x00,0x00,0x00
 
-	mov	rbx,r11
-	shld	r11,r10,1
-	shld	r10,rcx,1
+	xor	rbx,rbx
+	adox	r9,r9
 
-	xor	ebp,ebp
-	mulx	rcx,rax,rdx
-	mov	rdx,QWORD[16+rsi]
+	adcx	rax,rcx
+	adox	r10,r10
 	adcx	r9,rax
-	adcx	r10,rcx
-	adcx	r11,rbp
+	adox	rbx,rbp
+	adcx	r10,rdi
+	adcx	rbx,rbp
 
 	mov	QWORD[16+rsp],r9
 DB	0x4c,0x89,0x94,0x24,0x18,0x00,0x00,0x00
 
 
-DB	0xc4,0x62,0xc3,0xf6,0x8e,0x18,0x00,0x00,0x00
+	mulx	r9,rdi,QWORD[24+rsi]
 	adox	r12,rdi
 	adcx	r13,r9
 
@@ -502,7 +509,7 @@ DB	0xc4,0x62,0xc3,0xf6,0x8e,0x18,0x00,0x00,0x00
 	adox	r13,rax
 	adcx	r14,rcx
 
-	mulx	r9,rdi,QWORD[40+rsi]
+DB	0xc4,0x62,0xc3,0xf6,0x8e,0x28,0x00,0x00,0x00
 	adox	r14,rdi
 	adcx	r15,r9
 
@@ -510,27 +517,28 @@ DB	0xc4,0xe2,0xfb,0xf6,0x8e,0x30,0x00,0x00,0x00
 	adox	r15,rax
 	adcx	r8,rcx
 
-DB	0xc4,0x62,0xc3,0xf6,0x8e,0x38,0x00,0x00,0x00
+	mulx	r9,rdi,QWORD[56+rsi]
 	adox	r8,rdi
 	adcx	r9,rbp
+	mulx	rdi,rax,rdx
 	adox	r9,rbp
+	mov	rdx,QWORD[24+rsi]
 
-	mov	rcx,r13
-	shld	r13,r12,1
-	shld	r12,rbx,1
+	xor	rcx,rcx
+	adox	r11,r11
 
-	xor	ebp,ebp
-	mulx	rdx,rax,rdx
+	adcx	rax,rbx
+	adox	r12,r12
 	adcx	r11,rax
-	adcx	r12,rdx
-	mov	rdx,QWORD[24+rsi]
-	adcx	r13,rbp
+	adox	rcx,rbp
+	adcx	r12,rdi
+	adcx	rcx,rbp
 
 	mov	QWORD[32+rsp],r11
-DB	0x4c,0x89,0xa4,0x24,0x28,0x00,0x00,0x00
+	mov	QWORD[40+rsp],r12
 
 
-DB	0xc4,0xe2,0xfb,0xf6,0x9e,0x20,0x00,0x00,0x00
+	mulx	rbx,rax,QWORD[32+rsi]
 	adox	r14,rax
 	adcx	r15,rbx
 
@@ -545,25 +553,25 @@ DB	0xc4,0xe2,0xfb,0xf6,0x9e,0x20,0x00,0x00,0x00
 	mulx	r10,rdi,QWORD[56+rsi]
 	adox	r9,rdi
 	adcx	r10,rbp
+	mulx	rdi,rax,rdx
 	adox	r10,rbp
+	mov	rdx,QWORD[32+rsi]
 
-DB	0x66
-	mov	rbx,r15
-	shld	r15,r14,1
-	shld	r14,rcx,1
+	xor	rbx,rbx
+	adox	r13,r13
 
-	xor	ebp,ebp
-	mulx	rdx,rax,rdx
+	adcx	rax,rcx
+	adox	r14,r14
 	adcx	r13,rax
-	adcx	r14,rdx
-	mov	rdx,QWORD[32+rsi]
-	adcx	r15,rbp
+	adox	rbx,rbp
+	adcx	r14,rdi
+	adcx	rbx,rbp
 
 	mov	QWORD[48+rsp],r13
 	mov	QWORD[56+rsp],r14
 
 
-DB	0xc4,0x62,0xc3,0xf6,0x9e,0x28,0x00,0x00,0x00
+	mulx	r11,rdi,QWORD[40+rsi]
 	adox	r8,rdi
 	adcx	r9,r11
 
@@ -574,18 +582,19 @@ DB	0xc4,0x62,0xc3,0xf6,0x9e,0x28,0x00,0x00,0x00
 	mulx	r11,rdi,QWORD[56+rsi]
 	adox	r10,rdi
 	adcx	r11,rbp
+	mulx	rdi,rax,rdx
+	mov	rdx,QWORD[40+rsi]
 	adox	r11,rbp
 
-	mov	rcx,r9
-	shld	r9,r8,1
-	shld	r8,rbx,1
+	xor	rcx,rcx
+	adox	r15,r15
 
-	xor	ebp,ebp
-	mulx	rdx,rax,rdx
+	adcx	rax,rbx
+	adox	r8,r8
 	adcx	r15,rax
-	adcx	r8,rdx
-	mov	rdx,QWORD[40+rsi]
-	adcx	r9,rbp
+	adox	rcx,rbp
+	adcx	r8,rdi
+	adcx	rcx,rbp
 
 	mov	QWORD[64+rsp],r15
 	mov	QWORD[72+rsp],r8
@@ -598,18 +607,19 @@ DB	0xc4,0xe2,0xfb,0xf6,0x9e,0x30,0x00,0x00,0x00
 DB	0xc4,0x62,0xc3,0xf6,0xa6,0x38,0x00,0x00,0x00
 	adox	r11,rdi
 	adcx	r12,rbp
+	mulx	rdi,rax,rdx
 	adox	r12,rbp
+	mov	rdx,QWORD[48+rsi]
 
-	mov	rbx,r11
-	shld	r11,r10,1
-	shld	r10,rcx,1
+	xor	rbx,rbx
+	adox	r9,r9
 
-	xor	ebp,ebp
-	mulx	rdx,rax,rdx
+	adcx	rax,rcx
+	adox	r10,r10
 	adcx	r9,rax
-	adcx	r10,rdx
-	mov	rdx,QWORD[48+rsi]
-	adcx	r11,rbp
+	adcx	r10,rdi
+	adox	rbx,rbp
+	adcx	rbx,rbp
 
 	mov	QWORD[80+rsp],r9
 	mov	QWORD[88+rsp],r10
@@ -619,31 +629,31 @@ DB	0xc4,0x62,0xfb,0xf6,0xae,0x38,0x00,0x00,0x00
 	adox	r12,rax
 	adox	r13,rbp
 
-	xor	r14,r14
-	shld	r14,r13,1
-	shld	r13,r12,1
-	shld	r12,rbx,1
+	mulx	rdi,rax,rdx
+	xor	rcx,rcx
+	mov	rdx,QWORD[56+rsi]
+	adox	r11,r11
 
-	xor	ebp,ebp
-	mulx	rdx,rax,rdx
+	adcx	rax,rbx
+	adox	r12,r12
 	adcx	r11,rax
-	adcx	r12,rdx
-	mov	rdx,QWORD[56+rsi]
-	adcx	r13,rbp
+	adox	rcx,rbp
+	adcx	r12,rdi
+	adcx	rcx,rbp
 
 DB	0x4c,0x89,0x9c,0x24,0x60,0x00,0x00,0x00
 DB	0x4c,0x89,0xa4,0x24,0x68,0x00,0x00,0x00
 
 
 	mulx	rdx,rax,rdx
-	adox	r13,rax
-	adox	rdx,rbp
+	xor	rbx,rbx
+	adox	r13,r13
 
-DB	0x66
-	add	r14,rdx
+	adcx	rax,rcx
+	adox	rbx,rbp
+	adcx	rax,r13
+	adcx	rbx,rdx
 
-	mov	QWORD[112+rsp],r13
-	mov	QWORD[120+rsp],r14
 DB	102,72,15,126,199
 DB	102,72,15,126,205
 
@@ -657,6 +667,9 @@ DB	102,72,15,126,205
 	mov	r14,QWORD[48+rsp]
 	mov	r15,QWORD[56+rsp]
 
+	mov	QWORD[112+rsp],rax
+	mov	QWORD[120+rsp],rbx
+
 	call	__rsaz_512_reducex
 
 	add	r8,QWORD[64+rsp]
@@ -1502,6 +1515,7 @@ $L$SEH_end_rsaz_512_mul_by_one:
 
 ALIGN	32
 __rsaz_512_reduce:
+
 	mov	rbx,r8
 	imul	rbx,QWORD[((128+8))+rsp]
 	mov	rax,QWORD[rbp]
@@ -1583,9 +1597,11 @@ $L$reduction_loop:
 	DB	0F3h,0C3h		;repret
 
 
+
 ALIGN	32
 __rsaz_512_reducex:
 
+
 	imul	rdx,r8
 	xor	rsi,rsi
 	mov	ecx,8
@@ -1639,8 +1655,10 @@ DB	0xc4,0x62,0xfb,0xf6,0xb5,0x30,0x00,0x00,0x00
 	DB	0F3h,0C3h		;repret
 
 
+
 ALIGN	32
 __rsaz_512_subtract:
+
 	mov	QWORD[rdi],r8
 	mov	QWORD[8+rdi],r9
 	mov	QWORD[16+rdi],r10
@@ -1696,8 +1714,10 @@ __rsaz_512_subtract:
 	DB	0F3h,0C3h		;repret
 
 
+
 ALIGN	32
 __rsaz_512_mul:
+
 	lea	rdi,[8+rsp]
 
 	mov	rax,QWORD[rsi]
@@ -1838,8 +1858,10 @@ $L$oop_mul:
 	DB	0F3h,0C3h		;repret
 
 
+
 ALIGN	32
 __rsaz_512_mulx:
+
 	mulx	r8,rbx,QWORD[rsi]
 	mov	rcx,-6
 
@@ -1957,10 +1979,12 @@ DB	0xc4,0x62,0xfb,0xf6,0xbe,0x38,0x00,0x00,0x00
 
 	DB	0F3h,0C3h		;repret
 
+
 global	rsaz_512_scatter4
 
 ALIGN	16
 rsaz_512_scatter4:
+
 	lea	rcx,[r8*8+rcx]
 	mov	r9d,8
 	jmp	NEAR $L$oop_scatter
@@ -1975,10 +1999,12 @@ $L$oop_scatter:
 	DB	0F3h,0C3h		;repret
 
 
+
 global	rsaz_512_gather4
 
 ALIGN	16
 rsaz_512_gather4:
+
 $L$SEH_begin_rsaz_512_gather4:
 DB	0x48,0x81,0xec,0xa8,0x00,0x00,0x00
 DB	0x0f,0x29,0x34,0x24
@@ -2067,6 +2093,7 @@ $L$oop_gather:
 $L$SEH_end_rsaz_512_gather4:
 
 
+
 ALIGN	64
 $L$inc:
 	DD	0,0,1,1
diff --git a/deps/openssl/config/archs/VC-WIN64A/asm/crypto/bn/x86_64-mont5.asm b/deps/openssl/config/archs/VC-WIN64A/asm/crypto/bn/x86_64-mont5.asm
index 81570ab206..0756714904 100644
--- a/deps/openssl/config/archs/VC-WIN64A/asm/crypto/bn/x86_64-mont5.asm
+++ b/deps/openssl/config/archs/VC-WIN64A/asm/crypto/bn/x86_64-mont5.asm
@@ -583,6 +583,7 @@ $L$SEH_end_bn_mul4x_mont_gather5:
 
 ALIGN	32
 mul4x_internal:
+
 	shl	r9,5
 	movd	xmm5,DWORD[56+rax]
 	lea	rax,[$L$inc]
@@ -1105,6 +1106,7 @@ $L$inner4x:
 	mov	r15,QWORD[24+rbp]
 	jmp	NEAR $L$sqr4x_sub_entry
 
+
 global	bn_power5
 
 ALIGN	32
@@ -1333,6 +1335,7 @@ __bn_sqr8x_internal:
 
 
 
+
 	lea	rbp,[32+r10]
 	lea	rsi,[r9*1+rsi]
 
@@ -2036,8 +2039,10 @@ DB	102,73,15,126,217
 	DB	0F3h,0C3h		;repret
 
 
+
 ALIGN	32
 __bn_post4x_internal:
+
 	mov	r12,QWORD[rbp]
 	lea	rbx,[r9*1+rdi]
 	mov	rcx,r9
@@ -2089,10 +2094,12 @@ $L$sqr4x_sub_entry:
 	neg	r9
 	DB	0F3h,0C3h		;repret
 
+
 global	bn_from_montgomery
 
 ALIGN	32
 bn_from_montgomery:
+
 	test	DWORD[48+rsp],7
 	jz	NEAR bn_from_mont8x
 	xor	eax,eax
@@ -2100,6 +2107,7 @@ bn_from_montgomery:
 
 
 
+
 ALIGN	32
 bn_from_mont8x:
 	mov	QWORD[8+rsp],rdi	;WIN64 prologue
@@ -2408,6 +2416,7 @@ $L$SEH_end_bn_mulx4x_mont_gather5:
 
 ALIGN	32
 mulx4x_internal:
+
 	mov	QWORD[8+rsp],r9
 	mov	r10,r9
 	neg	r9
@@ -2828,6 +2837,7 @@ $L$mulx4x_inner:
 	jmp	NEAR $L$sqrx4x_sub_entry
 
 
+
 ALIGN	32
 bn_powerx5:
 	mov	QWORD[8+rsp],rdi	;WIN64 prologue
@@ -3598,6 +3608,7 @@ DB	102,72,15,126,213
 
 ALIGN	32
 __bn_postx4x_internal:
+
 	mov	r12,QWORD[rbp]
 	mov	r10,rcx
 	mov	r9,rcx
@@ -3646,10 +3657,12 @@ $L$sqrx4x_sub_entry:
 
 	DB	0F3h,0C3h		;repret
 
+
 global	bn_get_bits5
 
 ALIGN	16
 bn_get_bits5:
+
 	lea	r10,[rcx]
 	lea	r11,[1+rcx]
 	mov	ecx,edx
@@ -3665,10 +3678,12 @@ bn_get_bits5:
 	DB	0F3h,0C3h		;repret
 
 
+
 global	bn_scatter5
 
 ALIGN	16
 bn_scatter5:
+
 	cmp	edx,0
 	jz	NEAR $L$scatter_epilogue
 	lea	r8,[r9*8+r8]
@@ -3683,12 +3698,14 @@ $L$scatter_epilogue:
 	DB	0F3h,0C3h		;repret
 
 
+
 global	bn_gather5
 
 ALIGN	32
 bn_gather5:
 $L$SEH_begin_bn_gather5:
 
+
 DB	0x4c,0x8d,0x14,0x24
 DB	0x48,0x81,0xec,0x08,0x01,0x00,0x00
 	lea	rax,[$L$inc]
@@ -3846,6 +3863,7 @@ $L$gather:
 	DB	0F3h,0C3h		;repret
 $L$SEH_end_bn_gather5:
 
+
 ALIGN	64
 $L$inc:
 	DD	0,0,1,1
diff --git a/deps/openssl/config/archs/VC-WIN64A/asm/crypto/buildinf.h b/deps/openssl/config/archs/VC-WIN64A/asm/crypto/buildinf.h
index eba30a9c28..eee9e84f18 100644
--- a/deps/openssl/config/archs/VC-WIN64A/asm/crypto/buildinf.h
+++ b/deps/openssl/config/archs/VC-WIN64A/asm/crypto/buildinf.h
@@ -11,7 +11,7 @@
  */
 
 #define PLATFORM "platform: "
-#define DATE "built on: Fri Sep 13 16:02:58 2019 UTC"
+#define DATE "built on: Wed Mar 18 21:10:25 2020 UTC"
 
 /*
  * Generate compiler_flags as an array of individual characters. This is a
diff --git a/deps/openssl/config/archs/VC-WIN64A/asm/crypto/camellia/cmll-x86_64.asm b/deps/openssl/config/archs/VC-WIN64A/asm/crypto/camellia/cmll-x86_64.asm
index 7a0f351e51..4cf1d322ac 100644
--- a/deps/openssl/config/archs/VC-WIN64A/asm/crypto/camellia/cmll-x86_64.asm
+++ b/deps/openssl/config/archs/VC-WIN64A/asm/crypto/camellia/cmll-x86_64.asm
@@ -10,6 +10,7 @@ global	Camellia_EncryptBlock
 
 ALIGN	16
 Camellia_EncryptBlock:
+
 	mov	eax,128
 	sub	eax,ecx
 	mov	ecx,3
@@ -17,6 +18,7 @@ Camellia_EncryptBlock:
 	jmp	NEAR $L$enc_rounds
 
 
+
 global	Camellia_EncryptBlock_Rounds
 
 ALIGN	16
@@ -95,6 +97,7 @@ $L$SEH_end_Camellia_EncryptBlock_Rounds:
 
 ALIGN	16
 _x86_64_Camellia_encrypt:
+
 	xor	r9d,DWORD[r14]
 	xor	r8d,DWORD[4+r14]
 	xor	r11d,DWORD[8+r14]
@@ -300,10 +303,12 @@ DB	0xf3,0xc3
 
 
 
+
 global	Camellia_DecryptBlock
 
 ALIGN	16
 Camellia_DecryptBlock:
+
 	mov	eax,128
 	sub	eax,ecx
 	mov	ecx,3
@@ -311,6 +316,7 @@ Camellia_DecryptBlock:
 	jmp	NEAR $L$dec_rounds
 
 
+
 global	Camellia_DecryptBlock_Rounds
 
 ALIGN	16
@@ -389,6 +395,7 @@ $L$SEH_end_Camellia_DecryptBlock_Rounds:
 
 ALIGN	16
 _x86_64_Camellia_decrypt:
+
 	xor	r9d,DWORD[r14]
 	xor	r8d,DWORD[4+r14]
 	xor	r11d,DWORD[8+r14]
@@ -593,6 +600,7 @@ $L$ddone:
 
 DB	0xf3,0xc3
 
+
 global	Camellia_Ekeygen
 
 ALIGN	16
diff --git a/deps/openssl/config/archs/VC-WIN64A/asm/crypto/ec/ecp_nistz256-x86_64.asm b/deps/openssl/config/archs/VC-WIN64A/asm/crypto/ec/ecp_nistz256-x86_64.asm
index c87f73a8aa..9930dadce6 100644
--- a/deps/openssl/config/archs/VC-WIN64A/asm/crypto/ec/ecp_nistz256-x86_64.asm
+++ b/deps/openssl/config/archs/VC-WIN64A/asm/crypto/ec/ecp_nistz256-x86_64.asm
@@ -3958,10 +3958,12 @@ $L$SEH_begin_ecp_nistz256_to_mont:
 	mov	rsi,rdx
 
 
+
 	mov	ecx,0x80100
 	and	ecx,DWORD[((OPENSSL_ia32cap_P+8))]
 	lea	rdx,[$L$RR]
 	jmp	NEAR $L$mul_mont
+
 $L$SEH_end_ecp_nistz256_to_mont:
 
 
@@ -4922,6 +4924,7 @@ global	ecp_nistz256_scatter_w5
 
 ALIGN	32
 ecp_nistz256_scatter_w5:
+
 	lea	r8d,[((-3))+r8*2+r8]
 	movdqa	xmm0,XMMWORD[rdx]
 	shl	r8d,5
@@ -4942,6 +4945,7 @@ ecp_nistz256_scatter_w5:
 
 
 
+
 global	ecp_nistz256_gather_w5
 
 ALIGN	32
@@ -5035,6 +5039,7 @@ global	ecp_nistz256_scatter_w7
 
 ALIGN	32
 ecp_nistz256_scatter_w7:
+
 	movdqu	xmm0,XMMWORD[rdx]
 	shl	r8d,6
 	movdqu	xmm1,XMMWORD[16+rdx]
@@ -5050,6 +5055,7 @@ ecp_nistz256_scatter_w7:
 
 
 
+
 global	ecp_nistz256_gather_w7
 
 ALIGN	32
@@ -5861,26 +5867,16 @@ DB	102,73,15,110,220
 	or	r12,r8
 	or	r12,r9
 
-DB	0x3e
-	jnz	NEAR $L$add_proceedq
 DB	102,73,15,126,208
 DB	102,73,15,126,217
-	test	r8,r8
-	jnz	NEAR $L$add_proceedq
-	test	r9,r9
-	jz	NEAR $L$add_doubleq
 
-DB	102,72,15,126,199
-	pxor	xmm0,xmm0
-	movdqu	XMMWORD[rdi],xmm0
-	movdqu	XMMWORD[16+rdi],xmm0
-	movdqu	XMMWORD[32+rdi],xmm0
-	movdqu	XMMWORD[48+rdi],xmm0
-	movdqu	XMMWORD[64+rdi],xmm0
-	movdqu	XMMWORD[80+rdi],xmm0
-	jmp	NEAR $L$add_doneq
+	or	r12,r8
+	or	r12,r9
+
+
+DB	0x3e
+	jnz	NEAR $L$add_proceedq
 
-ALIGN	32
 $L$add_doubleq:
 DB	102,72,15,126,206
 DB	102,72,15,126,199
@@ -6994,26 +6990,16 @@ DB	102,73,15,110,220
 	or	r12,r8
 	or	r12,r9
 
-DB	0x3e
-	jnz	NEAR $L$add_proceedx
 DB	102,73,15,126,208
 DB	102,73,15,126,217
-	test	r8,r8
-	jnz	NEAR $L$add_proceedx
-	test	r9,r9
-	jz	NEAR $L$add_doublex
 
-DB	102,72,15,126,199
-	pxor	xmm0,xmm0
-	movdqu	XMMWORD[rdi],xmm0
-	movdqu	XMMWORD[16+rdi],xmm0
-	movdqu	XMMWORD[32+rdi],xmm0
-	movdqu	XMMWORD[48+rdi],xmm0
-	movdqu	XMMWORD[64+rdi],xmm0
-	movdqu	XMMWORD[80+rdi],xmm0
-	jmp	NEAR $L$add_donex
+	or	r12,r8
+	or	r12,r9
+
+
+DB	0x3e
+	jnz	NEAR $L$add_proceedx
 
-ALIGN	32
 $L$add_doublex:
 DB	102,72,15,126,206
 DB	102,72,15,126,199
diff --git a/deps/openssl/config/archs/VC-WIN64A/asm/crypto/ec/x25519-x86_64.asm b/deps/openssl/config/archs/VC-WIN64A/asm/crypto/ec/x25519-x86_64.asm
index 84d55134ac..d6c6312363 100644
--- a/deps/openssl/config/archs/VC-WIN64A/asm/crypto/ec/x25519-x86_64.asm
+++ b/deps/openssl/config/archs/VC-WIN64A/asm/crypto/ec/x25519-x86_64.asm
@@ -414,6 +414,7 @@ global	x25519_fe64_eligible
 
 ALIGN	32
 x25519_fe64_eligible:
+
 	mov	ecx,DWORD[((OPENSSL_ia32cap_P+8))]
 	xor	eax,eax
 	and	ecx,0x80100
@@ -422,6 +423,7 @@ x25519_fe64_eligible:
 	DB	0F3h,0C3h		;repret
 
 
+
 global	x25519_fe64_mul
 
 ALIGN	32
@@ -675,6 +677,7 @@ $L$SEH_begin_x25519_fe64_mul121666:
 
 
 $L$fe64_mul121666_body:
+
 	mov	edx,121666
 	mulx	rcx,r8,QWORD[rsi]
 	mulx	rax,r9,QWORD[8+rsi]
@@ -705,6 +708,7 @@ $L$fe64_mul121666_epilogue:
 	mov	rdi,QWORD[8+rsp]	;WIN64 epilogue
 	mov	rsi,QWORD[16+rsp]
 	DB	0F3h,0C3h		;repret
+
 $L$SEH_end_x25519_fe64_mul121666:
 
 global	x25519_fe64_add
@@ -721,6 +725,7 @@ $L$SEH_begin_x25519_fe64_add:
 
 
 $L$fe64_add_body:
+
 	mov	r8,QWORD[rsi]
 	mov	r9,QWORD[8+rsi]
 	mov	r10,QWORD[16+rsi]
@@ -751,6 +756,7 @@ $L$fe64_add_epilogue:
 	mov	rdi,QWORD[8+rsp]	;WIN64 epilogue
 	mov	rsi,QWORD[16+rsp]
 	DB	0F3h,0C3h		;repret
+
 $L$SEH_end_x25519_fe64_add:
 
 global	x25519_fe64_sub
@@ -767,6 +773,7 @@ $L$SEH_begin_x25519_fe64_sub:
 
 
 $L$fe64_sub_body:
+
 	mov	r8,QWORD[rsi]
 	mov	r9,QWORD[8+rsi]
 	mov	r10,QWORD[16+rsi]
@@ -797,6 +804,7 @@ $L$fe64_sub_epilogue:
 	mov	rdi,QWORD[8+rsp]	;WIN64 epilogue
 	mov	rsi,QWORD[16+rsp]
 	DB	0F3h,0C3h		;repret
+
 $L$SEH_end_x25519_fe64_sub:
 
 global	x25519_fe64_tobytes
@@ -812,6 +820,7 @@ $L$SEH_begin_x25519_fe64_tobytes:
 
 
 $L$fe64_to_body:
+
 	mov	r8,QWORD[rsi]
 	mov	r9,QWORD[8+rsi]
 	mov	r10,QWORD[16+rsi]
@@ -849,6 +858,7 @@ $L$fe64_to_epilogue:
 	mov	rdi,QWORD[8+rsp]	;WIN64 epilogue
 	mov	rsi,QWORD[16+rsp]
 	DB	0F3h,0C3h		;repret
+
 $L$SEH_end_x25519_fe64_tobytes:
 DB	88,50,53,53,49,57,32,112,114,105,109,105,116,105,118,101
 DB	115,32,102,111,114,32,120,56,54,95,54,52,44,32,67,82
diff --git a/deps/openssl/config/archs/VC-WIN64A/asm/crypto/include/internal/bn_conf.h b/deps/openssl/config/archs/VC-WIN64A/asm/crypto/include/internal/bn_conf.h
index d803b51858..dab67d1b37 100644
--- a/deps/openssl/config/archs/VC-WIN64A/asm/crypto/include/internal/bn_conf.h
+++ b/deps/openssl/config/archs/VC-WIN64A/asm/crypto/include/internal/bn_conf.h
@@ -1,5 +1,5 @@
 /* WARNING: do not edit! */
-/* Generated by makefile from crypto/include/internal/bn_conf.h.in */
+/* Generated by makefile from include/crypto/bn_conf.h.in */
 /*
  * Copyright 2016 The OpenSSL Project Authors. All Rights Reserved.
  *
@@ -9,8 +9,8 @@
  * https://www.openssl.org/source/license.html
  */
 
-#ifndef HEADER_BN_CONF_H
-# define HEADER_BN_CONF_H
+#ifndef OSSL_CRYPTO_BN_CONF_H
+# define OSSL_CRYPTO_BN_CONF_H
 
 /*
  * The contents of this file are not used in the UEFI build, as
diff --git a/deps/openssl/config/archs/VC-WIN64A/asm/crypto/include/internal/dso_conf.h b/deps/openssl/config/archs/VC-WIN64A/asm/crypto/include/internal/dso_conf.h
index c3b41df01e..0c96ce7363 100644
--- a/deps/openssl/config/archs/VC-WIN64A/asm/crypto/include/internal/dso_conf.h
+++ b/deps/openssl/config/archs/VC-WIN64A/asm/crypto/include/internal/dso_conf.h
@@ -1,5 +1,5 @@
 /* WARNING: do not edit! */
-/* Generated by makefile from crypto/include/internal/dso_conf.h.in */
+/* Generated by makefile from include/crypto/dso_conf.h.in */
 /*
  * Copyright 2016-2019 The OpenSSL Project Authors. All Rights Reserved.
  *
@@ -9,8 +9,8 @@
  * https://www.openssl.org/source/license.html
  */
 
-#ifndef HEADER_DSO_CONF_H
-# define HEADER_DSO_CONF_H
+#ifndef OSSL_CRYPTO_DSO_CONF_H
+# define OSSL_CRYPTO_DSO_CONF_H
 # define DSO_WIN32
 # define DSO_EXTENSION ".dll"
 #endif
diff --git a/deps/openssl/config/archs/VC-WIN64A/asm/crypto/modes/aesni-gcm-x86_64.asm b/deps/openssl/config/archs/VC-WIN64A/asm/crypto/modes/aesni-gcm-x86_64.asm
index b1d8332457..9fba32b883 100644
--- a/deps/openssl/config/archs/VC-WIN64A/asm/crypto/modes/aesni-gcm-x86_64.asm
+++ b/deps/openssl/config/archs/VC-WIN64A/asm/crypto/modes/aesni-gcm-x86_64.asm
@@ -8,6 +8,7 @@ section	.text code align=64
 
 ALIGN	32
 _aesni_ctr32_ghash_6x:
+
 	vmovdqu	xmm2,XMMWORD[32+r11]
 	sub	rdx,6
 	vpxor	xmm4,xmm4,xmm4
@@ -316,6 +317,7 @@ $L$6x_done:
 
 	DB	0F3h,0C3h		;repret
 
+
 global	aesni_gcm_decrypt
 
 ALIGN	32
@@ -457,6 +459,7 @@ $L$SEH_end_aesni_gcm_decrypt:
 
 ALIGN	32
 _aesni_ctr32_6x:
+
 	vmovdqu	xmm4,XMMWORD[((0-128))+rcx]
 	vmovdqu	xmm2,XMMWORD[32+r11]
 	lea	r13,[((-1))+rbp]
@@ -545,6 +548,7 @@ $L$handle_ctr32_2:
 	jmp	NEAR $L$oop_ctr32
 
 
+
 global	aesni_gcm_encrypt
 
 ALIGN	32
diff --git a/deps/openssl/config/archs/VC-WIN64A/asm/crypto/poly1305/poly1305-x86_64.asm b/deps/openssl/config/archs/VC-WIN64A/asm/crypto/poly1305/poly1305-x86_64.asm
index 5717654508..6f688b63e0 100644
--- a/deps/openssl/config/archs/VC-WIN64A/asm/crypto/poly1305/poly1305-x86_64.asm
+++ b/deps/openssl/config/archs/VC-WIN64A/asm/crypto/poly1305/poly1305-x86_64.asm
@@ -26,6 +26,7 @@ $L$SEH_begin_poly1305_init:
 	mov	rdx,r8
 
 
+
 	xor	rax,rax
 	mov	QWORD[rdi],rax
 	mov	QWORD[8+rdi],rax
@@ -63,6 +64,7 @@ $L$no_key:
 	mov	rdi,QWORD[8+rsp]	;WIN64 epilogue
 	mov	rsi,QWORD[16+rsp]
 	DB	0F3h,0C3h		;repret
+
 $L$SEH_end_poly1305_init:
 
 
@@ -198,6 +200,7 @@ $L$SEH_begin_poly1305_emit:
 	mov	rdx,r8
 
 
+
 $L$emit:
 	mov	r8,QWORD[rdi]
 	mov	r9,QWORD[8+rdi]
@@ -220,10 +223,12 @@ $L$emit:
 	mov	rdi,QWORD[8+rsp]	;WIN64 epilogue
 	mov	rsi,QWORD[16+rsp]
 	DB	0F3h,0C3h		;repret
+
 $L$SEH_end_poly1305_emit:
 
 ALIGN	32
 __poly1305_block:
+
 	mul	r14
 	mov	r9,rax
 	mov	rax,r11
@@ -266,8 +271,10 @@ __poly1305_block:
 
 
 
+
 ALIGN	32
 __poly1305_init_avx:
+
 	mov	r14,r11
 	mov	rbx,r12
 	xor	rbp,rbp
@@ -428,6 +435,7 @@ __poly1305_init_avx:
 
 
 
+
 ALIGN	32
 poly1305_blocks_avx:
 	mov	QWORD[8+rsp],rdi	;WIN64 prologue
@@ -1296,6 +1304,7 @@ $L$SEH_begin_poly1305_emit_avx:
 	mov	rdx,r8
 
 
+
 	cmp	DWORD[20+rdi],0
 	je	NEAR $L$emit
 
@@ -1348,6 +1357,7 @@ $L$SEH_begin_poly1305_emit_avx:
 	mov	rdi,QWORD[8+rsp]	;WIN64 epilogue
 	mov	rsi,QWORD[16+rsp]
 	DB	0F3h,0C3h		;repret
+
 $L$SEH_end_poly1305_emit_avx:
 
 ALIGN	32
@@ -2607,6 +2617,7 @@ $L$SEH_begin_poly1305_init_base2_44:
 	mov	rdx,r8
 
 
+
 	xor	rax,rax
 	mov	QWORD[rdi],rax
 	mov	QWORD[8+rdi],rax
@@ -2642,6 +2653,7 @@ $L$init_base2_44:
 	mov	rdi,QWORD[8+rsp]	;WIN64 epilogue
 	mov	rsi,QWORD[16+rsp]
 	DB	0F3h,0C3h		;repret
+
 $L$SEH_end_poly1305_init_base2_44:
 
 ALIGN	32
@@ -2656,6 +2668,7 @@ $L$SEH_begin_poly1305_blocks_vpmadd52:
 	mov	rcx,r9
 
 
+
 	shr	rdx,4
 	jz	NEAR $L$no_data_vpmadd52
 
@@ -2764,6 +2777,7 @@ $L$no_data_vpmadd52:
 	mov	rdi,QWORD[8+rsp]	;WIN64 epilogue
 	mov	rsi,QWORD[16+rsp]
 	DB	0F3h,0C3h		;repret
+
 $L$SEH_end_poly1305_blocks_vpmadd52:
 
 ALIGN	32
@@ -2778,6 +2792,7 @@ $L$SEH_begin_poly1305_blocks_vpmadd52_4x:
 	mov	rcx,r9
 
 
+
 	shr	rdx,4
 	jz	NEAR $L$no_data_vpmadd52_4x
 
@@ -3204,6 +3219,7 @@ $L$no_data_vpmadd52_4x:
 	mov	rdi,QWORD[8+rsp]	;WIN64 epilogue
 	mov	rsi,QWORD[16+rsp]
 	DB	0F3h,0C3h		;repret
+
 $L$SEH_end_poly1305_blocks_vpmadd52_4x:
 
 ALIGN	32
@@ -3218,6 +3234,7 @@ $L$SEH_begin_poly1305_blocks_vpmadd52_8x:
 	mov	rcx,r9
 
 
+
 	shr	rdx,4
 	jz	NEAR $L$no_data_vpmadd52_8x
 
@@ -3560,6 +3577,7 @@ $L$no_data_vpmadd52_8x:
 	mov	rdi,QWORD[8+rsp]	;WIN64 epilogue
 	mov	rsi,QWORD[16+rsp]
 	DB	0F3h,0C3h		;repret
+
 $L$SEH_end_poly1305_blocks_vpmadd52_8x:
 
 ALIGN	32
@@ -3573,6 +3591,7 @@ $L$SEH_begin_poly1305_emit_base2_44:
 	mov	rdx,r8
 
 
+
 	mov	r8,QWORD[rdi]
 	mov	r9,QWORD[8+rdi]
 	mov	r10,QWORD[16+rdi]
@@ -3605,6 +3624,7 @@ $L$SEH_begin_poly1305_emit_base2_44:
 	mov	rdi,QWORD[8+rsp]	;WIN64 epilogue
 	mov	rsi,QWORD[16+rsp]
 	DB	0F3h,0C3h		;repret
+
 $L$SEH_end_poly1305_emit_base2_44:
 ALIGN	64
 $L$const:
@@ -3646,6 +3666,7 @@ global	xor128_encrypt_n_pad
 
 ALIGN	16
 xor128_encrypt_n_pad:
+
 	sub	rdx,r8
 	sub	rcx,r8
 	mov	r10,r9
@@ -3689,10 +3710,12 @@ $L$done_enc:
 	DB	0F3h,0C3h		;repret
 
 
+
 global	xor128_decrypt_n_pad
 
 ALIGN	16
 xor128_decrypt_n_pad:
+
 	sub	rdx,r8
 	sub	rcx,r8
 	mov	r10,r9
@@ -3739,6 +3762,7 @@ $L$done_dec:
 	mov	rax,r8
 	DB	0F3h,0C3h		;repret
 
+
 EXTERN	__imp_RtlVirtualUnwind
 
 ALIGN	16
diff --git a/deps/openssl/config/archs/VC-WIN64A/asm/crypto/rc4/rc4-x86_64.asm b/deps/openssl/config/archs/VC-WIN64A/asm/crypto/rc4/rc4-x86_64.asm
index 5732b40ed6..edbcc06e34 100644
--- a/deps/openssl/config/archs/VC-WIN64A/asm/crypto/rc4/rc4-x86_64.asm
+++ b/deps/openssl/config/archs/VC-WIN64A/asm/crypto/rc4/rc4-x86_64.asm
@@ -19,13 +19,14 @@ $L$SEH_begin_RC4:
 	mov	rdx,r8
 	mov	rcx,r9
 
+
+
 	or	rsi,rsi
 	jne	NEAR $L$entry
 	mov	rdi,QWORD[8+rsp]	;WIN64 epilogue
 	mov	rsi,QWORD[16+rsp]
 	DB	0F3h,0C3h		;repret
 $L$entry:
-
 	push	rbx
 
 	push	r12
@@ -558,6 +559,7 @@ $L$SEH_begin_RC4_set_key:
 	mov	rdx,r8
 
 
+
 	lea	rdi,[8+rdi]
 	lea	rdx,[rsi*1+rdx]
 	neg	rsi
@@ -626,12 +628,14 @@ $L$exit_key:
 	mov	rdi,QWORD[8+rsp]	;WIN64 epilogue
 	mov	rsi,QWORD[16+rsp]
 	DB	0F3h,0C3h		;repret
+
 $L$SEH_end_RC4_set_key:
 
 global	RC4_options
 
 ALIGN	16
 RC4_options:
+
 	lea	rax,[$L$opts]
 	mov	edx,DWORD[OPENSSL_ia32cap_P]
 	bt	edx,20
@@ -644,6 +648,7 @@ $L$8xchar:
 	add	rax,12
 $L$done:
 	DB	0F3h,0C3h		;repret
+
 ALIGN	64
 $L$opts:
 DB	114,99,52,40,56,120,44,105,110,116,41,0
diff --git a/deps/openssl/config/archs/VC-WIN64A/asm/crypto/sha/keccak1600-x86_64.asm b/deps/openssl/config/archs/VC-WIN64A/asm/crypto/sha/keccak1600-x86_64.asm
index d0471cb3b3..fdab35d95c 100644
--- a/deps/openssl/config/archs/VC-WIN64A/asm/crypto/sha/keccak1600-x86_64.asm
+++ b/deps/openssl/config/archs/VC-WIN64A/asm/crypto/sha/keccak1600-x86_64.asm
@@ -8,6 +8,7 @@ section	.text code align=64
 
 ALIGN	32
 __KeccakF1600:
+
 	mov	rax,QWORD[60+rdi]
 	mov	rbx,QWORD[68+rdi]
 	mov	rcx,QWORD[76+rdi]
@@ -263,6 +264,7 @@ $L$oop:
 
 
 
+
 ALIGN	32
 KeccakF1600:
 
diff --git a/deps/openssl/config/archs/VC-WIN64A/asm/crypto/sha/sha1-x86_64.asm b/deps/openssl/config/archs/VC-WIN64A/asm/crypto/sha/sha1-x86_64.asm
index d796380ae8..1b60a7ce75 100644
--- a/deps/openssl/config/archs/VC-WIN64A/asm/crypto/sha/sha1-x86_64.asm
+++ b/deps/openssl/config/archs/VC-WIN64A/asm/crypto/sha/sha1-x86_64.asm
@@ -1458,10 +1458,10 @@ DB	102,15,56,0,251
 	movaps	xmm9,XMMWORD[((-8-16))+rax]
 	mov	rsp,rax
 $L$epilogue_shaext:
-
 	mov	rdi,QWORD[8+rsp]	;WIN64 epilogue
 	mov	rsi,QWORD[16+rsp]
 	DB	0F3h,0C3h		;repret
+
 $L$SEH_end_sha1_block_data_order_shaext:
 
 ALIGN	16
diff --git a/deps/openssl/config/archs/VC-WIN64A/asm/crypto/sha/sha256-x86_64.asm b/deps/openssl/config/archs/VC-WIN64A/asm/crypto/sha/sha256-x86_64.asm
index fc102444ff..9ff3cbb92b 100644
--- a/deps/openssl/config/archs/VC-WIN64A/asm/crypto/sha/sha256-x86_64.asm
+++ b/deps/openssl/config/archs/VC-WIN64A/asm/crypto/sha/sha256-x86_64.asm
@@ -1804,6 +1804,7 @@ $L$SEH_begin_sha256_block_data_order_shaext:
 
 
 _shaext_shortcut:
+
 	lea	rsp,[((-88))+rsp]
 	movaps	XMMWORD[(-8-80)+rax],xmm6
 	movaps	XMMWORD[(-8-64)+rax],xmm7
@@ -2022,6 +2023,7 @@ $L$epilogue_shaext:
 	mov	rdi,QWORD[8+rsp]	;WIN64 epilogue
 	mov	rsi,QWORD[16+rsp]
 	DB	0F3h,0C3h		;repret
+
 $L$SEH_end_sha256_block_data_order_shaext:
 
 ALIGN	64
@@ -5476,6 +5478,8 @@ $L$ower_avx2:
 
 	lea	rsp,[448+rsp]
 
+
+
 	add	eax,DWORD[rdi]
 	add	ebx,DWORD[4+rdi]
 	add	ecx,DWORD[8+rdi]
@@ -5501,15 +5505,17 @@ $L$ower_avx2:
 	jbe	NEAR $L$oop_avx2
 	lea	rbp,[rsp]
 
+
+
+
 $L$done_avx2:
-	lea	rsp,[rbp]
-	mov	rsi,QWORD[88+rsp]
+	mov	rsi,QWORD[88+rbp]
 
 	vzeroupper
-	movaps	xmm6,XMMWORD[((64+32))+rsp]
-	movaps	xmm7,XMMWORD[((64+48))+rsp]
-	movaps	xmm8,XMMWORD[((64+64))+rsp]
-	movaps	xmm9,XMMWORD[((64+80))+rsp]
+	movaps	xmm6,XMMWORD[((64+32))+rbp]
+	movaps	xmm7,XMMWORD[((64+48))+rbp]
+	movaps	xmm8,XMMWORD[((64+64))+rbp]
+	movaps	xmm9,XMMWORD[((64+80))+rbp]
 	mov	r15,QWORD[((-48))+rsi]
 
 	mov	r14,QWORD[((-40))+rsi]
diff --git a/deps/openssl/config/archs/VC-WIN64A/asm/crypto/sha/sha512-x86_64.asm b/deps/openssl/config/archs/VC-WIN64A/asm/crypto/sha/sha512-x86_64.asm
index 1a9935d7b6..fc2269c843 100644
--- a/deps/openssl/config/archs/VC-WIN64A/asm/crypto/sha/sha512-x86_64.asm
+++ b/deps/openssl/config/archs/VC-WIN64A/asm/crypto/sha/sha512-x86_64.asm
@@ -5468,6 +5468,8 @@ $L$ower_avx2:
 
 	lea	rsp,[1152+rsp]
 
+
+
 	add	rax,QWORD[rdi]
 	add	rbx,QWORD[8+rdi]
 	add	rcx,QWORD[16+rdi]
@@ -5493,17 +5495,19 @@ $L$ower_avx2:
 	jbe	NEAR $L$oop_avx2
 	lea	rbp,[rsp]
 
+
+
+
 $L$done_avx2:
-	lea	rsp,[rbp]
-	mov	rsi,QWORD[152+rsp]
+	mov	rsi,QWORD[152+rbp]
 
 	vzeroupper
-	movaps	xmm6,XMMWORD[((128+32))+rsp]
-	movaps	xmm7,XMMWORD[((128+48))+rsp]
-	movaps	xmm8,XMMWORD[((128+64))+rsp]
-	movaps	xmm9,XMMWORD[((128+80))+rsp]
-	movaps	xmm10,XMMWORD[((128+96))+rsp]
-	movaps	xmm11,XMMWORD[((128+112))+rsp]
+	movaps	xmm6,XMMWORD[((128+32))+rbp]
+	movaps	xmm7,XMMWORD[((128+48))+rbp]
+	movaps	xmm8,XMMWORD[((128+64))+rbp]
+	movaps	xmm9,XMMWORD[((128+80))+rbp]
+	movaps	xmm10,XMMWORD[((128+96))+rbp]
+	movaps	xmm11,XMMWORD[((128+112))+rbp]
 	mov	r15,QWORD[((-48))+rsi]
 
 	mov	r14,QWORD[((-40))+rsi]
diff --git a/deps/openssl/config/archs/VC-WIN64A/asm/crypto/x86_64cpuid.asm b/deps/openssl/config/archs/VC-WIN64A/asm/crypto/x86_64cpuid.asm
index e2fec12d22..f57d3210fc 100644
--- a/deps/openssl/config/archs/VC-WIN64A/asm/crypto/x86_64cpuid.asm
+++ b/deps/openssl/config/archs/VC-WIN64A/asm/crypto/x86_64cpuid.asm
@@ -17,6 +17,7 @@ global	OPENSSL_atomic_add
 
 ALIGN	16
 OPENSSL_atomic_add:
+
 	mov	eax,DWORD[rcx]
 $L$spin:	lea	r8,[rax*1+rdx]
 DB	0xf0
@@ -27,16 +28,19 @@ DB	0x48,0x98
 	DB	0F3h,0C3h		;repret
 
 
+
 global	OPENSSL_rdtsc
 
 ALIGN	16
 OPENSSL_rdtsc:
+
 	rdtsc
 	shl	rdx,32
 	or	rax,rdx
 	DB	0F3h,0C3h		;repret
 
 
+
 global	OPENSSL_ia32_cpuid
 
 ALIGN	16
@@ -219,6 +223,7 @@ global	OPENSSL_cleanse
 
 ALIGN	16
 OPENSSL_cleanse:
+
 	xor	rax,rax
 	cmp	rdx,15
 	jae	NEAR $L$ot
@@ -250,10 +255,12 @@ $L$aligned:
 	DB	0F3h,0C3h		;repret
 
 
+
 global	CRYPTO_memcmp
 
 ALIGN	16
 CRYPTO_memcmp:
+
 	xor	rax,rax
 	xor	r10,r10
 	cmp	r8,0
@@ -283,6 +290,7 @@ $L$oop_cmp:
 $L$no_data:
 	DB	0F3h,0C3h		;repret
 
+
 global	OPENSSL_wipe_cpu
 
 ALIGN	16
@@ -306,6 +314,7 @@ global	OPENSSL_instrument_bus
 
 ALIGN	16
 OPENSSL_instrument_bus:
+
 	mov	r10,rcx
 	mov	rcx,rdx
 	mov	r11,rdx
@@ -334,10 +343,12 @@ DB	0xf0
 	DB	0F3h,0C3h		;repret
 
 
+
 global	OPENSSL_instrument_bus2
 
 ALIGN	16
 OPENSSL_instrument_bus2:
+
 	mov	r10,rcx
 	mov	rcx,rdx
 	mov	r11,r8
@@ -381,10 +392,12 @@ $L$done2:
 	sub	rax,rcx
 	DB	0F3h,0C3h		;repret
 
+
 global	OPENSSL_ia32_rdrand_bytes
 
 ALIGN	16
 OPENSSL_ia32_rdrand_bytes:
+
 	xor	rax,rax
 	cmp	rdx,0
 	je	NEAR $L$done_rdrand_bytes
@@ -422,10 +435,12 @@ $L$done_rdrand_bytes:
 	xor	r10,r10
 	DB	0F3h,0C3h		;repret
 
+
 global	OPENSSL_ia32_rdseed_bytes
 
 ALIGN	16
 OPENSSL_ia32_rdseed_bytes:
+
 	xor	rax,rax
 	cmp	rdx,0
 	je	NEAR $L$done_rdseed_bytes
diff --git a/deps/openssl/config/archs/VC-WIN64A/asm/include/openssl/opensslconf.h b/deps/openssl/config/archs/VC-WIN64A/asm/include/openssl/opensslconf.h
index c4bc935b0a..de662de12b 100644
--- a/deps/openssl/config/archs/VC-WIN64A/asm/include/openssl/opensslconf.h
+++ b/deps/openssl/config/archs/VC-WIN64A/asm/include/openssl/opensslconf.h
@@ -99,9 +99,6 @@ extern "C" {
 #ifndef OPENSSL_NO_DYNAMIC_ENGINE
 # define OPENSSL_NO_DYNAMIC_ENGINE
 #endif
-#ifndef OPENSSL_NO_AFALGENG
-# define OPENSSL_NO_AFALGENG
-#endif
 
 
 /*
diff --git a/deps/openssl/config/archs/VC-WIN64A/asm/include/progs.h b/deps/openssl/config/archs/VC-WIN64A/asm/include/progs.h
index 9b3d270e20..308c65601b 100644
--- a/deps/openssl/config/archs/VC-WIN64A/asm/include/progs.h
+++ b/deps/openssl/config/archs/VC-WIN64A/asm/include/progs.h
@@ -2,7 +2,7 @@
  * WARNING: do not edit!
  * Generated by apps/progs.pl
  *
- * Copyright 1995-2019 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 1995-2020 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
diff --git a/deps/openssl/config/archs/VC-WIN64A/asm/openssl-cl.gypi b/deps/openssl/config/archs/VC-WIN64A/asm/openssl-cl.gypi
index 2d20ac3879..91ad847952 100644
--- a/deps/openssl/config/archs/VC-WIN64A/asm/openssl-cl.gypi
+++ b/deps/openssl/config/archs/VC-WIN64A/asm/openssl-cl.gypi
@@ -20,6 +20,7 @@
       'KECCAK1600_ASM',
       'RC4_ASM',
       'MD5_ASM',
+      'AESNI_ASM',
       'VPAES_ASM',
       'GHASH_ASM',
       'ECP_NISTZ256_ASM',
diff --git a/deps/openssl/config/archs/VC-WIN64A/asm/openssl.gypi b/deps/openssl/config/archs/VC-WIN64A/asm/openssl.gypi
index 20ef5e5d4b..5ddf062b39 100644
--- a/deps/openssl/config/archs/VC-WIN64A/asm/openssl.gypi
+++ b/deps/openssl/config/archs/VC-WIN64A/asm/openssl.gypi
@@ -727,6 +727,7 @@
       'KECCAK1600_ASM',
       'RC4_ASM',
       'MD5_ASM',
+      'AESNI_ASM',
       'VPAES_ASM',
       'GHASH_ASM',
       'ECP_NISTZ256_ASM',
diff --git a/deps/openssl/config/archs/VC-WIN64A/asm_avx2/configdata.pm b/deps/openssl/config/archs/VC-WIN64A/asm_avx2/configdata.pm
index 1a22e6b6ed..a95fc8411c 100644
--- a/deps/openssl/config/archs/VC-WIN64A/asm_avx2/configdata.pm
+++ b/deps/openssl/config/archs/VC-WIN64A/asm_avx2/configdata.pm
@@ -54,13 +54,13 @@ our %config = (
   export_var_as_fn => "1",
   includes => [  ],
   lflags => [  ],
-  lib_defines => [ "OPENSSL_PIC", "OPENSSL_CPUID_OBJ", "OPENSSL_IA32_SSE2", "OPENSSL_BN_ASM_MONT", "OPENSSL_BN_ASM_MONT5", "OPENSSL_BN_ASM_GF2m", "SHA1_ASM", "SHA256_ASM", "SHA512_ASM", "KECCAK1600_ASM", "RC4_ASM", "MD5_ASM", "VPAES_ASM", "GHASH_ASM", "ECP_NISTZ256_ASM", "X25519_ASM", "POLY1305_ASM" ],
+  lib_defines => [ "OPENSSL_PIC", "OPENSSL_CPUID_OBJ", "OPENSSL_IA32_SSE2", "OPENSSL_BN_ASM_MONT", "OPENSSL_BN_ASM_MONT5", "OPENSSL_BN_ASM_GF2m", "SHA1_ASM", "SHA256_ASM", "SHA512_ASM", "KECCAK1600_ASM", "RC4_ASM", "MD5_ASM", "AESNI_ASM", "VPAES_ASM", "GHASH_ASM", "ECP_NISTZ256_ASM", "X25519_ASM", "POLY1305_ASM" ],
   libdir => "",
   major => "1",
   minor => "1.1",
   openssl_algorithm_defines => [ "OPENSSL_NO_COMP", "OPENSSL_NO_MD2", "OPENSSL_NO_RC5" ],
   openssl_api_defines => [  ],
-  openssl_other_defines => [ "OPENSSL_RAND_SEED_OS", "OPENSSL_NO_AFALGENG", "OPENSSL_NO_ASAN", "OPENSSL_NO_CRYPTO_MDEBUG", "OPENSSL_NO_CRYPTO_MDEBUG_BACKTRACE", "OPENSSL_NO_DEVCRYPTOENG", "OPENSSL_NO_EC_NISTP_64_GCC_128", "OPENSSL_NO_EGD", "OPENSSL_NO_EXTERNAL_TESTS", "OPENSSL_NO_FUZZ_AFL", "OPENSSL_NO_FUZZ_LIBFUZZER", "OPENSSL_NO_HEARTBEATS", "OPENSSL_NO_MSAN", "OPENSSL_NO_SCTP", "OPENSSL_NO_SSL3", "OPENSSL_NO_SSL3_METHOD", "OPENSSL_NO_UBSAN", "OPENSSL_NO_UNIT_TEST", "OPENSSL_NO_WEAK_SSL_CIPHERS", "OPENSSL_NO_DYNAMIC_ENGINE", "OPENSSL_NO_AFALGENG" ],
+  openssl_other_defines => [ "OPENSSL_RAND_SEED_OS", "OPENSSL_NO_AFALGENG", "OPENSSL_NO_ASAN", "OPENSSL_NO_CRYPTO_MDEBUG", "OPENSSL_NO_CRYPTO_MDEBUG_BACKTRACE", "OPENSSL_NO_DEVCRYPTOENG", "OPENSSL_NO_EC_NISTP_64_GCC_128", "OPENSSL_NO_EGD", "OPENSSL_NO_EXTERNAL_TESTS", "OPENSSL_NO_FUZZ_AFL", "OPENSSL_NO_FUZZ_LIBFUZZER", "OPENSSL_NO_HEARTBEATS", "OPENSSL_NO_MSAN", "OPENSSL_NO_SCTP", "OPENSSL_NO_SSL3", "OPENSSL_NO_SSL3_METHOD", "OPENSSL_NO_UBSAN", "OPENSSL_NO_UNIT_TEST", "OPENSSL_NO_WEAK_SSL_CIPHERS", "OPENSSL_NO_DYNAMIC_ENGINE" ],
   openssl_sys_defines => [ "OPENSSL_SYS_WIN64A" ],
   openssl_thread_defines => [ "OPENSSL_THREADS" ],
   openssldir => "",
@@ -116,8 +116,8 @@ our %config = (
   sourcedir => ".",
   target => "VC-WIN64A",
   tdirs => [ "ossl_shim" ],
-  version => "1.1.1d",
-  version_num => "0x1010104fL",
+  version => "1.1.1e",
+  version_num => "0x1010105fL",
 );
 
 our %target = (
@@ -133,7 +133,7 @@ our %target = (
   LDFLAGS => "/nologo /debug",
   MT => "mt",
   MTFLAGS => "-nologo",
-  RANLIB => "CODE(0x562305dbe5d8)",
+  RANLIB => "CODE(0x55c8e9449798)",
   RC => "rc",
   _conf_fname_int => [ "Configurations/00-base-templates.conf", "Configurations/00-base-templates.conf", "Configurations/10-main.conf", "Configurations/10-main.conf", "Configurations/10-main.conf", "Configurations/00-base-templates.conf", "Configurations/10-main.conf", "Configurations/shared-info.pl" ],
   aes_asm_src => "aes_core.c aes_cbc.c vpaes-x86_64.s aesni-x86_64.s aesni-sha1-x86_64.s aesni-sha256-x86_64.s aesni-mb-x86_64.s",
@@ -259,6 +259,7 @@ our @disablables = (
   "dgram",
   "dh",
   "dsa",
+  "dso",
   "dtls",
   "dynamic-engine",
   "ec",
@@ -376,8 +377,8 @@ our %unified_info = (
         {
             "" =>
                 [
-                    "crypto/include/internal/bn_conf.h",
-                    "crypto/include/internal/dso_conf.h",
+                    "include/crypto/bn_conf.h",
+                    "include/crypto/dso_conf.h",
                     "include/openssl/opensslconf.h",
                 ],
             "apps/asn1pars.o" =>
@@ -645,14 +646,6 @@ our %unified_info = (
                     "crypto/perlasm/cbc.pl",
                     "crypto/perlasm/x86asm.pl",
                 ],
-            "crypto/include/internal/bn_conf.h" =>
-                [
-                    "configdata.pm",
-                ],
-            "crypto/include/internal/dso_conf.h" =>
-                [
-                    "configdata.pm",
-                ],
             "crypto/rc4/rc4-586.s" =>
                 [
                     "crypto/perlasm/x86asm.pl",
@@ -728,6 +721,14 @@ our %unified_info = (
                 [
                     "libcrypto",
                 ],
+            "include/crypto/bn_conf.h" =>
+                [
+                    "configdata.pm",
+                ],
+            "include/crypto/dso_conf.h" =>
+                [
+                    "configdata.pm",
+                ],
             "include/openssl/opensslconf.h" =>
                 [
                     "configdata.pm",
@@ -1525,6 +1526,12 @@ our %unified_info = (
                     "libcrypto",
                     "test/libtestutil.a",
                 ],
+            "test/ssl_ctx_test" =>
+                [
+                    "libcrypto",
+                    "libssl",
+                    "test/libtestutil.a",
+                ],
             "test/ssl_test" =>
                 [
                     "libcrypto",
@@ -3266,7 +3273,6 @@ our %unified_info = (
                             "test/testutil/cb.o",
                             "test/testutil/driver.o",
                             "test/testutil/format_output.o",
-                            "test/testutil/init.o",
                             "test/testutil/main.o",
                             "test/testutil/output_helpers.o",
                             "test/testutil/random.o",
@@ -3274,6 +3280,7 @@ our %unified_info = (
                             "test/testutil/tap_bio.o",
                             "test/testutil/test_cleanup.o",
                             "test/testutil/tests.o",
+                            "test/testutil/testutil_init.o",
                         ],
                     "products" =>
                         {
@@ -3767,14 +3774,6 @@ our %unified_info = (
                 [
                     "crypto/ia64cpuid.S",
                 ],
-            "crypto/include/internal/bn_conf.h" =>
-                [
-                    "crypto/include/internal/bn_conf.h.in",
-                ],
-            "crypto/include/internal/dso_conf.h" =>
-                [
-                    "crypto/include/internal/dso_conf.h.in",
-                ],
             "crypto/md5/md5-586.s" =>
                 [
                     "crypto/md5/asm/md5-586.pl",
@@ -4215,6 +4214,14 @@ our %unified_info = (
                     "engines/asm/e_padlock-x86_64.pl",
                     "\$(PERLASM_SCHEME)",
                 ],
+            "include/crypto/bn_conf.h" =>
+                [
+                    "include/crypto/bn_conf.h.in",
+                ],
+            "include/crypto/dso_conf.h" =>
+                [
+                    "include/crypto/dso_conf.h.in",
+                ],
             "include/openssl/opensslconf.h" =>
                 [
                     "include/openssl/opensslconf.h.in",
@@ -4924,49 +4931,41 @@ our %unified_info = (
             "crypto/aes/aes_cbc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/aes/aes_cfb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/aes/aes_core.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/aes/aes_ecb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/aes/aes_ige.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/aes/aes_misc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/aes/aes_ofb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/aes/aes_wrap.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/aes/aesfx-sparcv9.o" =>
@@ -4976,25 +4975,21 @@ our %unified_info = (
             "crypto/aes/aesni-mb-x86_64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/aes/aesni-sha1-x86_64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/aes/aesni-sha256-x86_64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/aes/aesni-x86_64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/aes/aest4-sparcv9.o" =>
@@ -5012,13 +5007,11 @@ our %unified_info = (
             "crypto/aes/vpaes-x86_64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/aria/aria.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/arm64cpuid.o" =>
@@ -5032,613 +5025,511 @@ our %unified_info = (
             "crypto/asn1/a_bitstr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_d2i_fp.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_digest.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_dup.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_gentm.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_i2d_fp.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_int.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_mbstr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_object.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_octet.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_print.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_sign.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_strex.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_strnid.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_time.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_type.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_utctm.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_utf8.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_verify.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/ameth_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/asn1_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/asn1_gen.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/asn1_item_list.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/asn1_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/asn1_par.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/asn_mime.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/asn_moid.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/asn_mstbl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/asn_pack.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/bio_asn1.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/bio_ndef.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/d2i_pr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/d2i_pu.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/evp_asn1.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/f_int.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/f_string.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/i2d_pr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/i2d_pu.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/n_pkey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/nsseq.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/p5_pbe.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/p5_pbev2.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/p5_scrypt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/p8_pkey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/t_bitst.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/t_pkey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/t_spki.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/tasn_dec.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/tasn_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/tasn_fre.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/tasn_new.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/tasn_prn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/tasn_scn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/tasn_typ.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/tasn_utl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/x_algor.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/x_bignum.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/x_info.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/x_int64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/x_long.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/x_pkey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/x_sig.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/x_spki.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/x_val.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/async/arch/async_null.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/async/arch/async_posix.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/async/arch/async_win.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/async/async.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/async/async_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/async/async_wait.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bf/bf_cfb64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bf/bf_ecb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bf/bf_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bf/bf_ofb64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bf/bf_skey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/b_addr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/b_dump.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/b_print.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/b_sock.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/b_sock2.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bf_buff.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bf_lbuf.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bf_nbio.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bf_null.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bio_cb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bio_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bio_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bio_meth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bss_acpt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bss_bio.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bss_conn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bss_dgram.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bss_fd.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bss_file.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bss_log.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bss_mem.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bss_null.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bss_sock.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/blake2/blake2b.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/blake2/blake2s.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/blake2/m_blake2b.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/blake2/m_blake2s.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/armv4-gf2m.o" =>
@@ -5656,188 +5547,157 @@ our %unified_info = (
             "crypto/bn/bn_add.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_asm.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_blind.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_const.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_ctx.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_depr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_dh.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_div.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_exp.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto",
                 ],
             "crypto/bn/bn_exp2.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_gcd.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_gf2m.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_intern.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_kron.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_mod.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_mont.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_mpi.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_mul.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_nist.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_prime.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_print.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_rand.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_recp.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_shift.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_sqr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_sqrt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_srp.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_word.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_x931p.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/mips-mont.o" =>
@@ -5847,19 +5707,16 @@ our %unified_info = (
             "crypto/bn/rsaz-avx2.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/rsaz-x86_64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/rsaz_exp.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/sparct4-mont.o" =>
@@ -5885,31 +5742,26 @@ our %unified_info = (
             "crypto/bn/x86_64-gf2m.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/x86_64-mont.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/x86_64-mont5.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/buffer/buf_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/buffer/buffer.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/buildinf.h" =>
@@ -5919,37 +5771,31 @@ our %unified_info = (
             "crypto/camellia/cmll-x86_64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/camellia/cmll_cfb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/camellia/cmll_ctr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/camellia/cmll_ecb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/camellia/cmll_misc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/camellia/cmll_ofb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/camellia/cmllt4-sparcv9.o" =>
@@ -5959,31 +5805,26 @@ our %unified_info = (
             "crypto/cast/c_cfb64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cast/c_ecb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cast/c_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cast/c_ofb64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cast/c_skey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/chacha/chacha-armv4.o" =>
@@ -6001,278 +5842,232 @@ our %unified_info = (
             "crypto/chacha/chacha-x86_64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cmac/cm_ameth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cmac/cm_pmeth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cmac/cmac.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_asn1.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_att.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_cd.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_dd.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_env.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_ess.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_io.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_kari.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_pwri.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_sd.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_smime.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/conf/conf_api.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/conf/conf_def.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/conf/conf_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/conf/conf_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/conf/conf_mall.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/conf/conf_mod.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/conf/conf_sap.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/conf/conf_ssl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cpt_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cryptlib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ct/ct_b64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ct/ct_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ct/ct_log.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ct/ct_oct.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ct/ct_policy.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ct/ct_prn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ct/ct_sct.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ct/ct_sct_ctx.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ct/ct_vfy.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ct/ct_x509v3.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ctype.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cversion.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto",
                 ],
             "crypto/des/cbc_cksm.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/cbc_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/cfb64ede.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/cfb64enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/cfb_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/des_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/dest4-sparcv9.o" =>
@@ -6282,301 +6077,251 @@ our %unified_info = (
             "crypto/des/ecb3_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/ecb_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/fcrypt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/fcrypt_b.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/ofb64ede.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/ofb64enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/ofb_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/pcbc_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/qud_cksm.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/rand_key.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/set_key.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/str2key.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/xcbc_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_ameth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_asn1.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_check.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_depr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_gen.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_kdf.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_key.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_meth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_pmeth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_prn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_rfc5114.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_rfc7919.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dsa/dsa_ameth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dsa/dsa_asn1.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dsa/dsa_depr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dsa/dsa_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dsa/dsa_gen.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dsa/dsa_key.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dsa/dsa_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dsa/dsa_meth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dsa/dsa_ossl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dsa/dsa_pmeth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dsa/dsa_prn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dsa/dsa_sign.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dsa/dsa_vrf.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dso/dso_dl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dso/dso_dlfcn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dso/dso_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dso/dso_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dso/dso_openssl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dso/dso_vms.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dso/dso_win32.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ebcdic.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/curve25519.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/curve448/arch_32/f_impl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto/ec/curve448/arch_32",
                     "crypto/ec/curve448",
@@ -6584,7 +6329,6 @@ our %unified_info = (
             "crypto/ec/curve448/curve448.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto/ec/curve448/arch_32",
                     "crypto/ec/curve448",
@@ -6592,7 +6336,6 @@ our %unified_info = (
             "crypto/ec/curve448/curve448_tables.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto/ec/curve448/arch_32",
                     "crypto/ec/curve448",
@@ -6600,7 +6343,6 @@ our %unified_info = (
             "crypto/ec/curve448/eddsa.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto/ec/curve448/arch_32",
                     "crypto/ec/curve448",
@@ -6608,7 +6350,6 @@ our %unified_info = (
             "crypto/ec/curve448/f_generic.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto/ec/curve448/arch_32",
                     "crypto/ec/curve448",
@@ -6616,7 +6357,6 @@ our %unified_info = (
             "crypto/ec/curve448/scalar.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto/ec/curve448/arch_32",
                     "crypto/ec/curve448",
@@ -6624,163 +6364,136 @@ our %unified_info = (
             "crypto/ec/ec2_oct.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec2_smpl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec_ameth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec_asn1.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec_check.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec_curve.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec_cvt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec_key.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec_kmeth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec_mult.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec_oct.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec_pmeth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec_print.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecdh_kdf.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecdh_ossl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecdsa_ossl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecdsa_sign.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecdsa_vrf.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/eck_prn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecp_mont.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecp_nist.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecp_nistp224.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecp_nistp256.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecp_nistp521.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecp_nistputil.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecp_nistz256-armv4.o" =>
@@ -6798,241 +6511,201 @@ our %unified_info = (
             "crypto/ec/ecp_nistz256-x86_64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecp_nistz256.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecp_oct.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecp_smpl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecx_meth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/x25519-x86_64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/eng_all.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/eng_cnf.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/eng_ctrl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/eng_dyn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/eng_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/eng_fat.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/eng_init.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/eng_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/eng_list.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/eng_openssl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/eng_pkey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/eng_rdrand.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/eng_table.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/tb_asnmth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/tb_cipher.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/tb_dh.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/tb_digest.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/tb_dsa.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/tb_eckey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/tb_pkmeth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/tb_rand.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/tb_rsa.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/err/err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/err/err_all.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/err/err_prn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/bio_b64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/bio_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/bio_md.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/bio_ok.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/c_allc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/c_alld.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/cmeth_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/digest.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/e_aes.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto",
                     "crypto/modes",
@@ -7040,21 +6713,18 @@ our %unified_info = (
             "crypto/evp/e_aes_cbc_hmac_sha1.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto/modes",
                 ],
             "crypto/evp/e_aes_cbc_hmac_sha256.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto/modes",
                 ],
             "crypto/evp/e_aria.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto",
                     "crypto/modes",
@@ -7062,13 +6732,11 @@ our %unified_info = (
             "crypto/evp/e_bf.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/e_camellia.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto",
                     "crypto/modes",
@@ -7076,81 +6744,68 @@ our %unified_info = (
             "crypto/evp/e_cast.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/e_chacha20_poly1305.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/e_des.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto",
                 ],
             "crypto/evp/e_des3.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto",
                 ],
             "crypto/evp/e_idea.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/e_null.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/e_old.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/e_rc2.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/e_rc4.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/e_rc4_hmac_md5.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/e_rc5.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/e_seed.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/e_sm4.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto",
                     "crypto/modes",
@@ -7158,328 +6813,267 @@ our %unified_info = (
             "crypto/evp/e_xcbc_d.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/encode.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/evp_cnf.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/evp_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/evp_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/evp_key.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/evp_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/evp_pbe.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/evp_pkey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/m_md2.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/m_md4.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/m_md5.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/m_md5_sha1.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/m_mdc2.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/m_null.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/m_ripemd.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/m_sha1.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/m_sha3.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto",
                 ],
             "crypto/evp/m_sigver.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/m_wp.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/names.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/p5_crpt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/p5_crpt2.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/p_dec.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/p_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/p_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/p_open.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/p_seal.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/p_sign.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/p_verify.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/pbe_scrypt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/pmeth_fn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/pmeth_gn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/pmeth_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ex_data.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/getenv.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/hmac/hm_ameth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/hmac/hm_pmeth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/hmac/hmac.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/idea/i_cbc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/idea/i_cfb64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/idea/i_ecb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/idea/i_ofb64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/idea/i_skey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
-            "crypto/include/internal/bn_conf.h" =>
-                [
-                    ".",
-                ],
-            "crypto/include/internal/dso_conf.h" =>
-                [
-                    ".",
-                ],
             "crypto/init.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/kdf/hkdf.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/kdf/kdf_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/kdf/scrypt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/kdf/tls1_prf.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/lhash/lh_stats.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/lhash/lhash.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/md4/md4_dgst.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/md4/md4_one.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/md5/md5-sparcv9.o" =>
@@ -7489,91 +7083,76 @@ our %unified_info = (
             "crypto/md5/md5-x86_64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/md5/md5_dgst.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/md5/md5_one.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/mdc2/mdc2_one.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/mdc2/mdc2dgst.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/mem.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/mem_dbg.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/mem_sec.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/modes/aesni-gcm-x86_64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/modes/cbc128.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/modes/ccm128.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/modes/cfb128.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/modes/ctr128.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/modes/cts128.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/modes/gcm128.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto",
                 ],
@@ -7592,7 +7171,6 @@ our %unified_info = (
             "crypto/modes/ghash-x86_64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/modes/ghashv8-armx.o" =>
@@ -7602,361 +7180,301 @@ our %unified_info = (
             "crypto/modes/ocb128.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/modes/ofb128.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/modes/wrap128.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/modes/xts128.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/o_dir.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/o_fips.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/o_fopen.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/o_init.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/o_str.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/o_time.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/objects/o_names.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/objects/obj_dat.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/objects/obj_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/objects/obj_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/objects/obj_xref.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ocsp/ocsp_asn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ocsp/ocsp_cl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ocsp/ocsp_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ocsp/ocsp_ext.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ocsp/ocsp_ht.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ocsp/ocsp_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ocsp/ocsp_prn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ocsp/ocsp_srv.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ocsp/ocsp_vfy.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ocsp/v3_ocsp.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pem/pem_all.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pem/pem_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pem/pem_info.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pem/pem_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pem/pem_oth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pem/pem_pk8.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pem/pem_pkey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pem/pem_sign.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pem/pem_x509.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pem/pem_xaux.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pem/pvkfmt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_add.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_asn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_attr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_crpt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_crt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_decr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_init.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_key.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_kiss.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_mutl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_npas.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_p8d.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_p8e.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_sbag.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_utl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/pk12err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs7/bio_pk7.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs7/pk7_asn1.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs7/pk7_attr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs7/pk7_doit.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs7/pk7_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs7/pk7_mime.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs7/pk7_smime.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs7/pkcs7err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/poly1305/poly1305-armv4.o" =>
@@ -7978,265 +7496,221 @@ our %unified_info = (
             "crypto/poly1305/poly1305-x86_64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/poly1305/poly1305.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/poly1305/poly1305_ameth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/poly1305/poly1305_pmeth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rand/drbg_ctr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rand/drbg_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rand/rand_egd.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rand/rand_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rand/rand_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rand/rand_unix.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rand/rand_vms.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rand/rand_win.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rand/randfile.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rc2/rc2_cbc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rc2/rc2_ecb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rc2/rc2_skey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rc2/rc2cfb64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rc2/rc2ofb64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rc4/rc4-md5-x86_64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rc4/rc4-x86_64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ripemd/rmd_dgst.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ripemd/rmd_one.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_ameth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_asn1.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_chk.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_crpt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_depr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_gen.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_meth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_mp.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_none.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_oaep.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_ossl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_pk1.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_pmeth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_prn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_pss.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_saos.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_sign.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_ssl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_x931.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_x931g.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/s390xcpuid.o" =>
@@ -8246,31 +7720,26 @@ our %unified_info = (
             "crypto/seed/seed.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/seed/seed_cbc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/seed/seed_cfb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/seed/seed_ecb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/seed/seed_ofb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sha/keccak1600-armv4.o" =>
@@ -8280,7 +7749,6 @@ our %unified_info = (
             "crypto/sha/keccak1600-x86_64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sha/sha1-armv4-large.o" =>
@@ -8294,7 +7762,6 @@ our %unified_info = (
             "crypto/sha/sha1-mb-x86_64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sha/sha1-mips.o" =>
@@ -8312,19 +7779,16 @@ our %unified_info = (
             "crypto/sha/sha1-x86_64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sha/sha1_one.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sha/sha1dgst.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sha/sha256-armv4.o" =>
@@ -8338,7 +7802,6 @@ our %unified_info = (
             "crypto/sha/sha256-mb-x86_64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sha/sha256-mips.o" =>
@@ -8356,13 +7819,11 @@ our %unified_info = (
             "crypto/sha/sha256-x86_64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sha/sha256.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sha/sha512-armv4.o" =>
@@ -8388,727 +7849,606 @@ our %unified_info = (
             "crypto/sha/sha512-x86_64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sha/sha512.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/siphash/siphash.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/siphash/siphash_ameth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/siphash/siphash_pmeth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sm2/sm2_crypt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sm2/sm2_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sm2/sm2_pmeth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sm2/sm2_sign.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sm3/m_sm3.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sm3/sm3.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sm4/sm4.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/srp/srp_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/srp/srp_vfy.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/stack/stack.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/store/loader_file.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/store/store_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/store/store_init.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/store/store_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/store/store_register.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/store/store_strings.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/threads_none.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/threads_pthread.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/threads_win.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ts/ts_asn1.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ts/ts_conf.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ts/ts_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ts/ts_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ts/ts_req_print.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ts/ts_req_utils.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ts/ts_rsp_print.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ts/ts_rsp_sign.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ts/ts_rsp_utils.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ts/ts_rsp_verify.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ts/ts_verify_ctx.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/txt_db/txt_db.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ui/ui_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ui/ui_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ui/ui_null.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ui/ui_openssl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ui/ui_util.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/uid.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/whrlpool/wp-x86_64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/whrlpool/wp_dgst.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/by_dir.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/by_file.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/t_crl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/t_req.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/t_x509.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_att.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_cmp.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_d2.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_def.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_ext.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_lu.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_meth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_obj.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_r2x.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_req.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_set.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_trs.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_txt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_v3.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_vfy.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_vpm.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509cset.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509name.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509rset.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509spki.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509type.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x_all.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x_attrib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x_crl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x_exten.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x_name.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x_pubkey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x_req.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x_x509.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x_x509a.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/pcy_cache.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/pcy_data.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/pcy_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/pcy_map.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/pcy_node.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/pcy_tree.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_addr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_admis.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_akey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_akeya.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_alt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_asid.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_bcons.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_bitst.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_conf.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_cpols.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_crld.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_enum.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_extku.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_genn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_ia5.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_info.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_int.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_ncons.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_pci.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_pcia.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_pcons.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_pku.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_pmaps.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_prn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_purp.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_skey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_sxnet.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_tlsf.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_utl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x86_64cpuid.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "engines/e_capi.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "engines/e_padlock-x86_64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "engines/e_padlock.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "fuzz/asn1.o" =>
@@ -9159,6 +8499,14 @@ our %unified_info = (
                 [
                     "include",
                 ],
+            "include/crypto/bn_conf.h" =>
+                [
+                    ".",
+                ],
+            "include/crypto/dso_conf.h" =>
+                [
+                    ".",
+                ],
             "include/openssl/opensslconf.h" =>
                 [
                     ".",
@@ -9403,7 +8751,6 @@ our %unified_info = (
                 [
                     ".",
                     "include",
-                    "crypto/include",
                 ],
             "test/asn1_string_table_test.o" =>
                 [
@@ -9729,7 +9076,6 @@ our %unified_info = (
                 [
                     ".",
                     "include",
-                    "crypto/include",
                 ],
             "test/cipher_overhead_test.o" =>
                 [
@@ -9775,7 +9121,6 @@ our %unified_info = (
             "test/ctype_internal_test.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "test/curve448_internal_test.o" =>
@@ -9841,7 +9186,6 @@ our %unified_info = (
                 [
                     "include",
                     "crypto/ec",
-                    "crypto/include",
                 ],
             "test/ecdsatest.o" =>
                 [
@@ -9866,7 +9210,6 @@ our %unified_info = (
             "test/evp_extra_test.o" =>
                 [
                     "include",
-                    "crypto/include",
                 ],
             "test/evp_test.o" =>
                 [
@@ -9964,7 +9307,6 @@ our %unified_info = (
                 [
                     ".",
                     "include",
-                    "crypto/include",
                 ],
             "test/rc2test.o" =>
                 [
@@ -10014,18 +9356,15 @@ our %unified_info = (
                 [
                     ".",
                     "include",
-                    "crypto/include",
                 ],
             "test/sm2_internal_test.o" =>
                 [
                     "include",
-                    "crypto/include",
                 ],
             "test/sm4_internal_test.o" =>
                 [
                     ".",
                     "include",
-                    "crypto/include",
                 ],
             "test/srptest.o" =>
                 [
@@ -10036,6 +9375,10 @@ our %unified_info = (
                     ".",
                     "include",
                 ],
+            "test/ssl_ctx_test.o" =>
+                [
+                    "include",
+                ],
             "test/ssl_test.o" =>
                 [
                     "include",
@@ -10099,10 +9442,6 @@ our %unified_info = (
                 [
                     "include",
                 ],
-            "test/testutil/init.o" =>
-                [
-                    "include",
-                ],
             "test/testutil/main.o" =>
                 [
                     "include",
@@ -10131,6 +9470,10 @@ our %unified_info = (
                 [
                     "include",
                 ],
+            "test/testutil/testutil_init.o" =>
+                [
+                    "include",
+                ],
             "test/threadstest.o" =>
                 [
                     "include",
@@ -10395,6 +9738,7 @@ our %unified_info = (
             "test/sm4_internal_test",
             "test/srptest",
             "test/ssl_cert_table_internal_test",
+            "test/ssl_ctx_test",
             "test/ssl_test",
             "test/ssl_test_ctx_test",
             "test/sslapitest",
@@ -15378,7 +14722,6 @@ our %unified_info = (
                     "test/testutil/cb.o",
                     "test/testutil/driver.o",
                     "test/testutil/format_output.o",
-                    "test/testutil/init.o",
                     "test/testutil/main.o",
                     "test/testutil/output_helpers.o",
                     "test/testutil/random.o",
@@ -15386,6 +14729,7 @@ our %unified_info = (
                     "test/testutil/tap_bio.o",
                     "test/testutil/test_cleanup.o",
                     "test/testutil/tests.o",
+                    "test/testutil/testutil_init.o",
                 ],
             "test/md2test" =>
                 [
@@ -15613,6 +14957,14 @@ our %unified_info = (
                 [
                     "test/ssl_cert_table_internal_test.c",
                 ],
+            "test/ssl_ctx_test" =>
+                [
+                    "test/ssl_ctx_test.o",
+                ],
+            "test/ssl_ctx_test.o" =>
+                [
+                    "test/ssl_ctx_test.c",
+                ],
             "test/ssl_test" =>
                 [
                     "test/handshake_helper.o",
@@ -15715,10 +15067,6 @@ our %unified_info = (
                 [
                     "test/testutil/format_output.c",
                 ],
-            "test/testutil/init.o" =>
-                [
-                    "test/testutil/init.c",
-                ],
             "test/testutil/main.o" =>
                 [
                     "test/testutil/main.c",
@@ -15747,6 +15095,10 @@ our %unified_info = (
                 [
                     "test/testutil/tests.c",
                 ],
+            "test/testutil/testutil_init.o" =>
+                [
+                    "test/testutil/testutil_init.c",
+                ],
             "test/threadstest" =>
                 [
                     "test/threadstest.o",
diff --git a/deps/openssl/config/archs/VC-WIN64A/asm_avx2/crypto/aes/aes-x86_64.asm b/deps/openssl/config/archs/VC-WIN64A/asm_avx2/crypto/aes/aes-x86_64.asm
deleted file mode 100644
index c01e41b301..0000000000
--- a/deps/openssl/config/archs/VC-WIN64A/asm_avx2/crypto/aes/aes-x86_64.asm
+++ /dev/null
@@ -1,2960 +0,0 @@
-default	rel
-%define XMMWORD
-%define YMMWORD
-%define ZMMWORD
-section	.text code align=64
-
-
-ALIGN	16
-_x86_64_AES_encrypt:
-	xor	eax,DWORD[r15]
-	xor	ebx,DWORD[4+r15]
-	xor	ecx,DWORD[8+r15]
-	xor	edx,DWORD[12+r15]
-
-	mov	r13d,DWORD[240+r15]
-	sub	r13d,1
-	jmp	NEAR $L$enc_loop
-ALIGN	16
-$L$enc_loop:
-
-	movzx	esi,al
-	movzx	edi,bl
-	movzx	ebp,cl
-	mov	r10d,DWORD[rsi*8+r14]
-	mov	r11d,DWORD[rdi*8+r14]
-	mov	r12d,DWORD[rbp*8+r14]
-
-	movzx	esi,bh
-	movzx	edi,ch
-	movzx	ebp,dl
-	xor	r10d,DWORD[3+rsi*8+r14]
-	xor	r11d,DWORD[3+rdi*8+r14]
-	mov	r8d,DWORD[rbp*8+r14]
-
-	movzx	esi,dh
-	shr	ecx,16
-	movzx	ebp,ah
-	xor	r12d,DWORD[3+rsi*8+r14]
-	shr	edx,16
-	xor	r8d,DWORD[3+rbp*8+r14]
-
-	shr	ebx,16
-	lea	r15,[16+r15]
-	shr	eax,16
-
-	movzx	esi,cl
-	movzx	edi,dl
-	movzx	ebp,al
-	xor	r10d,DWORD[2+rsi*8+r14]
-	xor	r11d,DWORD[2+rdi*8+r14]
-	xor	r12d,DWORD[2+rbp*8+r14]
-
-	movzx	esi,dh
-	movzx	edi,ah
-	movzx	ebp,bl
-	xor	r10d,DWORD[1+rsi*8+r14]
-	xor	r11d,DWORD[1+rdi*8+r14]
-	xor	r8d,DWORD[2+rbp*8+r14]
-
-	mov	edx,DWORD[12+r15]
-	movzx	edi,bh
-	movzx	ebp,ch
-	mov	eax,DWORD[r15]
-	xor	r12d,DWORD[1+rdi*8+r14]
-	xor	r8d,DWORD[1+rbp*8+r14]
-
-	mov	ebx,DWORD[4+r15]
-	mov	ecx,DWORD[8+r15]
-	xor	eax,r10d
-	xor	ebx,r11d
-	xor	ecx,r12d
-	xor	edx,r8d
-	sub	r13d,1
-	jnz	NEAR $L$enc_loop
-	movzx	esi,al
-	movzx	edi,bl
-	movzx	ebp,cl
-	movzx	r10d,BYTE[2+rsi*8+r14]
-	movzx	r11d,BYTE[2+rdi*8+r14]
-	movzx	r12d,BYTE[2+rbp*8+r14]
-
-	movzx	esi,dl
-	movzx	edi,bh
-	movzx	ebp,ch
-	movzx	r8d,BYTE[2+rsi*8+r14]
-	mov	edi,DWORD[rdi*8+r14]
-	mov	ebp,DWORD[rbp*8+r14]
-
-	and	edi,0x0000ff00
-	and	ebp,0x0000ff00
-
-	xor	r10d,edi
-	xor	r11d,ebp
-	shr	ecx,16
-
-	movzx	esi,dh
-	movzx	edi,ah
-	shr	edx,16
-	mov	esi,DWORD[rsi*8+r14]
-	mov	edi,DWORD[rdi*8+r14]
-
-	and	esi,0x0000ff00
-	and	edi,0x0000ff00
-	shr	ebx,16
-	xor	r12d,esi
-	xor	r8d,edi
-	shr	eax,16
-
-	movzx	esi,cl
-	movzx	edi,dl
-	movzx	ebp,al
-	mov	esi,DWORD[rsi*8+r14]
-	mov	edi,DWORD[rdi*8+r14]
-	mov	ebp,DWORD[rbp*8+r14]
-
-	and	esi,0x00ff0000
-	and	edi,0x00ff0000
-	and	ebp,0x00ff0000
-
-	xor	r10d,esi
-	xor	r11d,edi
-	xor	r12d,ebp
-
-	movzx	esi,bl
-	movzx	edi,dh
-	movzx	ebp,ah
-	mov	esi,DWORD[rsi*8+r14]
-	mov	edi,DWORD[2+rdi*8+r14]
-	mov	ebp,DWORD[2+rbp*8+r14]
-
-	and	esi,0x00ff0000
-	and	edi,0xff000000
-	and	ebp,0xff000000
-
-	xor	r8d,esi
-	xor	r10d,edi
-	xor	r11d,ebp
-
-	movzx	esi,bh
-	movzx	edi,ch
-	mov	edx,DWORD[((16+12))+r15]
-	mov	esi,DWORD[2+rsi*8+r14]
-	mov	edi,DWORD[2+rdi*8+r14]
-	mov	eax,DWORD[((16+0))+r15]
-
-	and	esi,0xff000000
-	and	edi,0xff000000
-
-	xor	r12d,esi
-	xor	r8d,edi
-
-	mov	ebx,DWORD[((16+4))+r15]
-	mov	ecx,DWORD[((16+8))+r15]
-	xor	eax,r10d
-	xor	ebx,r11d
-	xor	ecx,r12d
-	xor	edx,r8d
-DB	0xf3,0xc3
-
-
-ALIGN	16
-_x86_64_AES_encrypt_compact:
-
-	lea	r8,[128+r14]
-	mov	edi,DWORD[((0-128))+r8]
-	mov	ebp,DWORD[((32-128))+r8]
-	mov	r10d,DWORD[((64-128))+r8]
-	mov	r11d,DWORD[((96-128))+r8]
-	mov	edi,DWORD[((128-128))+r8]
-	mov	ebp,DWORD[((160-128))+r8]
-	mov	r10d,DWORD[((192-128))+r8]
-	mov	r11d,DWORD[((224-128))+r8]
-	jmp	NEAR $L$enc_loop_compact
-ALIGN	16
-$L$enc_loop_compact:
-	xor	eax,DWORD[r15]
-	xor	ebx,DWORD[4+r15]
-	xor	ecx,DWORD[8+r15]
-	xor	edx,DWORD[12+r15]
-	lea	r15,[16+r15]
-	movzx	r10d,al
-	movzx	r11d,bl
-	movzx	r12d,cl
-	movzx	r8d,dl
-	movzx	esi,bh
-	movzx	edi,ch
-	shr	ecx,16
-	movzx	ebp,dh
-	movzx	r10d,BYTE[r10*1+r14]
-	movzx	r11d,BYTE[r11*1+r14]
-	movzx	r12d,BYTE[r12*1+r14]
-	movzx	r8d,BYTE[r8*1+r14]
-
-	movzx	r9d,BYTE[rsi*1+r14]
-	movzx	esi,ah
-	movzx	r13d,BYTE[rdi*1+r14]
-	movzx	edi,cl
-	movzx	ebp,BYTE[rbp*1+r14]
-	movzx	esi,BYTE[rsi*1+r14]
-
-	shl	r9d,8
-	shr	edx,16
-	shl	r13d,8
-	xor	r10d,r9d
-	shr	eax,16
-	movzx	r9d,dl
-	shr	ebx,16
-	xor	r11d,r13d
-	shl	ebp,8
-	movzx	r13d,al
-	movzx	edi,BYTE[rdi*1+r14]
-	xor	r12d,ebp
-
-	shl	esi,8
-	movzx	ebp,bl
-	shl	edi,16
-	xor	r8d,esi
-	movzx	r9d,BYTE[r9*1+r14]
-	movzx	esi,dh
-	movzx	r13d,BYTE[r13*1+r14]
-	xor	r10d,edi
-
-	shr	ecx,8
-	movzx	edi,ah
-	shl	r9d,16
-	shr	ebx,8
-	shl	r13d,16
-	xor	r11d,r9d
-	movzx	ebp,BYTE[rbp*1+r14]
-	movzx	esi,BYTE[rsi*1+r14]
-	movzx	edi,BYTE[rdi*1+r14]
-	movzx	edx,BYTE[rcx*1+r14]
-	movzx	ecx,BYTE[rbx*1+r14]
-
-	shl	ebp,16
-	xor	r12d,r13d
-	shl	esi,24
-	xor	r8d,ebp
-	shl	edi,24
-	xor	r10d,esi
-	shl	edx,24
-	xor	r11d,edi
-	shl	ecx,24
-	mov	eax,r10d
-	mov	ebx,r11d
-	xor	ecx,r12d
-	xor	edx,r8d
-	cmp	r15,QWORD[16+rsp]
-	je	NEAR $L$enc_compact_done
-	mov	r10d,0x80808080
-	mov	r11d,0x80808080
-	and	r10d,eax
-	and	r11d,ebx
-	mov	esi,r10d
-	mov	edi,r11d
-	shr	r10d,7
-	lea	r8d,[rax*1+rax]
-	shr	r11d,7
-	lea	r9d,[rbx*1+rbx]
-	sub	esi,r10d
-	sub	edi,r11d
-	and	r8d,0xfefefefe
-	and	r9d,0xfefefefe
-	and	esi,0x1b1b1b1b
-	and	edi,0x1b1b1b1b
-	mov	r10d,eax
-	mov	r11d,ebx
-	xor	r8d,esi
-	xor	r9d,edi
-
-	xor	eax,r8d
-	xor	ebx,r9d
-	mov	r12d,0x80808080
-	rol	eax,24
-	mov	ebp,0x80808080
-	rol	ebx,24
-	and	r12d,ecx
-	and	ebp,edx
-	xor	eax,r8d
-	xor	ebx,r9d
-	mov	esi,r12d
-	ror	r10d,16
-	mov	edi,ebp
-	ror	r11d,16
-	lea	r8d,[rcx*1+rcx]
-	shr	r12d,7
-	xor	eax,r10d
-	shr	ebp,7
-	xor	ebx,r11d
-	ror	r10d,8
-	lea	r9d,[rdx*1+rdx]
-	ror	r11d,8
-	sub	esi,r12d
-	sub	edi,ebp
-	xor	eax,r10d
-	xor	ebx,r11d
-
-	and	r8d,0xfefefefe
-	and	r9d,0xfefefefe
-	and	esi,0x1b1b1b1b
-	and	edi,0x1b1b1b1b
-	mov	r12d,ecx
-	mov	ebp,edx
-	xor	r8d,esi
-	xor	r9d,edi
-
-	ror	r12d,16
-	xor	ecx,r8d
-	ror	ebp,16
-	xor	edx,r9d
-	rol	ecx,24
-	mov	esi,DWORD[r14]
-	rol	edx,24
-	xor	ecx,r8d
-	mov	edi,DWORD[64+r14]
-	xor	edx,r9d
-	mov	r8d,DWORD[128+r14]
-	xor	ecx,r12d
-	ror	r12d,8
-	xor	edx,ebp
-	ror	ebp,8
-	xor	ecx,r12d
-	mov	r9d,DWORD[192+r14]
-	xor	edx,ebp
-	jmp	NEAR $L$enc_loop_compact
-ALIGN	16
-$L$enc_compact_done:
-	xor	eax,DWORD[r15]
-	xor	ebx,DWORD[4+r15]
-	xor	ecx,DWORD[8+r15]
-	xor	edx,DWORD[12+r15]
-DB	0xf3,0xc3
-
-
-global	AES_encrypt
-
-ALIGN	16
-global	asm_AES_encrypt
-
-asm_AES_encrypt:
-AES_encrypt:
-	mov	QWORD[8+rsp],rdi	;WIN64 prologue
-	mov	QWORD[16+rsp],rsi
-	mov	rax,rsp
-$L$SEH_begin_AES_encrypt:
-	mov	rdi,rcx
-	mov	rsi,rdx
-	mov	rdx,r8
-
-
-
-	mov	rax,rsp
-
-	push	rbx
-
-	push	rbp
-
-	push	r12
-
-	push	r13
-
-	push	r14
-
-	push	r15
-
-
-
-	lea	rcx,[((-63))+rdx]
-	and	rsp,-64
-	sub	rcx,rsp
-	neg	rcx
-	and	rcx,0x3c0
-	sub	rsp,rcx
-	sub	rsp,32
-
-	mov	QWORD[16+rsp],rsi
-	mov	QWORD[24+rsp],rax
-
-$L$enc_prologue:
-
-	mov	r15,rdx
-	mov	r13d,DWORD[240+r15]
-
-	mov	eax,DWORD[rdi]
-	mov	ebx,DWORD[4+rdi]
-	mov	ecx,DWORD[8+rdi]
-	mov	edx,DWORD[12+rdi]
-
-	shl	r13d,4
-	lea	rbp,[r13*1+r15]
-	mov	QWORD[rsp],r15
-	mov	QWORD[8+rsp],rbp
-
-
-	lea	r14,[(($L$AES_Te+2048))]
-	lea	rbp,[768+rsp]
-	sub	rbp,r14
-	and	rbp,0x300
-	lea	r14,[rbp*1+r14]
-
-	call	_x86_64_AES_encrypt_compact
-
-	mov	r9,QWORD[16+rsp]
-	mov	rsi,QWORD[24+rsp]
-
-	mov	DWORD[r9],eax
-	mov	DWORD[4+r9],ebx
-	mov	DWORD[8+r9],ecx
-	mov	DWORD[12+r9],edx
-
-	mov	r15,QWORD[((-48))+rsi]
-
-	mov	r14,QWORD[((-40))+rsi]
-
-	mov	r13,QWORD[((-32))+rsi]
-
-	mov	r12,QWORD[((-24))+rsi]
-
-	mov	rbp,QWORD[((-16))+rsi]
-
-	mov	rbx,QWORD[((-8))+rsi]
-
-	lea	rsp,[rsi]
-
-$L$enc_epilogue:
-	mov	rdi,QWORD[8+rsp]	;WIN64 epilogue
-	mov	rsi,QWORD[16+rsp]
-	DB	0F3h,0C3h		;repret
-
-$L$SEH_end_AES_encrypt:
-
-ALIGN	16
-_x86_64_AES_decrypt:
-	xor	eax,DWORD[r15]
-	xor	ebx,DWORD[4+r15]
-	xor	ecx,DWORD[8+r15]
-	xor	edx,DWORD[12+r15]
-
-	mov	r13d,DWORD[240+r15]
-	sub	r13d,1
-	jmp	NEAR $L$dec_loop
-ALIGN	16
-$L$dec_loop:
-
-	movzx	esi,al
-	movzx	edi,bl
-	movzx	ebp,cl
-	mov	r10d,DWORD[rsi*8+r14]
-	mov	r11d,DWORD[rdi*8+r14]
-	mov	r12d,DWORD[rbp*8+r14]
-
-	movzx	esi,dh
-	movzx	edi,ah
-	movzx	ebp,dl
-	xor	r10d,DWORD[3+rsi*8+r14]
-	xor	r11d,DWORD[3+rdi*8+r14]
-	mov	r8d,DWORD[rbp*8+r14]
-
-	movzx	esi,bh
-	shr	eax,16
-	movzx	ebp,ch
-	xor	r12d,DWORD[3+rsi*8+r14]
-	shr	edx,16
-	xor	r8d,DWORD[3+rbp*8+r14]
-
-	shr	ebx,16
-	lea	r15,[16+r15]
-	shr	ecx,16
-
-	movzx	esi,cl
-	movzx	edi,dl
-	movzx	ebp,al
-	xor	r10d,DWORD[2+rsi*8+r14]
-	xor	r11d,DWORD[2+rdi*8+r14]
-	xor	r12d,DWORD[2+rbp*8+r14]
-
-	movzx	esi,bh
-	movzx	edi,ch
-	movzx	ebp,bl
-	xor	r10d,DWORD[1+rsi*8+r14]
-	xor	r11d,DWORD[1+rdi*8+r14]
-	xor	r8d,DWORD[2+rbp*8+r14]
-
-	movzx	esi,dh
-	mov	edx,DWORD[12+r15]
-	movzx	ebp,ah
-	xor	r12d,DWORD[1+rsi*8+r14]
-	mov	eax,DWORD[r15]
-	xor	r8d,DWORD[1+rbp*8+r14]
-
-	xor	eax,r10d
-	mov	ebx,DWORD[4+r15]
-	mov	ecx,DWORD[8+r15]
-	xor	ecx,r12d
-	xor	ebx,r11d
-	xor	edx,r8d
-	sub	r13d,1
-	jnz	NEAR $L$dec_loop
-	lea	r14,[2048+r14]
-	movzx	esi,al
-	movzx	edi,bl
-	movzx	ebp,cl
-	movzx	r10d,BYTE[rsi*1+r14]
-	movzx	r11d,BYTE[rdi*1+r14]
-	movzx	r12d,BYTE[rbp*1+r14]
-
-	movzx	esi,dl
-	movzx	edi,dh
-	movzx	ebp,ah
-	movzx	r8d,BYTE[rsi*1+r14]
-	movzx	edi,BYTE[rdi*1+r14]
-	movzx	ebp,BYTE[rbp*1+r14]
-
-	shl	edi,8
-	shl	ebp,8
-
-	xor	r10d,edi
-	xor	r11d,ebp
-	shr	edx,16
-
-	movzx	esi,bh
-	movzx	edi,ch
-	shr	eax,16
-	movzx	esi,BYTE[rsi*1+r14]
-	movzx	edi,BYTE[rdi*1+r14]
-
-	shl	esi,8
-	shl	edi,8
-	shr	ebx,16
-	xor	r12d,esi
-	xor	r8d,edi
-	shr	ecx,16
-
-	movzx	esi,cl
-	movzx	edi,dl
-	movzx	ebp,al
-	movzx	esi,BYTE[rsi*1+r14]
-	movzx	edi,BYTE[rdi*1+r14]
-	movzx	ebp,BYTE[rbp*1+r14]
-
-	shl	esi,16
-	shl	edi,16
-	shl	ebp,16
-
-	xor	r10d,esi
-	xor	r11d,edi
-	xor	r12d,ebp
-
-	movzx	esi,bl
-	movzx	edi,bh
-	movzx	ebp,ch
-	movzx	esi,BYTE[rsi*1+r14]
-	movzx	edi,BYTE[rdi*1+r14]
-	movzx	ebp,BYTE[rbp*1+r14]
-
-	shl	esi,16
-	shl	edi,24
-	shl	ebp,24
-
-	xor	r8d,esi
-	xor	r10d,edi
-	xor	r11d,ebp
-
-	movzx	esi,dh
-	movzx	edi,ah
-	mov	edx,DWORD[((16+12))+r15]
-	movzx	esi,BYTE[rsi*1+r14]
-	movzx	edi,BYTE[rdi*1+r14]
-	mov	eax,DWORD[((16+0))+r15]
-
-	shl	esi,24
-	shl	edi,24
-
-	xor	r12d,esi
-	xor	r8d,edi
-
-	mov	ebx,DWORD[((16+4))+r15]
-	mov	ecx,DWORD[((16+8))+r15]
-	lea	r14,[((-2048))+r14]
-	xor	eax,r10d
-	xor	ebx,r11d
-	xor	ecx,r12d
-	xor	edx,r8d
-DB	0xf3,0xc3
-
-
-ALIGN	16
-_x86_64_AES_decrypt_compact:
-
-	lea	r8,[128+r14]
-	mov	edi,DWORD[((0-128))+r8]
-	mov	ebp,DWORD[((32-128))+r8]
-	mov	r10d,DWORD[((64-128))+r8]
-	mov	r11d,DWORD[((96-128))+r8]
-	mov	edi,DWORD[((128-128))+r8]
-	mov	ebp,DWORD[((160-128))+r8]
-	mov	r10d,DWORD[((192-128))+r8]
-	mov	r11d,DWORD[((224-128))+r8]
-	jmp	NEAR $L$dec_loop_compact
-
-ALIGN	16
-$L$dec_loop_compact:
-	xor	eax,DWORD[r15]
-	xor	ebx,DWORD[4+r15]
-	xor	ecx,DWORD[8+r15]
-	xor	edx,DWORD[12+r15]
-	lea	r15,[16+r15]
-	movzx	r10d,al
-	movzx	r11d,bl
-	movzx	r12d,cl
-	movzx	r8d,dl
-	movzx	esi,dh
-	movzx	edi,ah
-	shr	edx,16
-	movzx	ebp,bh
-	movzx	r10d,BYTE[r10*1+r14]
-	movzx	r11d,BYTE[r11*1+r14]
-	movzx	r12d,BYTE[r12*1+r14]
-	movzx	r8d,BYTE[r8*1+r14]
-
-	movzx	r9d,BYTE[rsi*1+r14]
-	movzx	esi,ch
-	movzx	r13d,BYTE[rdi*1+r14]
-	movzx	ebp,BYTE[rbp*1+r14]
-	movzx	esi,BYTE[rsi*1+r14]
-
-	shr	ecx,16
-	shl	r13d,8
-	shl	r9d,8
-	movzx	edi,cl
-	shr	eax,16
-	xor	r10d,r9d
-	shr	ebx,16
-	movzx	r9d,dl
-
-	shl	ebp,8
-	xor	r11d,r13d
-	shl	esi,8
-	movzx	r13d,al
-	movzx	edi,BYTE[rdi*1+r14]
-	xor	r12d,ebp
-	movzx	ebp,bl
-
-	shl	edi,16
-	xor	r8d,esi
-	movzx	r9d,BYTE[r9*1+r14]
-	movzx	esi,bh
-	movzx	ebp,BYTE[rbp*1+r14]
-	xor	r10d,edi
-	movzx	r13d,BYTE[r13*1+r14]
-	movzx	edi,ch
-
-	shl	ebp,16
-	shl	r9d,16
-	shl	r13d,16
-	xor	r8d,ebp
-	movzx	ebp,dh
-	xor	r11d,r9d
-	shr	eax,8
-	xor	r12d,r13d
-
-	movzx	esi,BYTE[rsi*1+r14]
-	movzx	ebx,BYTE[rdi*1+r14]
-	movzx	ecx,BYTE[rbp*1+r14]
-	movzx	edx,BYTE[rax*1+r14]
-
-	mov	eax,r10d
-	shl	esi,24
-	shl	ebx,24
-	shl	ecx,24
-	xor	eax,esi
-	shl	edx,24
-	xor	ebx,r11d
-	xor	ecx,r12d
-	xor	edx,r8d
-	cmp	r15,QWORD[16+rsp]
-	je	NEAR $L$dec_compact_done
-
-	mov	rsi,QWORD[((256+0))+r14]
-	shl	rbx,32
-	shl	rdx,32
-	mov	rdi,QWORD[((256+8))+r14]
-	or	rax,rbx
-	or	rcx,rdx
-	mov	rbp,QWORD[((256+16))+r14]
-	mov	r9,rsi
-	mov	r12,rsi
-	and	r9,rax
-	and	r12,rcx
-	mov	rbx,r9
-	mov	rdx,r12
-	shr	r9,7
-	lea	r8,[rax*1+rax]
-	shr	r12,7
-	lea	r11,[rcx*1+rcx]
-	sub	rbx,r9
-	sub	rdx,r12
-	and	r8,rdi
-	and	r11,rdi
-	and	rbx,rbp
-	and	rdx,rbp
-	xor	r8,rbx
-	xor	r11,rdx
-	mov	r10,rsi
-	mov	r13,rsi
-
-	and	r10,r8
-	and	r13,r11
-	mov	rbx,r10
-	mov	rdx,r13
-	shr	r10,7
-	lea	r9,[r8*1+r8]
-	shr	r13,7
-	lea	r12,[r11*1+r11]
-	sub	rbx,r10
-	sub	rdx,r13
-	and	r9,rdi
-	and	r12,rdi
-	and	rbx,rbp
-	and	rdx,rbp
-	xor	r9,rbx
-	xor	r12,rdx
-	mov	r10,rsi
-	mov	r13,rsi
-
-	and	r10,r9
-	and	r13,r12
-	mov	rbx,r10
-	mov	rdx,r13
-	shr	r10,7
-	xor	r8,rax
-	shr	r13,7
-	xor	r11,rcx
-	sub	rbx,r10
-	sub	rdx,r13
-	lea	r10,[r9*1+r9]
-	lea	r13,[r12*1+r12]
-	xor	r9,rax
-	xor	r12,rcx
-	and	r10,rdi
-	and	r13,rdi
-	and	rbx,rbp
-	and	rdx,rbp
-	xor	r10,rbx
-	xor	r13,rdx
-
-	xor	rax,r10
-	xor	rcx,r13
-	xor	r8,r10
-	xor	r11,r13
-	mov	rbx,rax
-	mov	rdx,rcx
-	xor	r9,r10
-	shr	rbx,32
-	xor	r12,r13
-	shr	rdx,32
-	xor	r10,r8
-	rol	eax,8
-	xor	r13,r11
-	rol	ecx,8
-	xor	r10,r9
-	rol	ebx,8
-	xor	r13,r12
-
-	rol	edx,8
-	xor	eax,r10d
-	shr	r10,32
-	xor	ecx,r13d
-	shr	r13,32
-	xor	ebx,r10d
-	xor	edx,r13d
-
-	mov	r10,r8
-	rol	r8d,24
-	mov	r13,r11
-	rol	r11d,24
-	shr	r10,32
-	xor	eax,r8d
-	shr	r13,32
-	xor	ecx,r11d
-	rol	r10d,24
-	mov	r8,r9
-	rol	r13d,24
-	mov	r11,r12
-	shr	r8,32
-	xor	ebx,r10d
-	shr	r11,32
-	xor	edx,r13d
-
-	mov	rsi,QWORD[r14]
-	rol	r9d,16
-	mov	rdi,QWORD[64+r14]
-	rol	r12d,16
-	mov	rbp,QWORD[128+r14]
-	rol	r8d,16
-	mov	r10,QWORD[192+r14]
-	xor	eax,r9d
-	rol	r11d,16
-	xor	ecx,r12d
-	mov	r13,QWORD[256+r14]
-	xor	ebx,r8d
-	xor	edx,r11d
-	jmp	NEAR $L$dec_loop_compact
-ALIGN	16
-$L$dec_compact_done:
-	xor	eax,DWORD[r15]
-	xor	ebx,DWORD[4+r15]
-	xor	ecx,DWORD[8+r15]
-	xor	edx,DWORD[12+r15]
-DB	0xf3,0xc3
-
-
-global	AES_decrypt
-
-ALIGN	16
-global	asm_AES_decrypt
-
-asm_AES_decrypt:
-AES_decrypt:
-	mov	QWORD[8+rsp],rdi	;WIN64 prologue
-	mov	QWORD[16+rsp],rsi
-	mov	rax,rsp
-$L$SEH_begin_AES_decrypt:
-	mov	rdi,rcx
-	mov	rsi,rdx
-	mov	rdx,r8
-
-
-
-	mov	rax,rsp
-
-	push	rbx
-
-	push	rbp
-
-	push	r12
-
-	push	r13
-
-	push	r14
-
-	push	r15
-
-
-
-	lea	rcx,[((-63))+rdx]
-	and	rsp,-64
-	sub	rcx,rsp
-	neg	rcx
-	and	rcx,0x3c0
-	sub	rsp,rcx
-	sub	rsp,32
-
-	mov	QWORD[16+rsp],rsi
-	mov	QWORD[24+rsp],rax
-
-$L$dec_prologue:
-
-	mov	r15,rdx
-	mov	r13d,DWORD[240+r15]
-
-	mov	eax,DWORD[rdi]
-	mov	ebx,DWORD[4+rdi]
-	mov	ecx,DWORD[8+rdi]
-	mov	edx,DWORD[12+rdi]
-
-	shl	r13d,4
-	lea	rbp,[r13*1+r15]
-	mov	QWORD[rsp],r15
-	mov	QWORD[8+rsp],rbp
-
-
-	lea	r14,[(($L$AES_Td+2048))]
-	lea	rbp,[768+rsp]
-	sub	rbp,r14
-	and	rbp,0x300
-	lea	r14,[rbp*1+r14]
-	shr	rbp,3
-	add	r14,rbp
-
-	call	_x86_64_AES_decrypt_compact
-
-	mov	r9,QWORD[16+rsp]
-	mov	rsi,QWORD[24+rsp]
-
-	mov	DWORD[r9],eax
-	mov	DWORD[4+r9],ebx
-	mov	DWORD[8+r9],ecx
-	mov	DWORD[12+r9],edx
-
-	mov	r15,QWORD[((-48))+rsi]
-
-	mov	r14,QWORD[((-40))+rsi]
-
-	mov	r13,QWORD[((-32))+rsi]
-
-	mov	r12,QWORD[((-24))+rsi]
-
-	mov	rbp,QWORD[((-16))+rsi]
-
-	mov	rbx,QWORD[((-8))+rsi]
-
-	lea	rsp,[rsi]
-
-$L$dec_epilogue:
-	mov	rdi,QWORD[8+rsp]	;WIN64 epilogue
-	mov	rsi,QWORD[16+rsp]
-	DB	0F3h,0C3h		;repret
-
-$L$SEH_end_AES_decrypt:
-global	AES_set_encrypt_key
-
-ALIGN	16
-AES_set_encrypt_key:
-	mov	QWORD[8+rsp],rdi	;WIN64 prologue
-	mov	QWORD[16+rsp],rsi
-	mov	rax,rsp
-$L$SEH_begin_AES_set_encrypt_key:
-	mov	rdi,rcx
-	mov	rsi,rdx
-	mov	rdx,r8
-
-
-
-	push	rbx
-
-	push	rbp
-
-	push	r12
-
-	push	r13
-
-	push	r14
-
-	push	r15
-
-	sub	rsp,8
-
-$L$enc_key_prologue:
-
-	call	_x86_64_AES_set_encrypt_key
-
-	mov	rbp,QWORD[40+rsp]
-
-	mov	rbx,QWORD[48+rsp]
-
-	add	rsp,56
-
-$L$enc_key_epilogue:
-	mov	rdi,QWORD[8+rsp]	;WIN64 epilogue
-	mov	rsi,QWORD[16+rsp]
-	DB	0F3h,0C3h		;repret
-
-$L$SEH_end_AES_set_encrypt_key:
-
-
-ALIGN	16
-_x86_64_AES_set_encrypt_key:
-
-	mov	ecx,esi
-	mov	rsi,rdi
-	mov	rdi,rdx
-
-	test	rsi,-1
-	jz	NEAR $L$badpointer
-	test	rdi,-1
-	jz	NEAR $L$badpointer
-
-	lea	rbp,[$L$AES_Te]
-	lea	rbp,[((2048+128))+rbp]
-
-
-	mov	eax,DWORD[((0-128))+rbp]
-	mov	ebx,DWORD[((32-128))+rbp]
-	mov	r8d,DWORD[((64-128))+rbp]
-	mov	edx,DWORD[((96-128))+rbp]
-	mov	eax,DWORD[((128-128))+rbp]
-	mov	ebx,DWORD[((160-128))+rbp]
-	mov	r8d,DWORD[((192-128))+rbp]
-	mov	edx,DWORD[((224-128))+rbp]
-
-	cmp	ecx,128
-	je	NEAR $L$10rounds
-	cmp	ecx,192
-	je	NEAR $L$12rounds
-	cmp	ecx,256
-	je	NEAR $L$14rounds
-	mov	rax,-2
-	jmp	NEAR $L$exit
-
-$L$10rounds:
-	mov	rax,QWORD[rsi]
-	mov	rdx,QWORD[8+rsi]
-	mov	QWORD[rdi],rax
-	mov	QWORD[8+rdi],rdx
-
-	shr	rdx,32
-	xor	ecx,ecx
-	jmp	NEAR $L$10shortcut
-ALIGN	4
-$L$10loop:
-	mov	eax,DWORD[rdi]
-	mov	edx,DWORD[12+rdi]
-$L$10shortcut:
-	movzx	esi,dl
-	movzx	ebx,BYTE[((-128))+rsi*1+rbp]
-	movzx	esi,dh
-	shl	ebx,24
-	xor	eax,ebx
-
-	movzx	ebx,BYTE[((-128))+rsi*1+rbp]
-	shr	edx,16
-	movzx	esi,dl
-	xor	eax,ebx
-
-	movzx	ebx,BYTE[((-128))+rsi*1+rbp]
-	movzx	esi,dh
-	shl	ebx,8
-	xor	eax,ebx
-
-	movzx	ebx,BYTE[((-128))+rsi*1+rbp]
-	shl	ebx,16
-	xor	eax,ebx
-
-	xor	eax,DWORD[((1024-128))+rcx*4+rbp]
-	mov	DWORD[16+rdi],eax
-	xor	eax,DWORD[4+rdi]
-	mov	DWORD[20+rdi],eax
-	xor	eax,DWORD[8+rdi]
-	mov	DWORD[24+rdi],eax
-	xor	eax,DWORD[12+rdi]
-	mov	DWORD[28+rdi],eax
-	add	ecx,1
-	lea	rdi,[16+rdi]
-	cmp	ecx,10
-	jl	NEAR $L$10loop
-
-	mov	DWORD[80+rdi],10
-	xor	rax,rax
-	jmp	NEAR $L$exit
-
-$L$12rounds:
-	mov	rax,QWORD[rsi]
-	mov	rbx,QWORD[8+rsi]
-	mov	rdx,QWORD[16+rsi]
-	mov	QWORD[rdi],rax
-	mov	QWORD[8+rdi],rbx
-	mov	QWORD[16+rdi],rdx
-
-	shr	rdx,32
-	xor	ecx,ecx
-	jmp	NEAR $L$12shortcut
-ALIGN	4
-$L$12loop:
-	mov	eax,DWORD[rdi]
-	mov	edx,DWORD[20+rdi]
-$L$12shortcut:
-	movzx	esi,dl
-	movzx	ebx,BYTE[((-128))+rsi*1+rbp]
-	movzx	esi,dh
-	shl	ebx,24
-	xor	eax,ebx
-
-	movzx	ebx,BYTE[((-128))+rsi*1+rbp]
-	shr	edx,16
-	movzx	esi,dl
-	xor	eax,ebx
-
-	movzx	ebx,BYTE[((-128))+rsi*1+rbp]
-	movzx	esi,dh
-	shl	ebx,8
-	xor	eax,ebx
-
-	movzx	ebx,BYTE[((-128))+rsi*1+rbp]
-	shl	ebx,16
-	xor	eax,ebx
-
-	xor	eax,DWORD[((1024-128))+rcx*4+rbp]
-	mov	DWORD[24+rdi],eax
-	xor	eax,DWORD[4+rdi]
-	mov	DWORD[28+rdi],eax
-	xor	eax,DWORD[8+rdi]
-	mov	DWORD[32+rdi],eax
-	xor	eax,DWORD[12+rdi]
-	mov	DWORD[36+rdi],eax
-
-	cmp	ecx,7
-	je	NEAR $L$12break
-	add	ecx,1
-
-	xor	eax,DWORD[16+rdi]
-	mov	DWORD[40+rdi],eax
-	xor	eax,DWORD[20+rdi]
-	mov	DWORD[44+rdi],eax
-
-	lea	rdi,[24+rdi]
-	jmp	NEAR $L$12loop
-$L$12break:
-	mov	DWORD[72+rdi],12
-	xor	rax,rax
-	jmp	NEAR $L$exit
-
-$L$14rounds:
-	mov	rax,QWORD[rsi]
-	mov	rbx,QWORD[8+rsi]
-	mov	rcx,QWORD[16+rsi]
-	mov	rdx,QWORD[24+rsi]
-	mov	QWORD[rdi],rax
-	mov	QWORD[8+rdi],rbx
-	mov	QWORD[16+rdi],rcx
-	mov	QWORD[24+rdi],rdx
-
-	shr	rdx,32
-	xor	ecx,ecx
-	jmp	NEAR $L$14shortcut
-ALIGN	4
-$L$14loop:
-	mov	eax,DWORD[rdi]
-	mov	edx,DWORD[28+rdi]
-$L$14shortcut:
-	movzx	esi,dl
-	movzx	ebx,BYTE[((-128))+rsi*1+rbp]
-	movzx	esi,dh
-	shl	ebx,24
-	xor	eax,ebx
-
-	movzx	ebx,BYTE[((-128))+rsi*1+rbp]
-	shr	edx,16
-	movzx	esi,dl
-	xor	eax,ebx
-
-	movzx	ebx,BYTE[((-128))+rsi*1+rbp]
-	movzx	esi,dh
-	shl	ebx,8
-	xor	eax,ebx
-
-	movzx	ebx,BYTE[((-128))+rsi*1+rbp]
-	shl	ebx,16
-	xor	eax,ebx
-
-	xor	eax,DWORD[((1024-128))+rcx*4+rbp]
-	mov	DWORD[32+rdi],eax
-	xor	eax,DWORD[4+rdi]
-	mov	DWORD[36+rdi],eax
-	xor	eax,DWORD[8+rdi]
-	mov	DWORD[40+rdi],eax
-	xor	eax,DWORD[12+rdi]
-	mov	DWORD[44+rdi],eax
-
-	cmp	ecx,6
-	je	NEAR $L$14break
-	add	ecx,1
-
-	mov	edx,eax
-	mov	eax,DWORD[16+rdi]
-	movzx	esi,dl
-	movzx	ebx,BYTE[((-128))+rsi*1+rbp]
-	movzx	esi,dh
-	xor	eax,ebx
-
-	movzx	ebx,BYTE[((-128))+rsi*1+rbp]
-	shr	edx,16
-	shl	ebx,8
-	movzx	esi,dl
-	xor	eax,ebx
-
-	movzx	ebx,BYTE[((-128))+rsi*1+rbp]
-	movzx	esi,dh
-	shl	ebx,16
-	xor	eax,ebx
-
-	movzx	ebx,BYTE[((-128))+rsi*1+rbp]
-	shl	ebx,24
-	xor	eax,ebx
-
-	mov	DWORD[48+rdi],eax
-	xor	eax,DWORD[20+rdi]
-	mov	DWORD[52+rdi],eax
-	xor	eax,DWORD[24+rdi]
-	mov	DWORD[56+rdi],eax
-	xor	eax,DWORD[28+rdi]
-	mov	DWORD[60+rdi],eax
-
-	lea	rdi,[32+rdi]
-	jmp	NEAR $L$14loop
-$L$14break:
-	mov	DWORD[48+rdi],14
-	xor	rax,rax
-	jmp	NEAR $L$exit
-
-$L$badpointer:
-	mov	rax,-1
-$L$exit:
-DB	0xf3,0xc3
-
-
-global	AES_set_decrypt_key
-
-ALIGN	16
-AES_set_decrypt_key:
-	mov	QWORD[8+rsp],rdi	;WIN64 prologue
-	mov	QWORD[16+rsp],rsi
-	mov	rax,rsp
-$L$SEH_begin_AES_set_decrypt_key:
-	mov	rdi,rcx
-	mov	rsi,rdx
-	mov	rdx,r8
-
-
-
-	push	rbx
-
-	push	rbp
-
-	push	r12
-
-	push	r13
-
-	push	r14
-
-	push	r15
-
-	push	rdx
-
-$L$dec_key_prologue:
-
-	call	_x86_64_AES_set_encrypt_key
-	mov	r8,QWORD[rsp]
-	cmp	eax,0
-	jne	NEAR $L$abort
-
-	mov	r14d,DWORD[240+r8]
-	xor	rdi,rdi
-	lea	rcx,[r14*4+rdi]
-	mov	rsi,r8
-	lea	rdi,[rcx*4+r8]
-ALIGN	4
-$L$invert:
-	mov	rax,QWORD[rsi]
-	mov	rbx,QWORD[8+rsi]
-	mov	rcx,QWORD[rdi]
-	mov	rdx,QWORD[8+rdi]
-	mov	QWORD[rdi],rax
-	mov	QWORD[8+rdi],rbx
-	mov	QWORD[rsi],rcx
-	mov	QWORD[8+rsi],rdx
-	lea	rsi,[16+rsi]
-	lea	rdi,[((-16))+rdi]
-	cmp	rdi,rsi
-	jne	NEAR $L$invert
-
-	lea	rax,[(($L$AES_Te+2048+1024))]
-
-	mov	rsi,QWORD[40+rax]
-	mov	rdi,QWORD[48+rax]
-	mov	rbp,QWORD[56+rax]
-
-	mov	r15,r8
-	sub	r14d,1
-ALIGN	4
-$L$permute:
-	lea	r15,[16+r15]
-	mov	rax,QWORD[r15]
-	mov	rcx,QWORD[8+r15]
-	mov	r9,rsi
-	mov	r12,rsi
-	and	r9,rax
-	and	r12,rcx
-	mov	rbx,r9
-	mov	rdx,r12
-	shr	r9,7
-	lea	r8,[rax*1+rax]
-	shr	r12,7
-	lea	r11,[rcx*1+rcx]
-	sub	rbx,r9
-	sub	rdx,r12
-	and	r8,rdi
-	and	r11,rdi
-	and	rbx,rbp
-	and	rdx,rbp
-	xor	r8,rbx
-	xor	r11,rdx
-	mov	r10,rsi
-	mov	r13,rsi
-
-	and	r10,r8
-	and	r13,r11
-	mov	rbx,r10
-	mov	rdx,r13
-	shr	r10,7
-	lea	r9,[r8*1+r8]
-	shr	r13,7
-	lea	r12,[r11*1+r11]
-	sub	rbx,r10
-	sub	rdx,r13
-	and	r9,rdi
-	and	r12,rdi
-	and	rbx,rbp
-	and	rdx,rbp
-	xor	r9,rbx
-	xor	r12,rdx
-	mov	r10,rsi
-	mov	r13,rsi
-
-	and	r10,r9
-	and	r13,r12
-	mov	rbx,r10
-	mov	rdx,r13
-	shr	r10,7
-	xor	r8,rax
-	shr	r13,7
-	xor	r11,rcx
-	sub	rbx,r10
-	sub	rdx,r13
-	lea	r10,[r9*1+r9]
-	lea	r13,[r12*1+r12]
-	xor	r9,rax
-	xor	r12,rcx
-	and	r10,rdi
-	and	r13,rdi
-	and	rbx,rbp
-	and	rdx,rbp
-	xor	r10,rbx
-	xor	r13,rdx
-
-	xor	rax,r10
-	xor	rcx,r13
-	xor	r8,r10
-	xor	r11,r13
-	mov	rbx,rax
-	mov	rdx,rcx
-	xor	r9,r10
-	shr	rbx,32
-	xor	r12,r13
-	shr	rdx,32
-	xor	r10,r8
-	rol	eax,8
-	xor	r13,r11
-	rol	ecx,8
-	xor	r10,r9
-	rol	ebx,8
-	xor	r13,r12
-
-	rol	edx,8
-	xor	eax,r10d
-	shr	r10,32
-	xor	ecx,r13d
-	shr	r13,32
-	xor	ebx,r10d
-	xor	edx,r13d
-
-	mov	r10,r8
-	rol	r8d,24
-	mov	r13,r11
-	rol	r11d,24
-	shr	r10,32
-	xor	eax,r8d
-	shr	r13,32
-	xor	ecx,r11d
-	rol	r10d,24
-	mov	r8,r9
-	rol	r13d,24
-	mov	r11,r12
-	shr	r8,32
-	xor	ebx,r10d
-	shr	r11,32
-	xor	edx,r13d
-
-
-	rol	r9d,16
-
-	rol	r12d,16
-
-	rol	r8d,16
-
-	xor	eax,r9d
-	rol	r11d,16
-	xor	ecx,r12d
-
-	xor	ebx,r8d
-	xor	edx,r11d
-	mov	DWORD[r15],eax
-	mov	DWORD[4+r15],ebx
-	mov	DWORD[8+r15],ecx
-	mov	DWORD[12+r15],edx
-	sub	r14d,1
-	jnz	NEAR $L$permute
-
-	xor	rax,rax
-$L$abort:
-	mov	r15,QWORD[8+rsp]
-
-	mov	r14,QWORD[16+rsp]
-
-	mov	r13,QWORD[24+rsp]
-
-	mov	r12,QWORD[32+rsp]
-
-	mov	rbp,QWORD[40+rsp]
-
-	mov	rbx,QWORD[48+rsp]
-
-	add	rsp,56
-
-$L$dec_key_epilogue:
-	mov	rdi,QWORD[8+rsp]	;WIN64 epilogue
-	mov	rsi,QWORD[16+rsp]
-	DB	0F3h,0C3h		;repret
-
-$L$SEH_end_AES_set_decrypt_key:
-global	AES_cbc_encrypt
-
-ALIGN	16
-EXTERN	OPENSSL_ia32cap_P
-global	asm_AES_cbc_encrypt
-
-asm_AES_cbc_encrypt:
-AES_cbc_encrypt:
-	mov	QWORD[8+rsp],rdi	;WIN64 prologue
-	mov	QWORD[16+rsp],rsi
-	mov	rax,rsp
-$L$SEH_begin_AES_cbc_encrypt:
-	mov	rdi,rcx
-	mov	rsi,rdx
-	mov	rdx,r8
-	mov	rcx,r9
-	mov	r8,QWORD[40+rsp]
-	mov	r9,QWORD[48+rsp]
-
-
-
-	cmp	rdx,0
-	je	NEAR $L$cbc_epilogue
-	pushfq
-
-
-
-	push	rbx
-
-	push	rbp
-
-	push	r12
-
-	push	r13
-
-	push	r14
-
-	push	r15
-
-$L$cbc_prologue:
-
-	cld
-	mov	r9d,r9d
-
-	lea	r14,[$L$AES_Te]
-	lea	r10,[$L$AES_Td]
-	cmp	r9,0
-	cmove	r14,r10
-
-
-	mov	r10d,DWORD[OPENSSL_ia32cap_P]
-	cmp	rdx,512
-	jb	NEAR $L$cbc_slow_prologue
-	test	rdx,15
-	jnz	NEAR $L$cbc_slow_prologue
-	bt	r10d,28
-	jc	NEAR $L$cbc_slow_prologue
-
-
-	lea	r15,[((-88-248))+rsp]
-	and	r15,-64
-
-
-	mov	r10,r14
-	lea	r11,[2304+r14]
-	mov	r12,r15
-	and	r10,0xFFF
-	and	r11,0xFFF
-	and	r12,0xFFF
-
-	cmp	r12,r11
-	jb	NEAR $L$cbc_te_break_out
-	sub	r12,r11
-	sub	r15,r12
-	jmp	NEAR $L$cbc_te_ok
-$L$cbc_te_break_out:
-	sub	r12,r10
-	and	r12,0xFFF
-	add	r12,320
-	sub	r15,r12
-ALIGN	4
-$L$cbc_te_ok:
-
-	xchg	r15,rsp
-
-
-	mov	QWORD[16+rsp],r15
-
-$L$cbc_fast_body:
-	mov	QWORD[24+rsp],rdi
-	mov	QWORD[32+rsp],rsi
-	mov	QWORD[40+rsp],rdx
-	mov	QWORD[48+rsp],rcx
-	mov	QWORD[56+rsp],r8
-	mov	DWORD[((80+240))+rsp],0
-	mov	rbp,r8
-	mov	rbx,r9
-	mov	r9,rsi
-	mov	r8,rdi
-	mov	r15,rcx
-
-	mov	eax,DWORD[240+r15]
-
-	mov	r10,r15
-	sub	r10,r14
-	and	r10,0xfff
-	cmp	r10,2304
-	jb	NEAR $L$cbc_do_ecopy
-	cmp	r10,4096-248
-	jb	NEAR $L$cbc_skip_ecopy
-ALIGN	4
-$L$cbc_do_ecopy:
-	mov	rsi,r15
-	lea	rdi,[80+rsp]
-	lea	r15,[80+rsp]
-	mov	ecx,240/8
-	DD	0x90A548F3
-	mov	DWORD[rdi],eax
-$L$cbc_skip_ecopy:
-	mov	QWORD[rsp],r15
-
-	mov	ecx,18
-ALIGN	4
-$L$cbc_prefetch_te:
-	mov	r10,QWORD[r14]
-	mov	r11,QWORD[32+r14]
-	mov	r12,QWORD[64+r14]
-	mov	r13,QWORD[96+r14]
-	lea	r14,[128+r14]
-	sub	ecx,1
-	jnz	NEAR $L$cbc_prefetch_te
-	lea	r14,[((-2304))+r14]
-
-	cmp	rbx,0
-	je	NEAR $L$FAST_DECRYPT
-
-
-	mov	eax,DWORD[rbp]
-	mov	ebx,DWORD[4+rbp]
-	mov	ecx,DWORD[8+rbp]
-	mov	edx,DWORD[12+rbp]
-
-ALIGN	4
-$L$cbc_fast_enc_loop:
-	xor	eax,DWORD[r8]
-	xor	ebx,DWORD[4+r8]
-	xor	ecx,DWORD[8+r8]
-	xor	edx,DWORD[12+r8]
-	mov	r15,QWORD[rsp]
-	mov	QWORD[24+rsp],r8
-
-	call	_x86_64_AES_encrypt
-
-	mov	r8,QWORD[24+rsp]
-	mov	r10,QWORD[40+rsp]
-	mov	DWORD[r9],eax
-	mov	DWORD[4+r9],ebx
-	mov	DWORD[8+r9],ecx
-	mov	DWORD[12+r9],edx
-
-	lea	r8,[16+r8]
-	lea	r9,[16+r9]
-	sub	r10,16
-	test	r10,-16
-	mov	QWORD[40+rsp],r10
-	jnz	NEAR $L$cbc_fast_enc_loop
-	mov	rbp,QWORD[56+rsp]
-	mov	DWORD[rbp],eax
-	mov	DWORD[4+rbp],ebx
-	mov	DWORD[8+rbp],ecx
-	mov	DWORD[12+rbp],edx
-
-	jmp	NEAR $L$cbc_fast_cleanup
-
-
-ALIGN	16
-$L$FAST_DECRYPT:
-	cmp	r9,r8
-	je	NEAR $L$cbc_fast_dec_in_place
-
-	mov	QWORD[64+rsp],rbp
-ALIGN	4
-$L$cbc_fast_dec_loop:
-	mov	eax,DWORD[r8]
-	mov	ebx,DWORD[4+r8]
-	mov	ecx,DWORD[8+r8]
-	mov	edx,DWORD[12+r8]
-	mov	r15,QWORD[rsp]
-	mov	QWORD[24+rsp],r8
-
-	call	_x86_64_AES_decrypt
-
-	mov	rbp,QWORD[64+rsp]
-	mov	r8,QWORD[24+rsp]
-	mov	r10,QWORD[40+rsp]
-	xor	eax,DWORD[rbp]
-	xor	ebx,DWORD[4+rbp]
-	xor	ecx,DWORD[8+rbp]
-	xor	edx,DWORD[12+rbp]
-	mov	rbp,r8
-
-	sub	r10,16
-	mov	QWORD[40+rsp],r10
-	mov	QWORD[64+rsp],rbp
-
-	mov	DWORD[r9],eax
-	mov	DWORD[4+r9],ebx
-	mov	DWORD[8+r9],ecx
-	mov	DWORD[12+r9],edx
-
-	lea	r8,[16+r8]
-	lea	r9,[16+r9]
-	jnz	NEAR $L$cbc_fast_dec_loop
-	mov	r12,QWORD[56+rsp]
-	mov	r10,QWORD[rbp]
-	mov	r11,QWORD[8+rbp]
-	mov	QWORD[r12],r10
-	mov	QWORD[8+r12],r11
-	jmp	NEAR $L$cbc_fast_cleanup
-
-ALIGN	16
-$L$cbc_fast_dec_in_place:
-	mov	r10,QWORD[rbp]
-	mov	r11,QWORD[8+rbp]
-	mov	QWORD[((0+64))+rsp],r10
-	mov	QWORD[((8+64))+rsp],r11
-ALIGN	4
-$L$cbc_fast_dec_in_place_loop:
-	mov	eax,DWORD[r8]
-	mov	ebx,DWORD[4+r8]
-	mov	ecx,DWORD[8+r8]
-	mov	edx,DWORD[12+r8]
-	mov	r15,QWORD[rsp]
-	mov	QWORD[24+rsp],r8
-
-	call	_x86_64_AES_decrypt
-
-	mov	r8,QWORD[24+rsp]
-	mov	r10,QWORD[40+rsp]
-	xor	eax,DWORD[((0+64))+rsp]
-	xor	ebx,DWORD[((4+64))+rsp]
-	xor	ecx,DWORD[((8+64))+rsp]
-	xor	edx,DWORD[((12+64))+rsp]
-
-	mov	r11,QWORD[r8]
-	mov	r12,QWORD[8+r8]
-	sub	r10,16
-	jz	NEAR $L$cbc_fast_dec_in_place_done
-
-	mov	QWORD[((0+64))+rsp],r11
-	mov	QWORD[((8+64))+rsp],r12
-
-	mov	DWORD[r9],eax
-	mov	DWORD[4+r9],ebx
-	mov	DWORD[8+r9],ecx
-	mov	DWORD[12+r9],edx
-
-	lea	r8,[16+r8]
-	lea	r9,[16+r9]
-	mov	QWORD[40+rsp],r10
-	jmp	NEAR $L$cbc_fast_dec_in_place_loop
-$L$cbc_fast_dec_in_place_done:
-	mov	rdi,QWORD[56+rsp]
-	mov	QWORD[rdi],r11
-	mov	QWORD[8+rdi],r12
-
-	mov	DWORD[r9],eax
-	mov	DWORD[4+r9],ebx
-	mov	DWORD[8+r9],ecx
-	mov	DWORD[12+r9],edx
-
-ALIGN	4
-$L$cbc_fast_cleanup:
-	cmp	DWORD[((80+240))+rsp],0
-	lea	rdi,[80+rsp]
-	je	NEAR $L$cbc_exit
-	mov	ecx,240/8
-	xor	rax,rax
-	DD	0x90AB48F3
-
-	jmp	NEAR $L$cbc_exit
-
-
-ALIGN	16
-$L$cbc_slow_prologue:
-
-
-	lea	rbp,[((-88))+rsp]
-	and	rbp,-64
-
-	lea	r10,[((-88-63))+rcx]
-	sub	r10,rbp
-	neg	r10
-	and	r10,0x3c0
-	sub	rbp,r10
-
-	xchg	rbp,rsp
-
-
-	mov	QWORD[16+rsp],rbp
-
-$L$cbc_slow_body:
-
-
-
-
-	mov	QWORD[56+rsp],r8
-	mov	rbp,r8
-	mov	rbx,r9
-	mov	r9,rsi
-	mov	r8,rdi
-	mov	r15,rcx
-	mov	r10,rdx
-
-	mov	eax,DWORD[240+r15]
-	mov	QWORD[rsp],r15
-	shl	eax,4
-	lea	rax,[rax*1+r15]
-	mov	QWORD[8+rsp],rax
-
-
-	lea	r14,[2048+r14]
-	lea	rax,[((768-8))+rsp]
-	sub	rax,r14
-	and	rax,0x300
-	lea	r14,[rax*1+r14]
-
-	cmp	rbx,0
-	je	NEAR $L$SLOW_DECRYPT
-
-
-	test	r10,-16
-	mov	eax,DWORD[rbp]
-	mov	ebx,DWORD[4+rbp]
-	mov	ecx,DWORD[8+rbp]
-	mov	edx,DWORD[12+rbp]
-	jz	NEAR $L$cbc_slow_enc_tail
-
-ALIGN	4
-$L$cbc_slow_enc_loop:
-	xor	eax,DWORD[r8]
-	xor	ebx,DWORD[4+r8]
-	xor	ecx,DWORD[8+r8]
-	xor	edx,DWORD[12+r8]
-	mov	r15,QWORD[rsp]
-	mov	QWORD[24+rsp],r8
-	mov	QWORD[32+rsp],r9
-	mov	QWORD[40+rsp],r10
-
-	call	_x86_64_AES_encrypt_compact
-
-	mov	r8,QWORD[24+rsp]
-	mov	r9,QWORD[32+rsp]
-	mov	r10,QWORD[40+rsp]
-	mov	DWORD[r9],eax
-	mov	DWORD[4+r9],ebx
-	mov	DWORD[8+r9],ecx
-	mov	DWORD[12+r9],edx
-
-	lea	r8,[16+r8]
-	lea	r9,[16+r9]
-	sub	r10,16
-	test	r10,-16
-	jnz	NEAR $L$cbc_slow_enc_loop
-	test	r10,15
-	jnz	NEAR $L$cbc_slow_enc_tail
-	mov	rbp,QWORD[56+rsp]
-	mov	DWORD[rbp],eax
-	mov	DWORD[4+rbp],ebx
-	mov	DWORD[8+rbp],ecx
-	mov	DWORD[12+rbp],edx
-
-	jmp	NEAR $L$cbc_exit
-
-ALIGN	4
-$L$cbc_slow_enc_tail:
-	mov	r11,rax
-	mov	r12,rcx
-	mov	rcx,r10
-	mov	rsi,r8
-	mov	rdi,r9
-	DD	0x9066A4F3
-	mov	rcx,16
-	sub	rcx,r10
-	xor	rax,rax
-	DD	0x9066AAF3
-	mov	r8,r9
-	mov	r10,16
-	mov	rax,r11
-	mov	rcx,r12
-	jmp	NEAR $L$cbc_slow_enc_loop
-
-ALIGN	16
-$L$SLOW_DECRYPT:
-	shr	rax,3
-	add	r14,rax
-
-	mov	r11,QWORD[rbp]
-	mov	r12,QWORD[8+rbp]
-	mov	QWORD[((0+64))+rsp],r11
-	mov	QWORD[((8+64))+rsp],r12
-
-ALIGN	4
-$L$cbc_slow_dec_loop:
-	mov	eax,DWORD[r8]
-	mov	ebx,DWORD[4+r8]
-	mov	ecx,DWORD[8+r8]
-	mov	edx,DWORD[12+r8]
-	mov	r15,QWORD[rsp]
-	mov	QWORD[24+rsp],r8
-	mov	QWORD[32+rsp],r9
-	mov	QWORD[40+rsp],r10
-
-	call	_x86_64_AES_decrypt_compact
-
-	mov	r8,QWORD[24+rsp]
-	mov	r9,QWORD[32+rsp]
-	mov	r10,QWORD[40+rsp]
-	xor	eax,DWORD[((0+64))+rsp]
-	xor	ebx,DWORD[((4+64))+rsp]
-	xor	ecx,DWORD[((8+64))+rsp]
-	xor	edx,DWORD[((12+64))+rsp]
-
-	mov	r11,QWORD[r8]
-	mov	r12,QWORD[8+r8]
-	sub	r10,16
-	jc	NEAR $L$cbc_slow_dec_partial
-	jz	NEAR $L$cbc_slow_dec_done
-
-	mov	QWORD[((0+64))+rsp],r11
-	mov	QWORD[((8+64))+rsp],r12
-
-	mov	DWORD[r9],eax
-	mov	DWORD[4+r9],ebx
-	mov	DWORD[8+r9],ecx
-	mov	DWORD[12+r9],edx
-
-	lea	r8,[16+r8]
-	lea	r9,[16+r9]
-	jmp	NEAR $L$cbc_slow_dec_loop
-$L$cbc_slow_dec_done:
-	mov	rdi,QWORD[56+rsp]
-	mov	QWORD[rdi],r11
-	mov	QWORD[8+rdi],r12
-
-	mov	DWORD[r9],eax
-	mov	DWORD[4+r9],ebx
-	mov	DWORD[8+r9],ecx
-	mov	DWORD[12+r9],edx
-
-	jmp	NEAR $L$cbc_exit
-
-ALIGN	4
-$L$cbc_slow_dec_partial:
-	mov	rdi,QWORD[56+rsp]
-	mov	QWORD[rdi],r11
-	mov	QWORD[8+rdi],r12
-
-	mov	DWORD[((0+64))+rsp],eax
-	mov	DWORD[((4+64))+rsp],ebx
-	mov	DWORD[((8+64))+rsp],ecx
-	mov	DWORD[((12+64))+rsp],edx
-
-	mov	rdi,r9
-	lea	rsi,[64+rsp]
-	lea	rcx,[16+r10]
-	DD	0x9066A4F3
-	jmp	NEAR $L$cbc_exit
-
-ALIGN	16
-$L$cbc_exit:
-	mov	rsi,QWORD[16+rsp]
-
-	mov	r15,QWORD[rsi]
-
-	mov	r14,QWORD[8+rsi]
-
-	mov	r13,QWORD[16+rsi]
-
-	mov	r12,QWORD[24+rsi]
-
-	mov	rbp,QWORD[32+rsi]
-
-	mov	rbx,QWORD[40+rsi]
-
-	lea	rsp,[48+rsi]
-
-$L$cbc_popfq:
-	popfq
-
-
-
-$L$cbc_epilogue:
-	mov	rdi,QWORD[8+rsp]	;WIN64 epilogue
-	mov	rsi,QWORD[16+rsp]
-	DB	0F3h,0C3h		;repret
-
-$L$SEH_end_AES_cbc_encrypt:
-ALIGN	64
-$L$AES_Te:
-	DD	0xa56363c6,0xa56363c6
-	DD	0x847c7cf8,0x847c7cf8
-	DD	0x997777ee,0x997777ee
-	DD	0x8d7b7bf6,0x8d7b7bf6
-	DD	0x0df2f2ff,0x0df2f2ff
-	DD	0xbd6b6bd6,0xbd6b6bd6
-	DD	0xb16f6fde,0xb16f6fde
-	DD	0x54c5c591,0x54c5c591
-	DD	0x50303060,0x50303060
-	DD	0x03010102,0x03010102
-	DD	0xa96767ce,0xa96767ce
-	DD	0x7d2b2b56,0x7d2b2b56
-	DD	0x19fefee7,0x19fefee7
-	DD	0x62d7d7b5,0x62d7d7b5
-	DD	0xe6abab4d,0xe6abab4d
-	DD	0x9a7676ec,0x9a7676ec
-	DD	0x45caca8f,0x45caca8f
-	DD	0x9d82821f,0x9d82821f
-	DD	0x40c9c989,0x40c9c989
-	DD	0x877d7dfa,0x877d7dfa
-	DD	0x15fafaef,0x15fafaef
-	DD	0xeb5959b2,0xeb5959b2
-	DD	0xc947478e,0xc947478e
-	DD	0x0bf0f0fb,0x0bf0f0fb
-	DD	0xecadad41,0xecadad41
-	DD	0x67d4d4b3,0x67d4d4b3
-	DD	0xfda2a25f,0xfda2a25f
-	DD	0xeaafaf45,0xeaafaf45
-	DD	0xbf9c9c23,0xbf9c9c23
-	DD	0xf7a4a453,0xf7a4a453
-	DD	0x967272e4,0x967272e4
-	DD	0x5bc0c09b,0x5bc0c09b
-	DD	0xc2b7b775,0xc2b7b775
-	DD	0x1cfdfde1,0x1cfdfde1
-	DD	0xae93933d,0xae93933d
-	DD	0x6a26264c,0x6a26264c
-	DD	0x5a36366c,0x5a36366c
-	DD	0x413f3f7e,0x413f3f7e
-	DD	0x02f7f7f5,0x02f7f7f5
-	DD	0x4fcccc83,0x4fcccc83
-	DD	0x5c343468,0x5c343468
-	DD	0xf4a5a551,0xf4a5a551
-	DD	0x34e5e5d1,0x34e5e5d1
-	DD	0x08f1f1f9,0x08f1f1f9
-	DD	0x937171e2,0x937171e2
-	DD	0x73d8d8ab,0x73d8d8ab
-	DD	0x53313162,0x53313162
-	DD	0x3f15152a,0x3f15152a
-	DD	0x0c040408,0x0c040408
-	DD	0x52c7c795,0x52c7c795
-	DD	0x65232346,0x65232346
-	DD	0x5ec3c39d,0x5ec3c39d
-	DD	0x28181830,0x28181830
-	DD	0xa1969637,0xa1969637
-	DD	0x0f05050a,0x0f05050a
-	DD	0xb59a9a2f,0xb59a9a2f
-	DD	0x0907070e,0x0907070e
-	DD	0x36121224,0x36121224
-	DD	0x9b80801b,0x9b80801b
-	DD	0x3de2e2df,0x3de2e2df
-	DD	0x26ebebcd,0x26ebebcd
-	DD	0x6927274e,0x6927274e
-	DD	0xcdb2b27f,0xcdb2b27f
-	DD	0x9f7575ea,0x9f7575ea
-	DD	0x1b090912,0x1b090912
-	DD	0x9e83831d,0x9e83831d
-	DD	0x742c2c58,0x742c2c58
-	DD	0x2e1a1a34,0x2e1a1a34
-	DD	0x2d1b1b36,0x2d1b1b36
-	DD	0xb26e6edc,0xb26e6edc
-	DD	0xee5a5ab4,0xee5a5ab4
-	DD	0xfba0a05b,0xfba0a05b
-	DD	0xf65252a4,0xf65252a4
-	DD	0x4d3b3b76,0x4d3b3b76
-	DD	0x61d6d6b7,0x61d6d6b7
-	DD	0xceb3b37d,0xceb3b37d
-	DD	0x7b292952,0x7b292952
-	DD	0x3ee3e3dd,0x3ee3e3dd
-	DD	0x712f2f5e,0x712f2f5e
-	DD	0x97848413,0x97848413
-	DD	0xf55353a6,0xf55353a6
-	DD	0x68d1d1b9,0x68d1d1b9
-	DD	0x00000000,0x00000000
-	DD	0x2cededc1,0x2cededc1
-	DD	0x60202040,0x60202040
-	DD	0x1ffcfce3,0x1ffcfce3
-	DD	0xc8b1b179,0xc8b1b179
-	DD	0xed5b5bb6,0xed5b5bb6
-	DD	0xbe6a6ad4,0xbe6a6ad4
-	DD	0x46cbcb8d,0x46cbcb8d
-	DD	0xd9bebe67,0xd9bebe67
-	DD	0x4b393972,0x4b393972
-	DD	0xde4a4a94,0xde4a4a94
-	DD	0xd44c4c98,0xd44c4c98
-	DD	0xe85858b0,0xe85858b0
-	DD	0x4acfcf85,0x4acfcf85
-	DD	0x6bd0d0bb,0x6bd0d0bb
-	DD	0x2aefefc5,0x2aefefc5
-	DD	0xe5aaaa4f,0xe5aaaa4f
-	DD	0x16fbfbed,0x16fbfbed
-	DD	0xc5434386,0xc5434386
-	DD	0xd74d4d9a,0xd74d4d9a
-	DD	0x55333366,0x55333366
-	DD	0x94858511,0x94858511
-	DD	0xcf45458a,0xcf45458a
-	DD	0x10f9f9e9,0x10f9f9e9
-	DD	0x06020204,0x06020204
-	DD	0x817f7ffe,0x817f7ffe
-	DD	0xf05050a0,0xf05050a0
-	DD	0x443c3c78,0x443c3c78
-	DD	0xba9f9f25,0xba9f9f25
-	DD	0xe3a8a84b,0xe3a8a84b
-	DD	0xf35151a2,0xf35151a2
-	DD	0xfea3a35d,0xfea3a35d
-	DD	0xc0404080,0xc0404080
-	DD	0x8a8f8f05,0x8a8f8f05
-	DD	0xad92923f,0xad92923f
-	DD	0xbc9d9d21,0xbc9d9d21
-	DD	0x48383870,0x48383870
-	DD	0x04f5f5f1,0x04f5f5f1
-	DD	0xdfbcbc63,0xdfbcbc63
-	DD	0xc1b6b677,0xc1b6b677
-	DD	0x75dadaaf,0x75dadaaf
-	DD	0x63212142,0x63212142
-	DD	0x30101020,0x30101020
-	DD	0x1affffe5,0x1affffe5
-	DD	0x0ef3f3fd,0x0ef3f3fd
-	DD	0x6dd2d2bf,0x6dd2d2bf
-	DD	0x4ccdcd81,0x4ccdcd81
-	DD	0x140c0c18,0x140c0c18
-	DD	0x35131326,0x35131326
-	DD	0x2fececc3,0x2fececc3
-	DD	0xe15f5fbe,0xe15f5fbe
-	DD	0xa2979735,0xa2979735
-	DD	0xcc444488,0xcc444488
-	DD	0x3917172e,0x3917172e
-	DD	0x57c4c493,0x57c4c493
-	DD	0xf2a7a755,0xf2a7a755
-	DD	0x827e7efc,0x827e7efc
-	DD	0x473d3d7a,0x473d3d7a
-	DD	0xac6464c8,0xac6464c8
-	DD	0xe75d5dba,0xe75d5dba
-	DD	0x2b191932,0x2b191932
-	DD	0x957373e6,0x957373e6
-	DD	0xa06060c0,0xa06060c0
-	DD	0x98818119,0x98818119
-	DD	0xd14f4f9e,0xd14f4f9e
-	DD	0x7fdcdca3,0x7fdcdca3
-	DD	0x66222244,0x66222244
-	DD	0x7e2a2a54,0x7e2a2a54
-	DD	0xab90903b,0xab90903b
-	DD	0x8388880b,0x8388880b
-	DD	0xca46468c,0xca46468c
-	DD	0x29eeeec7,0x29eeeec7
-	DD	0xd3b8b86b,0xd3b8b86b
-	DD	0x3c141428,0x3c141428
-	DD	0x79dedea7,0x79dedea7
-	DD	0xe25e5ebc,0xe25e5ebc
-	DD	0x1d0b0b16,0x1d0b0b16
-	DD	0x76dbdbad,0x76dbdbad
-	DD	0x3be0e0db,0x3be0e0db
-	DD	0x56323264,0x56323264
-	DD	0x4e3a3a74,0x4e3a3a74
-	DD	0x1e0a0a14,0x1e0a0a14
-	DD	0xdb494992,0xdb494992
-	DD	0x0a06060c,0x0a06060c
-	DD	0x6c242448,0x6c242448
-	DD	0xe45c5cb8,0xe45c5cb8
-	DD	0x5dc2c29f,0x5dc2c29f
-	DD	0x6ed3d3bd,0x6ed3d3bd
-	DD	0xefacac43,0xefacac43
-	DD	0xa66262c4,0xa66262c4
-	DD	0xa8919139,0xa8919139
-	DD	0xa4959531,0xa4959531
-	DD	0x37e4e4d3,0x37e4e4d3
-	DD	0x8b7979f2,0x8b7979f2
-	DD	0x32e7e7d5,0x32e7e7d5
-	DD	0x43c8c88b,0x43c8c88b
-	DD	0x5937376e,0x5937376e
-	DD	0xb76d6dda,0xb76d6dda
-	DD	0x8c8d8d01,0x8c8d8d01
-	DD	0x64d5d5b1,0x64d5d5b1
-	DD	0xd24e4e9c,0xd24e4e9c
-	DD	0xe0a9a949,0xe0a9a949
-	DD	0xb46c6cd8,0xb46c6cd8
-	DD	0xfa5656ac,0xfa5656ac
-	DD	0x07f4f4f3,0x07f4f4f3
-	DD	0x25eaeacf,0x25eaeacf
-	DD	0xaf6565ca,0xaf6565ca
-	DD	0x8e7a7af4,0x8e7a7af4
-	DD	0xe9aeae47,0xe9aeae47
-	DD	0x18080810,0x18080810
-	DD	0xd5baba6f,0xd5baba6f
-	DD	0x887878f0,0x887878f0
-	DD	0x6f25254a,0x6f25254a
-	DD	0x722e2e5c,0x722e2e5c
-	DD	0x241c1c38,0x241c1c38
-	DD	0xf1a6a657,0xf1a6a657
-	DD	0xc7b4b473,0xc7b4b473
-	DD	0x51c6c697,0x51c6c697
-	DD	0x23e8e8cb,0x23e8e8cb
-	DD	0x7cdddda1,0x7cdddda1
-	DD	0x9c7474e8,0x9c7474e8
-	DD	0x211f1f3e,0x211f1f3e
-	DD	0xdd4b4b96,0xdd4b4b96
-	DD	0xdcbdbd61,0xdcbdbd61
-	DD	0x868b8b0d,0x868b8b0d
-	DD	0x858a8a0f,0x858a8a0f
-	DD	0x907070e0,0x907070e0
-	DD	0x423e3e7c,0x423e3e7c
-	DD	0xc4b5b571,0xc4b5b571
-	DD	0xaa6666cc,0xaa6666cc
-	DD	0xd8484890,0xd8484890
-	DD	0x05030306,0x05030306
-	DD	0x01f6f6f7,0x01f6f6f7
-	DD	0x120e0e1c,0x120e0e1c
-	DD	0xa36161c2,0xa36161c2
-	DD	0x5f35356a,0x5f35356a
-	DD	0xf95757ae,0xf95757ae
-	DD	0xd0b9b969,0xd0b9b969
-	DD	0x91868617,0x91868617
-	DD	0x58c1c199,0x58c1c199
-	DD	0x271d1d3a,0x271d1d3a
-	DD	0xb99e9e27,0xb99e9e27
-	DD	0x38e1e1d9,0x38e1e1d9
-	DD	0x13f8f8eb,0x13f8f8eb
-	DD	0xb398982b,0xb398982b
-	DD	0x33111122,0x33111122
-	DD	0xbb6969d2,0xbb6969d2
-	DD	0x70d9d9a9,0x70d9d9a9
-	DD	0x898e8e07,0x898e8e07
-	DD	0xa7949433,0xa7949433
-	DD	0xb69b9b2d,0xb69b9b2d
-	DD	0x221e1e3c,0x221e1e3c
-	DD	0x92878715,0x92878715
-	DD	0x20e9e9c9,0x20e9e9c9
-	DD	0x49cece87,0x49cece87
-	DD	0xff5555aa,0xff5555aa
-	DD	0x78282850,0x78282850
-	DD	0x7adfdfa5,0x7adfdfa5
-	DD	0x8f8c8c03,0x8f8c8c03
-	DD	0xf8a1a159,0xf8a1a159
-	DD	0x80898909,0x80898909
-	DD	0x170d0d1a,0x170d0d1a
-	DD	0xdabfbf65,0xdabfbf65
-	DD	0x31e6e6d7,0x31e6e6d7
-	DD	0xc6424284,0xc6424284
-	DD	0xb86868d0,0xb86868d0
-	DD	0xc3414182,0xc3414182
-	DD	0xb0999929,0xb0999929
-	DD	0x772d2d5a,0x772d2d5a
-	DD	0x110f0f1e,0x110f0f1e
-	DD	0xcbb0b07b,0xcbb0b07b
-	DD	0xfc5454a8,0xfc5454a8
-	DD	0xd6bbbb6d,0xd6bbbb6d
-	DD	0x3a16162c,0x3a16162c
-DB	0x63,0x7c,0x77,0x7b,0xf2,0x6b,0x6f,0xc5
-DB	0x30,0x01,0x67,0x2b,0xfe,0xd7,0xab,0x76
-DB	0xca,0x82,0xc9,0x7d,0xfa,0x59,0x47,0xf0
-DB	0xad,0xd4,0xa2,0xaf,0x9c,0xa4,0x72,0xc0
-DB	0xb7,0xfd,0x93,0x26,0x36,0x3f,0xf7,0xcc
-DB	0x34,0xa5,0xe5,0xf1,0x71,0xd8,0x31,0x15
-DB	0x04,0xc7,0x23,0xc3,0x18,0x96,0x05,0x9a
-DB	0x07,0x12,0x80,0xe2,0xeb,0x27,0xb2,0x75
-DB	0x09,0x83,0x2c,0x1a,0x1b,0x6e,0x5a,0xa0
-DB	0x52,0x3b,0xd6,0xb3,0x29,0xe3,0x2f,0x84
-DB	0x53,0xd1,0x00,0xed,0x20,0xfc,0xb1,0x5b
-DB	0x6a,0xcb,0xbe,0x39,0x4a,0x4c,0x58,0xcf
-DB	0xd0,0xef,0xaa,0xfb,0x43,0x4d,0x33,0x85
-DB	0x45,0xf9,0x02,0x7f,0x50,0x3c,0x9f,0xa8
-DB	0x51,0xa3,0x40,0x8f,0x92,0x9d,0x38,0xf5
-DB	0xbc,0xb6,0xda,0x21,0x10,0xff,0xf3,0xd2
-DB	0xcd,0x0c,0x13,0xec,0x5f,0x97,0x44,0x17
-DB	0xc4,0xa7,0x7e,0x3d,0x64,0x5d,0x19,0x73
-DB	0x60,0x81,0x4f,0xdc,0x22,0x2a,0x90,0x88
-DB	0x46,0xee,0xb8,0x14,0xde,0x5e,0x0b,0xdb
-DB	0xe0,0x32,0x3a,0x0a,0x49,0x06,0x24,0x5c
-DB	0xc2,0xd3,0xac,0x62,0x91,0x95,0xe4,0x79
-DB	0xe7,0xc8,0x37,0x6d,0x8d,0xd5,0x4e,0xa9
-DB	0x6c,0x56,0xf4,0xea,0x65,0x7a,0xae,0x08
-DB	0xba,0x78,0x25,0x2e,0x1c,0xa6,0xb4,0xc6
-DB	0xe8,0xdd,0x74,0x1f,0x4b,0xbd,0x8b,0x8a
-DB	0x70,0x3e,0xb5,0x66,0x48,0x03,0xf6,0x0e
-DB	0x61,0x35,0x57,0xb9,0x86,0xc1,0x1d,0x9e
-DB	0xe1,0xf8,0x98,0x11,0x69,0xd9,0x8e,0x94
-DB	0x9b,0x1e,0x87,0xe9,0xce,0x55,0x28,0xdf
-DB	0x8c,0xa1,0x89,0x0d,0xbf,0xe6,0x42,0x68
-DB	0x41,0x99,0x2d,0x0f,0xb0,0x54,0xbb,0x16
-DB	0x63,0x7c,0x77,0x7b,0xf2,0x6b,0x6f,0xc5
-DB	0x30,0x01,0x67,0x2b,0xfe,0xd7,0xab,0x76
-DB	0xca,0x82,0xc9,0x7d,0xfa,0x59,0x47,0xf0
-DB	0xad,0xd4,0xa2,0xaf,0x9c,0xa4,0x72,0xc0
-DB	0xb7,0xfd,0x93,0x26,0x36,0x3f,0xf7,0xcc
-DB	0x34,0xa5,0xe5,0xf1,0x71,0xd8,0x31,0x15
-DB	0x04,0xc7,0x23,0xc3,0x18,0x96,0x05,0x9a
-DB	0x07,0x12,0x80,0xe2,0xeb,0x27,0xb2,0x75
-DB	0x09,0x83,0x2c,0x1a,0x1b,0x6e,0x5a,0xa0
-DB	0x52,0x3b,0xd6,0xb3,0x29,0xe3,0x2f,0x84
-DB	0x53,0xd1,0x00,0xed,0x20,0xfc,0xb1,0x5b
-DB	0x6a,0xcb,0xbe,0x39,0x4a,0x4c,0x58,0xcf
-DB	0xd0,0xef,0xaa,0xfb,0x43,0x4d,0x33,0x85
-DB	0x45,0xf9,0x02,0x7f,0x50,0x3c,0x9f,0xa8
-DB	0x51,0xa3,0x40,0x8f,0x92,0x9d,0x38,0xf5
-DB	0xbc,0xb6,0xda,0x21,0x10,0xff,0xf3,0xd2
-DB	0xcd,0x0c,0x13,0xec,0x5f,0x97,0x44,0x17
-DB	0xc4,0xa7,0x7e,0x3d,0x64,0x5d,0x19,0x73
-DB	0x60,0x81,0x4f,0xdc,0x22,0x2a,0x90,0x88
-DB	0x46,0xee,0xb8,0x14,0xde,0x5e,0x0b,0xdb
-DB	0xe0,0x32,0x3a,0x0a,0x49,0x06,0x24,0x5c
-DB	0xc2,0xd3,0xac,0x62,0x91,0x95,0xe4,0x79
-DB	0xe7,0xc8,0x37,0x6d,0x8d,0xd5,0x4e,0xa9
-DB	0x6c,0x56,0xf4,0xea,0x65,0x7a,0xae,0x08
-DB	0xba,0x78,0x25,0x2e,0x1c,0xa6,0xb4,0xc6
-DB	0xe8,0xdd,0x74,0x1f,0x4b,0xbd,0x8b,0x8a
-DB	0x70,0x3e,0xb5,0x66,0x48,0x03,0xf6,0x0e
-DB	0x61,0x35,0x57,0xb9,0x86,0xc1,0x1d,0x9e
-DB	0xe1,0xf8,0x98,0x11,0x69,0xd9,0x8e,0x94
-DB	0x9b,0x1e,0x87,0xe9,0xce,0x55,0x28,0xdf
-DB	0x8c,0xa1,0x89,0x0d,0xbf,0xe6,0x42,0x68
-DB	0x41,0x99,0x2d,0x0f,0xb0,0x54,0xbb,0x16
-DB	0x63,0x7c,0x77,0x7b,0xf2,0x6b,0x6f,0xc5
-DB	0x30,0x01,0x67,0x2b,0xfe,0xd7,0xab,0x76
-DB	0xca,0x82,0xc9,0x7d,0xfa,0x59,0x47,0xf0
-DB	0xad,0xd4,0xa2,0xaf,0x9c,0xa4,0x72,0xc0
-DB	0xb7,0xfd,0x93,0x26,0x36,0x3f,0xf7,0xcc
-DB	0x34,0xa5,0xe5,0xf1,0x71,0xd8,0x31,0x15
-DB	0x04,0xc7,0x23,0xc3,0x18,0x96,0x05,0x9a
-DB	0x07,0x12,0x80,0xe2,0xeb,0x27,0xb2,0x75
-DB	0x09,0x83,0x2c,0x1a,0x1b,0x6e,0x5a,0xa0
-DB	0x52,0x3b,0xd6,0xb3,0x29,0xe3,0x2f,0x84
-DB	0x53,0xd1,0x00,0xed,0x20,0xfc,0xb1,0x5b
-DB	0x6a,0xcb,0xbe,0x39,0x4a,0x4c,0x58,0xcf
-DB	0xd0,0xef,0xaa,0xfb,0x43,0x4d,0x33,0x85
-DB	0x45,0xf9,0x02,0x7f,0x50,0x3c,0x9f,0xa8
-DB	0x51,0xa3,0x40,0x8f,0x92,0x9d,0x38,0xf5
-DB	0xbc,0xb6,0xda,0x21,0x10,0xff,0xf3,0xd2
-DB	0xcd,0x0c,0x13,0xec,0x5f,0x97,0x44,0x17
-DB	0xc4,0xa7,0x7e,0x3d,0x64,0x5d,0x19,0x73
-DB	0x60,0x81,0x4f,0xdc,0x22,0x2a,0x90,0x88
-DB	0x46,0xee,0xb8,0x14,0xde,0x5e,0x0b,0xdb
-DB	0xe0,0x32,0x3a,0x0a,0x49,0x06,0x24,0x5c
-DB	0xc2,0xd3,0xac,0x62,0x91,0x95,0xe4,0x79
-DB	0xe7,0xc8,0x37,0x6d,0x8d,0xd5,0x4e,0xa9
-DB	0x6c,0x56,0xf4,0xea,0x65,0x7a,0xae,0x08
-DB	0xba,0x78,0x25,0x2e,0x1c,0xa6,0xb4,0xc6
-DB	0xe8,0xdd,0x74,0x1f,0x4b,0xbd,0x8b,0x8a
-DB	0x70,0x3e,0xb5,0x66,0x48,0x03,0xf6,0x0e
-DB	0x61,0x35,0x57,0xb9,0x86,0xc1,0x1d,0x9e
-DB	0xe1,0xf8,0x98,0x11,0x69,0xd9,0x8e,0x94
-DB	0x9b,0x1e,0x87,0xe9,0xce,0x55,0x28,0xdf
-DB	0x8c,0xa1,0x89,0x0d,0xbf,0xe6,0x42,0x68
-DB	0x41,0x99,0x2d,0x0f,0xb0,0x54,0xbb,0x16
-DB	0x63,0x7c,0x77,0x7b,0xf2,0x6b,0x6f,0xc5
-DB	0x30,0x01,0x67,0x2b,0xfe,0xd7,0xab,0x76
-DB	0xca,0x82,0xc9,0x7d,0xfa,0x59,0x47,0xf0
-DB	0xad,0xd4,0xa2,0xaf,0x9c,0xa4,0x72,0xc0
-DB	0xb7,0xfd,0x93,0x26,0x36,0x3f,0xf7,0xcc
-DB	0x34,0xa5,0xe5,0xf1,0x71,0xd8,0x31,0x15
-DB	0x04,0xc7,0x23,0xc3,0x18,0x96,0x05,0x9a
-DB	0x07,0x12,0x80,0xe2,0xeb,0x27,0xb2,0x75
-DB	0x09,0x83,0x2c,0x1a,0x1b,0x6e,0x5a,0xa0
-DB	0x52,0x3b,0xd6,0xb3,0x29,0xe3,0x2f,0x84
-DB	0x53,0xd1,0x00,0xed,0x20,0xfc,0xb1,0x5b
-DB	0x6a,0xcb,0xbe,0x39,0x4a,0x4c,0x58,0xcf
-DB	0xd0,0xef,0xaa,0xfb,0x43,0x4d,0x33,0x85
-DB	0x45,0xf9,0x02,0x7f,0x50,0x3c,0x9f,0xa8
-DB	0x51,0xa3,0x40,0x8f,0x92,0x9d,0x38,0xf5
-DB	0xbc,0xb6,0xda,0x21,0x10,0xff,0xf3,0xd2
-DB	0xcd,0x0c,0x13,0xec,0x5f,0x97,0x44,0x17
-DB	0xc4,0xa7,0x7e,0x3d,0x64,0x5d,0x19,0x73
-DB	0x60,0x81,0x4f,0xdc,0x22,0x2a,0x90,0x88
-DB	0x46,0xee,0xb8,0x14,0xde,0x5e,0x0b,0xdb
-DB	0xe0,0x32,0x3a,0x0a,0x49,0x06,0x24,0x5c
-DB	0xc2,0xd3,0xac,0x62,0x91,0x95,0xe4,0x79
-DB	0xe7,0xc8,0x37,0x6d,0x8d,0xd5,0x4e,0xa9
-DB	0x6c,0x56,0xf4,0xea,0x65,0x7a,0xae,0x08
-DB	0xba,0x78,0x25,0x2e,0x1c,0xa6,0xb4,0xc6
-DB	0xe8,0xdd,0x74,0x1f,0x4b,0xbd,0x8b,0x8a
-DB	0x70,0x3e,0xb5,0x66,0x48,0x03,0xf6,0x0e
-DB	0x61,0x35,0x57,0xb9,0x86,0xc1,0x1d,0x9e
-DB	0xe1,0xf8,0x98,0x11,0x69,0xd9,0x8e,0x94
-DB	0x9b,0x1e,0x87,0xe9,0xce,0x55,0x28,0xdf
-DB	0x8c,0xa1,0x89,0x0d,0xbf,0xe6,0x42,0x68
-DB	0x41,0x99,0x2d,0x0f,0xb0,0x54,0xbb,0x16
-	DD	0x00000001,0x00000002,0x00000004,0x00000008
-	DD	0x00000010,0x00000020,0x00000040,0x00000080
-	DD	0x0000001b,0x00000036,0x80808080,0x80808080
-	DD	0xfefefefe,0xfefefefe,0x1b1b1b1b,0x1b1b1b1b
-ALIGN	64
-$L$AES_Td:
-	DD	0x50a7f451,0x50a7f451
-	DD	0x5365417e,0x5365417e
-	DD	0xc3a4171a,0xc3a4171a
-	DD	0x965e273a,0x965e273a
-	DD	0xcb6bab3b,0xcb6bab3b
-	DD	0xf1459d1f,0xf1459d1f
-	DD	0xab58faac,0xab58faac
-	DD	0x9303e34b,0x9303e34b
-	DD	0x55fa3020,0x55fa3020
-	DD	0xf66d76ad,0xf66d76ad
-	DD	0x9176cc88,0x9176cc88
-	DD	0x254c02f5,0x254c02f5
-	DD	0xfcd7e54f,0xfcd7e54f
-	DD	0xd7cb2ac5,0xd7cb2ac5
-	DD	0x80443526,0x80443526
-	DD	0x8fa362b5,0x8fa362b5
-	DD	0x495ab1de,0x495ab1de
-	DD	0x671bba25,0x671bba25
-	DD	0x980eea45,0x980eea45
-	DD	0xe1c0fe5d,0xe1c0fe5d
-	DD	0x02752fc3,0x02752fc3
-	DD	0x12f04c81,0x12f04c81
-	DD	0xa397468d,0xa397468d
-	DD	0xc6f9d36b,0xc6f9d36b
-	DD	0xe75f8f03,0xe75f8f03
-	DD	0x959c9215,0x959c9215
-	DD	0xeb7a6dbf,0xeb7a6dbf
-	DD	0xda595295,0xda595295
-	DD	0x2d83bed4,0x2d83bed4
-	DD	0xd3217458,0xd3217458
-	DD	0x2969e049,0x2969e049
-	DD	0x44c8c98e,0x44c8c98e
-	DD	0x6a89c275,0x6a89c275
-	DD	0x78798ef4,0x78798ef4
-	DD	0x6b3e5899,0x6b3e5899
-	DD	0xdd71b927,0xdd71b927
-	DD	0xb64fe1be,0xb64fe1be
-	DD	0x17ad88f0,0x17ad88f0
-	DD	0x66ac20c9,0x66ac20c9
-	DD	0xb43ace7d,0xb43ace7d
-	DD	0x184adf63,0x184adf63
-	DD	0x82311ae5,0x82311ae5
-	DD	0x60335197,0x60335197
-	DD	0x457f5362,0x457f5362
-	DD	0xe07764b1,0xe07764b1
-	DD	0x84ae6bbb,0x84ae6bbb
-	DD	0x1ca081fe,0x1ca081fe
-	DD	0x942b08f9,0x942b08f9
-	DD	0x58684870,0x58684870
-	DD	0x19fd458f,0x19fd458f
-	DD	0x876cde94,0x876cde94
-	DD	0xb7f87b52,0xb7f87b52
-	DD	0x23d373ab,0x23d373ab
-	DD	0xe2024b72,0xe2024b72
-	DD	0x578f1fe3,0x578f1fe3
-	DD	0x2aab5566,0x2aab5566
-	DD	0x0728ebb2,0x0728ebb2
-	DD	0x03c2b52f,0x03c2b52f
-	DD	0x9a7bc586,0x9a7bc586
-	DD	0xa50837d3,0xa50837d3
-	DD	0xf2872830,0xf2872830
-	DD	0xb2a5bf23,0xb2a5bf23
-	DD	0xba6a0302,0xba6a0302
-	DD	0x5c8216ed,0x5c8216ed
-	DD	0x2b1ccf8a,0x2b1ccf8a
-	DD	0x92b479a7,0x92b479a7
-	DD	0xf0f207f3,0xf0f207f3
-	DD	0xa1e2694e,0xa1e2694e
-	DD	0xcdf4da65,0xcdf4da65
-	DD	0xd5be0506,0xd5be0506
-	DD	0x1f6234d1,0x1f6234d1
-	DD	0x8afea6c4,0x8afea6c4
-	DD	0x9d532e34,0x9d532e34
-	DD	0xa055f3a2,0xa055f3a2
-	DD	0x32e18a05,0x32e18a05
-	DD	0x75ebf6a4,0x75ebf6a4
-	DD	0x39ec830b,0x39ec830b
-	DD	0xaaef6040,0xaaef6040
-	DD	0x069f715e,0x069f715e
-	DD	0x51106ebd,0x51106ebd
-	DD	0xf98a213e,0xf98a213e
-	DD	0x3d06dd96,0x3d06dd96
-	DD	0xae053edd,0xae053edd
-	DD	0x46bde64d,0x46bde64d
-	DD	0xb58d5491,0xb58d5491
-	DD	0x055dc471,0x055dc471
-	DD	0x6fd40604,0x6fd40604
-	DD	0xff155060,0xff155060
-	DD	0x24fb9819,0x24fb9819
-	DD	0x97e9bdd6,0x97e9bdd6
-	DD	0xcc434089,0xcc434089
-	DD	0x779ed967,0x779ed967
-	DD	0xbd42e8b0,0xbd42e8b0
-	DD	0x888b8907,0x888b8907
-	DD	0x385b19e7,0x385b19e7
-	DD	0xdbeec879,0xdbeec879
-	DD	0x470a7ca1,0x470a7ca1
-	DD	0xe90f427c,0xe90f427c
-	DD	0xc91e84f8,0xc91e84f8
-	DD	0x00000000,0x00000000
-	DD	0x83868009,0x83868009
-	DD	0x48ed2b32,0x48ed2b32
-	DD	0xac70111e,0xac70111e
-	DD	0x4e725a6c,0x4e725a6c
-	DD	0xfbff0efd,0xfbff0efd
-	DD	0x5638850f,0x5638850f
-	DD	0x1ed5ae3d,0x1ed5ae3d
-	DD	0x27392d36,0x27392d36
-	DD	0x64d90f0a,0x64d90f0a
-	DD	0x21a65c68,0x21a65c68
-	DD	0xd1545b9b,0xd1545b9b
-	DD	0x3a2e3624,0x3a2e3624
-	DD	0xb1670a0c,0xb1670a0c
-	DD	0x0fe75793,0x0fe75793
-	DD	0xd296eeb4,0xd296eeb4
-	DD	0x9e919b1b,0x9e919b1b
-	DD	0x4fc5c080,0x4fc5c080
-	DD	0xa220dc61,0xa220dc61
-	DD	0x694b775a,0x694b775a
-	DD	0x161a121c,0x161a121c
-	DD	0x0aba93e2,0x0aba93e2
-	DD	0xe52aa0c0,0xe52aa0c0
-	DD	0x43e0223c,0x43e0223c
-	DD	0x1d171b12,0x1d171b12
-	DD	0x0b0d090e,0x0b0d090e
-	DD	0xadc78bf2,0xadc78bf2
-	DD	0xb9a8b62d,0xb9a8b62d
-	DD	0xc8a91e14,0xc8a91e14
-	DD	0x8519f157,0x8519f157
-	DD	0x4c0775af,0x4c0775af
-	DD	0xbbdd99ee,0xbbdd99ee
-	DD	0xfd607fa3,0xfd607fa3
-	DD	0x9f2601f7,0x9f2601f7
-	DD	0xbcf5725c,0xbcf5725c
-	DD	0xc53b6644,0xc53b6644
-	DD	0x347efb5b,0x347efb5b
-	DD	0x7629438b,0x7629438b
-	DD	0xdcc623cb,0xdcc623cb
-	DD	0x68fcedb6,0x68fcedb6
-	DD	0x63f1e4b8,0x63f1e4b8
-	DD	0xcadc31d7,0xcadc31d7
-	DD	0x10856342,0x10856342
-	DD	0x40229713,0x40229713
-	DD	0x2011c684,0x2011c684
-	DD	0x7d244a85,0x7d244a85
-	DD	0xf83dbbd2,0xf83dbbd2
-	DD	0x1132f9ae,0x1132f9ae
-	DD	0x6da129c7,0x6da129c7
-	DD	0x4b2f9e1d,0x4b2f9e1d
-	DD	0xf330b2dc,0xf330b2dc
-	DD	0xec52860d,0xec52860d
-	DD	0xd0e3c177,0xd0e3c177
-	DD	0x6c16b32b,0x6c16b32b
-	DD	0x99b970a9,0x99b970a9
-	DD	0xfa489411,0xfa489411
-	DD	0x2264e947,0x2264e947
-	DD	0xc48cfca8,0xc48cfca8
-	DD	0x1a3ff0a0,0x1a3ff0a0
-	DD	0xd82c7d56,0xd82c7d56
-	DD	0xef903322,0xef903322
-	DD	0xc74e4987,0xc74e4987
-	DD	0xc1d138d9,0xc1d138d9
-	DD	0xfea2ca8c,0xfea2ca8c
-	DD	0x360bd498,0x360bd498
-	DD	0xcf81f5a6,0xcf81f5a6
-	DD	0x28de7aa5,0x28de7aa5
-	DD	0x268eb7da,0x268eb7da
-	DD	0xa4bfad3f,0xa4bfad3f
-	DD	0xe49d3a2c,0xe49d3a2c
-	DD	0x0d927850,0x0d927850
-	DD	0x9bcc5f6a,0x9bcc5f6a
-	DD	0x62467e54,0x62467e54
-	DD	0xc2138df6,0xc2138df6
-	DD	0xe8b8d890,0xe8b8d890
-	DD	0x5ef7392e,0x5ef7392e
-	DD	0xf5afc382,0xf5afc382
-	DD	0xbe805d9f,0xbe805d9f
-	DD	0x7c93d069,0x7c93d069
-	DD	0xa92dd56f,0xa92dd56f
-	DD	0xb31225cf,0xb31225cf
-	DD	0x3b99acc8,0x3b99acc8
-	DD	0xa77d1810,0xa77d1810
-	DD	0x6e639ce8,0x6e639ce8
-	DD	0x7bbb3bdb,0x7bbb3bdb
-	DD	0x097826cd,0x097826cd
-	DD	0xf418596e,0xf418596e
-	DD	0x01b79aec,0x01b79aec
-	DD	0xa89a4f83,0xa89a4f83
-	DD	0x656e95e6,0x656e95e6
-	DD	0x7ee6ffaa,0x7ee6ffaa
-	DD	0x08cfbc21,0x08cfbc21
-	DD	0xe6e815ef,0xe6e815ef
-	DD	0xd99be7ba,0xd99be7ba
-	DD	0xce366f4a,0xce366f4a
-	DD	0xd4099fea,0xd4099fea
-	DD	0xd67cb029,0xd67cb029
-	DD	0xafb2a431,0xafb2a431
-	DD	0x31233f2a,0x31233f2a
-	DD	0x3094a5c6,0x3094a5c6
-	DD	0xc066a235,0xc066a235
-	DD	0x37bc4e74,0x37bc4e74
-	DD	0xa6ca82fc,0xa6ca82fc
-	DD	0xb0d090e0,0xb0d090e0
-	DD	0x15d8a733,0x15d8a733
-	DD	0x4a9804f1,0x4a9804f1
-	DD	0xf7daec41,0xf7daec41
-	DD	0x0e50cd7f,0x0e50cd7f
-	DD	0x2ff69117,0x2ff69117
-	DD	0x8dd64d76,0x8dd64d76
-	DD	0x4db0ef43,0x4db0ef43
-	DD	0x544daacc,0x544daacc
-	DD	0xdf0496e4,0xdf0496e4
-	DD	0xe3b5d19e,0xe3b5d19e
-	DD	0x1b886a4c,0x1b886a4c
-	DD	0xb81f2cc1,0xb81f2cc1
-	DD	0x7f516546,0x7f516546
-	DD	0x04ea5e9d,0x04ea5e9d
-	DD	0x5d358c01,0x5d358c01
-	DD	0x737487fa,0x737487fa
-	DD	0x2e410bfb,0x2e410bfb
-	DD	0x5a1d67b3,0x5a1d67b3
-	DD	0x52d2db92,0x52d2db92
-	DD	0x335610e9,0x335610e9
-	DD	0x1347d66d,0x1347d66d
-	DD	0x8c61d79a,0x8c61d79a
-	DD	0x7a0ca137,0x7a0ca137
-	DD	0x8e14f859,0x8e14f859
-	DD	0x893c13eb,0x893c13eb
-	DD	0xee27a9ce,0xee27a9ce
-	DD	0x35c961b7,0x35c961b7
-	DD	0xede51ce1,0xede51ce1
-	DD	0x3cb1477a,0x3cb1477a
-	DD	0x59dfd29c,0x59dfd29c
-	DD	0x3f73f255,0x3f73f255
-	DD	0x79ce1418,0x79ce1418
-	DD	0xbf37c773,0xbf37c773
-	DD	0xeacdf753,0xeacdf753
-	DD	0x5baafd5f,0x5baafd5f
-	DD	0x146f3ddf,0x146f3ddf
-	DD	0x86db4478,0x86db4478
-	DD	0x81f3afca,0x81f3afca
-	DD	0x3ec468b9,0x3ec468b9
-	DD	0x2c342438,0x2c342438
-	DD	0x5f40a3c2,0x5f40a3c2
-	DD	0x72c31d16,0x72c31d16
-	DD	0x0c25e2bc,0x0c25e2bc
-	DD	0x8b493c28,0x8b493c28
-	DD	0x41950dff,0x41950dff
-	DD	0x7101a839,0x7101a839
-	DD	0xdeb30c08,0xdeb30c08
-	DD	0x9ce4b4d8,0x9ce4b4d8
-	DD	0x90c15664,0x90c15664
-	DD	0x6184cb7b,0x6184cb7b
-	DD	0x70b632d5,0x70b632d5
-	DD	0x745c6c48,0x745c6c48
-	DD	0x4257b8d0,0x4257b8d0
-DB	0x52,0x09,0x6a,0xd5,0x30,0x36,0xa5,0x38
-DB	0xbf,0x40,0xa3,0x9e,0x81,0xf3,0xd7,0xfb
-DB	0x7c,0xe3,0x39,0x82,0x9b,0x2f,0xff,0x87
-DB	0x34,0x8e,0x43,0x44,0xc4,0xde,0xe9,0xcb
-DB	0x54,0x7b,0x94,0x32,0xa6,0xc2,0x23,0x3d
-DB	0xee,0x4c,0x95,0x0b,0x42,0xfa,0xc3,0x4e
-DB	0x08,0x2e,0xa1,0x66,0x28,0xd9,0x24,0xb2
-DB	0x76,0x5b,0xa2,0x49,0x6d,0x8b,0xd1,0x25
-DB	0x72,0xf8,0xf6,0x64,0x86,0x68,0x98,0x16
-DB	0xd4,0xa4,0x5c,0xcc,0x5d,0x65,0xb6,0x92
-DB	0x6c,0x70,0x48,0x50,0xfd,0xed,0xb9,0xda
-DB	0x5e,0x15,0x46,0x57,0xa7,0x8d,0x9d,0x84
-DB	0x90,0xd8,0xab,0x00,0x8c,0xbc,0xd3,0x0a
-DB	0xf7,0xe4,0x58,0x05,0xb8,0xb3,0x45,0x06
-DB	0xd0,0x2c,0x1e,0x8f,0xca,0x3f,0x0f,0x02
-DB	0xc1,0xaf,0xbd,0x03,0x01,0x13,0x8a,0x6b
-DB	0x3a,0x91,0x11,0x41,0x4f,0x67,0xdc,0xea
-DB	0x97,0xf2,0xcf,0xce,0xf0,0xb4,0xe6,0x73
-DB	0x96,0xac,0x74,0x22,0xe7,0xad,0x35,0x85
-DB	0xe2,0xf9,0x37,0xe8,0x1c,0x75,0xdf,0x6e
-DB	0x47,0xf1,0x1a,0x71,0x1d,0x29,0xc5,0x89
-DB	0x6f,0xb7,0x62,0x0e,0xaa,0x18,0xbe,0x1b
-DB	0xfc,0x56,0x3e,0x4b,0xc6,0xd2,0x79,0x20
-DB	0x9a,0xdb,0xc0,0xfe,0x78,0xcd,0x5a,0xf4
-DB	0x1f,0xdd,0xa8,0x33,0x88,0x07,0xc7,0x31
-DB	0xb1,0x12,0x10,0x59,0x27,0x80,0xec,0x5f
-DB	0x60,0x51,0x7f,0xa9,0x19,0xb5,0x4a,0x0d
-DB	0x2d,0xe5,0x7a,0x9f,0x93,0xc9,0x9c,0xef
-DB	0xa0,0xe0,0x3b,0x4d,0xae,0x2a,0xf5,0xb0
-DB	0xc8,0xeb,0xbb,0x3c,0x83,0x53,0x99,0x61
-DB	0x17,0x2b,0x04,0x7e,0xba,0x77,0xd6,0x26
-DB	0xe1,0x69,0x14,0x63,0x55,0x21,0x0c,0x7d
-	DD	0x80808080,0x80808080,0xfefefefe,0xfefefefe
-	DD	0x1b1b1b1b,0x1b1b1b1b,0,0
-DB	0x52,0x09,0x6a,0xd5,0x30,0x36,0xa5,0x38
-DB	0xbf,0x40,0xa3,0x9e,0x81,0xf3,0xd7,0xfb
-DB	0x7c,0xe3,0x39,0x82,0x9b,0x2f,0xff,0x87
-DB	0x34,0x8e,0x43,0x44,0xc4,0xde,0xe9,0xcb
-DB	0x54,0x7b,0x94,0x32,0xa6,0xc2,0x23,0x3d
-DB	0xee,0x4c,0x95,0x0b,0x42,0xfa,0xc3,0x4e
-DB	0x08,0x2e,0xa1,0x66,0x28,0xd9,0x24,0xb2
-DB	0x76,0x5b,0xa2,0x49,0x6d,0x8b,0xd1,0x25
-DB	0x72,0xf8,0xf6,0x64,0x86,0x68,0x98,0x16
-DB	0xd4,0xa4,0x5c,0xcc,0x5d,0x65,0xb6,0x92
-DB	0x6c,0x70,0x48,0x50,0xfd,0xed,0xb9,0xda
-DB	0x5e,0x15,0x46,0x57,0xa7,0x8d,0x9d,0x84
-DB	0x90,0xd8,0xab,0x00,0x8c,0xbc,0xd3,0x0a
-DB	0xf7,0xe4,0x58,0x05,0xb8,0xb3,0x45,0x06
-DB	0xd0,0x2c,0x1e,0x8f,0xca,0x3f,0x0f,0x02
-DB	0xc1,0xaf,0xbd,0x03,0x01,0x13,0x8a,0x6b
-DB	0x3a,0x91,0x11,0x41,0x4f,0x67,0xdc,0xea
-DB	0x97,0xf2,0xcf,0xce,0xf0,0xb4,0xe6,0x73
-DB	0x96,0xac,0x74,0x22,0xe7,0xad,0x35,0x85
-DB	0xe2,0xf9,0x37,0xe8,0x1c,0x75,0xdf,0x6e
-DB	0x47,0xf1,0x1a,0x71,0x1d,0x29,0xc5,0x89
-DB	0x6f,0xb7,0x62,0x0e,0xaa,0x18,0xbe,0x1b
-DB	0xfc,0x56,0x3e,0x4b,0xc6,0xd2,0x79,0x20
-DB	0x9a,0xdb,0xc0,0xfe,0x78,0xcd,0x5a,0xf4
-DB	0x1f,0xdd,0xa8,0x33,0x88,0x07,0xc7,0x31
-DB	0xb1,0x12,0x10,0x59,0x27,0x80,0xec,0x5f
-DB	0x60,0x51,0x7f,0xa9,0x19,0xb5,0x4a,0x0d
-DB	0x2d,0xe5,0x7a,0x9f,0x93,0xc9,0x9c,0xef
-DB	0xa0,0xe0,0x3b,0x4d,0xae,0x2a,0xf5,0xb0
-DB	0xc8,0xeb,0xbb,0x3c,0x83,0x53,0x99,0x61
-DB	0x17,0x2b,0x04,0x7e,0xba,0x77,0xd6,0x26
-DB	0xe1,0x69,0x14,0x63,0x55,0x21,0x0c,0x7d
-	DD	0x80808080,0x80808080,0xfefefefe,0xfefefefe
-	DD	0x1b1b1b1b,0x1b1b1b1b,0,0
-DB	0x52,0x09,0x6a,0xd5,0x30,0x36,0xa5,0x38
-DB	0xbf,0x40,0xa3,0x9e,0x81,0xf3,0xd7,0xfb
-DB	0x7c,0xe3,0x39,0x82,0x9b,0x2f,0xff,0x87
-DB	0x34,0x8e,0x43,0x44,0xc4,0xde,0xe9,0xcb
-DB	0x54,0x7b,0x94,0x32,0xa6,0xc2,0x23,0x3d
-DB	0xee,0x4c,0x95,0x0b,0x42,0xfa,0xc3,0x4e
-DB	0x08,0x2e,0xa1,0x66,0x28,0xd9,0x24,0xb2
-DB	0x76,0x5b,0xa2,0x49,0x6d,0x8b,0xd1,0x25
-DB	0x72,0xf8,0xf6,0x64,0x86,0x68,0x98,0x16
-DB	0xd4,0xa4,0x5c,0xcc,0x5d,0x65,0xb6,0x92
-DB	0x6c,0x70,0x48,0x50,0xfd,0xed,0xb9,0xda
-DB	0x5e,0x15,0x46,0x57,0xa7,0x8d,0x9d,0x84
-DB	0x90,0xd8,0xab,0x00,0x8c,0xbc,0xd3,0x0a
-DB	0xf7,0xe4,0x58,0x05,0xb8,0xb3,0x45,0x06
-DB	0xd0,0x2c,0x1e,0x8f,0xca,0x3f,0x0f,0x02
-DB	0xc1,0xaf,0xbd,0x03,0x01,0x13,0x8a,0x6b
-DB	0x3a,0x91,0x11,0x41,0x4f,0x67,0xdc,0xea
-DB	0x97,0xf2,0xcf,0xce,0xf0,0xb4,0xe6,0x73
-DB	0x96,0xac,0x74,0x22,0xe7,0xad,0x35,0x85
-DB	0xe2,0xf9,0x37,0xe8,0x1c,0x75,0xdf,0x6e
-DB	0x47,0xf1,0x1a,0x71,0x1d,0x29,0xc5,0x89
-DB	0x6f,0xb7,0x62,0x0e,0xaa,0x18,0xbe,0x1b
-DB	0xfc,0x56,0x3e,0x4b,0xc6,0xd2,0x79,0x20
-DB	0x9a,0xdb,0xc0,0xfe,0x78,0xcd,0x5a,0xf4
-DB	0x1f,0xdd,0xa8,0x33,0x88,0x07,0xc7,0x31
-DB	0xb1,0x12,0x10,0x59,0x27,0x80,0xec,0x5f
-DB	0x60,0x51,0x7f,0xa9,0x19,0xb5,0x4a,0x0d
-DB	0x2d,0xe5,0x7a,0x9f,0x93,0xc9,0x9c,0xef
-DB	0xa0,0xe0,0x3b,0x4d,0xae,0x2a,0xf5,0xb0
-DB	0xc8,0xeb,0xbb,0x3c,0x83,0x53,0x99,0x61
-DB	0x17,0x2b,0x04,0x7e,0xba,0x77,0xd6,0x26
-DB	0xe1,0x69,0x14,0x63,0x55,0x21,0x0c,0x7d
-	DD	0x80808080,0x80808080,0xfefefefe,0xfefefefe
-	DD	0x1b1b1b1b,0x1b1b1b1b,0,0
-DB	0x52,0x09,0x6a,0xd5,0x30,0x36,0xa5,0x38
-DB	0xbf,0x40,0xa3,0x9e,0x81,0xf3,0xd7,0xfb
-DB	0x7c,0xe3,0x39,0x82,0x9b,0x2f,0xff,0x87
-DB	0x34,0x8e,0x43,0x44,0xc4,0xde,0xe9,0xcb
-DB	0x54,0x7b,0x94,0x32,0xa6,0xc2,0x23,0x3d
-DB	0xee,0x4c,0x95,0x0b,0x42,0xfa,0xc3,0x4e
-DB	0x08,0x2e,0xa1,0x66,0x28,0xd9,0x24,0xb2
-DB	0x76,0x5b,0xa2,0x49,0x6d,0x8b,0xd1,0x25
-DB	0x72,0xf8,0xf6,0x64,0x86,0x68,0x98,0x16
-DB	0xd4,0xa4,0x5c,0xcc,0x5d,0x65,0xb6,0x92
-DB	0x6c,0x70,0x48,0x50,0xfd,0xed,0xb9,0xda
-DB	0x5e,0x15,0x46,0x57,0xa7,0x8d,0x9d,0x84
-DB	0x90,0xd8,0xab,0x00,0x8c,0xbc,0xd3,0x0a
-DB	0xf7,0xe4,0x58,0x05,0xb8,0xb3,0x45,0x06
-DB	0xd0,0x2c,0x1e,0x8f,0xca,0x3f,0x0f,0x02
-DB	0xc1,0xaf,0xbd,0x03,0x01,0x13,0x8a,0x6b
-DB	0x3a,0x91,0x11,0x41,0x4f,0x67,0xdc,0xea
-DB	0x97,0xf2,0xcf,0xce,0xf0,0xb4,0xe6,0x73
-DB	0x96,0xac,0x74,0x22,0xe7,0xad,0x35,0x85
-DB	0xe2,0xf9,0x37,0xe8,0x1c,0x75,0xdf,0x6e
-DB	0x47,0xf1,0x1a,0x71,0x1d,0x29,0xc5,0x89
-DB	0x6f,0xb7,0x62,0x0e,0xaa,0x18,0xbe,0x1b
-DB	0xfc,0x56,0x3e,0x4b,0xc6,0xd2,0x79,0x20
-DB	0x9a,0xdb,0xc0,0xfe,0x78,0xcd,0x5a,0xf4
-DB	0x1f,0xdd,0xa8,0x33,0x88,0x07,0xc7,0x31
-DB	0xb1,0x12,0x10,0x59,0x27,0x80,0xec,0x5f
-DB	0x60,0x51,0x7f,0xa9,0x19,0xb5,0x4a,0x0d
-DB	0x2d,0xe5,0x7a,0x9f,0x93,0xc9,0x9c,0xef
-DB	0xa0,0xe0,0x3b,0x4d,0xae,0x2a,0xf5,0xb0
-DB	0xc8,0xeb,0xbb,0x3c,0x83,0x53,0x99,0x61
-DB	0x17,0x2b,0x04,0x7e,0xba,0x77,0xd6,0x26
-DB	0xe1,0x69,0x14,0x63,0x55,0x21,0x0c,0x7d
-	DD	0x80808080,0x80808080,0xfefefefe,0xfefefefe
-	DD	0x1b1b1b1b,0x1b1b1b1b,0,0
-DB	65,69,83,32,102,111,114,32,120,56,54,95,54,52,44,32
-DB	67,82,89,80,84,79,71,65,77,83,32,98,121,32,60,97
-DB	112,112,114,111,64,111,112,101,110,115,115,108,46,111,114,103
-DB	62,0
-ALIGN	64
-EXTERN	__imp_RtlVirtualUnwind
-
-ALIGN	16
-block_se_handler:
-	push	rsi
-	push	rdi
-	push	rbx
-	push	rbp
-	push	r12
-	push	r13
-	push	r14
-	push	r15
-	pushfq
-	sub	rsp,64
-
-	mov	rax,QWORD[120+r8]
-	mov	rbx,QWORD[248+r8]
-
-	mov	rsi,QWORD[8+r9]
-	mov	r11,QWORD[56+r9]
-
-	mov	r10d,DWORD[r11]
-	lea	r10,[r10*1+rsi]
-	cmp	rbx,r10
-	jb	NEAR $L$in_block_prologue
-
-	mov	rax,QWORD[152+r8]
-
-	mov	r10d,DWORD[4+r11]
-	lea	r10,[r10*1+rsi]
-	cmp	rbx,r10
-	jae	NEAR $L$in_block_prologue
-
-	mov	rax,QWORD[24+rax]
-
-	mov	rbx,QWORD[((-8))+rax]
-	mov	rbp,QWORD[((-16))+rax]
-	mov	r12,QWORD[((-24))+rax]
-	mov	r13,QWORD[((-32))+rax]
-	mov	r14,QWORD[((-40))+rax]
-	mov	r15,QWORD[((-48))+rax]
-	mov	QWORD[144+r8],rbx
-	mov	QWORD[160+r8],rbp
-	mov	QWORD[216+r8],r12
-	mov	QWORD[224+r8],r13
-	mov	QWORD[232+r8],r14
-	mov	QWORD[240+r8],r15
-
-$L$in_block_prologue:
-	mov	rdi,QWORD[8+rax]
-	mov	rsi,QWORD[16+rax]
-	mov	QWORD[152+r8],rax
-	mov	QWORD[168+r8],rsi
-	mov	QWORD[176+r8],rdi
-
-	jmp	NEAR $L$common_seh_exit
-
-
-
-ALIGN	16
-key_se_handler:
-	push	rsi
-	push	rdi
-	push	rbx
-	push	rbp
-	push	r12
-	push	r13
-	push	r14
-	push	r15
-	pushfq
-	sub	rsp,64
-
-	mov	rax,QWORD[120+r8]
-	mov	rbx,QWORD[248+r8]
-
-	mov	rsi,QWORD[8+r9]
-	mov	r11,QWORD[56+r9]
-
-	mov	r10d,DWORD[r11]
-	lea	r10,[r10*1+rsi]
-	cmp	rbx,r10
-	jb	NEAR $L$in_key_prologue
-
-	mov	rax,QWORD[152+r8]
-
-	mov	r10d,DWORD[4+r11]
-	lea	r10,[r10*1+rsi]
-	cmp	rbx,r10
-	jae	NEAR $L$in_key_prologue
-
-	lea	rax,[56+rax]
-
-	mov	rbx,QWORD[((-8))+rax]
-	mov	rbp,QWORD[((-16))+rax]
-	mov	r12,QWORD[((-24))+rax]
-	mov	r13,QWORD[((-32))+rax]
-	mov	r14,QWORD[((-40))+rax]
-	mov	r15,QWORD[((-48))+rax]
-	mov	QWORD[144+r8],rbx
-	mov	QWORD[160+r8],rbp
-	mov	QWORD[216+r8],r12
-	mov	QWORD[224+r8],r13
-	mov	QWORD[232+r8],r14
-	mov	QWORD[240+r8],r15
-
-$L$in_key_prologue:
-	mov	rdi,QWORD[8+rax]
-	mov	rsi,QWORD[16+rax]
-	mov	QWORD[152+r8],rax
-	mov	QWORD[168+r8],rsi
-	mov	QWORD[176+r8],rdi
-
-	jmp	NEAR $L$common_seh_exit
-
-
-
-ALIGN	16
-cbc_se_handler:
-	push	rsi
-	push	rdi
-	push	rbx
-	push	rbp
-	push	r12
-	push	r13
-	push	r14
-	push	r15
-	pushfq
-	sub	rsp,64
-
-	mov	rax,QWORD[120+r8]
-	mov	rbx,QWORD[248+r8]
-
-	lea	r10,[$L$cbc_prologue]
-	cmp	rbx,r10
-	jb	NEAR $L$in_cbc_prologue
-
-	lea	r10,[$L$cbc_fast_body]
-	cmp	rbx,r10
-	jb	NEAR $L$in_cbc_frame_setup
-
-	lea	r10,[$L$cbc_slow_prologue]
-	cmp	rbx,r10
-	jb	NEAR $L$in_cbc_body
-
-	lea	r10,[$L$cbc_slow_body]
-	cmp	rbx,r10
-	jb	NEAR $L$in_cbc_frame_setup
-
-$L$in_cbc_body:
-	mov	rax,QWORD[152+r8]
-
-	lea	r10,[$L$cbc_epilogue]
-	cmp	rbx,r10
-	jae	NEAR $L$in_cbc_prologue
-
-	lea	rax,[8+rax]
-
-	lea	r10,[$L$cbc_popfq]
-	cmp	rbx,r10
-	jae	NEAR $L$in_cbc_prologue
-
-	mov	rax,QWORD[8+rax]
-	lea	rax,[56+rax]
-
-$L$in_cbc_frame_setup:
-	mov	rbx,QWORD[((-16))+rax]
-	mov	rbp,QWORD[((-24))+rax]
-	mov	r12,QWORD[((-32))+rax]
-	mov	r13,QWORD[((-40))+rax]
-	mov	r14,QWORD[((-48))+rax]
-	mov	r15,QWORD[((-56))+rax]
-	mov	QWORD[144+r8],rbx
-	mov	QWORD[160+r8],rbp
-	mov	QWORD[216+r8],r12
-	mov	QWORD[224+r8],r13
-	mov	QWORD[232+r8],r14
-	mov	QWORD[240+r8],r15
-
-$L$in_cbc_prologue:
-	mov	rdi,QWORD[8+rax]
-	mov	rsi,QWORD[16+rax]
-	mov	QWORD[152+r8],rax
-	mov	QWORD[168+r8],rsi
-	mov	QWORD[176+r8],rdi
-
-$L$common_seh_exit:
-
-	mov	rdi,QWORD[40+r9]
-	mov	rsi,r8
-	mov	ecx,154
-	DD	0xa548f3fc
-
-	mov	rsi,r9
-	xor	rcx,rcx
-	mov	rdx,QWORD[8+rsi]
-	mov	r8,QWORD[rsi]
-	mov	r9,QWORD[16+rsi]
-	mov	r10,QWORD[40+rsi]
-	lea	r11,[56+rsi]
-	lea	r12,[24+rsi]
-	mov	QWORD[32+rsp],r10
-	mov	QWORD[40+rsp],r11
-	mov	QWORD[48+rsp],r12
-	mov	QWORD[56+rsp],rcx
-	call	QWORD[__imp_RtlVirtualUnwind]
-
-	mov	eax,1
-	add	rsp,64
-	popfq
-	pop	r15
-	pop	r14
-	pop	r13
-	pop	r12
-	pop	rbp
-	pop	rbx
-	pop	rdi
-	pop	rsi
-	DB	0F3h,0C3h		;repret
-
-
-section	.pdata rdata align=4
-ALIGN	4
-	DD	$L$SEH_begin_AES_encrypt wrt ..imagebase
-	DD	$L$SEH_end_AES_encrypt wrt ..imagebase
-	DD	$L$SEH_info_AES_encrypt wrt ..imagebase
-
-	DD	$L$SEH_begin_AES_decrypt wrt ..imagebase
-	DD	$L$SEH_end_AES_decrypt wrt ..imagebase
-	DD	$L$SEH_info_AES_decrypt wrt ..imagebase
-
-	DD	$L$SEH_begin_AES_set_encrypt_key wrt ..imagebase
-	DD	$L$SEH_end_AES_set_encrypt_key wrt ..imagebase
-	DD	$L$SEH_info_AES_set_encrypt_key wrt ..imagebase
-
-	DD	$L$SEH_begin_AES_set_decrypt_key wrt ..imagebase
-	DD	$L$SEH_end_AES_set_decrypt_key wrt ..imagebase
-	DD	$L$SEH_info_AES_set_decrypt_key wrt ..imagebase
-
-	DD	$L$SEH_begin_AES_cbc_encrypt wrt ..imagebase
-	DD	$L$SEH_end_AES_cbc_encrypt wrt ..imagebase
-	DD	$L$SEH_info_AES_cbc_encrypt wrt ..imagebase
-
-section	.xdata rdata align=8
-ALIGN	8
-$L$SEH_info_AES_encrypt:
-DB	9,0,0,0
-	DD	block_se_handler wrt ..imagebase
-	DD	$L$enc_prologue wrt ..imagebase,$L$enc_epilogue wrt ..imagebase
-$L$SEH_info_AES_decrypt:
-DB	9,0,0,0
-	DD	block_se_handler wrt ..imagebase
-	DD	$L$dec_prologue wrt ..imagebase,$L$dec_epilogue wrt ..imagebase
-$L$SEH_info_AES_set_encrypt_key:
-DB	9,0,0,0
-	DD	key_se_handler wrt ..imagebase
-	DD	$L$enc_key_prologue wrt ..imagebase,$L$enc_key_epilogue wrt ..imagebase
-$L$SEH_info_AES_set_decrypt_key:
-DB	9,0,0,0
-	DD	key_se_handler wrt ..imagebase
-	DD	$L$dec_key_prologue wrt ..imagebase,$L$dec_key_epilogue wrt ..imagebase
-$L$SEH_info_AES_cbc_encrypt:
-DB	9,0,0,0
-	DD	cbc_se_handler wrt ..imagebase
diff --git a/deps/openssl/config/archs/VC-WIN64A/asm_avx2/crypto/aes/aesni-sha1-x86_64.asm b/deps/openssl/config/archs/VC-WIN64A/asm_avx2/crypto/aes/aesni-sha1-x86_64.asm
index 925d1be94a..ac71215c45 100644
--- a/deps/openssl/config/archs/VC-WIN64A/asm_avx2/crypto/aes/aesni-sha1-x86_64.asm
+++ b/deps/openssl/config/archs/VC-WIN64A/asm_avx2/crypto/aes/aesni-sha1-x86_64.asm
@@ -11,6 +11,7 @@ global	aesni_cbc_sha1_enc
 ALIGN	32
 aesni_cbc_sha1_enc:
 
+
 	mov	r10d,DWORD[((OPENSSL_ia32cap_P+0))]
 	mov	r11,QWORD[((OPENSSL_ia32cap_P+4))]
 	bt	r11,61
@@ -24,6 +25,7 @@ aesni_cbc_sha1_enc:
 	DB	0F3h,0C3h		;repret
 
 
+
 ALIGN	32
 aesni_cbc_sha1_enc_ssse3:
 	mov	QWORD[8+rsp],rdi	;WIN64 prologue
@@ -2809,6 +2811,7 @@ $L$SEH_begin_aesni_cbc_sha1_enc_shaext:
 	mov	r9,QWORD[48+rsp]
 
 
+
 	mov	r10,QWORD[56+rsp]
 	lea	rsp,[((-168))+rsp]
 	movaps	XMMWORD[(-8-160)+rax],xmm6
@@ -3133,6 +3136,7 @@ $L$epilogue_shaext:
 	mov	rdi,QWORD[8+rsp]	;WIN64 epilogue
 	mov	rsi,QWORD[16+rsp]
 	DB	0F3h,0C3h		;repret
+
 $L$SEH_end_aesni_cbc_sha1_enc_shaext:
 EXTERN	__imp_RtlVirtualUnwind
 
diff --git a/deps/openssl/config/archs/VC-WIN64A/asm_avx2/crypto/aes/aesni-sha256-x86_64.asm b/deps/openssl/config/archs/VC-WIN64A/asm_avx2/crypto/aes/aesni-sha256-x86_64.asm
index b5d50c74db..17e571d38b 100644
--- a/deps/openssl/config/archs/VC-WIN64A/asm_avx2/crypto/aes/aesni-sha256-x86_64.asm
+++ b/deps/openssl/config/archs/VC-WIN64A/asm_avx2/crypto/aes/aesni-sha256-x86_64.asm
@@ -10,6 +10,7 @@ global	aesni_cbc_sha256_enc
 
 ALIGN	16
 aesni_cbc_sha256_enc:
+
 	lea	r11,[OPENSSL_ia32cap_P]
 	mov	eax,1
 	cmp	rcx,0
@@ -37,6 +38,7 @@ $L$probe:
 	DB	0F3h,0C3h		;repret
 
 
+
 ALIGN	64
 
 K256:
@@ -4128,23 +4130,25 @@ $L$ower_avx2:
 	jbe	NEAR $L$oop_avx2
 	lea	rbp,[rsp]
 
+
+
+
 $L$done_avx2:
-	lea	rsp,[rbp]
-	mov	r8,QWORD[((64+32))+rsp]
-	mov	rsi,QWORD[120+rsp]
+	mov	r8,QWORD[((64+32))+rbp]
+	mov	rsi,QWORD[((64+56))+rbp]
 
 	vmovdqu	XMMWORD[r8],xmm8
 	vzeroall
-	movaps	xmm6,XMMWORD[128+rsp]
-	movaps	xmm7,XMMWORD[144+rsp]
-	movaps	xmm8,XMMWORD[160+rsp]
-	movaps	xmm9,XMMWORD[176+rsp]
-	movaps	xmm10,XMMWORD[192+rsp]
-	movaps	xmm11,XMMWORD[208+rsp]
-	movaps	xmm12,XMMWORD[224+rsp]
-	movaps	xmm13,XMMWORD[240+rsp]
-	movaps	xmm14,XMMWORD[256+rsp]
-	movaps	xmm15,XMMWORD[272+rsp]
+	movaps	xmm6,XMMWORD[128+rbp]
+	movaps	xmm7,XMMWORD[144+rbp]
+	movaps	xmm8,XMMWORD[160+rbp]
+	movaps	xmm9,XMMWORD[176+rbp]
+	movaps	xmm10,XMMWORD[192+rbp]
+	movaps	xmm11,XMMWORD[208+rbp]
+	movaps	xmm12,XMMWORD[224+rbp]
+	movaps	xmm13,XMMWORD[240+rbp]
+	movaps	xmm14,XMMWORD[256+rbp]
+	movaps	xmm15,XMMWORD[272+rbp]
 	mov	r15,QWORD[((-48))+rsi]
 
 	mov	r14,QWORD[((-40))+rsi]
@@ -4180,6 +4184,7 @@ $L$SEH_begin_aesni_cbc_sha256_enc_shaext:
 	mov	r9,QWORD[48+rsp]
 
 
+
 	mov	r10,QWORD[56+rsp]
 	lea	rsp,[((-168))+rsp]
 	movaps	XMMWORD[(-8-160)+rax],xmm6
@@ -4555,6 +4560,7 @@ $L$epilogue_shaext:
 	mov	rdi,QWORD[8+rsp]	;WIN64 epilogue
 	mov	rsi,QWORD[16+rsp]
 	DB	0F3h,0C3h		;repret
+
 $L$SEH_end_aesni_cbc_sha256_enc_shaext:
 EXTERN	__imp_RtlVirtualUnwind
 
diff --git a/deps/openssl/config/archs/VC-WIN64A/asm_avx2/crypto/aes/aesni-x86_64.asm b/deps/openssl/config/archs/VC-WIN64A/asm_avx2/crypto/aes/aesni-x86_64.asm
index 823ba771d0..f6027245a3 100644
--- a/deps/openssl/config/archs/VC-WIN64A/asm_avx2/crypto/aes/aesni-x86_64.asm
+++ b/deps/openssl/config/archs/VC-WIN64A/asm_avx2/crypto/aes/aesni-x86_64.asm
@@ -907,6 +907,7 @@ $L$SEH_begin_aesni_ccm64_encrypt_blocks:
 	mov	r9,QWORD[48+rsp]
 
 
+
 	lea	rsp,[((-88))+rsp]
 	movaps	XMMWORD[rsp],xmm6
 	movaps	XMMWORD[16+rsp],xmm7
@@ -983,6 +984,7 @@ $L$ccm64_enc_ret:
 	mov	rdi,QWORD[8+rsp]	;WIN64 epilogue
 	mov	rsi,QWORD[16+rsp]
 	DB	0F3h,0C3h		;repret
+
 $L$SEH_end_aesni_ccm64_encrypt_blocks:
 global	aesni_ccm64_decrypt_blocks
 
@@ -1000,6 +1002,7 @@ $L$SEH_begin_aesni_ccm64_decrypt_blocks:
 	mov	r9,QWORD[48+rsp]
 
 
+
 	lea	rsp,[((-88))+rsp]
 	movaps	XMMWORD[rsp],xmm6
 	movaps	XMMWORD[16+rsp],xmm7
@@ -1110,6 +1113,7 @@ $L$ccm64_dec_ret:
 	mov	rdi,QWORD[8+rsp]	;WIN64 epilogue
 	mov	rsi,QWORD[16+rsp]
 	DB	0F3h,0C3h		;repret
+
 $L$SEH_end_aesni_ccm64_decrypt_blocks:
 global	aesni_ctr32_encrypt_blocks
 
@@ -3019,6 +3023,7 @@ $L$SEH_end_aesni_ocb_encrypt:
 
 ALIGN	32
 __ocb_encrypt6:
+
 	pxor	xmm15,xmm9
 	movdqu	xmm11,XMMWORD[r12*1+rbx]
 	movdqa	xmm12,xmm10
@@ -3119,8 +3124,10 @@ DB	102,65,15,56,221,255
 
 
 
+
 ALIGN	32
 __ocb_encrypt4:
+
 	pxor	xmm15,xmm9
 	movdqu	xmm11,XMMWORD[r12*1+rbx]
 	movdqa	xmm12,xmm10
@@ -3188,8 +3195,10 @@ DB	102,65,15,56,221,237
 
 
 
+
 ALIGN	32
 __ocb_encrypt1:
+
 	pxor	xmm7,xmm15
 	pxor	xmm7,xmm9
 	pxor	xmm8,xmm2
@@ -3222,6 +3231,7 @@ DB	102,15,56,221,215
 	DB	0F3h,0C3h		;repret
 
 
+
 global	aesni_ocb_decrypt
 
 ALIGN	32
@@ -3493,6 +3503,7 @@ $L$SEH_end_aesni_ocb_decrypt:
 
 ALIGN	32
 __ocb_decrypt6:
+
 	pxor	xmm15,xmm9
 	movdqu	xmm11,XMMWORD[r12*1+rbx]
 	movdqa	xmm12,xmm10
@@ -3587,8 +3598,10 @@ DB	102,65,15,56,223,255
 
 
 
+
 ALIGN	32
 __ocb_decrypt4:
+
 	pxor	xmm15,xmm9
 	movdqu	xmm11,XMMWORD[r12*1+rbx]
 	movdqa	xmm12,xmm10
@@ -3652,8 +3665,10 @@ DB	102,65,15,56,223,237
 
 
 
+
 ALIGN	32
 __ocb_decrypt1:
+
 	pxor	xmm7,xmm15
 	pxor	xmm7,xmm9
 	pxor	xmm2,xmm7
@@ -3684,6 +3699,7 @@ DB	102,15,56,222,209
 DB	102,15,56,223,215
 	DB	0F3h,0C3h		;repret
 
+
 global	aesni_cbc_encrypt
 
 ALIGN	16
@@ -4662,7 +4678,6 @@ $L$enc_key_ret:
 	add	rsp,8
 
 	DB	0F3h,0C3h		;repret
-
 $L$SEH_end_set_encrypt_key:
 
 ALIGN	16
@@ -4735,6 +4750,7 @@ $L$key_expansion_256b:
 	DB	0F3h,0C3h		;repret
 
 
+
 ALIGN	64
 $L$bswap_mask:
 DB	15,14,13,12,11,10,9,8,7,6,5,4,3,2,1,0
diff --git a/deps/openssl/config/archs/VC-WIN64A/asm_avx2/crypto/aes/bsaes-x86_64.asm b/deps/openssl/config/archs/VC-WIN64A/asm_avx2/crypto/aes/bsaes-x86_64.asm
deleted file mode 100644
index 7cccb6a469..0000000000
--- a/deps/openssl/config/archs/VC-WIN64A/asm_avx2/crypto/aes/bsaes-x86_64.asm
+++ /dev/null
@@ -1,2821 +0,0 @@
-default	rel
-%define XMMWORD
-%define YMMWORD
-%define ZMMWORD
-section	.text code align=64
-
-
-EXTERN	asm_AES_encrypt
-EXTERN	asm_AES_decrypt
-
-
-ALIGN	64
-_bsaes_encrypt8:
-
-	lea	r11,[$L$BS0]
-
-	movdqa	xmm8,XMMWORD[rax]
-	lea	rax,[16+rax]
-	movdqa	xmm7,XMMWORD[80+r11]
-	pxor	xmm15,xmm8
-	pxor	xmm0,xmm8
-	pxor	xmm1,xmm8
-	pxor	xmm2,xmm8
-DB	102,68,15,56,0,255
-DB	102,15,56,0,199
-	pxor	xmm3,xmm8
-	pxor	xmm4,xmm8
-DB	102,15,56,0,207
-DB	102,15,56,0,215
-	pxor	xmm5,xmm8
-	pxor	xmm6,xmm8
-DB	102,15,56,0,223
-DB	102,15,56,0,231
-DB	102,15,56,0,239
-DB	102,15,56,0,247
-_bsaes_encrypt8_bitslice:
-	movdqa	xmm7,XMMWORD[r11]
-	movdqa	xmm8,XMMWORD[16+r11]
-	movdqa	xmm9,xmm5
-	psrlq	xmm5,1
-	movdqa	xmm10,xmm3
-	psrlq	xmm3,1
-	pxor	xmm5,xmm6
-	pxor	xmm3,xmm4
-	pand	xmm5,xmm7
-	pand	xmm3,xmm7
-	pxor	xmm6,xmm5
-	psllq	xmm5,1
-	pxor	xmm4,xmm3
-	psllq	xmm3,1
-	pxor	xmm5,xmm9
-	pxor	xmm3,xmm10
-	movdqa	xmm9,xmm1
-	psrlq	xmm1,1
-	movdqa	xmm10,xmm15
-	psrlq	xmm15,1
-	pxor	xmm1,xmm2
-	pxor	xmm15,xmm0
-	pand	xmm1,xmm7
-	pand	xmm15,xmm7
-	pxor	xmm2,xmm1
-	psllq	xmm1,1
-	pxor	xmm0,xmm15
-	psllq	xmm15,1
-	pxor	xmm1,xmm9
-	pxor	xmm15,xmm10
-	movdqa	xmm7,XMMWORD[32+r11]
-	movdqa	xmm9,xmm4
-	psrlq	xmm4,2
-	movdqa	xmm10,xmm3
-	psrlq	xmm3,2
-	pxor	xmm4,xmm6
-	pxor	xmm3,xmm5
-	pand	xmm4,xmm8
-	pand	xmm3,xmm8
-	pxor	xmm6,xmm4
-	psllq	xmm4,2
-	pxor	xmm5,xmm3
-	psllq	xmm3,2
-	pxor	xmm4,xmm9
-	pxor	xmm3,xmm10
-	movdqa	xmm9,xmm0
-	psrlq	xmm0,2
-	movdqa	xmm10,xmm15
-	psrlq	xmm15,2
-	pxor	xmm0,xmm2
-	pxor	xmm15,xmm1
-	pand	xmm0,xmm8
-	pand	xmm15,xmm8
-	pxor	xmm2,xmm0
-	psllq	xmm0,2
-	pxor	xmm1,xmm15
-	psllq	xmm15,2
-	pxor	xmm0,xmm9
-	pxor	xmm15,xmm10
-	movdqa	xmm9,xmm2
-	psrlq	xmm2,4
-	movdqa	xmm10,xmm1
-	psrlq	xmm1,4
-	pxor	xmm2,xmm6
-	pxor	xmm1,xmm5
-	pand	xmm2,xmm7
-	pand	xmm1,xmm7
-	pxor	xmm6,xmm2
-	psllq	xmm2,4
-	pxor	xmm5,xmm1
-	psllq	xmm1,4
-	pxor	xmm2,xmm9
-	pxor	xmm1,xmm10
-	movdqa	xmm9,xmm0
-	psrlq	xmm0,4
-	movdqa	xmm10,xmm15
-	psrlq	xmm15,4
-	pxor	xmm0,xmm4
-	pxor	xmm15,xmm3
-	pand	xmm0,xmm7
-	pand	xmm15,xmm7
-	pxor	xmm4,xmm0
-	psllq	xmm0,4
-	pxor	xmm3,xmm15
-	psllq	xmm15,4
-	pxor	xmm0,xmm9
-	pxor	xmm15,xmm10
-	dec	r10d
-	jmp	NEAR $L$enc_sbox
-ALIGN	16
-$L$enc_loop:
-	pxor	xmm15,XMMWORD[rax]
-	pxor	xmm0,XMMWORD[16+rax]
-	pxor	xmm1,XMMWORD[32+rax]
-	pxor	xmm2,XMMWORD[48+rax]
-DB	102,68,15,56,0,255
-DB	102,15,56,0,199
-	pxor	xmm3,XMMWORD[64+rax]
-	pxor	xmm4,XMMWORD[80+rax]
-DB	102,15,56,0,207
-DB	102,15,56,0,215
-	pxor	xmm5,XMMWORD[96+rax]
-	pxor	xmm6,XMMWORD[112+rax]
-DB	102,15,56,0,223
-DB	102,15,56,0,231
-DB	102,15,56,0,239
-DB	102,15,56,0,247
-	lea	rax,[128+rax]
-$L$enc_sbox:
-	pxor	xmm4,xmm5
-	pxor	xmm1,xmm0
-	pxor	xmm2,xmm15
-	pxor	xmm5,xmm1
-	pxor	xmm4,xmm15
-
-	pxor	xmm5,xmm2
-	pxor	xmm2,xmm6
-	pxor	xmm6,xmm4
-	pxor	xmm2,xmm3
-	pxor	xmm3,xmm4
-	pxor	xmm2,xmm0
-
-	pxor	xmm1,xmm6
-	pxor	xmm0,xmm4
-	movdqa	xmm10,xmm6
-	movdqa	xmm9,xmm0
-	movdqa	xmm8,xmm4
-	movdqa	xmm12,xmm1
-	movdqa	xmm11,xmm5
-
-	pxor	xmm10,xmm3
-	pxor	xmm9,xmm1
-	pxor	xmm8,xmm2
-	movdqa	xmm13,xmm10
-	pxor	xmm12,xmm3
-	movdqa	xmm7,xmm9
-	pxor	xmm11,xmm15
-	movdqa	xmm14,xmm10
-
-	por	xmm9,xmm8
-	por	xmm10,xmm11
-	pxor	xmm14,xmm7
-	pand	xmm13,xmm11
-	pxor	xmm11,xmm8
-	pand	xmm7,xmm8
-	pand	xmm14,xmm11
-	movdqa	xmm11,xmm2
-	pxor	xmm11,xmm15
-	pand	xmm12,xmm11
-	pxor	xmm10,xmm12
-	pxor	xmm9,xmm12
-	movdqa	xmm12,xmm6
-	movdqa	xmm11,xmm4
-	pxor	xmm12,xmm0
-	pxor	xmm11,xmm5
-	movdqa	xmm8,xmm12
-	pand	xmm12,xmm11
-	por	xmm8,xmm11
-	pxor	xmm7,xmm12
-	pxor	xmm10,xmm14
-	pxor	xmm9,xmm13
-	pxor	xmm8,xmm14
-	movdqa	xmm11,xmm1
-	pxor	xmm7,xmm13
-	movdqa	xmm12,xmm3
-	pxor	xmm8,xmm13
-	movdqa	xmm13,xmm0
-	pand	xmm11,xmm2
-	movdqa	xmm14,xmm6
-	pand	xmm12,xmm15
-	pand	xmm13,xmm4
-	por	xmm14,xmm5
-	pxor	xmm10,xmm11
-	pxor	xmm9,xmm12
-	pxor	xmm8,xmm13
-	pxor	xmm7,xmm14
-
-
-
-
-
-	movdqa	xmm11,xmm10
-	pand	xmm10,xmm8
-	pxor	xmm11,xmm9
-
-	movdqa	xmm13,xmm7
-	movdqa	xmm14,xmm11
-	pxor	xmm13,xmm10
-	pand	xmm14,xmm13
-
-	movdqa	xmm12,xmm8
-	pxor	xmm14,xmm9
-	pxor	xmm12,xmm7
-
-	pxor	xmm10,xmm9
-
-	pand	xmm12,xmm10
-
-	movdqa	xmm9,xmm13
-	pxor	xmm12,xmm7
-
-	pxor	xmm9,xmm12
-	pxor	xmm8,xmm12
-
-	pand	xmm9,xmm7
-
-	pxor	xmm13,xmm9
-	pxor	xmm8,xmm9
-
-	pand	xmm13,xmm14
-
-	pxor	xmm13,xmm11
-	movdqa	xmm11,xmm5
-	movdqa	xmm7,xmm4
-	movdqa	xmm9,xmm14
-	pxor	xmm9,xmm13
-	pand	xmm9,xmm5
-	pxor	xmm5,xmm4
-	pand	xmm4,xmm14
-	pand	xmm5,xmm13
-	pxor	xmm5,xmm4
-	pxor	xmm4,xmm9
-	pxor	xmm11,xmm15
-	pxor	xmm7,xmm2
-	pxor	xmm14,xmm12
-	pxor	xmm13,xmm8
-	movdqa	xmm10,xmm14
-	movdqa	xmm9,xmm12
-	pxor	xmm10,xmm13
-	pxor	xmm9,xmm8
-	pand	xmm10,xmm11
-	pand	xmm9,xmm15
-	pxor	xmm11,xmm7
-	pxor	xmm15,xmm2
-	pand	xmm7,xmm14
-	pand	xmm2,xmm12
-	pand	xmm11,xmm13
-	pand	xmm15,xmm8
-	pxor	xmm7,xmm11
-	pxor	xmm15,xmm2
-	pxor	xmm11,xmm10
-	pxor	xmm2,xmm9
-	pxor	xmm5,xmm11
-	pxor	xmm15,xmm11
-	pxor	xmm4,xmm7
-	pxor	xmm2,xmm7
-
-	movdqa	xmm11,xmm6
-	movdqa	xmm7,xmm0
-	pxor	xmm11,xmm3
-	pxor	xmm7,xmm1
-	movdqa	xmm10,xmm14
-	movdqa	xmm9,xmm12
-	pxor	xmm10,xmm13
-	pxor	xmm9,xmm8
-	pand	xmm10,xmm11
-	pand	xmm9,xmm3
-	pxor	xmm11,xmm7
-	pxor	xmm3,xmm1
-	pand	xmm7,xmm14
-	pand	xmm1,xmm12
-	pand	xmm11,xmm13
-	pand	xmm3,xmm8
-	pxor	xmm7,xmm11
-	pxor	xmm3,xmm1
-	pxor	xmm11,xmm10
-	pxor	xmm1,xmm9
-	pxor	xmm14,xmm12
-	pxor	xmm13,xmm8
-	movdqa	xmm10,xmm14
-	pxor	xmm10,xmm13
-	pand	xmm10,xmm6
-	pxor	xmm6,xmm0
-	pand	xmm0,xmm14
-	pand	xmm6,xmm13
-	pxor	xmm6,xmm0
-	pxor	xmm0,xmm10
-	pxor	xmm6,xmm11
-	pxor	xmm3,xmm11
-	pxor	xmm0,xmm7
-	pxor	xmm1,xmm7
-	pxor	xmm6,xmm15
-	pxor	xmm0,xmm5
-	pxor	xmm3,xmm6
-	pxor	xmm5,xmm15
-	pxor	xmm15,xmm0
-
-	pxor	xmm0,xmm4
-	pxor	xmm4,xmm1
-	pxor	xmm1,xmm2
-	pxor	xmm2,xmm4
-	pxor	xmm3,xmm4
-
-	pxor	xmm5,xmm2
-	dec	r10d
-	jl	NEAR $L$enc_done
-	pshufd	xmm7,xmm15,0x93
-	pshufd	xmm8,xmm0,0x93
-	pxor	xmm15,xmm7
-	pshufd	xmm9,xmm3,0x93
-	pxor	xmm0,xmm8
-	pshufd	xmm10,xmm5,0x93
-	pxor	xmm3,xmm9
-	pshufd	xmm11,xmm2,0x93
-	pxor	xmm5,xmm10
-	pshufd	xmm12,xmm6,0x93
-	pxor	xmm2,xmm11
-	pshufd	xmm13,xmm1,0x93
-	pxor	xmm6,xmm12
-	pshufd	xmm14,xmm4,0x93
-	pxor	xmm1,xmm13
-	pxor	xmm4,xmm14
-
-	pxor	xmm8,xmm15
-	pxor	xmm7,xmm4
-	pxor	xmm8,xmm4
-	pshufd	xmm15,xmm15,0x4E
-	pxor	xmm9,xmm0
-	pshufd	xmm0,xmm0,0x4E
-	pxor	xmm12,xmm2
-	pxor	xmm15,xmm7
-	pxor	xmm13,xmm6
-	pxor	xmm0,xmm8
-	pxor	xmm11,xmm5
-	pshufd	xmm7,xmm2,0x4E
-	pxor	xmm14,xmm1
-	pshufd	xmm8,xmm6,0x4E
-	pxor	xmm10,xmm3
-	pshufd	xmm2,xmm5,0x4E
-	pxor	xmm10,xmm4
-	pshufd	xmm6,xmm4,0x4E
-	pxor	xmm11,xmm4
-	pshufd	xmm5,xmm1,0x4E
-	pxor	xmm7,xmm11
-	pshufd	xmm1,xmm3,0x4E
-	pxor	xmm8,xmm12
-	pxor	xmm2,xmm10
-	pxor	xmm6,xmm14
-	pxor	xmm5,xmm13
-	movdqa	xmm3,xmm7
-	pxor	xmm1,xmm9
-	movdqa	xmm4,xmm8
-	movdqa	xmm7,XMMWORD[48+r11]
-	jnz	NEAR $L$enc_loop
-	movdqa	xmm7,XMMWORD[64+r11]
-	jmp	NEAR $L$enc_loop
-ALIGN	16
-$L$enc_done:
-	movdqa	xmm7,XMMWORD[r11]
-	movdqa	xmm8,XMMWORD[16+r11]
-	movdqa	xmm9,xmm1
-	psrlq	xmm1,1
-	movdqa	xmm10,xmm2
-	psrlq	xmm2,1
-	pxor	xmm1,xmm4
-	pxor	xmm2,xmm6
-	pand	xmm1,xmm7
-	pand	xmm2,xmm7
-	pxor	xmm4,xmm1
-	psllq	xmm1,1
-	pxor	xmm6,xmm2
-	psllq	xmm2,1
-	pxor	xmm1,xmm9
-	pxor	xmm2,xmm10
-	movdqa	xmm9,xmm3
-	psrlq	xmm3,1
-	movdqa	xmm10,xmm15
-	psrlq	xmm15,1
-	pxor	xmm3,xmm5
-	pxor	xmm15,xmm0
-	pand	xmm3,xmm7
-	pand	xmm15,xmm7
-	pxor	xmm5,xmm3
-	psllq	xmm3,1
-	pxor	xmm0,xmm15
-	psllq	xmm15,1
-	pxor	xmm3,xmm9
-	pxor	xmm15,xmm10
-	movdqa	xmm7,XMMWORD[32+r11]
-	movdqa	xmm9,xmm6
-	psrlq	xmm6,2
-	movdqa	xmm10,xmm2
-	psrlq	xmm2,2
-	pxor	xmm6,xmm4
-	pxor	xmm2,xmm1
-	pand	xmm6,xmm8
-	pand	xmm2,xmm8
-	pxor	xmm4,xmm6
-	psllq	xmm6,2
-	pxor	xmm1,xmm2
-	psllq	xmm2,2
-	pxor	xmm6,xmm9
-	pxor	xmm2,xmm10
-	movdqa	xmm9,xmm0
-	psrlq	xmm0,2
-	movdqa	xmm10,xmm15
-	psrlq	xmm15,2
-	pxor	xmm0,xmm5
-	pxor	xmm15,xmm3
-	pand	xmm0,xmm8
-	pand	xmm15,xmm8
-	pxor	xmm5,xmm0
-	psllq	xmm0,2
-	pxor	xmm3,xmm15
-	psllq	xmm15,2
-	pxor	xmm0,xmm9
-	pxor	xmm15,xmm10
-	movdqa	xmm9,xmm5
-	psrlq	xmm5,4
-	movdqa	xmm10,xmm3
-	psrlq	xmm3,4
-	pxor	xmm5,xmm4
-	pxor	xmm3,xmm1
-	pand	xmm5,xmm7
-	pand	xmm3,xmm7
-	pxor	xmm4,xmm5
-	psllq	xmm5,4
-	pxor	xmm1,xmm3
-	psllq	xmm3,4
-	pxor	xmm5,xmm9
-	pxor	xmm3,xmm10
-	movdqa	xmm9,xmm0
-	psrlq	xmm0,4
-	movdqa	xmm10,xmm15
-	psrlq	xmm15,4
-	pxor	xmm0,xmm6
-	pxor	xmm15,xmm2
-	pand	xmm0,xmm7
-	pand	xmm15,xmm7
-	pxor	xmm6,xmm0
-	psllq	xmm0,4
-	pxor	xmm2,xmm15
-	psllq	xmm15,4
-	pxor	xmm0,xmm9
-	pxor	xmm15,xmm10
-	movdqa	xmm7,XMMWORD[rax]
-	pxor	xmm3,xmm7
-	pxor	xmm5,xmm7
-	pxor	xmm2,xmm7
-	pxor	xmm6,xmm7
-	pxor	xmm1,xmm7
-	pxor	xmm4,xmm7
-	pxor	xmm15,xmm7
-	pxor	xmm0,xmm7
-	DB	0F3h,0C3h		;repret
-
-
-
-
-ALIGN	64
-_bsaes_decrypt8:
-
-	lea	r11,[$L$BS0]
-
-	movdqa	xmm8,XMMWORD[rax]
-	lea	rax,[16+rax]
-	movdqa	xmm7,XMMWORD[((-48))+r11]
-	pxor	xmm15,xmm8
-	pxor	xmm0,xmm8
-	pxor	xmm1,xmm8
-	pxor	xmm2,xmm8
-DB	102,68,15,56,0,255
-DB	102,15,56,0,199
-	pxor	xmm3,xmm8
-	pxor	xmm4,xmm8
-DB	102,15,56,0,207
-DB	102,15,56,0,215
-	pxor	xmm5,xmm8
-	pxor	xmm6,xmm8
-DB	102,15,56,0,223
-DB	102,15,56,0,231
-DB	102,15,56,0,239
-DB	102,15,56,0,247
-	movdqa	xmm7,XMMWORD[r11]
-	movdqa	xmm8,XMMWORD[16+r11]
-	movdqa	xmm9,xmm5
-	psrlq	xmm5,1
-	movdqa	xmm10,xmm3
-	psrlq	xmm3,1
-	pxor	xmm5,xmm6
-	pxor	xmm3,xmm4
-	pand	xmm5,xmm7
-	pand	xmm3,xmm7
-	pxor	xmm6,xmm5
-	psllq	xmm5,1
-	pxor	xmm4,xmm3
-	psllq	xmm3,1
-	pxor	xmm5,xmm9
-	pxor	xmm3,xmm10
-	movdqa	xmm9,xmm1
-	psrlq	xmm1,1
-	movdqa	xmm10,xmm15
-	psrlq	xmm15,1
-	pxor	xmm1,xmm2
-	pxor	xmm15,xmm0
-	pand	xmm1,xmm7
-	pand	xmm15,xmm7
-	pxor	xmm2,xmm1
-	psllq	xmm1,1
-	pxor	xmm0,xmm15
-	psllq	xmm15,1
-	pxor	xmm1,xmm9
-	pxor	xmm15,xmm10
-	movdqa	xmm7,XMMWORD[32+r11]
-	movdqa	xmm9,xmm4
-	psrlq	xmm4,2
-	movdqa	xmm10,xmm3
-	psrlq	xmm3,2
-	pxor	xmm4,xmm6
-	pxor	xmm3,xmm5
-	pand	xmm4,xmm8
-	pand	xmm3,xmm8
-	pxor	xmm6,xmm4
-	psllq	xmm4,2
-	pxor	xmm5,xmm3
-	psllq	xmm3,2
-	pxor	xmm4,xmm9
-	pxor	xmm3,xmm10
-	movdqa	xmm9,xmm0
-	psrlq	xmm0,2
-	movdqa	xmm10,xmm15
-	psrlq	xmm15,2
-	pxor	xmm0,xmm2
-	pxor	xmm15,xmm1
-	pand	xmm0,xmm8
-	pand	xmm15,xmm8
-	pxor	xmm2,xmm0
-	psllq	xmm0,2
-	pxor	xmm1,xmm15
-	psllq	xmm15,2
-	pxor	xmm0,xmm9
-	pxor	xmm15,xmm10
-	movdqa	xmm9,xmm2
-	psrlq	xmm2,4
-	movdqa	xmm10,xmm1
-	psrlq	xmm1,4
-	pxor	xmm2,xmm6
-	pxor	xmm1,xmm5
-	pand	xmm2,xmm7
-	pand	xmm1,xmm7
-	pxor	xmm6,xmm2
-	psllq	xmm2,4
-	pxor	xmm5,xmm1
-	psllq	xmm1,4
-	pxor	xmm2,xmm9
-	pxor	xmm1,xmm10
-	movdqa	xmm9,xmm0
-	psrlq	xmm0,4
-	movdqa	xmm10,xmm15
-	psrlq	xmm15,4
-	pxor	xmm0,xmm4
-	pxor	xmm15,xmm3
-	pand	xmm0,xmm7
-	pand	xmm15,xmm7
-	pxor	xmm4,xmm0
-	psllq	xmm0,4
-	pxor	xmm3,xmm15
-	psllq	xmm15,4
-	pxor	xmm0,xmm9
-	pxor	xmm15,xmm10
-	dec	r10d
-	jmp	NEAR $L$dec_sbox
-ALIGN	16
-$L$dec_loop:
-	pxor	xmm15,XMMWORD[rax]
-	pxor	xmm0,XMMWORD[16+rax]
-	pxor	xmm1,XMMWORD[32+rax]
-	pxor	xmm2,XMMWORD[48+rax]
-DB	102,68,15,56,0,255
-DB	102,15,56,0,199
-	pxor	xmm3,XMMWORD[64+rax]
-	pxor	xmm4,XMMWORD[80+rax]
-DB	102,15,56,0,207
-DB	102,15,56,0,215
-	pxor	xmm5,XMMWORD[96+rax]
-	pxor	xmm6,XMMWORD[112+rax]
-DB	102,15,56,0,223
-DB	102,15,56,0,231
-DB	102,15,56,0,239
-DB	102,15,56,0,247
-	lea	rax,[128+rax]
-$L$dec_sbox:
-	pxor	xmm2,xmm3
-
-	pxor	xmm3,xmm6
-	pxor	xmm1,xmm6
-	pxor	xmm5,xmm3
-	pxor	xmm6,xmm5
-	pxor	xmm0,xmm6
-
-	pxor	xmm15,xmm0
-	pxor	xmm1,xmm4
-	pxor	xmm2,xmm15
-	pxor	xmm4,xmm15
-	pxor	xmm0,xmm2
-	movdqa	xmm10,xmm2
-	movdqa	xmm9,xmm6
-	movdqa	xmm8,xmm0
-	movdqa	xmm12,xmm3
-	movdqa	xmm11,xmm4
-
-	pxor	xmm10,xmm15
-	pxor	xmm9,xmm3
-	pxor	xmm8,xmm5
-	movdqa	xmm13,xmm10
-	pxor	xmm12,xmm15
-	movdqa	xmm7,xmm9
-	pxor	xmm11,xmm1
-	movdqa	xmm14,xmm10
-
-	por	xmm9,xmm8
-	por	xmm10,xmm11
-	pxor	xmm14,xmm7
-	pand	xmm13,xmm11
-	pxor	xmm11,xmm8
-	pand	xmm7,xmm8
-	pand	xmm14,xmm11
-	movdqa	xmm11,xmm5
-	pxor	xmm11,xmm1
-	pand	xmm12,xmm11
-	pxor	xmm10,xmm12
-	pxor	xmm9,xmm12
-	movdqa	xmm12,xmm2
-	movdqa	xmm11,xmm0
-	pxor	xmm12,xmm6
-	pxor	xmm11,xmm4
-	movdqa	xmm8,xmm12
-	pand	xmm12,xmm11
-	por	xmm8,xmm11
-	pxor	xmm7,xmm12
-	pxor	xmm10,xmm14
-	pxor	xmm9,xmm13
-	pxor	xmm8,xmm14
-	movdqa	xmm11,xmm3
-	pxor	xmm7,xmm13
-	movdqa	xmm12,xmm15
-	pxor	xmm8,xmm13
-	movdqa	xmm13,xmm6
-	pand	xmm11,xmm5
-	movdqa	xmm14,xmm2
-	pand	xmm12,xmm1
-	pand	xmm13,xmm0
-	por	xmm14,xmm4
-	pxor	xmm10,xmm11
-	pxor	xmm9,xmm12
-	pxor	xmm8,xmm13
-	pxor	xmm7,xmm14
-
-
-
-
-
-	movdqa	xmm11,xmm10
-	pand	xmm10,xmm8
-	pxor	xmm11,xmm9
-
-	movdqa	xmm13,xmm7
-	movdqa	xmm14,xmm11
-	pxor	xmm13,xmm10
-	pand	xmm14,xmm13
-
-	movdqa	xmm12,xmm8
-	pxor	xmm14,xmm9
-	pxor	xmm12,xmm7
-
-	pxor	xmm10,xmm9
-
-	pand	xmm12,xmm10
-
-	movdqa	xmm9,xmm13
-	pxor	xmm12,xmm7
-
-	pxor	xmm9,xmm12
-	pxor	xmm8,xmm12
-
-	pand	xmm9,xmm7
-
-	pxor	xmm13,xmm9
-	pxor	xmm8,xmm9
-
-	pand	xmm13,xmm14
-
-	pxor	xmm13,xmm11
-	movdqa	xmm11,xmm4
-	movdqa	xmm7,xmm0
-	movdqa	xmm9,xmm14
-	pxor	xmm9,xmm13
-	pand	xmm9,xmm4
-	pxor	xmm4,xmm0
-	pand	xmm0,xmm14
-	pand	xmm4,xmm13
-	pxor	xmm4,xmm0
-	pxor	xmm0,xmm9
-	pxor	xmm11,xmm1
-	pxor	xmm7,xmm5
-	pxor	xmm14,xmm12
-	pxor	xmm13,xmm8
-	movdqa	xmm10,xmm14
-	movdqa	xmm9,xmm12
-	pxor	xmm10,xmm13
-	pxor	xmm9,xmm8
-	pand	xmm10,xmm11
-	pand	xmm9,xmm1
-	pxor	xmm11,xmm7
-	pxor	xmm1,xmm5
-	pand	xmm7,xmm14
-	pand	xmm5,xmm12
-	pand	xmm11,xmm13
-	pand	xmm1,xmm8
-	pxor	xmm7,xmm11
-	pxor	xmm1,xmm5
-	pxor	xmm11,xmm10
-	pxor	xmm5,xmm9
-	pxor	xmm4,xmm11
-	pxor	xmm1,xmm11
-	pxor	xmm0,xmm7
-	pxor	xmm5,xmm7
-
-	movdqa	xmm11,xmm2
-	movdqa	xmm7,xmm6
-	pxor	xmm11,xmm15
-	pxor	xmm7,xmm3
-	movdqa	xmm10,xmm14
-	movdqa	xmm9,xmm12
-	pxor	xmm10,xmm13
-	pxor	xmm9,xmm8
-	pand	xmm10,xmm11
-	pand	xmm9,xmm15
-	pxor	xmm11,xmm7
-	pxor	xmm15,xmm3
-	pand	xmm7,xmm14
-	pand	xmm3,xmm12
-	pand	xmm11,xmm13
-	pand	xmm15,xmm8
-	pxor	xmm7,xmm11
-	pxor	xmm15,xmm3
-	pxor	xmm11,xmm10
-	pxor	xmm3,xmm9
-	pxor	xmm14,xmm12
-	pxor	xmm13,xmm8
-	movdqa	xmm10,xmm14
-	pxor	xmm10,xmm13
-	pand	xmm10,xmm2
-	pxor	xmm2,xmm6
-	pand	xmm6,xmm14
-	pand	xmm2,xmm13
-	pxor	xmm2,xmm6
-	pxor	xmm6,xmm10
-	pxor	xmm2,xmm11
-	pxor	xmm15,xmm11
-	pxor	xmm6,xmm7
-	pxor	xmm3,xmm7
-	pxor	xmm0,xmm6
-	pxor	xmm5,xmm4
-
-	pxor	xmm3,xmm0
-	pxor	xmm1,xmm6
-	pxor	xmm4,xmm6
-	pxor	xmm3,xmm1
-	pxor	xmm6,xmm15
-	pxor	xmm3,xmm4
-	pxor	xmm2,xmm5
-	pxor	xmm5,xmm0
-	pxor	xmm2,xmm3
-
-	pxor	xmm3,xmm15
-	pxor	xmm6,xmm2
-	dec	r10d
-	jl	NEAR $L$dec_done
-
-	pshufd	xmm7,xmm15,0x4E
-	pshufd	xmm13,xmm2,0x4E
-	pxor	xmm7,xmm15
-	pshufd	xmm14,xmm4,0x4E
-	pxor	xmm13,xmm2
-	pshufd	xmm8,xmm0,0x4E
-	pxor	xmm14,xmm4
-	pshufd	xmm9,xmm5,0x4E
-	pxor	xmm8,xmm0
-	pshufd	xmm10,xmm3,0x4E
-	pxor	xmm9,xmm5
-	pxor	xmm15,xmm13
-	pxor	xmm0,xmm13
-	pshufd	xmm11,xmm1,0x4E
-	pxor	xmm10,xmm3
-	pxor	xmm5,xmm7
-	pxor	xmm3,xmm8
-	pshufd	xmm12,xmm6,0x4E
-	pxor	xmm11,xmm1
-	pxor	xmm0,xmm14
-	pxor	xmm1,xmm9
-	pxor	xmm12,xmm6
-
-	pxor	xmm5,xmm14
-	pxor	xmm3,xmm13
-	pxor	xmm1,xmm13
-	pxor	xmm6,xmm10
-	pxor	xmm2,xmm11
-	pxor	xmm1,xmm14
-	pxor	xmm6,xmm14
-	pxor	xmm4,xmm12
-	pshufd	xmm7,xmm15,0x93
-	pshufd	xmm8,xmm0,0x93
-	pxor	xmm15,xmm7
-	pshufd	xmm9,xmm5,0x93
-	pxor	xmm0,xmm8
-	pshufd	xmm10,xmm3,0x93
-	pxor	xmm5,xmm9
-	pshufd	xmm11,xmm1,0x93
-	pxor	xmm3,xmm10
-	pshufd	xmm12,xmm6,0x93
-	pxor	xmm1,xmm11
-	pshufd	xmm13,xmm2,0x93
-	pxor	xmm6,xmm12
-	pshufd	xmm14,xmm4,0x93
-	pxor	xmm2,xmm13
-	pxor	xmm4,xmm14
-
-	pxor	xmm8,xmm15
-	pxor	xmm7,xmm4
-	pxor	xmm8,xmm4
-	pshufd	xmm15,xmm15,0x4E
-	pxor	xmm9,xmm0
-	pshufd	xmm0,xmm0,0x4E
-	pxor	xmm12,xmm1
-	pxor	xmm15,xmm7
-	pxor	xmm13,xmm6
-	pxor	xmm0,xmm8
-	pxor	xmm11,xmm3
-	pshufd	xmm7,xmm1,0x4E
-	pxor	xmm14,xmm2
-	pshufd	xmm8,xmm6,0x4E
-	pxor	xmm10,xmm5
-	pshufd	xmm1,xmm3,0x4E
-	pxor	xmm10,xmm4
-	pshufd	xmm6,xmm4,0x4E
-	pxor	xmm11,xmm4
-	pshufd	xmm3,xmm2,0x4E
-	pxor	xmm7,xmm11
-	pshufd	xmm2,xmm5,0x4E
-	pxor	xmm8,xmm12
-	pxor	xmm10,xmm1
-	pxor	xmm6,xmm14
-	pxor	xmm13,xmm3
-	movdqa	xmm3,xmm7
-	pxor	xmm2,xmm9
-	movdqa	xmm5,xmm13
-	movdqa	xmm4,xmm8
-	movdqa	xmm1,xmm2
-	movdqa	xmm2,xmm10
-	movdqa	xmm7,XMMWORD[((-16))+r11]
-	jnz	NEAR $L$dec_loop
-	movdqa	xmm7,XMMWORD[((-32))+r11]
-	jmp	NEAR $L$dec_loop
-ALIGN	16
-$L$dec_done:
-	movdqa	xmm7,XMMWORD[r11]
-	movdqa	xmm8,XMMWORD[16+r11]
-	movdqa	xmm9,xmm2
-	psrlq	xmm2,1
-	movdqa	xmm10,xmm1
-	psrlq	xmm1,1
-	pxor	xmm2,xmm4
-	pxor	xmm1,xmm6
-	pand	xmm2,xmm7
-	pand	xmm1,xmm7
-	pxor	xmm4,xmm2
-	psllq	xmm2,1
-	pxor	xmm6,xmm1
-	psllq	xmm1,1
-	pxor	xmm2,xmm9
-	pxor	xmm1,xmm10
-	movdqa	xmm9,xmm5
-	psrlq	xmm5,1
-	movdqa	xmm10,xmm15
-	psrlq	xmm15,1
-	pxor	xmm5,xmm3
-	pxor	xmm15,xmm0
-	pand	xmm5,xmm7
-	pand	xmm15,xmm7
-	pxor	xmm3,xmm5
-	psllq	xmm5,1
-	pxor	xmm0,xmm15
-	psllq	xmm15,1
-	pxor	xmm5,xmm9
-	pxor	xmm15,xmm10
-	movdqa	xmm7,XMMWORD[32+r11]
-	movdqa	xmm9,xmm6
-	psrlq	xmm6,2
-	movdqa	xmm10,xmm1
-	psrlq	xmm1,2
-	pxor	xmm6,xmm4
-	pxor	xmm1,xmm2
-	pand	xmm6,xmm8
-	pand	xmm1,xmm8
-	pxor	xmm4,xmm6
-	psllq	xmm6,2
-	pxor	xmm2,xmm1
-	psllq	xmm1,2
-	pxor	xmm6,xmm9
-	pxor	xmm1,xmm10
-	movdqa	xmm9,xmm0
-	psrlq	xmm0,2
-	movdqa	xmm10,xmm15
-	psrlq	xmm15,2
-	pxor	xmm0,xmm3
-	pxor	xmm15,xmm5
-	pand	xmm0,xmm8
-	pand	xmm15,xmm8
-	pxor	xmm3,xmm0
-	psllq	xmm0,2
-	pxor	xmm5,xmm15
-	psllq	xmm15,2
-	pxor	xmm0,xmm9
-	pxor	xmm15,xmm10
-	movdqa	xmm9,xmm3
-	psrlq	xmm3,4
-	movdqa	xmm10,xmm5
-	psrlq	xmm5,4
-	pxor	xmm3,xmm4
-	pxor	xmm5,xmm2
-	pand	xmm3,xmm7
-	pand	xmm5,xmm7
-	pxor	xmm4,xmm3
-	psllq	xmm3,4
-	pxor	xmm2,xmm5
-	psllq	xmm5,4
-	pxor	xmm3,xmm9
-	pxor	xmm5,xmm10
-	movdqa	xmm9,xmm0
-	psrlq	xmm0,4
-	movdqa	xmm10,xmm15
-	psrlq	xmm15,4
-	pxor	xmm0,xmm6
-	pxor	xmm15,xmm1
-	pand	xmm0,xmm7
-	pand	xmm15,xmm7
-	pxor	xmm6,xmm0
-	psllq	xmm0,4
-	pxor	xmm1,xmm15
-	psllq	xmm15,4
-	pxor	xmm0,xmm9
-	pxor	xmm15,xmm10
-	movdqa	xmm7,XMMWORD[rax]
-	pxor	xmm5,xmm7
-	pxor	xmm3,xmm7
-	pxor	xmm1,xmm7
-	pxor	xmm6,xmm7
-	pxor	xmm2,xmm7
-	pxor	xmm4,xmm7
-	pxor	xmm15,xmm7
-	pxor	xmm0,xmm7
-	DB	0F3h,0C3h		;repret
-
-
-
-ALIGN	16
-_bsaes_key_convert:
-
-	lea	r11,[$L$masks]
-	movdqu	xmm7,XMMWORD[rcx]
-	lea	rcx,[16+rcx]
-	movdqa	xmm0,XMMWORD[r11]
-	movdqa	xmm1,XMMWORD[16+r11]
-	movdqa	xmm2,XMMWORD[32+r11]
-	movdqa	xmm3,XMMWORD[48+r11]
-	movdqa	xmm4,XMMWORD[64+r11]
-	pcmpeqd	xmm5,xmm5
-
-	movdqu	xmm6,XMMWORD[rcx]
-	movdqa	XMMWORD[rax],xmm7
-	lea	rax,[16+rax]
-	dec	r10d
-	jmp	NEAR $L$key_loop
-ALIGN	16
-$L$key_loop:
-DB	102,15,56,0,244
-
-	movdqa	xmm8,xmm0
-	movdqa	xmm9,xmm1
-
-	pand	xmm8,xmm6
-	pand	xmm9,xmm6
-	movdqa	xmm10,xmm2
-	pcmpeqb	xmm8,xmm0
-	psllq	xmm0,4
-	movdqa	xmm11,xmm3
-	pcmpeqb	xmm9,xmm1
-	psllq	xmm1,4
-
-	pand	xmm10,xmm6
-	pand	xmm11,xmm6
-	movdqa	xmm12,xmm0
-	pcmpeqb	xmm10,xmm2
-	psllq	xmm2,4
-	movdqa	xmm13,xmm1
-	pcmpeqb	xmm11,xmm3
-	psllq	xmm3,4
-
-	movdqa	xmm14,xmm2
-	movdqa	xmm15,xmm3
-	pxor	xmm8,xmm5
-	pxor	xmm9,xmm5
-
-	pand	xmm12,xmm6
-	pand	xmm13,xmm6
-	movdqa	XMMWORD[rax],xmm8
-	pcmpeqb	xmm12,xmm0
-	psrlq	xmm0,4
-	movdqa	XMMWORD[16+rax],xmm9
-	pcmpeqb	xmm13,xmm1
-	psrlq	xmm1,4
-	lea	rcx,[16+rcx]
-
-	pand	xmm14,xmm6
-	pand	xmm15,xmm6
-	movdqa	XMMWORD[32+rax],xmm10
-	pcmpeqb	xmm14,xmm2
-	psrlq	xmm2,4
-	movdqa	XMMWORD[48+rax],xmm11
-	pcmpeqb	xmm15,xmm3
-	psrlq	xmm3,4
-	movdqu	xmm6,XMMWORD[rcx]
-
-	pxor	xmm13,xmm5
-	pxor	xmm14,xmm5
-	movdqa	XMMWORD[64+rax],xmm12
-	movdqa	XMMWORD[80+rax],xmm13
-	movdqa	XMMWORD[96+rax],xmm14
-	movdqa	XMMWORD[112+rax],xmm15
-	lea	rax,[128+rax]
-	dec	r10d
-	jnz	NEAR $L$key_loop
-
-	movdqa	xmm7,XMMWORD[80+r11]
-
-	DB	0F3h,0C3h		;repret
-
-
-EXTERN	asm_AES_cbc_encrypt
-global	bsaes_cbc_encrypt
-
-ALIGN	16
-bsaes_cbc_encrypt:
-
-	mov	r11d,DWORD[48+rsp]
-	cmp	r11d,0
-	jne	NEAR asm_AES_cbc_encrypt
-	cmp	r8,128
-	jb	NEAR asm_AES_cbc_encrypt
-
-	mov	rax,rsp
-$L$cbc_dec_prologue:
-	push	rbp
-
-	push	rbx
-
-	push	r12
-
-	push	r13
-
-	push	r14
-
-	push	r15
-
-	lea	rsp,[((-72))+rsp]
-
-	mov	r10,QWORD[160+rsp]
-	lea	rsp,[((-160))+rsp]
-	movaps	XMMWORD[64+rsp],xmm6
-	movaps	XMMWORD[80+rsp],xmm7
-	movaps	XMMWORD[96+rsp],xmm8
-	movaps	XMMWORD[112+rsp],xmm9
-	movaps	XMMWORD[128+rsp],xmm10
-	movaps	XMMWORD[144+rsp],xmm11
-	movaps	XMMWORD[160+rsp],xmm12
-	movaps	XMMWORD[176+rsp],xmm13
-	movaps	XMMWORD[192+rsp],xmm14
-	movaps	XMMWORD[208+rsp],xmm15
-$L$cbc_dec_body:
-	mov	rbp,rsp
-
-	mov	eax,DWORD[240+r9]
-	mov	r12,rcx
-	mov	r13,rdx
-	mov	r14,r8
-	mov	r15,r9
-	mov	rbx,r10
-	shr	r14,4
-
-	mov	edx,eax
-	shl	rax,7
-	sub	rax,96
-	sub	rsp,rax
-
-	mov	rax,rsp
-	mov	rcx,r15
-	mov	r10d,edx
-	call	_bsaes_key_convert
-	pxor	xmm7,XMMWORD[rsp]
-	movdqa	XMMWORD[rax],xmm6
-	movdqa	XMMWORD[rsp],xmm7
-
-	movdqu	xmm14,XMMWORD[rbx]
-	sub	r14,8
-$L$cbc_dec_loop:
-	movdqu	xmm15,XMMWORD[r12]
-	movdqu	xmm0,XMMWORD[16+r12]
-	movdqu	xmm1,XMMWORD[32+r12]
-	movdqu	xmm2,XMMWORD[48+r12]
-	movdqu	xmm3,XMMWORD[64+r12]
-	movdqu	xmm4,XMMWORD[80+r12]
-	mov	rax,rsp
-	movdqu	xmm5,XMMWORD[96+r12]
-	mov	r10d,edx
-	movdqu	xmm6,XMMWORD[112+r12]
-	movdqa	XMMWORD[32+rbp],xmm14
-
-	call	_bsaes_decrypt8
-
-	pxor	xmm15,XMMWORD[32+rbp]
-	movdqu	xmm7,XMMWORD[r12]
-	movdqu	xmm8,XMMWORD[16+r12]
-	pxor	xmm0,xmm7
-	movdqu	xmm9,XMMWORD[32+r12]
-	pxor	xmm5,xmm8
-	movdqu	xmm10,XMMWORD[48+r12]
-	pxor	xmm3,xmm9
-	movdqu	xmm11,XMMWORD[64+r12]
-	pxor	xmm1,xmm10
-	movdqu	xmm12,XMMWORD[80+r12]
-	pxor	xmm6,xmm11
-	movdqu	xmm13,XMMWORD[96+r12]
-	pxor	xmm2,xmm12
-	movdqu	xmm14,XMMWORD[112+r12]
-	pxor	xmm4,xmm13
-	movdqu	XMMWORD[r13],xmm15
-	lea	r12,[128+r12]
-	movdqu	XMMWORD[16+r13],xmm0
-	movdqu	XMMWORD[32+r13],xmm5
-	movdqu	XMMWORD[48+r13],xmm3
-	movdqu	XMMWORD[64+r13],xmm1
-	movdqu	XMMWORD[80+r13],xmm6
-	movdqu	XMMWORD[96+r13],xmm2
-	movdqu	XMMWORD[112+r13],xmm4
-	lea	r13,[128+r13]
-	sub	r14,8
-	jnc	NEAR $L$cbc_dec_loop
-
-	add	r14,8
-	jz	NEAR $L$cbc_dec_done
-
-	movdqu	xmm15,XMMWORD[r12]
-	mov	rax,rsp
-	mov	r10d,edx
-	cmp	r14,2
-	jb	NEAR $L$cbc_dec_one
-	movdqu	xmm0,XMMWORD[16+r12]
-	je	NEAR $L$cbc_dec_two
-	movdqu	xmm1,XMMWORD[32+r12]
-	cmp	r14,4
-	jb	NEAR $L$cbc_dec_three
-	movdqu	xmm2,XMMWORD[48+r12]
-	je	NEAR $L$cbc_dec_four
-	movdqu	xmm3,XMMWORD[64+r12]
-	cmp	r14,6
-	jb	NEAR $L$cbc_dec_five
-	movdqu	xmm4,XMMWORD[80+r12]
-	je	NEAR $L$cbc_dec_six
-	movdqu	xmm5,XMMWORD[96+r12]
-	movdqa	XMMWORD[32+rbp],xmm14
-	call	_bsaes_decrypt8
-	pxor	xmm15,XMMWORD[32+rbp]
-	movdqu	xmm7,XMMWORD[r12]
-	movdqu	xmm8,XMMWORD[16+r12]
-	pxor	xmm0,xmm7
-	movdqu	xmm9,XMMWORD[32+r12]
-	pxor	xmm5,xmm8
-	movdqu	xmm10,XMMWORD[48+r12]
-	pxor	xmm3,xmm9
-	movdqu	xmm11,XMMWORD[64+r12]
-	pxor	xmm1,xmm10
-	movdqu	xmm12,XMMWORD[80+r12]
-	pxor	xmm6,xmm11
-	movdqu	xmm14,XMMWORD[96+r12]
-	pxor	xmm2,xmm12
-	movdqu	XMMWORD[r13],xmm15
-	movdqu	XMMWORD[16+r13],xmm0
-	movdqu	XMMWORD[32+r13],xmm5
-	movdqu	XMMWORD[48+r13],xmm3
-	movdqu	XMMWORD[64+r13],xmm1
-	movdqu	XMMWORD[80+r13],xmm6
-	movdqu	XMMWORD[96+r13],xmm2
-	jmp	NEAR $L$cbc_dec_done
-ALIGN	16
-$L$cbc_dec_six:
-	movdqa	XMMWORD[32+rbp],xmm14
-	call	_bsaes_decrypt8
-	pxor	xmm15,XMMWORD[32+rbp]
-	movdqu	xmm7,XMMWORD[r12]
-	movdqu	xmm8,XMMWORD[16+r12]
-	pxor	xmm0,xmm7
-	movdqu	xmm9,XMMWORD[32+r12]
-	pxor	xmm5,xmm8
-	movdqu	xmm10,XMMWORD[48+r12]
-	pxor	xmm3,xmm9
-	movdqu	xmm11,XMMWORD[64+r12]
-	pxor	xmm1,xmm10
-	movdqu	xmm14,XMMWORD[80+r12]
-	pxor	xmm6,xmm11
-	movdqu	XMMWORD[r13],xmm15
-	movdqu	XMMWORD[16+r13],xmm0
-	movdqu	XMMWORD[32+r13],xmm5
-	movdqu	XMMWORD[48+r13],xmm3
-	movdqu	XMMWORD[64+r13],xmm1
-	movdqu	XMMWORD[80+r13],xmm6
-	jmp	NEAR $L$cbc_dec_done
-ALIGN	16
-$L$cbc_dec_five:
-	movdqa	XMMWORD[32+rbp],xmm14
-	call	_bsaes_decrypt8
-	pxor	xmm15,XMMWORD[32+rbp]
-	movdqu	xmm7,XMMWORD[r12]
-	movdqu	xmm8,XMMWORD[16+r12]
-	pxor	xmm0,xmm7
-	movdqu	xmm9,XMMWORD[32+r12]
-	pxor	xmm5,xmm8
-	movdqu	xmm10,XMMWORD[48+r12]
-	pxor	xmm3,xmm9
-	movdqu	xmm14,XMMWORD[64+r12]
-	pxor	xmm1,xmm10
-	movdqu	XMMWORD[r13],xmm15
-	movdqu	XMMWORD[16+r13],xmm0
-	movdqu	XMMWORD[32+r13],xmm5
-	movdqu	XMMWORD[48+r13],xmm3
-	movdqu	XMMWORD[64+r13],xmm1
-	jmp	NEAR $L$cbc_dec_done
-ALIGN	16
-$L$cbc_dec_four:
-	movdqa	XMMWORD[32+rbp],xmm14
-	call	_bsaes_decrypt8
-	pxor	xmm15,XMMWORD[32+rbp]
-	movdqu	xmm7,XMMWORD[r12]
-	movdqu	xmm8,XMMWORD[16+r12]
-	pxor	xmm0,xmm7
-	movdqu	xmm9,XMMWORD[32+r12]
-	pxor	xmm5,xmm8
-	movdqu	xmm14,XMMWORD[48+r12]
-	pxor	xmm3,xmm9
-	movdqu	XMMWORD[r13],xmm15
-	movdqu	XMMWORD[16+r13],xmm0
-	movdqu	XMMWORD[32+r13],xmm5
-	movdqu	XMMWORD[48+r13],xmm3
-	jmp	NEAR $L$cbc_dec_done
-ALIGN	16
-$L$cbc_dec_three:
-	movdqa	XMMWORD[32+rbp],xmm14
-	call	_bsaes_decrypt8
-	pxor	xmm15,XMMWORD[32+rbp]
-	movdqu	xmm7,XMMWORD[r12]
-	movdqu	xmm8,XMMWORD[16+r12]
-	pxor	xmm0,xmm7
-	movdqu	xmm14,XMMWORD[32+r12]
-	pxor	xmm5,xmm8
-	movdqu	XMMWORD[r13],xmm15
-	movdqu	XMMWORD[16+r13],xmm0
-	movdqu	XMMWORD[32+r13],xmm5
-	jmp	NEAR $L$cbc_dec_done
-ALIGN	16
-$L$cbc_dec_two:
-	movdqa	XMMWORD[32+rbp],xmm14
-	call	_bsaes_decrypt8
-	pxor	xmm15,XMMWORD[32+rbp]
-	movdqu	xmm7,XMMWORD[r12]
-	movdqu	xmm14,XMMWORD[16+r12]
-	pxor	xmm0,xmm7
-	movdqu	XMMWORD[r13],xmm15
-	movdqu	XMMWORD[16+r13],xmm0
-	jmp	NEAR $L$cbc_dec_done
-ALIGN	16
-$L$cbc_dec_one:
-	lea	rcx,[r12]
-	lea	rdx,[32+rbp]
-	lea	r8,[r15]
-	call	asm_AES_decrypt
-	pxor	xmm14,XMMWORD[32+rbp]
-	movdqu	XMMWORD[r13],xmm14
-	movdqa	xmm14,xmm15
-
-$L$cbc_dec_done:
-	movdqu	XMMWORD[rbx],xmm14
-	lea	rax,[rsp]
-	pxor	xmm0,xmm0
-$L$cbc_dec_bzero:
-	movdqa	XMMWORD[rax],xmm0
-	movdqa	XMMWORD[16+rax],xmm0
-	lea	rax,[32+rax]
-	cmp	rbp,rax
-	ja	NEAR $L$cbc_dec_bzero
-
-	lea	rax,[120+rbp]
-
-	movaps	xmm6,XMMWORD[64+rbp]
-	movaps	xmm7,XMMWORD[80+rbp]
-	movaps	xmm8,XMMWORD[96+rbp]
-	movaps	xmm9,XMMWORD[112+rbp]
-	movaps	xmm10,XMMWORD[128+rbp]
-	movaps	xmm11,XMMWORD[144+rbp]
-	movaps	xmm12,XMMWORD[160+rbp]
-	movaps	xmm13,XMMWORD[176+rbp]
-	movaps	xmm14,XMMWORD[192+rbp]
-	movaps	xmm15,XMMWORD[208+rbp]
-	lea	rax,[160+rax]
-$L$cbc_dec_tail:
-	mov	r15,QWORD[((-48))+rax]
-
-	mov	r14,QWORD[((-40))+rax]
-
-	mov	r13,QWORD[((-32))+rax]
-
-	mov	r12,QWORD[((-24))+rax]
-
-	mov	rbx,QWORD[((-16))+rax]
-
-	mov	rbp,QWORD[((-8))+rax]
-
-	lea	rsp,[rax]
-
-$L$cbc_dec_epilogue:
-	DB	0F3h,0C3h		;repret
-
-
-
-global	bsaes_ctr32_encrypt_blocks
-
-ALIGN	16
-bsaes_ctr32_encrypt_blocks:
-
-	mov	rax,rsp
-$L$ctr_enc_prologue:
-	push	rbp
-
-	push	rbx
-
-	push	r12
-
-	push	r13
-
-	push	r14
-
-	push	r15
-
-	lea	rsp,[((-72))+rsp]
-
-	mov	r10,QWORD[160+rsp]
-	lea	rsp,[((-160))+rsp]
-	movaps	XMMWORD[64+rsp],xmm6
-	movaps	XMMWORD[80+rsp],xmm7
-	movaps	XMMWORD[96+rsp],xmm8
-	movaps	XMMWORD[112+rsp],xmm9
-	movaps	XMMWORD[128+rsp],xmm10
-	movaps	XMMWORD[144+rsp],xmm11
-	movaps	XMMWORD[160+rsp],xmm12
-	movaps	XMMWORD[176+rsp],xmm13
-	movaps	XMMWORD[192+rsp],xmm14
-	movaps	XMMWORD[208+rsp],xmm15
-$L$ctr_enc_body:
-	mov	rbp,rsp
-
-	movdqu	xmm0,XMMWORD[r10]
-	mov	eax,DWORD[240+r9]
-	mov	r12,rcx
-	mov	r13,rdx
-	mov	r14,r8
-	mov	r15,r9
-	movdqa	XMMWORD[32+rbp],xmm0
-	cmp	r8,8
-	jb	NEAR $L$ctr_enc_short
-
-	mov	ebx,eax
-	shl	rax,7
-	sub	rax,96
-	sub	rsp,rax
-
-	mov	rax,rsp
-	mov	rcx,r15
-	mov	r10d,ebx
-	call	_bsaes_key_convert
-	pxor	xmm7,xmm6
-	movdqa	XMMWORD[rax],xmm7
-
-	movdqa	xmm8,XMMWORD[rsp]
-	lea	r11,[$L$ADD1]
-	movdqa	xmm15,XMMWORD[32+rbp]
-	movdqa	xmm7,XMMWORD[((-32))+r11]
-DB	102,68,15,56,0,199
-DB	102,68,15,56,0,255
-	movdqa	XMMWORD[rsp],xmm8
-	jmp	NEAR $L$ctr_enc_loop
-ALIGN	16
-$L$ctr_enc_loop:
-	movdqa	XMMWORD[32+rbp],xmm15
-	movdqa	xmm0,xmm15
-	movdqa	xmm1,xmm15
-	paddd	xmm0,XMMWORD[r11]
-	movdqa	xmm2,xmm15
-	paddd	xmm1,XMMWORD[16+r11]
-	movdqa	xmm3,xmm15
-	paddd	xmm2,XMMWORD[32+r11]
-	movdqa	xmm4,xmm15
-	paddd	xmm3,XMMWORD[48+r11]
-	movdqa	xmm5,xmm15
-	paddd	xmm4,XMMWORD[64+r11]
-	movdqa	xmm6,xmm15
-	paddd	xmm5,XMMWORD[80+r11]
-	paddd	xmm6,XMMWORD[96+r11]
-
-
-
-	movdqa	xmm8,XMMWORD[rsp]
-	lea	rax,[16+rsp]
-	movdqa	xmm7,XMMWORD[((-16))+r11]
-	pxor	xmm15,xmm8
-	pxor	xmm0,xmm8
-	pxor	xmm1,xmm8
-	pxor	xmm2,xmm8
-DB	102,68,15,56,0,255
-DB	102,15,56,0,199
-	pxor	xmm3,xmm8
-	pxor	xmm4,xmm8
-DB	102,15,56,0,207
-DB	102,15,56,0,215
-	pxor	xmm5,xmm8
-	pxor	xmm6,xmm8
-DB	102,15,56,0,223
-DB	102,15,56,0,231
-DB	102,15,56,0,239
-DB	102,15,56,0,247
-	lea	r11,[$L$BS0]
-	mov	r10d,ebx
-
-	call	_bsaes_encrypt8_bitslice
-
-	sub	r14,8
-	jc	NEAR $L$ctr_enc_loop_done
-
-	movdqu	xmm7,XMMWORD[r12]
-	movdqu	xmm8,XMMWORD[16+r12]
-	movdqu	xmm9,XMMWORD[32+r12]
-	movdqu	xmm10,XMMWORD[48+r12]
-	movdqu	xmm11,XMMWORD[64+r12]
-	movdqu	xmm12,XMMWORD[80+r12]
-	movdqu	xmm13,XMMWORD[96+r12]
-	movdqu	xmm14,XMMWORD[112+r12]
-	lea	r12,[128+r12]
-	pxor	xmm7,xmm15
-	movdqa	xmm15,XMMWORD[32+rbp]
-	pxor	xmm0,xmm8
-	movdqu	XMMWORD[r13],xmm7
-	pxor	xmm3,xmm9
-	movdqu	XMMWORD[16+r13],xmm0
-	pxor	xmm5,xmm10
-	movdqu	XMMWORD[32+r13],xmm3
-	pxor	xmm2,xmm11
-	movdqu	XMMWORD[48+r13],xmm5
-	pxor	xmm6,xmm12
-	movdqu	XMMWORD[64+r13],xmm2
-	pxor	xmm1,xmm13
-	movdqu	XMMWORD[80+r13],xmm6
-	pxor	xmm4,xmm14
-	movdqu	XMMWORD[96+r13],xmm1
-	lea	r11,[$L$ADD1]
-	movdqu	XMMWORD[112+r13],xmm4
-	lea	r13,[128+r13]
-	paddd	xmm15,XMMWORD[112+r11]
-	jnz	NEAR $L$ctr_enc_loop
-
-	jmp	NEAR $L$ctr_enc_done
-ALIGN	16
-$L$ctr_enc_loop_done:
-	add	r14,8
-	movdqu	xmm7,XMMWORD[r12]
-	pxor	xmm15,xmm7
-	movdqu	XMMWORD[r13],xmm15
-	cmp	r14,2
-	jb	NEAR $L$ctr_enc_done
-	movdqu	xmm8,XMMWORD[16+r12]
-	pxor	xmm0,xmm8
-	movdqu	XMMWORD[16+r13],xmm0
-	je	NEAR $L$ctr_enc_done
-	movdqu	xmm9,XMMWORD[32+r12]
-	pxor	xmm3,xmm9
-	movdqu	XMMWORD[32+r13],xmm3
-	cmp	r14,4
-	jb	NEAR $L$ctr_enc_done
-	movdqu	xmm10,XMMWORD[48+r12]
-	pxor	xmm5,xmm10
-	movdqu	XMMWORD[48+r13],xmm5
-	je	NEAR $L$ctr_enc_done
-	movdqu	xmm11,XMMWORD[64+r12]
-	pxor	xmm2,xmm11
-	movdqu	XMMWORD[64+r13],xmm2
-	cmp	r14,6
-	jb	NEAR $L$ctr_enc_done
-	movdqu	xmm12,XMMWORD[80+r12]
-	pxor	xmm6,xmm12
-	movdqu	XMMWORD[80+r13],xmm6
-	je	NEAR $L$ctr_enc_done
-	movdqu	xmm13,XMMWORD[96+r12]
-	pxor	xmm1,xmm13
-	movdqu	XMMWORD[96+r13],xmm1
-	jmp	NEAR $L$ctr_enc_done
-
-ALIGN	16
-$L$ctr_enc_short:
-	lea	rcx,[32+rbp]
-	lea	rdx,[48+rbp]
-	lea	r8,[r15]
-	call	asm_AES_encrypt
-	movdqu	xmm0,XMMWORD[r12]
-	lea	r12,[16+r12]
-	mov	eax,DWORD[44+rbp]
-	bswap	eax
-	pxor	xmm0,XMMWORD[48+rbp]
-	inc	eax
-	movdqu	XMMWORD[r13],xmm0
-	bswap	eax
-	lea	r13,[16+r13]
-	mov	DWORD[44+rsp],eax
-	dec	r14
-	jnz	NEAR $L$ctr_enc_short
-
-$L$ctr_enc_done:
-	lea	rax,[rsp]
-	pxor	xmm0,xmm0
-$L$ctr_enc_bzero:
-	movdqa	XMMWORD[rax],xmm0
-	movdqa	XMMWORD[16+rax],xmm0
-	lea	rax,[32+rax]
-	cmp	rbp,rax
-	ja	NEAR $L$ctr_enc_bzero
-
-	lea	rax,[120+rbp]
-
-	movaps	xmm6,XMMWORD[64+rbp]
-	movaps	xmm7,XMMWORD[80+rbp]
-	movaps	xmm8,XMMWORD[96+rbp]
-	movaps	xmm9,XMMWORD[112+rbp]
-	movaps	xmm10,XMMWORD[128+rbp]
-	movaps	xmm11,XMMWORD[144+rbp]
-	movaps	xmm12,XMMWORD[160+rbp]
-	movaps	xmm13,XMMWORD[176+rbp]
-	movaps	xmm14,XMMWORD[192+rbp]
-	movaps	xmm15,XMMWORD[208+rbp]
-	lea	rax,[160+rax]
-$L$ctr_enc_tail:
-	mov	r15,QWORD[((-48))+rax]
-
-	mov	r14,QWORD[((-40))+rax]
-
-	mov	r13,QWORD[((-32))+rax]
-
-	mov	r12,QWORD[((-24))+rax]
-
-	mov	rbx,QWORD[((-16))+rax]
-
-	mov	rbp,QWORD[((-8))+rax]
-
-	lea	rsp,[rax]
-
-$L$ctr_enc_epilogue:
-	DB	0F3h,0C3h		;repret
-
-
-global	bsaes_xts_encrypt
-
-ALIGN	16
-bsaes_xts_encrypt:
-
-	mov	rax,rsp
-$L$xts_enc_prologue:
-	push	rbp
-
-	push	rbx
-
-	push	r12
-
-	push	r13
-
-	push	r14
-
-	push	r15
-
-	lea	rsp,[((-72))+rsp]
-
-	mov	r10,QWORD[160+rsp]
-	mov	r11,QWORD[168+rsp]
-	lea	rsp,[((-160))+rsp]
-	movaps	XMMWORD[64+rsp],xmm6
-	movaps	XMMWORD[80+rsp],xmm7
-	movaps	XMMWORD[96+rsp],xmm8
-	movaps	XMMWORD[112+rsp],xmm9
-	movaps	XMMWORD[128+rsp],xmm10
-	movaps	XMMWORD[144+rsp],xmm11
-	movaps	XMMWORD[160+rsp],xmm12
-	movaps	XMMWORD[176+rsp],xmm13
-	movaps	XMMWORD[192+rsp],xmm14
-	movaps	XMMWORD[208+rsp],xmm15
-$L$xts_enc_body:
-	mov	rbp,rsp
-
-	mov	r12,rcx
-	mov	r13,rdx
-	mov	r14,r8
-	mov	r15,r9
-
-	lea	rcx,[r11]
-	lea	rdx,[32+rbp]
-	lea	r8,[r10]
-	call	asm_AES_encrypt
-
-	mov	eax,DWORD[240+r15]
-	mov	rbx,r14
-
-	mov	edx,eax
-	shl	rax,7
-	sub	rax,96
-	sub	rsp,rax
-
-	mov	rax,rsp
-	mov	rcx,r15
-	mov	r10d,edx
-	call	_bsaes_key_convert
-	pxor	xmm7,xmm6
-	movdqa	XMMWORD[rax],xmm7
-
-	and	r14,-16
-	sub	rsp,0x80
-	movdqa	xmm6,XMMWORD[32+rbp]
-
-	pxor	xmm14,xmm14
-	movdqa	xmm12,XMMWORD[$L$xts_magic]
-	pcmpgtd	xmm14,xmm6
-
-	sub	r14,0x80
-	jc	NEAR $L$xts_enc_short
-	jmp	NEAR $L$xts_enc_loop
-
-ALIGN	16
-$L$xts_enc_loop:
-	pshufd	xmm13,xmm14,0x13
-	pxor	xmm14,xmm14
-	movdqa	xmm15,xmm6
-	movdqa	XMMWORD[rsp],xmm6
-	paddq	xmm6,xmm6
-	pand	xmm13,xmm12
-	pcmpgtd	xmm14,xmm6
-	pxor	xmm6,xmm13
-	pshufd	xmm13,xmm14,0x13
-	pxor	xmm14,xmm14
-	movdqa	xmm0,xmm6
-	movdqa	XMMWORD[16+rsp],xmm6
-	paddq	xmm6,xmm6
-	pand	xmm13,xmm12
-	pcmpgtd	xmm14,xmm6
-	pxor	xmm6,xmm13
-	movdqu	xmm7,XMMWORD[r12]
-	pshufd	xmm13,xmm14,0x13
-	pxor	xmm14,xmm14
-	movdqa	xmm1,xmm6
-	movdqa	XMMWORD[32+rsp],xmm6
-	paddq	xmm6,xmm6
-	pand	xmm13,xmm12
-	pcmpgtd	xmm14,xmm6
-	pxor	xmm6,xmm13
-	movdqu	xmm8,XMMWORD[16+r12]
-	pxor	xmm15,xmm7
-	pshufd	xmm13,xmm14,0x13
-	pxor	xmm14,xmm14
-	movdqa	xmm2,xmm6
-	movdqa	XMMWORD[48+rsp],xmm6
-	paddq	xmm6,xmm6
-	pand	xmm13,xmm12
-	pcmpgtd	xmm14,xmm6
-	pxor	xmm6,xmm13
-	movdqu	xmm9,XMMWORD[32+r12]
-	pxor	xmm0,xmm8
-	pshufd	xmm13,xmm14,0x13
-	pxor	xmm14,xmm14
-	movdqa	xmm3,xmm6
-	movdqa	XMMWORD[64+rsp],xmm6
-	paddq	xmm6,xmm6
-	pand	xmm13,xmm12
-	pcmpgtd	xmm14,xmm6
-	pxor	xmm6,xmm13
-	movdqu	xmm10,XMMWORD[48+r12]
-	pxor	xmm1,xmm9
-	pshufd	xmm13,xmm14,0x13
-	pxor	xmm14,xmm14
-	movdqa	xmm4,xmm6
-	movdqa	XMMWORD[80+rsp],xmm6
-	paddq	xmm6,xmm6
-	pand	xmm13,xmm12
-	pcmpgtd	xmm14,xmm6
-	pxor	xmm6,xmm13
-	movdqu	xmm11,XMMWORD[64+r12]
-	pxor	xmm2,xmm10
-	pshufd	xmm13,xmm14,0x13
-	pxor	xmm14,xmm14
-	movdqa	xmm5,xmm6
-	movdqa	XMMWORD[96+rsp],xmm6
-	paddq	xmm6,xmm6
-	pand	xmm13,xmm12
-	pcmpgtd	xmm14,xmm6
-	pxor	xmm6,xmm13
-	movdqu	xmm12,XMMWORD[80+r12]
-	pxor	xmm3,xmm11
-	movdqu	xmm13,XMMWORD[96+r12]
-	pxor	xmm4,xmm12
-	movdqu	xmm14,XMMWORD[112+r12]
-	lea	r12,[128+r12]
-	movdqa	XMMWORD[112+rsp],xmm6
-	pxor	xmm5,xmm13
-	lea	rax,[128+rsp]
-	pxor	xmm6,xmm14
-	mov	r10d,edx
-
-	call	_bsaes_encrypt8
-
-	pxor	xmm15,XMMWORD[rsp]
-	pxor	xmm0,XMMWORD[16+rsp]
-	movdqu	XMMWORD[r13],xmm15
-	pxor	xmm3,XMMWORD[32+rsp]
-	movdqu	XMMWORD[16+r13],xmm0
-	pxor	xmm5,XMMWORD[48+rsp]
-	movdqu	XMMWORD[32+r13],xmm3
-	pxor	xmm2,XMMWORD[64+rsp]
-	movdqu	XMMWORD[48+r13],xmm5
-	pxor	xmm6,XMMWORD[80+rsp]
-	movdqu	XMMWORD[64+r13],xmm2
-	pxor	xmm1,XMMWORD[96+rsp]
-	movdqu	XMMWORD[80+r13],xmm6
-	pxor	xmm4,XMMWORD[112+rsp]
-	movdqu	XMMWORD[96+r13],xmm1
-	movdqu	XMMWORD[112+r13],xmm4
-	lea	r13,[128+r13]
-
-	movdqa	xmm6,XMMWORD[112+rsp]
-	pxor	xmm14,xmm14
-	movdqa	xmm12,XMMWORD[$L$xts_magic]
-	pcmpgtd	xmm14,xmm6
-	pshufd	xmm13,xmm14,0x13
-	pxor	xmm14,xmm14
-	paddq	xmm6,xmm6
-	pand	xmm13,xmm12
-	pcmpgtd	xmm14,xmm6
-	pxor	xmm6,xmm13
-
-	sub	r14,0x80
-	jnc	NEAR $L$xts_enc_loop
-
-$L$xts_enc_short:
-	add	r14,0x80
-	jz	NEAR $L$xts_enc_done
-	pshufd	xmm13,xmm14,0x13
-	pxor	xmm14,xmm14
-	movdqa	xmm15,xmm6
-	movdqa	XMMWORD[rsp],xmm6
-	paddq	xmm6,xmm6
-	pand	xmm13,xmm12
-	pcmpgtd	xmm14,xmm6
-	pxor	xmm6,xmm13
-	pshufd	xmm13,xmm14,0x13
-	pxor	xmm14,xmm14
-	movdqa	xmm0,xmm6
-	movdqa	XMMWORD[16+rsp],xmm6
-	paddq	xmm6,xmm6
-	pand	xmm13,xmm12
-	pcmpgtd	xmm14,xmm6
-	pxor	xmm6,xmm13
-	movdqu	xmm7,XMMWORD[r12]
-	cmp	r14,16
-	je	NEAR $L$xts_enc_1
-	pshufd	xmm13,xmm14,0x13
-	pxor	xmm14,xmm14
-	movdqa	xmm1,xmm6
-	movdqa	XMMWORD[32+rsp],xmm6
-	paddq	xmm6,xmm6
-	pand	xmm13,xmm12
-	pcmpgtd	xmm14,xmm6
-	pxor	xmm6,xmm13
-	movdqu	xmm8,XMMWORD[16+r12]
-	cmp	r14,32
-	je	NEAR $L$xts_enc_2
-	pxor	xmm15,xmm7
-	pshufd	xmm13,xmm14,0x13
-	pxor	xmm14,xmm14
-	movdqa	xmm2,xmm6
-	movdqa	XMMWORD[48+rsp],xmm6
-	paddq	xmm6,xmm6
-	pand	xmm13,xmm12
-	pcmpgtd	xmm14,xmm6
-	pxor	xmm6,xmm13
-	movdqu	xmm9,XMMWORD[32+r12]
-	cmp	r14,48
-	je	NEAR $L$xts_enc_3
-	pxor	xmm0,xmm8
-	pshufd	xmm13,xmm14,0x13
-	pxor	xmm14,xmm14
-	movdqa	xmm3,xmm6
-	movdqa	XMMWORD[64+rsp],xmm6
-	paddq	xmm6,xmm6
-	pand	xmm13,xmm12
-	pcmpgtd	xmm14,xmm6
-	pxor	xmm6,xmm13
-	movdqu	xmm10,XMMWORD[48+r12]
-	cmp	r14,64
-	je	NEAR $L$xts_enc_4
-	pxor	xmm1,xmm9
-	pshufd	xmm13,xmm14,0x13
-	pxor	xmm14,xmm14
-	movdqa	xmm4,xmm6
-	movdqa	XMMWORD[80+rsp],xmm6
-	paddq	xmm6,xmm6
-	pand	xmm13,xmm12
-	pcmpgtd	xmm14,xmm6
-	pxor	xmm6,xmm13
-	movdqu	xmm11,XMMWORD[64+r12]
-	cmp	r14,80
-	je	NEAR $L$xts_enc_5
-	pxor	xmm2,xmm10
-	pshufd	xmm13,xmm14,0x13
-	pxor	xmm14,xmm14
-	movdqa	xmm5,xmm6
-	movdqa	XMMWORD[96+rsp],xmm6
-	paddq	xmm6,xmm6
-	pand	xmm13,xmm12
-	pcmpgtd	xmm14,xmm6
-	pxor	xmm6,xmm13
-	movdqu	xmm12,XMMWORD[80+r12]
-	cmp	r14,96
-	je	NEAR $L$xts_enc_6
-	pxor	xmm3,xmm11
-	movdqu	xmm13,XMMWORD[96+r12]
-	pxor	xmm4,xmm12
-	movdqa	XMMWORD[112+rsp],xmm6
-	lea	r12,[112+r12]
-	pxor	xmm5,xmm13
-	lea	rax,[128+rsp]
-	mov	r10d,edx
-
-	call	_bsaes_encrypt8
-
-	pxor	xmm15,XMMWORD[rsp]
-	pxor	xmm0,XMMWORD[16+rsp]
-	movdqu	XMMWORD[r13],xmm15
-	pxor	xmm3,XMMWORD[32+rsp]
-	movdqu	XMMWORD[16+r13],xmm0
-	pxor	xmm5,XMMWORD[48+rsp]
-	movdqu	XMMWORD[32+r13],xmm3
-	pxor	xmm2,XMMWORD[64+rsp]
-	movdqu	XMMWORD[48+r13],xmm5
-	pxor	xmm6,XMMWORD[80+rsp]
-	movdqu	XMMWORD[64+r13],xmm2
-	pxor	xmm1,XMMWORD[96+rsp]
-	movdqu	XMMWORD[80+r13],xmm6
-	movdqu	XMMWORD[96+r13],xmm1
-	lea	r13,[112+r13]
-
-	movdqa	xmm6,XMMWORD[112+rsp]
-	jmp	NEAR $L$xts_enc_done
-ALIGN	16
-$L$xts_enc_6:
-	pxor	xmm3,xmm11
-	lea	r12,[96+r12]
-	pxor	xmm4,xmm12
-	lea	rax,[128+rsp]
-	mov	r10d,edx
-
-	call	_bsaes_encrypt8
-
-	pxor	xmm15,XMMWORD[rsp]
-	pxor	xmm0,XMMWORD[16+rsp]
-	movdqu	XMMWORD[r13],xmm15
-	pxor	xmm3,XMMWORD[32+rsp]
-	movdqu	XMMWORD[16+r13],xmm0
-	pxor	xmm5,XMMWORD[48+rsp]
-	movdqu	XMMWORD[32+r13],xmm3
-	pxor	xmm2,XMMWORD[64+rsp]
-	movdqu	XMMWORD[48+r13],xmm5
-	pxor	xmm6,XMMWORD[80+rsp]
-	movdqu	XMMWORD[64+r13],xmm2
-	movdqu	XMMWORD[80+r13],xmm6
-	lea	r13,[96+r13]
-
-	movdqa	xmm6,XMMWORD[96+rsp]
-	jmp	NEAR $L$xts_enc_done
-ALIGN	16
-$L$xts_enc_5:
-	pxor	xmm2,xmm10
-	lea	r12,[80+r12]
-	pxor	xmm3,xmm11
-	lea	rax,[128+rsp]
-	mov	r10d,edx
-
-	call	_bsaes_encrypt8
-
-	pxor	xmm15,XMMWORD[rsp]
-	pxor	xmm0,XMMWORD[16+rsp]
-	movdqu	XMMWORD[r13],xmm15
-	pxor	xmm3,XMMWORD[32+rsp]
-	movdqu	XMMWORD[16+r13],xmm0
-	pxor	xmm5,XMMWORD[48+rsp]
-	movdqu	XMMWORD[32+r13],xmm3
-	pxor	xmm2,XMMWORD[64+rsp]
-	movdqu	XMMWORD[48+r13],xmm5
-	movdqu	XMMWORD[64+r13],xmm2
-	lea	r13,[80+r13]
-
-	movdqa	xmm6,XMMWORD[80+rsp]
-	jmp	NEAR $L$xts_enc_done
-ALIGN	16
-$L$xts_enc_4:
-	pxor	xmm1,xmm9
-	lea	r12,[64+r12]
-	pxor	xmm2,xmm10
-	lea	rax,[128+rsp]
-	mov	r10d,edx
-
-	call	_bsaes_encrypt8
-
-	pxor	xmm15,XMMWORD[rsp]
-	pxor	xmm0,XMMWORD[16+rsp]
-	movdqu	XMMWORD[r13],xmm15
-	pxor	xmm3,XMMWORD[32+rsp]
-	movdqu	XMMWORD[16+r13],xmm0
-	pxor	xmm5,XMMWORD[48+rsp]
-	movdqu	XMMWORD[32+r13],xmm3
-	movdqu	XMMWORD[48+r13],xmm5
-	lea	r13,[64+r13]
-
-	movdqa	xmm6,XMMWORD[64+rsp]
-	jmp	NEAR $L$xts_enc_done
-ALIGN	16
-$L$xts_enc_3:
-	pxor	xmm0,xmm8
-	lea	r12,[48+r12]
-	pxor	xmm1,xmm9
-	lea	rax,[128+rsp]
-	mov	r10d,edx
-
-	call	_bsaes_encrypt8
-
-	pxor	xmm15,XMMWORD[rsp]
-	pxor	xmm0,XMMWORD[16+rsp]
-	movdqu	XMMWORD[r13],xmm15
-	pxor	xmm3,XMMWORD[32+rsp]
-	movdqu	XMMWORD[16+r13],xmm0
-	movdqu	XMMWORD[32+r13],xmm3
-	lea	r13,[48+r13]
-
-	movdqa	xmm6,XMMWORD[48+rsp]
-	jmp	NEAR $L$xts_enc_done
-ALIGN	16
-$L$xts_enc_2:
-	pxor	xmm15,xmm7
-	lea	r12,[32+r12]
-	pxor	xmm0,xmm8
-	lea	rax,[128+rsp]
-	mov	r10d,edx
-
-	call	_bsaes_encrypt8
-
-	pxor	xmm15,XMMWORD[rsp]
-	pxor	xmm0,XMMWORD[16+rsp]
-	movdqu	XMMWORD[r13],xmm15
-	movdqu	XMMWORD[16+r13],xmm0
-	lea	r13,[32+r13]
-
-	movdqa	xmm6,XMMWORD[32+rsp]
-	jmp	NEAR $L$xts_enc_done
-ALIGN	16
-$L$xts_enc_1:
-	pxor	xmm7,xmm15
-	lea	r12,[16+r12]
-	movdqa	XMMWORD[32+rbp],xmm7
-	lea	rcx,[32+rbp]
-	lea	rdx,[32+rbp]
-	lea	r8,[r15]
-	call	asm_AES_encrypt
-	pxor	xmm15,XMMWORD[32+rbp]
-
-
-
-
-
-	movdqu	XMMWORD[r13],xmm15
-	lea	r13,[16+r13]
-
-	movdqa	xmm6,XMMWORD[16+rsp]
-
-$L$xts_enc_done:
-	and	ebx,15
-	jz	NEAR $L$xts_enc_ret
-	mov	rdx,r13
-
-$L$xts_enc_steal:
-	movzx	eax,BYTE[r12]
-	movzx	ecx,BYTE[((-16))+rdx]
-	lea	r12,[1+r12]
-	mov	BYTE[((-16))+rdx],al
-	mov	BYTE[rdx],cl
-	lea	rdx,[1+rdx]
-	sub	ebx,1
-	jnz	NEAR $L$xts_enc_steal
-
-	movdqu	xmm15,XMMWORD[((-16))+r13]
-	lea	rcx,[32+rbp]
-	pxor	xmm15,xmm6
-	lea	rdx,[32+rbp]
-	movdqa	XMMWORD[32+rbp],xmm15
-	lea	r8,[r15]
-	call	asm_AES_encrypt
-	pxor	xmm6,XMMWORD[32+rbp]
-	movdqu	XMMWORD[(-16)+r13],xmm6
-
-$L$xts_enc_ret:
-	lea	rax,[rsp]
-	pxor	xmm0,xmm0
-$L$xts_enc_bzero:
-	movdqa	XMMWORD[rax],xmm0
-	movdqa	XMMWORD[16+rax],xmm0
-	lea	rax,[32+rax]
-	cmp	rbp,rax
-	ja	NEAR $L$xts_enc_bzero
-
-	lea	rax,[120+rbp]
-
-	movaps	xmm6,XMMWORD[64+rbp]
-	movaps	xmm7,XMMWORD[80+rbp]
-	movaps	xmm8,XMMWORD[96+rbp]
-	movaps	xmm9,XMMWORD[112+rbp]
-	movaps	xmm10,XMMWORD[128+rbp]
-	movaps	xmm11,XMMWORD[144+rbp]
-	movaps	xmm12,XMMWORD[160+rbp]
-	movaps	xmm13,XMMWORD[176+rbp]
-	movaps	xmm14,XMMWORD[192+rbp]
-	movaps	xmm15,XMMWORD[208+rbp]
-	lea	rax,[160+rax]
-$L$xts_enc_tail:
-	mov	r15,QWORD[((-48))+rax]
-
-	mov	r14,QWORD[((-40))+rax]
-
-	mov	r13,QWORD[((-32))+rax]
-
-	mov	r12,QWORD[((-24))+rax]
-
-	mov	rbx,QWORD[((-16))+rax]
-
-	mov	rbp,QWORD[((-8))+rax]
-
-	lea	rsp,[rax]
-
-$L$xts_enc_epilogue:
-	DB	0F3h,0C3h		;repret
-
-
-
-global	bsaes_xts_decrypt
-
-ALIGN	16
-bsaes_xts_decrypt:
-
-	mov	rax,rsp
-$L$xts_dec_prologue:
-	push	rbp
-
-	push	rbx
-
-	push	r12
-
-	push	r13
-
-	push	r14
-
-	push	r15
-
-	lea	rsp,[((-72))+rsp]
-
-	mov	r10,QWORD[160+rsp]
-	mov	r11,QWORD[168+rsp]
-	lea	rsp,[((-160))+rsp]
-	movaps	XMMWORD[64+rsp],xmm6
-	movaps	XMMWORD[80+rsp],xmm7
-	movaps	XMMWORD[96+rsp],xmm8
-	movaps	XMMWORD[112+rsp],xmm9
-	movaps	XMMWORD[128+rsp],xmm10
-	movaps	XMMWORD[144+rsp],xmm11
-	movaps	XMMWORD[160+rsp],xmm12
-	movaps	XMMWORD[176+rsp],xmm13
-	movaps	XMMWORD[192+rsp],xmm14
-	movaps	XMMWORD[208+rsp],xmm15
-$L$xts_dec_body:
-	mov	rbp,rsp
-	mov	r12,rcx
-	mov	r13,rdx
-	mov	r14,r8
-	mov	r15,r9
-
-	lea	rcx,[r11]
-	lea	rdx,[32+rbp]
-	lea	r8,[r10]
-	call	asm_AES_encrypt
-
-	mov	eax,DWORD[240+r15]
-	mov	rbx,r14
-
-	mov	edx,eax
-	shl	rax,7
-	sub	rax,96
-	sub	rsp,rax
-
-	mov	rax,rsp
-	mov	rcx,r15
-	mov	r10d,edx
-	call	_bsaes_key_convert
-	pxor	xmm7,XMMWORD[rsp]
-	movdqa	XMMWORD[rax],xmm6
-	movdqa	XMMWORD[rsp],xmm7
-
-	xor	eax,eax
-	and	r14,-16
-	test	ebx,15
-	setnz	al
-	shl	rax,4
-	sub	r14,rax
-
-	sub	rsp,0x80
-	movdqa	xmm6,XMMWORD[32+rbp]
-
-	pxor	xmm14,xmm14
-	movdqa	xmm12,XMMWORD[$L$xts_magic]
-	pcmpgtd	xmm14,xmm6
-
-	sub	r14,0x80
-	jc	NEAR $L$xts_dec_short
-	jmp	NEAR $L$xts_dec_loop
-
-ALIGN	16
-$L$xts_dec_loop:
-	pshufd	xmm13,xmm14,0x13
-	pxor	xmm14,xmm14
-	movdqa	xmm15,xmm6
-	movdqa	XMMWORD[rsp],xmm6
-	paddq	xmm6,xmm6
-	pand	xmm13,xmm12
-	pcmpgtd	xmm14,xmm6
-	pxor	xmm6,xmm13
-	pshufd	xmm13,xmm14,0x13
-	pxor	xmm14,xmm14
-	movdqa	xmm0,xmm6
-	movdqa	XMMWORD[16+rsp],xmm6
-	paddq	xmm6,xmm6
-	pand	xmm13,xmm12
-	pcmpgtd	xmm14,xmm6
-	pxor	xmm6,xmm13
-	movdqu	xmm7,XMMWORD[r12]
-	pshufd	xmm13,xmm14,0x13
-	pxor	xmm14,xmm14
-	movdqa	xmm1,xmm6
-	movdqa	XMMWORD[32+rsp],xmm6
-	paddq	xmm6,xmm6
-	pand	xmm13,xmm12
-	pcmpgtd	xmm14,xmm6
-	pxor	xmm6,xmm13
-	movdqu	xmm8,XMMWORD[16+r12]
-	pxor	xmm15,xmm7
-	pshufd	xmm13,xmm14,0x13
-	pxor	xmm14,xmm14
-	movdqa	xmm2,xmm6
-	movdqa	XMMWORD[48+rsp],xmm6
-	paddq	xmm6,xmm6
-	pand	xmm13,xmm12
-	pcmpgtd	xmm14,xmm6
-	pxor	xmm6,xmm13
-	movdqu	xmm9,XMMWORD[32+r12]
-	pxor	xmm0,xmm8
-	pshufd	xmm13,xmm14,0x13
-	pxor	xmm14,xmm14
-	movdqa	xmm3,xmm6
-	movdqa	XMMWORD[64+rsp],xmm6
-	paddq	xmm6,xmm6
-	pand	xmm13,xmm12
-	pcmpgtd	xmm14,xmm6
-	pxor	xmm6,xmm13
-	movdqu	xmm10,XMMWORD[48+r12]
-	pxor	xmm1,xmm9
-	pshufd	xmm13,xmm14,0x13
-	pxor	xmm14,xmm14
-	movdqa	xmm4,xmm6
-	movdqa	XMMWORD[80+rsp],xmm6
-	paddq	xmm6,xmm6
-	pand	xmm13,xmm12
-	pcmpgtd	xmm14,xmm6
-	pxor	xmm6,xmm13
-	movdqu	xmm11,XMMWORD[64+r12]
-	pxor	xmm2,xmm10
-	pshufd	xmm13,xmm14,0x13
-	pxor	xmm14,xmm14
-	movdqa	xmm5,xmm6
-	movdqa	XMMWORD[96+rsp],xmm6
-	paddq	xmm6,xmm6
-	pand	xmm13,xmm12
-	pcmpgtd	xmm14,xmm6
-	pxor	xmm6,xmm13
-	movdqu	xmm12,XMMWORD[80+r12]
-	pxor	xmm3,xmm11
-	movdqu	xmm13,XMMWORD[96+r12]
-	pxor	xmm4,xmm12
-	movdqu	xmm14,XMMWORD[112+r12]
-	lea	r12,[128+r12]
-	movdqa	XMMWORD[112+rsp],xmm6
-	pxor	xmm5,xmm13
-	lea	rax,[128+rsp]
-	pxor	xmm6,xmm14
-	mov	r10d,edx
-
-	call	_bsaes_decrypt8
-
-	pxor	xmm15,XMMWORD[rsp]
-	pxor	xmm0,XMMWORD[16+rsp]
-	movdqu	XMMWORD[r13],xmm15
-	pxor	xmm5,XMMWORD[32+rsp]
-	movdqu	XMMWORD[16+r13],xmm0
-	pxor	xmm3,XMMWORD[48+rsp]
-	movdqu	XMMWORD[32+r13],xmm5
-	pxor	xmm1,XMMWORD[64+rsp]
-	movdqu	XMMWORD[48+r13],xmm3
-	pxor	xmm6,XMMWORD[80+rsp]
-	movdqu	XMMWORD[64+r13],xmm1
-	pxor	xmm2,XMMWORD[96+rsp]
-	movdqu	XMMWORD[80+r13],xmm6
-	pxor	xmm4,XMMWORD[112+rsp]
-	movdqu	XMMWORD[96+r13],xmm2
-	movdqu	XMMWORD[112+r13],xmm4
-	lea	r13,[128+r13]
-
-	movdqa	xmm6,XMMWORD[112+rsp]
-	pxor	xmm14,xmm14
-	movdqa	xmm12,XMMWORD[$L$xts_magic]
-	pcmpgtd	xmm14,xmm6
-	pshufd	xmm13,xmm14,0x13
-	pxor	xmm14,xmm14
-	paddq	xmm6,xmm6
-	pand	xmm13,xmm12
-	pcmpgtd	xmm14,xmm6
-	pxor	xmm6,xmm13
-
-	sub	r14,0x80
-	jnc	NEAR $L$xts_dec_loop
-
-$L$xts_dec_short:
-	add	r14,0x80
-	jz	NEAR $L$xts_dec_done
-	pshufd	xmm13,xmm14,0x13
-	pxor	xmm14,xmm14
-	movdqa	xmm15,xmm6
-	movdqa	XMMWORD[rsp],xmm6
-	paddq	xmm6,xmm6
-	pand	xmm13,xmm12
-	pcmpgtd	xmm14,xmm6
-	pxor	xmm6,xmm13
-	pshufd	xmm13,xmm14,0x13
-	pxor	xmm14,xmm14
-	movdqa	xmm0,xmm6
-	movdqa	XMMWORD[16+rsp],xmm6
-	paddq	xmm6,xmm6
-	pand	xmm13,xmm12
-	pcmpgtd	xmm14,xmm6
-	pxor	xmm6,xmm13
-	movdqu	xmm7,XMMWORD[r12]
-	cmp	r14,16
-	je	NEAR $L$xts_dec_1
-	pshufd	xmm13,xmm14,0x13
-	pxor	xmm14,xmm14
-	movdqa	xmm1,xmm6
-	movdqa	XMMWORD[32+rsp],xmm6
-	paddq	xmm6,xmm6
-	pand	xmm13,xmm12
-	pcmpgtd	xmm14,xmm6
-	pxor	xmm6,xmm13
-	movdqu	xmm8,XMMWORD[16+r12]
-	cmp	r14,32
-	je	NEAR $L$xts_dec_2
-	pxor	xmm15,xmm7
-	pshufd	xmm13,xmm14,0x13
-	pxor	xmm14,xmm14
-	movdqa	xmm2,xmm6
-	movdqa	XMMWORD[48+rsp],xmm6
-	paddq	xmm6,xmm6
-	pand	xmm13,xmm12
-	pcmpgtd	xmm14,xmm6
-	pxor	xmm6,xmm13
-	movdqu	xmm9,XMMWORD[32+r12]
-	cmp	r14,48
-	je	NEAR $L$xts_dec_3
-	pxor	xmm0,xmm8
-	pshufd	xmm13,xmm14,0x13
-	pxor	xmm14,xmm14
-	movdqa	xmm3,xmm6
-	movdqa	XMMWORD[64+rsp],xmm6
-	paddq	xmm6,xmm6
-	pand	xmm13,xmm12
-	pcmpgtd	xmm14,xmm6
-	pxor	xmm6,xmm13
-	movdqu	xmm10,XMMWORD[48+r12]
-	cmp	r14,64
-	je	NEAR $L$xts_dec_4
-	pxor	xmm1,xmm9
-	pshufd	xmm13,xmm14,0x13
-	pxor	xmm14,xmm14
-	movdqa	xmm4,xmm6
-	movdqa	XMMWORD[80+rsp],xmm6
-	paddq	xmm6,xmm6
-	pand	xmm13,xmm12
-	pcmpgtd	xmm14,xmm6
-	pxor	xmm6,xmm13
-	movdqu	xmm11,XMMWORD[64+r12]
-	cmp	r14,80
-	je	NEAR $L$xts_dec_5
-	pxor	xmm2,xmm10
-	pshufd	xmm13,xmm14,0x13
-	pxor	xmm14,xmm14
-	movdqa	xmm5,xmm6
-	movdqa	XMMWORD[96+rsp],xmm6
-	paddq	xmm6,xmm6
-	pand	xmm13,xmm12
-	pcmpgtd	xmm14,xmm6
-	pxor	xmm6,xmm13
-	movdqu	xmm12,XMMWORD[80+r12]
-	cmp	r14,96
-	je	NEAR $L$xts_dec_6
-	pxor	xmm3,xmm11
-	movdqu	xmm13,XMMWORD[96+r12]
-	pxor	xmm4,xmm12
-	movdqa	XMMWORD[112+rsp],xmm6
-	lea	r12,[112+r12]
-	pxor	xmm5,xmm13
-	lea	rax,[128+rsp]
-	mov	r10d,edx
-
-	call	_bsaes_decrypt8
-
-	pxor	xmm15,XMMWORD[rsp]
-	pxor	xmm0,XMMWORD[16+rsp]
-	movdqu	XMMWORD[r13],xmm15
-	pxor	xmm5,XMMWORD[32+rsp]
-	movdqu	XMMWORD[16+r13],xmm0
-	pxor	xmm3,XMMWORD[48+rsp]
-	movdqu	XMMWORD[32+r13],xmm5
-	pxor	xmm1,XMMWORD[64+rsp]
-	movdqu	XMMWORD[48+r13],xmm3
-	pxor	xmm6,XMMWORD[80+rsp]
-	movdqu	XMMWORD[64+r13],xmm1
-	pxor	xmm2,XMMWORD[96+rsp]
-	movdqu	XMMWORD[80+r13],xmm6
-	movdqu	XMMWORD[96+r13],xmm2
-	lea	r13,[112+r13]
-
-	movdqa	xmm6,XMMWORD[112+rsp]
-	jmp	NEAR $L$xts_dec_done
-ALIGN	16
-$L$xts_dec_6:
-	pxor	xmm3,xmm11
-	lea	r12,[96+r12]
-	pxor	xmm4,xmm12
-	lea	rax,[128+rsp]
-	mov	r10d,edx
-
-	call	_bsaes_decrypt8
-
-	pxor	xmm15,XMMWORD[rsp]
-	pxor	xmm0,XMMWORD[16+rsp]
-	movdqu	XMMWORD[r13],xmm15
-	pxor	xmm5,XMMWORD[32+rsp]
-	movdqu	XMMWORD[16+r13],xmm0
-	pxor	xmm3,XMMWORD[48+rsp]
-	movdqu	XMMWORD[32+r13],xmm5
-	pxor	xmm1,XMMWORD[64+rsp]
-	movdqu	XMMWORD[48+r13],xmm3
-	pxor	xmm6,XMMWORD[80+rsp]
-	movdqu	XMMWORD[64+r13],xmm1
-	movdqu	XMMWORD[80+r13],xmm6
-	lea	r13,[96+r13]
-
-	movdqa	xmm6,XMMWORD[96+rsp]
-	jmp	NEAR $L$xts_dec_done
-ALIGN	16
-$L$xts_dec_5:
-	pxor	xmm2,xmm10
-	lea	r12,[80+r12]
-	pxor	xmm3,xmm11
-	lea	rax,[128+rsp]
-	mov	r10d,edx
-
-	call	_bsaes_decrypt8
-
-	pxor	xmm15,XMMWORD[rsp]
-	pxor	xmm0,XMMWORD[16+rsp]
-	movdqu	XMMWORD[r13],xmm15
-	pxor	xmm5,XMMWORD[32+rsp]
-	movdqu	XMMWORD[16+r13],xmm0
-	pxor	xmm3,XMMWORD[48+rsp]
-	movdqu	XMMWORD[32+r13],xmm5
-	pxor	xmm1,XMMWORD[64+rsp]
-	movdqu	XMMWORD[48+r13],xmm3
-	movdqu	XMMWORD[64+r13],xmm1
-	lea	r13,[80+r13]
-
-	movdqa	xmm6,XMMWORD[80+rsp]
-	jmp	NEAR $L$xts_dec_done
-ALIGN	16
-$L$xts_dec_4:
-	pxor	xmm1,xmm9
-	lea	r12,[64+r12]
-	pxor	xmm2,xmm10
-	lea	rax,[128+rsp]
-	mov	r10d,edx
-
-	call	_bsaes_decrypt8
-
-	pxor	xmm15,XMMWORD[rsp]
-	pxor	xmm0,XMMWORD[16+rsp]
-	movdqu	XMMWORD[r13],xmm15
-	pxor	xmm5,XMMWORD[32+rsp]
-	movdqu	XMMWORD[16+r13],xmm0
-	pxor	xmm3,XMMWORD[48+rsp]
-	movdqu	XMMWORD[32+r13],xmm5
-	movdqu	XMMWORD[48+r13],xmm3
-	lea	r13,[64+r13]
-
-	movdqa	xmm6,XMMWORD[64+rsp]
-	jmp	NEAR $L$xts_dec_done
-ALIGN	16
-$L$xts_dec_3:
-	pxor	xmm0,xmm8
-	lea	r12,[48+r12]
-	pxor	xmm1,xmm9
-	lea	rax,[128+rsp]
-	mov	r10d,edx
-
-	call	_bsaes_decrypt8
-
-	pxor	xmm15,XMMWORD[rsp]
-	pxor	xmm0,XMMWORD[16+rsp]
-	movdqu	XMMWORD[r13],xmm15
-	pxor	xmm5,XMMWORD[32+rsp]
-	movdqu	XMMWORD[16+r13],xmm0
-	movdqu	XMMWORD[32+r13],xmm5
-	lea	r13,[48+r13]
-
-	movdqa	xmm6,XMMWORD[48+rsp]
-	jmp	NEAR $L$xts_dec_done
-ALIGN	16
-$L$xts_dec_2:
-	pxor	xmm15,xmm7
-	lea	r12,[32+r12]
-	pxor	xmm0,xmm8
-	lea	rax,[128+rsp]
-	mov	r10d,edx
-
-	call	_bsaes_decrypt8
-
-	pxor	xmm15,XMMWORD[rsp]
-	pxor	xmm0,XMMWORD[16+rsp]
-	movdqu	XMMWORD[r13],xmm15
-	movdqu	XMMWORD[16+r13],xmm0
-	lea	r13,[32+r13]
-
-	movdqa	xmm6,XMMWORD[32+rsp]
-	jmp	NEAR $L$xts_dec_done
-ALIGN	16
-$L$xts_dec_1:
-	pxor	xmm7,xmm15
-	lea	r12,[16+r12]
-	movdqa	XMMWORD[32+rbp],xmm7
-	lea	rcx,[32+rbp]
-	lea	rdx,[32+rbp]
-	lea	r8,[r15]
-	call	asm_AES_decrypt
-	pxor	xmm15,XMMWORD[32+rbp]
-
-
-
-
-
-	movdqu	XMMWORD[r13],xmm15
-	lea	r13,[16+r13]
-
-	movdqa	xmm6,XMMWORD[16+rsp]
-
-$L$xts_dec_done:
-	and	ebx,15
-	jz	NEAR $L$xts_dec_ret
-
-	pxor	xmm14,xmm14
-	movdqa	xmm12,XMMWORD[$L$xts_magic]
-	pcmpgtd	xmm14,xmm6
-	pshufd	xmm13,xmm14,0x13
-	movdqa	xmm5,xmm6
-	paddq	xmm6,xmm6
-	pand	xmm13,xmm12
-	movdqu	xmm15,XMMWORD[r12]
-	pxor	xmm6,xmm13
-
-	lea	rcx,[32+rbp]
-	pxor	xmm15,xmm6
-	lea	rdx,[32+rbp]
-	movdqa	XMMWORD[32+rbp],xmm15
-	lea	r8,[r15]
-	call	asm_AES_decrypt
-	pxor	xmm6,XMMWORD[32+rbp]
-	mov	rdx,r13
-	movdqu	XMMWORD[r13],xmm6
-
-$L$xts_dec_steal:
-	movzx	eax,BYTE[16+r12]
-	movzx	ecx,BYTE[rdx]
-	lea	r12,[1+r12]
-	mov	BYTE[rdx],al
-	mov	BYTE[16+rdx],cl
-	lea	rdx,[1+rdx]
-	sub	ebx,1
-	jnz	NEAR $L$xts_dec_steal
-
-	movdqu	xmm15,XMMWORD[r13]
-	lea	rcx,[32+rbp]
-	pxor	xmm15,xmm5
-	lea	rdx,[32+rbp]
-	movdqa	XMMWORD[32+rbp],xmm15
-	lea	r8,[r15]
-	call	asm_AES_decrypt
-	pxor	xmm5,XMMWORD[32+rbp]
-	movdqu	XMMWORD[r13],xmm5
-
-$L$xts_dec_ret:
-	lea	rax,[rsp]
-	pxor	xmm0,xmm0
-$L$xts_dec_bzero:
-	movdqa	XMMWORD[rax],xmm0
-	movdqa	XMMWORD[16+rax],xmm0
-	lea	rax,[32+rax]
-	cmp	rbp,rax
-	ja	NEAR $L$xts_dec_bzero
-
-	lea	rax,[120+rbp]
-
-	movaps	xmm6,XMMWORD[64+rbp]
-	movaps	xmm7,XMMWORD[80+rbp]
-	movaps	xmm8,XMMWORD[96+rbp]
-	movaps	xmm9,XMMWORD[112+rbp]
-	movaps	xmm10,XMMWORD[128+rbp]
-	movaps	xmm11,XMMWORD[144+rbp]
-	movaps	xmm12,XMMWORD[160+rbp]
-	movaps	xmm13,XMMWORD[176+rbp]
-	movaps	xmm14,XMMWORD[192+rbp]
-	movaps	xmm15,XMMWORD[208+rbp]
-	lea	rax,[160+rax]
-$L$xts_dec_tail:
-	mov	r15,QWORD[((-48))+rax]
-
-	mov	r14,QWORD[((-40))+rax]
-
-	mov	r13,QWORD[((-32))+rax]
-
-	mov	r12,QWORD[((-24))+rax]
-
-	mov	rbx,QWORD[((-16))+rax]
-
-	mov	rbp,QWORD[((-8))+rax]
-
-	lea	rsp,[rax]
-
-$L$xts_dec_epilogue:
-	DB	0F3h,0C3h		;repret
-
-
-
-ALIGN	64
-_bsaes_const:
-$L$M0ISR:
-	DQ	0x0a0e0206070b0f03,0x0004080c0d010509
-$L$ISRM0:
-	DQ	0x01040b0e0205080f,0x0306090c00070a0d
-$L$ISR:
-	DQ	0x0504070602010003,0x0f0e0d0c080b0a09
-$L$BS0:
-	DQ	0x5555555555555555,0x5555555555555555
-$L$BS1:
-	DQ	0x3333333333333333,0x3333333333333333
-$L$BS2:
-	DQ	0x0f0f0f0f0f0f0f0f,0x0f0f0f0f0f0f0f0f
-$L$SR:
-	DQ	0x0504070600030201,0x0f0e0d0c0a09080b
-$L$SRM0:
-	DQ	0x0304090e00050a0f,0x01060b0c0207080d
-$L$M0SR:
-	DQ	0x0a0e02060f03070b,0x0004080c05090d01
-$L$SWPUP:
-	DQ	0x0706050403020100,0x0c0d0e0f0b0a0908
-$L$SWPUPM0SR:
-	DQ	0x0a0d02060c03070b,0x0004080f05090e01
-$L$ADD1:
-	DQ	0x0000000000000000,0x0000000100000000
-$L$ADD2:
-	DQ	0x0000000000000000,0x0000000200000000
-$L$ADD3:
-	DQ	0x0000000000000000,0x0000000300000000
-$L$ADD4:
-	DQ	0x0000000000000000,0x0000000400000000
-$L$ADD5:
-	DQ	0x0000000000000000,0x0000000500000000
-$L$ADD6:
-	DQ	0x0000000000000000,0x0000000600000000
-$L$ADD7:
-	DQ	0x0000000000000000,0x0000000700000000
-$L$ADD8:
-	DQ	0x0000000000000000,0x0000000800000000
-$L$xts_magic:
-	DD	0x87,0,1,0
-$L$masks:
-	DQ	0x0101010101010101,0x0101010101010101
-	DQ	0x0202020202020202,0x0202020202020202
-	DQ	0x0404040404040404,0x0404040404040404
-	DQ	0x0808080808080808,0x0808080808080808
-$L$M0:
-	DQ	0x02060a0e03070b0f,0x0004080c0105090d
-$L$63:
-	DQ	0x6363636363636363,0x6363636363636363
-DB	66,105,116,45,115,108,105,99,101,100,32,65,69,83,32,102
-DB	111,114,32,120,56,54,95,54,52,47,83,83,83,69,51,44
-DB	32,69,109,105,108,105,97,32,75,195,164,115,112,101,114,44
-DB	32,80,101,116,101,114,32,83,99,104,119,97,98,101,44,32
-DB	65,110,100,121,32,80,111,108,121,97,107,111,118,0
-ALIGN	64
-
-EXTERN	__imp_RtlVirtualUnwind
-
-ALIGN	16
-se_handler:
-	push	rsi
-	push	rdi
-	push	rbx
-	push	rbp
-	push	r12
-	push	r13
-	push	r14
-	push	r15
-	pushfq
-	sub	rsp,64
-
-	mov	rax,QWORD[120+r8]
-	mov	rbx,QWORD[248+r8]
-
-	mov	rsi,QWORD[8+r9]
-	mov	r11,QWORD[56+r9]
-
-	mov	r10d,DWORD[r11]
-	lea	r10,[r10*1+rsi]
-	cmp	rbx,r10
-	jbe	NEAR $L$in_prologue
-
-	mov	r10d,DWORD[4+r11]
-	lea	r10,[r10*1+rsi]
-	cmp	rbx,r10
-	jae	NEAR $L$in_prologue
-
-	mov	r10d,DWORD[8+r11]
-	lea	r10,[r10*1+rsi]
-	cmp	rbx,r10
-	jae	NEAR $L$in_tail
-
-	mov	rax,QWORD[160+r8]
-
-	lea	rsi,[64+rax]
-	lea	rdi,[512+r8]
-	mov	ecx,20
-	DD	0xa548f3fc
-	lea	rax,[((160+120))+rax]
-
-$L$in_tail:
-	mov	rbp,QWORD[((-48))+rax]
-	mov	rbx,QWORD[((-40))+rax]
-	mov	r12,QWORD[((-32))+rax]
-	mov	r13,QWORD[((-24))+rax]
-	mov	r14,QWORD[((-16))+rax]
-	mov	r15,QWORD[((-8))+rax]
-	mov	QWORD[144+r8],rbx
-	mov	QWORD[160+r8],rbp
-	mov	QWORD[216+r8],r12
-	mov	QWORD[224+r8],r13
-	mov	QWORD[232+r8],r14
-	mov	QWORD[240+r8],r15
-
-$L$in_prologue:
-	mov	QWORD[152+r8],rax
-
-	mov	rdi,QWORD[40+r9]
-	mov	rsi,r8
-	mov	ecx,154
-	DD	0xa548f3fc
-
-	mov	rsi,r9
-	xor	rcx,rcx
-	mov	rdx,QWORD[8+rsi]
-	mov	r8,QWORD[rsi]
-	mov	r9,QWORD[16+rsi]
-	mov	r10,QWORD[40+rsi]
-	lea	r11,[56+rsi]
-	lea	r12,[24+rsi]
-	mov	QWORD[32+rsp],r10
-	mov	QWORD[40+rsp],r11
-	mov	QWORD[48+rsp],r12
-	mov	QWORD[56+rsp],rcx
-	call	QWORD[__imp_RtlVirtualUnwind]
-
-	mov	eax,1
-	add	rsp,64
-	popfq
-	pop	r15
-	pop	r14
-	pop	r13
-	pop	r12
-	pop	rbp
-	pop	rbx
-	pop	rdi
-	pop	rsi
-	DB	0F3h,0C3h		;repret
-
-
-section	.pdata rdata align=4
-ALIGN	4
-	DD	$L$cbc_dec_prologue wrt ..imagebase
-	DD	$L$cbc_dec_epilogue wrt ..imagebase
-	DD	$L$cbc_dec_info wrt ..imagebase
-
-	DD	$L$ctr_enc_prologue wrt ..imagebase
-	DD	$L$ctr_enc_epilogue wrt ..imagebase
-	DD	$L$ctr_enc_info wrt ..imagebase
-
-	DD	$L$xts_enc_prologue wrt ..imagebase
-	DD	$L$xts_enc_epilogue wrt ..imagebase
-	DD	$L$xts_enc_info wrt ..imagebase
-
-	DD	$L$xts_dec_prologue wrt ..imagebase
-	DD	$L$xts_dec_epilogue wrt ..imagebase
-	DD	$L$xts_dec_info wrt ..imagebase
-
-section	.xdata rdata align=8
-ALIGN	8
-$L$cbc_dec_info:
-DB	9,0,0,0
-	DD	se_handler wrt ..imagebase
-	DD	$L$cbc_dec_body wrt ..imagebase,$L$cbc_dec_epilogue wrt ..imagebase
-	DD	$L$cbc_dec_tail wrt ..imagebase
-	DD	0
-$L$ctr_enc_info:
-DB	9,0,0,0
-	DD	se_handler wrt ..imagebase
-	DD	$L$ctr_enc_body wrt ..imagebase,$L$ctr_enc_epilogue wrt ..imagebase
-	DD	$L$ctr_enc_tail wrt ..imagebase
-	DD	0
-$L$xts_enc_info:
-DB	9,0,0,0
-	DD	se_handler wrt ..imagebase
-	DD	$L$xts_enc_body wrt ..imagebase,$L$xts_enc_epilogue wrt ..imagebase
-	DD	$L$xts_enc_tail wrt ..imagebase
-	DD	0
-$L$xts_dec_info:
-DB	9,0,0,0
-	DD	se_handler wrt ..imagebase
-	DD	$L$xts_dec_body wrt ..imagebase,$L$xts_dec_epilogue wrt ..imagebase
-	DD	$L$xts_dec_tail wrt ..imagebase
-	DD	0
diff --git a/deps/openssl/config/archs/VC-WIN64A/asm_avx2/crypto/bn/rsaz-x86_64.asm b/deps/openssl/config/archs/VC-WIN64A/asm_avx2/crypto/bn/rsaz-x86_64.asm
index 603a8d17b8..a474c5d9a6 100644
--- a/deps/openssl/config/archs/VC-WIN64A/asm_avx2/crypto/bn/rsaz-x86_64.asm
+++ b/deps/openssl/config/archs/VC-WIN64A/asm_avx2/crypto/bn/rsaz-x86_64.asm
@@ -39,7 +39,7 @@ $L$SEH_begin_rsaz_512_sqr:
 	sub	rsp,128+24
 
 $L$sqr_body:
-	mov	rbp,rdx
+DB	102,72,15,110,202
 	mov	rdx,QWORD[rsi]
 	mov	rax,QWORD[8+rsi]
 	mov	QWORD[128+rsp],rcx
@@ -54,6 +54,7 @@ $L$oop_sqr:
 	mov	DWORD[((128+8))+rsp],r8d
 
 	mov	rbx,rdx
+	mov	rbp,rax
 	mul	rdx
 	mov	r8,rax
 	mov	rax,QWORD[16+rsi]
@@ -92,31 +93,29 @@ $L$oop_sqr:
 	mul	rbx
 	add	r14,rax
 	mov	rax,rbx
-	mov	r15,rdx
-	adc	r15,0
+	adc	rdx,0
 
+	xor	rcx,rcx
 	add	r8,r8
-	mov	rcx,r9
-	adc	r9,r9
+	mov	r15,rdx
+	adc	rcx,0
 
 	mul	rax
-	mov	QWORD[rsp],rax
-	add	r8,rdx
-	adc	r9,0
+	add	rdx,r8
+	adc	rcx,0
 
-	mov	QWORD[8+rsp],r8
-	shr	rcx,63
+	mov	QWORD[rsp],rax
+	mov	QWORD[8+rsp],rdx
 
 
-	mov	r8,QWORD[8+rsi]
 	mov	rax,QWORD[16+rsi]
-	mul	r8
+	mul	rbp
 	add	r10,rax
 	mov	rax,QWORD[24+rsi]
 	mov	rbx,rdx
 	adc	rbx,0
 
-	mul	r8
+	mul	rbp
 	add	r11,rax
 	mov	rax,QWORD[32+rsi]
 	adc	rdx,0
@@ -124,7 +123,7 @@ $L$oop_sqr:
 	mov	rbx,rdx
 	adc	rbx,0
 
-	mul	r8
+	mul	rbp
 	add	r12,rax
 	mov	rax,QWORD[40+rsi]
 	adc	rdx,0
@@ -132,7 +131,7 @@ $L$oop_sqr:
 	mov	rbx,rdx
 	adc	rbx,0
 
-	mul	r8
+	mul	rbp
 	add	r13,rax
 	mov	rax,QWORD[48+rsi]
 	adc	rdx,0
@@ -140,7 +139,7 @@ $L$oop_sqr:
 	mov	rbx,rdx
 	adc	rbx,0
 
-	mul	r8
+	mul	rbp
 	add	r14,rax
 	mov	rax,QWORD[56+rsi]
 	adc	rdx,0
@@ -148,39 +147,39 @@ $L$oop_sqr:
 	mov	rbx,rdx
 	adc	rbx,0
 
-	mul	r8
+	mul	rbp
 	add	r15,rax
-	mov	rax,r8
+	mov	rax,rbp
 	adc	rdx,0
 	add	r15,rbx
-	mov	r8,rdx
-	mov	rdx,r10
-	adc	r8,0
+	adc	rdx,0
 
-	add	rdx,rdx
-	lea	r10,[r10*2+rcx]
-	mov	rbx,r11
-	adc	r11,r11
+	xor	rbx,rbx
+	add	r9,r9
+	mov	r8,rdx
+	adc	r10,r10
+	adc	rbx,0
 
 	mul	rax
+
+	add	rax,rcx
+	mov	rbp,QWORD[16+rsi]
 	add	r9,rax
+	mov	rax,QWORD[24+rsi]
 	adc	r10,rdx
-	adc	r11,0
+	adc	rbx,0
 
 	mov	QWORD[16+rsp],r9
 	mov	QWORD[24+rsp],r10
-	shr	rbx,63
 
 
-	mov	r9,QWORD[16+rsi]
-	mov	rax,QWORD[24+rsi]
-	mul	r9
+	mul	rbp
 	add	r12,rax
 	mov	rax,QWORD[32+rsi]
 	mov	rcx,rdx
 	adc	rcx,0
 
-	mul	r9
+	mul	rbp
 	add	r13,rax
 	mov	rax,QWORD[40+rsi]
 	adc	rdx,0
@@ -188,7 +187,7 @@ $L$oop_sqr:
 	mov	rcx,rdx
 	adc	rcx,0
 
-	mul	r9
+	mul	rbp
 	add	r14,rax
 	mov	rax,QWORD[48+rsi]
 	adc	rdx,0
@@ -196,9 +195,7 @@ $L$oop_sqr:
 	mov	rcx,rdx
 	adc	rcx,0
 
-	mul	r9
-	mov	r10,r12
-	lea	r12,[r12*2+rbx]
+	mul	rbp
 	add	r15,rax
 	mov	rax,QWORD[56+rsi]
 	adc	rdx,0
@@ -206,36 +203,40 @@ $L$oop_sqr:
 	mov	rcx,rdx
 	adc	rcx,0
 
-	mul	r9
-	shr	r10,63
+	mul	rbp
 	add	r8,rax
-	mov	rax,r9
+	mov	rax,rbp
 	adc	rdx,0
 	add	r8,rcx
-	mov	r9,rdx
-	adc	r9,0
+	adc	rdx,0
 
-	mov	rcx,r13
-	lea	r13,[r13*2+r10]
+	xor	rcx,rcx
+	add	r11,r11
+	mov	r9,rdx
+	adc	r12,r12
+	adc	rcx,0
 
 	mul	rax
+
+	add	rax,rbx
+	mov	r10,QWORD[24+rsi]
 	add	r11,rax
+	mov	rax,QWORD[32+rsi]
 	adc	r12,rdx
-	adc	r13,0
+	adc	rcx,0
 
 	mov	QWORD[32+rsp],r11
 	mov	QWORD[40+rsp],r12
-	shr	rcx,63
 
 
-	mov	r10,QWORD[24+rsi]
-	mov	rax,QWORD[32+rsi]
+	mov	r11,rax
 	mul	r10
 	add	r14,rax
 	mov	rax,QWORD[40+rsi]
 	mov	rbx,rdx
 	adc	rbx,0
 
+	mov	r12,rax
 	mul	r10
 	add	r15,rax
 	mov	rax,QWORD[48+rsi]
@@ -244,9 +245,8 @@ $L$oop_sqr:
 	mov	rbx,rdx
 	adc	rbx,0
 
+	mov	rbp,rax
 	mul	r10
-	mov	r12,r14
-	lea	r14,[r14*2+rcx]
 	add	r8,rax
 	mov	rax,QWORD[56+rsi]
 	adc	rdx,0
@@ -255,32 +255,33 @@ $L$oop_sqr:
 	adc	rbx,0
 
 	mul	r10
-	shr	r12,63
 	add	r9,rax
 	mov	rax,r10
 	adc	rdx,0
 	add	r9,rbx
-	mov	r10,rdx
-	adc	r10,0
+	adc	rdx,0
 
-	mov	rbx,r15
-	lea	r15,[r15*2+r12]
+	xor	rbx,rbx
+	add	r13,r13
+	mov	r10,rdx
+	adc	r14,r14
+	adc	rbx,0
 
 	mul	rax
+
+	add	rax,rcx
 	add	r13,rax
+	mov	rax,r12
 	adc	r14,rdx
-	adc	r15,0
+	adc	rbx,0
 
 	mov	QWORD[48+rsp],r13
 	mov	QWORD[56+rsp],r14
-	shr	rbx,63
 
 
-	mov	r11,QWORD[32+rsi]
-	mov	rax,QWORD[40+rsi]
 	mul	r11
 	add	r8,rax
-	mov	rax,QWORD[48+rsi]
+	mov	rax,rbp
 	mov	rcx,rdx
 	adc	rcx,0
 
@@ -288,97 +289,99 @@ $L$oop_sqr:
 	add	r9,rax
 	mov	rax,QWORD[56+rsi]
 	adc	rdx,0
-	mov	r12,r8
-	lea	r8,[r8*2+rbx]
 	add	r9,rcx
 	mov	rcx,rdx
 	adc	rcx,0
 
+	mov	r14,rax
 	mul	r11
-	shr	r12,63
 	add	r10,rax
 	mov	rax,r11
 	adc	rdx,0
 	add	r10,rcx
-	mov	r11,rdx
-	adc	r11,0
+	adc	rdx,0
 
-	mov	rcx,r9
-	lea	r9,[r9*2+r12]
+	xor	rcx,rcx
+	add	r15,r15
+	mov	r11,rdx
+	adc	r8,r8
+	adc	rcx,0
 
 	mul	rax
+
+	add	rax,rbx
 	add	r15,rax
+	mov	rax,rbp
 	adc	r8,rdx
-	adc	r9,0
+	adc	rcx,0
 
 	mov	QWORD[64+rsp],r15
 	mov	QWORD[72+rsp],r8
-	shr	rcx,63
 
 
-	mov	r12,QWORD[40+rsi]
-	mov	rax,QWORD[48+rsi]
 	mul	r12
 	add	r10,rax
-	mov	rax,QWORD[56+rsi]
+	mov	rax,r14
 	mov	rbx,rdx
 	adc	rbx,0
 
 	mul	r12
 	add	r11,rax
 	mov	rax,r12
-	mov	r15,r10
-	lea	r10,[r10*2+rcx]
 	adc	rdx,0
-	shr	r15,63
 	add	r11,rbx
-	mov	r12,rdx
-	adc	r12,0
+	adc	rdx,0
 
-	mov	rbx,r11
-	lea	r11,[r11*2+r15]
+	xor	rbx,rbx
+	add	r9,r9
+	mov	r12,rdx
+	adc	r10,r10
+	adc	rbx,0
 
 	mul	rax
+
+	add	rax,rcx
 	add	r9,rax
+	mov	rax,r14
 	adc	r10,rdx
-	adc	r11,0
+	adc	rbx,0
 
 	mov	QWORD[80+rsp],r9
 	mov	QWORD[88+rsp],r10
 
 
-	mov	r13,QWORD[48+rsi]
-	mov	rax,QWORD[56+rsi]
-	mul	r13
+	mul	rbp
 	add	r12,rax
-	mov	rax,r13
-	mov	r13,rdx
-	adc	r13,0
+	mov	rax,rbp
+	adc	rdx,0
 
-	xor	r14,r14
-	shl	rbx,1
+	xor	rcx,rcx
+	add	r11,r11
+	mov	r13,rdx
 	adc	r12,r12
-	adc	r13,r13
-	adc	r14,r14
+	adc	rcx,0
 
 	mul	rax
+
+	add	rax,rbx
 	add	r11,rax
+	mov	rax,r14
 	adc	r12,rdx
-	adc	r13,0
+	adc	rcx,0
 
 	mov	QWORD[96+rsp],r11
 	mov	QWORD[104+rsp],r12
 
 
-	mov	rax,QWORD[56+rsi]
-	mul	rax
-	add	r13,rax
-	adc	rdx,0
+	xor	rbx,rbx
+	add	r13,r13
+	adc	rbx,0
 
-	add	r14,rdx
+	mul	rax
 
-	mov	QWORD[112+rsp],r13
-	mov	QWORD[120+rsp],r14
+	add	rax,rcx
+	add	rax,r13
+	adc	rdx,rbx
 
 	mov	r8,QWORD[rsp]
 	mov	r9,QWORD[8+rsp]
@@ -388,6 +391,10 @@ $L$oop_sqr:
 	mov	r13,QWORD[40+rsp]
 	mov	r14,QWORD[48+rsp]
 	mov	r15,QWORD[56+rsp]
+DB	102,72,15,126,205
+
+	mov	QWORD[112+rsp],rax
+	mov	QWORD[120+rsp],rdx
 
 	call	__rsaz_512_reduce
 
@@ -416,9 +423,9 @@ ALIGN	32
 $L$oop_sqrx:
 	mov	DWORD[((128+8))+rsp],r8d
 DB	102,72,15,110,199
-DB	102,72,15,110,205
 
 	mulx	r9,r8,rax
+	mov	rbx,rax
 
 	mulx	r10,rcx,QWORD[16+rsi]
 	xor	rbp,rbp
@@ -426,40 +433,39 @@ DB	102,72,15,110,205
 	mulx	r11,rax,QWORD[24+rsi]
 	adcx	r9,rcx
 
-	mulx	r12,rcx,QWORD[32+rsi]
+DB	0xc4,0x62,0xf3,0xf6,0xa6,0x20,0x00,0x00,0x00
 	adcx	r10,rax
 
-	mulx	r13,rax,QWORD[40+rsi]
+DB	0xc4,0x62,0xfb,0xf6,0xae,0x28,0x00,0x00,0x00
 	adcx	r11,rcx
 
-DB	0xc4,0x62,0xf3,0xf6,0xb6,0x30,0x00,0x00,0x00
+	mulx	r14,rcx,QWORD[48+rsi]
 	adcx	r12,rax
 	adcx	r13,rcx
 
-DB	0xc4,0x62,0xfb,0xf6,0xbe,0x38,0x00,0x00,0x00
+	mulx	r15,rax,QWORD[56+rsi]
 	adcx	r14,rax
 	adcx	r15,rbp
 
-	mov	rcx,r9
-	shld	r9,r8,1
-	shl	r8,1
-
-	xor	ebp,ebp
-	mulx	rdx,rax,rdx
-	adcx	r8,rdx
-	mov	rdx,QWORD[8+rsi]
-	adcx	r9,rbp
+	mulx	rdi,rax,rdx
+	mov	rdx,rbx
+	xor	rcx,rcx
+	adox	r8,r8
+	adcx	r8,rdi
+	adox	rcx,rbp
+	adcx	rcx,rbp
 
 	mov	QWORD[rsp],rax
 	mov	QWORD[8+rsp],r8
 
 
-	mulx	rbx,rax,QWORD[16+rsi]
+DB	0xc4,0xe2,0xfb,0xf6,0x9e,0x10,0x00,0x00,0x00
 	adox	r10,rax
 	adcx	r11,rbx
 
-DB	0xc4,0x62,0xc3,0xf6,0x86,0x18,0x00,0x00,0x00
+	mulx	r8,rdi,QWORD[24+rsi]
 	adox	r11,rdi
+DB	0x66
 	adcx	r12,r8
 
 	mulx	rbx,rax,QWORD[32+rsi]
@@ -477,24 +483,25 @@ DB	0xc4,0xe2,0xfb,0xf6,0x9e,0x30,0x00,0x00,0x00
 DB	0xc4,0x62,0xc3,0xf6,0x86,0x38,0x00,0x00,0x00
 	adox	r15,rdi
 	adcx	r8,rbp
+	mulx	rdi,rax,rdx
 	adox	r8,rbp
+DB	0x48,0x8b,0x96,0x10,0x00,0x00,0x00
 
-	mov	rbx,r11
-	shld	r11,r10,1
-	shld	r10,rcx,1
+	xor	rbx,rbx
+	adox	r9,r9
 
-	xor	ebp,ebp
-	mulx	rcx,rax,rdx
-	mov	rdx,QWORD[16+rsi]
+	adcx	rax,rcx
+	adox	r10,r10
 	adcx	r9,rax
-	adcx	r10,rcx
-	adcx	r11,rbp
+	adox	rbx,rbp
+	adcx	r10,rdi
+	adcx	rbx,rbp
 
 	mov	QWORD[16+rsp],r9
 DB	0x4c,0x89,0x94,0x24,0x18,0x00,0x00,0x00
 
 
-DB	0xc4,0x62,0xc3,0xf6,0x8e,0x18,0x00,0x00,0x00
+	mulx	r9,rdi,QWORD[24+rsi]
 	adox	r12,rdi
 	adcx	r13,r9
 
@@ -502,7 +509,7 @@ DB	0xc4,0x62,0xc3,0xf6,0x8e,0x18,0x00,0x00,0x00
 	adox	r13,rax
 	adcx	r14,rcx
 
-	mulx	r9,rdi,QWORD[40+rsi]
+DB	0xc4,0x62,0xc3,0xf6,0x8e,0x28,0x00,0x00,0x00
 	adox	r14,rdi
 	adcx	r15,r9
 
@@ -510,27 +517,28 @@ DB	0xc4,0xe2,0xfb,0xf6,0x8e,0x30,0x00,0x00,0x00
 	adox	r15,rax
 	adcx	r8,rcx
 
-DB	0xc4,0x62,0xc3,0xf6,0x8e,0x38,0x00,0x00,0x00
+	mulx	r9,rdi,QWORD[56+rsi]
 	adox	r8,rdi
 	adcx	r9,rbp
+	mulx	rdi,rax,rdx
 	adox	r9,rbp
+	mov	rdx,QWORD[24+rsi]
 
-	mov	rcx,r13
-	shld	r13,r12,1
-	shld	r12,rbx,1
+	xor	rcx,rcx
+	adox	r11,r11
 
-	xor	ebp,ebp
-	mulx	rdx,rax,rdx
+	adcx	rax,rbx
+	adox	r12,r12
 	adcx	r11,rax
-	adcx	r12,rdx
-	mov	rdx,QWORD[24+rsi]
-	adcx	r13,rbp
+	adox	rcx,rbp
+	adcx	r12,rdi
+	adcx	rcx,rbp
 
 	mov	QWORD[32+rsp],r11
-DB	0x4c,0x89,0xa4,0x24,0x28,0x00,0x00,0x00
+	mov	QWORD[40+rsp],r12
 
 
-DB	0xc4,0xe2,0xfb,0xf6,0x9e,0x20,0x00,0x00,0x00
+	mulx	rbx,rax,QWORD[32+rsi]
 	adox	r14,rax
 	adcx	r15,rbx
 
@@ -545,25 +553,25 @@ DB	0xc4,0xe2,0xfb,0xf6,0x9e,0x20,0x00,0x00,0x00
 	mulx	r10,rdi,QWORD[56+rsi]
 	adox	r9,rdi
 	adcx	r10,rbp
+	mulx	rdi,rax,rdx
 	adox	r10,rbp
+	mov	rdx,QWORD[32+rsi]
 
-DB	0x66
-	mov	rbx,r15
-	shld	r15,r14,1
-	shld	r14,rcx,1
+	xor	rbx,rbx
+	adox	r13,r13
 
-	xor	ebp,ebp
-	mulx	rdx,rax,rdx
+	adcx	rax,rcx
+	adox	r14,r14
 	adcx	r13,rax
-	adcx	r14,rdx
-	mov	rdx,QWORD[32+rsi]
-	adcx	r15,rbp
+	adox	rbx,rbp
+	adcx	r14,rdi
+	adcx	rbx,rbp
 
 	mov	QWORD[48+rsp],r13
 	mov	QWORD[56+rsp],r14
 
 
-DB	0xc4,0x62,0xc3,0xf6,0x9e,0x28,0x00,0x00,0x00
+	mulx	r11,rdi,QWORD[40+rsi]
 	adox	r8,rdi
 	adcx	r9,r11
 
@@ -574,18 +582,19 @@ DB	0xc4,0x62,0xc3,0xf6,0x9e,0x28,0x00,0x00,0x00
 	mulx	r11,rdi,QWORD[56+rsi]
 	adox	r10,rdi
 	adcx	r11,rbp
+	mulx	rdi,rax,rdx
+	mov	rdx,QWORD[40+rsi]
 	adox	r11,rbp
 
-	mov	rcx,r9
-	shld	r9,r8,1
-	shld	r8,rbx,1
+	xor	rcx,rcx
+	adox	r15,r15
 
-	xor	ebp,ebp
-	mulx	rdx,rax,rdx
+	adcx	rax,rbx
+	adox	r8,r8
 	adcx	r15,rax
-	adcx	r8,rdx
-	mov	rdx,QWORD[40+rsi]
-	adcx	r9,rbp
+	adox	rcx,rbp
+	adcx	r8,rdi
+	adcx	rcx,rbp
 
 	mov	QWORD[64+rsp],r15
 	mov	QWORD[72+rsp],r8
@@ -598,18 +607,19 @@ DB	0xc4,0xe2,0xfb,0xf6,0x9e,0x30,0x00,0x00,0x00
 DB	0xc4,0x62,0xc3,0xf6,0xa6,0x38,0x00,0x00,0x00
 	adox	r11,rdi
 	adcx	r12,rbp
+	mulx	rdi,rax,rdx
 	adox	r12,rbp
+	mov	rdx,QWORD[48+rsi]
 
-	mov	rbx,r11
-	shld	r11,r10,1
-	shld	r10,rcx,1
+	xor	rbx,rbx
+	adox	r9,r9
 
-	xor	ebp,ebp
-	mulx	rdx,rax,rdx
+	adcx	rax,rcx
+	adox	r10,r10
 	adcx	r9,rax
-	adcx	r10,rdx
-	mov	rdx,QWORD[48+rsi]
-	adcx	r11,rbp
+	adcx	r10,rdi
+	adox	rbx,rbp
+	adcx	rbx,rbp
 
 	mov	QWORD[80+rsp],r9
 	mov	QWORD[88+rsp],r10
@@ -619,31 +629,31 @@ DB	0xc4,0x62,0xfb,0xf6,0xae,0x38,0x00,0x00,0x00
 	adox	r12,rax
 	adox	r13,rbp
 
-	xor	r14,r14
-	shld	r14,r13,1
-	shld	r13,r12,1
-	shld	r12,rbx,1
+	mulx	rdi,rax,rdx
+	xor	rcx,rcx
+	mov	rdx,QWORD[56+rsi]
+	adox	r11,r11
 
-	xor	ebp,ebp
-	mulx	rdx,rax,rdx
+	adcx	rax,rbx
+	adox	r12,r12
 	adcx	r11,rax
-	adcx	r12,rdx
-	mov	rdx,QWORD[56+rsi]
-	adcx	r13,rbp
+	adox	rcx,rbp
+	adcx	r12,rdi
+	adcx	rcx,rbp
 
 DB	0x4c,0x89,0x9c,0x24,0x60,0x00,0x00,0x00
 DB	0x4c,0x89,0xa4,0x24,0x68,0x00,0x00,0x00
 
 
 	mulx	rdx,rax,rdx
-	adox	r13,rax
-	adox	rdx,rbp
+	xor	rbx,rbx
+	adox	r13,r13
 
-DB	0x66
-	add	r14,rdx
+	adcx	rax,rcx
+	adox	rbx,rbp
+	adcx	rax,r13
+	adcx	rbx,rdx
 
-	mov	QWORD[112+rsp],r13
-	mov	QWORD[120+rsp],r14
 DB	102,72,15,126,199
 DB	102,72,15,126,205
 
@@ -657,6 +667,9 @@ DB	102,72,15,126,205
 	mov	r14,QWORD[48+rsp]
 	mov	r15,QWORD[56+rsp]
 
+	mov	QWORD[112+rsp],rax
+	mov	QWORD[120+rsp],rbx
+
 	call	__rsaz_512_reducex
 
 	add	r8,QWORD[64+rsp]
@@ -1502,6 +1515,7 @@ $L$SEH_end_rsaz_512_mul_by_one:
 
 ALIGN	32
 __rsaz_512_reduce:
+
 	mov	rbx,r8
 	imul	rbx,QWORD[((128+8))+rsp]
 	mov	rax,QWORD[rbp]
@@ -1583,9 +1597,11 @@ $L$reduction_loop:
 	DB	0F3h,0C3h		;repret
 
 
+
 ALIGN	32
 __rsaz_512_reducex:
 
+
 	imul	rdx,r8
 	xor	rsi,rsi
 	mov	ecx,8
@@ -1639,8 +1655,10 @@ DB	0xc4,0x62,0xfb,0xf6,0xb5,0x30,0x00,0x00,0x00
 	DB	0F3h,0C3h		;repret
 
 
+
 ALIGN	32
 __rsaz_512_subtract:
+
 	mov	QWORD[rdi],r8
 	mov	QWORD[8+rdi],r9
 	mov	QWORD[16+rdi],r10
@@ -1696,8 +1714,10 @@ __rsaz_512_subtract:
 	DB	0F3h,0C3h		;repret
 
 
+
 ALIGN	32
 __rsaz_512_mul:
+
 	lea	rdi,[8+rsp]
 
 	mov	rax,QWORD[rsi]
@@ -1838,8 +1858,10 @@ $L$oop_mul:
 	DB	0F3h,0C3h		;repret
 
 
+
 ALIGN	32
 __rsaz_512_mulx:
+
 	mulx	r8,rbx,QWORD[rsi]
 	mov	rcx,-6
 
@@ -1957,10 +1979,12 @@ DB	0xc4,0x62,0xfb,0xf6,0xbe,0x38,0x00,0x00,0x00
 
 	DB	0F3h,0C3h		;repret
 
+
 global	rsaz_512_scatter4
 
 ALIGN	16
 rsaz_512_scatter4:
+
 	lea	rcx,[r8*8+rcx]
 	mov	r9d,8
 	jmp	NEAR $L$oop_scatter
@@ -1975,10 +1999,12 @@ $L$oop_scatter:
 	DB	0F3h,0C3h		;repret
 
 
+
 global	rsaz_512_gather4
 
 ALIGN	16
 rsaz_512_gather4:
+
 $L$SEH_begin_rsaz_512_gather4:
 DB	0x48,0x81,0xec,0xa8,0x00,0x00,0x00
 DB	0x0f,0x29,0x34,0x24
@@ -2067,6 +2093,7 @@ $L$oop_gather:
 $L$SEH_end_rsaz_512_gather4:
 
 
+
 ALIGN	64
 $L$inc:
 	DD	0,0,1,1
diff --git a/deps/openssl/config/archs/VC-WIN64A/asm_avx2/crypto/bn/x86_64-mont5.asm b/deps/openssl/config/archs/VC-WIN64A/asm_avx2/crypto/bn/x86_64-mont5.asm
index 81570ab206..0756714904 100644
--- a/deps/openssl/config/archs/VC-WIN64A/asm_avx2/crypto/bn/x86_64-mont5.asm
+++ b/deps/openssl/config/archs/VC-WIN64A/asm_avx2/crypto/bn/x86_64-mont5.asm
@@ -583,6 +583,7 @@ $L$SEH_end_bn_mul4x_mont_gather5:
 
 ALIGN	32
 mul4x_internal:
+
 	shl	r9,5
 	movd	xmm5,DWORD[56+rax]
 	lea	rax,[$L$inc]
@@ -1105,6 +1106,7 @@ $L$inner4x:
 	mov	r15,QWORD[24+rbp]
 	jmp	NEAR $L$sqr4x_sub_entry
 
+
 global	bn_power5
 
 ALIGN	32
@@ -1333,6 +1335,7 @@ __bn_sqr8x_internal:
 
 
 
+
 	lea	rbp,[32+r10]
 	lea	rsi,[r9*1+rsi]
 
@@ -2036,8 +2039,10 @@ DB	102,73,15,126,217
 	DB	0F3h,0C3h		;repret
 
 
+
 ALIGN	32
 __bn_post4x_internal:
+
 	mov	r12,QWORD[rbp]
 	lea	rbx,[r9*1+rdi]
 	mov	rcx,r9
@@ -2089,10 +2094,12 @@ $L$sqr4x_sub_entry:
 	neg	r9
 	DB	0F3h,0C3h		;repret
 
+
 global	bn_from_montgomery
 
 ALIGN	32
 bn_from_montgomery:
+
 	test	DWORD[48+rsp],7
 	jz	NEAR bn_from_mont8x
 	xor	eax,eax
@@ -2100,6 +2107,7 @@ bn_from_montgomery:
 
 
 
+
 ALIGN	32
 bn_from_mont8x:
 	mov	QWORD[8+rsp],rdi	;WIN64 prologue
@@ -2408,6 +2416,7 @@ $L$SEH_end_bn_mulx4x_mont_gather5:
 
 ALIGN	32
 mulx4x_internal:
+
 	mov	QWORD[8+rsp],r9
 	mov	r10,r9
 	neg	r9
@@ -2828,6 +2837,7 @@ $L$mulx4x_inner:
 	jmp	NEAR $L$sqrx4x_sub_entry
 
 
+
 ALIGN	32
 bn_powerx5:
 	mov	QWORD[8+rsp],rdi	;WIN64 prologue
@@ -3598,6 +3608,7 @@ DB	102,72,15,126,213
 
 ALIGN	32
 __bn_postx4x_internal:
+
 	mov	r12,QWORD[rbp]
 	mov	r10,rcx
 	mov	r9,rcx
@@ -3646,10 +3657,12 @@ $L$sqrx4x_sub_entry:
 
 	DB	0F3h,0C3h		;repret
 
+
 global	bn_get_bits5
 
 ALIGN	16
 bn_get_bits5:
+
 	lea	r10,[rcx]
 	lea	r11,[1+rcx]
 	mov	ecx,edx
@@ -3665,10 +3678,12 @@ bn_get_bits5:
 	DB	0F3h,0C3h		;repret
 
 
+
 global	bn_scatter5
 
 ALIGN	16
 bn_scatter5:
+
 	cmp	edx,0
 	jz	NEAR $L$scatter_epilogue
 	lea	r8,[r9*8+r8]
@@ -3683,12 +3698,14 @@ $L$scatter_epilogue:
 	DB	0F3h,0C3h		;repret
 
 
+
 global	bn_gather5
 
 ALIGN	32
 bn_gather5:
 $L$SEH_begin_bn_gather5:
 
+
 DB	0x4c,0x8d,0x14,0x24
 DB	0x48,0x81,0xec,0x08,0x01,0x00,0x00
 	lea	rax,[$L$inc]
@@ -3846,6 +3863,7 @@ $L$gather:
 	DB	0F3h,0C3h		;repret
 $L$SEH_end_bn_gather5:
 
+
 ALIGN	64
 $L$inc:
 	DD	0,0,1,1
diff --git a/deps/openssl/config/archs/VC-WIN64A/asm_avx2/crypto/buildinf.h b/deps/openssl/config/archs/VC-WIN64A/asm_avx2/crypto/buildinf.h
index 8b7c50ce9a..59f6aefb5a 100644
--- a/deps/openssl/config/archs/VC-WIN64A/asm_avx2/crypto/buildinf.h
+++ b/deps/openssl/config/archs/VC-WIN64A/asm_avx2/crypto/buildinf.h
@@ -11,7 +11,7 @@
  */
 
 #define PLATFORM "platform: "
-#define DATE "built on: Fri Sep 13 16:03:14 2019 UTC"
+#define DATE "built on: Wed Mar 18 21:10:39 2020 UTC"
 
 /*
  * Generate compiler_flags as an array of individual characters. This is a
diff --git a/deps/openssl/config/archs/VC-WIN64A/asm_avx2/crypto/camellia/cmll-x86_64.asm b/deps/openssl/config/archs/VC-WIN64A/asm_avx2/crypto/camellia/cmll-x86_64.asm
index 7a0f351e51..4cf1d322ac 100644
--- a/deps/openssl/config/archs/VC-WIN64A/asm_avx2/crypto/camellia/cmll-x86_64.asm
+++ b/deps/openssl/config/archs/VC-WIN64A/asm_avx2/crypto/camellia/cmll-x86_64.asm
@@ -10,6 +10,7 @@ global	Camellia_EncryptBlock
 
 ALIGN	16
 Camellia_EncryptBlock:
+
 	mov	eax,128
 	sub	eax,ecx
 	mov	ecx,3
@@ -17,6 +18,7 @@ Camellia_EncryptBlock:
 	jmp	NEAR $L$enc_rounds
 
 
+
 global	Camellia_EncryptBlock_Rounds
 
 ALIGN	16
@@ -95,6 +97,7 @@ $L$SEH_end_Camellia_EncryptBlock_Rounds:
 
 ALIGN	16
 _x86_64_Camellia_encrypt:
+
 	xor	r9d,DWORD[r14]
 	xor	r8d,DWORD[4+r14]
 	xor	r11d,DWORD[8+r14]
@@ -300,10 +303,12 @@ DB	0xf3,0xc3
 
 
 
+
 global	Camellia_DecryptBlock
 
 ALIGN	16
 Camellia_DecryptBlock:
+
 	mov	eax,128
 	sub	eax,ecx
 	mov	ecx,3
@@ -311,6 +316,7 @@ Camellia_DecryptBlock:
 	jmp	NEAR $L$dec_rounds
 
 
+
 global	Camellia_DecryptBlock_Rounds
 
 ALIGN	16
@@ -389,6 +395,7 @@ $L$SEH_end_Camellia_DecryptBlock_Rounds:
 
 ALIGN	16
 _x86_64_Camellia_decrypt:
+
 	xor	r9d,DWORD[r14]
 	xor	r8d,DWORD[4+r14]
 	xor	r11d,DWORD[8+r14]
@@ -593,6 +600,7 @@ $L$ddone:
 
 DB	0xf3,0xc3
 
+
 global	Camellia_Ekeygen
 
 ALIGN	16
diff --git a/deps/openssl/config/archs/VC-WIN64A/asm_avx2/crypto/ec/ecp_nistz256-x86_64.asm b/deps/openssl/config/archs/VC-WIN64A/asm_avx2/crypto/ec/ecp_nistz256-x86_64.asm
index c87f73a8aa..9930dadce6 100644
--- a/deps/openssl/config/archs/VC-WIN64A/asm_avx2/crypto/ec/ecp_nistz256-x86_64.asm
+++ b/deps/openssl/config/archs/VC-WIN64A/asm_avx2/crypto/ec/ecp_nistz256-x86_64.asm
@@ -3958,10 +3958,12 @@ $L$SEH_begin_ecp_nistz256_to_mont:
 	mov	rsi,rdx
 
 
+
 	mov	ecx,0x80100
 	and	ecx,DWORD[((OPENSSL_ia32cap_P+8))]
 	lea	rdx,[$L$RR]
 	jmp	NEAR $L$mul_mont
+
 $L$SEH_end_ecp_nistz256_to_mont:
 
 
@@ -4922,6 +4924,7 @@ global	ecp_nistz256_scatter_w5
 
 ALIGN	32
 ecp_nistz256_scatter_w5:
+
 	lea	r8d,[((-3))+r8*2+r8]
 	movdqa	xmm0,XMMWORD[rdx]
 	shl	r8d,5
@@ -4942,6 +4945,7 @@ ecp_nistz256_scatter_w5:
 
 
 
+
 global	ecp_nistz256_gather_w5
 
 ALIGN	32
@@ -5035,6 +5039,7 @@ global	ecp_nistz256_scatter_w7
 
 ALIGN	32
 ecp_nistz256_scatter_w7:
+
 	movdqu	xmm0,XMMWORD[rdx]
 	shl	r8d,6
 	movdqu	xmm1,XMMWORD[16+rdx]
@@ -5050,6 +5055,7 @@ ecp_nistz256_scatter_w7:
 
 
 
+
 global	ecp_nistz256_gather_w7
 
 ALIGN	32
@@ -5861,26 +5867,16 @@ DB	102,73,15,110,220
 	or	r12,r8
 	or	r12,r9
 
-DB	0x3e
-	jnz	NEAR $L$add_proceedq
 DB	102,73,15,126,208
 DB	102,73,15,126,217
-	test	r8,r8
-	jnz	NEAR $L$add_proceedq
-	test	r9,r9
-	jz	NEAR $L$add_doubleq
 
-DB	102,72,15,126,199
-	pxor	xmm0,xmm0
-	movdqu	XMMWORD[rdi],xmm0
-	movdqu	XMMWORD[16+rdi],xmm0
-	movdqu	XMMWORD[32+rdi],xmm0
-	movdqu	XMMWORD[48+rdi],xmm0
-	movdqu	XMMWORD[64+rdi],xmm0
-	movdqu	XMMWORD[80+rdi],xmm0
-	jmp	NEAR $L$add_doneq
+	or	r12,r8
+	or	r12,r9
+
+
+DB	0x3e
+	jnz	NEAR $L$add_proceedq
 
-ALIGN	32
 $L$add_doubleq:
 DB	102,72,15,126,206
 DB	102,72,15,126,199
@@ -6994,26 +6990,16 @@ DB	102,73,15,110,220
 	or	r12,r8
 	or	r12,r9
 
-DB	0x3e
-	jnz	NEAR $L$add_proceedx
 DB	102,73,15,126,208
 DB	102,73,15,126,217
-	test	r8,r8
-	jnz	NEAR $L$add_proceedx
-	test	r9,r9
-	jz	NEAR $L$add_doublex
 
-DB	102,72,15,126,199
-	pxor	xmm0,xmm0
-	movdqu	XMMWORD[rdi],xmm0
-	movdqu	XMMWORD[16+rdi],xmm0
-	movdqu	XMMWORD[32+rdi],xmm0
-	movdqu	XMMWORD[48+rdi],xmm0
-	movdqu	XMMWORD[64+rdi],xmm0
-	movdqu	XMMWORD[80+rdi],xmm0
-	jmp	NEAR $L$add_donex
+	or	r12,r8
+	or	r12,r9
+
+
+DB	0x3e
+	jnz	NEAR $L$add_proceedx
 
-ALIGN	32
 $L$add_doublex:
 DB	102,72,15,126,206
 DB	102,72,15,126,199
diff --git a/deps/openssl/config/archs/VC-WIN64A/asm_avx2/crypto/ec/x25519-x86_64.asm b/deps/openssl/config/archs/VC-WIN64A/asm_avx2/crypto/ec/x25519-x86_64.asm
index 84d55134ac..d6c6312363 100644
--- a/deps/openssl/config/archs/VC-WIN64A/asm_avx2/crypto/ec/x25519-x86_64.asm
+++ b/deps/openssl/config/archs/VC-WIN64A/asm_avx2/crypto/ec/x25519-x86_64.asm
@@ -414,6 +414,7 @@ global	x25519_fe64_eligible
 
 ALIGN	32
 x25519_fe64_eligible:
+
 	mov	ecx,DWORD[((OPENSSL_ia32cap_P+8))]
 	xor	eax,eax
 	and	ecx,0x80100
@@ -422,6 +423,7 @@ x25519_fe64_eligible:
 	DB	0F3h,0C3h		;repret
 
 
+
 global	x25519_fe64_mul
 
 ALIGN	32
@@ -675,6 +677,7 @@ $L$SEH_begin_x25519_fe64_mul121666:
 
 
 $L$fe64_mul121666_body:
+
 	mov	edx,121666
 	mulx	rcx,r8,QWORD[rsi]
 	mulx	rax,r9,QWORD[8+rsi]
@@ -705,6 +708,7 @@ $L$fe64_mul121666_epilogue:
 	mov	rdi,QWORD[8+rsp]	;WIN64 epilogue
 	mov	rsi,QWORD[16+rsp]
 	DB	0F3h,0C3h		;repret
+
 $L$SEH_end_x25519_fe64_mul121666:
 
 global	x25519_fe64_add
@@ -721,6 +725,7 @@ $L$SEH_begin_x25519_fe64_add:
 
 
 $L$fe64_add_body:
+
 	mov	r8,QWORD[rsi]
 	mov	r9,QWORD[8+rsi]
 	mov	r10,QWORD[16+rsi]
@@ -751,6 +756,7 @@ $L$fe64_add_epilogue:
 	mov	rdi,QWORD[8+rsp]	;WIN64 epilogue
 	mov	rsi,QWORD[16+rsp]
 	DB	0F3h,0C3h		;repret
+
 $L$SEH_end_x25519_fe64_add:
 
 global	x25519_fe64_sub
@@ -767,6 +773,7 @@ $L$SEH_begin_x25519_fe64_sub:
 
 
 $L$fe64_sub_body:
+
 	mov	r8,QWORD[rsi]
 	mov	r9,QWORD[8+rsi]
 	mov	r10,QWORD[16+rsi]
@@ -797,6 +804,7 @@ $L$fe64_sub_epilogue:
 	mov	rdi,QWORD[8+rsp]	;WIN64 epilogue
 	mov	rsi,QWORD[16+rsp]
 	DB	0F3h,0C3h		;repret
+
 $L$SEH_end_x25519_fe64_sub:
 
 global	x25519_fe64_tobytes
@@ -812,6 +820,7 @@ $L$SEH_begin_x25519_fe64_tobytes:
 
 
 $L$fe64_to_body:
+
 	mov	r8,QWORD[rsi]
 	mov	r9,QWORD[8+rsi]
 	mov	r10,QWORD[16+rsi]
@@ -849,6 +858,7 @@ $L$fe64_to_epilogue:
 	mov	rdi,QWORD[8+rsp]	;WIN64 epilogue
 	mov	rsi,QWORD[16+rsp]
 	DB	0F3h,0C3h		;repret
+
 $L$SEH_end_x25519_fe64_tobytes:
 DB	88,50,53,53,49,57,32,112,114,105,109,105,116,105,118,101
 DB	115,32,102,111,114,32,120,56,54,95,54,52,44,32,67,82
diff --git a/deps/openssl/config/archs/VC-WIN64A/asm_avx2/crypto/include/internal/bn_conf.h b/deps/openssl/config/archs/VC-WIN64A/asm_avx2/crypto/include/internal/bn_conf.h
index d803b51858..dab67d1b37 100644
--- a/deps/openssl/config/archs/VC-WIN64A/asm_avx2/crypto/include/internal/bn_conf.h
+++ b/deps/openssl/config/archs/VC-WIN64A/asm_avx2/crypto/include/internal/bn_conf.h
@@ -1,5 +1,5 @@
 /* WARNING: do not edit! */
-/* Generated by makefile from crypto/include/internal/bn_conf.h.in */
+/* Generated by makefile from include/crypto/bn_conf.h.in */
 /*
  * Copyright 2016 The OpenSSL Project Authors. All Rights Reserved.
  *
@@ -9,8 +9,8 @@
  * https://www.openssl.org/source/license.html
  */
 
-#ifndef HEADER_BN_CONF_H
-# define HEADER_BN_CONF_H
+#ifndef OSSL_CRYPTO_BN_CONF_H
+# define OSSL_CRYPTO_BN_CONF_H
 
 /*
  * The contents of this file are not used in the UEFI build, as
diff --git a/deps/openssl/config/archs/VC-WIN64A/asm_avx2/crypto/include/internal/dso_conf.h b/deps/openssl/config/archs/VC-WIN64A/asm_avx2/crypto/include/internal/dso_conf.h
index c3b41df01e..0c96ce7363 100644
--- a/deps/openssl/config/archs/VC-WIN64A/asm_avx2/crypto/include/internal/dso_conf.h
+++ b/deps/openssl/config/archs/VC-WIN64A/asm_avx2/crypto/include/internal/dso_conf.h
@@ -1,5 +1,5 @@
 /* WARNING: do not edit! */
-/* Generated by makefile from crypto/include/internal/dso_conf.h.in */
+/* Generated by makefile from include/crypto/dso_conf.h.in */
 /*
  * Copyright 2016-2019 The OpenSSL Project Authors. All Rights Reserved.
  *
@@ -9,8 +9,8 @@
  * https://www.openssl.org/source/license.html
  */
 
-#ifndef HEADER_DSO_CONF_H
-# define HEADER_DSO_CONF_H
+#ifndef OSSL_CRYPTO_DSO_CONF_H
+# define OSSL_CRYPTO_DSO_CONF_H
 # define DSO_WIN32
 # define DSO_EXTENSION ".dll"
 #endif
diff --git a/deps/openssl/config/archs/VC-WIN64A/asm_avx2/crypto/modes/aesni-gcm-x86_64.asm b/deps/openssl/config/archs/VC-WIN64A/asm_avx2/crypto/modes/aesni-gcm-x86_64.asm
index b1d8332457..9fba32b883 100644
--- a/deps/openssl/config/archs/VC-WIN64A/asm_avx2/crypto/modes/aesni-gcm-x86_64.asm
+++ b/deps/openssl/config/archs/VC-WIN64A/asm_avx2/crypto/modes/aesni-gcm-x86_64.asm
@@ -8,6 +8,7 @@ section	.text code align=64
 
 ALIGN	32
 _aesni_ctr32_ghash_6x:
+
 	vmovdqu	xmm2,XMMWORD[32+r11]
 	sub	rdx,6
 	vpxor	xmm4,xmm4,xmm4
@@ -316,6 +317,7 @@ $L$6x_done:
 
 	DB	0F3h,0C3h		;repret
 
+
 global	aesni_gcm_decrypt
 
 ALIGN	32
@@ -457,6 +459,7 @@ $L$SEH_end_aesni_gcm_decrypt:
 
 ALIGN	32
 _aesni_ctr32_6x:
+
 	vmovdqu	xmm4,XMMWORD[((0-128))+rcx]
 	vmovdqu	xmm2,XMMWORD[32+r11]
 	lea	r13,[((-1))+rbp]
@@ -545,6 +548,7 @@ $L$handle_ctr32_2:
 	jmp	NEAR $L$oop_ctr32
 
 
+
 global	aesni_gcm_encrypt
 
 ALIGN	32
diff --git a/deps/openssl/config/archs/VC-WIN64A/asm_avx2/crypto/poly1305/poly1305-x86_64.asm b/deps/openssl/config/archs/VC-WIN64A/asm_avx2/crypto/poly1305/poly1305-x86_64.asm
index 5717654508..6f688b63e0 100644
--- a/deps/openssl/config/archs/VC-WIN64A/asm_avx2/crypto/poly1305/poly1305-x86_64.asm
+++ b/deps/openssl/config/archs/VC-WIN64A/asm_avx2/crypto/poly1305/poly1305-x86_64.asm
@@ -26,6 +26,7 @@ $L$SEH_begin_poly1305_init:
 	mov	rdx,r8
 
 
+
 	xor	rax,rax
 	mov	QWORD[rdi],rax
 	mov	QWORD[8+rdi],rax
@@ -63,6 +64,7 @@ $L$no_key:
 	mov	rdi,QWORD[8+rsp]	;WIN64 epilogue
 	mov	rsi,QWORD[16+rsp]
 	DB	0F3h,0C3h		;repret
+
 $L$SEH_end_poly1305_init:
 
 
@@ -198,6 +200,7 @@ $L$SEH_begin_poly1305_emit:
 	mov	rdx,r8
 
 
+
 $L$emit:
 	mov	r8,QWORD[rdi]
 	mov	r9,QWORD[8+rdi]
@@ -220,10 +223,12 @@ $L$emit:
 	mov	rdi,QWORD[8+rsp]	;WIN64 epilogue
 	mov	rsi,QWORD[16+rsp]
 	DB	0F3h,0C3h		;repret
+
 $L$SEH_end_poly1305_emit:
 
 ALIGN	32
 __poly1305_block:
+
 	mul	r14
 	mov	r9,rax
 	mov	rax,r11
@@ -266,8 +271,10 @@ __poly1305_block:
 
 
 
+
 ALIGN	32
 __poly1305_init_avx:
+
 	mov	r14,r11
 	mov	rbx,r12
 	xor	rbp,rbp
@@ -428,6 +435,7 @@ __poly1305_init_avx:
 
 
 
+
 ALIGN	32
 poly1305_blocks_avx:
 	mov	QWORD[8+rsp],rdi	;WIN64 prologue
@@ -1296,6 +1304,7 @@ $L$SEH_begin_poly1305_emit_avx:
 	mov	rdx,r8
 
 
+
 	cmp	DWORD[20+rdi],0
 	je	NEAR $L$emit
 
@@ -1348,6 +1357,7 @@ $L$SEH_begin_poly1305_emit_avx:
 	mov	rdi,QWORD[8+rsp]	;WIN64 epilogue
 	mov	rsi,QWORD[16+rsp]
 	DB	0F3h,0C3h		;repret
+
 $L$SEH_end_poly1305_emit_avx:
 
 ALIGN	32
@@ -2607,6 +2617,7 @@ $L$SEH_begin_poly1305_init_base2_44:
 	mov	rdx,r8
 
 
+
 	xor	rax,rax
 	mov	QWORD[rdi],rax
 	mov	QWORD[8+rdi],rax
@@ -2642,6 +2653,7 @@ $L$init_base2_44:
 	mov	rdi,QWORD[8+rsp]	;WIN64 epilogue
 	mov	rsi,QWORD[16+rsp]
 	DB	0F3h,0C3h		;repret
+
 $L$SEH_end_poly1305_init_base2_44:
 
 ALIGN	32
@@ -2656,6 +2668,7 @@ $L$SEH_begin_poly1305_blocks_vpmadd52:
 	mov	rcx,r9
 
 
+
 	shr	rdx,4
 	jz	NEAR $L$no_data_vpmadd52
 
@@ -2764,6 +2777,7 @@ $L$no_data_vpmadd52:
 	mov	rdi,QWORD[8+rsp]	;WIN64 epilogue
 	mov	rsi,QWORD[16+rsp]
 	DB	0F3h,0C3h		;repret
+
 $L$SEH_end_poly1305_blocks_vpmadd52:
 
 ALIGN	32
@@ -2778,6 +2792,7 @@ $L$SEH_begin_poly1305_blocks_vpmadd52_4x:
 	mov	rcx,r9
 
 
+
 	shr	rdx,4
 	jz	NEAR $L$no_data_vpmadd52_4x
 
@@ -3204,6 +3219,7 @@ $L$no_data_vpmadd52_4x:
 	mov	rdi,QWORD[8+rsp]	;WIN64 epilogue
 	mov	rsi,QWORD[16+rsp]
 	DB	0F3h,0C3h		;repret
+
 $L$SEH_end_poly1305_blocks_vpmadd52_4x:
 
 ALIGN	32
@@ -3218,6 +3234,7 @@ $L$SEH_begin_poly1305_blocks_vpmadd52_8x:
 	mov	rcx,r9
 
 
+
 	shr	rdx,4
 	jz	NEAR $L$no_data_vpmadd52_8x
 
@@ -3560,6 +3577,7 @@ $L$no_data_vpmadd52_8x:
 	mov	rdi,QWORD[8+rsp]	;WIN64 epilogue
 	mov	rsi,QWORD[16+rsp]
 	DB	0F3h,0C3h		;repret
+
 $L$SEH_end_poly1305_blocks_vpmadd52_8x:
 
 ALIGN	32
@@ -3573,6 +3591,7 @@ $L$SEH_begin_poly1305_emit_base2_44:
 	mov	rdx,r8
 
 
+
 	mov	r8,QWORD[rdi]
 	mov	r9,QWORD[8+rdi]
 	mov	r10,QWORD[16+rdi]
@@ -3605,6 +3624,7 @@ $L$SEH_begin_poly1305_emit_base2_44:
 	mov	rdi,QWORD[8+rsp]	;WIN64 epilogue
 	mov	rsi,QWORD[16+rsp]
 	DB	0F3h,0C3h		;repret
+
 $L$SEH_end_poly1305_emit_base2_44:
 ALIGN	64
 $L$const:
@@ -3646,6 +3666,7 @@ global	xor128_encrypt_n_pad
 
 ALIGN	16
 xor128_encrypt_n_pad:
+
 	sub	rdx,r8
 	sub	rcx,r8
 	mov	r10,r9
@@ -3689,10 +3710,12 @@ $L$done_enc:
 	DB	0F3h,0C3h		;repret
 
 
+
 global	xor128_decrypt_n_pad
 
 ALIGN	16
 xor128_decrypt_n_pad:
+
 	sub	rdx,r8
 	sub	rcx,r8
 	mov	r10,r9
@@ -3739,6 +3762,7 @@ $L$done_dec:
 	mov	rax,r8
 	DB	0F3h,0C3h		;repret
 
+
 EXTERN	__imp_RtlVirtualUnwind
 
 ALIGN	16
diff --git a/deps/openssl/config/archs/VC-WIN64A/asm_avx2/crypto/rc4/rc4-x86_64.asm b/deps/openssl/config/archs/VC-WIN64A/asm_avx2/crypto/rc4/rc4-x86_64.asm
index 5732b40ed6..edbcc06e34 100644
--- a/deps/openssl/config/archs/VC-WIN64A/asm_avx2/crypto/rc4/rc4-x86_64.asm
+++ b/deps/openssl/config/archs/VC-WIN64A/asm_avx2/crypto/rc4/rc4-x86_64.asm
@@ -19,13 +19,14 @@ $L$SEH_begin_RC4:
 	mov	rdx,r8
 	mov	rcx,r9
 
+
+
 	or	rsi,rsi
 	jne	NEAR $L$entry
 	mov	rdi,QWORD[8+rsp]	;WIN64 epilogue
 	mov	rsi,QWORD[16+rsp]
 	DB	0F3h,0C3h		;repret
 $L$entry:
-
 	push	rbx
 
 	push	r12
@@ -558,6 +559,7 @@ $L$SEH_begin_RC4_set_key:
 	mov	rdx,r8
 
 
+
 	lea	rdi,[8+rdi]
 	lea	rdx,[rsi*1+rdx]
 	neg	rsi
@@ -626,12 +628,14 @@ $L$exit_key:
 	mov	rdi,QWORD[8+rsp]	;WIN64 epilogue
 	mov	rsi,QWORD[16+rsp]
 	DB	0F3h,0C3h		;repret
+
 $L$SEH_end_RC4_set_key:
 
 global	RC4_options
 
 ALIGN	16
 RC4_options:
+
 	lea	rax,[$L$opts]
 	mov	edx,DWORD[OPENSSL_ia32cap_P]
 	bt	edx,20
@@ -644,6 +648,7 @@ $L$8xchar:
 	add	rax,12
 $L$done:
 	DB	0F3h,0C3h		;repret
+
 ALIGN	64
 $L$opts:
 DB	114,99,52,40,56,120,44,105,110,116,41,0
diff --git a/deps/openssl/config/archs/VC-WIN64A/asm_avx2/crypto/sha/keccak1600-x86_64.asm b/deps/openssl/config/archs/VC-WIN64A/asm_avx2/crypto/sha/keccak1600-x86_64.asm
index d0471cb3b3..fdab35d95c 100644
--- a/deps/openssl/config/archs/VC-WIN64A/asm_avx2/crypto/sha/keccak1600-x86_64.asm
+++ b/deps/openssl/config/archs/VC-WIN64A/asm_avx2/crypto/sha/keccak1600-x86_64.asm
@@ -8,6 +8,7 @@ section	.text code align=64
 
 ALIGN	32
 __KeccakF1600:
+
 	mov	rax,QWORD[60+rdi]
 	mov	rbx,QWORD[68+rdi]
 	mov	rcx,QWORD[76+rdi]
@@ -263,6 +264,7 @@ $L$oop:
 
 
 
+
 ALIGN	32
 KeccakF1600:
 
diff --git a/deps/openssl/config/archs/VC-WIN64A/asm_avx2/crypto/sha/sha1-x86_64.asm b/deps/openssl/config/archs/VC-WIN64A/asm_avx2/crypto/sha/sha1-x86_64.asm
index d796380ae8..1b60a7ce75 100644
--- a/deps/openssl/config/archs/VC-WIN64A/asm_avx2/crypto/sha/sha1-x86_64.asm
+++ b/deps/openssl/config/archs/VC-WIN64A/asm_avx2/crypto/sha/sha1-x86_64.asm
@@ -1458,10 +1458,10 @@ DB	102,15,56,0,251
 	movaps	xmm9,XMMWORD[((-8-16))+rax]
 	mov	rsp,rax
 $L$epilogue_shaext:
-
 	mov	rdi,QWORD[8+rsp]	;WIN64 epilogue
 	mov	rsi,QWORD[16+rsp]
 	DB	0F3h,0C3h		;repret
+
 $L$SEH_end_sha1_block_data_order_shaext:
 
 ALIGN	16
diff --git a/deps/openssl/config/archs/VC-WIN64A/asm_avx2/crypto/sha/sha256-x86_64.asm b/deps/openssl/config/archs/VC-WIN64A/asm_avx2/crypto/sha/sha256-x86_64.asm
index fc102444ff..9ff3cbb92b 100644
--- a/deps/openssl/config/archs/VC-WIN64A/asm_avx2/crypto/sha/sha256-x86_64.asm
+++ b/deps/openssl/config/archs/VC-WIN64A/asm_avx2/crypto/sha/sha256-x86_64.asm
@@ -1804,6 +1804,7 @@ $L$SEH_begin_sha256_block_data_order_shaext:
 
 
 _shaext_shortcut:
+
 	lea	rsp,[((-88))+rsp]
 	movaps	XMMWORD[(-8-80)+rax],xmm6
 	movaps	XMMWORD[(-8-64)+rax],xmm7
@@ -2022,6 +2023,7 @@ $L$epilogue_shaext:
 	mov	rdi,QWORD[8+rsp]	;WIN64 epilogue
 	mov	rsi,QWORD[16+rsp]
 	DB	0F3h,0C3h		;repret
+
 $L$SEH_end_sha256_block_data_order_shaext:
 
 ALIGN	64
@@ -5476,6 +5478,8 @@ $L$ower_avx2:
 
 	lea	rsp,[448+rsp]
 
+
+
 	add	eax,DWORD[rdi]
 	add	ebx,DWORD[4+rdi]
 	add	ecx,DWORD[8+rdi]
@@ -5501,15 +5505,17 @@ $L$ower_avx2:
 	jbe	NEAR $L$oop_avx2
 	lea	rbp,[rsp]
 
+
+
+
 $L$done_avx2:
-	lea	rsp,[rbp]
-	mov	rsi,QWORD[88+rsp]
+	mov	rsi,QWORD[88+rbp]
 
 	vzeroupper
-	movaps	xmm6,XMMWORD[((64+32))+rsp]
-	movaps	xmm7,XMMWORD[((64+48))+rsp]
-	movaps	xmm8,XMMWORD[((64+64))+rsp]
-	movaps	xmm9,XMMWORD[((64+80))+rsp]
+	movaps	xmm6,XMMWORD[((64+32))+rbp]
+	movaps	xmm7,XMMWORD[((64+48))+rbp]
+	movaps	xmm8,XMMWORD[((64+64))+rbp]
+	movaps	xmm9,XMMWORD[((64+80))+rbp]
 	mov	r15,QWORD[((-48))+rsi]
 
 	mov	r14,QWORD[((-40))+rsi]
diff --git a/deps/openssl/config/archs/VC-WIN64A/asm_avx2/crypto/sha/sha512-x86_64.asm b/deps/openssl/config/archs/VC-WIN64A/asm_avx2/crypto/sha/sha512-x86_64.asm
index 1a9935d7b6..fc2269c843 100644
--- a/deps/openssl/config/archs/VC-WIN64A/asm_avx2/crypto/sha/sha512-x86_64.asm
+++ b/deps/openssl/config/archs/VC-WIN64A/asm_avx2/crypto/sha/sha512-x86_64.asm
@@ -5468,6 +5468,8 @@ $L$ower_avx2:
 
 	lea	rsp,[1152+rsp]
 
+
+
 	add	rax,QWORD[rdi]
 	add	rbx,QWORD[8+rdi]
 	add	rcx,QWORD[16+rdi]
@@ -5493,17 +5495,19 @@ $L$ower_avx2:
 	jbe	NEAR $L$oop_avx2
 	lea	rbp,[rsp]
 
+
+
+
 $L$done_avx2:
-	lea	rsp,[rbp]
-	mov	rsi,QWORD[152+rsp]
+	mov	rsi,QWORD[152+rbp]
 
 	vzeroupper
-	movaps	xmm6,XMMWORD[((128+32))+rsp]
-	movaps	xmm7,XMMWORD[((128+48))+rsp]
-	movaps	xmm8,XMMWORD[((128+64))+rsp]
-	movaps	xmm9,XMMWORD[((128+80))+rsp]
-	movaps	xmm10,XMMWORD[((128+96))+rsp]
-	movaps	xmm11,XMMWORD[((128+112))+rsp]
+	movaps	xmm6,XMMWORD[((128+32))+rbp]
+	movaps	xmm7,XMMWORD[((128+48))+rbp]
+	movaps	xmm8,XMMWORD[((128+64))+rbp]
+	movaps	xmm9,XMMWORD[((128+80))+rbp]
+	movaps	xmm10,XMMWORD[((128+96))+rbp]
+	movaps	xmm11,XMMWORD[((128+112))+rbp]
 	mov	r15,QWORD[((-48))+rsi]
 
 	mov	r14,QWORD[((-40))+rsi]
diff --git a/deps/openssl/config/archs/VC-WIN64A/asm_avx2/crypto/x86_64cpuid.asm b/deps/openssl/config/archs/VC-WIN64A/asm_avx2/crypto/x86_64cpuid.asm
index e2fec12d22..f57d3210fc 100644
--- a/deps/openssl/config/archs/VC-WIN64A/asm_avx2/crypto/x86_64cpuid.asm
+++ b/deps/openssl/config/archs/VC-WIN64A/asm_avx2/crypto/x86_64cpuid.asm
@@ -17,6 +17,7 @@ global	OPENSSL_atomic_add
 
 ALIGN	16
 OPENSSL_atomic_add:
+
 	mov	eax,DWORD[rcx]
 $L$spin:	lea	r8,[rax*1+rdx]
 DB	0xf0
@@ -27,16 +28,19 @@ DB	0x48,0x98
 	DB	0F3h,0C3h		;repret
 
 
+
 global	OPENSSL_rdtsc
 
 ALIGN	16
 OPENSSL_rdtsc:
+
 	rdtsc
 	shl	rdx,32
 	or	rax,rdx
 	DB	0F3h,0C3h		;repret
 
 
+
 global	OPENSSL_ia32_cpuid
 
 ALIGN	16
@@ -219,6 +223,7 @@ global	OPENSSL_cleanse
 
 ALIGN	16
 OPENSSL_cleanse:
+
 	xor	rax,rax
 	cmp	rdx,15
 	jae	NEAR $L$ot
@@ -250,10 +255,12 @@ $L$aligned:
 	DB	0F3h,0C3h		;repret
 
 
+
 global	CRYPTO_memcmp
 
 ALIGN	16
 CRYPTO_memcmp:
+
 	xor	rax,rax
 	xor	r10,r10
 	cmp	r8,0
@@ -283,6 +290,7 @@ $L$oop_cmp:
 $L$no_data:
 	DB	0F3h,0C3h		;repret
 
+
 global	OPENSSL_wipe_cpu
 
 ALIGN	16
@@ -306,6 +314,7 @@ global	OPENSSL_instrument_bus
 
 ALIGN	16
 OPENSSL_instrument_bus:
+
 	mov	r10,rcx
 	mov	rcx,rdx
 	mov	r11,rdx
@@ -334,10 +343,12 @@ DB	0xf0
 	DB	0F3h,0C3h		;repret
 
 
+
 global	OPENSSL_instrument_bus2
 
 ALIGN	16
 OPENSSL_instrument_bus2:
+
 	mov	r10,rcx
 	mov	rcx,rdx
 	mov	r11,r8
@@ -381,10 +392,12 @@ $L$done2:
 	sub	rax,rcx
 	DB	0F3h,0C3h		;repret
 
+
 global	OPENSSL_ia32_rdrand_bytes
 
 ALIGN	16
 OPENSSL_ia32_rdrand_bytes:
+
 	xor	rax,rax
 	cmp	rdx,0
 	je	NEAR $L$done_rdrand_bytes
@@ -422,10 +435,12 @@ $L$done_rdrand_bytes:
 	xor	r10,r10
 	DB	0F3h,0C3h		;repret
 
+
 global	OPENSSL_ia32_rdseed_bytes
 
 ALIGN	16
 OPENSSL_ia32_rdseed_bytes:
+
 	xor	rax,rax
 	cmp	rdx,0
 	je	NEAR $L$done_rdseed_bytes
diff --git a/deps/openssl/config/archs/VC-WIN64A/asm_avx2/include/openssl/opensslconf.h b/deps/openssl/config/archs/VC-WIN64A/asm_avx2/include/openssl/opensslconf.h
index c4bc935b0a..de662de12b 100644
--- a/deps/openssl/config/archs/VC-WIN64A/asm_avx2/include/openssl/opensslconf.h
+++ b/deps/openssl/config/archs/VC-WIN64A/asm_avx2/include/openssl/opensslconf.h
@@ -99,9 +99,6 @@ extern "C" {
 #ifndef OPENSSL_NO_DYNAMIC_ENGINE
 # define OPENSSL_NO_DYNAMIC_ENGINE
 #endif
-#ifndef OPENSSL_NO_AFALGENG
-# define OPENSSL_NO_AFALGENG
-#endif
 
 
 /*
diff --git a/deps/openssl/config/archs/VC-WIN64A/asm_avx2/include/progs.h b/deps/openssl/config/archs/VC-WIN64A/asm_avx2/include/progs.h
index 9b3d270e20..308c65601b 100644
--- a/deps/openssl/config/archs/VC-WIN64A/asm_avx2/include/progs.h
+++ b/deps/openssl/config/archs/VC-WIN64A/asm_avx2/include/progs.h
@@ -2,7 +2,7 @@
  * WARNING: do not edit!
  * Generated by apps/progs.pl
  *
- * Copyright 1995-2019 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 1995-2020 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
diff --git a/deps/openssl/config/archs/VC-WIN64A/asm_avx2/openssl-cl.gypi b/deps/openssl/config/archs/VC-WIN64A/asm_avx2/openssl-cl.gypi
index 2d20ac3879..91ad847952 100644
--- a/deps/openssl/config/archs/VC-WIN64A/asm_avx2/openssl-cl.gypi
+++ b/deps/openssl/config/archs/VC-WIN64A/asm_avx2/openssl-cl.gypi
@@ -20,6 +20,7 @@
       'KECCAK1600_ASM',
       'RC4_ASM',
       'MD5_ASM',
+      'AESNI_ASM',
       'VPAES_ASM',
       'GHASH_ASM',
       'ECP_NISTZ256_ASM',
diff --git a/deps/openssl/config/archs/VC-WIN64A/asm_avx2/openssl.gypi b/deps/openssl/config/archs/VC-WIN64A/asm_avx2/openssl.gypi
index 53d15ad06c..b70224fd8b 100644
--- a/deps/openssl/config/archs/VC-WIN64A/asm_avx2/openssl.gypi
+++ b/deps/openssl/config/archs/VC-WIN64A/asm_avx2/openssl.gypi
@@ -727,6 +727,7 @@
       'KECCAK1600_ASM',
       'RC4_ASM',
       'MD5_ASM',
+      'AESNI_ASM',
       'VPAES_ASM',
       'GHASH_ASM',
       'ECP_NISTZ256_ASM',
diff --git a/deps/openssl/config/archs/VC-WIN64A/no-asm/configdata.pm b/deps/openssl/config/archs/VC-WIN64A/no-asm/configdata.pm
index fdebb6f709..0091b95296 100644
--- a/deps/openssl/config/archs/VC-WIN64A/no-asm/configdata.pm
+++ b/deps/openssl/config/archs/VC-WIN64A/no-asm/configdata.pm
@@ -59,7 +59,7 @@ our %config = (
   minor => "1.1",
   openssl_algorithm_defines => [ "OPENSSL_NO_COMP", "OPENSSL_NO_MD2", "OPENSSL_NO_RC5" ],
   openssl_api_defines => [  ],
-  openssl_other_defines => [ "OPENSSL_RAND_SEED_OS", "OPENSSL_NO_AFALGENG", "OPENSSL_NO_ASAN", "OPENSSL_NO_ASM", "OPENSSL_NO_CRYPTO_MDEBUG", "OPENSSL_NO_CRYPTO_MDEBUG_BACKTRACE", "OPENSSL_NO_DEVCRYPTOENG", "OPENSSL_NO_EC_NISTP_64_GCC_128", "OPENSSL_NO_EGD", "OPENSSL_NO_EXTERNAL_TESTS", "OPENSSL_NO_FUZZ_AFL", "OPENSSL_NO_FUZZ_LIBFUZZER", "OPENSSL_NO_HEARTBEATS", "OPENSSL_NO_MSAN", "OPENSSL_NO_SCTP", "OPENSSL_NO_SSL3", "OPENSSL_NO_SSL3_METHOD", "OPENSSL_NO_UBSAN", "OPENSSL_NO_UNIT_TEST", "OPENSSL_NO_WEAK_SSL_CIPHERS", "OPENSSL_NO_DYNAMIC_ENGINE", "OPENSSL_NO_AFALGENG" ],
+  openssl_other_defines => [ "OPENSSL_RAND_SEED_OS", "OPENSSL_NO_AFALGENG", "OPENSSL_NO_ASAN", "OPENSSL_NO_ASM", "OPENSSL_NO_CRYPTO_MDEBUG", "OPENSSL_NO_CRYPTO_MDEBUG_BACKTRACE", "OPENSSL_NO_DEVCRYPTOENG", "OPENSSL_NO_EC_NISTP_64_GCC_128", "OPENSSL_NO_EGD", "OPENSSL_NO_EXTERNAL_TESTS", "OPENSSL_NO_FUZZ_AFL", "OPENSSL_NO_FUZZ_LIBFUZZER", "OPENSSL_NO_HEARTBEATS", "OPENSSL_NO_MSAN", "OPENSSL_NO_SCTP", "OPENSSL_NO_SSL3", "OPENSSL_NO_SSL3_METHOD", "OPENSSL_NO_UBSAN", "OPENSSL_NO_UNIT_TEST", "OPENSSL_NO_WEAK_SSL_CIPHERS", "OPENSSL_NO_DYNAMIC_ENGINE" ],
   openssl_sys_defines => [ "OPENSSL_SYS_WIN64A" ],
   openssl_thread_defines => [ "OPENSSL_THREADS" ],
   openssldir => "",
@@ -115,8 +115,8 @@ our %config = (
   sourcedir => ".",
   target => "VC-WIN64A",
   tdirs => [ "ossl_shim" ],
-  version => "1.1.1d",
-  version_num => "0x1010104fL",
+  version => "1.1.1e",
+  version_num => "0x1010105fL",
 );
 
 our %target = (
@@ -132,7 +132,7 @@ our %target = (
   LDFLAGS => "/nologo /debug",
   MT => "mt",
   MTFLAGS => "-nologo",
-  RANLIB => "CODE(0x557a48128d28)",
+  RANLIB => "CODE(0x557c73be49d8)",
   RC => "rc",
   _conf_fname_int => [ "Configurations/00-base-templates.conf", "Configurations/00-base-templates.conf", "Configurations/10-main.conf", "Configurations/10-main.conf", "Configurations/10-main.conf", "Configurations/10-main.conf", "Configurations/shared-info.pl" ],
   aes_asm_src => "aes_core.c aes_cbc.c",
@@ -256,6 +256,7 @@ our @disablables = (
   "dgram",
   "dh",
   "dsa",
+  "dso",
   "dtls",
   "dynamic-engine",
   "ec",
@@ -374,8 +375,8 @@ our %unified_info = (
         {
             "" =>
                 [
-                    "crypto/include/internal/bn_conf.h",
-                    "crypto/include/internal/dso_conf.h",
+                    "include/crypto/bn_conf.h",
+                    "include/crypto/dso_conf.h",
                     "include/openssl/opensslconf.h",
                 ],
             "apps/asn1pars.o" =>
@@ -643,14 +644,6 @@ our %unified_info = (
                     "crypto/perlasm/cbc.pl",
                     "crypto/perlasm/x86asm.pl",
                 ],
-            "crypto/include/internal/bn_conf.h" =>
-                [
-                    "configdata.pm",
-                ],
-            "crypto/include/internal/dso_conf.h" =>
-                [
-                    "configdata.pm",
-                ],
             "crypto/rc4/rc4-586.s" =>
                 [
                     "crypto/perlasm/x86asm.pl",
@@ -726,6 +719,14 @@ our %unified_info = (
                 [
                     "libcrypto",
                 ],
+            "include/crypto/bn_conf.h" =>
+                [
+                    "configdata.pm",
+                ],
+            "include/crypto/dso_conf.h" =>
+                [
+                    "configdata.pm",
+                ],
             "include/openssl/opensslconf.h" =>
                 [
                     "configdata.pm",
@@ -1523,6 +1524,12 @@ our %unified_info = (
                     "libcrypto",
                     "test/libtestutil.a",
                 ],
+            "test/ssl_ctx_test" =>
+                [
+                    "libcrypto",
+                    "libssl",
+                    "test/libtestutil.a",
+                ],
             "test/ssl_test" =>
                 [
                     "libcrypto",
@@ -3241,7 +3248,6 @@ our %unified_info = (
                             "test/testutil/cb.o",
                             "test/testutil/driver.o",
                             "test/testutil/format_output.o",
-                            "test/testutil/init.o",
                             "test/testutil/main.o",
                             "test/testutil/output_helpers.o",
                             "test/testutil/random.o",
@@ -3249,6 +3255,7 @@ our %unified_info = (
                             "test/testutil/tap_bio.o",
                             "test/testutil/test_cleanup.o",
                             "test/testutil/tests.o",
+                            "test/testutil/testutil_init.o",
                         ],
                     "products" =>
                         {
@@ -3742,14 +3749,6 @@ our %unified_info = (
                 [
                     "crypto/ia64cpuid.S",
                 ],
-            "crypto/include/internal/bn_conf.h" =>
-                [
-                    "crypto/include/internal/bn_conf.h.in",
-                ],
-            "crypto/include/internal/dso_conf.h" =>
-                [
-                    "crypto/include/internal/dso_conf.h.in",
-                ],
             "crypto/md5/md5-586.s" =>
                 [
                     "crypto/md5/asm/md5-586.pl",
@@ -4190,6 +4189,14 @@ our %unified_info = (
                     "engines/asm/e_padlock-x86_64.pl",
                     "\$(PERLASM_SCHEME)",
                 ],
+            "include/crypto/bn_conf.h" =>
+                [
+                    "include/crypto/bn_conf.h.in",
+                ],
+            "include/crypto/dso_conf.h" =>
+                [
+                    "include/crypto/dso_conf.h.in",
+                ],
             "include/openssl/opensslconf.h" =>
                 [
                     "include/openssl/opensslconf.h.in",
@@ -4899,49 +4906,41 @@ our %unified_info = (
             "crypto/aes/aes_cbc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/aes/aes_cfb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/aes/aes_core.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/aes/aes_ecb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/aes/aes_ige.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/aes/aes_misc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/aes/aes_ofb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/aes/aes_wrap.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/aes/aesfx-sparcv9.o" =>
@@ -4963,7 +4962,6 @@ our %unified_info = (
             "crypto/aria/aria.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/arm64cpuid.o" =>
@@ -4977,613 +4975,511 @@ our %unified_info = (
             "crypto/asn1/a_bitstr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_d2i_fp.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_digest.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_dup.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_gentm.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_i2d_fp.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_int.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_mbstr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_object.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_octet.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_print.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_sign.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_strex.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_strnid.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_time.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_type.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_utctm.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_utf8.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_verify.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/ameth_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/asn1_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/asn1_gen.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/asn1_item_list.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/asn1_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/asn1_par.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/asn_mime.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/asn_moid.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/asn_mstbl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/asn_pack.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/bio_asn1.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/bio_ndef.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/d2i_pr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/d2i_pu.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/evp_asn1.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/f_int.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/f_string.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/i2d_pr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/i2d_pu.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/n_pkey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/nsseq.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/p5_pbe.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/p5_pbev2.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/p5_scrypt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/p8_pkey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/t_bitst.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/t_pkey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/t_spki.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/tasn_dec.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/tasn_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/tasn_fre.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/tasn_new.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/tasn_prn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/tasn_scn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/tasn_typ.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/tasn_utl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/x_algor.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/x_bignum.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/x_info.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/x_int64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/x_long.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/x_pkey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/x_sig.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/x_spki.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/x_val.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/async/arch/async_null.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/async/arch/async_posix.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/async/arch/async_win.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/async/async.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/async/async_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/async/async_wait.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bf/bf_cfb64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bf/bf_ecb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bf/bf_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bf/bf_ofb64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bf/bf_skey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/b_addr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/b_dump.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/b_print.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/b_sock.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/b_sock2.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bf_buff.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bf_lbuf.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bf_nbio.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bf_null.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bio_cb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bio_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bio_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bio_meth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bss_acpt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bss_bio.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bss_conn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bss_dgram.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bss_fd.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bss_file.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bss_log.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bss_mem.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bss_null.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bss_sock.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/blake2/blake2b.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/blake2/blake2s.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/blake2/m_blake2b.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/blake2/m_blake2s.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/armv4-gf2m.o" =>
@@ -5601,188 +5497,157 @@ our %unified_info = (
             "crypto/bn/bn_add.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_asm.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_blind.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_const.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_ctx.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_depr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_dh.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_div.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_exp.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto",
                 ],
             "crypto/bn/bn_exp2.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_gcd.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_gf2m.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_intern.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_kron.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_mod.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_mont.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_mpi.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_mul.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_nist.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_prime.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_print.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_rand.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_recp.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_shift.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_sqr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_sqrt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_srp.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_word.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_x931p.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/mips-mont.o" =>
@@ -5812,13 +5677,11 @@ our %unified_info = (
             "crypto/buffer/buf_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/buffer/buffer.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/buildinf.h" =>
@@ -5828,43 +5691,36 @@ our %unified_info = (
             "crypto/camellia/camellia.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/camellia/cmll_cbc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/camellia/cmll_cfb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/camellia/cmll_ctr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/camellia/cmll_ecb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/camellia/cmll_misc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/camellia/cmll_ofb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/camellia/cmllt4-sparcv9.o" =>
@@ -5874,31 +5730,26 @@ our %unified_info = (
             "crypto/cast/c_cfb64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cast/c_ecb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cast/c_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cast/c_ofb64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cast/c_skey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/chacha/chacha-armv4.o" =>
@@ -5916,278 +5767,232 @@ our %unified_info = (
             "crypto/chacha/chacha_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cmac/cm_ameth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cmac/cm_pmeth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cmac/cmac.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_asn1.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_att.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_cd.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_dd.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_env.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_ess.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_io.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_kari.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_pwri.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_sd.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_smime.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/conf/conf_api.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/conf/conf_def.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/conf/conf_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/conf/conf_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/conf/conf_mall.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/conf/conf_mod.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/conf/conf_sap.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/conf/conf_ssl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cpt_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cryptlib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ct/ct_b64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ct/ct_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ct/ct_log.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ct/ct_oct.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ct/ct_policy.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ct/ct_prn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ct/ct_sct.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ct/ct_sct_ctx.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ct/ct_vfy.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ct/ct_x509v3.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ctype.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cversion.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto",
                 ],
             "crypto/des/cbc_cksm.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/cbc_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/cfb64ede.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/cfb64enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/cfb_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/des_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/dest4-sparcv9.o" =>
@@ -6197,301 +6002,251 @@ our %unified_info = (
             "crypto/des/ecb3_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/ecb_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/fcrypt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/fcrypt_b.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/ofb64ede.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/ofb64enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/ofb_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/pcbc_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/qud_cksm.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/rand_key.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/set_key.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/str2key.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/xcbc_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_ameth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_asn1.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_check.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_depr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_gen.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_kdf.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_key.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_meth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_pmeth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_prn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_rfc5114.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_rfc7919.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dsa/dsa_ameth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dsa/dsa_asn1.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dsa/dsa_depr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dsa/dsa_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dsa/dsa_gen.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dsa/dsa_key.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dsa/dsa_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dsa/dsa_meth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dsa/dsa_ossl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dsa/dsa_pmeth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dsa/dsa_prn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dsa/dsa_sign.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dsa/dsa_vrf.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dso/dso_dl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dso/dso_dlfcn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dso/dso_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dso/dso_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dso/dso_openssl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dso/dso_vms.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dso/dso_win32.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ebcdic.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/curve25519.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/curve448/arch_32/f_impl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto/ec/curve448/arch_32",
                     "crypto/ec/curve448",
@@ -6499,7 +6254,6 @@ our %unified_info = (
             "crypto/ec/curve448/curve448.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto/ec/curve448/arch_32",
                     "crypto/ec/curve448",
@@ -6507,7 +6261,6 @@ our %unified_info = (
             "crypto/ec/curve448/curve448_tables.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto/ec/curve448/arch_32",
                     "crypto/ec/curve448",
@@ -6515,7 +6268,6 @@ our %unified_info = (
             "crypto/ec/curve448/eddsa.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto/ec/curve448/arch_32",
                     "crypto/ec/curve448",
@@ -6523,7 +6275,6 @@ our %unified_info = (
             "crypto/ec/curve448/f_generic.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto/ec/curve448/arch_32",
                     "crypto/ec/curve448",
@@ -6531,7 +6282,6 @@ our %unified_info = (
             "crypto/ec/curve448/scalar.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto/ec/curve448/arch_32",
                     "crypto/ec/curve448",
@@ -6539,163 +6289,136 @@ our %unified_info = (
             "crypto/ec/ec2_oct.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec2_smpl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec_ameth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec_asn1.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec_check.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec_curve.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec_cvt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec_key.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec_kmeth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec_mult.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec_oct.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec_pmeth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec_print.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecdh_kdf.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecdh_ossl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecdsa_ossl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecdsa_sign.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecdsa_vrf.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/eck_prn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecp_mont.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecp_nist.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecp_nistp224.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecp_nistp256.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecp_nistp521.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecp_nistputil.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecp_nistz256-armv4.o" =>
@@ -6713,223 +6436,186 @@ our %unified_info = (
             "crypto/ec/ecp_oct.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecp_smpl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecx_meth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/eng_all.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/eng_cnf.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/eng_ctrl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/eng_dyn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/eng_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/eng_fat.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/eng_init.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/eng_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/eng_list.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/eng_openssl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/eng_pkey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/eng_rdrand.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/eng_table.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/tb_asnmth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/tb_cipher.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/tb_dh.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/tb_digest.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/tb_dsa.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/tb_eckey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/tb_pkmeth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/tb_rand.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/tb_rsa.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/err/err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/err/err_all.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/err/err_prn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/bio_b64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/bio_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/bio_md.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/bio_ok.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/c_allc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/c_alld.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/cmeth_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/digest.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/e_aes.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto",
                     "crypto/modes",
@@ -6937,21 +6623,18 @@ our %unified_info = (
             "crypto/evp/e_aes_cbc_hmac_sha1.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto/modes",
                 ],
             "crypto/evp/e_aes_cbc_hmac_sha256.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto/modes",
                 ],
             "crypto/evp/e_aria.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto",
                     "crypto/modes",
@@ -6959,13 +6642,11 @@ our %unified_info = (
             "crypto/evp/e_bf.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/e_camellia.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto",
                     "crypto/modes",
@@ -6973,81 +6654,68 @@ our %unified_info = (
             "crypto/evp/e_cast.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/e_chacha20_poly1305.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/e_des.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto",
                 ],
             "crypto/evp/e_des3.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto",
                 ],
             "crypto/evp/e_idea.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/e_null.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/e_old.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/e_rc2.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/e_rc4.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/e_rc4_hmac_md5.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/e_rc5.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/e_seed.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/e_sm4.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto",
                     "crypto/modes",
@@ -7055,328 +6723,267 @@ our %unified_info = (
             "crypto/evp/e_xcbc_d.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/encode.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/evp_cnf.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/evp_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/evp_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/evp_key.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/evp_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/evp_pbe.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/evp_pkey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/m_md2.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/m_md4.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/m_md5.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/m_md5_sha1.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/m_mdc2.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/m_null.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/m_ripemd.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/m_sha1.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/m_sha3.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto",
                 ],
             "crypto/evp/m_sigver.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/m_wp.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/names.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/p5_crpt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/p5_crpt2.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/p_dec.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/p_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/p_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/p_open.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/p_seal.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/p_sign.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/p_verify.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/pbe_scrypt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/pmeth_fn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/pmeth_gn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/pmeth_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ex_data.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/getenv.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/hmac/hm_ameth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/hmac/hm_pmeth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/hmac/hmac.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/idea/i_cbc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/idea/i_cfb64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/idea/i_ecb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/idea/i_ofb64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/idea/i_skey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
-            "crypto/include/internal/bn_conf.h" =>
-                [
-                    ".",
-                ],
-            "crypto/include/internal/dso_conf.h" =>
-                [
-                    ".",
-                ],
             "crypto/init.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/kdf/hkdf.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/kdf/kdf_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/kdf/scrypt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/kdf/tls1_prf.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/lhash/lh_stats.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/lhash/lhash.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/md4/md4_dgst.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/md4/md4_one.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/md5/md5-sparcv9.o" =>
@@ -7386,85 +6993,71 @@ our %unified_info = (
             "crypto/md5/md5_dgst.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/md5/md5_one.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/mdc2/mdc2_one.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/mdc2/mdc2dgst.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/mem.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/mem_clr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/mem_dbg.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/mem_sec.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/modes/cbc128.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/modes/ccm128.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/modes/cfb128.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/modes/ctr128.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/modes/cts128.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/modes/gcm128.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto",
                 ],
@@ -7487,361 +7080,301 @@ our %unified_info = (
             "crypto/modes/ocb128.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/modes/ofb128.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/modes/wrap128.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/modes/xts128.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/o_dir.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/o_fips.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/o_fopen.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/o_init.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/o_str.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/o_time.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/objects/o_names.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/objects/obj_dat.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/objects/obj_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/objects/obj_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/objects/obj_xref.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ocsp/ocsp_asn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ocsp/ocsp_cl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ocsp/ocsp_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ocsp/ocsp_ext.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ocsp/ocsp_ht.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ocsp/ocsp_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ocsp/ocsp_prn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ocsp/ocsp_srv.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ocsp/ocsp_vfy.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ocsp/v3_ocsp.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pem/pem_all.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pem/pem_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pem/pem_info.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pem/pem_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pem/pem_oth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pem/pem_pk8.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pem/pem_pkey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pem/pem_sign.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pem/pem_x509.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pem/pem_xaux.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pem/pvkfmt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_add.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_asn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_attr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_crpt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_crt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_decr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_init.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_key.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_kiss.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_mutl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_npas.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_p8d.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_p8e.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_sbag.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_utl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/pk12err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs7/bio_pk7.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs7/pk7_asn1.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs7/pk7_attr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs7/pk7_doit.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs7/pk7_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs7/pk7_mime.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs7/pk7_smime.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs7/pkcs7err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/poly1305/poly1305-armv4.o" =>
@@ -7863,259 +7396,216 @@ our %unified_info = (
             "crypto/poly1305/poly1305.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/poly1305/poly1305_ameth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/poly1305/poly1305_pmeth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rand/drbg_ctr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rand/drbg_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rand/rand_egd.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rand/rand_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rand/rand_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rand/rand_unix.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rand/rand_vms.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rand/rand_win.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rand/randfile.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rc2/rc2_cbc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rc2/rc2_ecb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rc2/rc2_skey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rc2/rc2cfb64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rc2/rc2ofb64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rc4/rc4_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rc4/rc4_skey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ripemd/rmd_dgst.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ripemd/rmd_one.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_ameth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_asn1.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_chk.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_crpt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_depr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_gen.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_meth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_mp.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_none.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_oaep.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_ossl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_pk1.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_pmeth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_prn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_pss.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_saos.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_sign.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_ssl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_x931.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_x931g.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/s390xcpuid.o" =>
@@ -8125,31 +7615,26 @@ our %unified_info = (
             "crypto/seed/seed.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/seed/seed_cbc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/seed/seed_cfb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/seed/seed_ecb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/seed/seed_ofb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sha/keccak1600-armv4.o" =>
@@ -8159,7 +7644,6 @@ our %unified_info = (
             "crypto/sha/keccak1600.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sha/sha1-armv4-large.o" =>
@@ -8185,13 +7669,11 @@ our %unified_info = (
             "crypto/sha/sha1_one.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sha/sha1dgst.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sha/sha256-armv4.o" =>
@@ -8217,7 +7699,6 @@ our %unified_info = (
             "crypto/sha/sha256.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sha/sha512-armv4.o" =>
@@ -8243,709 +7724,591 @@ our %unified_info = (
             "crypto/sha/sha512.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/siphash/siphash.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/siphash/siphash_ameth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/siphash/siphash_pmeth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sm2/sm2_crypt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sm2/sm2_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sm2/sm2_pmeth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sm2/sm2_sign.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sm3/m_sm3.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sm3/sm3.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sm4/sm4.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/srp/srp_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/srp/srp_vfy.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/stack/stack.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/store/loader_file.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/store/store_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/store/store_init.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/store/store_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/store/store_register.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/store/store_strings.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/threads_none.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/threads_pthread.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/threads_win.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ts/ts_asn1.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ts/ts_conf.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ts/ts_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ts/ts_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ts/ts_req_print.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ts/ts_req_utils.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ts/ts_rsp_print.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ts/ts_rsp_sign.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ts/ts_rsp_utils.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ts/ts_rsp_verify.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ts/ts_verify_ctx.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/txt_db/txt_db.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ui/ui_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ui/ui_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ui/ui_null.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ui/ui_openssl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ui/ui_util.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/uid.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/whrlpool/wp_block.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/whrlpool/wp_dgst.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/by_dir.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/by_file.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/t_crl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/t_req.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/t_x509.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_att.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_cmp.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_d2.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_def.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_ext.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_lu.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_meth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_obj.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_r2x.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_req.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_set.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_trs.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_txt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_v3.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_vfy.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_vpm.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509cset.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509name.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509rset.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509spki.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509type.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x_all.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x_attrib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x_crl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x_exten.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x_name.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x_pubkey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x_req.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x_x509.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x_x509a.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/pcy_cache.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/pcy_data.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/pcy_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/pcy_map.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/pcy_node.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/pcy_tree.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_addr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_admis.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_akey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_akeya.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_alt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_asid.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_bcons.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_bitst.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_conf.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_cpols.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_crld.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_enum.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_extku.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_genn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_ia5.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_info.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_int.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_ncons.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_pci.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_pcia.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_pcons.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_pku.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_pmaps.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_prn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_purp.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_skey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_sxnet.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_tlsf.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_utl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "engines/e_capi.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "engines/e_padlock.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "fuzz/asn1.o" =>
@@ -8996,6 +8359,14 @@ our %unified_info = (
                 [
                     "include",
                 ],
+            "include/crypto/bn_conf.h" =>
+                [
+                    ".",
+                ],
+            "include/crypto/dso_conf.h" =>
+                [
+                    ".",
+                ],
             "include/openssl/opensslconf.h" =>
                 [
                     ".",
@@ -9240,7 +8611,6 @@ our %unified_info = (
                 [
                     ".",
                     "include",
-                    "crypto/include",
                 ],
             "test/asn1_string_table_test.o" =>
                 [
@@ -9566,7 +8936,6 @@ our %unified_info = (
                 [
                     ".",
                     "include",
-                    "crypto/include",
                 ],
             "test/cipher_overhead_test.o" =>
                 [
@@ -9612,7 +8981,6 @@ our %unified_info = (
             "test/ctype_internal_test.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "test/curve448_internal_test.o" =>
@@ -9678,7 +9046,6 @@ our %unified_info = (
                 [
                     "include",
                     "crypto/ec",
-                    "crypto/include",
                 ],
             "test/ecdsatest.o" =>
                 [
@@ -9703,7 +9070,6 @@ our %unified_info = (
             "test/evp_extra_test.o" =>
                 [
                     "include",
-                    "crypto/include",
                 ],
             "test/evp_test.o" =>
                 [
@@ -9801,7 +9167,6 @@ our %unified_info = (
                 [
                     ".",
                     "include",
-                    "crypto/include",
                 ],
             "test/rc2test.o" =>
                 [
@@ -9851,18 +9216,15 @@ our %unified_info = (
                 [
                     ".",
                     "include",
-                    "crypto/include",
                 ],
             "test/sm2_internal_test.o" =>
                 [
                     "include",
-                    "crypto/include",
                 ],
             "test/sm4_internal_test.o" =>
                 [
                     ".",
                     "include",
-                    "crypto/include",
                 ],
             "test/srptest.o" =>
                 [
@@ -9873,6 +9235,10 @@ our %unified_info = (
                     ".",
                     "include",
                 ],
+            "test/ssl_ctx_test.o" =>
+                [
+                    "include",
+                ],
             "test/ssl_test.o" =>
                 [
                     "include",
@@ -9936,10 +9302,6 @@ our %unified_info = (
                 [
                     "include",
                 ],
-            "test/testutil/init.o" =>
-                [
-                    "include",
-                ],
             "test/testutil/main.o" =>
                 [
                     "include",
@@ -9968,6 +9330,10 @@ our %unified_info = (
                 [
                     "include",
                 ],
+            "test/testutil/testutil_init.o" =>
+                [
+                    "include",
+                ],
             "test/threadstest.o" =>
                 [
                     "include",
@@ -10232,6 +9598,7 @@ our %unified_info = (
             "test/sm4_internal_test",
             "test/srptest",
             "test/ssl_cert_table_internal_test",
+            "test/ssl_ctx_test",
             "test/ssl_test",
             "test/ssl_test_ctx_test",
             "test/sslapitest",
@@ -15100,7 +14467,6 @@ our %unified_info = (
                     "test/testutil/cb.o",
                     "test/testutil/driver.o",
                     "test/testutil/format_output.o",
-                    "test/testutil/init.o",
                     "test/testutil/main.o",
                     "test/testutil/output_helpers.o",
                     "test/testutil/random.o",
@@ -15108,6 +14474,7 @@ our %unified_info = (
                     "test/testutil/tap_bio.o",
                     "test/testutil/test_cleanup.o",
                     "test/testutil/tests.o",
+                    "test/testutil/testutil_init.o",
                 ],
             "test/md2test" =>
                 [
@@ -15335,6 +14702,14 @@ our %unified_info = (
                 [
                     "test/ssl_cert_table_internal_test.c",
                 ],
+            "test/ssl_ctx_test" =>
+                [
+                    "test/ssl_ctx_test.o",
+                ],
+            "test/ssl_ctx_test.o" =>
+                [
+                    "test/ssl_ctx_test.c",
+                ],
             "test/ssl_test" =>
                 [
                     "test/handshake_helper.o",
@@ -15437,10 +14812,6 @@ our %unified_info = (
                 [
                     "test/testutil/format_output.c",
                 ],
-            "test/testutil/init.o" =>
-                [
-                    "test/testutil/init.c",
-                ],
             "test/testutil/main.o" =>
                 [
                     "test/testutil/main.c",
@@ -15469,6 +14840,10 @@ our %unified_info = (
                 [
                     "test/testutil/tests.c",
                 ],
+            "test/testutil/testutil_init.o" =>
+                [
+                    "test/testutil/testutil_init.c",
+                ],
             "test/threadstest" =>
                 [
                     "test/threadstest.o",
diff --git a/deps/openssl/config/archs/VC-WIN64A/no-asm/crypto/buildinf.h b/deps/openssl/config/archs/VC-WIN64A/no-asm/crypto/buildinf.h
index fae2f1183e..00baa0f863 100644
--- a/deps/openssl/config/archs/VC-WIN64A/no-asm/crypto/buildinf.h
+++ b/deps/openssl/config/archs/VC-WIN64A/no-asm/crypto/buildinf.h
@@ -11,7 +11,7 @@
  */
 
 #define PLATFORM "platform: "
-#define DATE "built on: Fri Sep 13 16:03:30 2019 UTC"
+#define DATE "built on: Wed Mar 18 21:10:56 2020 UTC"
 
 /*
  * Generate compiler_flags as an array of individual characters. This is a
diff --git a/deps/openssl/config/archs/VC-WIN64A/no-asm/crypto/include/internal/bn_conf.h b/deps/openssl/config/archs/VC-WIN64A/no-asm/crypto/include/internal/bn_conf.h
index d803b51858..dab67d1b37 100644
--- a/deps/openssl/config/archs/VC-WIN64A/no-asm/crypto/include/internal/bn_conf.h
+++ b/deps/openssl/config/archs/VC-WIN64A/no-asm/crypto/include/internal/bn_conf.h
@@ -1,5 +1,5 @@
 /* WARNING: do not edit! */
-/* Generated by makefile from crypto/include/internal/bn_conf.h.in */
+/* Generated by makefile from include/crypto/bn_conf.h.in */
 /*
  * Copyright 2016 The OpenSSL Project Authors. All Rights Reserved.
  *
@@ -9,8 +9,8 @@
  * https://www.openssl.org/source/license.html
  */
 
-#ifndef HEADER_BN_CONF_H
-# define HEADER_BN_CONF_H
+#ifndef OSSL_CRYPTO_BN_CONF_H
+# define OSSL_CRYPTO_BN_CONF_H
 
 /*
  * The contents of this file are not used in the UEFI build, as
diff --git a/deps/openssl/config/archs/VC-WIN64A/no-asm/crypto/include/internal/dso_conf.h b/deps/openssl/config/archs/VC-WIN64A/no-asm/crypto/include/internal/dso_conf.h
index c3b41df01e..0c96ce7363 100644
--- a/deps/openssl/config/archs/VC-WIN64A/no-asm/crypto/include/internal/dso_conf.h
+++ b/deps/openssl/config/archs/VC-WIN64A/no-asm/crypto/include/internal/dso_conf.h
@@ -1,5 +1,5 @@
 /* WARNING: do not edit! */
-/* Generated by makefile from crypto/include/internal/dso_conf.h.in */
+/* Generated by makefile from include/crypto/dso_conf.h.in */
 /*
  * Copyright 2016-2019 The OpenSSL Project Authors. All Rights Reserved.
  *
@@ -9,8 +9,8 @@
  * https://www.openssl.org/source/license.html
  */
 
-#ifndef HEADER_DSO_CONF_H
-# define HEADER_DSO_CONF_H
+#ifndef OSSL_CRYPTO_DSO_CONF_H
+# define OSSL_CRYPTO_DSO_CONF_H
 # define DSO_WIN32
 # define DSO_EXTENSION ".dll"
 #endif
diff --git a/deps/openssl/config/archs/VC-WIN64A/no-asm/include/openssl/opensslconf.h b/deps/openssl/config/archs/VC-WIN64A/no-asm/include/openssl/opensslconf.h
index a89654ac77..0122f2c30d 100644
--- a/deps/openssl/config/archs/VC-WIN64A/no-asm/include/openssl/opensslconf.h
+++ b/deps/openssl/config/archs/VC-WIN64A/no-asm/include/openssl/opensslconf.h
@@ -102,9 +102,6 @@ extern "C" {
 #ifndef OPENSSL_NO_DYNAMIC_ENGINE
 # define OPENSSL_NO_DYNAMIC_ENGINE
 #endif
-#ifndef OPENSSL_NO_AFALGENG
-# define OPENSSL_NO_AFALGENG
-#endif
 
 
 /*
diff --git a/deps/openssl/config/archs/VC-WIN64A/no-asm/include/progs.h b/deps/openssl/config/archs/VC-WIN64A/no-asm/include/progs.h
index 9b3d270e20..308c65601b 100644
--- a/deps/openssl/config/archs/VC-WIN64A/no-asm/include/progs.h
+++ b/deps/openssl/config/archs/VC-WIN64A/no-asm/include/progs.h
@@ -2,7 +2,7 @@
  * WARNING: do not edit!
  * Generated by apps/progs.pl
  *
- * Copyright 1995-2019 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 1995-2020 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
diff --git a/deps/openssl/config/archs/aix-gcc/asm/configdata.pm b/deps/openssl/config/archs/aix-gcc/asm/configdata.pm
index b79cebd14c..7dc4c54dd0 100644
--- a/deps/openssl/config/archs/aix-gcc/asm/configdata.pm
+++ b/deps/openssl/config/archs/aix-gcc/asm/configdata.pm
@@ -54,7 +54,7 @@ our %config = (
   minor => "1.1",
   openssl_algorithm_defines => [ "OPENSSL_NO_COMP", "OPENSSL_NO_MD2", "OPENSSL_NO_RC5" ],
   openssl_api_defines => [  ],
-  openssl_other_defines => [ "OPENSSL_RAND_SEED_OS", "OPENSSL_NO_AFALGENG", "OPENSSL_NO_ASAN", "OPENSSL_NO_CRYPTO_MDEBUG", "OPENSSL_NO_CRYPTO_MDEBUG_BACKTRACE", "OPENSSL_NO_DEVCRYPTOENG", "OPENSSL_NO_EC_NISTP_64_GCC_128", "OPENSSL_NO_EGD", "OPENSSL_NO_EXTERNAL_TESTS", "OPENSSL_NO_FUZZ_AFL", "OPENSSL_NO_FUZZ_LIBFUZZER", "OPENSSL_NO_HEARTBEATS", "OPENSSL_NO_MSAN", "OPENSSL_NO_SCTP", "OPENSSL_NO_SSL3", "OPENSSL_NO_SSL3_METHOD", "OPENSSL_NO_UBSAN", "OPENSSL_NO_UNIT_TEST", "OPENSSL_NO_WEAK_SSL_CIPHERS", "OPENSSL_NO_DYNAMIC_ENGINE", "OPENSSL_NO_AFALGENG" ],
+  openssl_other_defines => [ "OPENSSL_RAND_SEED_OS", "OPENSSL_NO_AFALGENG", "OPENSSL_NO_ASAN", "OPENSSL_NO_CRYPTO_MDEBUG", "OPENSSL_NO_CRYPTO_MDEBUG_BACKTRACE", "OPENSSL_NO_DEVCRYPTOENG", "OPENSSL_NO_EC_NISTP_64_GCC_128", "OPENSSL_NO_EGD", "OPENSSL_NO_EXTERNAL_TESTS", "OPENSSL_NO_FUZZ_AFL", "OPENSSL_NO_FUZZ_LIBFUZZER", "OPENSSL_NO_HEARTBEATS", "OPENSSL_NO_MSAN", "OPENSSL_NO_SCTP", "OPENSSL_NO_SSL3", "OPENSSL_NO_SSL3_METHOD", "OPENSSL_NO_UBSAN", "OPENSSL_NO_UNIT_TEST", "OPENSSL_NO_WEAK_SSL_CIPHERS", "OPENSSL_NO_DYNAMIC_ENGINE" ],
   openssl_sys_defines => [ "OPENSSL_SYS_AIX" ],
   openssl_thread_defines => [ "OPENSSL_THREADS" ],
   openssldir => "",
@@ -110,8 +110,8 @@ our %config = (
   sourcedir => ".",
   target => "aix-gcc",
   tdirs => [ "ossl_shim" ],
-  version => "1.1.1d",
-  version_num => "0x1010104fL",
+  version => "1.1.1e",
+  version_num => "0x1010105fL",
 );
 
 our %target = (
@@ -236,6 +236,7 @@ our @disablables = (
   "dgram",
   "dh",
   "dsa",
+  "dso",
   "dtls",
   "dynamic-engine",
   "ec",
@@ -353,8 +354,8 @@ our %unified_info = (
         {
             "" =>
                 [
-                    "crypto/include/internal/bn_conf.h",
-                    "crypto/include/internal/dso_conf.h",
+                    "include/crypto/bn_conf.h",
+                    "include/crypto/dso_conf.h",
                     "include/openssl/opensslconf.h",
                 ],
             "apps/asn1pars.o" =>
@@ -622,14 +623,6 @@ our %unified_info = (
                     "crypto/perlasm/cbc.pl",
                     "crypto/perlasm/x86asm.pl",
                 ],
-            "crypto/include/internal/bn_conf.h" =>
-                [
-                    "configdata.pm",
-                ],
-            "crypto/include/internal/dso_conf.h" =>
-                [
-                    "configdata.pm",
-                ],
             "crypto/rc4/rc4-586.s" =>
                 [
                     "crypto/perlasm/x86asm.pl",
@@ -705,6 +698,14 @@ our %unified_info = (
                 [
                     "libcrypto",
                 ],
+            "include/crypto/bn_conf.h" =>
+                [
+                    "configdata.pm",
+                ],
+            "include/crypto/dso_conf.h" =>
+                [
+                    "configdata.pm",
+                ],
             "include/openssl/opensslconf.h" =>
                 [
                     "configdata.pm",
@@ -1502,6 +1503,12 @@ our %unified_info = (
                     "libcrypto",
                     "test/libtestutil.a",
                 ],
+            "test/ssl_ctx_test" =>
+                [
+                    "libcrypto",
+                    "libssl",
+                    "test/libtestutil.a",
+                ],
             "test/ssl_test" =>
                 [
                     "libcrypto",
@@ -3233,7 +3240,6 @@ our %unified_info = (
                             "test/testutil/cb.o",
                             "test/testutil/driver.o",
                             "test/testutil/format_output.o",
-                            "test/testutil/init.o",
                             "test/testutil/main.o",
                             "test/testutil/output_helpers.o",
                             "test/testutil/random.o",
@@ -3241,6 +3247,7 @@ our %unified_info = (
                             "test/testutil/tap_bio.o",
                             "test/testutil/test_cleanup.o",
                             "test/testutil/tests.o",
+                            "test/testutil/testutil_init.o",
                         ],
                     "products" =>
                         {
@@ -3739,14 +3746,6 @@ our %unified_info = (
                 [
                     "crypto/ia64cpuid.S",
                 ],
-            "crypto/include/internal/bn_conf.h" =>
-                [
-                    "crypto/include/internal/bn_conf.h.in",
-                ],
-            "crypto/include/internal/dso_conf.h" =>
-                [
-                    "crypto/include/internal/dso_conf.h.in",
-                ],
             "crypto/md5/md5-586.s" =>
                 [
                     "crypto/md5/asm/md5-586.pl",
@@ -4187,6 +4186,14 @@ our %unified_info = (
                     "engines/asm/e_padlock-x86_64.pl",
                     "\$(PERLASM_SCHEME)",
                 ],
+            "include/crypto/bn_conf.h" =>
+                [
+                    "include/crypto/bn_conf.h.in",
+                ],
+            "include/crypto/dso_conf.h" =>
+                [
+                    "include/crypto/dso_conf.h.in",
+                ],
             "include/openssl/opensslconf.h" =>
                 [
                     "include/openssl/opensslconf.h.in",
@@ -4873,7 +4880,6 @@ our %unified_info = (
             "crypto/aes/aes-ppc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/aes/aes-s390x.o" =>
@@ -4887,49 +4893,41 @@ our %unified_info = (
             "crypto/aes/aes_cbc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/aes/aes_cfb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/aes/aes_core.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/aes/aes_ecb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/aes/aes_ige.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/aes/aes_misc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/aes/aes_ofb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/aes/aes_wrap.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/aes/aesfx-sparcv9.o" =>
@@ -4939,7 +4937,6 @@ our %unified_info = (
             "crypto/aes/aesp8-ppc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/aes/aest4-sparcv9.o" =>
@@ -4957,13 +4954,11 @@ our %unified_info = (
             "crypto/aes/vpaes-ppc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/aria/aria.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/arm64cpuid.o" =>
@@ -4977,613 +4972,511 @@ our %unified_info = (
             "crypto/asn1/a_bitstr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_d2i_fp.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_digest.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_dup.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_gentm.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_i2d_fp.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_int.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_mbstr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_object.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_octet.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_print.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_sign.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_strex.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_strnid.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_time.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_type.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_utctm.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_utf8.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_verify.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/ameth_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/asn1_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/asn1_gen.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/asn1_item_list.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/asn1_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/asn1_par.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/asn_mime.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/asn_moid.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/asn_mstbl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/asn_pack.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/bio_asn1.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/bio_ndef.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/d2i_pr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/d2i_pu.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/evp_asn1.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/f_int.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/f_string.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/i2d_pr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/i2d_pu.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/n_pkey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/nsseq.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/p5_pbe.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/p5_pbev2.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/p5_scrypt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/p8_pkey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/t_bitst.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/t_pkey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/t_spki.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/tasn_dec.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/tasn_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/tasn_fre.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/tasn_new.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/tasn_prn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/tasn_scn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/tasn_typ.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/tasn_utl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/x_algor.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/x_bignum.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/x_info.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/x_int64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/x_long.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/x_pkey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/x_sig.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/x_spki.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/x_val.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/async/arch/async_null.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/async/arch/async_posix.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/async/arch/async_win.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/async/async.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/async/async_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/async/async_wait.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bf/bf_cfb64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bf/bf_ecb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bf/bf_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bf/bf_ofb64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bf/bf_skey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/b_addr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/b_dump.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/b_print.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/b_sock.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/b_sock2.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bf_buff.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bf_lbuf.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bf_nbio.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bf_null.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bio_cb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bio_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bio_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bio_meth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bss_acpt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bss_bio.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bss_conn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bss_dgram.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bss_fd.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bss_file.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bss_log.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bss_mem.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bss_null.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bss_sock.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/blake2/blake2b.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/blake2/blake2s.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/blake2/m_blake2b.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/blake2/m_blake2s.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/armv4-gf2m.o" =>
@@ -5601,188 +5494,157 @@ our %unified_info = (
             "crypto/bn/bn-ppc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_add.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_blind.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_const.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_ctx.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_depr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_dh.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_div.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_exp.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto",
                 ],
             "crypto/bn/bn_exp2.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_gcd.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_gf2m.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_intern.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_kron.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_mod.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_mont.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_mpi.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_mul.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_nist.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_prime.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_print.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_rand.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_recp.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_shift.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_sqr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_sqrt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_srp.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_word.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_x931p.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/mips-mont.o" =>
@@ -5792,7 +5654,6 @@ our %unified_info = (
             "crypto/bn/ppc-mont.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/sparct4-mont.o" =>
@@ -5818,13 +5679,11 @@ our %unified_info = (
             "crypto/buffer/buf_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/buffer/buffer.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/buildinf.h" =>
@@ -5834,43 +5693,36 @@ our %unified_info = (
             "crypto/camellia/camellia.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/camellia/cmll_cbc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/camellia/cmll_cfb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/camellia/cmll_ctr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/camellia/cmll_ecb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/camellia/cmll_misc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/camellia/cmll_ofb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/camellia/cmllt4-sparcv9.o" =>
@@ -5880,31 +5732,26 @@ our %unified_info = (
             "crypto/cast/c_cfb64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cast/c_ecb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cast/c_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cast/c_ofb64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cast/c_skey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/chacha/chacha-armv4.o" =>
@@ -5918,7 +5765,6 @@ our %unified_info = (
             "crypto/chacha/chacha-ppc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/chacha/chacha-s390x.o" =>
@@ -5928,272 +5774,227 @@ our %unified_info = (
             "crypto/cmac/cm_ameth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cmac/cm_pmeth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cmac/cmac.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_asn1.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_att.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_cd.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_dd.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_env.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_ess.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_io.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_kari.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_pwri.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_sd.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_smime.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/conf/conf_api.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/conf/conf_def.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/conf/conf_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/conf/conf_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/conf/conf_mall.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/conf/conf_mod.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/conf/conf_sap.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/conf/conf_ssl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cpt_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cryptlib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ct/ct_b64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ct/ct_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ct/ct_log.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ct/ct_oct.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ct/ct_policy.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ct/ct_prn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ct/ct_sct.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ct/ct_sct_ctx.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ct/ct_vfy.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ct/ct_x509v3.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ctype.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cversion.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto",
                 ],
             "crypto/des/cbc_cksm.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/cbc_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/cfb64ede.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/cfb64enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/cfb_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/des_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/dest4-sparcv9.o" =>
@@ -6203,301 +6004,251 @@ our %unified_info = (
             "crypto/des/ecb3_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/ecb_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/fcrypt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/fcrypt_b.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/ofb64ede.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/ofb64enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/ofb_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/pcbc_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/qud_cksm.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/rand_key.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/set_key.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/str2key.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/xcbc_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_ameth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_asn1.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_check.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_depr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_gen.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_kdf.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_key.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_meth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_pmeth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_prn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_rfc5114.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_rfc7919.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dsa/dsa_ameth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dsa/dsa_asn1.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dsa/dsa_depr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dsa/dsa_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dsa/dsa_gen.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dsa/dsa_key.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dsa/dsa_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dsa/dsa_meth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dsa/dsa_ossl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dsa/dsa_pmeth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dsa/dsa_prn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dsa/dsa_sign.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dsa/dsa_vrf.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dso/dso_dl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dso/dso_dlfcn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dso/dso_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dso/dso_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dso/dso_openssl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dso/dso_vms.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dso/dso_win32.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ebcdic.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/curve25519.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/curve448/arch_32/f_impl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto/ec/curve448/arch_32",
                     "crypto/ec/curve448",
@@ -6505,7 +6256,6 @@ our %unified_info = (
             "crypto/ec/curve448/curve448.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto/ec/curve448/arch_32",
                     "crypto/ec/curve448",
@@ -6513,7 +6263,6 @@ our %unified_info = (
             "crypto/ec/curve448/curve448_tables.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto/ec/curve448/arch_32",
                     "crypto/ec/curve448",
@@ -6521,7 +6270,6 @@ our %unified_info = (
             "crypto/ec/curve448/eddsa.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto/ec/curve448/arch_32",
                     "crypto/ec/curve448",
@@ -6529,7 +6277,6 @@ our %unified_info = (
             "crypto/ec/curve448/f_generic.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto/ec/curve448/arch_32",
                     "crypto/ec/curve448",
@@ -6537,7 +6284,6 @@ our %unified_info = (
             "crypto/ec/curve448/scalar.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto/ec/curve448/arch_32",
                     "crypto/ec/curve448",
@@ -6545,163 +6291,136 @@ our %unified_info = (
             "crypto/ec/ec2_oct.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec2_smpl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec_ameth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec_asn1.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec_check.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec_curve.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec_cvt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec_key.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec_kmeth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec_mult.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec_oct.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec_pmeth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec_print.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecdh_kdf.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecdh_ossl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecdsa_ossl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecdsa_sign.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecdsa_vrf.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/eck_prn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecp_mont.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecp_nist.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecp_nistp224.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecp_nistp256.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecp_nistp521.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecp_nistputil.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecp_nistz256-armv4.o" =>
@@ -6719,223 +6438,186 @@ our %unified_info = (
             "crypto/ec/ecp_oct.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecp_smpl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecx_meth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/eng_all.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/eng_cnf.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/eng_ctrl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/eng_dyn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/eng_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/eng_fat.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/eng_init.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/eng_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/eng_list.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/eng_openssl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/eng_pkey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/eng_rdrand.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/eng_table.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/tb_asnmth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/tb_cipher.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/tb_dh.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/tb_digest.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/tb_dsa.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/tb_eckey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/tb_pkmeth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/tb_rand.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/tb_rsa.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/err/err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/err/err_all.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/err/err_prn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/bio_b64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/bio_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/bio_md.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/bio_ok.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/c_allc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/c_alld.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/cmeth_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/digest.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/e_aes.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto",
                     "crypto/modes",
@@ -6943,21 +6625,18 @@ our %unified_info = (
             "crypto/evp/e_aes_cbc_hmac_sha1.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto/modes",
                 ],
             "crypto/evp/e_aes_cbc_hmac_sha256.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto/modes",
                 ],
             "crypto/evp/e_aria.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto",
                     "crypto/modes",
@@ -6965,13 +6644,11 @@ our %unified_info = (
             "crypto/evp/e_bf.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/e_camellia.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto",
                     "crypto/modes",
@@ -6979,81 +6656,68 @@ our %unified_info = (
             "crypto/evp/e_cast.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/e_chacha20_poly1305.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/e_des.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto",
                 ],
             "crypto/evp/e_des3.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto",
                 ],
             "crypto/evp/e_idea.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/e_null.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/e_old.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/e_rc2.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/e_rc4.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/e_rc4_hmac_md5.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/e_rc5.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/e_seed.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/e_sm4.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto",
                     "crypto/modes",
@@ -7061,328 +6725,267 @@ our %unified_info = (
             "crypto/evp/e_xcbc_d.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/encode.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/evp_cnf.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/evp_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/evp_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/evp_key.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/evp_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/evp_pbe.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/evp_pkey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/m_md2.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/m_md4.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/m_md5.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/m_md5_sha1.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/m_mdc2.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/m_null.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/m_ripemd.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/m_sha1.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/m_sha3.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto",
                 ],
             "crypto/evp/m_sigver.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/m_wp.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/names.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/p5_crpt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/p5_crpt2.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/p_dec.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/p_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/p_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/p_open.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/p_seal.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/p_sign.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/p_verify.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/pbe_scrypt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/pmeth_fn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/pmeth_gn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/pmeth_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ex_data.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/getenv.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/hmac/hm_ameth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/hmac/hm_pmeth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/hmac/hmac.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/idea/i_cbc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/idea/i_cfb64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/idea/i_ecb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/idea/i_ofb64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/idea/i_skey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
-            "crypto/include/internal/bn_conf.h" =>
-                [
-                    ".",
-                ],
-            "crypto/include/internal/dso_conf.h" =>
-                [
-                    ".",
-                ],
             "crypto/init.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/kdf/hkdf.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/kdf/kdf_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/kdf/scrypt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/kdf/tls1_prf.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/lhash/lh_stats.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/lhash/lhash.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/md4/md4_dgst.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/md4/md4_one.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/md5/md5-sparcv9.o" =>
@@ -7392,79 +6995,66 @@ our %unified_info = (
             "crypto/md5/md5_dgst.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/md5/md5_one.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/mdc2/mdc2_one.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/mdc2/mdc2dgst.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/mem.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/mem_dbg.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/mem_sec.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/modes/cbc128.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/modes/ccm128.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/modes/cfb128.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/modes/ctr128.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/modes/cts128.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/modes/gcm128.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto",
                 ],
@@ -7483,7 +7073,6 @@ our %unified_info = (
             "crypto/modes/ghashp8-ppc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/modes/ghashv8-armx.o" =>
@@ -7493,361 +7082,301 @@ our %unified_info = (
             "crypto/modes/ocb128.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/modes/ofb128.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/modes/wrap128.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/modes/xts128.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/o_dir.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/o_fips.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/o_fopen.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/o_init.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/o_str.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/o_time.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/objects/o_names.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/objects/obj_dat.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/objects/obj_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/objects/obj_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/objects/obj_xref.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ocsp/ocsp_asn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ocsp/ocsp_cl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ocsp/ocsp_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ocsp/ocsp_ext.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ocsp/ocsp_ht.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ocsp/ocsp_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ocsp/ocsp_prn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ocsp/ocsp_srv.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ocsp/ocsp_vfy.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ocsp/v3_ocsp.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pem/pem_all.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pem/pem_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pem/pem_info.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pem/pem_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pem/pem_oth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pem/pem_pk8.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pem/pem_pkey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pem/pem_sign.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pem/pem_x509.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pem/pem_xaux.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pem/pvkfmt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_add.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_asn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_attr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_crpt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_crt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_decr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_init.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_key.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_kiss.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_mutl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_npas.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_p8d.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_p8e.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_sbag.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_utl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/pk12err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs7/bio_pk7.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs7/pk7_asn1.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs7/pk7_attr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs7/pk7_doit.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs7/pk7_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs7/pk7_mime.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs7/pk7_smime.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs7/pkcs7err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/poly1305/poly1305-armv4.o" =>
@@ -7865,13 +7394,11 @@ our %unified_info = (
             "crypto/poly1305/poly1305-ppc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/poly1305/poly1305-ppcfp.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/poly1305/poly1305-sparcv9.o" =>
@@ -7881,271 +7408,226 @@ our %unified_info = (
             "crypto/poly1305/poly1305.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/poly1305/poly1305_ameth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/poly1305/poly1305_pmeth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ppccap.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ppccpuid.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rand/drbg_ctr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rand/drbg_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rand/rand_egd.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rand/rand_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rand/rand_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rand/rand_unix.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rand/rand_vms.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rand/rand_win.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rand/randfile.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rc2/rc2_cbc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rc2/rc2_ecb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rc2/rc2_skey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rc2/rc2cfb64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rc2/rc2ofb64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rc4/rc4_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rc4/rc4_skey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ripemd/rmd_dgst.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ripemd/rmd_one.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_ameth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_asn1.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_chk.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_crpt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_depr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_gen.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_meth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_mp.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_none.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_oaep.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_ossl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_pk1.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_pmeth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_prn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_pss.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_saos.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_sign.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_ssl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_x931.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_x931g.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/s390xcpuid.o" =>
@@ -8155,31 +7637,26 @@ our %unified_info = (
             "crypto/seed/seed.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/seed/seed_cbc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/seed/seed_cfb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/seed/seed_ecb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/seed/seed_ofb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sha/keccak1600-armv4.o" =>
@@ -8189,7 +7666,6 @@ our %unified_info = (
             "crypto/sha/keccak1600.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sha/sha1-armv4-large.o" =>
@@ -8207,7 +7683,6 @@ our %unified_info = (
             "crypto/sha/sha1-ppc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sha/sha1-s390x.o" =>
@@ -8221,13 +7696,11 @@ our %unified_info = (
             "crypto/sha/sha1_one.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sha/sha1dgst.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sha/sha256-armv4.o" =>
@@ -8245,7 +7718,6 @@ our %unified_info = (
             "crypto/sha/sha256-ppc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sha/sha256-s390x.o" =>
@@ -8259,13 +7731,11 @@ our %unified_info = (
             "crypto/sha/sha256.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sha/sha256p8-ppc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sha/sha512-armv4.o" =>
@@ -8283,7 +7753,6 @@ our %unified_info = (
             "crypto/sha/sha512-ppc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sha/sha512-s390x.o" =>
@@ -8297,715 +7766,596 @@ our %unified_info = (
             "crypto/sha/sha512.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sha/sha512p8-ppc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/siphash/siphash.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/siphash/siphash_ameth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/siphash/siphash_pmeth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sm2/sm2_crypt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sm2/sm2_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sm2/sm2_pmeth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sm2/sm2_sign.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sm3/m_sm3.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sm3/sm3.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sm4/sm4.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/srp/srp_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/srp/srp_vfy.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/stack/stack.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/store/loader_file.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/store/store_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/store/store_init.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/store/store_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/store/store_register.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/store/store_strings.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/threads_none.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/threads_pthread.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/threads_win.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ts/ts_asn1.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ts/ts_conf.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ts/ts_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ts/ts_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ts/ts_req_print.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ts/ts_req_utils.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ts/ts_rsp_print.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ts/ts_rsp_sign.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ts/ts_rsp_utils.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ts/ts_rsp_verify.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ts/ts_verify_ctx.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/txt_db/txt_db.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ui/ui_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ui/ui_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ui/ui_null.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ui/ui_openssl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ui/ui_util.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/uid.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/whrlpool/wp_block.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/whrlpool/wp_dgst.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/by_dir.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/by_file.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/t_crl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/t_req.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/t_x509.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_att.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_cmp.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_d2.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_def.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_ext.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_lu.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_meth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_obj.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_r2x.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_req.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_set.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_trs.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_txt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_v3.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_vfy.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_vpm.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509cset.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509name.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509rset.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509spki.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509type.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x_all.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x_attrib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x_crl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x_exten.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x_name.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x_pubkey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x_req.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x_x509.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x_x509a.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/pcy_cache.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/pcy_data.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/pcy_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/pcy_map.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/pcy_node.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/pcy_tree.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_addr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_admis.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_akey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_akeya.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_alt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_asid.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_bcons.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_bitst.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_conf.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_cpols.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_crld.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_enum.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_extku.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_genn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_ia5.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_info.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_int.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_ncons.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_pci.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_pcia.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_pcons.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_pku.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_pmaps.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_prn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_purp.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_skey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_sxnet.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_tlsf.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_utl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "engines/e_capi.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "engines/e_padlock.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "fuzz/asn1.o" =>
@@ -9056,6 +8406,14 @@ our %unified_info = (
                 [
                     "include",
                 ],
+            "include/crypto/bn_conf.h" =>
+                [
+                    ".",
+                ],
+            "include/crypto/dso_conf.h" =>
+                [
+                    ".",
+                ],
             "include/openssl/opensslconf.h" =>
                 [
                     ".",
@@ -9300,7 +8658,6 @@ our %unified_info = (
                 [
                     ".",
                     "include",
-                    "crypto/include",
                 ],
             "test/asn1_string_table_test.o" =>
                 [
@@ -9626,7 +8983,6 @@ our %unified_info = (
                 [
                     ".",
                     "include",
-                    "crypto/include",
                 ],
             "test/cipher_overhead_test.o" =>
                 [
@@ -9672,7 +9028,6 @@ our %unified_info = (
             "test/ctype_internal_test.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "test/curve448_internal_test.o" =>
@@ -9738,7 +9093,6 @@ our %unified_info = (
                 [
                     "include",
                     "crypto/ec",
-                    "crypto/include",
                 ],
             "test/ecdsatest.o" =>
                 [
@@ -9763,7 +9117,6 @@ our %unified_info = (
             "test/evp_extra_test.o" =>
                 [
                     "include",
-                    "crypto/include",
                 ],
             "test/evp_test.o" =>
                 [
@@ -9861,7 +9214,6 @@ our %unified_info = (
                 [
                     ".",
                     "include",
-                    "crypto/include",
                 ],
             "test/rc2test.o" =>
                 [
@@ -9911,18 +9263,15 @@ our %unified_info = (
                 [
                     ".",
                     "include",
-                    "crypto/include",
                 ],
             "test/sm2_internal_test.o" =>
                 [
                     "include",
-                    "crypto/include",
                 ],
             "test/sm4_internal_test.o" =>
                 [
                     ".",
                     "include",
-                    "crypto/include",
                 ],
             "test/srptest.o" =>
                 [
@@ -9933,6 +9282,10 @@ our %unified_info = (
                     ".",
                     "include",
                 ],
+            "test/ssl_ctx_test.o" =>
+                [
+                    "include",
+                ],
             "test/ssl_test.o" =>
                 [
                     "include",
@@ -9996,10 +9349,6 @@ our %unified_info = (
                 [
                     "include",
                 ],
-            "test/testutil/init.o" =>
-                [
-                    "include",
-                ],
             "test/testutil/main.o" =>
                 [
                     "include",
@@ -10028,6 +9377,10 @@ our %unified_info = (
                 [
                     "include",
                 ],
+            "test/testutil/testutil_init.o" =>
+                [
+                    "include",
+                ],
             "test/threadstest.o" =>
                 [
                     "include",
@@ -10292,6 +9645,7 @@ our %unified_info = (
             "test/sm4_internal_test",
             "test/srptest",
             "test/ssl_cert_table_internal_test",
+            "test/ssl_ctx_test",
             "test/ssl_test",
             "test/ssl_test_ctx_test",
             "test/sslapitest",
@@ -15247,7 +14601,6 @@ our %unified_info = (
                     "test/testutil/cb.o",
                     "test/testutil/driver.o",
                     "test/testutil/format_output.o",
-                    "test/testutil/init.o",
                     "test/testutil/main.o",
                     "test/testutil/output_helpers.o",
                     "test/testutil/random.o",
@@ -15255,6 +14608,7 @@ our %unified_info = (
                     "test/testutil/tap_bio.o",
                     "test/testutil/test_cleanup.o",
                     "test/testutil/tests.o",
+                    "test/testutil/testutil_init.o",
                 ],
             "test/md2test" =>
                 [
@@ -15482,6 +14836,14 @@ our %unified_info = (
                 [
                     "test/ssl_cert_table_internal_test.c",
                 ],
+            "test/ssl_ctx_test" =>
+                [
+                    "test/ssl_ctx_test.o",
+                ],
+            "test/ssl_ctx_test.o" =>
+                [
+                    "test/ssl_ctx_test.c",
+                ],
             "test/ssl_test" =>
                 [
                     "test/handshake_helper.o",
@@ -15584,10 +14946,6 @@ our %unified_info = (
                 [
                     "test/testutil/format_output.c",
                 ],
-            "test/testutil/init.o" =>
-                [
-                    "test/testutil/init.c",
-                ],
             "test/testutil/main.o" =>
                 [
                     "test/testutil/main.c",
@@ -15616,6 +14974,10 @@ our %unified_info = (
                 [
                     "test/testutil/tests.c",
                 ],
+            "test/testutil/testutil_init.o" =>
+                [
+                    "test/testutil/testutil_init.c",
+                ],
             "test/threadstest" =>
                 [
                     "test/threadstest.o",
diff --git a/deps/openssl/config/archs/aix-gcc/asm/crypto/bn/ppc64-mont.s b/deps/openssl/config/archs/aix-gcc/asm/crypto/bn/ppc64-mont.s
deleted file mode 100644
index 1506bcc03a..0000000000
--- a/deps/openssl/config/archs/aix-gcc/asm/crypto/bn/ppc64-mont.s
+++ /dev/null
@@ -1,968 +0,0 @@
-.machine	"any"
-.csect	.text[PR],7
-
-.globl	.bn_mul_mont_fpu64
-.align	5
-.bn_mul_mont_fpu64:
-	cmpwi	8,6
-	mr	9,3
-	li	3,0
-	bclr	14,0
-	andi.	0,8,3
-	bclr	6,2
-
-	slwi	8,8,2
-	li	12,-4096
-	slwi	10,8,2
-	add	10,10,8
-	addi	10,10,488
-	subf	10,10,1
-	and	10,10,12
-	subf	10,1,10
-	mr	12,1
-	stwux	1,1,10
-
-	stw	19,-148(12)
-	stw	20,-144(12)
-	stw	21,-140(12)
-	stw	22,-136(12)
-	stw	23,-132(12)
-	stw	24,-128(12)
-	stw	25,-124(12)
-	stw	26,-120(12)
-	stw	27,-116(12)
-	stw	28,-112(12)
-	stw	29,-108(12)
-	stw	30,-104(12)
-	stw	31,-100(12)
-	stfd	20,-96(12)
-	stfd	21,-88(12)
-	stfd	22,-80(12)
-	stfd	23,-72(12)
-	stfd	24,-64(12)
-	stfd	25,-56(12)
-	stfd	26,-48(12)
-	stfd	27,-40(12)
-	stfd	28,-32(12)
-	stfd	29,-24(12)
-	stfd	30,-16(12)
-	stfd	31,-8(12)
-
-	addi	10,1,264
-	li	12,-64
-	add	22,10,8
-	and	22,22,12
-
-	addi	22,22,-8
-	srwi	11,8,4
-	addi	11,11,-1
-	addi	10,1,184
-	li	0,0
-	mtctr	11
-	lwz	23,0(4)
-	mr	20,7
-	lwz	21,4(4)
-	li	19,0
-	lwz	25,0(5)
-	lwz	27,4(5)
-	lwz	7,0(20)
-	lwz	20,4(20)
-
-	mullw	28,23,25
-	mulhwu	29,23,25
-	mullw	30,21,25
-	mullw	31,23,27
-	add	29,29,30
-	add	29,29,31
-
-	extrwi	24,25,16,16
-	extrwi	25,25,16,0
-	extrwi	26,27,16,16
-	extrwi	27,27,16,0
-	std	24,64(1)
-	std	25,72(1)
-	std	26,80(1)
-	std	27,88(1)
-
-	mullw	24,28,7
-	mulhwu	25,28,7
-	mullw	26,29,7
-	mullw	27,28,20
-	add	25,25,26
-	add	25,25,27
-
-	extrwi	28,24,16,16
-	extrwi	29,24,16,0
-	extrwi	30,25,16,16
-	extrwi	31,25,16,0
-	std	28,96(1)
-	std	29,104(1)
-	std	30,112(1)
-	std	31,120(1)
-
-	mr	24,23
-	mr	25,21
-	lwz	26,8(4)
-	lwz	27,12(4)
-	lwz	28,0(6)
-	lwz	29,4(6)
-	lwz	30,8(6)
-	lwz	31,12(6)
-	lfd	0,64(1)
-	lfd	1,72(1)
-	lfd	2,80(1)
-	lfd	3,88(1)
-	lfd	4,96(1)
-	lfd	5,104(1)
-	lfd	6,112(1)
-	lfd	7,120(1)
-	std	24,128(1)
-	std	25,136(1)
-	std	26,144(1)
-	std	27,152(1)
-	std	28,160(1)
-	std	29,168(1)
-	std	30,176(1)
-	std	31,184(1)
-	fcfid	0,0
-	fcfid	1,1
-	fcfid	2,2
-	fcfid	3,3
-	fcfid	4,4
-	fcfid	5,5
-	fcfid	6,6
-	fcfid	7,7
-
-	lfd	10,128(1)
-	lfd	11,136(1)
-	lfd	12,144(1)
-	lfd	13,152(1)
-	lfd	20,160(1)
-	lfd	21,168(1)
-	lfd	22,176(1)
-	lfd	23,184(1)
-	fcfid	10,10
-	fcfid	11,11
-	fcfid	12,12
-	fcfid	13,13
-	fcfid	20,20
-	fcfid	21,21
-	fcfid	22,22
-	fcfid	23,23
-	addi	4,4,16
-	addi	6,6,16
-
-	fmul	26,11,0
-	fmul	27,11,1
-	stfd	10,8(22)
-	stfd	11,16(22)
-	fmul	28,12,0
-	fmul	29,12,1
-	stfd	12,24(22)
-	stfd	13,32(22)
-	fmul	30,13,0
-	fmul	31,13,1
-	stfd	20,40(22)
-	stfd	21,48(22)
-	fmul	24,10,0
-	fmul	25,10,1
-	stfd	22,56(22)
-	stfdu	23,64(22)
-
-	fmadd	26,10,2,26
-	fmadd	27,10,3,27
-	fmadd	28,11,2,28
-	fmadd	29,11,3,29
-	fmadd	30,12,2,30
-	fmadd	31,12,3,31
-	fmul	8,13,2
-	fmul	9,13,3
-
-	fmadd	26,21,4,26
-	fmadd	27,21,5,27
-	fmadd	28,22,4,28
-	fmadd	29,22,5,29
-	fmadd	30,23,4,30
-	fmadd	31,23,5,31
-	fmadd	24,20,4,24
-	fmadd	25,20,5,25
-
-	fmadd	26,20,6,26
-	fmadd	27,20,7,27
-	fmadd	28,21,6,28
-	fmadd	29,21,7,29
-	fmadd	30,22,6,30
-	fmadd	31,22,7,31
-	fmadd	8,23,6,8
-	fmadd	9,23,7,9
-
-	fctid	24,24
-	fctid	25,25
-	fctid	26,26
-	fctid	27,27
-	fctid	28,28
-	fctid	29,29
-	fctid	30,30
-	fctid	31,31
-
-	stfd	24,64(1)
-	stfd	25,72(1)
-	stfd	26,80(1)
-	stfd	27,88(1)
-	stfd	28,96(1)
-	stfd	29,104(1)
-	stfd	30,112(1)
-	stfd	31,120(1)
-
-.align	5
-L1st:
-	lwz	24,0(4)
-	lwz	25,4(4)
-	lwz	26,8(4)
-	lwz	27,12(4)
-	lwz	28,0(6)
-	lwz	29,4(6)
-	lwz	30,8(6)
-	lwz	31,12(6)
-	std	24,128(1)
-	std	25,136(1)
-	std	26,144(1)
-	std	27,152(1)
-	std	28,160(1)
-	std	29,168(1)
-	std	30,176(1)
-	std	31,184(1)
-	lwz	25,64(1)
-	lwz	24,68(1)
-	lwz	27,72(1)
-	lwz	26,76(1)
-	lwz	29,80(1)
-	lwz	28,84(1)
-	lwz	31,88(1)
-	lwz	30,92(1)
-	lfd	10,128(1)
-	lfd	11,136(1)
-	lfd	12,144(1)
-	lfd	13,152(1)
-	lfd	20,160(1)
-	lfd	21,168(1)
-	lfd	22,176(1)
-	lfd	23,184(1)
-	fcfid	10,10
-	fcfid	11,11
-	fcfid	12,12
-	fcfid	13,13
-	fcfid	20,20
-	fcfid	21,21
-	fcfid	22,22
-	fcfid	23,23
-	addi	4,4,16
-	addi	6,6,16
-
-	fmul	26,11,0
-	fmul	27,11,1
-	fmul	28,12,0
-	fmul	29,12,1
-	stfd	10,8(22)
-	stfd	11,16(22)
-	fmul	30,13,0
-	fmul	31,13,1
-	fmadd	24,10,0,8
-	fmadd	25,10,1,9
-	stfd	12,24(22)
-	stfd	13,32(22)
-	fmadd	26,10,2,26
-	fmadd	27,10,3,27
-	addc	24,24,0
-	adde	25,25,19
-	srwi	0,24,16
-	fmadd	28,11,2,28
-	fmadd	29,11,3,29
-	stfd	20,40(22)
-	stfd	21,48(22)
-	srwi	19,25,16
-	insrwi	0,25,16,0
-	fmadd	30,12,2,30
-	fmadd	31,12,3,31
-	addc	26,26,0
-	adde	27,27,19
-	srwi	0,26,16
-	fmul	8,13,2
-	fmul	9,13,3
-	stfd	22,56(22)
-	stfdu	23,64(22)
-	insrwi	24,26,16,0
-	srwi	19,27,16
-	insrwi	0,27,16,0
-
-	fmadd	26,21,4,26
-	fmadd	27,21,5,27
-	lwz	27,96(1)
-	lwz	26,100(1)
-	addc	28,28,0
-	adde	29,29,19
-	srwi	0,28,16
-	fmadd	28,22,4,28
-	fmadd	29,22,5,29
-	srwi	19,29,16
-	insrwi	0,29,16,0
-	fmadd	30,23,4,30
-	fmadd	31,23,5,31
-	addc	30,30,0
-	adde	31,31,19
-	srwi	0,30,16
-	fmadd	24,20,4,24
-	fmadd	25,20,5,25
-	insrwi	28,30,16,0
-	srwi	19,31,16
-	insrwi	0,31,16,0
-
-	fmadd	26,20,6,26
-	fmadd	27,20,7,27
-	lwz	31,104(1)
-	lwz	30,108(1)
-	addc	26,26,0
-	adde	27,27,19
-	srwi	0,26,16
-	fmadd	28,21,6,28
-	fmadd	29,21,7,29
-	stw	24,12(10)
-	stw	28,8(10)
-	srwi	19,27,16
-	insrwi	0,27,16,0
-	fmadd	30,22,6,30
-	fmadd	31,22,7,31
-	lwz	25,112(1)
-	lwz	24,116(1)
-	addc	30,30,0
-	adde	31,31,19
-	srwi	0,30,16
-	fmadd	8,23,6,8
-	fmadd	9,23,7,9
-	insrwi	26,30,16,0
-	srwi	19,31,16
-	insrwi	0,31,16,0
-
-	fctid	24,24
-	fctid	25,25
-	lwz	29,120(1)
-	lwz	28,124(1)
-	addc	24,24,0
-	adde	25,25,19
-	srwi	0,24,16
-	fctid	26,26
-	fctid	27,27
-	srwi	19,25,16
-	insrwi	0,25,16,0
-	fctid	28,28
-	fctid	29,29
-	addc	28,28,0
-	adde	29,29,19
-	srwi	0,28,16
-	fctid	30,30
-	fctid	31,31
-	insrwi	24,28,16,0
-	srwi	19,29,16
-	insrwi	0,29,16,0
-
-	stfd	24,64(1)
-	stfd	25,72(1)
-	stfd	26,80(1)
-	stfd	27,88(1)
-	stfd	28,96(1)
-	stfd	29,104(1)
-	stfd	30,112(1)
-	stfd	31,120(1)
-	stw	26,20(10)
-	stwu	24,16(10)
-	bc	16,0,L1st
-
-	fctid	8,8
-	fctid	9,9
-	lwz	25,64(1)
-	lwz	24,68(1)
-	lwz	27,72(1)
-	lwz	26,76(1)
-	lwz	29,80(1)
-	lwz	28,84(1)
-	lwz	31,88(1)
-	lwz	30,92(1)
-	stfd	8,128(1)
-	stfd	9,136(1)
-
-	addc	24,24,0
-	adde	25,25,19
-	srwi	0,24,16
-	insrwi	0,25,16,0
-	srwi	19,25,16
-	addc	26,26,0
-	adde	27,27,19
-	srwi	0,26,16
-	insrwi	24,26,16,0
-	insrwi	0,27,16,0
-	srwi	19,27,16
-	addc	28,28,0
-	adde	29,29,19
-	srwi	0,28,16
-	insrwi	0,29,16,0
-	srwi	19,29,16
-	addc	30,30,0
-	adde	31,31,19
-	srwi	0,30,16
-	insrwi	28,30,16,0
-	insrwi	0,31,16,0
-	srwi	19,31,16
-	stw	24,12(10)
-	stw	28,8(10)
-
-	lwz	27,96(1)
-	lwz	26,100(1)
-	lwz	31,104(1)
-	lwz	30,108(1)
-	lwz	25,112(1)
-	lwz	24,116(1)
-	lwz	29,120(1)
-	lwz	28,124(1)
-
-	addc	26,26,0
-	adde	27,27,19
-	srwi	0,26,16
-	insrwi	0,27,16,0
-	srwi	19,27,16
-	addc	30,30,0
-	adde	31,31,19
-	srwi	0,30,16
-	insrwi	26,30,16,0
-	insrwi	0,31,16,0
-	srwi	19,31,16
-	addc	24,24,0
-	adde	25,25,19
-	srwi	0,24,16
-	insrwi	0,25,16,0
-	srwi	19,25,16
-	addc	28,28,0
-	adde	29,29,19
-	srwi	0,28,16
-	insrwi	24,28,16,0
-	insrwi	0,29,16,0
-	srwi	19,29,16
-	stw	26,20(10)
-	stwu	24,16(10)
-
-	lwz	31,128(1)
-	lwz	30,132(1)
-	lwz	29,136(1)
-	lwz	28,140(1)
-
-	addc	30,30,0
-	adde	31,31,19
-	srwi	0,30,16
-	insrwi	0,31,16,0
-	srwi	19,31,16
-	addc	28,28,0
-	adde	29,29,19
-
-	insrwi	30,28,16,0
-	srwi	28,28,16
-	insrwi	28,29,16,0
-	srwi	3,29,16
-	stw	30,12(10)
-	stw	28,8(10)
-	slwi	31,8,2
-	subf	22,31,22
-
-	li	12,8
-.align	5
-Louter:
-	addi	10,1,192
-	li	0,0
-	mtctr	11
-	add	24,5,12
-	li	19,0
-	lwz	25,0(24)
-	lwz	27,4(24)
-
-	mullw	28,23,25
-	lwz	24,204(1)
-	mulhwu	29,23,25
-	lwz	26,200(1)
-	mullw	30,21,25
-	mullw	31,23,27
-	add	29,29,30
-	add	29,29,31
-	addc	28,28,24
-	adde	29,29,26
-
-	extrwi	24,25,16,16
-	extrwi	25,25,16,0
-	extrwi	26,27,16,16
-	extrwi	27,27,16,0
-	std	24,64(1)
-	std	25,72(1)
-	std	26,80(1)
-	std	27,88(1)
-
-	mullw	24,28,7
-	mulhwu	25,28,7
-	mullw	26,29,7
-	mullw	27,28,20
-	add	25,25,26
-	add	25,25,27
-
-	extrwi	28,24,16,16
-	extrwi	29,24,16,0
-	extrwi	30,25,16,16
-	extrwi	31,25,16,0
-	std	28,96(1)
-	std	29,104(1)
-	std	30,112(1)
-	std	31,120(1)
-	lfd	10,8(22)
-	lfd	11,16(22)
-	lfd	12,24(22)
-	lfd	13,32(22)
-	lfd	20,40(22)
-	lfd	21,48(22)
-	lfd	22,56(22)
-	lfdu	23,64(22)
-
-	lfd	0,64(1)
-	lfd	1,72(1)
-	lfd	2,80(1)
-	lfd	3,88(1)
-	lfd	4,96(1)
-	lfd	5,104(1)
-	lfd	6,112(1)
-	lfd	7,120(1)
-
-	fcfid	0,0
-	fcfid	1,1
-	fcfid	2,2
-	fcfid	3,3
-	fcfid	4,4
-	fcfid	5,5
-	fcfid	6,6
-	fcfid	7,7
-
-	fmul	26,11,0
-	fmul	27,11,1
-	fmul	28,12,0
-	fmul	29,12,1
-	fmul	30,13,0
-	fmul	31,13,1
-	fmul	24,10,0
-	fmul	25,10,1
-
-	fmadd	26,10,2,26
-	fmadd	27,10,3,27
-	fmadd	28,11,2,28
-	fmadd	29,11,3,29
-	fmadd	30,12,2,30
-	fmadd	31,12,3,31
-	fmul	8,13,2
-	fmul	9,13,3
-
-	fmadd	26,21,4,26
-	fmadd	27,21,5,27
-	lfd	10,8(22)
-	lfd	11,16(22)
-	fmadd	28,22,4,28
-	fmadd	29,22,5,29
-	lfd	12,24(22)
-	lfd	13,32(22)
-	fmadd	30,23,4,30
-	fmadd	31,23,5,31
-	fmadd	24,20,4,24
-	fmadd	25,20,5,25
-
-	fmadd	26,20,6,26
-	fmadd	27,20,7,27
-	fmadd	28,21,6,28
-	fmadd	29,21,7,29
-	fmadd	30,22,6,30
-	fmadd	31,22,7,31
-	fmadd	8,23,6,8
-	fmadd	9,23,7,9
-
-	fctid	24,24
-	fctid	25,25
-	fctid	26,26
-	fctid	27,27
-	fctid	28,28
-	fctid	29,29
-	fctid	30,30
-	fctid	31,31
-
-	stfd	24,64(1)
-	stfd	25,72(1)
-	stfd	26,80(1)
-	stfd	27,88(1)
-	stfd	28,96(1)
-	stfd	29,104(1)
-	stfd	30,112(1)
-	stfd	31,120(1)
-
-.align	5
-Linner:
-	fmul	26,11,0
-	fmul	27,11,1
-	fmul	28,12,0
-	fmul	29,12,1
-	lfd	20,40(22)
-	lfd	21,48(22)
-	fmul	30,13,0
-	fmul	31,13,1
-	fmadd	24,10,0,8
-	fmadd	25,10,1,9
-	lfd	22,56(22)
-	lfdu	23,64(22)
-
-	fmadd	26,10,2,26
-	fmadd	27,10,3,27
-	fmadd	28,11,2,28
-	fmadd	29,11,3,29
-	lfd	10,8(22)
-	lfd	11,16(22)
-	fmadd	30,12,2,30
-	fmadd	31,12,3,31
-	fmul	8,13,2
-	fmul	9,13,3
-	lfd	12,24(22)
-	lfd	13,32(22)
-	fmadd	26,21,4,26
-	fmadd	27,21,5,27
-	lwz	25,64(1)
-	lwz	24,68(1)
-	fmadd	28,22,4,28
-	fmadd	29,22,5,29
-	lwz	27,72(1)
-	lwz	26,76(1)
-	fmadd	30,23,4,30
-	fmadd	31,23,5,31
-	lwz	29,80(1)
-	lwz	28,84(1)
-	addc	24,24,0
-	adde	25,25,19
-	srwi	0,24,16
-	fmadd	24,20,4,24
-	fmadd	25,20,5,25
-	lwz	31,88(1)
-	lwz	30,92(1)
-	srwi	19,25,16
-	insrwi	0,25,16,0
-
-	fmadd	26,20,6,26
-	fmadd	27,20,7,27
-	addc	26,26,0
-	adde	27,27,19
-	srwi	0,26,16
-	fmadd	28,21,6,28
-	fmadd	29,21,7,29
-	insrwi	24,26,16,0
-	srwi	19,27,16
-	insrwi	0,27,16,0
-	fmadd	30,22,6,30
-	fmadd	31,22,7,31
-	lwz	26,12(10)
-	lwz	27,8(10)
-	addc	28,28,0
-	adde	29,29,19
-	srwi	0,28,16
-	fmadd	8,23,6,8
-	fmadd	9,23,7,9
-	srwi	19,29,16
-	insrwi	0,29,16,0
-
-	fctid	24,24
-	addc	30,30,0
-	adde	31,31,19
-	srwi	0,30,16
-	fctid	25,25
-	insrwi	28,30,16,0
-	srwi	19,31,16
-	insrwi	0,31,16,0
-	fctid	26,26
-	addc	24,24,26
-	adde	28,28,27
-	lwz	27,96(1)
-	lwz	26,100(1)
-	fctid	27,27
-	addze	0,0
-	addze	19,19
-	stw	24,4(10)
-	stw	28,0(10)
-	fctid	28,28
-	addc	26,26,0
-	adde	27,27,19
-	srwi	0,26,16
-	lwz	31,104(1)
-	lwz	30,108(1)
-	fctid	29,29
-	srwi	19,27,16
-	insrwi	0,27,16,0
-	lwz	25,112(1)
-	lwz	24,116(1)
-	fctid	30,30
-	addc	30,30,0
-	adde	31,31,19
-	srwi	0,30,16
-	lwz	29,120(1)
-	lwz	28,124(1)
-	fctid	31,31
-
-	insrwi	26,30,16,0
-	insrwi	0,31,16,0
-	srwi	19,31,16
-	lwz	30,20(10)
-	lwzu	31,16(10)
-	addc	24,24,0
-	stfd	24,64(1)
-	adde	25,25,19
-	srwi	0,24,16
-	stfd	25,72(1)
-	insrwi	0,25,16,0
-	srwi	19,25,16
-	addc	28,28,0
-	stfd	26,80(1)
-	adde	29,29,19
-	srwi	0,28,16
-	insrwi	24,28,16,0
-	stfd	27,88(1)
-	insrwi	0,29,16,0
-	srwi	19,29,16
-
-	addc	26,26,30
-	stfd	28,96(1)
-	adde	24,24,31
-	stfd	29,104(1)
-	addze	0,0
-	stfd	30,112(1)
-	addze	19,19
-	stfd	31,120(1)
-	stw	26,-4(10)
-	stw	24,-8(10)
-	bc	16,0,Linner
-
-	fctid	8,8
-	fctid	9,9
-	lwz	25,64(1)
-	lwz	24,68(1)
-	lwz	27,72(1)
-	lwz	26,76(1)
-	lwz	29,80(1)
-	lwz	28,84(1)
-	lwz	31,88(1)
-	lwz	30,92(1)
-	stfd	8,128(1)
-	stfd	9,136(1)
-
-	addc	24,24,0
-	adde	25,25,19
-	srwi	0,24,16
-	insrwi	0,25,16,0
-	srwi	19,25,16
-	addc	26,26,0
-	adde	27,27,19
-	srwi	0,26,16
-	insrwi	24,26,16,0
-	lwz	26,12(10)
-	insrwi	0,27,16,0
-	srwi	19,27,16
-	lwz	27,8(10)
-	addc	28,28,0
-	adde	29,29,19
-	srwi	0,28,16
-	insrwi	0,29,16,0
-	srwi	19,29,16
-	addc	30,30,0
-	adde	31,31,19
-	srwi	0,30,16
-	insrwi	28,30,16,0
-	insrwi	0,31,16,0
-	srwi	19,31,16
-
-	addc	24,24,26
-	adde	28,28,27
-	addze	0,0
-	addze	19,19
-	stw	24,4(10)
-	stw	28,0(10)
-
-	lwz	27,96(1)
-	lwz	26,100(1)
-	lwz	31,104(1)
-	lwz	30,108(1)
-	lwz	25,112(1)
-	lwz	24,116(1)
-	lwz	29,120(1)
-	lwz	28,124(1)
-
-	addc	26,26,0
-	adde	27,27,19
-	srwi	0,26,16
-	insrwi	0,27,16,0
-	srwi	19,27,16
-	addc	30,30,0
-	adde	31,31,19
-	srwi	0,30,16
-	insrwi	26,30,16,0
-	lwz	30,20(10)
-	insrwi	0,31,16,0
-	srwi	19,31,16
-	lwzu	31,16(10)
-	addc	24,24,0
-	adde	25,25,19
-	srwi	0,24,16
-	insrwi	0,25,16,0
-	srwi	19,25,16
-	addc	28,28,0
-	adde	29,29,19
-	srwi	0,28,16
-	insrwi	24,28,16,0
-	insrwi	0,29,16,0
-	srwi	19,29,16
-
-	addc	26,26,30
-	adde	24,24,31
-	lwz	31,128(1)
-	lwz	30,132(1)
-	addze	0,0
-	addze	19,19
-	lwz	29,136(1)
-	lwz	28,140(1)
-
-	addc	30,30,0
-	adde	31,31,19
-	stw	26,-4(10)
-	stw	24,-8(10)
-	addc	30,30,3
-	addze	31,31
-	srwi	0,30,16
-	insrwi	0,31,16,0
-	srwi	19,31,16
-	addc	28,28,0
-	adde	29,29,19
-
-	insrwi	30,28,16,0
-	srwi	28,28,16
-	insrwi	28,29,16,0
-	srwi	3,29,16
-	stw	30,4(10)
-	stw	28,0(10)
-	slwi	31,8,2
-	addi	12,12,8
-	subf	22,31,22
-	cmpw	12,8
-	blt-	Louter
-	subf	6,8,6
-	addi	11,11,1
-	subfc	12,12,12
-	addi	10,1,192
-	addi	6,6,-4
-	addi	9,9,-4
-	addi	4,1,196
-	mtctr	11
-
-.align	4
-Lsub:	lwz	24,12(10)
-	lwz	25,8(10)
-	lwz	26,20(10)
-	lwzu	27,16(10)
-	lwz	28,4(6)
-	lwz	29,8(6)
-	lwz	30,12(6)
-	lwzu	31,16(6)
-	subfe	28,28,24
-	stw	24,4(4)
-	subfe	29,29,25
-	stw	25,8(4)
-	subfe	30,30,26
-	stw	26,12(4)
-	subfe	31,31,27
-	stwu	27,16(4)
-	stw	28,4(9)
-	stw	29,8(9)
-	stw	30,12(9)
-	stwu	31,16(9)
-	bc	16,0,Lsub
-
-	li	12,0
-	subfe	3,12,3
-	addi	4,1,196
-	subf	9,8,9
-	addi	10,1,192
-	mtctr	11
-
-.align	4
-Lcopy:
-	lwz	24,4(4)
-	lwz	25,8(4)
-	lwz	26,12(4)
-	lwzu	27,16(4)
-	lwz	28,4(9)
-	lwz	29,8(9)
-	lwz	30,12(9)
-	lwz	31,16(9)
-	std	12,8(22)
-	std	12,16(22)
-	std	12,24(22)
-	std	12,32(22)
-	std	12,40(22)
-	std	12,48(22)
-	std	12,56(22)
-	stdu	12,64(22)
-	and	24,24,3
-	and	25,25,3
-	and	26,26,3
-	and	27,27,3
-	andc	28,28,3
-	andc	29,29,3
-	andc	30,30,3
-	andc	31,31,3
-	or	24,24,28
-	or	25,25,29
-	or	26,26,30
-	or	27,27,31
-	stw	24,4(9)
-	stw	25,8(9)
-	stw	26,12(9)
-	stwu	27,16(9)
-	std	12,8(10)
-	stdu	12,16(10)
-	bc	16,0,Lcopy
-	lwz	12,0(1)
-	li	3,1
-	lwz	19,-148(12)
-	lwz	20,-144(12)
-	lwz	21,-140(12)
-	lwz	22,-136(12)
-	lwz	23,-132(12)
-	lwz	24,-128(12)
-	lwz	25,-124(12)
-	lwz	26,-120(12)
-	lwz	27,-116(12)
-	lwz	28,-112(12)
-	lwz	29,-108(12)
-	lwz	30,-104(12)
-	lwz	31,-100(12)
-	lfd	20,-96(12)
-	lfd	21,-88(12)
-	lfd	22,-80(12)
-	lfd	23,-72(12)
-	lfd	24,-64(12)
-	lfd	25,-56(12)
-	lfd	26,-48(12)
-	lfd	27,-40(12)
-	lfd	28,-32(12)
-	lfd	29,-24(12)
-	lfd	30,-16(12)
-	lfd	31,-8(12)
-	mr	1,12
-	blr	
-.long	0
-.byte	0,12,4,0,0x8c,13,6,0
-.long	0
-
-
-.byte	77,111,110,116,103,111,109,101,114,121,32,77,117,108,116,105,112,108,105,99,97,116,105,111,110,32,102,111,114,32,80,80,67,54,52,44,32,67,82,89,80,84,79,71,65,77,83,32,98,121,32,60,97,112,112,114,111,64,111,112,101,110,115,115,108,46,111,114,103,62,0
-.align	2
diff --git a/deps/openssl/config/archs/aix-gcc/asm/crypto/buildinf.h b/deps/openssl/config/archs/aix-gcc/asm/crypto/buildinf.h
index 23bf3c3860..39bc5ba3c4 100644
--- a/deps/openssl/config/archs/aix-gcc/asm/crypto/buildinf.h
+++ b/deps/openssl/config/archs/aix-gcc/asm/crypto/buildinf.h
@@ -11,7 +11,7 @@
  */
 
 #define PLATFORM "platform: aix-gcc"
-#define DATE "built on: Fri Sep 13 15:56:47 2019 UTC"
+#define DATE "built on: Wed Mar 18 21:04:29 2020 UTC"
 
 /*
  * Generate compiler_flags as an array of individual characters. This is a
diff --git a/deps/openssl/config/archs/aix-gcc/asm/crypto/include/internal/bn_conf.h b/deps/openssl/config/archs/aix-gcc/asm/crypto/include/internal/bn_conf.h
index fb52156bd0..459055c96f 100644
--- a/deps/openssl/config/archs/aix-gcc/asm/crypto/include/internal/bn_conf.h
+++ b/deps/openssl/config/archs/aix-gcc/asm/crypto/include/internal/bn_conf.h
@@ -1,5 +1,5 @@
 /* WARNING: do not edit! */
-/* Generated by Makefile from crypto/include/internal/bn_conf.h.in */
+/* Generated by Makefile from include/crypto/bn_conf.h.in */
 /*
  * Copyright 2016 The OpenSSL Project Authors. All Rights Reserved.
  *
@@ -9,8 +9,8 @@
  * https://www.openssl.org/source/license.html
  */
 
-#ifndef HEADER_BN_CONF_H
-# define HEADER_BN_CONF_H
+#ifndef OSSL_CRYPTO_BN_CONF_H
+# define OSSL_CRYPTO_BN_CONF_H
 
 /*
  * The contents of this file are not used in the UEFI build, as
diff --git a/deps/openssl/config/archs/aix-gcc/asm/crypto/include/internal/dso_conf.h b/deps/openssl/config/archs/aix-gcc/asm/crypto/include/internal/dso_conf.h
index 252266ec2a..4b1167c3d8 100644
--- a/deps/openssl/config/archs/aix-gcc/asm/crypto/include/internal/dso_conf.h
+++ b/deps/openssl/config/archs/aix-gcc/asm/crypto/include/internal/dso_conf.h
@@ -1,5 +1,5 @@
 /* WARNING: do not edit! */
-/* Generated by Makefile from crypto/include/internal/dso_conf.h.in */
+/* Generated by Makefile from include/crypto/dso_conf.h.in */
 /*
  * Copyright 2016-2019 The OpenSSL Project Authors. All Rights Reserved.
  *
@@ -9,8 +9,8 @@
  * https://www.openssl.org/source/license.html
  */
 
-#ifndef HEADER_DSO_CONF_H
-# define HEADER_DSO_CONF_H
+#ifndef OSSL_CRYPTO_DSO_CONF_H
+# define OSSL_CRYPTO_DSO_CONF_H
 # define DSO_DLFCN
 # define HAVE_DLFCN_H
 # define DSO_EXTENSION ".so"
diff --git a/deps/openssl/config/archs/aix-gcc/asm/include/openssl/opensslconf.h b/deps/openssl/config/archs/aix-gcc/asm/include/openssl/opensslconf.h
index 683c468946..9028305bd2 100644
--- a/deps/openssl/config/archs/aix-gcc/asm/include/openssl/opensslconf.h
+++ b/deps/openssl/config/archs/aix-gcc/asm/include/openssl/opensslconf.h
@@ -99,9 +99,6 @@ extern "C" {
 #ifndef OPENSSL_NO_DYNAMIC_ENGINE
 # define OPENSSL_NO_DYNAMIC_ENGINE
 #endif
-#ifndef OPENSSL_NO_AFALGENG
-# define OPENSSL_NO_AFALGENG
-#endif
 
 
 /*
diff --git a/deps/openssl/config/archs/aix-gcc/asm/include/progs.h b/deps/openssl/config/archs/aix-gcc/asm/include/progs.h
index 9b3d270e20..308c65601b 100644
--- a/deps/openssl/config/archs/aix-gcc/asm/include/progs.h
+++ b/deps/openssl/config/archs/aix-gcc/asm/include/progs.h
@@ -2,7 +2,7 @@
  * WARNING: do not edit!
  * Generated by apps/progs.pl
  *
- * Copyright 1995-2019 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 1995-2020 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
diff --git a/deps/openssl/config/archs/aix-gcc/asm_avx2/configdata.pm b/deps/openssl/config/archs/aix-gcc/asm_avx2/configdata.pm
index 52c1848ab0..2308e3e39b 100644
--- a/deps/openssl/config/archs/aix-gcc/asm_avx2/configdata.pm
+++ b/deps/openssl/config/archs/aix-gcc/asm_avx2/configdata.pm
@@ -54,7 +54,7 @@ our %config = (
   minor => "1.1",
   openssl_algorithm_defines => [ "OPENSSL_NO_COMP", "OPENSSL_NO_MD2", "OPENSSL_NO_RC5" ],
   openssl_api_defines => [  ],
-  openssl_other_defines => [ "OPENSSL_RAND_SEED_OS", "OPENSSL_NO_AFALGENG", "OPENSSL_NO_ASAN", "OPENSSL_NO_CRYPTO_MDEBUG", "OPENSSL_NO_CRYPTO_MDEBUG_BACKTRACE", "OPENSSL_NO_DEVCRYPTOENG", "OPENSSL_NO_EC_NISTP_64_GCC_128", "OPENSSL_NO_EGD", "OPENSSL_NO_EXTERNAL_TESTS", "OPENSSL_NO_FUZZ_AFL", "OPENSSL_NO_FUZZ_LIBFUZZER", "OPENSSL_NO_HEARTBEATS", "OPENSSL_NO_MSAN", "OPENSSL_NO_SCTP", "OPENSSL_NO_SSL3", "OPENSSL_NO_SSL3_METHOD", "OPENSSL_NO_UBSAN", "OPENSSL_NO_UNIT_TEST", "OPENSSL_NO_WEAK_SSL_CIPHERS", "OPENSSL_NO_DYNAMIC_ENGINE", "OPENSSL_NO_AFALGENG" ],
+  openssl_other_defines => [ "OPENSSL_RAND_SEED_OS", "OPENSSL_NO_AFALGENG", "OPENSSL_NO_ASAN", "OPENSSL_NO_CRYPTO_MDEBUG", "OPENSSL_NO_CRYPTO_MDEBUG_BACKTRACE", "OPENSSL_NO_DEVCRYPTOENG", "OPENSSL_NO_EC_NISTP_64_GCC_128", "OPENSSL_NO_EGD", "OPENSSL_NO_EXTERNAL_TESTS", "OPENSSL_NO_FUZZ_AFL", "OPENSSL_NO_FUZZ_LIBFUZZER", "OPENSSL_NO_HEARTBEATS", "OPENSSL_NO_MSAN", "OPENSSL_NO_SCTP", "OPENSSL_NO_SSL3", "OPENSSL_NO_SSL3_METHOD", "OPENSSL_NO_UBSAN", "OPENSSL_NO_UNIT_TEST", "OPENSSL_NO_WEAK_SSL_CIPHERS", "OPENSSL_NO_DYNAMIC_ENGINE" ],
   openssl_sys_defines => [ "OPENSSL_SYS_AIX" ],
   openssl_thread_defines => [ "OPENSSL_THREADS" ],
   openssldir => "",
@@ -110,8 +110,8 @@ our %config = (
   sourcedir => ".",
   target => "aix-gcc",
   tdirs => [ "ossl_shim" ],
-  version => "1.1.1d",
-  version_num => "0x1010104fL",
+  version => "1.1.1e",
+  version_num => "0x1010105fL",
 );
 
 our %target = (
@@ -236,6 +236,7 @@ our @disablables = (
   "dgram",
   "dh",
   "dsa",
+  "dso",
   "dtls",
   "dynamic-engine",
   "ec",
@@ -353,8 +354,8 @@ our %unified_info = (
         {
             "" =>
                 [
-                    "crypto/include/internal/bn_conf.h",
-                    "crypto/include/internal/dso_conf.h",
+                    "include/crypto/bn_conf.h",
+                    "include/crypto/dso_conf.h",
                     "include/openssl/opensslconf.h",
                 ],
             "apps/asn1pars.o" =>
@@ -622,14 +623,6 @@ our %unified_info = (
                     "crypto/perlasm/cbc.pl",
                     "crypto/perlasm/x86asm.pl",
                 ],
-            "crypto/include/internal/bn_conf.h" =>
-                [
-                    "configdata.pm",
-                ],
-            "crypto/include/internal/dso_conf.h" =>
-                [
-                    "configdata.pm",
-                ],
             "crypto/rc4/rc4-586.s" =>
                 [
                     "crypto/perlasm/x86asm.pl",
@@ -705,6 +698,14 @@ our %unified_info = (
                 [
                     "libcrypto",
                 ],
+            "include/crypto/bn_conf.h" =>
+                [
+                    "configdata.pm",
+                ],
+            "include/crypto/dso_conf.h" =>
+                [
+                    "configdata.pm",
+                ],
             "include/openssl/opensslconf.h" =>
                 [
                     "configdata.pm",
@@ -1502,6 +1503,12 @@ our %unified_info = (
                     "libcrypto",
                     "test/libtestutil.a",
                 ],
+            "test/ssl_ctx_test" =>
+                [
+                    "libcrypto",
+                    "libssl",
+                    "test/libtestutil.a",
+                ],
             "test/ssl_test" =>
                 [
                     "libcrypto",
@@ -3233,7 +3240,6 @@ our %unified_info = (
                             "test/testutil/cb.o",
                             "test/testutil/driver.o",
                             "test/testutil/format_output.o",
-                            "test/testutil/init.o",
                             "test/testutil/main.o",
                             "test/testutil/output_helpers.o",
                             "test/testutil/random.o",
@@ -3241,6 +3247,7 @@ our %unified_info = (
                             "test/testutil/tap_bio.o",
                             "test/testutil/test_cleanup.o",
                             "test/testutil/tests.o",
+                            "test/testutil/testutil_init.o",
                         ],
                     "products" =>
                         {
@@ -3739,14 +3746,6 @@ our %unified_info = (
                 [
                     "crypto/ia64cpuid.S",
                 ],
-            "crypto/include/internal/bn_conf.h" =>
-                [
-                    "crypto/include/internal/bn_conf.h.in",
-                ],
-            "crypto/include/internal/dso_conf.h" =>
-                [
-                    "crypto/include/internal/dso_conf.h.in",
-                ],
             "crypto/md5/md5-586.s" =>
                 [
                     "crypto/md5/asm/md5-586.pl",
@@ -4187,6 +4186,14 @@ our %unified_info = (
                     "engines/asm/e_padlock-x86_64.pl",
                     "\$(PERLASM_SCHEME)",
                 ],
+            "include/crypto/bn_conf.h" =>
+                [
+                    "include/crypto/bn_conf.h.in",
+                ],
+            "include/crypto/dso_conf.h" =>
+                [
+                    "include/crypto/dso_conf.h.in",
+                ],
             "include/openssl/opensslconf.h" =>
                 [
                     "include/openssl/opensslconf.h.in",
@@ -4873,7 +4880,6 @@ our %unified_info = (
             "crypto/aes/aes-ppc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/aes/aes-s390x.o" =>
@@ -4887,49 +4893,41 @@ our %unified_info = (
             "crypto/aes/aes_cbc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/aes/aes_cfb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/aes/aes_core.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/aes/aes_ecb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/aes/aes_ige.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/aes/aes_misc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/aes/aes_ofb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/aes/aes_wrap.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/aes/aesfx-sparcv9.o" =>
@@ -4939,7 +4937,6 @@ our %unified_info = (
             "crypto/aes/aesp8-ppc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/aes/aest4-sparcv9.o" =>
@@ -4957,13 +4954,11 @@ our %unified_info = (
             "crypto/aes/vpaes-ppc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/aria/aria.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/arm64cpuid.o" =>
@@ -4977,613 +4972,511 @@ our %unified_info = (
             "crypto/asn1/a_bitstr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_d2i_fp.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_digest.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_dup.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_gentm.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_i2d_fp.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_int.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_mbstr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_object.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_octet.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_print.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_sign.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_strex.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_strnid.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_time.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_type.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_utctm.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_utf8.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_verify.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/ameth_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/asn1_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/asn1_gen.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/asn1_item_list.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/asn1_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/asn1_par.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/asn_mime.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/asn_moid.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/asn_mstbl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/asn_pack.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/bio_asn1.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/bio_ndef.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/d2i_pr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/d2i_pu.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/evp_asn1.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/f_int.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/f_string.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/i2d_pr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/i2d_pu.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/n_pkey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/nsseq.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/p5_pbe.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/p5_pbev2.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/p5_scrypt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/p8_pkey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/t_bitst.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/t_pkey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/t_spki.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/tasn_dec.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/tasn_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/tasn_fre.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/tasn_new.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/tasn_prn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/tasn_scn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/tasn_typ.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/tasn_utl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/x_algor.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/x_bignum.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/x_info.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/x_int64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/x_long.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/x_pkey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/x_sig.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/x_spki.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/x_val.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/async/arch/async_null.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/async/arch/async_posix.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/async/arch/async_win.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/async/async.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/async/async_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/async/async_wait.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bf/bf_cfb64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bf/bf_ecb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bf/bf_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bf/bf_ofb64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bf/bf_skey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/b_addr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/b_dump.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/b_print.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/b_sock.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/b_sock2.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bf_buff.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bf_lbuf.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bf_nbio.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bf_null.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bio_cb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bio_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bio_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bio_meth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bss_acpt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bss_bio.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bss_conn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bss_dgram.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bss_fd.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bss_file.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bss_log.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bss_mem.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bss_null.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bss_sock.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/blake2/blake2b.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/blake2/blake2s.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/blake2/m_blake2b.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/blake2/m_blake2s.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/armv4-gf2m.o" =>
@@ -5601,188 +5494,157 @@ our %unified_info = (
             "crypto/bn/bn-ppc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_add.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_blind.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_const.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_ctx.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_depr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_dh.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_div.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_exp.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto",
                 ],
             "crypto/bn/bn_exp2.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_gcd.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_gf2m.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_intern.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_kron.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_mod.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_mont.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_mpi.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_mul.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_nist.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_prime.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_print.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_rand.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_recp.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_shift.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_sqr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_sqrt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_srp.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_word.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_x931p.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/mips-mont.o" =>
@@ -5792,7 +5654,6 @@ our %unified_info = (
             "crypto/bn/ppc-mont.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/sparct4-mont.o" =>
@@ -5818,13 +5679,11 @@ our %unified_info = (
             "crypto/buffer/buf_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/buffer/buffer.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/buildinf.h" =>
@@ -5834,43 +5693,36 @@ our %unified_info = (
             "crypto/camellia/camellia.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/camellia/cmll_cbc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/camellia/cmll_cfb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/camellia/cmll_ctr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/camellia/cmll_ecb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/camellia/cmll_misc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/camellia/cmll_ofb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/camellia/cmllt4-sparcv9.o" =>
@@ -5880,31 +5732,26 @@ our %unified_info = (
             "crypto/cast/c_cfb64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cast/c_ecb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cast/c_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cast/c_ofb64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cast/c_skey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/chacha/chacha-armv4.o" =>
@@ -5918,7 +5765,6 @@ our %unified_info = (
             "crypto/chacha/chacha-ppc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/chacha/chacha-s390x.o" =>
@@ -5928,272 +5774,227 @@ our %unified_info = (
             "crypto/cmac/cm_ameth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cmac/cm_pmeth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cmac/cmac.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_asn1.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_att.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_cd.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_dd.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_env.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_ess.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_io.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_kari.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_pwri.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_sd.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_smime.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/conf/conf_api.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/conf/conf_def.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/conf/conf_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/conf/conf_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/conf/conf_mall.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/conf/conf_mod.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/conf/conf_sap.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/conf/conf_ssl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cpt_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cryptlib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ct/ct_b64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ct/ct_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ct/ct_log.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ct/ct_oct.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ct/ct_policy.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ct/ct_prn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ct/ct_sct.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ct/ct_sct_ctx.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ct/ct_vfy.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ct/ct_x509v3.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ctype.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cversion.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto",
                 ],
             "crypto/des/cbc_cksm.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/cbc_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/cfb64ede.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/cfb64enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/cfb_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/des_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/dest4-sparcv9.o" =>
@@ -6203,301 +6004,251 @@ our %unified_info = (
             "crypto/des/ecb3_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/ecb_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/fcrypt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/fcrypt_b.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/ofb64ede.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/ofb64enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/ofb_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/pcbc_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/qud_cksm.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/rand_key.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/set_key.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/str2key.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/xcbc_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_ameth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_asn1.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_check.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_depr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_gen.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_kdf.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_key.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_meth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_pmeth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_prn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_rfc5114.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_rfc7919.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dsa/dsa_ameth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dsa/dsa_asn1.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dsa/dsa_depr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dsa/dsa_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dsa/dsa_gen.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dsa/dsa_key.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dsa/dsa_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dsa/dsa_meth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dsa/dsa_ossl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dsa/dsa_pmeth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dsa/dsa_prn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dsa/dsa_sign.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dsa/dsa_vrf.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dso/dso_dl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dso/dso_dlfcn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dso/dso_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dso/dso_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dso/dso_openssl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dso/dso_vms.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dso/dso_win32.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ebcdic.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/curve25519.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/curve448/arch_32/f_impl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto/ec/curve448/arch_32",
                     "crypto/ec/curve448",
@@ -6505,7 +6256,6 @@ our %unified_info = (
             "crypto/ec/curve448/curve448.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto/ec/curve448/arch_32",
                     "crypto/ec/curve448",
@@ -6513,7 +6263,6 @@ our %unified_info = (
             "crypto/ec/curve448/curve448_tables.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto/ec/curve448/arch_32",
                     "crypto/ec/curve448",
@@ -6521,7 +6270,6 @@ our %unified_info = (
             "crypto/ec/curve448/eddsa.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto/ec/curve448/arch_32",
                     "crypto/ec/curve448",
@@ -6529,7 +6277,6 @@ our %unified_info = (
             "crypto/ec/curve448/f_generic.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto/ec/curve448/arch_32",
                     "crypto/ec/curve448",
@@ -6537,7 +6284,6 @@ our %unified_info = (
             "crypto/ec/curve448/scalar.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto/ec/curve448/arch_32",
                     "crypto/ec/curve448",
@@ -6545,163 +6291,136 @@ our %unified_info = (
             "crypto/ec/ec2_oct.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec2_smpl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec_ameth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec_asn1.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec_check.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec_curve.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec_cvt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec_key.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec_kmeth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec_mult.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec_oct.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec_pmeth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec_print.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecdh_kdf.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecdh_ossl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecdsa_ossl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecdsa_sign.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecdsa_vrf.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/eck_prn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecp_mont.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecp_nist.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecp_nistp224.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecp_nistp256.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecp_nistp521.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecp_nistputil.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecp_nistz256-armv4.o" =>
@@ -6719,223 +6438,186 @@ our %unified_info = (
             "crypto/ec/ecp_oct.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecp_smpl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecx_meth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/eng_all.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/eng_cnf.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/eng_ctrl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/eng_dyn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/eng_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/eng_fat.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/eng_init.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/eng_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/eng_list.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/eng_openssl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/eng_pkey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/eng_rdrand.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/eng_table.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/tb_asnmth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/tb_cipher.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/tb_dh.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/tb_digest.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/tb_dsa.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/tb_eckey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/tb_pkmeth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/tb_rand.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/tb_rsa.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/err/err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/err/err_all.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/err/err_prn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/bio_b64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/bio_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/bio_md.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/bio_ok.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/c_allc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/c_alld.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/cmeth_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/digest.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/e_aes.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto",
                     "crypto/modes",
@@ -6943,21 +6625,18 @@ our %unified_info = (
             "crypto/evp/e_aes_cbc_hmac_sha1.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto/modes",
                 ],
             "crypto/evp/e_aes_cbc_hmac_sha256.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto/modes",
                 ],
             "crypto/evp/e_aria.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto",
                     "crypto/modes",
@@ -6965,13 +6644,11 @@ our %unified_info = (
             "crypto/evp/e_bf.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/e_camellia.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto",
                     "crypto/modes",
@@ -6979,81 +6656,68 @@ our %unified_info = (
             "crypto/evp/e_cast.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/e_chacha20_poly1305.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/e_des.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto",
                 ],
             "crypto/evp/e_des3.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto",
                 ],
             "crypto/evp/e_idea.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/e_null.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/e_old.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/e_rc2.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/e_rc4.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/e_rc4_hmac_md5.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/e_rc5.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/e_seed.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/e_sm4.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto",
                     "crypto/modes",
@@ -7061,328 +6725,267 @@ our %unified_info = (
             "crypto/evp/e_xcbc_d.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/encode.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/evp_cnf.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/evp_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/evp_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/evp_key.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/evp_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/evp_pbe.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/evp_pkey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/m_md2.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/m_md4.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/m_md5.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/m_md5_sha1.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/m_mdc2.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/m_null.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/m_ripemd.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/m_sha1.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/m_sha3.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto",
                 ],
             "crypto/evp/m_sigver.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/m_wp.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/names.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/p5_crpt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/p5_crpt2.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/p_dec.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/p_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/p_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/p_open.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/p_seal.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/p_sign.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/p_verify.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/pbe_scrypt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/pmeth_fn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/pmeth_gn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/pmeth_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ex_data.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/getenv.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/hmac/hm_ameth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/hmac/hm_pmeth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/hmac/hmac.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/idea/i_cbc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/idea/i_cfb64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/idea/i_ecb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/idea/i_ofb64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/idea/i_skey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
-            "crypto/include/internal/bn_conf.h" =>
-                [
-                    ".",
-                ],
-            "crypto/include/internal/dso_conf.h" =>
-                [
-                    ".",
-                ],
             "crypto/init.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/kdf/hkdf.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/kdf/kdf_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/kdf/scrypt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/kdf/tls1_prf.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/lhash/lh_stats.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/lhash/lhash.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/md4/md4_dgst.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/md4/md4_one.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/md5/md5-sparcv9.o" =>
@@ -7392,79 +6995,66 @@ our %unified_info = (
             "crypto/md5/md5_dgst.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/md5/md5_one.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/mdc2/mdc2_one.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/mdc2/mdc2dgst.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/mem.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/mem_dbg.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/mem_sec.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/modes/cbc128.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/modes/ccm128.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/modes/cfb128.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/modes/ctr128.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/modes/cts128.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/modes/gcm128.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto",
                 ],
@@ -7483,7 +7073,6 @@ our %unified_info = (
             "crypto/modes/ghashp8-ppc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/modes/ghashv8-armx.o" =>
@@ -7493,361 +7082,301 @@ our %unified_info = (
             "crypto/modes/ocb128.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/modes/ofb128.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/modes/wrap128.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/modes/xts128.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/o_dir.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/o_fips.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/o_fopen.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/o_init.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/o_str.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/o_time.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/objects/o_names.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/objects/obj_dat.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/objects/obj_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/objects/obj_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/objects/obj_xref.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ocsp/ocsp_asn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ocsp/ocsp_cl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ocsp/ocsp_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ocsp/ocsp_ext.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ocsp/ocsp_ht.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ocsp/ocsp_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ocsp/ocsp_prn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ocsp/ocsp_srv.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ocsp/ocsp_vfy.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ocsp/v3_ocsp.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pem/pem_all.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pem/pem_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pem/pem_info.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pem/pem_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pem/pem_oth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pem/pem_pk8.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pem/pem_pkey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pem/pem_sign.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pem/pem_x509.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pem/pem_xaux.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pem/pvkfmt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_add.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_asn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_attr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_crpt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_crt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_decr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_init.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_key.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_kiss.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_mutl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_npas.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_p8d.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_p8e.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_sbag.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_utl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/pk12err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs7/bio_pk7.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs7/pk7_asn1.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs7/pk7_attr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs7/pk7_doit.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs7/pk7_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs7/pk7_mime.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs7/pk7_smime.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs7/pkcs7err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/poly1305/poly1305-armv4.o" =>
@@ -7865,13 +7394,11 @@ our %unified_info = (
             "crypto/poly1305/poly1305-ppc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/poly1305/poly1305-ppcfp.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/poly1305/poly1305-sparcv9.o" =>
@@ -7881,271 +7408,226 @@ our %unified_info = (
             "crypto/poly1305/poly1305.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/poly1305/poly1305_ameth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/poly1305/poly1305_pmeth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ppccap.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ppccpuid.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rand/drbg_ctr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rand/drbg_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rand/rand_egd.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rand/rand_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rand/rand_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rand/rand_unix.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rand/rand_vms.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rand/rand_win.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rand/randfile.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rc2/rc2_cbc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rc2/rc2_ecb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rc2/rc2_skey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rc2/rc2cfb64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rc2/rc2ofb64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rc4/rc4_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rc4/rc4_skey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ripemd/rmd_dgst.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ripemd/rmd_one.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_ameth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_asn1.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_chk.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_crpt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_depr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_gen.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_meth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_mp.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_none.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_oaep.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_ossl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_pk1.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_pmeth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_prn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_pss.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_saos.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_sign.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_ssl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_x931.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_x931g.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/s390xcpuid.o" =>
@@ -8155,31 +7637,26 @@ our %unified_info = (
             "crypto/seed/seed.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/seed/seed_cbc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/seed/seed_cfb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/seed/seed_ecb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/seed/seed_ofb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sha/keccak1600-armv4.o" =>
@@ -8189,7 +7666,6 @@ our %unified_info = (
             "crypto/sha/keccak1600.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sha/sha1-armv4-large.o" =>
@@ -8207,7 +7683,6 @@ our %unified_info = (
             "crypto/sha/sha1-ppc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sha/sha1-s390x.o" =>
@@ -8221,13 +7696,11 @@ our %unified_info = (
             "crypto/sha/sha1_one.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sha/sha1dgst.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sha/sha256-armv4.o" =>
@@ -8245,7 +7718,6 @@ our %unified_info = (
             "crypto/sha/sha256-ppc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sha/sha256-s390x.o" =>
@@ -8259,13 +7731,11 @@ our %unified_info = (
             "crypto/sha/sha256.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sha/sha256p8-ppc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sha/sha512-armv4.o" =>
@@ -8283,7 +7753,6 @@ our %unified_info = (
             "crypto/sha/sha512-ppc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sha/sha512-s390x.o" =>
@@ -8297,715 +7766,596 @@ our %unified_info = (
             "crypto/sha/sha512.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sha/sha512p8-ppc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/siphash/siphash.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/siphash/siphash_ameth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/siphash/siphash_pmeth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sm2/sm2_crypt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sm2/sm2_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sm2/sm2_pmeth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sm2/sm2_sign.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sm3/m_sm3.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sm3/sm3.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sm4/sm4.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/srp/srp_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/srp/srp_vfy.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/stack/stack.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/store/loader_file.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/store/store_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/store/store_init.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/store/store_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/store/store_register.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/store/store_strings.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/threads_none.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/threads_pthread.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/threads_win.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ts/ts_asn1.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ts/ts_conf.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ts/ts_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ts/ts_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ts/ts_req_print.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ts/ts_req_utils.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ts/ts_rsp_print.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ts/ts_rsp_sign.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ts/ts_rsp_utils.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ts/ts_rsp_verify.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ts/ts_verify_ctx.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/txt_db/txt_db.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ui/ui_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ui/ui_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ui/ui_null.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ui/ui_openssl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ui/ui_util.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/uid.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/whrlpool/wp_block.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/whrlpool/wp_dgst.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/by_dir.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/by_file.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/t_crl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/t_req.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/t_x509.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_att.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_cmp.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_d2.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_def.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_ext.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_lu.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_meth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_obj.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_r2x.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_req.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_set.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_trs.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_txt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_v3.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_vfy.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_vpm.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509cset.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509name.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509rset.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509spki.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509type.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x_all.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x_attrib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x_crl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x_exten.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x_name.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x_pubkey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x_req.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x_x509.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x_x509a.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/pcy_cache.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/pcy_data.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/pcy_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/pcy_map.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/pcy_node.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/pcy_tree.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_addr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_admis.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_akey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_akeya.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_alt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_asid.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_bcons.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_bitst.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_conf.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_cpols.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_crld.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_enum.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_extku.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_genn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_ia5.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_info.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_int.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_ncons.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_pci.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_pcia.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_pcons.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_pku.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_pmaps.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_prn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_purp.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_skey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_sxnet.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_tlsf.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_utl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "engines/e_capi.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "engines/e_padlock.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "fuzz/asn1.o" =>
@@ -9056,6 +8406,14 @@ our %unified_info = (
                 [
                     "include",
                 ],
+            "include/crypto/bn_conf.h" =>
+                [
+                    ".",
+                ],
+            "include/crypto/dso_conf.h" =>
+                [
+                    ".",
+                ],
             "include/openssl/opensslconf.h" =>
                 [
                     ".",
@@ -9300,7 +8658,6 @@ our %unified_info = (
                 [
                     ".",
                     "include",
-                    "crypto/include",
                 ],
             "test/asn1_string_table_test.o" =>
                 [
@@ -9626,7 +8983,6 @@ our %unified_info = (
                 [
                     ".",
                     "include",
-                    "crypto/include",
                 ],
             "test/cipher_overhead_test.o" =>
                 [
@@ -9672,7 +9028,6 @@ our %unified_info = (
             "test/ctype_internal_test.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "test/curve448_internal_test.o" =>
@@ -9738,7 +9093,6 @@ our %unified_info = (
                 [
                     "include",
                     "crypto/ec",
-                    "crypto/include",
                 ],
             "test/ecdsatest.o" =>
                 [
@@ -9763,7 +9117,6 @@ our %unified_info = (
             "test/evp_extra_test.o" =>
                 [
                     "include",
-                    "crypto/include",
                 ],
             "test/evp_test.o" =>
                 [
@@ -9861,7 +9214,6 @@ our %unified_info = (
                 [
                     ".",
                     "include",
-                    "crypto/include",
                 ],
             "test/rc2test.o" =>
                 [
@@ -9911,18 +9263,15 @@ our %unified_info = (
                 [
                     ".",
                     "include",
-                    "crypto/include",
                 ],
             "test/sm2_internal_test.o" =>
                 [
                     "include",
-                    "crypto/include",
                 ],
             "test/sm4_internal_test.o" =>
                 [
                     ".",
                     "include",
-                    "crypto/include",
                 ],
             "test/srptest.o" =>
                 [
@@ -9933,6 +9282,10 @@ our %unified_info = (
                     ".",
                     "include",
                 ],
+            "test/ssl_ctx_test.o" =>
+                [
+                    "include",
+                ],
             "test/ssl_test.o" =>
                 [
                     "include",
@@ -9996,10 +9349,6 @@ our %unified_info = (
                 [
                     "include",
                 ],
-            "test/testutil/init.o" =>
-                [
-                    "include",
-                ],
             "test/testutil/main.o" =>
                 [
                     "include",
@@ -10028,6 +9377,10 @@ our %unified_info = (
                 [
                     "include",
                 ],
+            "test/testutil/testutil_init.o" =>
+                [
+                    "include",
+                ],
             "test/threadstest.o" =>
                 [
                     "include",
@@ -10292,6 +9645,7 @@ our %unified_info = (
             "test/sm4_internal_test",
             "test/srptest",
             "test/ssl_cert_table_internal_test",
+            "test/ssl_ctx_test",
             "test/ssl_test",
             "test/ssl_test_ctx_test",
             "test/sslapitest",
@@ -15247,7 +14601,6 @@ our %unified_info = (
                     "test/testutil/cb.o",
                     "test/testutil/driver.o",
                     "test/testutil/format_output.o",
-                    "test/testutil/init.o",
                     "test/testutil/main.o",
                     "test/testutil/output_helpers.o",
                     "test/testutil/random.o",
@@ -15255,6 +14608,7 @@ our %unified_info = (
                     "test/testutil/tap_bio.o",
                     "test/testutil/test_cleanup.o",
                     "test/testutil/tests.o",
+                    "test/testutil/testutil_init.o",
                 ],
             "test/md2test" =>
                 [
@@ -15482,6 +14836,14 @@ our %unified_info = (
                 [
                     "test/ssl_cert_table_internal_test.c",
                 ],
+            "test/ssl_ctx_test" =>
+                [
+                    "test/ssl_ctx_test.o",
+                ],
+            "test/ssl_ctx_test.o" =>
+                [
+                    "test/ssl_ctx_test.c",
+                ],
             "test/ssl_test" =>
                 [
                     "test/handshake_helper.o",
@@ -15584,10 +14946,6 @@ our %unified_info = (
                 [
                     "test/testutil/format_output.c",
                 ],
-            "test/testutil/init.o" =>
-                [
-                    "test/testutil/init.c",
-                ],
             "test/testutil/main.o" =>
                 [
                     "test/testutil/main.c",
@@ -15616,6 +14974,10 @@ our %unified_info = (
                 [
                     "test/testutil/tests.c",
                 ],
+            "test/testutil/testutil_init.o" =>
+                [
+                    "test/testutil/testutil_init.c",
+                ],
             "test/threadstest" =>
                 [
                     "test/threadstest.o",
diff --git a/deps/openssl/config/archs/aix-gcc/asm_avx2/crypto/buildinf.h b/deps/openssl/config/archs/aix-gcc/asm_avx2/crypto/buildinf.h
index 553eaaf94c..eadeff3e44 100644
--- a/deps/openssl/config/archs/aix-gcc/asm_avx2/crypto/buildinf.h
+++ b/deps/openssl/config/archs/aix-gcc/asm_avx2/crypto/buildinf.h
@@ -11,7 +11,7 @@
  */
 
 #define PLATFORM "platform: aix-gcc"
-#define DATE "built on: Fri Sep 13 15:56:53 2019 UTC"
+#define DATE "built on: Wed Mar 18 21:04:33 2020 UTC"
 
 /*
  * Generate compiler_flags as an array of individual characters. This is a
diff --git a/deps/openssl/config/archs/aix-gcc/asm_avx2/crypto/include/internal/bn_conf.h b/deps/openssl/config/archs/aix-gcc/asm_avx2/crypto/include/internal/bn_conf.h
index fb52156bd0..459055c96f 100644
--- a/deps/openssl/config/archs/aix-gcc/asm_avx2/crypto/include/internal/bn_conf.h
+++ b/deps/openssl/config/archs/aix-gcc/asm_avx2/crypto/include/internal/bn_conf.h
@@ -1,5 +1,5 @@
 /* WARNING: do not edit! */
-/* Generated by Makefile from crypto/include/internal/bn_conf.h.in */
+/* Generated by Makefile from include/crypto/bn_conf.h.in */
 /*
  * Copyright 2016 The OpenSSL Project Authors. All Rights Reserved.
  *
@@ -9,8 +9,8 @@
  * https://www.openssl.org/source/license.html
  */
 
-#ifndef HEADER_BN_CONF_H
-# define HEADER_BN_CONF_H
+#ifndef OSSL_CRYPTO_BN_CONF_H
+# define OSSL_CRYPTO_BN_CONF_H
 
 /*
  * The contents of this file are not used in the UEFI build, as
diff --git a/deps/openssl/config/archs/aix-gcc/asm_avx2/crypto/include/internal/dso_conf.h b/deps/openssl/config/archs/aix-gcc/asm_avx2/crypto/include/internal/dso_conf.h
index 252266ec2a..4b1167c3d8 100644
--- a/deps/openssl/config/archs/aix-gcc/asm_avx2/crypto/include/internal/dso_conf.h
+++ b/deps/openssl/config/archs/aix-gcc/asm_avx2/crypto/include/internal/dso_conf.h
@@ -1,5 +1,5 @@
 /* WARNING: do not edit! */
-/* Generated by Makefile from crypto/include/internal/dso_conf.h.in */
+/* Generated by Makefile from include/crypto/dso_conf.h.in */
 /*
  * Copyright 2016-2019 The OpenSSL Project Authors. All Rights Reserved.
  *
@@ -9,8 +9,8 @@
  * https://www.openssl.org/source/license.html
  */
 
-#ifndef HEADER_DSO_CONF_H
-# define HEADER_DSO_CONF_H
+#ifndef OSSL_CRYPTO_DSO_CONF_H
+# define OSSL_CRYPTO_DSO_CONF_H
 # define DSO_DLFCN
 # define HAVE_DLFCN_H
 # define DSO_EXTENSION ".so"
diff --git a/deps/openssl/config/archs/aix-gcc/asm_avx2/include/openssl/opensslconf.h b/deps/openssl/config/archs/aix-gcc/asm_avx2/include/openssl/opensslconf.h
index 683c468946..9028305bd2 100644
--- a/deps/openssl/config/archs/aix-gcc/asm_avx2/include/openssl/opensslconf.h
+++ b/deps/openssl/config/archs/aix-gcc/asm_avx2/include/openssl/opensslconf.h
@@ -99,9 +99,6 @@ extern "C" {
 #ifndef OPENSSL_NO_DYNAMIC_ENGINE
 # define OPENSSL_NO_DYNAMIC_ENGINE
 #endif
-#ifndef OPENSSL_NO_AFALGENG
-# define OPENSSL_NO_AFALGENG
-#endif
 
 
 /*
diff --git a/deps/openssl/config/archs/aix-gcc/asm_avx2/include/progs.h b/deps/openssl/config/archs/aix-gcc/asm_avx2/include/progs.h
index 9b3d270e20..308c65601b 100644
--- a/deps/openssl/config/archs/aix-gcc/asm_avx2/include/progs.h
+++ b/deps/openssl/config/archs/aix-gcc/asm_avx2/include/progs.h
@@ -2,7 +2,7 @@
  * WARNING: do not edit!
  * Generated by apps/progs.pl
  *
- * Copyright 1995-2019 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 1995-2020 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
diff --git a/deps/openssl/config/archs/aix-gcc/no-asm/configdata.pm b/deps/openssl/config/archs/aix-gcc/no-asm/configdata.pm
index 48bc45df70..401c0fa7dc 100644
--- a/deps/openssl/config/archs/aix-gcc/no-asm/configdata.pm
+++ b/deps/openssl/config/archs/aix-gcc/no-asm/configdata.pm
@@ -54,7 +54,7 @@ our %config = (
   minor => "1.1",
   openssl_algorithm_defines => [ "OPENSSL_NO_COMP", "OPENSSL_NO_MD2", "OPENSSL_NO_RC5" ],
   openssl_api_defines => [  ],
-  openssl_other_defines => [ "OPENSSL_RAND_SEED_OS", "OPENSSL_NO_AFALGENG", "OPENSSL_NO_ASAN", "OPENSSL_NO_ASM", "OPENSSL_NO_CRYPTO_MDEBUG", "OPENSSL_NO_CRYPTO_MDEBUG_BACKTRACE", "OPENSSL_NO_DEVCRYPTOENG", "OPENSSL_NO_EC_NISTP_64_GCC_128", "OPENSSL_NO_EGD", "OPENSSL_NO_EXTERNAL_TESTS", "OPENSSL_NO_FUZZ_AFL", "OPENSSL_NO_FUZZ_LIBFUZZER", "OPENSSL_NO_HEARTBEATS", "OPENSSL_NO_MSAN", "OPENSSL_NO_SCTP", "OPENSSL_NO_SSL3", "OPENSSL_NO_SSL3_METHOD", "OPENSSL_NO_UBSAN", "OPENSSL_NO_UNIT_TEST", "OPENSSL_NO_WEAK_SSL_CIPHERS", "OPENSSL_NO_DYNAMIC_ENGINE", "OPENSSL_NO_AFALGENG" ],
+  openssl_other_defines => [ "OPENSSL_RAND_SEED_OS", "OPENSSL_NO_AFALGENG", "OPENSSL_NO_ASAN", "OPENSSL_NO_ASM", "OPENSSL_NO_CRYPTO_MDEBUG", "OPENSSL_NO_CRYPTO_MDEBUG_BACKTRACE", "OPENSSL_NO_DEVCRYPTOENG", "OPENSSL_NO_EC_NISTP_64_GCC_128", "OPENSSL_NO_EGD", "OPENSSL_NO_EXTERNAL_TESTS", "OPENSSL_NO_FUZZ_AFL", "OPENSSL_NO_FUZZ_LIBFUZZER", "OPENSSL_NO_HEARTBEATS", "OPENSSL_NO_MSAN", "OPENSSL_NO_SCTP", "OPENSSL_NO_SSL3", "OPENSSL_NO_SSL3_METHOD", "OPENSSL_NO_UBSAN", "OPENSSL_NO_UNIT_TEST", "OPENSSL_NO_WEAK_SSL_CIPHERS", "OPENSSL_NO_DYNAMIC_ENGINE" ],
   openssl_sys_defines => [ "OPENSSL_SYS_AIX" ],
   openssl_thread_defines => [ "OPENSSL_THREADS" ],
   openssldir => "",
@@ -110,8 +110,8 @@ our %config = (
   sourcedir => ".",
   target => "aix-gcc",
   tdirs => [ "ossl_shim" ],
-  version => "1.1.1d",
-  version_num => "0x1010104fL",
+  version => "1.1.1e",
+  version_num => "0x1010105fL",
 );
 
 our %target = (
@@ -234,6 +234,7 @@ our @disablables = (
   "dgram",
   "dh",
   "dsa",
+  "dso",
   "dtls",
   "dynamic-engine",
   "ec",
@@ -352,8 +353,8 @@ our %unified_info = (
         {
             "" =>
                 [
-                    "crypto/include/internal/bn_conf.h",
-                    "crypto/include/internal/dso_conf.h",
+                    "include/crypto/bn_conf.h",
+                    "include/crypto/dso_conf.h",
                     "include/openssl/opensslconf.h",
                 ],
             "apps/asn1pars.o" =>
@@ -621,14 +622,6 @@ our %unified_info = (
                     "crypto/perlasm/cbc.pl",
                     "crypto/perlasm/x86asm.pl",
                 ],
-            "crypto/include/internal/bn_conf.h" =>
-                [
-                    "configdata.pm",
-                ],
-            "crypto/include/internal/dso_conf.h" =>
-                [
-                    "configdata.pm",
-                ],
             "crypto/rc4/rc4-586.s" =>
                 [
                     "crypto/perlasm/x86asm.pl",
@@ -704,6 +697,14 @@ our %unified_info = (
                 [
                     "libcrypto",
                 ],
+            "include/crypto/bn_conf.h" =>
+                [
+                    "configdata.pm",
+                ],
+            "include/crypto/dso_conf.h" =>
+                [
+                    "configdata.pm",
+                ],
             "include/openssl/opensslconf.h" =>
                 [
                     "configdata.pm",
@@ -1501,6 +1502,12 @@ our %unified_info = (
                     "libcrypto",
                     "test/libtestutil.a",
                 ],
+            "test/ssl_ctx_test" =>
+                [
+                    "libcrypto",
+                    "libssl",
+                    "test/libtestutil.a",
+                ],
             "test/ssl_test" =>
                 [
                     "libcrypto",
@@ -3219,7 +3226,6 @@ our %unified_info = (
                             "test/testutil/cb.o",
                             "test/testutil/driver.o",
                             "test/testutil/format_output.o",
-                            "test/testutil/init.o",
                             "test/testutil/main.o",
                             "test/testutil/output_helpers.o",
                             "test/testutil/random.o",
@@ -3227,6 +3233,7 @@ our %unified_info = (
                             "test/testutil/tap_bio.o",
                             "test/testutil/test_cleanup.o",
                             "test/testutil/tests.o",
+                            "test/testutil/testutil_init.o",
                         ],
                     "products" =>
                         {
@@ -3725,14 +3732,6 @@ our %unified_info = (
                 [
                     "crypto/ia64cpuid.S",
                 ],
-            "crypto/include/internal/bn_conf.h" =>
-                [
-                    "crypto/include/internal/bn_conf.h.in",
-                ],
-            "crypto/include/internal/dso_conf.h" =>
-                [
-                    "crypto/include/internal/dso_conf.h.in",
-                ],
             "crypto/md5/md5-586.s" =>
                 [
                     "crypto/md5/asm/md5-586.pl",
@@ -4173,6 +4172,14 @@ our %unified_info = (
                     "engines/asm/e_padlock-x86_64.pl",
                     "\$(PERLASM_SCHEME)",
                 ],
+            "include/crypto/bn_conf.h" =>
+                [
+                    "include/crypto/bn_conf.h.in",
+                ],
+            "include/crypto/dso_conf.h" =>
+                [
+                    "include/crypto/dso_conf.h.in",
+                ],
             "include/openssl/opensslconf.h" =>
                 [
                     "include/openssl/opensslconf.h.in",
@@ -4867,49 +4874,41 @@ our %unified_info = (
             "crypto/aes/aes_cbc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/aes/aes_cfb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/aes/aes_core.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/aes/aes_ecb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/aes/aes_ige.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/aes/aes_misc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/aes/aes_ofb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/aes/aes_wrap.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/aes/aesfx-sparcv9.o" =>
@@ -4931,7 +4930,6 @@ our %unified_info = (
             "crypto/aria/aria.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/arm64cpuid.o" =>
@@ -4945,613 +4943,511 @@ our %unified_info = (
             "crypto/asn1/a_bitstr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_d2i_fp.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_digest.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_dup.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_gentm.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_i2d_fp.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_int.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_mbstr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_object.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_octet.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_print.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_sign.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_strex.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_strnid.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_time.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_type.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_utctm.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_utf8.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_verify.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/ameth_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/asn1_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/asn1_gen.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/asn1_item_list.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/asn1_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/asn1_par.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/asn_mime.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/asn_moid.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/asn_mstbl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/asn_pack.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/bio_asn1.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/bio_ndef.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/d2i_pr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/d2i_pu.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/evp_asn1.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/f_int.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/f_string.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/i2d_pr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/i2d_pu.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/n_pkey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/nsseq.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/p5_pbe.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/p5_pbev2.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/p5_scrypt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/p8_pkey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/t_bitst.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/t_pkey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/t_spki.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/tasn_dec.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/tasn_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/tasn_fre.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/tasn_new.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/tasn_prn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/tasn_scn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/tasn_typ.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/tasn_utl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/x_algor.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/x_bignum.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/x_info.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/x_int64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/x_long.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/x_pkey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/x_sig.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/x_spki.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/x_val.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/async/arch/async_null.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/async/arch/async_posix.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/async/arch/async_win.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/async/async.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/async/async_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/async/async_wait.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bf/bf_cfb64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bf/bf_ecb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bf/bf_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bf/bf_ofb64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bf/bf_skey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/b_addr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/b_dump.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/b_print.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/b_sock.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/b_sock2.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bf_buff.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bf_lbuf.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bf_nbio.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bf_null.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bio_cb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bio_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bio_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bio_meth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bss_acpt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bss_bio.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bss_conn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bss_dgram.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bss_fd.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bss_file.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bss_log.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bss_mem.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bss_null.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bss_sock.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/blake2/blake2b.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/blake2/blake2s.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/blake2/m_blake2b.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/blake2/m_blake2s.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/armv4-gf2m.o" =>
@@ -5569,188 +5465,157 @@ our %unified_info = (
             "crypto/bn/bn_add.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_asm.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_blind.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_const.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_ctx.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_depr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_dh.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_div.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_exp.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto",
                 ],
             "crypto/bn/bn_exp2.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_gcd.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_gf2m.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_intern.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_kron.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_mod.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_mont.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_mpi.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_mul.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_nist.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_prime.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_print.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_rand.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_recp.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_shift.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_sqr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_sqrt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_srp.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_word.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_x931p.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/mips-mont.o" =>
@@ -5780,13 +5645,11 @@ our %unified_info = (
             "crypto/buffer/buf_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/buffer/buffer.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/buildinf.h" =>
@@ -5796,43 +5659,36 @@ our %unified_info = (
             "crypto/camellia/camellia.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/camellia/cmll_cbc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/camellia/cmll_cfb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/camellia/cmll_ctr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/camellia/cmll_ecb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/camellia/cmll_misc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/camellia/cmll_ofb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/camellia/cmllt4-sparcv9.o" =>
@@ -5842,31 +5698,26 @@ our %unified_info = (
             "crypto/cast/c_cfb64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cast/c_ecb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cast/c_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cast/c_ofb64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cast/c_skey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/chacha/chacha-armv4.o" =>
@@ -5884,278 +5735,232 @@ our %unified_info = (
             "crypto/chacha/chacha_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cmac/cm_ameth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cmac/cm_pmeth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cmac/cmac.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_asn1.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_att.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_cd.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_dd.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_env.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_ess.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_io.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_kari.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_pwri.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_sd.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_smime.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/conf/conf_api.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/conf/conf_def.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/conf/conf_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/conf/conf_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/conf/conf_mall.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/conf/conf_mod.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/conf/conf_sap.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/conf/conf_ssl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cpt_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cryptlib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ct/ct_b64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ct/ct_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ct/ct_log.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ct/ct_oct.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ct/ct_policy.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ct/ct_prn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ct/ct_sct.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ct/ct_sct_ctx.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ct/ct_vfy.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ct/ct_x509v3.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ctype.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cversion.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto",
                 ],
             "crypto/des/cbc_cksm.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/cbc_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/cfb64ede.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/cfb64enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/cfb_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/des_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/dest4-sparcv9.o" =>
@@ -6165,301 +5970,251 @@ our %unified_info = (
             "crypto/des/ecb3_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/ecb_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/fcrypt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/fcrypt_b.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/ofb64ede.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/ofb64enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/ofb_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/pcbc_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/qud_cksm.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/rand_key.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/set_key.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/str2key.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/xcbc_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_ameth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_asn1.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_check.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_depr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_gen.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_kdf.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_key.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_meth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_pmeth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_prn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_rfc5114.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_rfc7919.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dsa/dsa_ameth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dsa/dsa_asn1.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dsa/dsa_depr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dsa/dsa_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dsa/dsa_gen.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dsa/dsa_key.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dsa/dsa_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dsa/dsa_meth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dsa/dsa_ossl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dsa/dsa_pmeth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dsa/dsa_prn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dsa/dsa_sign.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dsa/dsa_vrf.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dso/dso_dl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dso/dso_dlfcn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dso/dso_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dso/dso_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dso/dso_openssl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dso/dso_vms.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dso/dso_win32.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ebcdic.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/curve25519.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/curve448/arch_32/f_impl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto/ec/curve448/arch_32",
                     "crypto/ec/curve448",
@@ -6467,7 +6222,6 @@ our %unified_info = (
             "crypto/ec/curve448/curve448.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto/ec/curve448/arch_32",
                     "crypto/ec/curve448",
@@ -6475,7 +6229,6 @@ our %unified_info = (
             "crypto/ec/curve448/curve448_tables.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto/ec/curve448/arch_32",
                     "crypto/ec/curve448",
@@ -6483,7 +6236,6 @@ our %unified_info = (
             "crypto/ec/curve448/eddsa.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto/ec/curve448/arch_32",
                     "crypto/ec/curve448",
@@ -6491,7 +6243,6 @@ our %unified_info = (
             "crypto/ec/curve448/f_generic.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto/ec/curve448/arch_32",
                     "crypto/ec/curve448",
@@ -6499,7 +6250,6 @@ our %unified_info = (
             "crypto/ec/curve448/scalar.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto/ec/curve448/arch_32",
                     "crypto/ec/curve448",
@@ -6507,163 +6257,136 @@ our %unified_info = (
             "crypto/ec/ec2_oct.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec2_smpl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec_ameth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec_asn1.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec_check.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec_curve.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec_cvt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec_key.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec_kmeth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec_mult.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec_oct.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec_pmeth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec_print.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecdh_kdf.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecdh_ossl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecdsa_ossl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecdsa_sign.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecdsa_vrf.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/eck_prn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecp_mont.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecp_nist.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecp_nistp224.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecp_nistp256.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecp_nistp521.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecp_nistputil.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecp_nistz256-armv4.o" =>
@@ -6681,223 +6404,186 @@ our %unified_info = (
             "crypto/ec/ecp_oct.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecp_smpl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecx_meth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/eng_all.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/eng_cnf.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/eng_ctrl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/eng_dyn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/eng_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/eng_fat.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/eng_init.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/eng_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/eng_list.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/eng_openssl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/eng_pkey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/eng_rdrand.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/eng_table.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/tb_asnmth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/tb_cipher.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/tb_dh.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/tb_digest.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/tb_dsa.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/tb_eckey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/tb_pkmeth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/tb_rand.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/tb_rsa.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/err/err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/err/err_all.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/err/err_prn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/bio_b64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/bio_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/bio_md.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/bio_ok.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/c_allc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/c_alld.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/cmeth_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/digest.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/e_aes.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto",
                     "crypto/modes",
@@ -6905,21 +6591,18 @@ our %unified_info = (
             "crypto/evp/e_aes_cbc_hmac_sha1.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto/modes",
                 ],
             "crypto/evp/e_aes_cbc_hmac_sha256.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto/modes",
                 ],
             "crypto/evp/e_aria.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto",
                     "crypto/modes",
@@ -6927,13 +6610,11 @@ our %unified_info = (
             "crypto/evp/e_bf.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/e_camellia.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto",
                     "crypto/modes",
@@ -6941,81 +6622,68 @@ our %unified_info = (
             "crypto/evp/e_cast.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/e_chacha20_poly1305.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/e_des.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto",
                 ],
             "crypto/evp/e_des3.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto",
                 ],
             "crypto/evp/e_idea.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/e_null.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/e_old.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/e_rc2.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/e_rc4.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/e_rc4_hmac_md5.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/e_rc5.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/e_seed.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/e_sm4.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto",
                     "crypto/modes",
@@ -7023,328 +6691,267 @@ our %unified_info = (
             "crypto/evp/e_xcbc_d.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/encode.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/evp_cnf.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/evp_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/evp_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/evp_key.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/evp_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/evp_pbe.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/evp_pkey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/m_md2.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/m_md4.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/m_md5.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/m_md5_sha1.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/m_mdc2.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/m_null.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/m_ripemd.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/m_sha1.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/m_sha3.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto",
                 ],
             "crypto/evp/m_sigver.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/m_wp.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/names.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/p5_crpt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/p5_crpt2.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/p_dec.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/p_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/p_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/p_open.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/p_seal.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/p_sign.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/p_verify.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/pbe_scrypt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/pmeth_fn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/pmeth_gn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/pmeth_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ex_data.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/getenv.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/hmac/hm_ameth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/hmac/hm_pmeth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/hmac/hmac.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/idea/i_cbc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/idea/i_cfb64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/idea/i_ecb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/idea/i_ofb64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/idea/i_skey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
-            "crypto/include/internal/bn_conf.h" =>
-                [
-                    ".",
-                ],
-            "crypto/include/internal/dso_conf.h" =>
-                [
-                    ".",
-                ],
             "crypto/init.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/kdf/hkdf.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/kdf/kdf_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/kdf/scrypt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/kdf/tls1_prf.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/lhash/lh_stats.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/lhash/lhash.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/md4/md4_dgst.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/md4/md4_one.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/md5/md5-sparcv9.o" =>
@@ -7354,85 +6961,71 @@ our %unified_info = (
             "crypto/md5/md5_dgst.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/md5/md5_one.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/mdc2/mdc2_one.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/mdc2/mdc2dgst.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/mem.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/mem_clr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/mem_dbg.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/mem_sec.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/modes/cbc128.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/modes/ccm128.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/modes/cfb128.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/modes/ctr128.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/modes/cts128.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/modes/gcm128.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto",
                 ],
@@ -7455,361 +7048,301 @@ our %unified_info = (
             "crypto/modes/ocb128.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/modes/ofb128.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/modes/wrap128.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/modes/xts128.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/o_dir.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/o_fips.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/o_fopen.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/o_init.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/o_str.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/o_time.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/objects/o_names.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/objects/obj_dat.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/objects/obj_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/objects/obj_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/objects/obj_xref.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ocsp/ocsp_asn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ocsp/ocsp_cl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ocsp/ocsp_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ocsp/ocsp_ext.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ocsp/ocsp_ht.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ocsp/ocsp_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ocsp/ocsp_prn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ocsp/ocsp_srv.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ocsp/ocsp_vfy.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ocsp/v3_ocsp.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pem/pem_all.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pem/pem_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pem/pem_info.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pem/pem_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pem/pem_oth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pem/pem_pk8.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pem/pem_pkey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pem/pem_sign.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pem/pem_x509.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pem/pem_xaux.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pem/pvkfmt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_add.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_asn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_attr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_crpt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_crt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_decr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_init.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_key.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_kiss.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_mutl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_npas.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_p8d.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_p8e.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_sbag.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_utl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/pk12err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs7/bio_pk7.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs7/pk7_asn1.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs7/pk7_attr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs7/pk7_doit.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs7/pk7_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs7/pk7_mime.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs7/pk7_smime.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs7/pkcs7err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/poly1305/poly1305-armv4.o" =>
@@ -7831,259 +7364,216 @@ our %unified_info = (
             "crypto/poly1305/poly1305.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/poly1305/poly1305_ameth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/poly1305/poly1305_pmeth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rand/drbg_ctr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rand/drbg_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rand/rand_egd.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rand/rand_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rand/rand_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rand/rand_unix.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rand/rand_vms.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rand/rand_win.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rand/randfile.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rc2/rc2_cbc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rc2/rc2_ecb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rc2/rc2_skey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rc2/rc2cfb64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rc2/rc2ofb64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rc4/rc4_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rc4/rc4_skey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ripemd/rmd_dgst.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ripemd/rmd_one.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_ameth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_asn1.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_chk.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_crpt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_depr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_gen.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_meth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_mp.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_none.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_oaep.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_ossl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_pk1.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_pmeth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_prn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_pss.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_saos.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_sign.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_ssl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_x931.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_x931g.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/s390xcpuid.o" =>
@@ -8093,31 +7583,26 @@ our %unified_info = (
             "crypto/seed/seed.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/seed/seed_cbc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/seed/seed_cfb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/seed/seed_ecb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/seed/seed_ofb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sha/keccak1600-armv4.o" =>
@@ -8127,7 +7612,6 @@ our %unified_info = (
             "crypto/sha/keccak1600.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sha/sha1-armv4-large.o" =>
@@ -8153,13 +7637,11 @@ our %unified_info = (
             "crypto/sha/sha1_one.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sha/sha1dgst.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sha/sha256-armv4.o" =>
@@ -8185,7 +7667,6 @@ our %unified_info = (
             "crypto/sha/sha256.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sha/sha512-armv4.o" =>
@@ -8211,709 +7692,591 @@ our %unified_info = (
             "crypto/sha/sha512.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/siphash/siphash.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/siphash/siphash_ameth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/siphash/siphash_pmeth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sm2/sm2_crypt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sm2/sm2_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sm2/sm2_pmeth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sm2/sm2_sign.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sm3/m_sm3.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sm3/sm3.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sm4/sm4.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/srp/srp_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/srp/srp_vfy.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/stack/stack.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/store/loader_file.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/store/store_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/store/store_init.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/store/store_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/store/store_register.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/store/store_strings.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/threads_none.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/threads_pthread.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/threads_win.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ts/ts_asn1.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ts/ts_conf.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ts/ts_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ts/ts_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ts/ts_req_print.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ts/ts_req_utils.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ts/ts_rsp_print.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ts/ts_rsp_sign.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ts/ts_rsp_utils.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ts/ts_rsp_verify.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ts/ts_verify_ctx.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/txt_db/txt_db.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ui/ui_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ui/ui_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ui/ui_null.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ui/ui_openssl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ui/ui_util.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/uid.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/whrlpool/wp_block.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/whrlpool/wp_dgst.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/by_dir.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/by_file.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/t_crl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/t_req.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/t_x509.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_att.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_cmp.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_d2.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_def.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_ext.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_lu.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_meth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_obj.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_r2x.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_req.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_set.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_trs.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_txt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_v3.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_vfy.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_vpm.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509cset.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509name.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509rset.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509spki.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509type.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x_all.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x_attrib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x_crl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x_exten.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x_name.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x_pubkey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x_req.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x_x509.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x_x509a.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/pcy_cache.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/pcy_data.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/pcy_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/pcy_map.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/pcy_node.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/pcy_tree.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_addr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_admis.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_akey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_akeya.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_alt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_asid.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_bcons.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_bitst.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_conf.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_cpols.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_crld.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_enum.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_extku.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_genn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_ia5.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_info.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_int.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_ncons.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_pci.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_pcia.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_pcons.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_pku.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_pmaps.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_prn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_purp.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_skey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_sxnet.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_tlsf.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_utl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "engines/e_capi.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "engines/e_padlock.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "fuzz/asn1.o" =>
@@ -8964,6 +8327,14 @@ our %unified_info = (
                 [
                     "include",
                 ],
+            "include/crypto/bn_conf.h" =>
+                [
+                    ".",
+                ],
+            "include/crypto/dso_conf.h" =>
+                [
+                    ".",
+                ],
             "include/openssl/opensslconf.h" =>
                 [
                     ".",
@@ -9208,7 +8579,6 @@ our %unified_info = (
                 [
                     ".",
                     "include",
-                    "crypto/include",
                 ],
             "test/asn1_string_table_test.o" =>
                 [
@@ -9534,7 +8904,6 @@ our %unified_info = (
                 [
                     ".",
                     "include",
-                    "crypto/include",
                 ],
             "test/cipher_overhead_test.o" =>
                 [
@@ -9580,7 +8949,6 @@ our %unified_info = (
             "test/ctype_internal_test.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "test/curve448_internal_test.o" =>
@@ -9646,7 +9014,6 @@ our %unified_info = (
                 [
                     "include",
                     "crypto/ec",
-                    "crypto/include",
                 ],
             "test/ecdsatest.o" =>
                 [
@@ -9671,7 +9038,6 @@ our %unified_info = (
             "test/evp_extra_test.o" =>
                 [
                     "include",
-                    "crypto/include",
                 ],
             "test/evp_test.o" =>
                 [
@@ -9769,7 +9135,6 @@ our %unified_info = (
                 [
                     ".",
                     "include",
-                    "crypto/include",
                 ],
             "test/rc2test.o" =>
                 [
@@ -9819,18 +9184,15 @@ our %unified_info = (
                 [
                     ".",
                     "include",
-                    "crypto/include",
                 ],
             "test/sm2_internal_test.o" =>
                 [
                     "include",
-                    "crypto/include",
                 ],
             "test/sm4_internal_test.o" =>
                 [
                     ".",
                     "include",
-                    "crypto/include",
                 ],
             "test/srptest.o" =>
                 [
@@ -9841,6 +9203,10 @@ our %unified_info = (
                     ".",
                     "include",
                 ],
+            "test/ssl_ctx_test.o" =>
+                [
+                    "include",
+                ],
             "test/ssl_test.o" =>
                 [
                     "include",
@@ -9904,10 +9270,6 @@ our %unified_info = (
                 [
                     "include",
                 ],
-            "test/testutil/init.o" =>
-                [
-                    "include",
-                ],
             "test/testutil/main.o" =>
                 [
                     "include",
@@ -9936,6 +9298,10 @@ our %unified_info = (
                 [
                     "include",
                 ],
+            "test/testutil/testutil_init.o" =>
+                [
+                    "include",
+                ],
             "test/threadstest.o" =>
                 [
                     "include",
@@ -10200,6 +9566,7 @@ our %unified_info = (
             "test/sm4_internal_test",
             "test/srptest",
             "test/ssl_cert_table_internal_test",
+            "test/ssl_ctx_test",
             "test/ssl_test",
             "test/ssl_test_ctx_test",
             "test/sslapitest",
@@ -15090,7 +14457,6 @@ our %unified_info = (
                     "test/testutil/cb.o",
                     "test/testutil/driver.o",
                     "test/testutil/format_output.o",
-                    "test/testutil/init.o",
                     "test/testutil/main.o",
                     "test/testutil/output_helpers.o",
                     "test/testutil/random.o",
@@ -15098,6 +14464,7 @@ our %unified_info = (
                     "test/testutil/tap_bio.o",
                     "test/testutil/test_cleanup.o",
                     "test/testutil/tests.o",
+                    "test/testutil/testutil_init.o",
                 ],
             "test/md2test" =>
                 [
@@ -15325,6 +14692,14 @@ our %unified_info = (
                 [
                     "test/ssl_cert_table_internal_test.c",
                 ],
+            "test/ssl_ctx_test" =>
+                [
+                    "test/ssl_ctx_test.o",
+                ],
+            "test/ssl_ctx_test.o" =>
+                [
+                    "test/ssl_ctx_test.c",
+                ],
             "test/ssl_test" =>
                 [
                     "test/handshake_helper.o",
@@ -15427,10 +14802,6 @@ our %unified_info = (
                 [
                     "test/testutil/format_output.c",
                 ],
-            "test/testutil/init.o" =>
-                [
-                    "test/testutil/init.c",
-                ],
             "test/testutil/main.o" =>
                 [
                     "test/testutil/main.c",
@@ -15459,6 +14830,10 @@ our %unified_info = (
                 [
                     "test/testutil/tests.c",
                 ],
+            "test/testutil/testutil_init.o" =>
+                [
+                    "test/testutil/testutil_init.c",
+                ],
             "test/threadstest" =>
                 [
                     "test/threadstest.o",
diff --git a/deps/openssl/config/archs/aix-gcc/no-asm/crypto/buildinf.h b/deps/openssl/config/archs/aix-gcc/no-asm/crypto/buildinf.h
index a3c2c5a66f..5a597aebe4 100644
--- a/deps/openssl/config/archs/aix-gcc/no-asm/crypto/buildinf.h
+++ b/deps/openssl/config/archs/aix-gcc/no-asm/crypto/buildinf.h
@@ -11,7 +11,7 @@
  */
 
 #define PLATFORM "platform: aix-gcc"
-#define DATE "built on: Fri Sep 13 15:56:58 2019 UTC"
+#define DATE "built on: Wed Mar 18 21:04:36 2020 UTC"
 
 /*
  * Generate compiler_flags as an array of individual characters. This is a
diff --git a/deps/openssl/config/archs/aix-gcc/no-asm/crypto/include/internal/bn_conf.h b/deps/openssl/config/archs/aix-gcc/no-asm/crypto/include/internal/bn_conf.h
index fb52156bd0..459055c96f 100644
--- a/deps/openssl/config/archs/aix-gcc/no-asm/crypto/include/internal/bn_conf.h
+++ b/deps/openssl/config/archs/aix-gcc/no-asm/crypto/include/internal/bn_conf.h
@@ -1,5 +1,5 @@
 /* WARNING: do not edit! */
-/* Generated by Makefile from crypto/include/internal/bn_conf.h.in */
+/* Generated by Makefile from include/crypto/bn_conf.h.in */
 /*
  * Copyright 2016 The OpenSSL Project Authors. All Rights Reserved.
  *
@@ -9,8 +9,8 @@
  * https://www.openssl.org/source/license.html
  */
 
-#ifndef HEADER_BN_CONF_H
-# define HEADER_BN_CONF_H
+#ifndef OSSL_CRYPTO_BN_CONF_H
+# define OSSL_CRYPTO_BN_CONF_H
 
 /*
  * The contents of this file are not used in the UEFI build, as
diff --git a/deps/openssl/config/archs/aix-gcc/no-asm/crypto/include/internal/dso_conf.h b/deps/openssl/config/archs/aix-gcc/no-asm/crypto/include/internal/dso_conf.h
index 252266ec2a..4b1167c3d8 100644
--- a/deps/openssl/config/archs/aix-gcc/no-asm/crypto/include/internal/dso_conf.h
+++ b/deps/openssl/config/archs/aix-gcc/no-asm/crypto/include/internal/dso_conf.h
@@ -1,5 +1,5 @@
 /* WARNING: do not edit! */
-/* Generated by Makefile from crypto/include/internal/dso_conf.h.in */
+/* Generated by Makefile from include/crypto/dso_conf.h.in */
 /*
  * Copyright 2016-2019 The OpenSSL Project Authors. All Rights Reserved.
  *
@@ -9,8 +9,8 @@
  * https://www.openssl.org/source/license.html
  */
 
-#ifndef HEADER_DSO_CONF_H
-# define HEADER_DSO_CONF_H
+#ifndef OSSL_CRYPTO_DSO_CONF_H
+# define OSSL_CRYPTO_DSO_CONF_H
 # define DSO_DLFCN
 # define HAVE_DLFCN_H
 # define DSO_EXTENSION ".so"
diff --git a/deps/openssl/config/archs/aix-gcc/no-asm/include/openssl/opensslconf.h b/deps/openssl/config/archs/aix-gcc/no-asm/include/openssl/opensslconf.h
index 882ae5789d..5b3831705c 100644
--- a/deps/openssl/config/archs/aix-gcc/no-asm/include/openssl/opensslconf.h
+++ b/deps/openssl/config/archs/aix-gcc/no-asm/include/openssl/opensslconf.h
@@ -102,9 +102,6 @@ extern "C" {
 #ifndef OPENSSL_NO_DYNAMIC_ENGINE
 # define OPENSSL_NO_DYNAMIC_ENGINE
 #endif
-#ifndef OPENSSL_NO_AFALGENG
-# define OPENSSL_NO_AFALGENG
-#endif
 
 
 /*
diff --git a/deps/openssl/config/archs/aix-gcc/no-asm/include/progs.h b/deps/openssl/config/archs/aix-gcc/no-asm/include/progs.h
index 9b3d270e20..308c65601b 100644
--- a/deps/openssl/config/archs/aix-gcc/no-asm/include/progs.h
+++ b/deps/openssl/config/archs/aix-gcc/no-asm/include/progs.h
@@ -2,7 +2,7 @@
  * WARNING: do not edit!
  * Generated by apps/progs.pl
  *
- * Copyright 1995-2019 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 1995-2020 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
diff --git a/deps/openssl/config/archs/aix64-gcc/asm/configdata.pm b/deps/openssl/config/archs/aix64-gcc/asm/configdata.pm
index a91a3c0878..11958ce68b 100644
--- a/deps/openssl/config/archs/aix64-gcc/asm/configdata.pm
+++ b/deps/openssl/config/archs/aix64-gcc/asm/configdata.pm
@@ -54,7 +54,7 @@ our %config = (
   minor => "1.1",
   openssl_algorithm_defines => [ "OPENSSL_NO_COMP", "OPENSSL_NO_MD2", "OPENSSL_NO_RC5" ],
   openssl_api_defines => [  ],
-  openssl_other_defines => [ "OPENSSL_RAND_SEED_OS", "OPENSSL_NO_AFALGENG", "OPENSSL_NO_ASAN", "OPENSSL_NO_CRYPTO_MDEBUG", "OPENSSL_NO_CRYPTO_MDEBUG_BACKTRACE", "OPENSSL_NO_DEVCRYPTOENG", "OPENSSL_NO_EC_NISTP_64_GCC_128", "OPENSSL_NO_EGD", "OPENSSL_NO_EXTERNAL_TESTS", "OPENSSL_NO_FUZZ_AFL", "OPENSSL_NO_FUZZ_LIBFUZZER", "OPENSSL_NO_HEARTBEATS", "OPENSSL_NO_MSAN", "OPENSSL_NO_SCTP", "OPENSSL_NO_SSL3", "OPENSSL_NO_SSL3_METHOD", "OPENSSL_NO_UBSAN", "OPENSSL_NO_UNIT_TEST", "OPENSSL_NO_WEAK_SSL_CIPHERS", "OPENSSL_NO_DYNAMIC_ENGINE", "OPENSSL_NO_AFALGENG" ],
+  openssl_other_defines => [ "OPENSSL_RAND_SEED_OS", "OPENSSL_NO_AFALGENG", "OPENSSL_NO_ASAN", "OPENSSL_NO_CRYPTO_MDEBUG", "OPENSSL_NO_CRYPTO_MDEBUG_BACKTRACE", "OPENSSL_NO_DEVCRYPTOENG", "OPENSSL_NO_EC_NISTP_64_GCC_128", "OPENSSL_NO_EGD", "OPENSSL_NO_EXTERNAL_TESTS", "OPENSSL_NO_FUZZ_AFL", "OPENSSL_NO_FUZZ_LIBFUZZER", "OPENSSL_NO_HEARTBEATS", "OPENSSL_NO_MSAN", "OPENSSL_NO_SCTP", "OPENSSL_NO_SSL3", "OPENSSL_NO_SSL3_METHOD", "OPENSSL_NO_UBSAN", "OPENSSL_NO_UNIT_TEST", "OPENSSL_NO_WEAK_SSL_CIPHERS", "OPENSSL_NO_DYNAMIC_ENGINE" ],
   openssl_sys_defines => [ "OPENSSL_SYS_AIX" ],
   openssl_thread_defines => [ "OPENSSL_THREADS" ],
   openssldir => "",
@@ -110,8 +110,8 @@ our %config = (
   sourcedir => ".",
   target => "aix64-gcc",
   tdirs => [ "ossl_shim" ],
-  version => "1.1.1d",
-  version_num => "0x1010104fL",
+  version => "1.1.1e",
+  version_num => "0x1010105fL",
 );
 
 our %target = (
@@ -236,6 +236,7 @@ our @disablables = (
   "dgram",
   "dh",
   "dsa",
+  "dso",
   "dtls",
   "dynamic-engine",
   "ec",
@@ -353,8 +354,8 @@ our %unified_info = (
         {
             "" =>
                 [
-                    "crypto/include/internal/bn_conf.h",
-                    "crypto/include/internal/dso_conf.h",
+                    "include/crypto/bn_conf.h",
+                    "include/crypto/dso_conf.h",
                     "include/openssl/opensslconf.h",
                 ],
             "apps/asn1pars.o" =>
@@ -622,14 +623,6 @@ our %unified_info = (
                     "crypto/perlasm/cbc.pl",
                     "crypto/perlasm/x86asm.pl",
                 ],
-            "crypto/include/internal/bn_conf.h" =>
-                [
-                    "configdata.pm",
-                ],
-            "crypto/include/internal/dso_conf.h" =>
-                [
-                    "configdata.pm",
-                ],
             "crypto/rc4/rc4-586.s" =>
                 [
                     "crypto/perlasm/x86asm.pl",
@@ -705,6 +698,14 @@ our %unified_info = (
                 [
                     "libcrypto",
                 ],
+            "include/crypto/bn_conf.h" =>
+                [
+                    "configdata.pm",
+                ],
+            "include/crypto/dso_conf.h" =>
+                [
+                    "configdata.pm",
+                ],
             "include/openssl/opensslconf.h" =>
                 [
                     "configdata.pm",
@@ -1502,6 +1503,12 @@ our %unified_info = (
                     "libcrypto",
                     "test/libtestutil.a",
                 ],
+            "test/ssl_ctx_test" =>
+                [
+                    "libcrypto",
+                    "libssl",
+                    "test/libtestutil.a",
+                ],
             "test/ssl_test" =>
                 [
                     "libcrypto",
@@ -3236,7 +3243,6 @@ our %unified_info = (
                             "test/testutil/cb.o",
                             "test/testutil/driver.o",
                             "test/testutil/format_output.o",
-                            "test/testutil/init.o",
                             "test/testutil/main.o",
                             "test/testutil/output_helpers.o",
                             "test/testutil/random.o",
@@ -3244,6 +3250,7 @@ our %unified_info = (
                             "test/testutil/tap_bio.o",
                             "test/testutil/test_cleanup.o",
                             "test/testutil/tests.o",
+                            "test/testutil/testutil_init.o",
                         ],
                     "products" =>
                         {
@@ -3742,14 +3749,6 @@ our %unified_info = (
                 [
                     "crypto/ia64cpuid.S",
                 ],
-            "crypto/include/internal/bn_conf.h" =>
-                [
-                    "crypto/include/internal/bn_conf.h.in",
-                ],
-            "crypto/include/internal/dso_conf.h" =>
-                [
-                    "crypto/include/internal/dso_conf.h.in",
-                ],
             "crypto/md5/md5-586.s" =>
                 [
                     "crypto/md5/asm/md5-586.pl",
@@ -4190,6 +4189,14 @@ our %unified_info = (
                     "engines/asm/e_padlock-x86_64.pl",
                     "\$(PERLASM_SCHEME)",
                 ],
+            "include/crypto/bn_conf.h" =>
+                [
+                    "include/crypto/bn_conf.h.in",
+                ],
+            "include/crypto/dso_conf.h" =>
+                [
+                    "include/crypto/dso_conf.h.in",
+                ],
             "include/openssl/opensslconf.h" =>
                 [
                     "include/openssl/opensslconf.h.in",
@@ -4876,7 +4883,6 @@ our %unified_info = (
             "crypto/aes/aes-ppc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/aes/aes-s390x.o" =>
@@ -4890,49 +4896,41 @@ our %unified_info = (
             "crypto/aes/aes_cbc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/aes/aes_cfb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/aes/aes_core.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/aes/aes_ecb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/aes/aes_ige.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/aes/aes_misc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/aes/aes_ofb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/aes/aes_wrap.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/aes/aesfx-sparcv9.o" =>
@@ -4942,7 +4940,6 @@ our %unified_info = (
             "crypto/aes/aesp8-ppc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/aes/aest4-sparcv9.o" =>
@@ -4960,13 +4957,11 @@ our %unified_info = (
             "crypto/aes/vpaes-ppc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/aria/aria.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/arm64cpuid.o" =>
@@ -4980,613 +4975,511 @@ our %unified_info = (
             "crypto/asn1/a_bitstr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_d2i_fp.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_digest.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_dup.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_gentm.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_i2d_fp.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_int.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_mbstr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_object.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_octet.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_print.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_sign.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_strex.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_strnid.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_time.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_type.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_utctm.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_utf8.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_verify.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/ameth_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/asn1_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/asn1_gen.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/asn1_item_list.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/asn1_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/asn1_par.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/asn_mime.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/asn_moid.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/asn_mstbl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/asn_pack.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/bio_asn1.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/bio_ndef.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/d2i_pr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/d2i_pu.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/evp_asn1.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/f_int.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/f_string.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/i2d_pr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/i2d_pu.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/n_pkey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/nsseq.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/p5_pbe.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/p5_pbev2.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/p5_scrypt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/p8_pkey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/t_bitst.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/t_pkey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/t_spki.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/tasn_dec.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/tasn_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/tasn_fre.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/tasn_new.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/tasn_prn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/tasn_scn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/tasn_typ.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/tasn_utl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/x_algor.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/x_bignum.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/x_info.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/x_int64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/x_long.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/x_pkey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/x_sig.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/x_spki.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/x_val.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/async/arch/async_null.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/async/arch/async_posix.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/async/arch/async_win.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/async/async.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/async/async_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/async/async_wait.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bf/bf_cfb64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bf/bf_ecb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bf/bf_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bf/bf_ofb64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bf/bf_skey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/b_addr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/b_dump.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/b_print.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/b_sock.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/b_sock2.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bf_buff.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bf_lbuf.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bf_nbio.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bf_null.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bio_cb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bio_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bio_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bio_meth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bss_acpt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bss_bio.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bss_conn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bss_dgram.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bss_fd.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bss_file.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bss_log.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bss_mem.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bss_null.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bss_sock.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/blake2/blake2b.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/blake2/blake2s.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/blake2/m_blake2b.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/blake2/m_blake2s.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/armv4-gf2m.o" =>
@@ -5604,188 +5497,157 @@ our %unified_info = (
             "crypto/bn/bn-ppc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_add.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_blind.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_const.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_ctx.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_depr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_dh.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_div.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_exp.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto",
                 ],
             "crypto/bn/bn_exp2.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_gcd.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_gf2m.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_intern.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_kron.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_mod.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_mont.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_mpi.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_mul.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_nist.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_prime.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_print.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_rand.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_recp.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_shift.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_sqr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_sqrt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_srp.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_word.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_x931p.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/mips-mont.o" =>
@@ -5795,7 +5657,6 @@ our %unified_info = (
             "crypto/bn/ppc-mont.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/sparct4-mont.o" =>
@@ -5821,13 +5682,11 @@ our %unified_info = (
             "crypto/buffer/buf_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/buffer/buffer.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/buildinf.h" =>
@@ -5837,43 +5696,36 @@ our %unified_info = (
             "crypto/camellia/camellia.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/camellia/cmll_cbc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/camellia/cmll_cfb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/camellia/cmll_ctr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/camellia/cmll_ecb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/camellia/cmll_misc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/camellia/cmll_ofb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/camellia/cmllt4-sparcv9.o" =>
@@ -5883,31 +5735,26 @@ our %unified_info = (
             "crypto/cast/c_cfb64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cast/c_ecb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cast/c_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cast/c_ofb64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cast/c_skey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/chacha/chacha-armv4.o" =>
@@ -5921,7 +5768,6 @@ our %unified_info = (
             "crypto/chacha/chacha-ppc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/chacha/chacha-s390x.o" =>
@@ -5931,272 +5777,227 @@ our %unified_info = (
             "crypto/cmac/cm_ameth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cmac/cm_pmeth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cmac/cmac.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_asn1.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_att.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_cd.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_dd.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_env.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_ess.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_io.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_kari.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_pwri.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_sd.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_smime.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/conf/conf_api.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/conf/conf_def.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/conf/conf_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/conf/conf_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/conf/conf_mall.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/conf/conf_mod.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/conf/conf_sap.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/conf/conf_ssl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cpt_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cryptlib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ct/ct_b64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ct/ct_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ct/ct_log.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ct/ct_oct.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ct/ct_policy.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ct/ct_prn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ct/ct_sct.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ct/ct_sct_ctx.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ct/ct_vfy.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ct/ct_x509v3.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ctype.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cversion.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto",
                 ],
             "crypto/des/cbc_cksm.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/cbc_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/cfb64ede.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/cfb64enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/cfb_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/des_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/dest4-sparcv9.o" =>
@@ -6206,301 +6007,251 @@ our %unified_info = (
             "crypto/des/ecb3_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/ecb_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/fcrypt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/fcrypt_b.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/ofb64ede.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/ofb64enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/ofb_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/pcbc_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/qud_cksm.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/rand_key.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/set_key.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/str2key.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/xcbc_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_ameth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_asn1.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_check.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_depr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_gen.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_kdf.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_key.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_meth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_pmeth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_prn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_rfc5114.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_rfc7919.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dsa/dsa_ameth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dsa/dsa_asn1.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dsa/dsa_depr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dsa/dsa_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dsa/dsa_gen.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dsa/dsa_key.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dsa/dsa_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dsa/dsa_meth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dsa/dsa_ossl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dsa/dsa_pmeth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dsa/dsa_prn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dsa/dsa_sign.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dsa/dsa_vrf.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dso/dso_dl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dso/dso_dlfcn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dso/dso_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dso/dso_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dso/dso_openssl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dso/dso_vms.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dso/dso_win32.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ebcdic.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/curve25519.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/curve448/arch_32/f_impl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto/ec/curve448/arch_32",
                     "crypto/ec/curve448",
@@ -6508,7 +6259,6 @@ our %unified_info = (
             "crypto/ec/curve448/curve448.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto/ec/curve448/arch_32",
                     "crypto/ec/curve448",
@@ -6516,7 +6266,6 @@ our %unified_info = (
             "crypto/ec/curve448/curve448_tables.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto/ec/curve448/arch_32",
                     "crypto/ec/curve448",
@@ -6524,7 +6273,6 @@ our %unified_info = (
             "crypto/ec/curve448/eddsa.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto/ec/curve448/arch_32",
                     "crypto/ec/curve448",
@@ -6532,7 +6280,6 @@ our %unified_info = (
             "crypto/ec/curve448/f_generic.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto/ec/curve448/arch_32",
                     "crypto/ec/curve448",
@@ -6540,7 +6287,6 @@ our %unified_info = (
             "crypto/ec/curve448/scalar.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto/ec/curve448/arch_32",
                     "crypto/ec/curve448",
@@ -6548,163 +6294,136 @@ our %unified_info = (
             "crypto/ec/ec2_oct.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec2_smpl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec_ameth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec_asn1.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec_check.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec_curve.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec_cvt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec_key.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec_kmeth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec_mult.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec_oct.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec_pmeth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec_print.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecdh_kdf.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecdh_ossl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecdsa_ossl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecdsa_sign.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecdsa_vrf.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/eck_prn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecp_mont.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecp_nist.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecp_nistp224.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecp_nistp256.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecp_nistp521.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecp_nistputil.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecp_nistz256-armv4.o" =>
@@ -6718,7 +6437,6 @@ our %unified_info = (
             "crypto/ec/ecp_nistz256-ppc64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecp_nistz256-sparcv9.o" =>
@@ -6728,235 +6446,196 @@ our %unified_info = (
             "crypto/ec/ecp_nistz256.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecp_oct.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecp_smpl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecx_meth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/x25519-ppc64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/eng_all.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/eng_cnf.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/eng_ctrl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/eng_dyn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/eng_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/eng_fat.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/eng_init.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/eng_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/eng_list.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/eng_openssl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/eng_pkey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/eng_rdrand.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/eng_table.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/tb_asnmth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/tb_cipher.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/tb_dh.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/tb_digest.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/tb_dsa.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/tb_eckey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/tb_pkmeth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/tb_rand.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/tb_rsa.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/err/err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/err/err_all.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/err/err_prn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/bio_b64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/bio_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/bio_md.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/bio_ok.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/c_allc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/c_alld.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/cmeth_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/digest.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/e_aes.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto",
                     "crypto/modes",
@@ -6964,21 +6643,18 @@ our %unified_info = (
             "crypto/evp/e_aes_cbc_hmac_sha1.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto/modes",
                 ],
             "crypto/evp/e_aes_cbc_hmac_sha256.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto/modes",
                 ],
             "crypto/evp/e_aria.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto",
                     "crypto/modes",
@@ -6986,13 +6662,11 @@ our %unified_info = (
             "crypto/evp/e_bf.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/e_camellia.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto",
                     "crypto/modes",
@@ -7000,81 +6674,68 @@ our %unified_info = (
             "crypto/evp/e_cast.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/e_chacha20_poly1305.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/e_des.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto",
                 ],
             "crypto/evp/e_des3.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto",
                 ],
             "crypto/evp/e_idea.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/e_null.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/e_old.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/e_rc2.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/e_rc4.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/e_rc4_hmac_md5.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/e_rc5.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/e_seed.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/e_sm4.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto",
                     "crypto/modes",
@@ -7082,328 +6743,267 @@ our %unified_info = (
             "crypto/evp/e_xcbc_d.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/encode.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/evp_cnf.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/evp_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/evp_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/evp_key.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/evp_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/evp_pbe.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/evp_pkey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/m_md2.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/m_md4.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/m_md5.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/m_md5_sha1.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/m_mdc2.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/m_null.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/m_ripemd.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/m_sha1.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/m_sha3.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto",
                 ],
             "crypto/evp/m_sigver.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/m_wp.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/names.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/p5_crpt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/p5_crpt2.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/p_dec.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/p_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/p_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/p_open.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/p_seal.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/p_sign.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/p_verify.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/pbe_scrypt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/pmeth_fn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/pmeth_gn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/pmeth_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ex_data.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/getenv.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/hmac/hm_ameth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/hmac/hm_pmeth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/hmac/hmac.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/idea/i_cbc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/idea/i_cfb64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/idea/i_ecb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/idea/i_ofb64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/idea/i_skey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
-            "crypto/include/internal/bn_conf.h" =>
-                [
-                    ".",
-                ],
-            "crypto/include/internal/dso_conf.h" =>
-                [
-                    ".",
-                ],
             "crypto/init.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/kdf/hkdf.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/kdf/kdf_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/kdf/scrypt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/kdf/tls1_prf.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/lhash/lh_stats.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/lhash/lhash.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/md4/md4_dgst.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/md4/md4_one.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/md5/md5-sparcv9.o" =>
@@ -7413,79 +7013,66 @@ our %unified_info = (
             "crypto/md5/md5_dgst.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/md5/md5_one.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/mdc2/mdc2_one.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/mdc2/mdc2dgst.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/mem.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/mem_dbg.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/mem_sec.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/modes/cbc128.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/modes/ccm128.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/modes/cfb128.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/modes/ctr128.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/modes/cts128.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/modes/gcm128.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto",
                 ],
@@ -7504,7 +7091,6 @@ our %unified_info = (
             "crypto/modes/ghashp8-ppc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/modes/ghashv8-armx.o" =>
@@ -7514,361 +7100,301 @@ our %unified_info = (
             "crypto/modes/ocb128.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/modes/ofb128.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/modes/wrap128.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/modes/xts128.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/o_dir.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/o_fips.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/o_fopen.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/o_init.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/o_str.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/o_time.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/objects/o_names.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/objects/obj_dat.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/objects/obj_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/objects/obj_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/objects/obj_xref.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ocsp/ocsp_asn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ocsp/ocsp_cl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ocsp/ocsp_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ocsp/ocsp_ext.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ocsp/ocsp_ht.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ocsp/ocsp_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ocsp/ocsp_prn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ocsp/ocsp_srv.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ocsp/ocsp_vfy.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ocsp/v3_ocsp.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pem/pem_all.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pem/pem_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pem/pem_info.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pem/pem_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pem/pem_oth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pem/pem_pk8.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pem/pem_pkey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pem/pem_sign.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pem/pem_x509.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pem/pem_xaux.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pem/pvkfmt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_add.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_asn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_attr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_crpt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_crt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_decr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_init.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_key.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_kiss.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_mutl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_npas.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_p8d.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_p8e.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_sbag.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_utl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/pk12err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs7/bio_pk7.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs7/pk7_asn1.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs7/pk7_attr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs7/pk7_doit.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs7/pk7_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs7/pk7_mime.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs7/pk7_smime.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs7/pkcs7err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/poly1305/poly1305-armv4.o" =>
@@ -7886,13 +7412,11 @@ our %unified_info = (
             "crypto/poly1305/poly1305-ppc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/poly1305/poly1305-ppcfp.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/poly1305/poly1305-sparcv9.o" =>
@@ -7902,271 +7426,226 @@ our %unified_info = (
             "crypto/poly1305/poly1305.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/poly1305/poly1305_ameth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/poly1305/poly1305_pmeth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ppccap.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ppccpuid.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rand/drbg_ctr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rand/drbg_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rand/rand_egd.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rand/rand_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rand/rand_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rand/rand_unix.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rand/rand_vms.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rand/rand_win.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rand/randfile.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rc2/rc2_cbc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rc2/rc2_ecb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rc2/rc2_skey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rc2/rc2cfb64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rc2/rc2ofb64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rc4/rc4_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rc4/rc4_skey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ripemd/rmd_dgst.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ripemd/rmd_one.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_ameth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_asn1.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_chk.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_crpt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_depr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_gen.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_meth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_mp.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_none.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_oaep.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_ossl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_pk1.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_pmeth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_prn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_pss.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_saos.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_sign.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_ssl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_x931.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_x931g.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/s390xcpuid.o" =>
@@ -8176,31 +7655,26 @@ our %unified_info = (
             "crypto/seed/seed.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/seed/seed_cbc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/seed/seed_cfb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/seed/seed_ecb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/seed/seed_ofb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sha/keccak1600-armv4.o" =>
@@ -8210,7 +7684,6 @@ our %unified_info = (
             "crypto/sha/keccak1600-ppc64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sha/sha1-armv4-large.o" =>
@@ -8228,7 +7701,6 @@ our %unified_info = (
             "crypto/sha/sha1-ppc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sha/sha1-s390x.o" =>
@@ -8242,13 +7714,11 @@ our %unified_info = (
             "crypto/sha/sha1_one.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sha/sha1dgst.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sha/sha256-armv4.o" =>
@@ -8266,7 +7736,6 @@ our %unified_info = (
             "crypto/sha/sha256-ppc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sha/sha256-s390x.o" =>
@@ -8280,13 +7749,11 @@ our %unified_info = (
             "crypto/sha/sha256.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sha/sha256p8-ppc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sha/sha512-armv4.o" =>
@@ -8304,7 +7771,6 @@ our %unified_info = (
             "crypto/sha/sha512-ppc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sha/sha512-s390x.o" =>
@@ -8318,715 +7784,596 @@ our %unified_info = (
             "crypto/sha/sha512.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sha/sha512p8-ppc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/siphash/siphash.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/siphash/siphash_ameth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/siphash/siphash_pmeth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sm2/sm2_crypt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sm2/sm2_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sm2/sm2_pmeth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sm2/sm2_sign.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sm3/m_sm3.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sm3/sm3.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sm4/sm4.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/srp/srp_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/srp/srp_vfy.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/stack/stack.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/store/loader_file.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/store/store_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/store/store_init.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/store/store_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/store/store_register.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/store/store_strings.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/threads_none.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/threads_pthread.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/threads_win.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ts/ts_asn1.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ts/ts_conf.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ts/ts_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ts/ts_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ts/ts_req_print.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ts/ts_req_utils.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ts/ts_rsp_print.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ts/ts_rsp_sign.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ts/ts_rsp_utils.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ts/ts_rsp_verify.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ts/ts_verify_ctx.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/txt_db/txt_db.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ui/ui_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ui/ui_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ui/ui_null.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ui/ui_openssl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ui/ui_util.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/uid.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/whrlpool/wp_block.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/whrlpool/wp_dgst.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/by_dir.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/by_file.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/t_crl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/t_req.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/t_x509.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_att.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_cmp.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_d2.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_def.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_ext.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_lu.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_meth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_obj.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_r2x.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_req.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_set.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_trs.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_txt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_v3.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_vfy.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_vpm.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509cset.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509name.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509rset.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509spki.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509type.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x_all.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x_attrib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x_crl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x_exten.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x_name.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x_pubkey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x_req.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x_x509.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x_x509a.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/pcy_cache.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/pcy_data.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/pcy_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/pcy_map.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/pcy_node.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/pcy_tree.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_addr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_admis.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_akey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_akeya.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_alt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_asid.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_bcons.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_bitst.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_conf.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_cpols.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_crld.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_enum.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_extku.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_genn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_ia5.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_info.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_int.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_ncons.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_pci.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_pcia.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_pcons.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_pku.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_pmaps.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_prn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_purp.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_skey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_sxnet.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_tlsf.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_utl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "engines/e_capi.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "engines/e_padlock.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "fuzz/asn1.o" =>
@@ -9077,6 +8424,14 @@ our %unified_info = (
                 [
                     "include",
                 ],
+            "include/crypto/bn_conf.h" =>
+                [
+                    ".",
+                ],
+            "include/crypto/dso_conf.h" =>
+                [
+                    ".",
+                ],
             "include/openssl/opensslconf.h" =>
                 [
                     ".",
@@ -9321,7 +8676,6 @@ our %unified_info = (
                 [
                     ".",
                     "include",
-                    "crypto/include",
                 ],
             "test/asn1_string_table_test.o" =>
                 [
@@ -9647,7 +9001,6 @@ our %unified_info = (
                 [
                     ".",
                     "include",
-                    "crypto/include",
                 ],
             "test/cipher_overhead_test.o" =>
                 [
@@ -9693,7 +9046,6 @@ our %unified_info = (
             "test/ctype_internal_test.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "test/curve448_internal_test.o" =>
@@ -9759,7 +9111,6 @@ our %unified_info = (
                 [
                     "include",
                     "crypto/ec",
-                    "crypto/include",
                 ],
             "test/ecdsatest.o" =>
                 [
@@ -9784,7 +9135,6 @@ our %unified_info = (
             "test/evp_extra_test.o" =>
                 [
                     "include",
-                    "crypto/include",
                 ],
             "test/evp_test.o" =>
                 [
@@ -9882,7 +9232,6 @@ our %unified_info = (
                 [
                     ".",
                     "include",
-                    "crypto/include",
                 ],
             "test/rc2test.o" =>
                 [
@@ -9932,18 +9281,15 @@ our %unified_info = (
                 [
                     ".",
                     "include",
-                    "crypto/include",
                 ],
             "test/sm2_internal_test.o" =>
                 [
                     "include",
-                    "crypto/include",
                 ],
             "test/sm4_internal_test.o" =>
                 [
                     ".",
                     "include",
-                    "crypto/include",
                 ],
             "test/srptest.o" =>
                 [
@@ -9954,6 +9300,10 @@ our %unified_info = (
                     ".",
                     "include",
                 ],
+            "test/ssl_ctx_test.o" =>
+                [
+                    "include",
+                ],
             "test/ssl_test.o" =>
                 [
                     "include",
@@ -10017,10 +9367,6 @@ our %unified_info = (
                 [
                     "include",
                 ],
-            "test/testutil/init.o" =>
-                [
-                    "include",
-                ],
             "test/testutil/main.o" =>
                 [
                     "include",
@@ -10049,6 +9395,10 @@ our %unified_info = (
                 [
                     "include",
                 ],
+            "test/testutil/testutil_init.o" =>
+                [
+                    "include",
+                ],
             "test/threadstest.o" =>
                 [
                     "include",
@@ -10313,6 +9663,7 @@ our %unified_info = (
             "test/sm4_internal_test",
             "test/srptest",
             "test/ssl_cert_table_internal_test",
+            "test/ssl_ctx_test",
             "test/ssl_test",
             "test/ssl_test_ctx_test",
             "test/sslapitest",
@@ -15283,7 +14634,6 @@ our %unified_info = (
                     "test/testutil/cb.o",
                     "test/testutil/driver.o",
                     "test/testutil/format_output.o",
-                    "test/testutil/init.o",
                     "test/testutil/main.o",
                     "test/testutil/output_helpers.o",
                     "test/testutil/random.o",
@@ -15291,6 +14641,7 @@ our %unified_info = (
                     "test/testutil/tap_bio.o",
                     "test/testutil/test_cleanup.o",
                     "test/testutil/tests.o",
+                    "test/testutil/testutil_init.o",
                 ],
             "test/md2test" =>
                 [
@@ -15518,6 +14869,14 @@ our %unified_info = (
                 [
                     "test/ssl_cert_table_internal_test.c",
                 ],
+            "test/ssl_ctx_test" =>
+                [
+                    "test/ssl_ctx_test.o",
+                ],
+            "test/ssl_ctx_test.o" =>
+                [
+                    "test/ssl_ctx_test.c",
+                ],
             "test/ssl_test" =>
                 [
                     "test/handshake_helper.o",
@@ -15620,10 +14979,6 @@ our %unified_info = (
                 [
                     "test/testutil/format_output.c",
                 ],
-            "test/testutil/init.o" =>
-                [
-                    "test/testutil/init.c",
-                ],
             "test/testutil/main.o" =>
                 [
                     "test/testutil/main.c",
@@ -15652,6 +15007,10 @@ our %unified_info = (
                 [
                     "test/testutil/tests.c",
                 ],
+            "test/testutil/testutil_init.o" =>
+                [
+                    "test/testutil/testutil_init.c",
+                ],
             "test/threadstest" =>
                 [
                     "test/threadstest.o",
diff --git a/deps/openssl/config/archs/aix64-gcc/asm/crypto/bn/ppc64-mont.s b/deps/openssl/config/archs/aix64-gcc/asm/crypto/bn/ppc64-mont.s
deleted file mode 100644
index 96ef2a9ea7..0000000000
--- a/deps/openssl/config/archs/aix64-gcc/asm/crypto/bn/ppc64-mont.s
+++ /dev/null
@@ -1,745 +0,0 @@
-.machine	"any"
-.csect	.text[PR],7
-
-.globl	.bn_mul_mont_fpu64
-.align	5
-.bn_mul_mont_fpu64:
-	cmpwi	8,3
-	mr	9,3
-	li	3,0
-	bclr	14,0
-	andi.	0,8,1
-	bclr	6,2
-
-	slwi	8,8,3
-	li	12,-4096
-	slwi	10,8,2
-	add	10,10,8
-	addi	10,10,552
-	subf	10,10,1
-	and	10,10,12
-	subf	10,1,10
-	mr	12,1
-	stdux	1,1,10
-
-	std	19,-200(12)
-	std	20,-192(12)
-	std	21,-184(12)
-	std	22,-176(12)
-	std	23,-168(12)
-	std	24,-160(12)
-	std	25,-152(12)
-	std	26,-144(12)
-	std	27,-136(12)
-	std	28,-128(12)
-	std	29,-120(12)
-	std	30,-112(12)
-	std	31,-104(12)
-	stfd	20,-96(12)
-	stfd	21,-88(12)
-	stfd	22,-80(12)
-	stfd	23,-72(12)
-	stfd	24,-64(12)
-	stfd	25,-56(12)
-	stfd	26,-48(12)
-	stfd	27,-40(12)
-	stfd	28,-32(12)
-	stfd	29,-24(12)
-	stfd	30,-16(12)
-	stfd	31,-8(12)
-
-	addi	10,1,264
-	li	12,-64
-	add	22,10,8
-	and	22,22,12
-
-	addi	22,22,-8
-	srwi	11,8,4
-	addi	11,11,-1
-	addi	10,1,184
-	li	0,0
-	mtctr	11
-	ld	23,0(4)
-	ld	27,0(5)
-	ld	7,0(7)
-
-	mulld	31,23,27
-
-	rldicl	24,27,0,48
-	rldicl	25,27,48,48
-	rldicl	26,27,32,48
-	rldicl	27,27,16,48
-	std	24,64(1)
-	std	25,72(1)
-	std	26,80(1)
-	std	27,88(1)
-
-	mulld	31,31,7
-
-	rldicl	28,31,0,48
-	rldicl	29,31,48,48
-	rldicl	30,31,32,48
-	rldicl	31,31,16,48
-	std	28,96(1)
-	std	29,104(1)
-	std	30,112(1)
-	std	31,120(1)
-
-	rldicl	24,23,0,32
-	rldicl	25,23,32,32
-	lwz	26,12(4)
-	lwz	27,8(4)
-	lwz	28,4(6)
-	lwz	29,0(6)
-	lwz	30,12(6)
-	lwz	31,8(6)
-	lfd	0,64(1)
-	lfd	1,72(1)
-	lfd	2,80(1)
-	lfd	3,88(1)
-	lfd	4,96(1)
-	lfd	5,104(1)
-	lfd	6,112(1)
-	lfd	7,120(1)
-	std	24,128(1)
-	std	25,136(1)
-	std	26,144(1)
-	std	27,152(1)
-	std	28,160(1)
-	std	29,168(1)
-	std	30,176(1)
-	std	31,184(1)
-	fcfid	0,0
-	fcfid	1,1
-	fcfid	2,2
-	fcfid	3,3
-	fcfid	4,4
-	fcfid	5,5
-	fcfid	6,6
-	fcfid	7,7
-
-	lfd	10,128(1)
-	lfd	11,136(1)
-	lfd	12,144(1)
-	lfd	13,152(1)
-	lfd	20,160(1)
-	lfd	21,168(1)
-	lfd	22,176(1)
-	lfd	23,184(1)
-	fcfid	10,10
-	fcfid	11,11
-	fcfid	12,12
-	fcfid	13,13
-	fcfid	20,20
-	fcfid	21,21
-	fcfid	22,22
-	fcfid	23,23
-	addi	4,4,16
-	addi	6,6,16
-
-	fmul	26,11,0
-	fmul	27,11,1
-	stfd	10,8(22)
-	stfd	11,16(22)
-	fmul	28,12,0
-	fmul	29,12,1
-	stfd	12,24(22)
-	stfd	13,32(22)
-	fmul	30,13,0
-	fmul	31,13,1
-	stfd	20,40(22)
-	stfd	21,48(22)
-	fmul	24,10,0
-	fmul	25,10,1
-	stfd	22,56(22)
-	stfdu	23,64(22)
-
-	fmadd	26,10,2,26
-	fmadd	27,10,3,27
-	fmadd	28,11,2,28
-	fmadd	29,11,3,29
-	fmadd	30,12,2,30
-	fmadd	31,12,3,31
-	fmul	8,13,2
-	fmul	9,13,3
-
-	fmadd	26,21,4,26
-	fmadd	27,21,5,27
-	fmadd	28,22,4,28
-	fmadd	29,22,5,29
-	fmadd	30,23,4,30
-	fmadd	31,23,5,31
-	fmadd	24,20,4,24
-	fmadd	25,20,5,25
-
-	fmadd	26,20,6,26
-	fmadd	27,20,7,27
-	fmadd	28,21,6,28
-	fmadd	29,21,7,29
-	fmadd	30,22,6,30
-	fmadd	31,22,7,31
-	fmadd	8,23,6,8
-	fmadd	9,23,7,9
-
-	fctid	24,24
-	fctid	25,25
-	fctid	26,26
-	fctid	27,27
-	fctid	28,28
-	fctid	29,29
-	fctid	30,30
-	fctid	31,31
-
-	stfd	24,64(1)
-	stfd	25,72(1)
-	stfd	26,80(1)
-	stfd	27,88(1)
-	stfd	28,96(1)
-	stfd	29,104(1)
-	stfd	30,112(1)
-	stfd	31,120(1)
-
-.align	5
-L1st:
-	lwz	24,4(4)
-	lwz	25,0(4)
-	lwz	26,12(4)
-	lwz	27,8(4)
-	lwz	28,4(6)
-	lwz	29,0(6)
-	lwz	30,12(6)
-	lwz	31,8(6)
-	std	24,128(1)
-	std	25,136(1)
-	std	26,144(1)
-	std	27,152(1)
-	std	28,160(1)
-	std	29,168(1)
-	std	30,176(1)
-	std	31,184(1)
-	ld	24,64(1)
-	ld	25,72(1)
-	ld	26,80(1)
-	ld	27,88(1)
-	ld	28,96(1)
-	ld	29,104(1)
-	ld	30,112(1)
-	ld	31,120(1)
-	lfd	10,128(1)
-	lfd	11,136(1)
-	lfd	12,144(1)
-	lfd	13,152(1)
-	lfd	20,160(1)
-	lfd	21,168(1)
-	lfd	22,176(1)
-	lfd	23,184(1)
-	fcfid	10,10
-	fcfid	11,11
-	fcfid	12,12
-	fcfid	13,13
-	fcfid	20,20
-	fcfid	21,21
-	fcfid	22,22
-	fcfid	23,23
-	addi	4,4,16
-	addi	6,6,16
-
-	fmul	26,11,0
-	fmul	27,11,1
-	fmul	28,12,0
-	fmul	29,12,1
-	stfd	10,8(22)
-	stfd	11,16(22)
-	fmul	30,13,0
-	fmul	31,13,1
-	fmadd	24,10,0,8
-	fmadd	25,10,1,9
-	stfd	12,24(22)
-	stfd	13,32(22)
-	fmadd	26,10,2,26
-	fmadd	27,10,3,27
-	fmadd	28,11,2,28
-	fmadd	29,11,3,29
-	stfd	20,40(22)
-	stfd	21,48(22)
-	fmadd	30,12,2,30
-	fmadd	31,12,3,31
-	add	24,24,0
-	fmul	8,13,2
-	fmul	9,13,3
-	stfd	22,56(22)
-	stfdu	23,64(22)
-	srdi	0,24,16
-	add	25,25,0
-	srdi	0,25,16
-
-	fmadd	26,21,4,26
-	fmadd	27,21,5,27
-	insrdi	24,25,16,32
-	fmadd	28,22,4,28
-	fmadd	29,22,5,29
-	add	26,26,0
-	fmadd	30,23,4,30
-	fmadd	31,23,5,31
-	srdi	0,26,16
-	fmadd	24,20,4,24
-	fmadd	25,20,5,25
-	insrdi	24,26,16,16
-	add	27,27,0
-	srdi	0,27,16
-
-	fmadd	26,20,6,26
-	fmadd	27,20,7,27
-	insrdi	24,27,16,0
-	fmadd	28,21,6,28
-	fmadd	29,21,7,29
-	add	28,28,0
-	fmadd	30,22,6,30
-	fmadd	31,22,7,31
-	srdi	0,28,16
-	fmadd	8,23,6,8
-	fmadd	9,23,7,9
-	add	29,29,0
-	srdi	0,29,16
-	insrdi	28,29,16,32
-
-	fctid	24,24
-	fctid	25,25
-	add	30,30,0
-	fctid	26,26
-	fctid	27,27
-	srdi	0,30,16
-	fctid	28,28
-	fctid	29,29
-	insrdi	28,30,16,16
-	fctid	30,30
-	fctid	31,31
-	add	31,31,0
-	insrdi	28,31,16,0
-	srdi	0,31,16
-
-	stfd	24,64(1)
-	stfd	25,72(1)
-	stfd	26,80(1)
-	stfd	27,88(1)
-	stfd	28,96(1)
-	stfd	29,104(1)
-	stfd	30,112(1)
-	stfd	31,120(1)
-	std	24,8(10)
-	stdu	28,16(10)
-	bc	16,0,L1st
-
-	fctid	8,8
-	fctid	9,9
-	ld	24,64(1)
-	ld	25,72(1)
-	ld	26,80(1)
-	ld	27,88(1)
-	ld	28,96(1)
-	ld	29,104(1)
-	ld	30,112(1)
-	ld	31,120(1)
-	stfd	8,128(1)
-	stfd	9,136(1)
-
-	add	24,24,0
-	srdi	0,24,16
-	add	25,25,0
-	srdi	0,25,16
-	insrdi	24,25,16,32
-	add	26,26,0
-	srdi	0,26,16
-	insrdi	24,26,16,16
-	add	27,27,0
-	srdi	0,27,16
-	insrdi	24,27,16,0
-	add	28,28,0
-	srdi	0,28,16
-	add	29,29,0
-	srdi	0,29,16
-	insrdi	28,29,16,32
-	add	30,30,0
-	srdi	0,30,16
-	insrdi	28,30,16,16
-	add	31,31,0
-	insrdi	28,31,16,0
-	srdi	0,31,16
-	ld	30,128(1)
-	ld	31,136(1)
-
-	std	24,8(10)
-	stdu	28,16(10)
-
-	add	30,30,0
-	srdi	0,30,16
-	add	31,31,0
-	insrdi	30,31,48,0
-	srdi	3,31,48
-	std	30,8(10)
-	slwi	31,8,2
-	subf	22,31,22
-
-	li	12,8
-.align	5
-Louter:
-	addi	10,1,192
-	li	0,0
-	mtctr	11
-	ldx	27,5,12
-
-	ld	30,200(1)
-	mulld	31,23,27
-	add	31,31,30
-
-	rldicl	24,27,0,48
-	rldicl	25,27,48,48
-	rldicl	26,27,32,48
-	rldicl	27,27,16,48
-	std	24,64(1)
-	std	25,72(1)
-	std	26,80(1)
-	std	27,88(1)
-
-	mulld	31,31,7
-
-	rldicl	28,31,0,48
-	rldicl	29,31,48,48
-	rldicl	30,31,32,48
-	rldicl	31,31,16,48
-	std	28,96(1)
-	std	29,104(1)
-	std	30,112(1)
-	std	31,120(1)
-	lfd	10,8(22)
-	lfd	11,16(22)
-	lfd	12,24(22)
-	lfd	13,32(22)
-	lfd	20,40(22)
-	lfd	21,48(22)
-	lfd	22,56(22)
-	lfdu	23,64(22)
-
-	lfd	0,64(1)
-	lfd	1,72(1)
-	lfd	2,80(1)
-	lfd	3,88(1)
-	lfd	4,96(1)
-	lfd	5,104(1)
-	lfd	6,112(1)
-	lfd	7,120(1)
-
-	fcfid	0,0
-	fcfid	1,1
-	fcfid	2,2
-	fcfid	3,3
-	fcfid	4,4
-	fcfid	5,5
-	fcfid	6,6
-	fcfid	7,7
-
-	fmul	26,11,0
-	fmul	27,11,1
-	fmul	28,12,0
-	fmul	29,12,1
-	fmul	30,13,0
-	fmul	31,13,1
-	fmul	24,10,0
-	fmul	25,10,1
-
-	fmadd	26,10,2,26
-	fmadd	27,10,3,27
-	fmadd	28,11,2,28
-	fmadd	29,11,3,29
-	fmadd	30,12,2,30
-	fmadd	31,12,3,31
-	fmul	8,13,2
-	fmul	9,13,3
-
-	fmadd	26,21,4,26
-	fmadd	27,21,5,27
-	lfd	10,8(22)
-	lfd	11,16(22)
-	fmadd	28,22,4,28
-	fmadd	29,22,5,29
-	lfd	12,24(22)
-	lfd	13,32(22)
-	fmadd	30,23,4,30
-	fmadd	31,23,5,31
-	fmadd	24,20,4,24
-	fmadd	25,20,5,25
-
-	fmadd	26,20,6,26
-	fmadd	27,20,7,27
-	fmadd	28,21,6,28
-	fmadd	29,21,7,29
-	fmadd	30,22,6,30
-	fmadd	31,22,7,31
-	fmadd	8,23,6,8
-	fmadd	9,23,7,9
-
-	fctid	24,24
-	fctid	25,25
-	fctid	26,26
-	fctid	27,27
-	fctid	28,28
-	fctid	29,29
-	fctid	30,30
-	fctid	31,31
-
-	stfd	24,64(1)
-	stfd	25,72(1)
-	stfd	26,80(1)
-	stfd	27,88(1)
-	stfd	28,96(1)
-	stfd	29,104(1)
-	stfd	30,112(1)
-	stfd	31,120(1)
-
-.align	5
-Linner:
-	fmul	26,11,0
-	fmul	27,11,1
-	fmul	28,12,0
-	fmul	29,12,1
-	lfd	20,40(22)
-	lfd	21,48(22)
-	fmul	30,13,0
-	fmul	31,13,1
-	fmadd	24,10,0,8
-	fmadd	25,10,1,9
-	lfd	22,56(22)
-	lfdu	23,64(22)
-
-	fmadd	26,10,2,26
-	fmadd	27,10,3,27
-	fmadd	28,11,2,28
-	fmadd	29,11,3,29
-	lfd	10,8(22)
-	lfd	11,16(22)
-	fmadd	30,12,2,30
-	fmadd	31,12,3,31
-	fmul	8,13,2
-	fmul	9,13,3
-	lfd	12,24(22)
-	lfd	13,32(22)
-	fmadd	26,21,4,26
-	fmadd	27,21,5,27
-	ld	24,64(1)
-	ld	25,72(1)
-	fmadd	28,22,4,28
-	fmadd	29,22,5,29
-	ld	26,80(1)
-	ld	27,88(1)
-	fmadd	30,23,4,30
-	fmadd	31,23,5,31
-	add	24,24,0
-	ld	28,96(1)
-	ld	29,104(1)
-	fmadd	24,20,4,24
-	fmadd	25,20,5,25
-	srdi	0,24,16
-	add	25,25,0
-	srdi	0,25,16
-	ld	30,112(1)
-	ld	31,120(1)
-
-	fmadd	26,20,6,26
-	fmadd	27,20,7,27
-	insrdi	24,25,16,32
-	ld	25,8(10)
-	fmadd	28,21,6,28
-	fmadd	29,21,7,29
-	add	26,26,0
-	fmadd	30,22,6,30
-	fmadd	31,22,7,31
-	srdi	0,26,16
-	insrdi	24,26,16,16
-	fmadd	8,23,6,8
-	fmadd	9,23,7,9
-	add	27,27,0
-	ldu	26,16(10)
-	srdi	0,27,16
-	insrdi	24,27,16,0
-	add	28,28,0
-
-	fctid	24,24
-	fctid	25,25
-	srdi	0,28,16
-	fctid	26,26
-	fctid	27,27
-	add	29,29,0
-	fctid	28,28
-	fctid	29,29
-	srdi	0,29,16
-	insrdi	28,29,16,32
-	fctid	30,30
-	fctid	31,31
-	add	30,30,0
-	srdi	0,30,16
-	insrdi	28,30,16,16
-
-	stfd	24,64(1)
-	stfd	25,72(1)
-	add	31,31,0
-	addc	27,24,25
-	stfd	26,80(1)
-	stfd	27,88(1)
-	insrdi	28,31,16,0
-	srdi	0,31,16
-	stfd	28,96(1)
-	stfd	29,104(1)
-	adde	29,28,26
-	stfd	30,112(1)
-	stfd	31,120(1)
-	addze	0,0
-	std	27,-16(10)
-	std	29,-8(10)
-	bc	16,0,Linner
-
-	fctid	8,8
-	fctid	9,9
-	ld	24,64(1)
-	ld	25,72(1)
-	ld	26,80(1)
-	ld	27,88(1)
-	ld	28,96(1)
-	ld	29,104(1)
-	ld	30,112(1)
-	ld	31,120(1)
-	stfd	8,128(1)
-	stfd	9,136(1)
-
-	add	24,24,0
-	srdi	0,24,16
-	add	25,25,0
-	srdi	0,25,16
-	insrdi	24,25,16,32
-	add	26,26,0
-	ld	25,8(10)
-	srdi	0,26,16
-	insrdi	24,26,16,16
-	add	27,27,0
-	ldu	26,16(10)
-	srdi	0,27,16
-	insrdi	24,27,16,0
-	add	28,28,0
-	srdi	0,28,16
-	add	29,29,0
-	srdi	0,29,16
-	insrdi	28,29,16,32
-	add	30,30,0
-	srdi	0,30,16
-	insrdi	28,30,16,16
-	add	31,31,0
-	insrdi	28,31,16,0
-	srdi	0,31,16
-	ld	30,128(1)
-	ld	31,136(1)
-
-	addc	27,24,25
-	adde	29,28,26
-	addze	0,0
-
-	std	27,-16(10)
-	std	29,-8(10)
-
-	add	0,0,3
-	add	30,30,0
-	srdi	0,30,16
-	add	31,31,0
-	insrdi	30,31,48,0
-	srdi	3,31,48
-	std	30,0(10)
-	slwi	31,8,2
-	addi	12,12,8
-	subf	22,31,22
-	cmpw	12,8
-	blt-	Louter
-	subf	6,8,6
-	addi	11,11,1
-	subfc	12,12,12
-	addi	10,1,200
-	addi	28,1,208
-	addi	29,6,8
-	addi	30,9,8
-	mtctr	11
-
-.align	4
-Lsub:	ldx	24,10,12
-	ldx	25,6,12
-	ldx	26,28,12
-	ldx	27,29,12
-	subfe	24,25,24
-	subfe	26,27,26
-	stdx	24,9,12
-	stdx	26,30,12
-	addi	12,12,16
-	bc	16,0,Lsub
-
-	li	12,0
-	subfe	3,12,3
-	mtctr	11
-
-.align	4
-Lcopy:
-	ldx	24,10,12
-	ldx	25,28,12
-	ldx	26,9,12
-	ldx	27,30,12
-	std	12,8(22)
-	std	12,16(22)
-	std	12,24(22)
-	std	12,32(22)
-	std	12,40(22)
-	std	12,48(22)
-	std	12,56(22)
-	stdu	12,64(22)
-	and	24,24,3
-	and	25,25,3
-	andc	26,26,3
-	andc	27,27,3
-	or	24,24,26
-	or	25,25,27
-	stdx	24,9,12
-	stdx	25,30,12
-	stdx	12,10,12
-	stdx	12,28,12
-	addi	12,12,16
-	bc	16,0,Lcopy
-	ld	12,0(1)
-	li	3,1
-	ld	19,-200(12)
-	ld	20,-192(12)
-	ld	21,-184(12)
-	ld	22,-176(12)
-	ld	23,-168(12)
-	ld	24,-160(12)
-	ld	25,-152(12)
-	ld	26,-144(12)
-	ld	27,-136(12)
-	ld	28,-128(12)
-	ld	29,-120(12)
-	ld	30,-112(12)
-	ld	31,-104(12)
-	lfd	20,-96(12)
-	lfd	21,-88(12)
-	lfd	22,-80(12)
-	lfd	23,-72(12)
-	lfd	24,-64(12)
-	lfd	25,-56(12)
-	lfd	26,-48(12)
-	lfd	27,-40(12)
-	lfd	28,-32(12)
-	lfd	29,-24(12)
-	lfd	30,-16(12)
-	lfd	31,-8(12)
-	mr	1,12
-	blr	
-.long	0
-.byte	0,12,4,0,0x8c,13,6,0
-.long	0
-
-
-.byte	77,111,110,116,103,111,109,101,114,121,32,77,117,108,116,105,112,108,105,99,97,116,105,111,110,32,102,111,114,32,80,80,67,54,52,44,32,67,82,89,80,84,79,71,65,77,83,32,98,121,32,60,97,112,112,114,111,64,111,112,101,110,115,115,108,46,111,114,103,62,0
-.align	2
diff --git a/deps/openssl/config/archs/aix64-gcc/asm/crypto/buildinf.h b/deps/openssl/config/archs/aix64-gcc/asm/crypto/buildinf.h
index 4ec1ec8283..a994547d9f 100644
--- a/deps/openssl/config/archs/aix64-gcc/asm/crypto/buildinf.h
+++ b/deps/openssl/config/archs/aix64-gcc/asm/crypto/buildinf.h
@@ -11,7 +11,7 @@
  */
 
 #define PLATFORM "platform: aix64-gcc"
-#define DATE "built on: Fri Sep 13 15:57:01 2019 UTC"
+#define DATE "built on: Wed Mar 18 21:04:38 2020 UTC"
 
 /*
  * Generate compiler_flags as an array of individual characters. This is a
diff --git a/deps/openssl/config/archs/aix64-gcc/asm/crypto/include/internal/bn_conf.h b/deps/openssl/config/archs/aix64-gcc/asm/crypto/include/internal/bn_conf.h
index 34bd8b78b4..5312ef5a7a 100644
--- a/deps/openssl/config/archs/aix64-gcc/asm/crypto/include/internal/bn_conf.h
+++ b/deps/openssl/config/archs/aix64-gcc/asm/crypto/include/internal/bn_conf.h
@@ -1,5 +1,5 @@
 /* WARNING: do not edit! */
-/* Generated by Makefile from crypto/include/internal/bn_conf.h.in */
+/* Generated by Makefile from include/crypto/bn_conf.h.in */
 /*
  * Copyright 2016 The OpenSSL Project Authors. All Rights Reserved.
  *
@@ -9,8 +9,8 @@
  * https://www.openssl.org/source/license.html
  */
 
-#ifndef HEADER_BN_CONF_H
-# define HEADER_BN_CONF_H
+#ifndef OSSL_CRYPTO_BN_CONF_H
+# define OSSL_CRYPTO_BN_CONF_H
 
 /*
  * The contents of this file are not used in the UEFI build, as
diff --git a/deps/openssl/config/archs/aix64-gcc/asm/crypto/include/internal/dso_conf.h b/deps/openssl/config/archs/aix64-gcc/asm/crypto/include/internal/dso_conf.h
index 252266ec2a..4b1167c3d8 100644
--- a/deps/openssl/config/archs/aix64-gcc/asm/crypto/include/internal/dso_conf.h
+++ b/deps/openssl/config/archs/aix64-gcc/asm/crypto/include/internal/dso_conf.h
@@ -1,5 +1,5 @@
 /* WARNING: do not edit! */
-/* Generated by Makefile from crypto/include/internal/dso_conf.h.in */
+/* Generated by Makefile from include/crypto/dso_conf.h.in */
 /*
  * Copyright 2016-2019 The OpenSSL Project Authors. All Rights Reserved.
  *
@@ -9,8 +9,8 @@
  * https://www.openssl.org/source/license.html
  */
 
-#ifndef HEADER_DSO_CONF_H
-# define HEADER_DSO_CONF_H
+#ifndef OSSL_CRYPTO_DSO_CONF_H
+# define OSSL_CRYPTO_DSO_CONF_H
 # define DSO_DLFCN
 # define HAVE_DLFCN_H
 # define DSO_EXTENSION ".so"
diff --git a/deps/openssl/config/archs/aix64-gcc/asm/include/openssl/opensslconf.h b/deps/openssl/config/archs/aix64-gcc/asm/include/openssl/opensslconf.h
index 23ac57c116..2ab0cdb917 100644
--- a/deps/openssl/config/archs/aix64-gcc/asm/include/openssl/opensslconf.h
+++ b/deps/openssl/config/archs/aix64-gcc/asm/include/openssl/opensslconf.h
@@ -99,9 +99,6 @@ extern "C" {
 #ifndef OPENSSL_NO_DYNAMIC_ENGINE
 # define OPENSSL_NO_DYNAMIC_ENGINE
 #endif
-#ifndef OPENSSL_NO_AFALGENG
-# define OPENSSL_NO_AFALGENG
-#endif
 
 
 /*
diff --git a/deps/openssl/config/archs/aix64-gcc/asm/include/progs.h b/deps/openssl/config/archs/aix64-gcc/asm/include/progs.h
index 9b3d270e20..308c65601b 100644
--- a/deps/openssl/config/archs/aix64-gcc/asm/include/progs.h
+++ b/deps/openssl/config/archs/aix64-gcc/asm/include/progs.h
@@ -2,7 +2,7 @@
  * WARNING: do not edit!
  * Generated by apps/progs.pl
  *
- * Copyright 1995-2019 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 1995-2020 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
diff --git a/deps/openssl/config/archs/aix64-gcc/asm_avx2/configdata.pm b/deps/openssl/config/archs/aix64-gcc/asm_avx2/configdata.pm
index 56f615362d..ce4e06798c 100644
--- a/deps/openssl/config/archs/aix64-gcc/asm_avx2/configdata.pm
+++ b/deps/openssl/config/archs/aix64-gcc/asm_avx2/configdata.pm
@@ -54,7 +54,7 @@ our %config = (
   minor => "1.1",
   openssl_algorithm_defines => [ "OPENSSL_NO_COMP", "OPENSSL_NO_MD2", "OPENSSL_NO_RC5" ],
   openssl_api_defines => [  ],
-  openssl_other_defines => [ "OPENSSL_RAND_SEED_OS", "OPENSSL_NO_AFALGENG", "OPENSSL_NO_ASAN", "OPENSSL_NO_CRYPTO_MDEBUG", "OPENSSL_NO_CRYPTO_MDEBUG_BACKTRACE", "OPENSSL_NO_DEVCRYPTOENG", "OPENSSL_NO_EC_NISTP_64_GCC_128", "OPENSSL_NO_EGD", "OPENSSL_NO_EXTERNAL_TESTS", "OPENSSL_NO_FUZZ_AFL", "OPENSSL_NO_FUZZ_LIBFUZZER", "OPENSSL_NO_HEARTBEATS", "OPENSSL_NO_MSAN", "OPENSSL_NO_SCTP", "OPENSSL_NO_SSL3", "OPENSSL_NO_SSL3_METHOD", "OPENSSL_NO_UBSAN", "OPENSSL_NO_UNIT_TEST", "OPENSSL_NO_WEAK_SSL_CIPHERS", "OPENSSL_NO_DYNAMIC_ENGINE", "OPENSSL_NO_AFALGENG" ],
+  openssl_other_defines => [ "OPENSSL_RAND_SEED_OS", "OPENSSL_NO_AFALGENG", "OPENSSL_NO_ASAN", "OPENSSL_NO_CRYPTO_MDEBUG", "OPENSSL_NO_CRYPTO_MDEBUG_BACKTRACE", "OPENSSL_NO_DEVCRYPTOENG", "OPENSSL_NO_EC_NISTP_64_GCC_128", "OPENSSL_NO_EGD", "OPENSSL_NO_EXTERNAL_TESTS", "OPENSSL_NO_FUZZ_AFL", "OPENSSL_NO_FUZZ_LIBFUZZER", "OPENSSL_NO_HEARTBEATS", "OPENSSL_NO_MSAN", "OPENSSL_NO_SCTP", "OPENSSL_NO_SSL3", "OPENSSL_NO_SSL3_METHOD", "OPENSSL_NO_UBSAN", "OPENSSL_NO_UNIT_TEST", "OPENSSL_NO_WEAK_SSL_CIPHERS", "OPENSSL_NO_DYNAMIC_ENGINE" ],
   openssl_sys_defines => [ "OPENSSL_SYS_AIX" ],
   openssl_thread_defines => [ "OPENSSL_THREADS" ],
   openssldir => "",
@@ -110,8 +110,8 @@ our %config = (
   sourcedir => ".",
   target => "aix64-gcc",
   tdirs => [ "ossl_shim" ],
-  version => "1.1.1d",
-  version_num => "0x1010104fL",
+  version => "1.1.1e",
+  version_num => "0x1010105fL",
 );
 
 our %target = (
@@ -236,6 +236,7 @@ our @disablables = (
   "dgram",
   "dh",
   "dsa",
+  "dso",
   "dtls",
   "dynamic-engine",
   "ec",
@@ -353,8 +354,8 @@ our %unified_info = (
         {
             "" =>
                 [
-                    "crypto/include/internal/bn_conf.h",
-                    "crypto/include/internal/dso_conf.h",
+                    "include/crypto/bn_conf.h",
+                    "include/crypto/dso_conf.h",
                     "include/openssl/opensslconf.h",
                 ],
             "apps/asn1pars.o" =>
@@ -622,14 +623,6 @@ our %unified_info = (
                     "crypto/perlasm/cbc.pl",
                     "crypto/perlasm/x86asm.pl",
                 ],
-            "crypto/include/internal/bn_conf.h" =>
-                [
-                    "configdata.pm",
-                ],
-            "crypto/include/internal/dso_conf.h" =>
-                [
-                    "configdata.pm",
-                ],
             "crypto/rc4/rc4-586.s" =>
                 [
                     "crypto/perlasm/x86asm.pl",
@@ -705,6 +698,14 @@ our %unified_info = (
                 [
                     "libcrypto",
                 ],
+            "include/crypto/bn_conf.h" =>
+                [
+                    "configdata.pm",
+                ],
+            "include/crypto/dso_conf.h" =>
+                [
+                    "configdata.pm",
+                ],
             "include/openssl/opensslconf.h" =>
                 [
                     "configdata.pm",
@@ -1502,6 +1503,12 @@ our %unified_info = (
                     "libcrypto",
                     "test/libtestutil.a",
                 ],
+            "test/ssl_ctx_test" =>
+                [
+                    "libcrypto",
+                    "libssl",
+                    "test/libtestutil.a",
+                ],
             "test/ssl_test" =>
                 [
                     "libcrypto",
@@ -3236,7 +3243,6 @@ our %unified_info = (
                             "test/testutil/cb.o",
                             "test/testutil/driver.o",
                             "test/testutil/format_output.o",
-                            "test/testutil/init.o",
                             "test/testutil/main.o",
                             "test/testutil/output_helpers.o",
                             "test/testutil/random.o",
@@ -3244,6 +3250,7 @@ our %unified_info = (
                             "test/testutil/tap_bio.o",
                             "test/testutil/test_cleanup.o",
                             "test/testutil/tests.o",
+                            "test/testutil/testutil_init.o",
                         ],
                     "products" =>
                         {
@@ -3742,14 +3749,6 @@ our %unified_info = (
                 [
                     "crypto/ia64cpuid.S",
                 ],
-            "crypto/include/internal/bn_conf.h" =>
-                [
-                    "crypto/include/internal/bn_conf.h.in",
-                ],
-            "crypto/include/internal/dso_conf.h" =>
-                [
-                    "crypto/include/internal/dso_conf.h.in",
-                ],
             "crypto/md5/md5-586.s" =>
                 [
                     "crypto/md5/asm/md5-586.pl",
@@ -4190,6 +4189,14 @@ our %unified_info = (
                     "engines/asm/e_padlock-x86_64.pl",
                     "\$(PERLASM_SCHEME)",
                 ],
+            "include/crypto/bn_conf.h" =>
+                [
+                    "include/crypto/bn_conf.h.in",
+                ],
+            "include/crypto/dso_conf.h" =>
+                [
+                    "include/crypto/dso_conf.h.in",
+                ],
             "include/openssl/opensslconf.h" =>
                 [
                     "include/openssl/opensslconf.h.in",
@@ -4876,7 +4883,6 @@ our %unified_info = (
             "crypto/aes/aes-ppc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/aes/aes-s390x.o" =>
@@ -4890,49 +4896,41 @@ our %unified_info = (
             "crypto/aes/aes_cbc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/aes/aes_cfb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/aes/aes_core.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/aes/aes_ecb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/aes/aes_ige.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/aes/aes_misc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/aes/aes_ofb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/aes/aes_wrap.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/aes/aesfx-sparcv9.o" =>
@@ -4942,7 +4940,6 @@ our %unified_info = (
             "crypto/aes/aesp8-ppc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/aes/aest4-sparcv9.o" =>
@@ -4960,13 +4957,11 @@ our %unified_info = (
             "crypto/aes/vpaes-ppc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/aria/aria.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/arm64cpuid.o" =>
@@ -4980,613 +4975,511 @@ our %unified_info = (
             "crypto/asn1/a_bitstr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_d2i_fp.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_digest.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_dup.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_gentm.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_i2d_fp.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_int.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_mbstr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_object.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_octet.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_print.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_sign.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_strex.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_strnid.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_time.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_type.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_utctm.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_utf8.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_verify.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/ameth_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/asn1_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/asn1_gen.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/asn1_item_list.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/asn1_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/asn1_par.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/asn_mime.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/asn_moid.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/asn_mstbl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/asn_pack.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/bio_asn1.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/bio_ndef.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/d2i_pr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/d2i_pu.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/evp_asn1.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/f_int.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/f_string.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/i2d_pr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/i2d_pu.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/n_pkey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/nsseq.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/p5_pbe.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/p5_pbev2.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/p5_scrypt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/p8_pkey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/t_bitst.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/t_pkey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/t_spki.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/tasn_dec.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/tasn_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/tasn_fre.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/tasn_new.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/tasn_prn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/tasn_scn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/tasn_typ.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/tasn_utl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/x_algor.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/x_bignum.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/x_info.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/x_int64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/x_long.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/x_pkey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/x_sig.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/x_spki.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/x_val.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/async/arch/async_null.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/async/arch/async_posix.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/async/arch/async_win.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/async/async.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/async/async_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/async/async_wait.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bf/bf_cfb64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bf/bf_ecb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bf/bf_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bf/bf_ofb64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bf/bf_skey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/b_addr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/b_dump.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/b_print.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/b_sock.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/b_sock2.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bf_buff.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bf_lbuf.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bf_nbio.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bf_null.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bio_cb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bio_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bio_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bio_meth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bss_acpt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bss_bio.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bss_conn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bss_dgram.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bss_fd.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bss_file.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bss_log.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bss_mem.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bss_null.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bss_sock.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/blake2/blake2b.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/blake2/blake2s.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/blake2/m_blake2b.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/blake2/m_blake2s.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/armv4-gf2m.o" =>
@@ -5604,188 +5497,157 @@ our %unified_info = (
             "crypto/bn/bn-ppc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_add.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_blind.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_const.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_ctx.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_depr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_dh.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_div.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_exp.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto",
                 ],
             "crypto/bn/bn_exp2.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_gcd.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_gf2m.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_intern.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_kron.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_mod.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_mont.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_mpi.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_mul.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_nist.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_prime.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_print.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_rand.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_recp.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_shift.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_sqr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_sqrt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_srp.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_word.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_x931p.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/mips-mont.o" =>
@@ -5795,7 +5657,6 @@ our %unified_info = (
             "crypto/bn/ppc-mont.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/sparct4-mont.o" =>
@@ -5821,13 +5682,11 @@ our %unified_info = (
             "crypto/buffer/buf_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/buffer/buffer.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/buildinf.h" =>
@@ -5837,43 +5696,36 @@ our %unified_info = (
             "crypto/camellia/camellia.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/camellia/cmll_cbc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/camellia/cmll_cfb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/camellia/cmll_ctr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/camellia/cmll_ecb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/camellia/cmll_misc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/camellia/cmll_ofb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/camellia/cmllt4-sparcv9.o" =>
@@ -5883,31 +5735,26 @@ our %unified_info = (
             "crypto/cast/c_cfb64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cast/c_ecb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cast/c_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cast/c_ofb64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cast/c_skey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/chacha/chacha-armv4.o" =>
@@ -5921,7 +5768,6 @@ our %unified_info = (
             "crypto/chacha/chacha-ppc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/chacha/chacha-s390x.o" =>
@@ -5931,272 +5777,227 @@ our %unified_info = (
             "crypto/cmac/cm_ameth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cmac/cm_pmeth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cmac/cmac.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_asn1.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_att.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_cd.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_dd.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_env.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_ess.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_io.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_kari.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_pwri.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_sd.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_smime.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/conf/conf_api.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/conf/conf_def.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/conf/conf_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/conf/conf_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/conf/conf_mall.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/conf/conf_mod.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/conf/conf_sap.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/conf/conf_ssl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cpt_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cryptlib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ct/ct_b64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ct/ct_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ct/ct_log.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ct/ct_oct.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ct/ct_policy.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ct/ct_prn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ct/ct_sct.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ct/ct_sct_ctx.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ct/ct_vfy.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ct/ct_x509v3.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ctype.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cversion.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto",
                 ],
             "crypto/des/cbc_cksm.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/cbc_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/cfb64ede.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/cfb64enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/cfb_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/des_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/dest4-sparcv9.o" =>
@@ -6206,301 +6007,251 @@ our %unified_info = (
             "crypto/des/ecb3_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/ecb_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/fcrypt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/fcrypt_b.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/ofb64ede.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/ofb64enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/ofb_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/pcbc_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/qud_cksm.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/rand_key.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/set_key.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/str2key.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/xcbc_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_ameth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_asn1.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_check.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_depr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_gen.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_kdf.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_key.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_meth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_pmeth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_prn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_rfc5114.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_rfc7919.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dsa/dsa_ameth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dsa/dsa_asn1.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dsa/dsa_depr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dsa/dsa_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dsa/dsa_gen.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dsa/dsa_key.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dsa/dsa_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dsa/dsa_meth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dsa/dsa_ossl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dsa/dsa_pmeth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dsa/dsa_prn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dsa/dsa_sign.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dsa/dsa_vrf.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dso/dso_dl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dso/dso_dlfcn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dso/dso_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dso/dso_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dso/dso_openssl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dso/dso_vms.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dso/dso_win32.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ebcdic.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/curve25519.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/curve448/arch_32/f_impl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto/ec/curve448/arch_32",
                     "crypto/ec/curve448",
@@ -6508,7 +6259,6 @@ our %unified_info = (
             "crypto/ec/curve448/curve448.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto/ec/curve448/arch_32",
                     "crypto/ec/curve448",
@@ -6516,7 +6266,6 @@ our %unified_info = (
             "crypto/ec/curve448/curve448_tables.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto/ec/curve448/arch_32",
                     "crypto/ec/curve448",
@@ -6524,7 +6273,6 @@ our %unified_info = (
             "crypto/ec/curve448/eddsa.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto/ec/curve448/arch_32",
                     "crypto/ec/curve448",
@@ -6532,7 +6280,6 @@ our %unified_info = (
             "crypto/ec/curve448/f_generic.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto/ec/curve448/arch_32",
                     "crypto/ec/curve448",
@@ -6540,7 +6287,6 @@ our %unified_info = (
             "crypto/ec/curve448/scalar.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto/ec/curve448/arch_32",
                     "crypto/ec/curve448",
@@ -6548,163 +6294,136 @@ our %unified_info = (
             "crypto/ec/ec2_oct.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec2_smpl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec_ameth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec_asn1.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec_check.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec_curve.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec_cvt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec_key.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec_kmeth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec_mult.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec_oct.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec_pmeth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec_print.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecdh_kdf.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecdh_ossl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecdsa_ossl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecdsa_sign.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecdsa_vrf.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/eck_prn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecp_mont.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecp_nist.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecp_nistp224.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecp_nistp256.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecp_nistp521.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecp_nistputil.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecp_nistz256-armv4.o" =>
@@ -6718,7 +6437,6 @@ our %unified_info = (
             "crypto/ec/ecp_nistz256-ppc64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecp_nistz256-sparcv9.o" =>
@@ -6728,235 +6446,196 @@ our %unified_info = (
             "crypto/ec/ecp_nistz256.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecp_oct.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecp_smpl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecx_meth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/x25519-ppc64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/eng_all.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/eng_cnf.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/eng_ctrl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/eng_dyn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/eng_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/eng_fat.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/eng_init.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/eng_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/eng_list.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/eng_openssl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/eng_pkey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/eng_rdrand.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/eng_table.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/tb_asnmth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/tb_cipher.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/tb_dh.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/tb_digest.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/tb_dsa.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/tb_eckey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/tb_pkmeth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/tb_rand.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/tb_rsa.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/err/err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/err/err_all.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/err/err_prn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/bio_b64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/bio_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/bio_md.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/bio_ok.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/c_allc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/c_alld.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/cmeth_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/digest.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/e_aes.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto",
                     "crypto/modes",
@@ -6964,21 +6643,18 @@ our %unified_info = (
             "crypto/evp/e_aes_cbc_hmac_sha1.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto/modes",
                 ],
             "crypto/evp/e_aes_cbc_hmac_sha256.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto/modes",
                 ],
             "crypto/evp/e_aria.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto",
                     "crypto/modes",
@@ -6986,13 +6662,11 @@ our %unified_info = (
             "crypto/evp/e_bf.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/e_camellia.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto",
                     "crypto/modes",
@@ -7000,81 +6674,68 @@ our %unified_info = (
             "crypto/evp/e_cast.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/e_chacha20_poly1305.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/e_des.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto",
                 ],
             "crypto/evp/e_des3.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto",
                 ],
             "crypto/evp/e_idea.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/e_null.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/e_old.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/e_rc2.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/e_rc4.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/e_rc4_hmac_md5.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/e_rc5.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/e_seed.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/e_sm4.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto",
                     "crypto/modes",
@@ -7082,328 +6743,267 @@ our %unified_info = (
             "crypto/evp/e_xcbc_d.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/encode.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/evp_cnf.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/evp_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/evp_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/evp_key.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/evp_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/evp_pbe.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/evp_pkey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/m_md2.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/m_md4.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/m_md5.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/m_md5_sha1.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/m_mdc2.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/m_null.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/m_ripemd.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/m_sha1.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/m_sha3.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto",
                 ],
             "crypto/evp/m_sigver.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/m_wp.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/names.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/p5_crpt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/p5_crpt2.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/p_dec.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/p_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/p_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/p_open.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/p_seal.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/p_sign.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/p_verify.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/pbe_scrypt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/pmeth_fn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/pmeth_gn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/pmeth_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ex_data.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/getenv.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/hmac/hm_ameth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/hmac/hm_pmeth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/hmac/hmac.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/idea/i_cbc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/idea/i_cfb64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/idea/i_ecb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/idea/i_ofb64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/idea/i_skey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
-            "crypto/include/internal/bn_conf.h" =>
-                [
-                    ".",
-                ],
-            "crypto/include/internal/dso_conf.h" =>
-                [
-                    ".",
-                ],
             "crypto/init.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/kdf/hkdf.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/kdf/kdf_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/kdf/scrypt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/kdf/tls1_prf.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/lhash/lh_stats.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/lhash/lhash.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/md4/md4_dgst.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/md4/md4_one.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/md5/md5-sparcv9.o" =>
@@ -7413,79 +7013,66 @@ our %unified_info = (
             "crypto/md5/md5_dgst.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/md5/md5_one.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/mdc2/mdc2_one.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/mdc2/mdc2dgst.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/mem.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/mem_dbg.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/mem_sec.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/modes/cbc128.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/modes/ccm128.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/modes/cfb128.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/modes/ctr128.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/modes/cts128.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/modes/gcm128.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto",
                 ],
@@ -7504,7 +7091,6 @@ our %unified_info = (
             "crypto/modes/ghashp8-ppc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/modes/ghashv8-armx.o" =>
@@ -7514,361 +7100,301 @@ our %unified_info = (
             "crypto/modes/ocb128.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/modes/ofb128.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/modes/wrap128.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/modes/xts128.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/o_dir.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/o_fips.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/o_fopen.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/o_init.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/o_str.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/o_time.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/objects/o_names.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/objects/obj_dat.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/objects/obj_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/objects/obj_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/objects/obj_xref.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ocsp/ocsp_asn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ocsp/ocsp_cl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ocsp/ocsp_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ocsp/ocsp_ext.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ocsp/ocsp_ht.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ocsp/ocsp_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ocsp/ocsp_prn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ocsp/ocsp_srv.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ocsp/ocsp_vfy.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ocsp/v3_ocsp.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pem/pem_all.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pem/pem_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pem/pem_info.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pem/pem_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pem/pem_oth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pem/pem_pk8.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pem/pem_pkey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pem/pem_sign.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pem/pem_x509.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pem/pem_xaux.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pem/pvkfmt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_add.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_asn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_attr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_crpt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_crt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_decr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_init.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_key.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_kiss.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_mutl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_npas.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_p8d.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_p8e.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_sbag.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_utl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/pk12err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs7/bio_pk7.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs7/pk7_asn1.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs7/pk7_attr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs7/pk7_doit.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs7/pk7_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs7/pk7_mime.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs7/pk7_smime.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs7/pkcs7err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/poly1305/poly1305-armv4.o" =>
@@ -7886,13 +7412,11 @@ our %unified_info = (
             "crypto/poly1305/poly1305-ppc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/poly1305/poly1305-ppcfp.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/poly1305/poly1305-sparcv9.o" =>
@@ -7902,271 +7426,226 @@ our %unified_info = (
             "crypto/poly1305/poly1305.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/poly1305/poly1305_ameth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/poly1305/poly1305_pmeth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ppccap.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ppccpuid.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rand/drbg_ctr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rand/drbg_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rand/rand_egd.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rand/rand_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rand/rand_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rand/rand_unix.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rand/rand_vms.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rand/rand_win.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rand/randfile.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rc2/rc2_cbc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rc2/rc2_ecb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rc2/rc2_skey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rc2/rc2cfb64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rc2/rc2ofb64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rc4/rc4_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rc4/rc4_skey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ripemd/rmd_dgst.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ripemd/rmd_one.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_ameth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_asn1.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_chk.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_crpt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_depr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_gen.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_meth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_mp.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_none.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_oaep.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_ossl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_pk1.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_pmeth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_prn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_pss.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_saos.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_sign.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_ssl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_x931.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_x931g.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/s390xcpuid.o" =>
@@ -8176,31 +7655,26 @@ our %unified_info = (
             "crypto/seed/seed.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/seed/seed_cbc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/seed/seed_cfb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/seed/seed_ecb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/seed/seed_ofb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sha/keccak1600-armv4.o" =>
@@ -8210,7 +7684,6 @@ our %unified_info = (
             "crypto/sha/keccak1600-ppc64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sha/sha1-armv4-large.o" =>
@@ -8228,7 +7701,6 @@ our %unified_info = (
             "crypto/sha/sha1-ppc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sha/sha1-s390x.o" =>
@@ -8242,13 +7714,11 @@ our %unified_info = (
             "crypto/sha/sha1_one.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sha/sha1dgst.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sha/sha256-armv4.o" =>
@@ -8266,7 +7736,6 @@ our %unified_info = (
             "crypto/sha/sha256-ppc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sha/sha256-s390x.o" =>
@@ -8280,13 +7749,11 @@ our %unified_info = (
             "crypto/sha/sha256.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sha/sha256p8-ppc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sha/sha512-armv4.o" =>
@@ -8304,7 +7771,6 @@ our %unified_info = (
             "crypto/sha/sha512-ppc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sha/sha512-s390x.o" =>
@@ -8318,715 +7784,596 @@ our %unified_info = (
             "crypto/sha/sha512.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sha/sha512p8-ppc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/siphash/siphash.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/siphash/siphash_ameth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/siphash/siphash_pmeth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sm2/sm2_crypt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sm2/sm2_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sm2/sm2_pmeth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sm2/sm2_sign.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sm3/m_sm3.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sm3/sm3.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sm4/sm4.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/srp/srp_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/srp/srp_vfy.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/stack/stack.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/store/loader_file.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/store/store_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/store/store_init.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/store/store_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/store/store_register.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/store/store_strings.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/threads_none.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/threads_pthread.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/threads_win.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ts/ts_asn1.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ts/ts_conf.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ts/ts_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ts/ts_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ts/ts_req_print.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ts/ts_req_utils.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ts/ts_rsp_print.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ts/ts_rsp_sign.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ts/ts_rsp_utils.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ts/ts_rsp_verify.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ts/ts_verify_ctx.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/txt_db/txt_db.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ui/ui_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ui/ui_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ui/ui_null.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ui/ui_openssl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ui/ui_util.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/uid.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/whrlpool/wp_block.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/whrlpool/wp_dgst.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/by_dir.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/by_file.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/t_crl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/t_req.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/t_x509.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_att.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_cmp.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_d2.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_def.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_ext.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_lu.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_meth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_obj.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_r2x.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_req.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_set.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_trs.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_txt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_v3.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_vfy.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_vpm.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509cset.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509name.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509rset.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509spki.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509type.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x_all.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x_attrib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x_crl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x_exten.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x_name.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x_pubkey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x_req.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x_x509.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x_x509a.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/pcy_cache.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/pcy_data.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/pcy_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/pcy_map.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/pcy_node.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/pcy_tree.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_addr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_admis.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_akey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_akeya.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_alt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_asid.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_bcons.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_bitst.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_conf.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_cpols.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_crld.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_enum.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_extku.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_genn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_ia5.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_info.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_int.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_ncons.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_pci.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_pcia.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_pcons.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_pku.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_pmaps.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_prn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_purp.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_skey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_sxnet.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_tlsf.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_utl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "engines/e_capi.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "engines/e_padlock.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "fuzz/asn1.o" =>
@@ -9077,6 +8424,14 @@ our %unified_info = (
                 [
                     "include",
                 ],
+            "include/crypto/bn_conf.h" =>
+                [
+                    ".",
+                ],
+            "include/crypto/dso_conf.h" =>
+                [
+                    ".",
+                ],
             "include/openssl/opensslconf.h" =>
                 [
                     ".",
@@ -9321,7 +8676,6 @@ our %unified_info = (
                 [
                     ".",
                     "include",
-                    "crypto/include",
                 ],
             "test/asn1_string_table_test.o" =>
                 [
@@ -9647,7 +9001,6 @@ our %unified_info = (
                 [
                     ".",
                     "include",
-                    "crypto/include",
                 ],
             "test/cipher_overhead_test.o" =>
                 [
@@ -9693,7 +9046,6 @@ our %unified_info = (
             "test/ctype_internal_test.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "test/curve448_internal_test.o" =>
@@ -9759,7 +9111,6 @@ our %unified_info = (
                 [
                     "include",
                     "crypto/ec",
-                    "crypto/include",
                 ],
             "test/ecdsatest.o" =>
                 [
@@ -9784,7 +9135,6 @@ our %unified_info = (
             "test/evp_extra_test.o" =>
                 [
                     "include",
-                    "crypto/include",
                 ],
             "test/evp_test.o" =>
                 [
@@ -9882,7 +9232,6 @@ our %unified_info = (
                 [
                     ".",
                     "include",
-                    "crypto/include",
                 ],
             "test/rc2test.o" =>
                 [
@@ -9932,18 +9281,15 @@ our %unified_info = (
                 [
                     ".",
                     "include",
-                    "crypto/include",
                 ],
             "test/sm2_internal_test.o" =>
                 [
                     "include",
-                    "crypto/include",
                 ],
             "test/sm4_internal_test.o" =>
                 [
                     ".",
                     "include",
-                    "crypto/include",
                 ],
             "test/srptest.o" =>
                 [
@@ -9954,6 +9300,10 @@ our %unified_info = (
                     ".",
                     "include",
                 ],
+            "test/ssl_ctx_test.o" =>
+                [
+                    "include",
+                ],
             "test/ssl_test.o" =>
                 [
                     "include",
@@ -10017,10 +9367,6 @@ our %unified_info = (
                 [
                     "include",
                 ],
-            "test/testutil/init.o" =>
-                [
-                    "include",
-                ],
             "test/testutil/main.o" =>
                 [
                     "include",
@@ -10049,6 +9395,10 @@ our %unified_info = (
                 [
                     "include",
                 ],
+            "test/testutil/testutil_init.o" =>
+                [
+                    "include",
+                ],
             "test/threadstest.o" =>
                 [
                     "include",
@@ -10313,6 +9663,7 @@ our %unified_info = (
             "test/sm4_internal_test",
             "test/srptest",
             "test/ssl_cert_table_internal_test",
+            "test/ssl_ctx_test",
             "test/ssl_test",
             "test/ssl_test_ctx_test",
             "test/sslapitest",
@@ -15283,7 +14634,6 @@ our %unified_info = (
                     "test/testutil/cb.o",
                     "test/testutil/driver.o",
                     "test/testutil/format_output.o",
-                    "test/testutil/init.o",
                     "test/testutil/main.o",
                     "test/testutil/output_helpers.o",
                     "test/testutil/random.o",
@@ -15291,6 +14641,7 @@ our %unified_info = (
                     "test/testutil/tap_bio.o",
                     "test/testutil/test_cleanup.o",
                     "test/testutil/tests.o",
+                    "test/testutil/testutil_init.o",
                 ],
             "test/md2test" =>
                 [
@@ -15518,6 +14869,14 @@ our %unified_info = (
                 [
                     "test/ssl_cert_table_internal_test.c",
                 ],
+            "test/ssl_ctx_test" =>
+                [
+                    "test/ssl_ctx_test.o",
+                ],
+            "test/ssl_ctx_test.o" =>
+                [
+                    "test/ssl_ctx_test.c",
+                ],
             "test/ssl_test" =>
                 [
                     "test/handshake_helper.o",
@@ -15620,10 +14979,6 @@ our %unified_info = (
                 [
                     "test/testutil/format_output.c",
                 ],
-            "test/testutil/init.o" =>
-                [
-                    "test/testutil/init.c",
-                ],
             "test/testutil/main.o" =>
                 [
                     "test/testutil/main.c",
@@ -15652,6 +15007,10 @@ our %unified_info = (
                 [
                     "test/testutil/tests.c",
                 ],
+            "test/testutil/testutil_init.o" =>
+                [
+                    "test/testutil/testutil_init.c",
+                ],
             "test/threadstest" =>
                 [
                     "test/threadstest.o",
diff --git a/deps/openssl/config/archs/aix64-gcc/asm_avx2/crypto/buildinf.h b/deps/openssl/config/archs/aix64-gcc/asm_avx2/crypto/buildinf.h
index fe20db38c0..c53f28b67b 100644
--- a/deps/openssl/config/archs/aix64-gcc/asm_avx2/crypto/buildinf.h
+++ b/deps/openssl/config/archs/aix64-gcc/asm_avx2/crypto/buildinf.h
@@ -11,7 +11,7 @@
  */
 
 #define PLATFORM "platform: aix64-gcc"
-#define DATE "built on: Fri Sep 13 15:57:07 2019 UTC"
+#define DATE "built on: Wed Mar 18 21:04:42 2020 UTC"
 
 /*
  * Generate compiler_flags as an array of individual characters. This is a
diff --git a/deps/openssl/config/archs/aix64-gcc/asm_avx2/crypto/include/internal/bn_conf.h b/deps/openssl/config/archs/aix64-gcc/asm_avx2/crypto/include/internal/bn_conf.h
index 34bd8b78b4..5312ef5a7a 100644
--- a/deps/openssl/config/archs/aix64-gcc/asm_avx2/crypto/include/internal/bn_conf.h
+++ b/deps/openssl/config/archs/aix64-gcc/asm_avx2/crypto/include/internal/bn_conf.h
@@ -1,5 +1,5 @@
 /* WARNING: do not edit! */
-/* Generated by Makefile from crypto/include/internal/bn_conf.h.in */
+/* Generated by Makefile from include/crypto/bn_conf.h.in */
 /*
  * Copyright 2016 The OpenSSL Project Authors. All Rights Reserved.
  *
@@ -9,8 +9,8 @@
  * https://www.openssl.org/source/license.html
  */
 
-#ifndef HEADER_BN_CONF_H
-# define HEADER_BN_CONF_H
+#ifndef OSSL_CRYPTO_BN_CONF_H
+# define OSSL_CRYPTO_BN_CONF_H
 
 /*
  * The contents of this file are not used in the UEFI build, as
diff --git a/deps/openssl/config/archs/aix64-gcc/asm_avx2/crypto/include/internal/dso_conf.h b/deps/openssl/config/archs/aix64-gcc/asm_avx2/crypto/include/internal/dso_conf.h
index 252266ec2a..4b1167c3d8 100644
--- a/deps/openssl/config/archs/aix64-gcc/asm_avx2/crypto/include/internal/dso_conf.h
+++ b/deps/openssl/config/archs/aix64-gcc/asm_avx2/crypto/include/internal/dso_conf.h
@@ -1,5 +1,5 @@
 /* WARNING: do not edit! */
-/* Generated by Makefile from crypto/include/internal/dso_conf.h.in */
+/* Generated by Makefile from include/crypto/dso_conf.h.in */
 /*
  * Copyright 2016-2019 The OpenSSL Project Authors. All Rights Reserved.
  *
@@ -9,8 +9,8 @@
  * https://www.openssl.org/source/license.html
  */
 
-#ifndef HEADER_DSO_CONF_H
-# define HEADER_DSO_CONF_H
+#ifndef OSSL_CRYPTO_DSO_CONF_H
+# define OSSL_CRYPTO_DSO_CONF_H
 # define DSO_DLFCN
 # define HAVE_DLFCN_H
 # define DSO_EXTENSION ".so"
diff --git a/deps/openssl/config/archs/aix64-gcc/asm_avx2/include/openssl/opensslconf.h b/deps/openssl/config/archs/aix64-gcc/asm_avx2/include/openssl/opensslconf.h
index 23ac57c116..2ab0cdb917 100644
--- a/deps/openssl/config/archs/aix64-gcc/asm_avx2/include/openssl/opensslconf.h
+++ b/deps/openssl/config/archs/aix64-gcc/asm_avx2/include/openssl/opensslconf.h
@@ -99,9 +99,6 @@ extern "C" {
 #ifndef OPENSSL_NO_DYNAMIC_ENGINE
 # define OPENSSL_NO_DYNAMIC_ENGINE
 #endif
-#ifndef OPENSSL_NO_AFALGENG
-# define OPENSSL_NO_AFALGENG
-#endif
 
 
 /*
diff --git a/deps/openssl/config/archs/aix64-gcc/asm_avx2/include/progs.h b/deps/openssl/config/archs/aix64-gcc/asm_avx2/include/progs.h
index 9b3d270e20..308c65601b 100644
--- a/deps/openssl/config/archs/aix64-gcc/asm_avx2/include/progs.h
+++ b/deps/openssl/config/archs/aix64-gcc/asm_avx2/include/progs.h
@@ -2,7 +2,7 @@
  * WARNING: do not edit!
  * Generated by apps/progs.pl
  *
- * Copyright 1995-2019 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 1995-2020 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
diff --git a/deps/openssl/config/archs/aix64-gcc/no-asm/configdata.pm b/deps/openssl/config/archs/aix64-gcc/no-asm/configdata.pm
index d37f8ad8b0..e5164e6d11 100644
--- a/deps/openssl/config/archs/aix64-gcc/no-asm/configdata.pm
+++ b/deps/openssl/config/archs/aix64-gcc/no-asm/configdata.pm
@@ -54,7 +54,7 @@ our %config = (
   minor => "1.1",
   openssl_algorithm_defines => [ "OPENSSL_NO_COMP", "OPENSSL_NO_MD2", "OPENSSL_NO_RC5" ],
   openssl_api_defines => [  ],
-  openssl_other_defines => [ "OPENSSL_RAND_SEED_OS", "OPENSSL_NO_AFALGENG", "OPENSSL_NO_ASAN", "OPENSSL_NO_ASM", "OPENSSL_NO_CRYPTO_MDEBUG", "OPENSSL_NO_CRYPTO_MDEBUG_BACKTRACE", "OPENSSL_NO_DEVCRYPTOENG", "OPENSSL_NO_EC_NISTP_64_GCC_128", "OPENSSL_NO_EGD", "OPENSSL_NO_EXTERNAL_TESTS", "OPENSSL_NO_FUZZ_AFL", "OPENSSL_NO_FUZZ_LIBFUZZER", "OPENSSL_NO_HEARTBEATS", "OPENSSL_NO_MSAN", "OPENSSL_NO_SCTP", "OPENSSL_NO_SSL3", "OPENSSL_NO_SSL3_METHOD", "OPENSSL_NO_UBSAN", "OPENSSL_NO_UNIT_TEST", "OPENSSL_NO_WEAK_SSL_CIPHERS", "OPENSSL_NO_DYNAMIC_ENGINE", "OPENSSL_NO_AFALGENG" ],
+  openssl_other_defines => [ "OPENSSL_RAND_SEED_OS", "OPENSSL_NO_AFALGENG", "OPENSSL_NO_ASAN", "OPENSSL_NO_ASM", "OPENSSL_NO_CRYPTO_MDEBUG", "OPENSSL_NO_CRYPTO_MDEBUG_BACKTRACE", "OPENSSL_NO_DEVCRYPTOENG", "OPENSSL_NO_EC_NISTP_64_GCC_128", "OPENSSL_NO_EGD", "OPENSSL_NO_EXTERNAL_TESTS", "OPENSSL_NO_FUZZ_AFL", "OPENSSL_NO_FUZZ_LIBFUZZER", "OPENSSL_NO_HEARTBEATS", "OPENSSL_NO_MSAN", "OPENSSL_NO_SCTP", "OPENSSL_NO_SSL3", "OPENSSL_NO_SSL3_METHOD", "OPENSSL_NO_UBSAN", "OPENSSL_NO_UNIT_TEST", "OPENSSL_NO_WEAK_SSL_CIPHERS", "OPENSSL_NO_DYNAMIC_ENGINE" ],
   openssl_sys_defines => [ "OPENSSL_SYS_AIX" ],
   openssl_thread_defines => [ "OPENSSL_THREADS" ],
   openssldir => "",
@@ -110,8 +110,8 @@ our %config = (
   sourcedir => ".",
   target => "aix64-gcc",
   tdirs => [ "ossl_shim" ],
-  version => "1.1.1d",
-  version_num => "0x1010104fL",
+  version => "1.1.1e",
+  version_num => "0x1010105fL",
 );
 
 our %target = (
@@ -234,6 +234,7 @@ our @disablables = (
   "dgram",
   "dh",
   "dsa",
+  "dso",
   "dtls",
   "dynamic-engine",
   "ec",
@@ -352,8 +353,8 @@ our %unified_info = (
         {
             "" =>
                 [
-                    "crypto/include/internal/bn_conf.h",
-                    "crypto/include/internal/dso_conf.h",
+                    "include/crypto/bn_conf.h",
+                    "include/crypto/dso_conf.h",
                     "include/openssl/opensslconf.h",
                 ],
             "apps/asn1pars.o" =>
@@ -621,14 +622,6 @@ our %unified_info = (
                     "crypto/perlasm/cbc.pl",
                     "crypto/perlasm/x86asm.pl",
                 ],
-            "crypto/include/internal/bn_conf.h" =>
-                [
-                    "configdata.pm",
-                ],
-            "crypto/include/internal/dso_conf.h" =>
-                [
-                    "configdata.pm",
-                ],
             "crypto/rc4/rc4-586.s" =>
                 [
                     "crypto/perlasm/x86asm.pl",
@@ -704,6 +697,14 @@ our %unified_info = (
                 [
                     "libcrypto",
                 ],
+            "include/crypto/bn_conf.h" =>
+                [
+                    "configdata.pm",
+                ],
+            "include/crypto/dso_conf.h" =>
+                [
+                    "configdata.pm",
+                ],
             "include/openssl/opensslconf.h" =>
                 [
                     "configdata.pm",
@@ -1501,6 +1502,12 @@ our %unified_info = (
                     "libcrypto",
                     "test/libtestutil.a",
                 ],
+            "test/ssl_ctx_test" =>
+                [
+                    "libcrypto",
+                    "libssl",
+                    "test/libtestutil.a",
+                ],
             "test/ssl_test" =>
                 [
                     "libcrypto",
@@ -3219,7 +3226,6 @@ our %unified_info = (
                             "test/testutil/cb.o",
                             "test/testutil/driver.o",
                             "test/testutil/format_output.o",
-                            "test/testutil/init.o",
                             "test/testutil/main.o",
                             "test/testutil/output_helpers.o",
                             "test/testutil/random.o",
@@ -3227,6 +3233,7 @@ our %unified_info = (
                             "test/testutil/tap_bio.o",
                             "test/testutil/test_cleanup.o",
                             "test/testutil/tests.o",
+                            "test/testutil/testutil_init.o",
                         ],
                     "products" =>
                         {
@@ -3725,14 +3732,6 @@ our %unified_info = (
                 [
                     "crypto/ia64cpuid.S",
                 ],
-            "crypto/include/internal/bn_conf.h" =>
-                [
-                    "crypto/include/internal/bn_conf.h.in",
-                ],
-            "crypto/include/internal/dso_conf.h" =>
-                [
-                    "crypto/include/internal/dso_conf.h.in",
-                ],
             "crypto/md5/md5-586.s" =>
                 [
                     "crypto/md5/asm/md5-586.pl",
@@ -4173,6 +4172,14 @@ our %unified_info = (
                     "engines/asm/e_padlock-x86_64.pl",
                     "\$(PERLASM_SCHEME)",
                 ],
+            "include/crypto/bn_conf.h" =>
+                [
+                    "include/crypto/bn_conf.h.in",
+                ],
+            "include/crypto/dso_conf.h" =>
+                [
+                    "include/crypto/dso_conf.h.in",
+                ],
             "include/openssl/opensslconf.h" =>
                 [
                     "include/openssl/opensslconf.h.in",
@@ -4867,49 +4874,41 @@ our %unified_info = (
             "crypto/aes/aes_cbc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/aes/aes_cfb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/aes/aes_core.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/aes/aes_ecb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/aes/aes_ige.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/aes/aes_misc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/aes/aes_ofb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/aes/aes_wrap.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/aes/aesfx-sparcv9.o" =>
@@ -4931,7 +4930,6 @@ our %unified_info = (
             "crypto/aria/aria.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/arm64cpuid.o" =>
@@ -4945,613 +4943,511 @@ our %unified_info = (
             "crypto/asn1/a_bitstr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_d2i_fp.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_digest.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_dup.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_gentm.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_i2d_fp.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_int.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_mbstr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_object.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_octet.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_print.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_sign.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_strex.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_strnid.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_time.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_type.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_utctm.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_utf8.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_verify.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/ameth_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/asn1_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/asn1_gen.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/asn1_item_list.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/asn1_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/asn1_par.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/asn_mime.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/asn_moid.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/asn_mstbl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/asn_pack.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/bio_asn1.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/bio_ndef.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/d2i_pr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/d2i_pu.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/evp_asn1.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/f_int.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/f_string.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/i2d_pr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/i2d_pu.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/n_pkey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/nsseq.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/p5_pbe.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/p5_pbev2.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/p5_scrypt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/p8_pkey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/t_bitst.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/t_pkey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/t_spki.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/tasn_dec.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/tasn_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/tasn_fre.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/tasn_new.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/tasn_prn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/tasn_scn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/tasn_typ.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/tasn_utl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/x_algor.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/x_bignum.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/x_info.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/x_int64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/x_long.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/x_pkey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/x_sig.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/x_spki.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/x_val.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/async/arch/async_null.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/async/arch/async_posix.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/async/arch/async_win.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/async/async.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/async/async_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/async/async_wait.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bf/bf_cfb64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bf/bf_ecb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bf/bf_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bf/bf_ofb64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bf/bf_skey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/b_addr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/b_dump.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/b_print.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/b_sock.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/b_sock2.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bf_buff.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bf_lbuf.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bf_nbio.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bf_null.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bio_cb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bio_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bio_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bio_meth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bss_acpt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bss_bio.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bss_conn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bss_dgram.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bss_fd.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bss_file.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bss_log.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bss_mem.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bss_null.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bss_sock.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/blake2/blake2b.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/blake2/blake2s.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/blake2/m_blake2b.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/blake2/m_blake2s.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/armv4-gf2m.o" =>
@@ -5569,188 +5465,157 @@ our %unified_info = (
             "crypto/bn/bn_add.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_asm.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_blind.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_const.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_ctx.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_depr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_dh.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_div.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_exp.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto",
                 ],
             "crypto/bn/bn_exp2.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_gcd.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_gf2m.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_intern.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_kron.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_mod.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_mont.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_mpi.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_mul.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_nist.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_prime.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_print.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_rand.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_recp.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_shift.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_sqr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_sqrt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_srp.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_word.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_x931p.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/mips-mont.o" =>
@@ -5780,13 +5645,11 @@ our %unified_info = (
             "crypto/buffer/buf_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/buffer/buffer.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/buildinf.h" =>
@@ -5796,43 +5659,36 @@ our %unified_info = (
             "crypto/camellia/camellia.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/camellia/cmll_cbc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/camellia/cmll_cfb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/camellia/cmll_ctr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/camellia/cmll_ecb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/camellia/cmll_misc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/camellia/cmll_ofb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/camellia/cmllt4-sparcv9.o" =>
@@ -5842,31 +5698,26 @@ our %unified_info = (
             "crypto/cast/c_cfb64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cast/c_ecb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cast/c_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cast/c_ofb64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cast/c_skey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/chacha/chacha-armv4.o" =>
@@ -5884,278 +5735,232 @@ our %unified_info = (
             "crypto/chacha/chacha_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cmac/cm_ameth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cmac/cm_pmeth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cmac/cmac.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_asn1.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_att.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_cd.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_dd.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_env.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_ess.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_io.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_kari.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_pwri.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_sd.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_smime.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/conf/conf_api.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/conf/conf_def.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/conf/conf_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/conf/conf_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/conf/conf_mall.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/conf/conf_mod.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/conf/conf_sap.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/conf/conf_ssl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cpt_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cryptlib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ct/ct_b64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ct/ct_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ct/ct_log.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ct/ct_oct.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ct/ct_policy.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ct/ct_prn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ct/ct_sct.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ct/ct_sct_ctx.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ct/ct_vfy.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ct/ct_x509v3.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ctype.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cversion.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto",
                 ],
             "crypto/des/cbc_cksm.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/cbc_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/cfb64ede.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/cfb64enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/cfb_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/des_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/dest4-sparcv9.o" =>
@@ -6165,301 +5970,251 @@ our %unified_info = (
             "crypto/des/ecb3_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/ecb_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/fcrypt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/fcrypt_b.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/ofb64ede.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/ofb64enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/ofb_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/pcbc_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/qud_cksm.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/rand_key.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/set_key.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/str2key.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/xcbc_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_ameth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_asn1.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_check.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_depr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_gen.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_kdf.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_key.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_meth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_pmeth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_prn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_rfc5114.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_rfc7919.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dsa/dsa_ameth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dsa/dsa_asn1.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dsa/dsa_depr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dsa/dsa_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dsa/dsa_gen.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dsa/dsa_key.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dsa/dsa_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dsa/dsa_meth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dsa/dsa_ossl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dsa/dsa_pmeth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dsa/dsa_prn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dsa/dsa_sign.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dsa/dsa_vrf.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dso/dso_dl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dso/dso_dlfcn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dso/dso_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dso/dso_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dso/dso_openssl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dso/dso_vms.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dso/dso_win32.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ebcdic.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/curve25519.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/curve448/arch_32/f_impl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto/ec/curve448/arch_32",
                     "crypto/ec/curve448",
@@ -6467,7 +6222,6 @@ our %unified_info = (
             "crypto/ec/curve448/curve448.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto/ec/curve448/arch_32",
                     "crypto/ec/curve448",
@@ -6475,7 +6229,6 @@ our %unified_info = (
             "crypto/ec/curve448/curve448_tables.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto/ec/curve448/arch_32",
                     "crypto/ec/curve448",
@@ -6483,7 +6236,6 @@ our %unified_info = (
             "crypto/ec/curve448/eddsa.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto/ec/curve448/arch_32",
                     "crypto/ec/curve448",
@@ -6491,7 +6243,6 @@ our %unified_info = (
             "crypto/ec/curve448/f_generic.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto/ec/curve448/arch_32",
                     "crypto/ec/curve448",
@@ -6499,7 +6250,6 @@ our %unified_info = (
             "crypto/ec/curve448/scalar.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto/ec/curve448/arch_32",
                     "crypto/ec/curve448",
@@ -6507,163 +6257,136 @@ our %unified_info = (
             "crypto/ec/ec2_oct.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec2_smpl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec_ameth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec_asn1.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec_check.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec_curve.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec_cvt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec_key.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec_kmeth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec_mult.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec_oct.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec_pmeth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec_print.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecdh_kdf.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecdh_ossl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecdsa_ossl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecdsa_sign.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecdsa_vrf.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/eck_prn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecp_mont.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecp_nist.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecp_nistp224.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecp_nistp256.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecp_nistp521.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecp_nistputil.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecp_nistz256-armv4.o" =>
@@ -6681,223 +6404,186 @@ our %unified_info = (
             "crypto/ec/ecp_oct.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecp_smpl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecx_meth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/eng_all.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/eng_cnf.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/eng_ctrl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/eng_dyn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/eng_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/eng_fat.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/eng_init.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/eng_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/eng_list.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/eng_openssl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/eng_pkey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/eng_rdrand.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/eng_table.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/tb_asnmth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/tb_cipher.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/tb_dh.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/tb_digest.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/tb_dsa.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/tb_eckey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/tb_pkmeth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/tb_rand.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/tb_rsa.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/err/err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/err/err_all.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/err/err_prn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/bio_b64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/bio_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/bio_md.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/bio_ok.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/c_allc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/c_alld.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/cmeth_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/digest.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/e_aes.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto",
                     "crypto/modes",
@@ -6905,21 +6591,18 @@ our %unified_info = (
             "crypto/evp/e_aes_cbc_hmac_sha1.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto/modes",
                 ],
             "crypto/evp/e_aes_cbc_hmac_sha256.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto/modes",
                 ],
             "crypto/evp/e_aria.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto",
                     "crypto/modes",
@@ -6927,13 +6610,11 @@ our %unified_info = (
             "crypto/evp/e_bf.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/e_camellia.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto",
                     "crypto/modes",
@@ -6941,81 +6622,68 @@ our %unified_info = (
             "crypto/evp/e_cast.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/e_chacha20_poly1305.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/e_des.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto",
                 ],
             "crypto/evp/e_des3.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto",
                 ],
             "crypto/evp/e_idea.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/e_null.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/e_old.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/e_rc2.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/e_rc4.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/e_rc4_hmac_md5.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/e_rc5.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/e_seed.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/e_sm4.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto",
                     "crypto/modes",
@@ -7023,328 +6691,267 @@ our %unified_info = (
             "crypto/evp/e_xcbc_d.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/encode.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/evp_cnf.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/evp_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/evp_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/evp_key.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/evp_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/evp_pbe.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/evp_pkey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/m_md2.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/m_md4.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/m_md5.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/m_md5_sha1.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/m_mdc2.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/m_null.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/m_ripemd.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/m_sha1.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/m_sha3.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto",
                 ],
             "crypto/evp/m_sigver.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/m_wp.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/names.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/p5_crpt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/p5_crpt2.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/p_dec.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/p_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/p_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/p_open.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/p_seal.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/p_sign.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/p_verify.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/pbe_scrypt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/pmeth_fn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/pmeth_gn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/pmeth_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ex_data.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/getenv.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/hmac/hm_ameth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/hmac/hm_pmeth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/hmac/hmac.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/idea/i_cbc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/idea/i_cfb64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/idea/i_ecb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/idea/i_ofb64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/idea/i_skey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
-            "crypto/include/internal/bn_conf.h" =>
-                [
-                    ".",
-                ],
-            "crypto/include/internal/dso_conf.h" =>
-                [
-                    ".",
-                ],
             "crypto/init.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/kdf/hkdf.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/kdf/kdf_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/kdf/scrypt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/kdf/tls1_prf.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/lhash/lh_stats.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/lhash/lhash.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/md4/md4_dgst.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/md4/md4_one.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/md5/md5-sparcv9.o" =>
@@ -7354,85 +6961,71 @@ our %unified_info = (
             "crypto/md5/md5_dgst.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/md5/md5_one.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/mdc2/mdc2_one.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/mdc2/mdc2dgst.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/mem.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/mem_clr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/mem_dbg.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/mem_sec.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/modes/cbc128.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/modes/ccm128.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/modes/cfb128.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/modes/ctr128.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/modes/cts128.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/modes/gcm128.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto",
                 ],
@@ -7455,361 +7048,301 @@ our %unified_info = (
             "crypto/modes/ocb128.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/modes/ofb128.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/modes/wrap128.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/modes/xts128.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/o_dir.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/o_fips.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/o_fopen.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/o_init.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/o_str.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/o_time.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/objects/o_names.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/objects/obj_dat.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/objects/obj_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/objects/obj_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/objects/obj_xref.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ocsp/ocsp_asn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ocsp/ocsp_cl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ocsp/ocsp_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ocsp/ocsp_ext.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ocsp/ocsp_ht.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ocsp/ocsp_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ocsp/ocsp_prn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ocsp/ocsp_srv.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ocsp/ocsp_vfy.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ocsp/v3_ocsp.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pem/pem_all.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pem/pem_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pem/pem_info.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pem/pem_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pem/pem_oth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pem/pem_pk8.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pem/pem_pkey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pem/pem_sign.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pem/pem_x509.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pem/pem_xaux.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pem/pvkfmt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_add.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_asn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_attr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_crpt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_crt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_decr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_init.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_key.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_kiss.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_mutl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_npas.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_p8d.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_p8e.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_sbag.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_utl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/pk12err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs7/bio_pk7.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs7/pk7_asn1.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs7/pk7_attr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs7/pk7_doit.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs7/pk7_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs7/pk7_mime.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs7/pk7_smime.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs7/pkcs7err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/poly1305/poly1305-armv4.o" =>
@@ -7831,259 +7364,216 @@ our %unified_info = (
             "crypto/poly1305/poly1305.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/poly1305/poly1305_ameth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/poly1305/poly1305_pmeth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rand/drbg_ctr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rand/drbg_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rand/rand_egd.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rand/rand_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rand/rand_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rand/rand_unix.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rand/rand_vms.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rand/rand_win.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rand/randfile.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rc2/rc2_cbc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rc2/rc2_ecb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rc2/rc2_skey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rc2/rc2cfb64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rc2/rc2ofb64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rc4/rc4_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rc4/rc4_skey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ripemd/rmd_dgst.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ripemd/rmd_one.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_ameth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_asn1.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_chk.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_crpt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_depr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_gen.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_meth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_mp.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_none.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_oaep.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_ossl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_pk1.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_pmeth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_prn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_pss.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_saos.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_sign.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_ssl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_x931.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_x931g.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/s390xcpuid.o" =>
@@ -8093,31 +7583,26 @@ our %unified_info = (
             "crypto/seed/seed.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/seed/seed_cbc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/seed/seed_cfb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/seed/seed_ecb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/seed/seed_ofb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sha/keccak1600-armv4.o" =>
@@ -8127,7 +7612,6 @@ our %unified_info = (
             "crypto/sha/keccak1600.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sha/sha1-armv4-large.o" =>
@@ -8153,13 +7637,11 @@ our %unified_info = (
             "crypto/sha/sha1_one.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sha/sha1dgst.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sha/sha256-armv4.o" =>
@@ -8185,7 +7667,6 @@ our %unified_info = (
             "crypto/sha/sha256.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sha/sha512-armv4.o" =>
@@ -8211,709 +7692,591 @@ our %unified_info = (
             "crypto/sha/sha512.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/siphash/siphash.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/siphash/siphash_ameth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/siphash/siphash_pmeth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sm2/sm2_crypt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sm2/sm2_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sm2/sm2_pmeth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sm2/sm2_sign.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sm3/m_sm3.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sm3/sm3.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sm4/sm4.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/srp/srp_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/srp/srp_vfy.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/stack/stack.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/store/loader_file.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/store/store_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/store/store_init.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/store/store_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/store/store_register.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/store/store_strings.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/threads_none.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/threads_pthread.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/threads_win.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ts/ts_asn1.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ts/ts_conf.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ts/ts_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ts/ts_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ts/ts_req_print.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ts/ts_req_utils.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ts/ts_rsp_print.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ts/ts_rsp_sign.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ts/ts_rsp_utils.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ts/ts_rsp_verify.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ts/ts_verify_ctx.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/txt_db/txt_db.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ui/ui_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ui/ui_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ui/ui_null.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ui/ui_openssl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ui/ui_util.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/uid.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/whrlpool/wp_block.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/whrlpool/wp_dgst.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/by_dir.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/by_file.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/t_crl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/t_req.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/t_x509.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_att.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_cmp.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_d2.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_def.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_ext.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_lu.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_meth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_obj.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_r2x.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_req.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_set.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_trs.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_txt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_v3.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_vfy.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_vpm.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509cset.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509name.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509rset.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509spki.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509type.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x_all.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x_attrib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x_crl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x_exten.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x_name.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x_pubkey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x_req.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x_x509.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x_x509a.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/pcy_cache.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/pcy_data.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/pcy_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/pcy_map.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/pcy_node.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/pcy_tree.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_addr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_admis.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_akey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_akeya.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_alt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_asid.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_bcons.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_bitst.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_conf.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_cpols.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_crld.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_enum.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_extku.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_genn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_ia5.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_info.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_int.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_ncons.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_pci.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_pcia.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_pcons.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_pku.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_pmaps.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_prn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_purp.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_skey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_sxnet.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_tlsf.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_utl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "engines/e_capi.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "engines/e_padlock.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "fuzz/asn1.o" =>
@@ -8964,6 +8327,14 @@ our %unified_info = (
                 [
                     "include",
                 ],
+            "include/crypto/bn_conf.h" =>
+                [
+                    ".",
+                ],
+            "include/crypto/dso_conf.h" =>
+                [
+                    ".",
+                ],
             "include/openssl/opensslconf.h" =>
                 [
                     ".",
@@ -9208,7 +8579,6 @@ our %unified_info = (
                 [
                     ".",
                     "include",
-                    "crypto/include",
                 ],
             "test/asn1_string_table_test.o" =>
                 [
@@ -9534,7 +8904,6 @@ our %unified_info = (
                 [
                     ".",
                     "include",
-                    "crypto/include",
                 ],
             "test/cipher_overhead_test.o" =>
                 [
@@ -9580,7 +8949,6 @@ our %unified_info = (
             "test/ctype_internal_test.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "test/curve448_internal_test.o" =>
@@ -9646,7 +9014,6 @@ our %unified_info = (
                 [
                     "include",
                     "crypto/ec",
-                    "crypto/include",
                 ],
             "test/ecdsatest.o" =>
                 [
@@ -9671,7 +9038,6 @@ our %unified_info = (
             "test/evp_extra_test.o" =>
                 [
                     "include",
-                    "crypto/include",
                 ],
             "test/evp_test.o" =>
                 [
@@ -9769,7 +9135,6 @@ our %unified_info = (
                 [
                     ".",
                     "include",
-                    "crypto/include",
                 ],
             "test/rc2test.o" =>
                 [
@@ -9819,18 +9184,15 @@ our %unified_info = (
                 [
                     ".",
                     "include",
-                    "crypto/include",
                 ],
             "test/sm2_internal_test.o" =>
                 [
                     "include",
-                    "crypto/include",
                 ],
             "test/sm4_internal_test.o" =>
                 [
                     ".",
                     "include",
-                    "crypto/include",
                 ],
             "test/srptest.o" =>
                 [
@@ -9841,6 +9203,10 @@ our %unified_info = (
                     ".",
                     "include",
                 ],
+            "test/ssl_ctx_test.o" =>
+                [
+                    "include",
+                ],
             "test/ssl_test.o" =>
                 [
                     "include",
@@ -9904,10 +9270,6 @@ our %unified_info = (
                 [
                     "include",
                 ],
-            "test/testutil/init.o" =>
-                [
-                    "include",
-                ],
             "test/testutil/main.o" =>
                 [
                     "include",
@@ -9936,6 +9298,10 @@ our %unified_info = (
                 [
                     "include",
                 ],
+            "test/testutil/testutil_init.o" =>
+                [
+                    "include",
+                ],
             "test/threadstest.o" =>
                 [
                     "include",
@@ -10200,6 +9566,7 @@ our %unified_info = (
             "test/sm4_internal_test",
             "test/srptest",
             "test/ssl_cert_table_internal_test",
+            "test/ssl_ctx_test",
             "test/ssl_test",
             "test/ssl_test_ctx_test",
             "test/sslapitest",
@@ -15090,7 +14457,6 @@ our %unified_info = (
                     "test/testutil/cb.o",
                     "test/testutil/driver.o",
                     "test/testutil/format_output.o",
-                    "test/testutil/init.o",
                     "test/testutil/main.o",
                     "test/testutil/output_helpers.o",
                     "test/testutil/random.o",
@@ -15098,6 +14464,7 @@ our %unified_info = (
                     "test/testutil/tap_bio.o",
                     "test/testutil/test_cleanup.o",
                     "test/testutil/tests.o",
+                    "test/testutil/testutil_init.o",
                 ],
             "test/md2test" =>
                 [
@@ -15325,6 +14692,14 @@ our %unified_info = (
                 [
                     "test/ssl_cert_table_internal_test.c",
                 ],
+            "test/ssl_ctx_test" =>
+                [
+                    "test/ssl_ctx_test.o",
+                ],
+            "test/ssl_ctx_test.o" =>
+                [
+                    "test/ssl_ctx_test.c",
+                ],
             "test/ssl_test" =>
                 [
                     "test/handshake_helper.o",
@@ -15427,10 +14802,6 @@ our %unified_info = (
                 [
                     "test/testutil/format_output.c",
                 ],
-            "test/testutil/init.o" =>
-                [
-                    "test/testutil/init.c",
-                ],
             "test/testutil/main.o" =>
                 [
                     "test/testutil/main.c",
@@ -15459,6 +14830,10 @@ our %unified_info = (
                 [
                     "test/testutil/tests.c",
                 ],
+            "test/testutil/testutil_init.o" =>
+                [
+                    "test/testutil/testutil_init.c",
+                ],
             "test/threadstest" =>
                 [
                     "test/threadstest.o",
diff --git a/deps/openssl/config/archs/aix64-gcc/no-asm/crypto/buildinf.h b/deps/openssl/config/archs/aix64-gcc/no-asm/crypto/buildinf.h
index 533bf0b9e3..eca0e52e0a 100644
--- a/deps/openssl/config/archs/aix64-gcc/no-asm/crypto/buildinf.h
+++ b/deps/openssl/config/archs/aix64-gcc/no-asm/crypto/buildinf.h
@@ -11,7 +11,7 @@
  */
 
 #define PLATFORM "platform: aix64-gcc"
-#define DATE "built on: Fri Sep 13 15:57:13 2019 UTC"
+#define DATE "built on: Wed Mar 18 21:04:46 2020 UTC"
 
 /*
  * Generate compiler_flags as an array of individual characters. This is a
diff --git a/deps/openssl/config/archs/aix64-gcc/no-asm/crypto/include/internal/bn_conf.h b/deps/openssl/config/archs/aix64-gcc/no-asm/crypto/include/internal/bn_conf.h
index 34bd8b78b4..5312ef5a7a 100644
--- a/deps/openssl/config/archs/aix64-gcc/no-asm/crypto/include/internal/bn_conf.h
+++ b/deps/openssl/config/archs/aix64-gcc/no-asm/crypto/include/internal/bn_conf.h
@@ -1,5 +1,5 @@
 /* WARNING: do not edit! */
-/* Generated by Makefile from crypto/include/internal/bn_conf.h.in */
+/* Generated by Makefile from include/crypto/bn_conf.h.in */
 /*
  * Copyright 2016 The OpenSSL Project Authors. All Rights Reserved.
  *
@@ -9,8 +9,8 @@
  * https://www.openssl.org/source/license.html
  */
 
-#ifndef HEADER_BN_CONF_H
-# define HEADER_BN_CONF_H
+#ifndef OSSL_CRYPTO_BN_CONF_H
+# define OSSL_CRYPTO_BN_CONF_H
 
 /*
  * The contents of this file are not used in the UEFI build, as
diff --git a/deps/openssl/config/archs/aix64-gcc/no-asm/crypto/include/internal/dso_conf.h b/deps/openssl/config/archs/aix64-gcc/no-asm/crypto/include/internal/dso_conf.h
index 252266ec2a..4b1167c3d8 100644
--- a/deps/openssl/config/archs/aix64-gcc/no-asm/crypto/include/internal/dso_conf.h
+++ b/deps/openssl/config/archs/aix64-gcc/no-asm/crypto/include/internal/dso_conf.h
@@ -1,5 +1,5 @@
 /* WARNING: do not edit! */
-/* Generated by Makefile from crypto/include/internal/dso_conf.h.in */
+/* Generated by Makefile from include/crypto/dso_conf.h.in */
 /*
  * Copyright 2016-2019 The OpenSSL Project Authors. All Rights Reserved.
  *
@@ -9,8 +9,8 @@
  * https://www.openssl.org/source/license.html
  */
 
-#ifndef HEADER_DSO_CONF_H
-# define HEADER_DSO_CONF_H
+#ifndef OSSL_CRYPTO_DSO_CONF_H
+# define OSSL_CRYPTO_DSO_CONF_H
 # define DSO_DLFCN
 # define HAVE_DLFCN_H
 # define DSO_EXTENSION ".so"
diff --git a/deps/openssl/config/archs/aix64-gcc/no-asm/include/openssl/opensslconf.h b/deps/openssl/config/archs/aix64-gcc/no-asm/include/openssl/opensslconf.h
index c118ab6b89..267f47f523 100644
--- a/deps/openssl/config/archs/aix64-gcc/no-asm/include/openssl/opensslconf.h
+++ b/deps/openssl/config/archs/aix64-gcc/no-asm/include/openssl/opensslconf.h
@@ -102,9 +102,6 @@ extern "C" {
 #ifndef OPENSSL_NO_DYNAMIC_ENGINE
 # define OPENSSL_NO_DYNAMIC_ENGINE
 #endif
-#ifndef OPENSSL_NO_AFALGENG
-# define OPENSSL_NO_AFALGENG
-#endif
 
 
 /*
diff --git a/deps/openssl/config/archs/aix64-gcc/no-asm/include/progs.h b/deps/openssl/config/archs/aix64-gcc/no-asm/include/progs.h
index 9b3d270e20..308c65601b 100644
--- a/deps/openssl/config/archs/aix64-gcc/no-asm/include/progs.h
+++ b/deps/openssl/config/archs/aix64-gcc/no-asm/include/progs.h
@@ -2,7 +2,7 @@
  * WARNING: do not edit!
  * Generated by apps/progs.pl
  *
- * Copyright 1995-2019 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 1995-2020 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
diff --git a/deps/openssl/config/archs/darwin-i386-cc/asm/configdata.pm b/deps/openssl/config/archs/darwin-i386-cc/asm/configdata.pm
index d9ceb02bb7..e7607607e4 100644
--- a/deps/openssl/config/archs/darwin-i386-cc/asm/configdata.pm
+++ b/deps/openssl/config/archs/darwin-i386-cc/asm/configdata.pm
@@ -48,14 +48,14 @@ our %config = (
   export_var_as_fn => "0",
   includes => [  ],
   lflags => [  ],
-  lib_defines => [ "OPENSSL_PIC", "OPENSSL_CPUID_OBJ", "OPENSSL_BN_ASM_PART_WORDS", "OPENSSL_IA32_SSE2", "OPENSSL_BN_ASM_MONT", "OPENSSL_BN_ASM_GF2m", "SHA1_ASM", "SHA256_ASM", "SHA512_ASM", "RC4_ASM", "MD5_ASM", "RMD160_ASM", "VPAES_ASM", "WHIRLPOOL_ASM", "GHASH_ASM", "ECP_NISTZ256_ASM", "POLY1305_ASM" ],
+  lib_defines => [ "OPENSSL_PIC", "OPENSSL_CPUID_OBJ", "OPENSSL_BN_ASM_PART_WORDS", "OPENSSL_IA32_SSE2", "OPENSSL_BN_ASM_MONT", "OPENSSL_BN_ASM_GF2m", "SHA1_ASM", "SHA256_ASM", "SHA512_ASM", "RC4_ASM", "MD5_ASM", "RMD160_ASM", "AESNI_ASM", "VPAES_ASM", "WHIRLPOOL_ASM", "GHASH_ASM", "ECP_NISTZ256_ASM", "POLY1305_ASM" ],
   libdir => "",
   major => "1",
   makedepprog => "\$(CROSS_COMPILE)gcc",
   minor => "1.1",
   openssl_algorithm_defines => [ "OPENSSL_NO_COMP", "OPENSSL_NO_MD2", "OPENSSL_NO_RC5" ],
   openssl_api_defines => [  ],
-  openssl_other_defines => [ "OPENSSL_RAND_SEED_OS", "OPENSSL_NO_AFALGENG", "OPENSSL_NO_ASAN", "OPENSSL_NO_CRYPTO_MDEBUG", "OPENSSL_NO_CRYPTO_MDEBUG_BACKTRACE", "OPENSSL_NO_DEVCRYPTOENG", "OPENSSL_NO_EC_NISTP_64_GCC_128", "OPENSSL_NO_EGD", "OPENSSL_NO_EXTERNAL_TESTS", "OPENSSL_NO_FUZZ_AFL", "OPENSSL_NO_FUZZ_LIBFUZZER", "OPENSSL_NO_HEARTBEATS", "OPENSSL_NO_MSAN", "OPENSSL_NO_SCTP", "OPENSSL_NO_SSL3", "OPENSSL_NO_SSL3_METHOD", "OPENSSL_NO_UBSAN", "OPENSSL_NO_UNIT_TEST", "OPENSSL_NO_WEAK_SSL_CIPHERS", "OPENSSL_NO_DYNAMIC_ENGINE", "OPENSSL_NO_AFALGENG" ],
+  openssl_other_defines => [ "OPENSSL_RAND_SEED_OS", "OPENSSL_NO_AFALGENG", "OPENSSL_NO_ASAN", "OPENSSL_NO_CRYPTO_MDEBUG", "OPENSSL_NO_CRYPTO_MDEBUG_BACKTRACE", "OPENSSL_NO_DEVCRYPTOENG", "OPENSSL_NO_EC_NISTP_64_GCC_128", "OPENSSL_NO_EGD", "OPENSSL_NO_EXTERNAL_TESTS", "OPENSSL_NO_FUZZ_AFL", "OPENSSL_NO_FUZZ_LIBFUZZER", "OPENSSL_NO_HEARTBEATS", "OPENSSL_NO_MSAN", "OPENSSL_NO_SCTP", "OPENSSL_NO_SSL3", "OPENSSL_NO_SSL3_METHOD", "OPENSSL_NO_UBSAN", "OPENSSL_NO_UNIT_TEST", "OPENSSL_NO_WEAK_SSL_CIPHERS", "OPENSSL_NO_DYNAMIC_ENGINE" ],
   openssl_sys_defines => [ "OPENSSL_SYS_MACOSX" ],
   openssl_thread_defines => [ "OPENSSL_THREADS" ],
   openssldir => "",
@@ -111,8 +111,8 @@ our %config = (
   sourcedir => ".",
   target => "darwin-i386-cc",
   tdirs => [ "ossl_shim" ],
-  version => "1.1.1d",
-  version_num => "0x1010104fL",
+  version => "1.1.1e",
+  version_num => "0x1010105fL",
 );
 
 our %target = (
@@ -235,6 +235,7 @@ our @disablables = (
   "dgram",
   "dh",
   "dsa",
+  "dso",
   "dtls",
   "dynamic-engine",
   "ec",
@@ -352,8 +353,8 @@ our %unified_info = (
         {
             "" =>
                 [
-                    "crypto/include/internal/bn_conf.h",
-                    "crypto/include/internal/dso_conf.h",
+                    "include/crypto/bn_conf.h",
+                    "include/crypto/dso_conf.h",
                     "include/openssl/opensslconf.h",
                 ],
             "apps/asn1pars.o" =>
@@ -621,14 +622,6 @@ our %unified_info = (
                     "crypto/perlasm/cbc.pl",
                     "crypto/perlasm/x86asm.pl",
                 ],
-            "crypto/include/internal/bn_conf.h" =>
-                [
-                    "configdata.pm",
-                ],
-            "crypto/include/internal/dso_conf.h" =>
-                [
-                    "configdata.pm",
-                ],
             "crypto/rc4/rc4-586.s" =>
                 [
                     "crypto/perlasm/x86asm.pl",
@@ -704,6 +697,14 @@ our %unified_info = (
                 [
                     "libcrypto",
                 ],
+            "include/crypto/bn_conf.h" =>
+                [
+                    "configdata.pm",
+                ],
+            "include/crypto/dso_conf.h" =>
+                [
+                    "configdata.pm",
+                ],
             "include/openssl/opensslconf.h" =>
                 [
                     "configdata.pm",
@@ -1493,6 +1494,12 @@ our %unified_info = (
                     "libcrypto",
                     "test/libtestutil.a",
                 ],
+            "test/ssl_ctx_test" =>
+                [
+                    "libcrypto",
+                    "libssl",
+                    "test/libtestutil.a",
+                ],
             "test/ssl_test" =>
                 [
                     "libcrypto",
@@ -3224,7 +3231,6 @@ our %unified_info = (
                             "test/testutil/cb.o",
                             "test/testutil/driver.o",
                             "test/testutil/format_output.o",
-                            "test/testutil/init.o",
                             "test/testutil/main.o",
                             "test/testutil/output_helpers.o",
                             "test/testutil/random.o",
@@ -3232,6 +3238,7 @@ our %unified_info = (
                             "test/testutil/tap_bio.o",
                             "test/testutil/test_cleanup.o",
                             "test/testutil/tests.o",
+                            "test/testutil/testutil_init.o",
                         ],
                     "products" =>
                         {
@@ -3730,14 +3737,6 @@ our %unified_info = (
                 [
                     "crypto/ia64cpuid.S",
                 ],
-            "crypto/include/internal/bn_conf.h" =>
-                [
-                    "crypto/include/internal/bn_conf.h.in",
-                ],
-            "crypto/include/internal/dso_conf.h" =>
-                [
-                    "crypto/include/internal/dso_conf.h.in",
-                ],
             "crypto/md5/md5-586.s" =>
                 [
                     "crypto/md5/asm/md5-586.pl",
@@ -4178,6 +4177,14 @@ our %unified_info = (
                     "engines/asm/e_padlock-x86_64.pl",
                     "\$(PERLASM_SCHEME)",
                 ],
+            "include/crypto/bn_conf.h" =>
+                [
+                    "include/crypto/bn_conf.h.in",
+                ],
+            "include/crypto/dso_conf.h" =>
+                [
+                    "include/crypto/dso_conf.h.in",
+                ],
             "include/openssl/opensslconf.h" =>
                 [
                     "include/openssl/opensslconf.h.in",
@@ -4860,49 +4867,41 @@ our %unified_info = (
             "crypto/aes/aes_cbc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/aes/aes_cfb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/aes/aes_core.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/aes/aes_ecb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/aes/aes_ige.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/aes/aes_misc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/aes/aes_ofb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/aes/aes_wrap.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/aes/aesfx-sparcv9.o" =>
@@ -4912,7 +4911,6 @@ our %unified_info = (
             "crypto/aes/aesni-x86.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/aes/aest4-sparcv9.o" =>
@@ -4930,13 +4928,11 @@ our %unified_info = (
             "crypto/aes/vpaes-x86.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/aria/aria.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/arm64cpuid.o" =>
@@ -4950,613 +4946,511 @@ our %unified_info = (
             "crypto/asn1/a_bitstr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_d2i_fp.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_digest.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_dup.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_gentm.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_i2d_fp.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_int.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_mbstr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_object.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_octet.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_print.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_sign.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_strex.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_strnid.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_time.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_type.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_utctm.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_utf8.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_verify.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/ameth_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/asn1_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/asn1_gen.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/asn1_item_list.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/asn1_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/asn1_par.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/asn_mime.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/asn_moid.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/asn_mstbl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/asn_pack.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/bio_asn1.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/bio_ndef.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/d2i_pr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/d2i_pu.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/evp_asn1.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/f_int.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/f_string.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/i2d_pr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/i2d_pu.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/n_pkey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/nsseq.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/p5_pbe.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/p5_pbev2.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/p5_scrypt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/p8_pkey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/t_bitst.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/t_pkey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/t_spki.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/tasn_dec.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/tasn_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/tasn_fre.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/tasn_new.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/tasn_prn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/tasn_scn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/tasn_typ.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/tasn_utl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/x_algor.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/x_bignum.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/x_info.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/x_int64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/x_long.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/x_pkey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/x_sig.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/x_spki.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/x_val.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/async/arch/async_null.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/async/arch/async_posix.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/async/arch/async_win.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/async/async.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/async/async_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/async/async_wait.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bf/bf-586.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bf/bf_cfb64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bf/bf_ecb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bf/bf_ofb64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bf/bf_skey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/b_addr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/b_dump.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/b_print.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/b_sock.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/b_sock2.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bf_buff.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bf_lbuf.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bf_nbio.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bf_null.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bio_cb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bio_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bio_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bio_meth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bss_acpt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bss_bio.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bss_conn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bss_dgram.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bss_fd.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bss_file.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bss_log.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bss_mem.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bss_null.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bss_sock.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/blake2/blake2b.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/blake2/blake2s.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/blake2/m_blake2b.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/blake2/m_blake2s.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/armv4-gf2m.o" =>
@@ -5570,7 +5464,6 @@ our %unified_info = (
             "crypto/bn/bn-586.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn-mips.o" =>
@@ -5580,188 +5473,157 @@ our %unified_info = (
             "crypto/bn/bn_add.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_blind.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_const.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_ctx.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_depr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_dh.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_div.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_exp.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto",
                 ],
             "crypto/bn/bn_exp2.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_gcd.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_gf2m.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_intern.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_kron.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_mod.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_mont.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_mpi.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_mul.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_nist.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_prime.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_print.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_rand.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_recp.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_shift.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_sqr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_sqrt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_srp.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_word.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_x931p.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/co-586.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/mips-mont.o" =>
@@ -5791,25 +5653,21 @@ our %unified_info = (
             "crypto/bn/x86-gf2m.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/x86-mont.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/buffer/buf_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/buffer/buffer.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/buildinf.h" =>
@@ -5819,31 +5677,26 @@ our %unified_info = (
             "crypto/camellia/cmll-x86.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/camellia/cmll_cfb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/camellia/cmll_ctr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/camellia/cmll_ecb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/camellia/cmll_ofb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/camellia/cmllt4-sparcv9.o" =>
@@ -5853,31 +5706,26 @@ our %unified_info = (
             "crypto/cast/c_cfb64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cast/c_ecb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cast/c_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cast/c_ofb64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cast/c_skey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/chacha/chacha-armv4.o" =>
@@ -5895,284 +5743,237 @@ our %unified_info = (
             "crypto/chacha/chacha-x86.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cmac/cm_ameth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cmac/cm_pmeth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cmac/cmac.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_asn1.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_att.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_cd.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_dd.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_env.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_ess.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_io.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_kari.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_pwri.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_sd.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_smime.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/conf/conf_api.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/conf/conf_def.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/conf/conf_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/conf/conf_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/conf/conf_mall.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/conf/conf_mod.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/conf/conf_sap.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/conf/conf_ssl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cpt_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cryptlib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ct/ct_b64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ct/ct_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ct/ct_log.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ct/ct_oct.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ct/ct_policy.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ct/ct_prn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ct/ct_sct.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ct/ct_sct_ctx.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ct/ct_vfy.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ct/ct_x509v3.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ctype.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cversion.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto",
                 ],
             "crypto/des/cbc_cksm.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/cbc_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/cfb64ede.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/cfb64enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/cfb_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/crypt586.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/des-586.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/dest4-sparcv9.o" =>
@@ -6182,295 +5983,246 @@ our %unified_info = (
             "crypto/des/ecb3_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/ecb_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/fcrypt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/ofb64ede.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/ofb64enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/ofb_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/pcbc_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/qud_cksm.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/rand_key.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/set_key.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/str2key.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/xcbc_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_ameth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_asn1.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_check.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_depr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_gen.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_kdf.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_key.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_meth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_pmeth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_prn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_rfc5114.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_rfc7919.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dsa/dsa_ameth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dsa/dsa_asn1.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dsa/dsa_depr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dsa/dsa_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dsa/dsa_gen.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dsa/dsa_key.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dsa/dsa_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dsa/dsa_meth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dsa/dsa_ossl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dsa/dsa_pmeth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dsa/dsa_prn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dsa/dsa_sign.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dsa/dsa_vrf.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dso/dso_dl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dso/dso_dlfcn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dso/dso_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dso/dso_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dso/dso_openssl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dso/dso_vms.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dso/dso_win32.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ebcdic.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/curve25519.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/curve448/arch_32/f_impl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto/ec/curve448/arch_32",
                     "crypto/ec/curve448",
@@ -6478,7 +6230,6 @@ our %unified_info = (
             "crypto/ec/curve448/curve448.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto/ec/curve448/arch_32",
                     "crypto/ec/curve448",
@@ -6486,7 +6237,6 @@ our %unified_info = (
             "crypto/ec/curve448/curve448_tables.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto/ec/curve448/arch_32",
                     "crypto/ec/curve448",
@@ -6494,7 +6244,6 @@ our %unified_info = (
             "crypto/ec/curve448/eddsa.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto/ec/curve448/arch_32",
                     "crypto/ec/curve448",
@@ -6502,7 +6251,6 @@ our %unified_info = (
             "crypto/ec/curve448/f_generic.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto/ec/curve448/arch_32",
                     "crypto/ec/curve448",
@@ -6510,7 +6258,6 @@ our %unified_info = (
             "crypto/ec/curve448/scalar.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto/ec/curve448/arch_32",
                     "crypto/ec/curve448",
@@ -6518,163 +6265,136 @@ our %unified_info = (
             "crypto/ec/ec2_oct.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec2_smpl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec_ameth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec_asn1.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec_check.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec_curve.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec_cvt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec_key.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec_kmeth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec_mult.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec_oct.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec_pmeth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec_print.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecdh_kdf.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecdh_ossl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecdsa_ossl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecdsa_sign.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecdsa_vrf.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/eck_prn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecp_mont.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecp_nist.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecp_nistp224.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecp_nistp256.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecp_nistp521.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecp_nistputil.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecp_nistz256-armv4.o" =>
@@ -6692,235 +6412,196 @@ our %unified_info = (
             "crypto/ec/ecp_nistz256-x86.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecp_nistz256.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecp_oct.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecp_smpl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecx_meth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/eng_all.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/eng_cnf.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/eng_ctrl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/eng_dyn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/eng_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/eng_fat.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/eng_init.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/eng_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/eng_list.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/eng_openssl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/eng_pkey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/eng_rdrand.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/eng_table.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/tb_asnmth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/tb_cipher.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/tb_dh.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/tb_digest.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/tb_dsa.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/tb_eckey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/tb_pkmeth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/tb_rand.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/tb_rsa.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/err/err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/err/err_all.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/err/err_prn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/bio_b64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/bio_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/bio_md.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/bio_ok.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/c_allc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/c_alld.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/cmeth_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/digest.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/e_aes.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto",
                     "crypto/modes",
@@ -6928,21 +6609,18 @@ our %unified_info = (
             "crypto/evp/e_aes_cbc_hmac_sha1.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto/modes",
                 ],
             "crypto/evp/e_aes_cbc_hmac_sha256.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto/modes",
                 ],
             "crypto/evp/e_aria.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto",
                     "crypto/modes",
@@ -6950,13 +6628,11 @@ our %unified_info = (
             "crypto/evp/e_bf.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/e_camellia.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto",
                     "crypto/modes",
@@ -6964,81 +6640,68 @@ our %unified_info = (
             "crypto/evp/e_cast.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/e_chacha20_poly1305.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/e_des.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto",
                 ],
             "crypto/evp/e_des3.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto",
                 ],
             "crypto/evp/e_idea.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/e_null.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/e_old.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/e_rc2.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/e_rc4.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/e_rc4_hmac_md5.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/e_rc5.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/e_seed.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/e_sm4.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto",
                     "crypto/modes",
@@ -7046,334 +6709,272 @@ our %unified_info = (
             "crypto/evp/e_xcbc_d.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/encode.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/evp_cnf.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/evp_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/evp_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/evp_key.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/evp_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/evp_pbe.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/evp_pkey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/m_md2.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/m_md4.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/m_md5.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/m_md5_sha1.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/m_mdc2.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/m_null.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/m_ripemd.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/m_sha1.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/m_sha3.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto",
                 ],
             "crypto/evp/m_sigver.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/m_wp.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/names.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/p5_crpt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/p5_crpt2.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/p_dec.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/p_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/p_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/p_open.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/p_seal.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/p_sign.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/p_verify.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/pbe_scrypt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/pmeth_fn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/pmeth_gn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/pmeth_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ex_data.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/getenv.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/hmac/hm_ameth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/hmac/hm_pmeth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/hmac/hmac.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/idea/i_cbc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/idea/i_cfb64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/idea/i_ecb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/idea/i_ofb64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/idea/i_skey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
-            "crypto/include/internal/bn_conf.h" =>
-                [
-                    ".",
-                ],
-            "crypto/include/internal/dso_conf.h" =>
-                [
-                    ".",
-                ],
             "crypto/init.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/kdf/hkdf.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/kdf/kdf_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/kdf/scrypt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/kdf/tls1_prf.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/lhash/lh_stats.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/lhash/lhash.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/md4/md4_dgst.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/md4/md4_one.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/md5/md5-586.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/md5/md5-sparcv9.o" =>
@@ -7383,79 +6984,66 @@ our %unified_info = (
             "crypto/md5/md5_dgst.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/md5/md5_one.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/mdc2/mdc2_one.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/mdc2/mdc2dgst.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/mem.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/mem_dbg.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/mem_sec.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/modes/cbc128.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/modes/ccm128.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/modes/cfb128.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/modes/ctr128.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/modes/cts128.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/modes/gcm128.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto",
                 ],
@@ -7474,7 +7062,6 @@ our %unified_info = (
             "crypto/modes/ghash-x86.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/modes/ghashv8-armx.o" =>
@@ -7484,361 +7071,301 @@ our %unified_info = (
             "crypto/modes/ocb128.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/modes/ofb128.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/modes/wrap128.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/modes/xts128.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/o_dir.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/o_fips.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/o_fopen.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/o_init.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/o_str.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/o_time.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/objects/o_names.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/objects/obj_dat.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/objects/obj_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/objects/obj_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/objects/obj_xref.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ocsp/ocsp_asn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ocsp/ocsp_cl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ocsp/ocsp_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ocsp/ocsp_ext.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ocsp/ocsp_ht.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ocsp/ocsp_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ocsp/ocsp_prn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ocsp/ocsp_srv.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ocsp/ocsp_vfy.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ocsp/v3_ocsp.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pem/pem_all.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pem/pem_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pem/pem_info.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pem/pem_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pem/pem_oth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pem/pem_pk8.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pem/pem_pkey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pem/pem_sign.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pem/pem_x509.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pem/pem_xaux.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pem/pvkfmt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_add.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_asn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_attr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_crpt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_crt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_decr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_init.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_key.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_kiss.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_mutl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_npas.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_p8d.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_p8e.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_sbag.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_utl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/pk12err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs7/bio_pk7.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs7/pk7_asn1.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs7/pk7_attr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs7/pk7_doit.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs7/pk7_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs7/pk7_mime.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs7/pk7_smime.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs7/pkcs7err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/poly1305/poly1305-armv4.o" =>
@@ -7860,265 +7387,221 @@ our %unified_info = (
             "crypto/poly1305/poly1305-x86.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/poly1305/poly1305.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/poly1305/poly1305_ameth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/poly1305/poly1305_pmeth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rand/drbg_ctr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rand/drbg_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rand/rand_egd.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rand/rand_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rand/rand_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rand/rand_unix.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rand/rand_vms.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rand/rand_win.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rand/randfile.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rc2/rc2_cbc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rc2/rc2_ecb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rc2/rc2_skey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rc2/rc2cfb64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rc2/rc2ofb64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rc4/rc4-586.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ripemd/rmd-586.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ripemd/rmd_dgst.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ripemd/rmd_one.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_ameth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_asn1.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_chk.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_crpt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_depr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_gen.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_meth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_mp.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_none.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_oaep.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_ossl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_pk1.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_pmeth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_prn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_pss.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_saos.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_sign.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_ssl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_x931.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_x931g.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/s390xcpuid.o" =>
@@ -8128,31 +7611,26 @@ our %unified_info = (
             "crypto/seed/seed.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/seed/seed_cbc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/seed/seed_cfb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/seed/seed_ecb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/seed/seed_ofb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sha/keccak1600-armv4.o" =>
@@ -8162,13 +7640,11 @@ our %unified_info = (
             "crypto/sha/keccak1600.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sha/sha1-586.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sha/sha1-armv4-large.o" =>
@@ -8194,19 +7670,16 @@ our %unified_info = (
             "crypto/sha/sha1_one.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sha/sha1dgst.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sha/sha256-586.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sha/sha256-armv4.o" =>
@@ -8232,13 +7705,11 @@ our %unified_info = (
             "crypto/sha/sha256.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sha/sha512-586.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sha/sha512-armv4.o" =>
@@ -8264,727 +7735,606 @@ our %unified_info = (
             "crypto/sha/sha512.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/siphash/siphash.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/siphash/siphash_ameth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/siphash/siphash_pmeth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sm2/sm2_crypt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sm2/sm2_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sm2/sm2_pmeth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sm2/sm2_sign.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sm3/m_sm3.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sm3/sm3.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sm4/sm4.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/srp/srp_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/srp/srp_vfy.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/stack/stack.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/store/loader_file.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/store/store_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/store/store_init.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/store/store_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/store/store_register.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/store/store_strings.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/threads_none.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/threads_pthread.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/threads_win.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ts/ts_asn1.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ts/ts_conf.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ts/ts_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ts/ts_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ts/ts_req_print.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ts/ts_req_utils.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ts/ts_rsp_print.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ts/ts_rsp_sign.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ts/ts_rsp_utils.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ts/ts_rsp_verify.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ts/ts_verify_ctx.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/txt_db/txt_db.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ui/ui_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ui/ui_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ui/ui_null.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ui/ui_openssl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ui/ui_util.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/uid.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/whrlpool/wp-mmx.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/whrlpool/wp_block.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/whrlpool/wp_dgst.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/by_dir.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/by_file.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/t_crl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/t_req.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/t_x509.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_att.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_cmp.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_d2.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_def.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_ext.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_lu.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_meth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_obj.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_r2x.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_req.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_set.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_trs.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_txt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_v3.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_vfy.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_vpm.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509cset.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509name.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509rset.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509spki.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509type.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x_all.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x_attrib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x_crl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x_exten.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x_name.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x_pubkey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x_req.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x_x509.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x_x509a.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/pcy_cache.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/pcy_data.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/pcy_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/pcy_map.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/pcy_node.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/pcy_tree.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_addr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_admis.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_akey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_akeya.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_alt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_asid.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_bcons.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_bitst.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_conf.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_cpols.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_crld.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_enum.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_extku.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_genn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_ia5.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_info.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_int.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_ncons.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_pci.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_pcia.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_pcons.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_pku.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_pmaps.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_prn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_purp.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_skey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_sxnet.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_tlsf.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_utl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x86cpuid.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "engines/e_capi.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "engines/e_padlock-x86.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "engines/e_padlock.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "fuzz/asn1.o" =>
@@ -9035,6 +8385,14 @@ our %unified_info = (
                 [
                     "include",
                 ],
+            "include/crypto/bn_conf.h" =>
+                [
+                    ".",
+                ],
+            "include/crypto/dso_conf.h" =>
+                [
+                    ".",
+                ],
             "include/openssl/opensslconf.h" =>
                 [
                     ".",
@@ -9279,7 +8637,6 @@ our %unified_info = (
                 [
                     ".",
                     "include",
-                    "crypto/include",
                 ],
             "test/asn1_string_table_test.o" =>
                 [
@@ -9605,7 +8962,6 @@ our %unified_info = (
                 [
                     ".",
                     "include",
-                    "crypto/include",
                 ],
             "test/cipher_overhead_test.o" =>
                 [
@@ -9651,7 +9007,6 @@ our %unified_info = (
             "test/ctype_internal_test.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "test/curve448_internal_test.o" =>
@@ -9717,7 +9072,6 @@ our %unified_info = (
                 [
                     "include",
                     "crypto/ec",
-                    "crypto/include",
                 ],
             "test/ecdsatest.o" =>
                 [
@@ -9742,7 +9096,6 @@ our %unified_info = (
             "test/evp_extra_test.o" =>
                 [
                     "include",
-                    "crypto/include",
                 ],
             "test/evp_test.o" =>
                 [
@@ -9840,7 +9193,6 @@ our %unified_info = (
                 [
                     ".",
                     "include",
-                    "crypto/include",
                 ],
             "test/rc2test.o" =>
                 [
@@ -9890,18 +9242,15 @@ our %unified_info = (
                 [
                     ".",
                     "include",
-                    "crypto/include",
                 ],
             "test/sm2_internal_test.o" =>
                 [
                     "include",
-                    "crypto/include",
                 ],
             "test/sm4_internal_test.o" =>
                 [
                     ".",
                     "include",
-                    "crypto/include",
                 ],
             "test/srptest.o" =>
                 [
@@ -9912,6 +9261,10 @@ our %unified_info = (
                     ".",
                     "include",
                 ],
+            "test/ssl_ctx_test.o" =>
+                [
+                    "include",
+                ],
             "test/ssl_test.o" =>
                 [
                     "include",
@@ -9975,10 +9328,6 @@ our %unified_info = (
                 [
                     "include",
                 ],
-            "test/testutil/init.o" =>
-                [
-                    "include",
-                ],
             "test/testutil/main.o" =>
                 [
                     "include",
@@ -10007,6 +9356,10 @@ our %unified_info = (
                 [
                     "include",
                 ],
+            "test/testutil/testutil_init.o" =>
+                [
+                    "include",
+                ],
             "test/threadstest.o" =>
                 [
                     "include",
@@ -10271,6 +9624,7 @@ our %unified_info = (
             "test/sm4_internal_test",
             "test/srptest",
             "test/ssl_cert_table_internal_test",
+            "test/ssl_ctx_test",
             "test/ssl_test",
             "test/ssl_test_ctx_test",
             "test/sslapitest",
@@ -15226,7 +14580,6 @@ our %unified_info = (
                     "test/testutil/cb.o",
                     "test/testutil/driver.o",
                     "test/testutil/format_output.o",
-                    "test/testutil/init.o",
                     "test/testutil/main.o",
                     "test/testutil/output_helpers.o",
                     "test/testutil/random.o",
@@ -15234,6 +14587,7 @@ our %unified_info = (
                     "test/testutil/tap_bio.o",
                     "test/testutil/test_cleanup.o",
                     "test/testutil/tests.o",
+                    "test/testutil/testutil_init.o",
                 ],
             "test/md2test" =>
                 [
@@ -15461,6 +14815,14 @@ our %unified_info = (
                 [
                     "test/ssl_cert_table_internal_test.c",
                 ],
+            "test/ssl_ctx_test" =>
+                [
+                    "test/ssl_ctx_test.o",
+                ],
+            "test/ssl_ctx_test.o" =>
+                [
+                    "test/ssl_ctx_test.c",
+                ],
             "test/ssl_test" =>
                 [
                     "test/handshake_helper.o",
@@ -15563,10 +14925,6 @@ our %unified_info = (
                 [
                     "test/testutil/format_output.c",
                 ],
-            "test/testutil/init.o" =>
-                [
-                    "test/testutil/init.c",
-                ],
             "test/testutil/main.o" =>
                 [
                     "test/testutil/main.c",
@@ -15595,6 +14953,10 @@ our %unified_info = (
                 [
                     "test/testutil/tests.c",
                 ],
+            "test/testutil/testutil_init.o" =>
+                [
+                    "test/testutil/testutil_init.c",
+                ],
             "test/threadstest" =>
                 [
                     "test/threadstest.o",
diff --git a/deps/openssl/config/archs/darwin-i386-cc/asm/crypto/aes/aes-586.s b/deps/openssl/config/archs/darwin-i386-cc/asm/crypto/aes/aes-586.s
deleted file mode 100644
index 5e23147093..0000000000
--- a/deps/openssl/config/archs/darwin-i386-cc/asm/crypto/aes/aes-586.s
+++ /dev/null
@@ -1,3207 +0,0 @@
-.text
-.align	4
-__x86_AES_encrypt_compact:
-	movl	%edi,20(%esp)
-	xorl	(%edi),%eax
-	xorl	4(%edi),%ebx
-	xorl	8(%edi),%ecx
-	xorl	12(%edi),%edx
-	movl	240(%edi),%esi
-	leal	-2(%esi,%esi,1),%esi
-	leal	(%edi,%esi,8),%esi
-	movl	%esi,24(%esp)
-	movl	-128(%ebp),%edi
-	movl	-96(%ebp),%esi
-	movl	-64(%ebp),%edi
-	movl	-32(%ebp),%esi
-	movl	(%ebp),%edi
-	movl	32(%ebp),%esi
-	movl	64(%ebp),%edi
-	movl	96(%ebp),%esi
-.align	4,0x90
-L000loop:
-	movl	%eax,%esi
-	andl	$255,%esi
-	movzbl	-128(%ebp,%esi,1),%esi
-	movzbl	%bh,%edi
-	movzbl	-128(%ebp,%edi,1),%edi
-	shll	$8,%edi
-	xorl	%edi,%esi
-	movl	%ecx,%edi
-	shrl	$16,%edi
-	andl	$255,%edi
-	movzbl	-128(%ebp,%edi,1),%edi
-	shll	$16,%edi
-	xorl	%edi,%esi
-	movl	%edx,%edi
-	shrl	$24,%edi
-	movzbl	-128(%ebp,%edi,1),%edi
-	shll	$24,%edi
-	xorl	%edi,%esi
-	movl	%esi,4(%esp)
-	movl	%ebx,%esi
-	andl	$255,%esi
-	shrl	$16,%ebx
-	movzbl	-128(%ebp,%esi,1),%esi
-	movzbl	%ch,%edi
-	movzbl	-128(%ebp,%edi,1),%edi
-	shll	$8,%edi
-	xorl	%edi,%esi
-	movl	%edx,%edi
-	shrl	$16,%edi
-	andl	$255,%edi
-	movzbl	-128(%ebp,%edi,1),%edi
-	shll	$16,%edi
-	xorl	%edi,%esi
-	movl	%eax,%edi
-	shrl	$24,%edi
-	movzbl	-128(%ebp,%edi,1),%edi
-	shll	$24,%edi
-	xorl	%edi,%esi
-	movl	%esi,8(%esp)
-	movl	%ecx,%esi
-	andl	$255,%esi
-	shrl	$24,%ecx
-	movzbl	-128(%ebp,%esi,1),%esi
-	movzbl	%dh,%edi
-	movzbl	-128(%ebp,%edi,1),%edi
-	shll	$8,%edi
-	xorl	%edi,%esi
-	movl	%eax,%edi
-	shrl	$16,%edi
-	andl	$255,%edx
-	andl	$255,%edi
-	movzbl	-128(%ebp,%edi,1),%edi
-	shll	$16,%edi
-	xorl	%edi,%esi
-	movzbl	%bh,%edi
-	movzbl	-128(%ebp,%edi,1),%edi
-	shll	$24,%edi
-	xorl	%edi,%esi
-	andl	$255,%edx
-	movzbl	-128(%ebp,%edx,1),%edx
-	movzbl	%ah,%eax
-	movzbl	-128(%ebp,%eax,1),%eax
-	shll	$8,%eax
-	xorl	%eax,%edx
-	movl	4(%esp),%eax
-	andl	$255,%ebx
-	movzbl	-128(%ebp,%ebx,1),%ebx
-	shll	$16,%ebx
-	xorl	%ebx,%edx
-	movl	8(%esp),%ebx
-	movzbl	-128(%ebp,%ecx,1),%ecx
-	shll	$24,%ecx
-	xorl	%ecx,%edx
-	movl	%esi,%ecx
-	movl	$2155905152,%ebp
-	andl	%ecx,%ebp
-	leal	(%ecx,%ecx,1),%edi
-	movl	%ebp,%esi
-	shrl	$7,%ebp
-	andl	$4278124286,%edi
-	subl	%ebp,%esi
-	movl	%ecx,%ebp
-	andl	$454761243,%esi
-	rorl	$16,%ebp
-	xorl	%edi,%esi
-	movl	%ecx,%edi
-	xorl	%esi,%ecx
-	rorl	$24,%edi
-	xorl	%ebp,%esi
-	roll	$24,%ecx
-	xorl	%edi,%esi
-	movl	$2155905152,%ebp
-	xorl	%esi,%ecx
-	andl	%edx,%ebp
-	leal	(%edx,%edx,1),%edi
-	movl	%ebp,%esi
-	shrl	$7,%ebp
-	andl	$4278124286,%edi
-	subl	%ebp,%esi
-	movl	%edx,%ebp
-	andl	$454761243,%esi
-	rorl	$16,%ebp
-	xorl	%edi,%esi
-	movl	%edx,%edi
-	xorl	%esi,%edx
-	rorl	$24,%edi
-	xorl	%ebp,%esi
-	roll	$24,%edx
-	xorl	%edi,%esi
-	movl	$2155905152,%ebp
-	xorl	%esi,%edx
-	andl	%eax,%ebp
-	leal	(%eax,%eax,1),%edi
-	movl	%ebp,%esi
-	shrl	$7,%ebp
-	andl	$4278124286,%edi
-	subl	%ebp,%esi
-	movl	%eax,%ebp
-	andl	$454761243,%esi
-	rorl	$16,%ebp
-	xorl	%edi,%esi
-	movl	%eax,%edi
-	xorl	%esi,%eax
-	rorl	$24,%edi
-	xorl	%ebp,%esi
-	roll	$24,%eax
-	xorl	%edi,%esi
-	movl	$2155905152,%ebp
-	xorl	%esi,%eax
-	andl	%ebx,%ebp
-	leal	(%ebx,%ebx,1),%edi
-	movl	%ebp,%esi
-	shrl	$7,%ebp
-	andl	$4278124286,%edi
-	subl	%ebp,%esi
-	movl	%ebx,%ebp
-	andl	$454761243,%esi
-	rorl	$16,%ebp
-	xorl	%edi,%esi
-	movl	%ebx,%edi
-	xorl	%esi,%ebx
-	rorl	$24,%edi
-	xorl	%ebp,%esi
-	roll	$24,%ebx
-	xorl	%edi,%esi
-	xorl	%esi,%ebx
-	movl	20(%esp),%edi
-	movl	28(%esp),%ebp
-	addl	$16,%edi
-	xorl	(%edi),%eax
-	xorl	4(%edi),%ebx
-	xorl	8(%edi),%ecx
-	xorl	12(%edi),%edx
-	cmpl	24(%esp),%edi
-	movl	%edi,20(%esp)
-	jb	L000loop
-	movl	%eax,%esi
-	andl	$255,%esi
-	movzbl	-128(%ebp,%esi,1),%esi
-	movzbl	%bh,%edi
-	movzbl	-128(%ebp,%edi,1),%edi
-	shll	$8,%edi
-	xorl	%edi,%esi
-	movl	%ecx,%edi
-	shrl	$16,%edi
-	andl	$255,%edi
-	movzbl	-128(%ebp,%edi,1),%edi
-	shll	$16,%edi
-	xorl	%edi,%esi
-	movl	%edx,%edi
-	shrl	$24,%edi
-	movzbl	-128(%ebp,%edi,1),%edi
-	shll	$24,%edi
-	xorl	%edi,%esi
-	movl	%esi,4(%esp)
-	movl	%ebx,%esi
-	andl	$255,%esi
-	shrl	$16,%ebx
-	movzbl	-128(%ebp,%esi,1),%esi
-	movzbl	%ch,%edi
-	movzbl	-128(%ebp,%edi,1),%edi
-	shll	$8,%edi
-	xorl	%edi,%esi
-	movl	%edx,%edi
-	shrl	$16,%edi
-	andl	$255,%edi
-	movzbl	-128(%ebp,%edi,1),%edi
-	shll	$16,%edi
-	xorl	%edi,%esi
-	movl	%eax,%edi
-	shrl	$24,%edi
-	movzbl	-128(%ebp,%edi,1),%edi
-	shll	$24,%edi
-	xorl	%edi,%esi
-	movl	%esi,8(%esp)
-	movl	%ecx,%esi
-	andl	$255,%esi
-	shrl	$24,%ecx
-	movzbl	-128(%ebp,%esi,1),%esi
-	movzbl	%dh,%edi
-	movzbl	-128(%ebp,%edi,1),%edi
-	shll	$8,%edi
-	xorl	%edi,%esi
-	movl	%eax,%edi
-	shrl	$16,%edi
-	andl	$255,%edx
-	andl	$255,%edi
-	movzbl	-128(%ebp,%edi,1),%edi
-	shll	$16,%edi
-	xorl	%edi,%esi
-	movzbl	%bh,%edi
-	movzbl	-128(%ebp,%edi,1),%edi
-	shll	$24,%edi
-	xorl	%edi,%esi
-	movl	20(%esp),%edi
-	andl	$255,%edx
-	movzbl	-128(%ebp,%edx,1),%edx
-	movzbl	%ah,%eax
-	movzbl	-128(%ebp,%eax,1),%eax
-	shll	$8,%eax
-	xorl	%eax,%edx
-	movl	4(%esp),%eax
-	andl	$255,%ebx
-	movzbl	-128(%ebp,%ebx,1),%ebx
-	shll	$16,%ebx
-	xorl	%ebx,%edx
-	movl	8(%esp),%ebx
-	movzbl	-128(%ebp,%ecx,1),%ecx
-	shll	$24,%ecx
-	xorl	%ecx,%edx
-	movl	%esi,%ecx
-	xorl	16(%edi),%eax
-	xorl	20(%edi),%ebx
-	xorl	24(%edi),%ecx
-	xorl	28(%edi),%edx
-	ret
-.align	4
-__sse_AES_encrypt_compact:
-	pxor	(%edi),%mm0
-	pxor	8(%edi),%mm4
-	movl	240(%edi),%esi
-	leal	-2(%esi,%esi,1),%esi
-	leal	(%edi,%esi,8),%esi
-	movl	%esi,24(%esp)
-	movl	$454761243,%eax
-	movl	%eax,8(%esp)
-	movl	%eax,12(%esp)
-	movl	-128(%ebp),%eax
-	movl	-96(%ebp),%ebx
-	movl	-64(%ebp),%ecx
-	movl	-32(%ebp),%edx
-	movl	(%ebp),%eax
-	movl	32(%ebp),%ebx
-	movl	64(%ebp),%ecx
-	movl	96(%ebp),%edx
-.align	4,0x90
-L001loop:
-	pshufw	$8,%mm0,%mm1
-	pshufw	$13,%mm4,%mm5
-	movd	%mm1,%eax
-	movd	%mm5,%ebx
-	movl	%edi,20(%esp)
-	movzbl	%al,%esi
-	movzbl	%ah,%edx
-	pshufw	$13,%mm0,%mm2
-	movzbl	-128(%ebp,%esi,1),%ecx
-	movzbl	%bl,%edi
-	movzbl	-128(%ebp,%edx,1),%edx
-	shrl	$16,%eax
-	shll	$8,%edx
-	movzbl	-128(%ebp,%edi,1),%esi
-	movzbl	%bh,%edi
-	shll	$16,%esi
-	pshufw	$8,%mm4,%mm6
-	orl	%esi,%ecx
-	movzbl	-128(%ebp,%edi,1),%esi
-	movzbl	%ah,%edi
-	shll	$24,%esi
-	shrl	$16,%ebx
-	orl	%esi,%edx
-	movzbl	-128(%ebp,%edi,1),%esi
-	movzbl	%bh,%edi
-	shll	$8,%esi
-	orl	%esi,%ecx
-	movzbl	-128(%ebp,%edi,1),%esi
-	movzbl	%al,%edi
-	shll	$24,%esi
-	orl	%esi,%ecx
-	movzbl	-128(%ebp,%edi,1),%esi
-	movzbl	%bl,%edi
-	movd	%mm2,%eax
-	movd	%ecx,%mm0
-	movzbl	-128(%ebp,%edi,1),%ecx
-	movzbl	%ah,%edi
-	shll	$16,%ecx
-	movd	%mm6,%ebx
-	orl	%esi,%ecx
-	movzbl	-128(%ebp,%edi,1),%esi
-	movzbl	%bh,%edi
-	shll	$24,%esi
-	orl	%esi,%ecx
-	movzbl	-128(%ebp,%edi,1),%esi
-	movzbl	%bl,%edi
-	shll	$8,%esi
-	shrl	$16,%ebx
-	orl	%esi,%ecx
-	movzbl	-128(%ebp,%edi,1),%esi
-	movzbl	%al,%edi
-	shrl	$16,%eax
-	movd	%ecx,%mm1
-	movzbl	-128(%ebp,%edi,1),%ecx
-	movzbl	%ah,%edi
-	shll	$16,%ecx
-	andl	$255,%eax
-	orl	%esi,%ecx
-	punpckldq	%mm1,%mm0
-	movzbl	-128(%ebp,%edi,1),%esi
-	movzbl	%bh,%edi
-	shll	$24,%esi
-	andl	$255,%ebx
-	movzbl	-128(%ebp,%eax,1),%eax
-	orl	%esi,%ecx
-	shll	$16,%eax
-	movzbl	-128(%ebp,%edi,1),%esi
-	orl	%eax,%edx
-	shll	$8,%esi
-	movzbl	-128(%ebp,%ebx,1),%ebx
-	orl	%esi,%ecx
-	orl	%ebx,%edx
-	movl	20(%esp),%edi
-	movd	%ecx,%mm4
-	movd	%edx,%mm5
-	punpckldq	%mm5,%mm4
-	addl	$16,%edi
-	cmpl	24(%esp),%edi
-	ja	L002out
-	movq	8(%esp),%mm2
-	pxor	%mm3,%mm3
-	pxor	%mm7,%mm7
-	movq	%mm0,%mm1
-	movq	%mm4,%mm5
-	pcmpgtb	%mm0,%mm3
-	pcmpgtb	%mm4,%mm7
-	pand	%mm2,%mm3
-	pand	%mm2,%mm7
-	pshufw	$177,%mm0,%mm2
-	pshufw	$177,%mm4,%mm6
-	paddb	%mm0,%mm0
-	paddb	%mm4,%mm4
-	pxor	%mm3,%mm0
-	pxor	%mm7,%mm4
-	pshufw	$177,%mm2,%mm3
-	pshufw	$177,%mm6,%mm7
-	pxor	%mm0,%mm1
-	pxor	%mm4,%mm5
-	pxor	%mm2,%mm0
-	pxor	%mm6,%mm4
-	movq	%mm3,%mm2
-	movq	%mm7,%mm6
-	pslld	$8,%mm3
-	pslld	$8,%mm7
-	psrld	$24,%mm2
-	psrld	$24,%mm6
-	pxor	%mm3,%mm0
-	pxor	%mm7,%mm4
-	pxor	%mm2,%mm0
-	pxor	%mm6,%mm4
-	movq	%mm1,%mm3
-	movq	%mm5,%mm7
-	movq	(%edi),%mm2
-	movq	8(%edi),%mm6
-	psrld	$8,%mm1
-	psrld	$8,%mm5
-	movl	-128(%ebp),%eax
-	pslld	$24,%mm3
-	pslld	$24,%mm7
-	movl	-64(%ebp),%ebx
-	pxor	%mm1,%mm0
-	pxor	%mm5,%mm4
-	movl	(%ebp),%ecx
-	pxor	%mm3,%mm0
-	pxor	%mm7,%mm4
-	movl	64(%ebp),%edx
-	pxor	%mm2,%mm0
-	pxor	%mm6,%mm4
-	jmp	L001loop
-.align	4,0x90
-L002out:
-	pxor	(%edi),%mm0
-	pxor	8(%edi),%mm4
-	ret
-.align	4
-__x86_AES_encrypt:
-	movl	%edi,20(%esp)
-	xorl	(%edi),%eax
-	xorl	4(%edi),%ebx
-	xorl	8(%edi),%ecx
-	xorl	12(%edi),%edx
-	movl	240(%edi),%esi
-	leal	-2(%esi,%esi,1),%esi
-	leal	(%edi,%esi,8),%esi
-	movl	%esi,24(%esp)
-.align	4,0x90
-L003loop:
-	movl	%eax,%esi
-	andl	$255,%esi
-	movl	(%ebp,%esi,8),%esi
-	movzbl	%bh,%edi
-	xorl	3(%ebp,%edi,8),%esi
-	movl	%ecx,%edi
-	shrl	$16,%edi
-	andl	$255,%edi
-	xorl	2(%ebp,%edi,8),%esi
-	movl	%edx,%edi
-	shrl	$24,%edi
-	xorl	1(%ebp,%edi,8),%esi
-	movl	%esi,4(%esp)
-	movl	%ebx,%esi
-	andl	$255,%esi
-	shrl	$16,%ebx
-	movl	(%ebp,%esi,8),%esi
-	movzbl	%ch,%edi
-	xorl	3(%ebp,%edi,8),%esi
-	movl	%edx,%edi
-	shrl	$16,%edi
-	andl	$255,%edi
-	xorl	2(%ebp,%edi,8),%esi
-	movl	%eax,%edi
-	shrl	$24,%edi
-	xorl	1(%ebp,%edi,8),%esi
-	movl	%esi,8(%esp)
-	movl	%ecx,%esi
-	andl	$255,%esi
-	shrl	$24,%ecx
-	movl	(%ebp,%esi,8),%esi
-	movzbl	%dh,%edi
-	xorl	3(%ebp,%edi,8),%esi
-	movl	%eax,%edi
-	shrl	$16,%edi
-	andl	$255,%edx
-	andl	$255,%edi
-	xorl	2(%ebp,%edi,8),%esi
-	movzbl	%bh,%edi
-	xorl	1(%ebp,%edi,8),%esi
-	movl	20(%esp),%edi
-	movl	(%ebp,%edx,8),%edx
-	movzbl	%ah,%eax
-	xorl	3(%ebp,%eax,8),%edx
-	movl	4(%esp),%eax
-	andl	$255,%ebx
-	xorl	2(%ebp,%ebx,8),%edx
-	movl	8(%esp),%ebx
-	xorl	1(%ebp,%ecx,8),%edx
-	movl	%esi,%ecx
-	addl	$16,%edi
-	xorl	(%edi),%eax
-	xorl	4(%edi),%ebx
-	xorl	8(%edi),%ecx
-	xorl	12(%edi),%edx
-	cmpl	24(%esp),%edi
-	movl	%edi,20(%esp)
-	jb	L003loop
-	movl	%eax,%esi
-	andl	$255,%esi
-	movl	2(%ebp,%esi,8),%esi
-	andl	$255,%esi
-	movzbl	%bh,%edi
-	movl	(%ebp,%edi,8),%edi
-	andl	$65280,%edi
-	xorl	%edi,%esi
-	movl	%ecx,%edi
-	shrl	$16,%edi
-	andl	$255,%edi
-	movl	(%ebp,%edi,8),%edi
-	andl	$16711680,%edi
-	xorl	%edi,%esi
-	movl	%edx,%edi
-	shrl	$24,%edi
-	movl	2(%ebp,%edi,8),%edi
-	andl	$4278190080,%edi
-	xorl	%edi,%esi
-	movl	%esi,4(%esp)
-	movl	%ebx,%esi
-	andl	$255,%esi
-	shrl	$16,%ebx
-	movl	2(%ebp,%esi,8),%esi
-	andl	$255,%esi
-	movzbl	%ch,%edi
-	movl	(%ebp,%edi,8),%edi
-	andl	$65280,%edi
-	xorl	%edi,%esi
-	movl	%edx,%edi
-	shrl	$16,%edi
-	andl	$255,%edi
-	movl	(%ebp,%edi,8),%edi
-	andl	$16711680,%edi
-	xorl	%edi,%esi
-	movl	%eax,%edi
-	shrl	$24,%edi
-	movl	2(%ebp,%edi,8),%edi
-	andl	$4278190080,%edi
-	xorl	%edi,%esi
-	movl	%esi,8(%esp)
-	movl	%ecx,%esi
-	andl	$255,%esi
-	shrl	$24,%ecx
-	movl	2(%ebp,%esi,8),%esi
-	andl	$255,%esi
-	movzbl	%dh,%edi
-	movl	(%ebp,%edi,8),%edi
-	andl	$65280,%edi
-	xorl	%edi,%esi
-	movl	%eax,%edi
-	shrl	$16,%edi
-	andl	$255,%edx
-	andl	$255,%edi
-	movl	(%ebp,%edi,8),%edi
-	andl	$16711680,%edi
-	xorl	%edi,%esi
-	movzbl	%bh,%edi
-	movl	2(%ebp,%edi,8),%edi
-	andl	$4278190080,%edi
-	xorl	%edi,%esi
-	movl	20(%esp),%edi
-	andl	$255,%edx
-	movl	2(%ebp,%edx,8),%edx
-	andl	$255,%edx
-	movzbl	%ah,%eax
-	movl	(%ebp,%eax,8),%eax
-	andl	$65280,%eax
-	xorl	%eax,%edx
-	movl	4(%esp),%eax
-	andl	$255,%ebx
-	movl	(%ebp,%ebx,8),%ebx
-	andl	$16711680,%ebx
-	xorl	%ebx,%edx
-	movl	8(%esp),%ebx
-	movl	2(%ebp,%ecx,8),%ecx
-	andl	$4278190080,%ecx
-	xorl	%ecx,%edx
-	movl	%esi,%ecx
-	addl	$16,%edi
-	xorl	(%edi),%eax
-	xorl	4(%edi),%ebx
-	xorl	8(%edi),%ecx
-	xorl	12(%edi),%edx
-	ret
-.align	6,0x90
-LAES_Te:
-.long	2774754246,2774754246
-.long	2222750968,2222750968
-.long	2574743534,2574743534
-.long	2373680118,2373680118
-.long	234025727,234025727
-.long	3177933782,3177933782
-.long	2976870366,2976870366
-.long	1422247313,1422247313
-.long	1345335392,1345335392
-.long	50397442,50397442
-.long	2842126286,2842126286
-.long	2099981142,2099981142
-.long	436141799,436141799
-.long	1658312629,1658312629
-.long	3870010189,3870010189
-.long	2591454956,2591454956
-.long	1170918031,1170918031
-.long	2642575903,2642575903
-.long	1086966153,1086966153
-.long	2273148410,2273148410
-.long	368769775,368769775
-.long	3948501426,3948501426
-.long	3376891790,3376891790
-.long	200339707,200339707
-.long	3970805057,3970805057
-.long	1742001331,1742001331
-.long	4255294047,4255294047
-.long	3937382213,3937382213
-.long	3214711843,3214711843
-.long	4154762323,4154762323
-.long	2524082916,2524082916
-.long	1539358875,1539358875
-.long	3266819957,3266819957
-.long	486407649,486407649
-.long	2928907069,2928907069
-.long	1780885068,1780885068
-.long	1513502316,1513502316
-.long	1094664062,1094664062
-.long	49805301,49805301
-.long	1338821763,1338821763
-.long	1546925160,1546925160
-.long	4104496465,4104496465
-.long	887481809,887481809
-.long	150073849,150073849
-.long	2473685474,2473685474
-.long	1943591083,1943591083
-.long	1395732834,1395732834
-.long	1058346282,1058346282
-.long	201589768,201589768
-.long	1388824469,1388824469
-.long	1696801606,1696801606
-.long	1589887901,1589887901
-.long	672667696,672667696
-.long	2711000631,2711000631
-.long	251987210,251987210
-.long	3046808111,3046808111
-.long	151455502,151455502
-.long	907153956,907153956
-.long	2608889883,2608889883
-.long	1038279391,1038279391
-.long	652995533,652995533
-.long	1764173646,1764173646
-.long	3451040383,3451040383
-.long	2675275242,2675275242
-.long	453576978,453576978
-.long	2659418909,2659418909
-.long	1949051992,1949051992
-.long	773462580,773462580
-.long	756751158,756751158
-.long	2993581788,2993581788
-.long	3998898868,3998898868
-.long	4221608027,4221608027
-.long	4132590244,4132590244
-.long	1295727478,1295727478
-.long	1641469623,1641469623
-.long	3467883389,3467883389
-.long	2066295122,2066295122
-.long	1055122397,1055122397
-.long	1898917726,1898917726
-.long	2542044179,2542044179
-.long	4115878822,4115878822
-.long	1758581177,1758581177
-.long	0,0
-.long	753790401,753790401
-.long	1612718144,1612718144
-.long	536673507,536673507
-.long	3367088505,3367088505
-.long	3982187446,3982187446
-.long	3194645204,3194645204
-.long	1187761037,1187761037
-.long	3653156455,3653156455
-.long	1262041458,1262041458
-.long	3729410708,3729410708
-.long	3561770136,3561770136
-.long	3898103984,3898103984
-.long	1255133061,1255133061
-.long	1808847035,1808847035
-.long	720367557,720367557
-.long	3853167183,3853167183
-.long	385612781,385612781
-.long	3309519750,3309519750
-.long	3612167578,3612167578
-.long	1429418854,1429418854
-.long	2491778321,2491778321
-.long	3477423498,3477423498
-.long	284817897,284817897
-.long	100794884,100794884
-.long	2172616702,2172616702
-.long	4031795360,4031795360
-.long	1144798328,1144798328
-.long	3131023141,3131023141
-.long	3819481163,3819481163
-.long	4082192802,4082192802
-.long	4272137053,4272137053
-.long	3225436288,3225436288
-.long	2324664069,2324664069
-.long	2912064063,2912064063
-.long	3164445985,3164445985
-.long	1211644016,1211644016
-.long	83228145,83228145
-.long	3753688163,3753688163
-.long	3249976951,3249976951
-.long	1977277103,1977277103
-.long	1663115586,1663115586
-.long	806359072,806359072
-.long	452984805,452984805
-.long	250868733,250868733
-.long	1842533055,1842533055
-.long	1288555905,1288555905
-.long	336333848,336333848
-.long	890442534,890442534
-.long	804056259,804056259
-.long	3781124030,3781124030
-.long	2727843637,2727843637
-.long	3427026056,3427026056
-.long	957814574,957814574
-.long	1472513171,1472513171
-.long	4071073621,4071073621
-.long	2189328124,2189328124
-.long	1195195770,1195195770
-.long	2892260552,2892260552
-.long	3881655738,3881655738
-.long	723065138,723065138
-.long	2507371494,2507371494
-.long	2690670784,2690670784
-.long	2558624025,2558624025
-.long	3511635870,3511635870
-.long	2145180835,2145180835
-.long	1713513028,1713513028
-.long	2116692564,2116692564
-.long	2878378043,2878378043
-.long	2206763019,2206763019
-.long	3393603212,3393603212
-.long	703524551,703524551
-.long	3552098411,3552098411
-.long	1007948840,1007948840
-.long	2044649127,2044649127
-.long	3797835452,3797835452
-.long	487262998,487262998
-.long	1994120109,1994120109
-.long	1004593371,1004593371
-.long	1446130276,1446130276
-.long	1312438900,1312438900
-.long	503974420,503974420
-.long	3679013266,3679013266
-.long	168166924,168166924
-.long	1814307912,1814307912
-.long	3831258296,3831258296
-.long	1573044895,1573044895
-.long	1859376061,1859376061
-.long	4021070915,4021070915
-.long	2791465668,2791465668
-.long	2828112185,2828112185
-.long	2761266481,2761266481
-.long	937747667,937747667
-.long	2339994098,2339994098
-.long	854058965,854058965
-.long	1137232011,1137232011
-.long	1496790894,1496790894
-.long	3077402074,3077402074
-.long	2358086913,2358086913
-.long	1691735473,1691735473
-.long	3528347292,3528347292
-.long	3769215305,3769215305
-.long	3027004632,3027004632
-.long	4199962284,4199962284
-.long	133494003,133494003
-.long	636152527,636152527
-.long	2942657994,2942657994
-.long	2390391540,2390391540
-.long	3920539207,3920539207
-.long	403179536,403179536
-.long	3585784431,3585784431
-.long	2289596656,2289596656
-.long	1864705354,1864705354
-.long	1915629148,1915629148
-.long	605822008,605822008
-.long	4054230615,4054230615
-.long	3350508659,3350508659
-.long	1371981463,1371981463
-.long	602466507,602466507
-.long	2094914977,2094914977
-.long	2624877800,2624877800
-.long	555687742,555687742
-.long	3712699286,3712699286
-.long	3703422305,3703422305
-.long	2257292045,2257292045
-.long	2240449039,2240449039
-.long	2423288032,2423288032
-.long	1111375484,1111375484
-.long	3300242801,3300242801
-.long	2858837708,2858837708
-.long	3628615824,3628615824
-.long	84083462,84083462
-.long	32962295,32962295
-.long	302911004,302911004
-.long	2741068226,2741068226
-.long	1597322602,1597322602
-.long	4183250862,4183250862
-.long	3501832553,3501832553
-.long	2441512471,2441512471
-.long	1489093017,1489093017
-.long	656219450,656219450
-.long	3114180135,3114180135
-.long	954327513,954327513
-.long	335083755,335083755
-.long	3013122091,3013122091
-.long	856756514,856756514
-.long	3144247762,3144247762
-.long	1893325225,1893325225
-.long	2307821063,2307821063
-.long	2811532339,2811532339
-.long	3063651117,3063651117
-.long	572399164,572399164
-.long	2458355477,2458355477
-.long	552200649,552200649
-.long	1238290055,1238290055
-.long	4283782570,4283782570
-.long	2015897680,2015897680
-.long	2061492133,2061492133
-.long	2408352771,2408352771
-.long	4171342169,4171342169
-.long	2156497161,2156497161
-.long	386731290,386731290
-.long	3669999461,3669999461
-.long	837215959,837215959
-.long	3326231172,3326231172
-.long	3093850320,3093850320
-.long	3275833730,3275833730
-.long	2962856233,2962856233
-.long	1999449434,1999449434
-.long	286199582,286199582
-.long	3417354363,3417354363
-.long	4233385128,4233385128
-.long	3602627437,3602627437
-.long	974525996,974525996
-.byte	99,124,119,123,242,107,111,197
-.byte	48,1,103,43,254,215,171,118
-.byte	202,130,201,125,250,89,71,240
-.byte	173,212,162,175,156,164,114,192
-.byte	183,253,147,38,54,63,247,204
-.byte	52,165,229,241,113,216,49,21
-.byte	4,199,35,195,24,150,5,154
-.byte	7,18,128,226,235,39,178,117
-.byte	9,131,44,26,27,110,90,160
-.byte	82,59,214,179,41,227,47,132
-.byte	83,209,0,237,32,252,177,91
-.byte	106,203,190,57,74,76,88,207
-.byte	208,239,170,251,67,77,51,133
-.byte	69,249,2,127,80,60,159,168
-.byte	81,163,64,143,146,157,56,245
-.byte	188,182,218,33,16,255,243,210
-.byte	205,12,19,236,95,151,68,23
-.byte	196,167,126,61,100,93,25,115
-.byte	96,129,79,220,34,42,144,136
-.byte	70,238,184,20,222,94,11,219
-.byte	224,50,58,10,73,6,36,92
-.byte	194,211,172,98,145,149,228,121
-.byte	231,200,55,109,141,213,78,169
-.byte	108,86,244,234,101,122,174,8
-.byte	186,120,37,46,28,166,180,198
-.byte	232,221,116,31,75,189,139,138
-.byte	112,62,181,102,72,3,246,14
-.byte	97,53,87,185,134,193,29,158
-.byte	225,248,152,17,105,217,142,148
-.byte	155,30,135,233,206,85,40,223
-.byte	140,161,137,13,191,230,66,104
-.byte	65,153,45,15,176,84,187,22
-.byte	99,124,119,123,242,107,111,197
-.byte	48,1,103,43,254,215,171,118
-.byte	202,130,201,125,250,89,71,240
-.byte	173,212,162,175,156,164,114,192
-.byte	183,253,147,38,54,63,247,204
-.byte	52,165,229,241,113,216,49,21
-.byte	4,199,35,195,24,150,5,154
-.byte	7,18,128,226,235,39,178,117
-.byte	9,131,44,26,27,110,90,160
-.byte	82,59,214,179,41,227,47,132
-.byte	83,209,0,237,32,252,177,91
-.byte	106,203,190,57,74,76,88,207
-.byte	208,239,170,251,67,77,51,133
-.byte	69,249,2,127,80,60,159,168
-.byte	81,163,64,143,146,157,56,245
-.byte	188,182,218,33,16,255,243,210
-.byte	205,12,19,236,95,151,68,23
-.byte	196,167,126,61,100,93,25,115
-.byte	96,129,79,220,34,42,144,136
-.byte	70,238,184,20,222,94,11,219
-.byte	224,50,58,10,73,6,36,92
-.byte	194,211,172,98,145,149,228,121
-.byte	231,200,55,109,141,213,78,169
-.byte	108,86,244,234,101,122,174,8
-.byte	186,120,37,46,28,166,180,198
-.byte	232,221,116,31,75,189,139,138
-.byte	112,62,181,102,72,3,246,14
-.byte	97,53,87,185,134,193,29,158
-.byte	225,248,152,17,105,217,142,148
-.byte	155,30,135,233,206,85,40,223
-.byte	140,161,137,13,191,230,66,104
-.byte	65,153,45,15,176,84,187,22
-.byte	99,124,119,123,242,107,111,197
-.byte	48,1,103,43,254,215,171,118
-.byte	202,130,201,125,250,89,71,240
-.byte	173,212,162,175,156,164,114,192
-.byte	183,253,147,38,54,63,247,204
-.byte	52,165,229,241,113,216,49,21
-.byte	4,199,35,195,24,150,5,154
-.byte	7,18,128,226,235,39,178,117
-.byte	9,131,44,26,27,110,90,160
-.byte	82,59,214,179,41,227,47,132
-.byte	83,209,0,237,32,252,177,91
-.byte	106,203,190,57,74,76,88,207
-.byte	208,239,170,251,67,77,51,133
-.byte	69,249,2,127,80,60,159,168
-.byte	81,163,64,143,146,157,56,245
-.byte	188,182,218,33,16,255,243,210
-.byte	205,12,19,236,95,151,68,23
-.byte	196,167,126,61,100,93,25,115
-.byte	96,129,79,220,34,42,144,136
-.byte	70,238,184,20,222,94,11,219
-.byte	224,50,58,10,73,6,36,92
-.byte	194,211,172,98,145,149,228,121
-.byte	231,200,55,109,141,213,78,169
-.byte	108,86,244,234,101,122,174,8
-.byte	186,120,37,46,28,166,180,198
-.byte	232,221,116,31,75,189,139,138
-.byte	112,62,181,102,72,3,246,14
-.byte	97,53,87,185,134,193,29,158
-.byte	225,248,152,17,105,217,142,148
-.byte	155,30,135,233,206,85,40,223
-.byte	140,161,137,13,191,230,66,104
-.byte	65,153,45,15,176,84,187,22
-.byte	99,124,119,123,242,107,111,197
-.byte	48,1,103,43,254,215,171,118
-.byte	202,130,201,125,250,89,71,240
-.byte	173,212,162,175,156,164,114,192
-.byte	183,253,147,38,54,63,247,204
-.byte	52,165,229,241,113,216,49,21
-.byte	4,199,35,195,24,150,5,154
-.byte	7,18,128,226,235,39,178,117
-.byte	9,131,44,26,27,110,90,160
-.byte	82,59,214,179,41,227,47,132
-.byte	83,209,0,237,32,252,177,91
-.byte	106,203,190,57,74,76,88,207
-.byte	208,239,170,251,67,77,51,133
-.byte	69,249,2,127,80,60,159,168
-.byte	81,163,64,143,146,157,56,245
-.byte	188,182,218,33,16,255,243,210
-.byte	205,12,19,236,95,151,68,23
-.byte	196,167,126,61,100,93,25,115
-.byte	96,129,79,220,34,42,144,136
-.byte	70,238,184,20,222,94,11,219
-.byte	224,50,58,10,73,6,36,92
-.byte	194,211,172,98,145,149,228,121
-.byte	231,200,55,109,141,213,78,169
-.byte	108,86,244,234,101,122,174,8
-.byte	186,120,37,46,28,166,180,198
-.byte	232,221,116,31,75,189,139,138
-.byte	112,62,181,102,72,3,246,14
-.byte	97,53,87,185,134,193,29,158
-.byte	225,248,152,17,105,217,142,148
-.byte	155,30,135,233,206,85,40,223
-.byte	140,161,137,13,191,230,66,104
-.byte	65,153,45,15,176,84,187,22
-.long	1,2,4,8
-.long	16,32,64,128
-.long	27,54,0,0
-.long	0,0,0,0
-.globl	_AES_encrypt
-.align	4
-_AES_encrypt:
-L_AES_encrypt_begin:
-	pushl	%ebp
-	pushl	%ebx
-	pushl	%esi
-	pushl	%edi
-	movl	20(%esp),%esi
-	movl	28(%esp),%edi
-	movl	%esp,%eax
-	subl	$36,%esp
-	andl	$-64,%esp
-	leal	-127(%edi),%ebx
-	subl	%esp,%ebx
-	negl	%ebx
-	andl	$960,%ebx
-	subl	%ebx,%esp
-	addl	$4,%esp
-	movl	%eax,28(%esp)
-	call	L004pic_point
-L004pic_point:
-	popl	%ebp
-	movl	L_OPENSSL_ia32cap_P$non_lazy_ptr-L004pic_point(%ebp),%eax
-	leal	LAES_Te-L004pic_point(%ebp),%ebp
-	leal	764(%esp),%ebx
-	subl	%ebp,%ebx
-	andl	$768,%ebx
-	leal	2176(%ebp,%ebx,1),%ebp
-	btl	$25,(%eax)
-	jnc	L005x86
-	movq	(%esi),%mm0
-	movq	8(%esi),%mm4
-	call	__sse_AES_encrypt_compact
-	movl	28(%esp),%esp
-	movl	24(%esp),%esi
-	movq	%mm0,(%esi)
-	movq	%mm4,8(%esi)
-	emms
-	popl	%edi
-	popl	%esi
-	popl	%ebx
-	popl	%ebp
-	ret
-.align	4,0x90
-L005x86:
-	movl	%ebp,24(%esp)
-	movl	(%esi),%eax
-	movl	4(%esi),%ebx
-	movl	8(%esi),%ecx
-	movl	12(%esi),%edx
-	call	__x86_AES_encrypt_compact
-	movl	28(%esp),%esp
-	movl	24(%esp),%esi
-	movl	%eax,(%esi)
-	movl	%ebx,4(%esi)
-	movl	%ecx,8(%esi)
-	movl	%edx,12(%esi)
-	popl	%edi
-	popl	%esi
-	popl	%ebx
-	popl	%ebp
-	ret
-.align	4
-__x86_AES_decrypt_compact:
-	movl	%edi,20(%esp)
-	xorl	(%edi),%eax
-	xorl	4(%edi),%ebx
-	xorl	8(%edi),%ecx
-	xorl	12(%edi),%edx
-	movl	240(%edi),%esi
-	leal	-2(%esi,%esi,1),%esi
-	leal	(%edi,%esi,8),%esi
-	movl	%esi,24(%esp)
-	movl	-128(%ebp),%edi
-	movl	-96(%ebp),%esi
-	movl	-64(%ebp),%edi
-	movl	-32(%ebp),%esi
-	movl	(%ebp),%edi
-	movl	32(%ebp),%esi
-	movl	64(%ebp),%edi
-	movl	96(%ebp),%esi
-.align	4,0x90
-L006loop:
-	movl	%eax,%esi
-	andl	$255,%esi
-	movzbl	-128(%ebp,%esi,1),%esi
-	movzbl	%dh,%edi
-	movzbl	-128(%ebp,%edi,1),%edi
-	shll	$8,%edi
-	xorl	%edi,%esi
-	movl	%ecx,%edi
-	shrl	$16,%edi
-	andl	$255,%edi
-	movzbl	-128(%ebp,%edi,1),%edi
-	shll	$16,%edi
-	xorl	%edi,%esi
-	movl	%ebx,%edi
-	shrl	$24,%edi
-	movzbl	-128(%ebp,%edi,1),%edi
-	shll	$24,%edi
-	xorl	%edi,%esi
-	movl	%esi,4(%esp)
-	movl	%ebx,%esi
-	andl	$255,%esi
-	movzbl	-128(%ebp,%esi,1),%esi
-	movzbl	%ah,%edi
-	movzbl	-128(%ebp,%edi,1),%edi
-	shll	$8,%edi
-	xorl	%edi,%esi
-	movl	%edx,%edi
-	shrl	$16,%edi
-	andl	$255,%edi
-	movzbl	-128(%ebp,%edi,1),%edi
-	shll	$16,%edi
-	xorl	%edi,%esi
-	movl	%ecx,%edi
-	shrl	$24,%edi
-	movzbl	-128(%ebp,%edi,1),%edi
-	shll	$24,%edi
-	xorl	%edi,%esi
-	movl	%esi,8(%esp)
-	movl	%ecx,%esi
-	andl	$255,%esi
-	movzbl	-128(%ebp,%esi,1),%esi
-	movzbl	%bh,%edi
-	movzbl	-128(%ebp,%edi,1),%edi
-	shll	$8,%edi
-	xorl	%edi,%esi
-	movl	%eax,%edi
-	shrl	$16,%edi
-	andl	$255,%edi
-	movzbl	-128(%ebp,%edi,1),%edi
-	shll	$16,%edi
-	xorl	%edi,%esi
-	movl	%edx,%edi
-	shrl	$24,%edi
-	movzbl	-128(%ebp,%edi,1),%edi
-	shll	$24,%edi
-	xorl	%edi,%esi
-	andl	$255,%edx
-	movzbl	-128(%ebp,%edx,1),%edx
-	movzbl	%ch,%ecx
-	movzbl	-128(%ebp,%ecx,1),%ecx
-	shll	$8,%ecx
-	xorl	%ecx,%edx
-	movl	%esi,%ecx
-	shrl	$16,%ebx
-	andl	$255,%ebx
-	movzbl	-128(%ebp,%ebx,1),%ebx
-	shll	$16,%ebx
-	xorl	%ebx,%edx
-	shrl	$24,%eax
-	movzbl	-128(%ebp,%eax,1),%eax
-	shll	$24,%eax
-	xorl	%eax,%edx
-	movl	$2155905152,%edi
-	andl	%ecx,%edi
-	movl	%edi,%esi
-	shrl	$7,%edi
-	leal	(%ecx,%ecx,1),%eax
-	subl	%edi,%esi
-	andl	$4278124286,%eax
-	andl	$454761243,%esi
-	xorl	%esi,%eax
-	movl	$2155905152,%edi
-	andl	%eax,%edi
-	movl	%edi,%esi
-	shrl	$7,%edi
-	leal	(%eax,%eax,1),%ebx
-	subl	%edi,%esi
-	andl	$4278124286,%ebx
-	andl	$454761243,%esi
-	xorl	%ecx,%eax
-	xorl	%esi,%ebx
-	movl	$2155905152,%edi
-	andl	%ebx,%edi
-	movl	%edi,%esi
-	shrl	$7,%edi
-	leal	(%ebx,%ebx,1),%ebp
-	subl	%edi,%esi
-	andl	$4278124286,%ebp
-	andl	$454761243,%esi
-	xorl	%ecx,%ebx
-	roll	$8,%ecx
-	xorl	%esi,%ebp
-	xorl	%eax,%ecx
-	xorl	%ebp,%eax
-	xorl	%ebx,%ecx
-	xorl	%ebp,%ebx
-	roll	$24,%eax
-	xorl	%ebp,%ecx
-	roll	$16,%ebx
-	xorl	%eax,%ecx
-	roll	$8,%ebp
-	xorl	%ebx,%ecx
-	movl	4(%esp),%eax
-	xorl	%ebp,%ecx
-	movl	%ecx,12(%esp)
-	movl	$2155905152,%edi
-	andl	%edx,%edi
-	movl	%edi,%esi
-	shrl	$7,%edi
-	leal	(%edx,%edx,1),%ebx
-	subl	%edi,%esi
-	andl	$4278124286,%ebx
-	andl	$454761243,%esi
-	xorl	%esi,%ebx
-	movl	$2155905152,%edi
-	andl	%ebx,%edi
-	movl	%edi,%esi
-	shrl	$7,%edi
-	leal	(%ebx,%ebx,1),%ecx
-	subl	%edi,%esi
-	andl	$4278124286,%ecx
-	andl	$454761243,%esi
-	xorl	%edx,%ebx
-	xorl	%esi,%ecx
-	movl	$2155905152,%edi
-	andl	%ecx,%edi
-	movl	%edi,%esi
-	shrl	$7,%edi
-	leal	(%ecx,%ecx,1),%ebp
-	subl	%edi,%esi
-	andl	$4278124286,%ebp
-	andl	$454761243,%esi
-	xorl	%edx,%ecx
-	roll	$8,%edx
-	xorl	%esi,%ebp
-	xorl	%ebx,%edx
-	xorl	%ebp,%ebx
-	xorl	%ecx,%edx
-	xorl	%ebp,%ecx
-	roll	$24,%ebx
-	xorl	%ebp,%edx
-	roll	$16,%ecx
-	xorl	%ebx,%edx
-	roll	$8,%ebp
-	xorl	%ecx,%edx
-	movl	8(%esp),%ebx
-	xorl	%ebp,%edx
-	movl	%edx,16(%esp)
-	movl	$2155905152,%edi
-	andl	%eax,%edi
-	movl	%edi,%esi
-	shrl	$7,%edi
-	leal	(%eax,%eax,1),%ecx
-	subl	%edi,%esi
-	andl	$4278124286,%ecx
-	andl	$454761243,%esi
-	xorl	%esi,%ecx
-	movl	$2155905152,%edi
-	andl	%ecx,%edi
-	movl	%edi,%esi
-	shrl	$7,%edi
-	leal	(%ecx,%ecx,1),%edx
-	subl	%edi,%esi
-	andl	$4278124286,%edx
-	andl	$454761243,%esi
-	xorl	%eax,%ecx
-	xorl	%esi,%edx
-	movl	$2155905152,%edi
-	andl	%edx,%edi
-	movl	%edi,%esi
-	shrl	$7,%edi
-	leal	(%edx,%edx,1),%ebp
-	subl	%edi,%esi
-	andl	$4278124286,%ebp
-	andl	$454761243,%esi
-	xorl	%eax,%edx
-	roll	$8,%eax
-	xorl	%esi,%ebp
-	xorl	%ecx,%eax
-	xorl	%ebp,%ecx
-	xorl	%edx,%eax
-	xorl	%ebp,%edx
-	roll	$24,%ecx
-	xorl	%ebp,%eax
-	roll	$16,%edx
-	xorl	%ecx,%eax
-	roll	$8,%ebp
-	xorl	%edx,%eax
-	xorl	%ebp,%eax
-	movl	$2155905152,%edi
-	andl	%ebx,%edi
-	movl	%edi,%esi
-	shrl	$7,%edi
-	leal	(%ebx,%ebx,1),%ecx
-	subl	%edi,%esi
-	andl	$4278124286,%ecx
-	andl	$454761243,%esi
-	xorl	%esi,%ecx
-	movl	$2155905152,%edi
-	andl	%ecx,%edi
-	movl	%edi,%esi
-	shrl	$7,%edi
-	leal	(%ecx,%ecx,1),%edx
-	subl	%edi,%esi
-	andl	$4278124286,%edx
-	andl	$454761243,%esi
-	xorl	%ebx,%ecx
-	xorl	%esi,%edx
-	movl	$2155905152,%edi
-	andl	%edx,%edi
-	movl	%edi,%esi
-	shrl	$7,%edi
-	leal	(%edx,%edx,1),%ebp
-	subl	%edi,%esi
-	andl	$4278124286,%ebp
-	andl	$454761243,%esi
-	xorl	%ebx,%edx
-	roll	$8,%ebx
-	xorl	%esi,%ebp
-	xorl	%ecx,%ebx
-	xorl	%ebp,%ecx
-	xorl	%edx,%ebx
-	xorl	%ebp,%edx
-	roll	$24,%ecx
-	xorl	%ebp,%ebx
-	roll	$16,%edx
-	xorl	%ecx,%ebx
-	roll	$8,%ebp
-	xorl	%edx,%ebx
-	movl	12(%esp),%ecx
-	xorl	%ebp,%ebx
-	movl	16(%esp),%edx
-	movl	20(%esp),%edi
-	movl	28(%esp),%ebp
-	addl	$16,%edi
-	xorl	(%edi),%eax
-	xorl	4(%edi),%ebx
-	xorl	8(%edi),%ecx
-	xorl	12(%edi),%edx
-	cmpl	24(%esp),%edi
-	movl	%edi,20(%esp)
-	jb	L006loop
-	movl	%eax,%esi
-	andl	$255,%esi
-	movzbl	-128(%ebp,%esi,1),%esi
-	movzbl	%dh,%edi
-	movzbl	-128(%ebp,%edi,1),%edi
-	shll	$8,%edi
-	xorl	%edi,%esi
-	movl	%ecx,%edi
-	shrl	$16,%edi
-	andl	$255,%edi
-	movzbl	-128(%ebp,%edi,1),%edi
-	shll	$16,%edi
-	xorl	%edi,%esi
-	movl	%ebx,%edi
-	shrl	$24,%edi
-	movzbl	-128(%ebp,%edi,1),%edi
-	shll	$24,%edi
-	xorl	%edi,%esi
-	movl	%esi,4(%esp)
-	movl	%ebx,%esi
-	andl	$255,%esi
-	movzbl	-128(%ebp,%esi,1),%esi
-	movzbl	%ah,%edi
-	movzbl	-128(%ebp,%edi,1),%edi
-	shll	$8,%edi
-	xorl	%edi,%esi
-	movl	%edx,%edi
-	shrl	$16,%edi
-	andl	$255,%edi
-	movzbl	-128(%ebp,%edi,1),%edi
-	shll	$16,%edi
-	xorl	%edi,%esi
-	movl	%ecx,%edi
-	shrl	$24,%edi
-	movzbl	-128(%ebp,%edi,1),%edi
-	shll	$24,%edi
-	xorl	%edi,%esi
-	movl	%esi,8(%esp)
-	movl	%ecx,%esi
-	andl	$255,%esi
-	movzbl	-128(%ebp,%esi,1),%esi
-	movzbl	%bh,%edi
-	movzbl	-128(%ebp,%edi,1),%edi
-	shll	$8,%edi
-	xorl	%edi,%esi
-	movl	%eax,%edi
-	shrl	$16,%edi
-	andl	$255,%edi
-	movzbl	-128(%ebp,%edi,1),%edi
-	shll	$16,%edi
-	xorl	%edi,%esi
-	movl	%edx,%edi
-	shrl	$24,%edi
-	movzbl	-128(%ebp,%edi,1),%edi
-	shll	$24,%edi
-	xorl	%edi,%esi
-	movl	20(%esp),%edi
-	andl	$255,%edx
-	movzbl	-128(%ebp,%edx,1),%edx
-	movzbl	%ch,%ecx
-	movzbl	-128(%ebp,%ecx,1),%ecx
-	shll	$8,%ecx
-	xorl	%ecx,%edx
-	movl	%esi,%ecx
-	shrl	$16,%ebx
-	andl	$255,%ebx
-	movzbl	-128(%ebp,%ebx,1),%ebx
-	shll	$16,%ebx
-	xorl	%ebx,%edx
-	movl	8(%esp),%ebx
-	shrl	$24,%eax
-	movzbl	-128(%ebp,%eax,1),%eax
-	shll	$24,%eax
-	xorl	%eax,%edx
-	movl	4(%esp),%eax
-	xorl	16(%edi),%eax
-	xorl	20(%edi),%ebx
-	xorl	24(%edi),%ecx
-	xorl	28(%edi),%edx
-	ret
-.align	4
-__sse_AES_decrypt_compact:
-	pxor	(%edi),%mm0
-	pxor	8(%edi),%mm4
-	movl	240(%edi),%esi
-	leal	-2(%esi,%esi,1),%esi
-	leal	(%edi,%esi,8),%esi
-	movl	%esi,24(%esp)
-	movl	$454761243,%eax
-	movl	%eax,8(%esp)
-	movl	%eax,12(%esp)
-	movl	-128(%ebp),%eax
-	movl	-96(%ebp),%ebx
-	movl	-64(%ebp),%ecx
-	movl	-32(%ebp),%edx
-	movl	(%ebp),%eax
-	movl	32(%ebp),%ebx
-	movl	64(%ebp),%ecx
-	movl	96(%ebp),%edx
-.align	4,0x90
-L007loop:
-	pshufw	$12,%mm0,%mm1
-	pshufw	$9,%mm4,%mm5
-	movd	%mm1,%eax
-	movd	%mm5,%ebx
-	movl	%edi,20(%esp)
-	movzbl	%al,%esi
-	movzbl	%ah,%edx
-	pshufw	$6,%mm0,%mm2
-	movzbl	-128(%ebp,%esi,1),%ecx
-	movzbl	%bl,%edi
-	movzbl	-128(%ebp,%edx,1),%edx
-	shrl	$16,%eax
-	shll	$8,%edx
-	movzbl	-128(%ebp,%edi,1),%esi
-	movzbl	%bh,%edi
-	shll	$16,%esi
-	pshufw	$3,%mm4,%mm6
-	orl	%esi,%ecx
-	movzbl	-128(%ebp,%edi,1),%esi
-	movzbl	%ah,%edi
-	shll	$24,%esi
-	shrl	$16,%ebx
-	orl	%esi,%edx
-	movzbl	-128(%ebp,%edi,1),%esi
-	movzbl	%bh,%edi
-	shll	$24,%esi
-	orl	%esi,%ecx
-	movzbl	-128(%ebp,%edi,1),%esi
-	movzbl	%al,%edi
-	shll	$8,%esi
-	movd	%mm2,%eax
-	orl	%esi,%ecx
-	movzbl	-128(%ebp,%edi,1),%esi
-	movzbl	%bl,%edi
-	shll	$16,%esi
-	movd	%mm6,%ebx
-	movd	%ecx,%mm0
-	movzbl	-128(%ebp,%edi,1),%ecx
-	movzbl	%al,%edi
-	orl	%esi,%ecx
-	movzbl	-128(%ebp,%edi,1),%esi
-	movzbl	%bl,%edi
-	orl	%esi,%edx
-	movzbl	-128(%ebp,%edi,1),%esi
-	movzbl	%ah,%edi
-	shll	$16,%esi
-	shrl	$16,%eax
-	orl	%esi,%edx
-	movzbl	-128(%ebp,%edi,1),%esi
-	movzbl	%bh,%edi
-	shrl	$16,%ebx
-	shll	$8,%esi
-	movd	%edx,%mm1
-	movzbl	-128(%ebp,%edi,1),%edx
-	movzbl	%bh,%edi
-	shll	$24,%edx
-	andl	$255,%ebx
-	orl	%esi,%edx
-	punpckldq	%mm1,%mm0
-	movzbl	-128(%ebp,%edi,1),%esi
-	movzbl	%al,%edi
-	shll	$8,%esi
-	movzbl	%ah,%eax
-	movzbl	-128(%ebp,%ebx,1),%ebx
-	orl	%esi,%ecx
-	movzbl	-128(%ebp,%edi,1),%esi
-	orl	%ebx,%edx
-	shll	$16,%esi
-	movzbl	-128(%ebp,%eax,1),%eax
-	orl	%esi,%edx
-	shll	$24,%eax
-	orl	%eax,%ecx
-	movl	20(%esp),%edi
-	movd	%edx,%mm4
-	movd	%ecx,%mm5
-	punpckldq	%mm5,%mm4
-	addl	$16,%edi
-	cmpl	24(%esp),%edi
-	ja	L008out
-	movq	%mm0,%mm3
-	movq	%mm4,%mm7
-	pshufw	$228,%mm0,%mm2
-	pshufw	$228,%mm4,%mm6
-	movq	%mm0,%mm1
-	movq	%mm4,%mm5
-	pshufw	$177,%mm0,%mm0
-	pshufw	$177,%mm4,%mm4
-	pslld	$8,%mm2
-	pslld	$8,%mm6
-	psrld	$8,%mm3
-	psrld	$8,%mm7
-	pxor	%mm2,%mm0
-	pxor	%mm6,%mm4
-	pxor	%mm3,%mm0
-	pxor	%mm7,%mm4
-	pslld	$16,%mm2
-	pslld	$16,%mm6
-	psrld	$16,%mm3
-	psrld	$16,%mm7
-	pxor	%mm2,%mm0
-	pxor	%mm6,%mm4
-	pxor	%mm3,%mm0
-	pxor	%mm7,%mm4
-	movq	8(%esp),%mm3
-	pxor	%mm2,%mm2
-	pxor	%mm6,%mm6
-	pcmpgtb	%mm1,%mm2
-	pcmpgtb	%mm5,%mm6
-	pand	%mm3,%mm2
-	pand	%mm3,%mm6
-	paddb	%mm1,%mm1
-	paddb	%mm5,%mm5
-	pxor	%mm2,%mm1
-	pxor	%mm6,%mm5
-	movq	%mm1,%mm3
-	movq	%mm5,%mm7
-	movq	%mm1,%mm2
-	movq	%mm5,%mm6
-	pxor	%mm1,%mm0
-	pxor	%mm5,%mm4
-	pslld	$24,%mm3
-	pslld	$24,%mm7
-	psrld	$8,%mm2
-	psrld	$8,%mm6
-	pxor	%mm3,%mm0
-	pxor	%mm7,%mm4
-	pxor	%mm2,%mm0
-	pxor	%mm6,%mm4
-	movq	8(%esp),%mm2
-	pxor	%mm3,%mm3
-	pxor	%mm7,%mm7
-	pcmpgtb	%mm1,%mm3
-	pcmpgtb	%mm5,%mm7
-	pand	%mm2,%mm3
-	pand	%mm2,%mm7
-	paddb	%mm1,%mm1
-	paddb	%mm5,%mm5
-	pxor	%mm3,%mm1
-	pxor	%mm7,%mm5
-	pshufw	$177,%mm1,%mm3
-	pshufw	$177,%mm5,%mm7
-	pxor	%mm1,%mm0
-	pxor	%mm5,%mm4
-	pxor	%mm3,%mm0
-	pxor	%mm7,%mm4
-	pxor	%mm3,%mm3
-	pxor	%mm7,%mm7
-	pcmpgtb	%mm1,%mm3
-	pcmpgtb	%mm5,%mm7
-	pand	%mm2,%mm3
-	pand	%mm2,%mm7
-	paddb	%mm1,%mm1
-	paddb	%mm5,%mm5
-	pxor	%mm3,%mm1
-	pxor	%mm7,%mm5
-	pxor	%mm1,%mm0
-	pxor	%mm5,%mm4
-	movq	%mm1,%mm3
-	movq	%mm5,%mm7
-	pshufw	$177,%mm1,%mm2
-	pshufw	$177,%mm5,%mm6
-	pxor	%mm2,%mm0
-	pxor	%mm6,%mm4
-	pslld	$8,%mm1
-	pslld	$8,%mm5
-	psrld	$8,%mm3
-	psrld	$8,%mm7
-	movq	(%edi),%mm2
-	movq	8(%edi),%mm6
-	pxor	%mm1,%mm0
-	pxor	%mm5,%mm4
-	pxor	%mm3,%mm0
-	pxor	%mm7,%mm4
-	movl	-128(%ebp),%eax
-	pslld	$16,%mm1
-	pslld	$16,%mm5
-	movl	-64(%ebp),%ebx
-	psrld	$16,%mm3
-	psrld	$16,%mm7
-	movl	(%ebp),%ecx
-	pxor	%mm1,%mm0
-	pxor	%mm5,%mm4
-	movl	64(%ebp),%edx
-	pxor	%mm3,%mm0
-	pxor	%mm7,%mm4
-	pxor	%mm2,%mm0
-	pxor	%mm6,%mm4
-	jmp	L007loop
-.align	4,0x90
-L008out:
-	pxor	(%edi),%mm0
-	pxor	8(%edi),%mm4
-	ret
-.align	4
-__x86_AES_decrypt:
-	movl	%edi,20(%esp)
-	xorl	(%edi),%eax
-	xorl	4(%edi),%ebx
-	xorl	8(%edi),%ecx
-	xorl	12(%edi),%edx
-	movl	240(%edi),%esi
-	leal	-2(%esi,%esi,1),%esi
-	leal	(%edi,%esi,8),%esi
-	movl	%esi,24(%esp)
-.align	4,0x90
-L009loop:
-	movl	%eax,%esi
-	andl	$255,%esi
-	movl	(%ebp,%esi,8),%esi
-	movzbl	%dh,%edi
-	xorl	3(%ebp,%edi,8),%esi
-	movl	%ecx,%edi
-	shrl	$16,%edi
-	andl	$255,%edi
-	xorl	2(%ebp,%edi,8),%esi
-	movl	%ebx,%edi
-	shrl	$24,%edi
-	xorl	1(%ebp,%edi,8),%esi
-	movl	%esi,4(%esp)
-	movl	%ebx,%esi
-	andl	$255,%esi
-	movl	(%ebp,%esi,8),%esi
-	movzbl	%ah,%edi
-	xorl	3(%ebp,%edi,8),%esi
-	movl	%edx,%edi
-	shrl	$16,%edi
-	andl	$255,%edi
-	xorl	2(%ebp,%edi,8),%esi
-	movl	%ecx,%edi
-	shrl	$24,%edi
-	xorl	1(%ebp,%edi,8),%esi
-	movl	%esi,8(%esp)
-	movl	%ecx,%esi
-	andl	$255,%esi
-	movl	(%ebp,%esi,8),%esi
-	movzbl	%bh,%edi
-	xorl	3(%ebp,%edi,8),%esi
-	movl	%eax,%edi
-	shrl	$16,%edi
-	andl	$255,%edi
-	xorl	2(%ebp,%edi,8),%esi
-	movl	%edx,%edi
-	shrl	$24,%edi
-	xorl	1(%ebp,%edi,8),%esi
-	movl	20(%esp),%edi
-	andl	$255,%edx
-	movl	(%ebp,%edx,8),%edx
-	movzbl	%ch,%ecx
-	xorl	3(%ebp,%ecx,8),%edx
-	movl	%esi,%ecx
-	shrl	$16,%ebx
-	andl	$255,%ebx
-	xorl	2(%ebp,%ebx,8),%edx
-	movl	8(%esp),%ebx
-	shrl	$24,%eax
-	xorl	1(%ebp,%eax,8),%edx
-	movl	4(%esp),%eax
-	addl	$16,%edi
-	xorl	(%edi),%eax
-	xorl	4(%edi),%ebx
-	xorl	8(%edi),%ecx
-	xorl	12(%edi),%edx
-	cmpl	24(%esp),%edi
-	movl	%edi,20(%esp)
-	jb	L009loop
-	leal	2176(%ebp),%ebp
-	movl	-128(%ebp),%edi
-	movl	-96(%ebp),%esi
-	movl	-64(%ebp),%edi
-	movl	-32(%ebp),%esi
-	movl	(%ebp),%edi
-	movl	32(%ebp),%esi
-	movl	64(%ebp),%edi
-	movl	96(%ebp),%esi
-	leal	-128(%ebp),%ebp
-	movl	%eax,%esi
-	andl	$255,%esi
-	movzbl	(%ebp,%esi,1),%esi
-	movzbl	%dh,%edi
-	movzbl	(%ebp,%edi,1),%edi
-	shll	$8,%edi
-	xorl	%edi,%esi
-	movl	%ecx,%edi
-	shrl	$16,%edi
-	andl	$255,%edi
-	movzbl	(%ebp,%edi,1),%edi
-	shll	$16,%edi
-	xorl	%edi,%esi
-	movl	%ebx,%edi
-	shrl	$24,%edi
-	movzbl	(%ebp,%edi,1),%edi
-	shll	$24,%edi
-	xorl	%edi,%esi
-	movl	%esi,4(%esp)
-	movl	%ebx,%esi
-	andl	$255,%esi
-	movzbl	(%ebp,%esi,1),%esi
-	movzbl	%ah,%edi
-	movzbl	(%ebp,%edi,1),%edi
-	shll	$8,%edi
-	xorl	%edi,%esi
-	movl	%edx,%edi
-	shrl	$16,%edi
-	andl	$255,%edi
-	movzbl	(%ebp,%edi,1),%edi
-	shll	$16,%edi
-	xorl	%edi,%esi
-	movl	%ecx,%edi
-	shrl	$24,%edi
-	movzbl	(%ebp,%edi,1),%edi
-	shll	$24,%edi
-	xorl	%edi,%esi
-	movl	%esi,8(%esp)
-	movl	%ecx,%esi
-	andl	$255,%esi
-	movzbl	(%ebp,%esi,1),%esi
-	movzbl	%bh,%edi
-	movzbl	(%ebp,%edi,1),%edi
-	shll	$8,%edi
-	xorl	%edi,%esi
-	movl	%eax,%edi
-	shrl	$16,%edi
-	andl	$255,%edi
-	movzbl	(%ebp,%edi,1),%edi
-	shll	$16,%edi
-	xorl	%edi,%esi
-	movl	%edx,%edi
-	shrl	$24,%edi
-	movzbl	(%ebp,%edi,1),%edi
-	shll	$24,%edi
-	xorl	%edi,%esi
-	movl	20(%esp),%edi
-	andl	$255,%edx
-	movzbl	(%ebp,%edx,1),%edx
-	movzbl	%ch,%ecx
-	movzbl	(%ebp,%ecx,1),%ecx
-	shll	$8,%ecx
-	xorl	%ecx,%edx
-	movl	%esi,%ecx
-	shrl	$16,%ebx
-	andl	$255,%ebx
-	movzbl	(%ebp,%ebx,1),%ebx
-	shll	$16,%ebx
-	xorl	%ebx,%edx
-	movl	8(%esp),%ebx
-	shrl	$24,%eax
-	movzbl	(%ebp,%eax,1),%eax
-	shll	$24,%eax
-	xorl	%eax,%edx
-	movl	4(%esp),%eax
-	leal	-2048(%ebp),%ebp
-	addl	$16,%edi
-	xorl	(%edi),%eax
-	xorl	4(%edi),%ebx
-	xorl	8(%edi),%ecx
-	xorl	12(%edi),%edx
-	ret
-.align	6,0x90
-LAES_Td:
-.long	1353184337,1353184337
-.long	1399144830,1399144830
-.long	3282310938,3282310938
-.long	2522752826,2522752826
-.long	3412831035,3412831035
-.long	4047871263,4047871263
-.long	2874735276,2874735276
-.long	2466505547,2466505547
-.long	1442459680,1442459680
-.long	4134368941,4134368941
-.long	2440481928,2440481928
-.long	625738485,625738485
-.long	4242007375,4242007375
-.long	3620416197,3620416197
-.long	2151953702,2151953702
-.long	2409849525,2409849525
-.long	1230680542,1230680542
-.long	1729870373,1729870373
-.long	2551114309,2551114309
-.long	3787521629,3787521629
-.long	41234371,41234371
-.long	317738113,317738113
-.long	2744600205,2744600205
-.long	3338261355,3338261355
-.long	3881799427,3881799427
-.long	2510066197,2510066197
-.long	3950669247,3950669247
-.long	3663286933,3663286933
-.long	763608788,763608788
-.long	3542185048,3542185048
-.long	694804553,694804553
-.long	1154009486,1154009486
-.long	1787413109,1787413109
-.long	2021232372,2021232372
-.long	1799248025,1799248025
-.long	3715217703,3715217703
-.long	3058688446,3058688446
-.long	397248752,397248752
-.long	1722556617,1722556617
-.long	3023752829,3023752829
-.long	407560035,407560035
-.long	2184256229,2184256229
-.long	1613975959,1613975959
-.long	1165972322,1165972322
-.long	3765920945,3765920945
-.long	2226023355,2226023355
-.long	480281086,480281086
-.long	2485848313,2485848313
-.long	1483229296,1483229296
-.long	436028815,436028815
-.long	2272059028,2272059028
-.long	3086515026,3086515026
-.long	601060267,601060267
-.long	3791801202,3791801202
-.long	1468997603,1468997603
-.long	715871590,715871590
-.long	120122290,120122290
-.long	63092015,63092015
-.long	2591802758,2591802758
-.long	2768779219,2768779219
-.long	4068943920,4068943920
-.long	2997206819,2997206819
-.long	3127509762,3127509762
-.long	1552029421,1552029421
-.long	723308426,723308426
-.long	2461301159,2461301159
-.long	4042393587,4042393587
-.long	2715969870,2715969870
-.long	3455375973,3455375973
-.long	3586000134,3586000134
-.long	526529745,526529745
-.long	2331944644,2331944644
-.long	2639474228,2639474228
-.long	2689987490,2689987490
-.long	853641733,853641733
-.long	1978398372,1978398372
-.long	971801355,971801355
-.long	2867814464,2867814464
-.long	111112542,111112542
-.long	1360031421,1360031421
-.long	4186579262,4186579262
-.long	1023860118,1023860118
-.long	2919579357,2919579357
-.long	1186850381,1186850381
-.long	3045938321,3045938321
-.long	90031217,90031217
-.long	1876166148,1876166148
-.long	4279586912,4279586912
-.long	620468249,620468249
-.long	2548678102,2548678102
-.long	3426959497,3426959497
-.long	2006899047,2006899047
-.long	3175278768,3175278768
-.long	2290845959,2290845959
-.long	945494503,945494503
-.long	3689859193,3689859193
-.long	1191869601,1191869601
-.long	3910091388,3910091388
-.long	3374220536,3374220536
-.long	0,0
-.long	2206629897,2206629897
-.long	1223502642,1223502642
-.long	2893025566,2893025566
-.long	1316117100,1316117100
-.long	4227796733,4227796733
-.long	1446544655,1446544655
-.long	517320253,517320253
-.long	658058550,658058550
-.long	1691946762,1691946762
-.long	564550760,564550760
-.long	3511966619,3511966619
-.long	976107044,976107044
-.long	2976320012,2976320012
-.long	266819475,266819475
-.long	3533106868,3533106868
-.long	2660342555,2660342555
-.long	1338359936,1338359936
-.long	2720062561,2720062561
-.long	1766553434,1766553434
-.long	370807324,370807324
-.long	179999714,179999714
-.long	3844776128,3844776128
-.long	1138762300,1138762300
-.long	488053522,488053522
-.long	185403662,185403662
-.long	2915535858,2915535858
-.long	3114841645,3114841645
-.long	3366526484,3366526484
-.long	2233069911,2233069911
-.long	1275557295,1275557295
-.long	3151862254,3151862254
-.long	4250959779,4250959779
-.long	2670068215,2670068215
-.long	3170202204,3170202204
-.long	3309004356,3309004356
-.long	880737115,880737115
-.long	1982415755,1982415755
-.long	3703972811,3703972811
-.long	1761406390,1761406390
-.long	1676797112,1676797112
-.long	3403428311,3403428311
-.long	277177154,277177154
-.long	1076008723,1076008723
-.long	538035844,538035844
-.long	2099530373,2099530373
-.long	4164795346,4164795346
-.long	288553390,288553390
-.long	1839278535,1839278535
-.long	1261411869,1261411869
-.long	4080055004,4080055004
-.long	3964831245,3964831245
-.long	3504587127,3504587127
-.long	1813426987,1813426987
-.long	2579067049,2579067049
-.long	4199060497,4199060497
-.long	577038663,577038663
-.long	3297574056,3297574056
-.long	440397984,440397984
-.long	3626794326,3626794326
-.long	4019204898,4019204898
-.long	3343796615,3343796615
-.long	3251714265,3251714265
-.long	4272081548,4272081548
-.long	906744984,906744984
-.long	3481400742,3481400742
-.long	685669029,685669029
-.long	646887386,646887386
-.long	2764025151,2764025151
-.long	3835509292,3835509292
-.long	227702864,227702864
-.long	2613862250,2613862250
-.long	1648787028,1648787028
-.long	3256061430,3256061430
-.long	3904428176,3904428176
-.long	1593260334,1593260334
-.long	4121936770,4121936770
-.long	3196083615,3196083615
-.long	2090061929,2090061929
-.long	2838353263,2838353263
-.long	3004310991,3004310991
-.long	999926984,999926984
-.long	2809993232,2809993232
-.long	1852021992,1852021992
-.long	2075868123,2075868123
-.long	158869197,158869197
-.long	4095236462,4095236462
-.long	28809964,28809964
-.long	2828685187,2828685187
-.long	1701746150,1701746150
-.long	2129067946,2129067946
-.long	147831841,147831841
-.long	3873969647,3873969647
-.long	3650873274,3650873274
-.long	3459673930,3459673930
-.long	3557400554,3557400554
-.long	3598495785,3598495785
-.long	2947720241,2947720241
-.long	824393514,824393514
-.long	815048134,815048134
-.long	3227951669,3227951669
-.long	935087732,935087732
-.long	2798289660,2798289660
-.long	2966458592,2966458592
-.long	366520115,366520115
-.long	1251476721,1251476721
-.long	4158319681,4158319681
-.long	240176511,240176511
-.long	804688151,804688151
-.long	2379631990,2379631990
-.long	1303441219,1303441219
-.long	1414376140,1414376140
-.long	3741619940,3741619940
-.long	3820343710,3820343710
-.long	461924940,461924940
-.long	3089050817,3089050817
-.long	2136040774,2136040774
-.long	82468509,82468509
-.long	1563790337,1563790337
-.long	1937016826,1937016826
-.long	776014843,776014843
-.long	1511876531,1511876531
-.long	1389550482,1389550482
-.long	861278441,861278441
-.long	323475053,323475053
-.long	2355222426,2355222426
-.long	2047648055,2047648055
-.long	2383738969,2383738969
-.long	2302415851,2302415851
-.long	3995576782,3995576782
-.long	902390199,902390199
-.long	3991215329,3991215329
-.long	1018251130,1018251130
-.long	1507840668,1507840668
-.long	1064563285,1064563285
-.long	2043548696,2043548696
-.long	3208103795,3208103795
-.long	3939366739,3939366739
-.long	1537932639,1537932639
-.long	342834655,342834655
-.long	2262516856,2262516856
-.long	2180231114,2180231114
-.long	1053059257,1053059257
-.long	741614648,741614648
-.long	1598071746,1598071746
-.long	1925389590,1925389590
-.long	203809468,203809468
-.long	2336832552,2336832552
-.long	1100287487,1100287487
-.long	1895934009,1895934009
-.long	3736275976,3736275976
-.long	2632234200,2632234200
-.long	2428589668,2428589668
-.long	1636092795,1636092795
-.long	1890988757,1890988757
-.long	1952214088,1952214088
-.long	1113045200,1113045200
-.byte	82,9,106,213,48,54,165,56
-.byte	191,64,163,158,129,243,215,251
-.byte	124,227,57,130,155,47,255,135
-.byte	52,142,67,68,196,222,233,203
-.byte	84,123,148,50,166,194,35,61
-.byte	238,76,149,11,66,250,195,78
-.byte	8,46,161,102,40,217,36,178
-.byte	118,91,162,73,109,139,209,37
-.byte	114,248,246,100,134,104,152,22
-.byte	212,164,92,204,93,101,182,146
-.byte	108,112,72,80,253,237,185,218
-.byte	94,21,70,87,167,141,157,132
-.byte	144,216,171,0,140,188,211,10
-.byte	247,228,88,5,184,179,69,6
-.byte	208,44,30,143,202,63,15,2
-.byte	193,175,189,3,1,19,138,107
-.byte	58,145,17,65,79,103,220,234
-.byte	151,242,207,206,240,180,230,115
-.byte	150,172,116,34,231,173,53,133
-.byte	226,249,55,232,28,117,223,110
-.byte	71,241,26,113,29,41,197,137
-.byte	111,183,98,14,170,24,190,27
-.byte	252,86,62,75,198,210,121,32
-.byte	154,219,192,254,120,205,90,244
-.byte	31,221,168,51,136,7,199,49
-.byte	177,18,16,89,39,128,236,95
-.byte	96,81,127,169,25,181,74,13
-.byte	45,229,122,159,147,201,156,239
-.byte	160,224,59,77,174,42,245,176
-.byte	200,235,187,60,131,83,153,97
-.byte	23,43,4,126,186,119,214,38
-.byte	225,105,20,99,85,33,12,125
-.byte	82,9,106,213,48,54,165,56
-.byte	191,64,163,158,129,243,215,251
-.byte	124,227,57,130,155,47,255,135
-.byte	52,142,67,68,196,222,233,203
-.byte	84,123,148,50,166,194,35,61
-.byte	238,76,149,11,66,250,195,78
-.byte	8,46,161,102,40,217,36,178
-.byte	118,91,162,73,109,139,209,37
-.byte	114,248,246,100,134,104,152,22
-.byte	212,164,92,204,93,101,182,146
-.byte	108,112,72,80,253,237,185,218
-.byte	94,21,70,87,167,141,157,132
-.byte	144,216,171,0,140,188,211,10
-.byte	247,228,88,5,184,179,69,6
-.byte	208,44,30,143,202,63,15,2
-.byte	193,175,189,3,1,19,138,107
-.byte	58,145,17,65,79,103,220,234
-.byte	151,242,207,206,240,180,230,115
-.byte	150,172,116,34,231,173,53,133
-.byte	226,249,55,232,28,117,223,110
-.byte	71,241,26,113,29,41,197,137
-.byte	111,183,98,14,170,24,190,27
-.byte	252,86,62,75,198,210,121,32
-.byte	154,219,192,254,120,205,90,244
-.byte	31,221,168,51,136,7,199,49
-.byte	177,18,16,89,39,128,236,95
-.byte	96,81,127,169,25,181,74,13
-.byte	45,229,122,159,147,201,156,239
-.byte	160,224,59,77,174,42,245,176
-.byte	200,235,187,60,131,83,153,97
-.byte	23,43,4,126,186,119,214,38
-.byte	225,105,20,99,85,33,12,125
-.byte	82,9,106,213,48,54,165,56
-.byte	191,64,163,158,129,243,215,251
-.byte	124,227,57,130,155,47,255,135
-.byte	52,142,67,68,196,222,233,203
-.byte	84,123,148,50,166,194,35,61
-.byte	238,76,149,11,66,250,195,78
-.byte	8,46,161,102,40,217,36,178
-.byte	118,91,162,73,109,139,209,37
-.byte	114,248,246,100,134,104,152,22
-.byte	212,164,92,204,93,101,182,146
-.byte	108,112,72,80,253,237,185,218
-.byte	94,21,70,87,167,141,157,132
-.byte	144,216,171,0,140,188,211,10
-.byte	247,228,88,5,184,179,69,6
-.byte	208,44,30,143,202,63,15,2
-.byte	193,175,189,3,1,19,138,107
-.byte	58,145,17,65,79,103,220,234
-.byte	151,242,207,206,240,180,230,115
-.byte	150,172,116,34,231,173,53,133
-.byte	226,249,55,232,28,117,223,110
-.byte	71,241,26,113,29,41,197,137
-.byte	111,183,98,14,170,24,190,27
-.byte	252,86,62,75,198,210,121,32
-.byte	154,219,192,254,120,205,90,244
-.byte	31,221,168,51,136,7,199,49
-.byte	177,18,16,89,39,128,236,95
-.byte	96,81,127,169,25,181,74,13
-.byte	45,229,122,159,147,201,156,239
-.byte	160,224,59,77,174,42,245,176
-.byte	200,235,187,60,131,83,153,97
-.byte	23,43,4,126,186,119,214,38
-.byte	225,105,20,99,85,33,12,125
-.byte	82,9,106,213,48,54,165,56
-.byte	191,64,163,158,129,243,215,251
-.byte	124,227,57,130,155,47,255,135
-.byte	52,142,67,68,196,222,233,203
-.byte	84,123,148,50,166,194,35,61
-.byte	238,76,149,11,66,250,195,78
-.byte	8,46,161,102,40,217,36,178
-.byte	118,91,162,73,109,139,209,37
-.byte	114,248,246,100,134,104,152,22
-.byte	212,164,92,204,93,101,182,146
-.byte	108,112,72,80,253,237,185,218
-.byte	94,21,70,87,167,141,157,132
-.byte	144,216,171,0,140,188,211,10
-.byte	247,228,88,5,184,179,69,6
-.byte	208,44,30,143,202,63,15,2
-.byte	193,175,189,3,1,19,138,107
-.byte	58,145,17,65,79,103,220,234
-.byte	151,242,207,206,240,180,230,115
-.byte	150,172,116,34,231,173,53,133
-.byte	226,249,55,232,28,117,223,110
-.byte	71,241,26,113,29,41,197,137
-.byte	111,183,98,14,170,24,190,27
-.byte	252,86,62,75,198,210,121,32
-.byte	154,219,192,254,120,205,90,244
-.byte	31,221,168,51,136,7,199,49
-.byte	177,18,16,89,39,128,236,95
-.byte	96,81,127,169,25,181,74,13
-.byte	45,229,122,159,147,201,156,239
-.byte	160,224,59,77,174,42,245,176
-.byte	200,235,187,60,131,83,153,97
-.byte	23,43,4,126,186,119,214,38
-.byte	225,105,20,99,85,33,12,125
-.globl	_AES_decrypt
-.align	4
-_AES_decrypt:
-L_AES_decrypt_begin:
-	pushl	%ebp
-	pushl	%ebx
-	pushl	%esi
-	pushl	%edi
-	movl	20(%esp),%esi
-	movl	28(%esp),%edi
-	movl	%esp,%eax
-	subl	$36,%esp
-	andl	$-64,%esp
-	leal	-127(%edi),%ebx
-	subl	%esp,%ebx
-	negl	%ebx
-	andl	$960,%ebx
-	subl	%ebx,%esp
-	addl	$4,%esp
-	movl	%eax,28(%esp)
-	call	L010pic_point
-L010pic_point:
-	popl	%ebp
-	movl	L_OPENSSL_ia32cap_P$non_lazy_ptr-L010pic_point(%ebp),%eax
-	leal	LAES_Td-L010pic_point(%ebp),%ebp
-	leal	764(%esp),%ebx
-	subl	%ebp,%ebx
-	andl	$768,%ebx
-	leal	2176(%ebp,%ebx,1),%ebp
-	btl	$25,(%eax)
-	jnc	L011x86
-	movq	(%esi),%mm0
-	movq	8(%esi),%mm4
-	call	__sse_AES_decrypt_compact
-	movl	28(%esp),%esp
-	movl	24(%esp),%esi
-	movq	%mm0,(%esi)
-	movq	%mm4,8(%esi)
-	emms
-	popl	%edi
-	popl	%esi
-	popl	%ebx
-	popl	%ebp
-	ret
-.align	4,0x90
-L011x86:
-	movl	%ebp,24(%esp)
-	movl	(%esi),%eax
-	movl	4(%esi),%ebx
-	movl	8(%esi),%ecx
-	movl	12(%esi),%edx
-	call	__x86_AES_decrypt_compact
-	movl	28(%esp),%esp
-	movl	24(%esp),%esi
-	movl	%eax,(%esi)
-	movl	%ebx,4(%esi)
-	movl	%ecx,8(%esi)
-	movl	%edx,12(%esi)
-	popl	%edi
-	popl	%esi
-	popl	%ebx
-	popl	%ebp
-	ret
-.globl	_AES_cbc_encrypt
-.align	4
-_AES_cbc_encrypt:
-L_AES_cbc_encrypt_begin:
-	pushl	%ebp
-	pushl	%ebx
-	pushl	%esi
-	pushl	%edi
-	movl	28(%esp),%ecx
-	cmpl	$0,%ecx
-	je	L012drop_out
-	call	L013pic_point
-L013pic_point:
-	popl	%ebp
-	movl	L_OPENSSL_ia32cap_P$non_lazy_ptr-L013pic_point(%ebp),%eax
-	cmpl	$0,40(%esp)
-	leal	LAES_Te-L013pic_point(%ebp),%ebp
-	jne	L014picked_te
-	leal	LAES_Td-LAES_Te(%ebp),%ebp
-L014picked_te:
-	pushfl
-	cld
-	cmpl	$512,%ecx
-	jb	L015slow_way
-	testl	$15,%ecx
-	jnz	L015slow_way
-	btl	$28,(%eax)
-	jc	L015slow_way
-	leal	-324(%esp),%esi
-	andl	$-64,%esi
-	movl	%ebp,%eax
-	leal	2304(%ebp),%ebx
-	movl	%esi,%edx
-	andl	$4095,%eax
-	andl	$4095,%ebx
-	andl	$4095,%edx
-	cmpl	%ebx,%edx
-	jb	L016tbl_break_out
-	subl	%ebx,%edx
-	subl	%edx,%esi
-	jmp	L017tbl_ok
-.align	2,0x90
-L016tbl_break_out:
-	subl	%eax,%edx
-	andl	$4095,%edx
-	addl	$384,%edx
-	subl	%edx,%esi
-.align	2,0x90
-L017tbl_ok:
-	leal	24(%esp),%edx
-	xchgl	%esi,%esp
-	addl	$4,%esp
-	movl	%ebp,24(%esp)
-	movl	%esi,28(%esp)
-	movl	(%edx),%eax
-	movl	4(%edx),%ebx
-	movl	12(%edx),%edi
-	movl	16(%edx),%esi
-	movl	20(%edx),%edx
-	movl	%eax,32(%esp)
-	movl	%ebx,36(%esp)
-	movl	%ecx,40(%esp)
-	movl	%edi,44(%esp)
-	movl	%esi,48(%esp)
-	movl	$0,316(%esp)
-	movl	%edi,%ebx
-	movl	$61,%ecx
-	subl	%ebp,%ebx
-	movl	%edi,%esi
-	andl	$4095,%ebx
-	leal	76(%esp),%edi
-	cmpl	$2304,%ebx
-	jb	L018do_copy
-	cmpl	$3852,%ebx
-	jb	L019skip_copy
-.align	2,0x90
-L018do_copy:
-	movl	%edi,44(%esp)
-.long	2784229001
-L019skip_copy:
-	movl	$16,%edi
-.align	2,0x90
-L020prefetch_tbl:
-	movl	(%ebp),%eax
-	movl	32(%ebp),%ebx
-	movl	64(%ebp),%ecx
-	movl	96(%ebp),%esi
-	leal	128(%ebp),%ebp
-	subl	$1,%edi
-	jnz	L020prefetch_tbl
-	subl	$2048,%ebp
-	movl	32(%esp),%esi
-	movl	48(%esp),%edi
-	cmpl	$0,%edx
-	je	L021fast_decrypt
-	movl	(%edi),%eax
-	movl	4(%edi),%ebx
-.align	4,0x90
-L022fast_enc_loop:
-	movl	8(%edi),%ecx
-	movl	12(%edi),%edx
-	xorl	(%esi),%eax
-	xorl	4(%esi),%ebx
-	xorl	8(%esi),%ecx
-	xorl	12(%esi),%edx
-	movl	44(%esp),%edi
-	call	__x86_AES_encrypt
-	movl	32(%esp),%esi
-	movl	36(%esp),%edi
-	movl	%eax,(%edi)
-	movl	%ebx,4(%edi)
-	movl	%ecx,8(%edi)
-	movl	%edx,12(%edi)
-	leal	16(%esi),%esi
-	movl	40(%esp),%ecx
-	movl	%esi,32(%esp)
-	leal	16(%edi),%edx
-	movl	%edx,36(%esp)
-	subl	$16,%ecx
-	movl	%ecx,40(%esp)
-	jnz	L022fast_enc_loop
-	movl	48(%esp),%esi
-	movl	8(%edi),%ecx
-	movl	12(%edi),%edx
-	movl	%eax,(%esi)
-	movl	%ebx,4(%esi)
-	movl	%ecx,8(%esi)
-	movl	%edx,12(%esi)
-	cmpl	$0,316(%esp)
-	movl	44(%esp),%edi
-	je	L023skip_ezero
-	movl	$60,%ecx
-	xorl	%eax,%eax
-.align	2,0x90
-.long	2884892297
-L023skip_ezero:
-	movl	28(%esp),%esp
-	popfl
-L012drop_out:
-	popl	%edi
-	popl	%esi
-	popl	%ebx
-	popl	%ebp
-	ret
-	pushfl
-.align	4,0x90
-L021fast_decrypt:
-	cmpl	36(%esp),%esi
-	je	L024fast_dec_in_place
-	movl	%edi,52(%esp)
-.align	2,0x90
-.align	4,0x90
-L025fast_dec_loop:
-	movl	(%esi),%eax
-	movl	4(%esi),%ebx
-	movl	8(%esi),%ecx
-	movl	12(%esi),%edx
-	movl	44(%esp),%edi
-	call	__x86_AES_decrypt
-	movl	52(%esp),%edi
-	movl	40(%esp),%esi
-	xorl	(%edi),%eax
-	xorl	4(%edi),%ebx
-	xorl	8(%edi),%ecx
-	xorl	12(%edi),%edx
-	movl	36(%esp),%edi
-	movl	32(%esp),%esi
-	movl	%eax,(%edi)
-	movl	%ebx,4(%edi)
-	movl	%ecx,8(%edi)
-	movl	%edx,12(%edi)
-	movl	40(%esp),%ecx
-	movl	%esi,52(%esp)
-	leal	16(%esi),%esi
-	movl	%esi,32(%esp)
-	leal	16(%edi),%edi
-	movl	%edi,36(%esp)
-	subl	$16,%ecx
-	movl	%ecx,40(%esp)
-	jnz	L025fast_dec_loop
-	movl	52(%esp),%edi
-	movl	48(%esp),%esi
-	movl	(%edi),%eax
-	movl	4(%edi),%ebx
-	movl	8(%edi),%ecx
-	movl	12(%edi),%edx
-	movl	%eax,(%esi)
-	movl	%ebx,4(%esi)
-	movl	%ecx,8(%esi)
-	movl	%edx,12(%esi)
-	jmp	L026fast_dec_out
-.align	4,0x90
-L024fast_dec_in_place:
-L027fast_dec_in_place_loop:
-	movl	(%esi),%eax
-	movl	4(%esi),%ebx
-	movl	8(%esi),%ecx
-	movl	12(%esi),%edx
-	leal	60(%esp),%edi
-	movl	%eax,(%edi)
-	movl	%ebx,4(%edi)
-	movl	%ecx,8(%edi)
-	movl	%edx,12(%edi)
-	movl	44(%esp),%edi
-	call	__x86_AES_decrypt
-	movl	48(%esp),%edi
-	movl	36(%esp),%esi
-	xorl	(%edi),%eax
-	xorl	4(%edi),%ebx
-	xorl	8(%edi),%ecx
-	xorl	12(%edi),%edx
-	movl	%eax,(%esi)
-	movl	%ebx,4(%esi)
-	movl	%ecx,8(%esi)
-	movl	%edx,12(%esi)
-	leal	16(%esi),%esi
-	movl	%esi,36(%esp)
-	leal	60(%esp),%esi
-	movl	(%esi),%eax
-	movl	4(%esi),%ebx
-	movl	8(%esi),%ecx
-	movl	12(%esi),%edx
-	movl	%eax,(%edi)
-	movl	%ebx,4(%edi)
-	movl	%ecx,8(%edi)
-	movl	%edx,12(%edi)
-	movl	32(%esp),%esi
-	movl	40(%esp),%ecx
-	leal	16(%esi),%esi
-	movl	%esi,32(%esp)
-	subl	$16,%ecx
-	movl	%ecx,40(%esp)
-	jnz	L027fast_dec_in_place_loop
-.align	2,0x90
-L026fast_dec_out:
-	cmpl	$0,316(%esp)
-	movl	44(%esp),%edi
-	je	L028skip_dzero
-	movl	$60,%ecx
-	xorl	%eax,%eax
-.align	2,0x90
-.long	2884892297
-L028skip_dzero:
-	movl	28(%esp),%esp
-	popfl
-	popl	%edi
-	popl	%esi
-	popl	%ebx
-	popl	%ebp
-	ret
-	pushfl
-.align	4,0x90
-L015slow_way:
-	movl	(%eax),%eax
-	movl	36(%esp),%edi
-	leal	-80(%esp),%esi
-	andl	$-64,%esi
-	leal	-143(%edi),%ebx
-	subl	%esi,%ebx
-	negl	%ebx
-	andl	$960,%ebx
-	subl	%ebx,%esi
-	leal	768(%esi),%ebx
-	subl	%ebp,%ebx
-	andl	$768,%ebx
-	leal	2176(%ebp,%ebx,1),%ebp
-	leal	24(%esp),%edx
-	xchgl	%esi,%esp
-	addl	$4,%esp
-	movl	%ebp,24(%esp)
-	movl	%esi,28(%esp)
-	movl	%eax,52(%esp)
-	movl	(%edx),%eax
-	movl	4(%edx),%ebx
-	movl	16(%edx),%esi
-	movl	20(%edx),%edx
-	movl	%eax,32(%esp)
-	movl	%ebx,36(%esp)
-	movl	%ecx,40(%esp)
-	movl	%edi,44(%esp)
-	movl	%esi,48(%esp)
-	movl	%esi,%edi
-	movl	%eax,%esi
-	cmpl	$0,%edx
-	je	L029slow_decrypt
-	cmpl	$16,%ecx
-	movl	%ebx,%edx
-	jb	L030slow_enc_tail
-	btl	$25,52(%esp)
-	jnc	L031slow_enc_x86
-	movq	(%edi),%mm0
-	movq	8(%edi),%mm4
-.align	4,0x90
-L032slow_enc_loop_sse:
-	pxor	(%esi),%mm0
-	pxor	8(%esi),%mm4
-	movl	44(%esp),%edi
-	call	__sse_AES_encrypt_compact
-	movl	32(%esp),%esi
-	movl	36(%esp),%edi
-	movl	40(%esp),%ecx
-	movq	%mm0,(%edi)
-	movq	%mm4,8(%edi)
-	leal	16(%esi),%esi
-	movl	%esi,32(%esp)
-	leal	16(%edi),%edx
-	movl	%edx,36(%esp)
-	subl	$16,%ecx
-	cmpl	$16,%ecx
-	movl	%ecx,40(%esp)
-	jae	L032slow_enc_loop_sse
-	testl	$15,%ecx
-	jnz	L030slow_enc_tail
-	movl	48(%esp),%esi
-	movq	%mm0,(%esi)
-	movq	%mm4,8(%esi)
-	emms
-	movl	28(%esp),%esp
-	popfl
-	popl	%edi
-	popl	%esi
-	popl	%ebx
-	popl	%ebp
-	ret
-	pushfl
-.align	4,0x90
-L031slow_enc_x86:
-	movl	(%edi),%eax
-	movl	4(%edi),%ebx
-.align	2,0x90
-L033slow_enc_loop_x86:
-	movl	8(%edi),%ecx
-	movl	12(%edi),%edx
-	xorl	(%esi),%eax
-	xorl	4(%esi),%ebx
-	xorl	8(%esi),%ecx
-	xorl	12(%esi),%edx
-	movl	44(%esp),%edi
-	call	__x86_AES_encrypt_compact
-	movl	32(%esp),%esi
-	movl	36(%esp),%edi
-	movl	%eax,(%edi)
-	movl	%ebx,4(%edi)
-	movl	%ecx,8(%edi)
-	movl	%edx,12(%edi)
-	movl	40(%esp),%ecx
-	leal	16(%esi),%esi
-	movl	%esi,32(%esp)
-	leal	16(%edi),%edx
-	movl	%edx,36(%esp)
-	subl	$16,%ecx
-	cmpl	$16,%ecx
-	movl	%ecx,40(%esp)
-	jae	L033slow_enc_loop_x86
-	testl	$15,%ecx
-	jnz	L030slow_enc_tail
-	movl	48(%esp),%esi
-	movl	8(%edi),%ecx
-	movl	12(%edi),%edx
-	movl	%eax,(%esi)
-	movl	%ebx,4(%esi)
-	movl	%ecx,8(%esi)
-	movl	%edx,12(%esi)
-	movl	28(%esp),%esp
-	popfl
-	popl	%edi
-	popl	%esi
-	popl	%ebx
-	popl	%ebp
-	ret
-	pushfl
-.align	4,0x90
-L030slow_enc_tail:
-	emms
-	movl	%edx,%edi
-	movl	$16,%ebx
-	subl	%ecx,%ebx
-	cmpl	%esi,%edi
-	je	L034enc_in_place
-.align	2,0x90
-.long	2767451785
-	jmp	L035enc_skip_in_place
-L034enc_in_place:
-	leal	(%edi,%ecx,1),%edi
-L035enc_skip_in_place:
-	movl	%ebx,%ecx
-	xorl	%eax,%eax
-.align	2,0x90
-.long	2868115081
-	movl	48(%esp),%edi
-	movl	%edx,%esi
-	movl	(%edi),%eax
-	movl	4(%edi),%ebx
-	movl	$16,40(%esp)
-	jmp	L033slow_enc_loop_x86
-.align	4,0x90
-L029slow_decrypt:
-	btl	$25,52(%esp)
-	jnc	L036slow_dec_loop_x86
-.align	2,0x90
-L037slow_dec_loop_sse:
-	movq	(%esi),%mm0
-	movq	8(%esi),%mm4
-	movl	44(%esp),%edi
-	call	__sse_AES_decrypt_compact
-	movl	32(%esp),%esi
-	leal	60(%esp),%eax
-	movl	36(%esp),%ebx
-	movl	40(%esp),%ecx
-	movl	48(%esp),%edi
-	movq	(%esi),%mm1
-	movq	8(%esi),%mm5
-	pxor	(%edi),%mm0
-	pxor	8(%edi),%mm4
-	movq	%mm1,(%edi)
-	movq	%mm5,8(%edi)
-	subl	$16,%ecx
-	jc	L038slow_dec_partial_sse
-	movq	%mm0,(%ebx)
-	movq	%mm4,8(%ebx)
-	leal	16(%ebx),%ebx
-	movl	%ebx,36(%esp)
-	leal	16(%esi),%esi
-	movl	%esi,32(%esp)
-	movl	%ecx,40(%esp)
-	jnz	L037slow_dec_loop_sse
-	emms
-	movl	28(%esp),%esp
-	popfl
-	popl	%edi
-	popl	%esi
-	popl	%ebx
-	popl	%ebp
-	ret
-	pushfl
-.align	4,0x90
-L038slow_dec_partial_sse:
-	movq	%mm0,(%eax)
-	movq	%mm4,8(%eax)
-	emms
-	addl	$16,%ecx
-	movl	%ebx,%edi
-	movl	%eax,%esi
-.align	2,0x90
-.long	2767451785
-	movl	28(%esp),%esp
-	popfl
-	popl	%edi
-	popl	%esi
-	popl	%ebx
-	popl	%ebp
-	ret
-	pushfl
-.align	4,0x90
-L036slow_dec_loop_x86:
-	movl	(%esi),%eax
-	movl	4(%esi),%ebx
-	movl	8(%esi),%ecx
-	movl	12(%esi),%edx
-	leal	60(%esp),%edi
-	movl	%eax,(%edi)
-	movl	%ebx,4(%edi)
-	movl	%ecx,8(%edi)
-	movl	%edx,12(%edi)
-	movl	44(%esp),%edi
-	call	__x86_AES_decrypt_compact
-	movl	48(%esp),%edi
-	movl	40(%esp),%esi
-	xorl	(%edi),%eax
-	xorl	4(%edi),%ebx
-	xorl	8(%edi),%ecx
-	xorl	12(%edi),%edx
-	subl	$16,%esi
-	jc	L039slow_dec_partial_x86
-	movl	%esi,40(%esp)
-	movl	36(%esp),%esi
-	movl	%eax,(%esi)
-	movl	%ebx,4(%esi)
-	movl	%ecx,8(%esi)
-	movl	%edx,12(%esi)
-	leal	16(%esi),%esi
-	movl	%esi,36(%esp)
-	leal	60(%esp),%esi
-	movl	(%esi),%eax
-	movl	4(%esi),%ebx
-	movl	8(%esi),%ecx
-	movl	12(%esi),%edx
-	movl	%eax,(%edi)
-	movl	%ebx,4(%edi)
-	movl	%ecx,8(%edi)
-	movl	%edx,12(%edi)
-	movl	32(%esp),%esi
-	leal	16(%esi),%esi
-	movl	%esi,32(%esp)
-	jnz	L036slow_dec_loop_x86
-	movl	28(%esp),%esp
-	popfl
-	popl	%edi
-	popl	%esi
-	popl	%ebx
-	popl	%ebp
-	ret
-	pushfl
-.align	4,0x90
-L039slow_dec_partial_x86:
-	leal	60(%esp),%esi
-	movl	%eax,(%esi)
-	movl	%ebx,4(%esi)
-	movl	%ecx,8(%esi)
-	movl	%edx,12(%esi)
-	movl	32(%esp),%esi
-	movl	(%esi),%eax
-	movl	4(%esi),%ebx
-	movl	8(%esi),%ecx
-	movl	12(%esi),%edx
-	movl	%eax,(%edi)
-	movl	%ebx,4(%edi)
-	movl	%ecx,8(%edi)
-	movl	%edx,12(%edi)
-	movl	40(%esp),%ecx
-	movl	36(%esp),%edi
-	leal	60(%esp),%esi
-.align	2,0x90
-.long	2767451785
-	movl	28(%esp),%esp
-	popfl
-	popl	%edi
-	popl	%esi
-	popl	%ebx
-	popl	%ebp
-	ret
-.align	4
-__x86_AES_set_encrypt_key:
-	pushl	%ebp
-	pushl	%ebx
-	pushl	%esi
-	pushl	%edi
-	movl	24(%esp),%esi
-	movl	32(%esp),%edi
-	testl	$-1,%esi
-	jz	L040badpointer
-	testl	$-1,%edi
-	jz	L040badpointer
-	call	L041pic_point
-L041pic_point:
-	popl	%ebp
-	leal	LAES_Te-L041pic_point(%ebp),%ebp
-	leal	2176(%ebp),%ebp
-	movl	-128(%ebp),%eax
-	movl	-96(%ebp),%ebx
-	movl	-64(%ebp),%ecx
-	movl	-32(%ebp),%edx
-	movl	(%ebp),%eax
-	movl	32(%ebp),%ebx
-	movl	64(%ebp),%ecx
-	movl	96(%ebp),%edx
-	movl	28(%esp),%ecx
-	cmpl	$128,%ecx
-	je	L04210rounds
-	cmpl	$192,%ecx
-	je	L04312rounds
-	cmpl	$256,%ecx
-	je	L04414rounds
-	movl	$-2,%eax
-	jmp	L045exit
-L04210rounds:
-	movl	(%esi),%eax
-	movl	4(%esi),%ebx
-	movl	8(%esi),%ecx
-	movl	12(%esi),%edx
-	movl	%eax,(%edi)
-	movl	%ebx,4(%edi)
-	movl	%ecx,8(%edi)
-	movl	%edx,12(%edi)
-	xorl	%ecx,%ecx
-	jmp	L04610shortcut
-.align	2,0x90
-L04710loop:
-	movl	(%edi),%eax
-	movl	12(%edi),%edx
-L04610shortcut:
-	movzbl	%dl,%esi
-	movzbl	-128(%ebp,%esi,1),%ebx
-	movzbl	%dh,%esi
-	shll	$24,%ebx
-	xorl	%ebx,%eax
-	movzbl	-128(%ebp,%esi,1),%ebx
-	shrl	$16,%edx
-	movzbl	%dl,%esi
-	xorl	%ebx,%eax
-	movzbl	-128(%ebp,%esi,1),%ebx
-	movzbl	%dh,%esi
-	shll	$8,%ebx
-	xorl	%ebx,%eax
-	movzbl	-128(%ebp,%esi,1),%ebx
-	shll	$16,%ebx
-	xorl	%ebx,%eax
-	xorl	896(%ebp,%ecx,4),%eax
-	movl	%eax,16(%edi)
-	xorl	4(%edi),%eax
-	movl	%eax,20(%edi)
-	xorl	8(%edi),%eax
-	movl	%eax,24(%edi)
-	xorl	12(%edi),%eax
-	movl	%eax,28(%edi)
-	incl	%ecx
-	addl	$16,%edi
-	cmpl	$10,%ecx
-	jl	L04710loop
-	movl	$10,80(%edi)
-	xorl	%eax,%eax
-	jmp	L045exit
-L04312rounds:
-	movl	(%esi),%eax
-	movl	4(%esi),%ebx
-	movl	8(%esi),%ecx
-	movl	12(%esi),%edx
-	movl	%eax,(%edi)
-	movl	%ebx,4(%edi)
-	movl	%ecx,8(%edi)
-	movl	%edx,12(%edi)
-	movl	16(%esi),%ecx
-	movl	20(%esi),%edx
-	movl	%ecx,16(%edi)
-	movl	%edx,20(%edi)
-	xorl	%ecx,%ecx
-	jmp	L04812shortcut
-.align	2,0x90
-L04912loop:
-	movl	(%edi),%eax
-	movl	20(%edi),%edx
-L04812shortcut:
-	movzbl	%dl,%esi
-	movzbl	-128(%ebp,%esi,1),%ebx
-	movzbl	%dh,%esi
-	shll	$24,%ebx
-	xorl	%ebx,%eax
-	movzbl	-128(%ebp,%esi,1),%ebx
-	shrl	$16,%edx
-	movzbl	%dl,%esi
-	xorl	%ebx,%eax
-	movzbl	-128(%ebp,%esi,1),%ebx
-	movzbl	%dh,%esi
-	shll	$8,%ebx
-	xorl	%ebx,%eax
-	movzbl	-128(%ebp,%esi,1),%ebx
-	shll	$16,%ebx
-	xorl	%ebx,%eax
-	xorl	896(%ebp,%ecx,4),%eax
-	movl	%eax,24(%edi)
-	xorl	4(%edi),%eax
-	movl	%eax,28(%edi)
-	xorl	8(%edi),%eax
-	movl	%eax,32(%edi)
-	xorl	12(%edi),%eax
-	movl	%eax,36(%edi)
-	cmpl	$7,%ecx
-	je	L05012break
-	incl	%ecx
-	xorl	16(%edi),%eax
-	movl	%eax,40(%edi)
-	xorl	20(%edi),%eax
-	movl	%eax,44(%edi)
-	addl	$24,%edi
-	jmp	L04912loop
-L05012break:
-	movl	$12,72(%edi)
-	xorl	%eax,%eax
-	jmp	L045exit
-L04414rounds:
-	movl	(%esi),%eax
-	movl	4(%esi),%ebx
-	movl	8(%esi),%ecx
-	movl	12(%esi),%edx
-	movl	%eax,(%edi)
-	movl	%ebx,4(%edi)
-	movl	%ecx,8(%edi)
-	movl	%edx,12(%edi)
-	movl	16(%esi),%eax
-	movl	20(%esi),%ebx
-	movl	24(%esi),%ecx
-	movl	28(%esi),%edx
-	movl	%eax,16(%edi)
-	movl	%ebx,20(%edi)
-	movl	%ecx,24(%edi)
-	movl	%edx,28(%edi)
-	xorl	%ecx,%ecx
-	jmp	L05114shortcut
-.align	2,0x90
-L05214loop:
-	movl	28(%edi),%edx
-L05114shortcut:
-	movl	(%edi),%eax
-	movzbl	%dl,%esi
-	movzbl	-128(%ebp,%esi,1),%ebx
-	movzbl	%dh,%esi
-	shll	$24,%ebx
-	xorl	%ebx,%eax
-	movzbl	-128(%ebp,%esi,1),%ebx
-	shrl	$16,%edx
-	movzbl	%dl,%esi
-	xorl	%ebx,%eax
-	movzbl	-128(%ebp,%esi,1),%ebx
-	movzbl	%dh,%esi
-	shll	$8,%ebx
-	xorl	%ebx,%eax
-	movzbl	-128(%ebp,%esi,1),%ebx
-	shll	$16,%ebx
-	xorl	%ebx,%eax
-	xorl	896(%ebp,%ecx,4),%eax
-	movl	%eax,32(%edi)
-	xorl	4(%edi),%eax
-	movl	%eax,36(%edi)
-	xorl	8(%edi),%eax
-	movl	%eax,40(%edi)
-	xorl	12(%edi),%eax
-	movl	%eax,44(%edi)
-	cmpl	$6,%ecx
-	je	L05314break
-	incl	%ecx
-	movl	%eax,%edx
-	movl	16(%edi),%eax
-	movzbl	%dl,%esi
-	movzbl	-128(%ebp,%esi,1),%ebx
-	movzbl	%dh,%esi
-	xorl	%ebx,%eax
-	movzbl	-128(%ebp,%esi,1),%ebx
-	shrl	$16,%edx
-	shll	$8,%ebx
-	movzbl	%dl,%esi
-	xorl	%ebx,%eax
-	movzbl	-128(%ebp,%esi,1),%ebx
-	movzbl	%dh,%esi
-	shll	$16,%ebx
-	xorl	%ebx,%eax
-	movzbl	-128(%ebp,%esi,1),%ebx
-	shll	$24,%ebx
-	xorl	%ebx,%eax
-	movl	%eax,48(%edi)
-	xorl	20(%edi),%eax
-	movl	%eax,52(%edi)
-	xorl	24(%edi),%eax
-	movl	%eax,56(%edi)
-	xorl	28(%edi),%eax
-	movl	%eax,60(%edi)
-	addl	$32,%edi
-	jmp	L05214loop
-L05314break:
-	movl	$14,48(%edi)
-	xorl	%eax,%eax
-	jmp	L045exit
-L040badpointer:
-	movl	$-1,%eax
-L045exit:
-	popl	%edi
-	popl	%esi
-	popl	%ebx
-	popl	%ebp
-	ret
-.globl	_AES_set_encrypt_key
-.align	4
-_AES_set_encrypt_key:
-L_AES_set_encrypt_key_begin:
-	call	__x86_AES_set_encrypt_key
-	ret
-.globl	_AES_set_decrypt_key
-.align	4
-_AES_set_decrypt_key:
-L_AES_set_decrypt_key_begin:
-	call	__x86_AES_set_encrypt_key
-	cmpl	$0,%eax
-	je	L054proceed
-	ret
-L054proceed:
-	pushl	%ebp
-	pushl	%ebx
-	pushl	%esi
-	pushl	%edi
-	movl	28(%esp),%esi
-	movl	240(%esi),%ecx
-	leal	(,%ecx,4),%ecx
-	leal	(%esi,%ecx,4),%edi
-.align	2,0x90
-L055invert:
-	movl	(%esi),%eax
-	movl	4(%esi),%ebx
-	movl	(%edi),%ecx
-	movl	4(%edi),%edx
-	movl	%eax,(%edi)
-	movl	%ebx,4(%edi)
-	movl	%ecx,(%esi)
-	movl	%edx,4(%esi)
-	movl	8(%esi),%eax
-	movl	12(%esi),%ebx
-	movl	8(%edi),%ecx
-	movl	12(%edi),%edx
-	movl	%eax,8(%edi)
-	movl	%ebx,12(%edi)
-	movl	%ecx,8(%esi)
-	movl	%edx,12(%esi)
-	addl	$16,%esi
-	subl	$16,%edi
-	cmpl	%edi,%esi
-	jne	L055invert
-	movl	28(%esp),%edi
-	movl	240(%edi),%esi
-	leal	-2(%esi,%esi,1),%esi
-	leal	(%edi,%esi,8),%esi
-	movl	%esi,28(%esp)
-	movl	16(%edi),%eax
-.align	2,0x90
-L056permute:
-	addl	$16,%edi
-	movl	$2155905152,%ebp
-	andl	%eax,%ebp
-	leal	(%eax,%eax,1),%ebx
-	movl	%ebp,%esi
-	shrl	$7,%ebp
-	subl	%ebp,%esi
-	andl	$4278124286,%ebx
-	andl	$454761243,%esi
-	xorl	%esi,%ebx
-	movl	$2155905152,%ebp
-	andl	%ebx,%ebp
-	leal	(%ebx,%ebx,1),%ecx
-	movl	%ebp,%esi
-	shrl	$7,%ebp
-	subl	%ebp,%esi
-	andl	$4278124286,%ecx
-	andl	$454761243,%esi
-	xorl	%eax,%ebx
-	xorl	%esi,%ecx
-	movl	$2155905152,%ebp
-	andl	%ecx,%ebp
-	leal	(%ecx,%ecx,1),%edx
-	movl	%ebp,%esi
-	shrl	$7,%ebp
-	xorl	%eax,%ecx
-	subl	%ebp,%esi
-	andl	$4278124286,%edx
-	andl	$454761243,%esi
-	roll	$8,%eax
-	xorl	%esi,%edx
-	movl	4(%edi),%ebp
-	xorl	%ebx,%eax
-	xorl	%edx,%ebx
-	xorl	%ecx,%eax
-	roll	$24,%ebx
-	xorl	%edx,%ecx
-	xorl	%edx,%eax
-	roll	$16,%ecx
-	xorl	%ebx,%eax
-	roll	$8,%edx
-	xorl	%ecx,%eax
-	movl	%ebp,%ebx
-	xorl	%edx,%eax
-	movl	%eax,(%edi)
-	movl	$2155905152,%ebp
-	andl	%ebx,%ebp
-	leal	(%ebx,%ebx,1),%ecx
-	movl	%ebp,%esi
-	shrl	$7,%ebp
-	subl	%ebp,%esi
-	andl	$4278124286,%ecx
-	andl	$454761243,%esi
-	xorl	%esi,%ecx
-	movl	$2155905152,%ebp
-	andl	%ecx,%ebp
-	leal	(%ecx,%ecx,1),%edx
-	movl	%ebp,%esi
-	shrl	$7,%ebp
-	subl	%ebp,%esi
-	andl	$4278124286,%edx
-	andl	$454761243,%esi
-	xorl	%ebx,%ecx
-	xorl	%esi,%edx
-	movl	$2155905152,%ebp
-	andl	%edx,%ebp
-	leal	(%edx,%edx,1),%eax
-	movl	%ebp,%esi
-	shrl	$7,%ebp
-	xorl	%ebx,%edx
-	subl	%ebp,%esi
-	andl	$4278124286,%eax
-	andl	$454761243,%esi
-	roll	$8,%ebx
-	xorl	%esi,%eax
-	movl	8(%edi),%ebp
-	xorl	%ecx,%ebx
-	xorl	%eax,%ecx
-	xorl	%edx,%ebx
-	roll	$24,%ecx
-	xorl	%eax,%edx
-	xorl	%eax,%ebx
-	roll	$16,%edx
-	xorl	%ecx,%ebx
-	roll	$8,%eax
-	xorl	%edx,%ebx
-	movl	%ebp,%ecx
-	xorl	%eax,%ebx
-	movl	%ebx,4(%edi)
-	movl	$2155905152,%ebp
-	andl	%ecx,%ebp
-	leal	(%ecx,%ecx,1),%edx
-	movl	%ebp,%esi
-	shrl	$7,%ebp
-	subl	%ebp,%esi
-	andl	$4278124286,%edx
-	andl	$454761243,%esi
-	xorl	%esi,%edx
-	movl	$2155905152,%ebp
-	andl	%edx,%ebp
-	leal	(%edx,%edx,1),%eax
-	movl	%ebp,%esi
-	shrl	$7,%ebp
-	subl	%ebp,%esi
-	andl	$4278124286,%eax
-	andl	$454761243,%esi
-	xorl	%ecx,%edx
-	xorl	%esi,%eax
-	movl	$2155905152,%ebp
-	andl	%eax,%ebp
-	leal	(%eax,%eax,1),%ebx
-	movl	%ebp,%esi
-	shrl	$7,%ebp
-	xorl	%ecx,%eax
-	subl	%ebp,%esi
-	andl	$4278124286,%ebx
-	andl	$454761243,%esi
-	roll	$8,%ecx
-	xorl	%esi,%ebx
-	movl	12(%edi),%ebp
-	xorl	%edx,%ecx
-	xorl	%ebx,%edx
-	xorl	%eax,%ecx
-	roll	$24,%edx
-	xorl	%ebx,%eax
-	xorl	%ebx,%ecx
-	roll	$16,%eax
-	xorl	%edx,%ecx
-	roll	$8,%ebx
-	xorl	%eax,%ecx
-	movl	%ebp,%edx
-	xorl	%ebx,%ecx
-	movl	%ecx,8(%edi)
-	movl	$2155905152,%ebp
-	andl	%edx,%ebp
-	leal	(%edx,%edx,1),%eax
-	movl	%ebp,%esi
-	shrl	$7,%ebp
-	subl	%ebp,%esi
-	andl	$4278124286,%eax
-	andl	$454761243,%esi
-	xorl	%esi,%eax
-	movl	$2155905152,%ebp
-	andl	%eax,%ebp
-	leal	(%eax,%eax,1),%ebx
-	movl	%ebp,%esi
-	shrl	$7,%ebp
-	subl	%ebp,%esi
-	andl	$4278124286,%ebx
-	andl	$454761243,%esi
-	xorl	%edx,%eax
-	xorl	%esi,%ebx
-	movl	$2155905152,%ebp
-	andl	%ebx,%ebp
-	leal	(%ebx,%ebx,1),%ecx
-	movl	%ebp,%esi
-	shrl	$7,%ebp
-	xorl	%edx,%ebx
-	subl	%ebp,%esi
-	andl	$4278124286,%ecx
-	andl	$454761243,%esi
-	roll	$8,%edx
-	xorl	%esi,%ecx
-	movl	16(%edi),%ebp
-	xorl	%eax,%edx
-	xorl	%ecx,%eax
-	xorl	%ebx,%edx
-	roll	$24,%eax
-	xorl	%ecx,%ebx
-	xorl	%ecx,%edx
-	roll	$16,%ebx
-	xorl	%eax,%edx
-	roll	$8,%ecx
-	xorl	%ebx,%edx
-	movl	%ebp,%eax
-	xorl	%ecx,%edx
-	movl	%edx,12(%edi)
-	cmpl	28(%esp),%edi
-	jb	L056permute
-	xorl	%eax,%eax
-	popl	%edi
-	popl	%esi
-	popl	%ebx
-	popl	%ebp
-	ret
-.byte	65,69,83,32,102,111,114,32,120,56,54,44,32,67,82,89
-.byte	80,84,79,71,65,77,83,32,98,121,32,60,97,112,112,114
-.byte	111,64,111,112,101,110,115,115,108,46,111,114,103,62,0
-.section __IMPORT,__pointers,non_lazy_symbol_pointers
-L_OPENSSL_ia32cap_P$non_lazy_ptr:
-.indirect_symbol	_OPENSSL_ia32cap_P
-.long	0
-.comm	_OPENSSL_ia32cap_P,16,2
diff --git a/deps/openssl/config/archs/darwin-i386-cc/asm/crypto/buildinf.h b/deps/openssl/config/archs/darwin-i386-cc/asm/crypto/buildinf.h
index abd541341f..c577b784d2 100644
--- a/deps/openssl/config/archs/darwin-i386-cc/asm/crypto/buildinf.h
+++ b/deps/openssl/config/archs/darwin-i386-cc/asm/crypto/buildinf.h
@@ -11,7 +11,7 @@
  */
 
 #define PLATFORM "platform: darwin-i386-cc"
-#define DATE "built on: Fri Sep 13 15:58:40 2019 UTC"
+#define DATE "built on: Wed Mar 18 21:05:40 2020 UTC"
 
 /*
  * Generate compiler_flags as an array of individual characters. This is a
@@ -36,11 +36,12 @@ static const char compiler_flags[] = {
     'S','H','A','2','5','6','_','A','S','M',' ','-','D','S','H','A',
     '5','1','2','_','A','S','M',' ','-','D','R','C','4','_','A','S',
     'M',' ','-','D','M','D','5','_','A','S','M',' ','-','D','R','M',
-    'D','1','6','0','_','A','S','M',' ','-','D','V','P','A','E','S',
-    '_','A','S','M',' ','-','D','W','H','I','R','L','P','O','O','L',
-    '_','A','S','M',' ','-','D','G','H','A','S','H','_','A','S','M',
-    ' ','-','D','E','C','P','_','N','I','S','T','Z','2','5','6','_',
-    'A','S','M',' ','-','D','P','O','L','Y','1','3','0','5','_','A',
-    'S','M',' ','-','D','_','R','E','E','N','T','R','A','N','T',' ',
-    '-','D','N','D','E','B','U','G','\0'
+    'D','1','6','0','_','A','S','M',' ','-','D','A','E','S','N','I',
+    '_','A','S','M',' ','-','D','V','P','A','E','S','_','A','S','M',
+    ' ','-','D','W','H','I','R','L','P','O','O','L','_','A','S','M',
+    ' ','-','D','G','H','A','S','H','_','A','S','M',' ','-','D','E',
+    'C','P','_','N','I','S','T','Z','2','5','6','_','A','S','M',' ',
+    '-','D','P','O','L','Y','1','3','0','5','_','A','S','M',' ','-',
+    'D','_','R','E','E','N','T','R','A','N','T',' ','-','D','N','D',
+    'E','B','U','G','\0'
 };
diff --git a/deps/openssl/config/archs/darwin-i386-cc/asm/crypto/ec/ecp_nistz256-x86.s b/deps/openssl/config/archs/darwin-i386-cc/asm/crypto/ec/ecp_nistz256-x86.s
index a6736904f3..891647b7ed 100644
--- a/deps/openssl/config/archs/darwin-i386-cc/asm/crypto/ec/ecp_nistz256-x86.s
+++ b/deps/openssl/config/archs/darwin-i386-cc/asm/crypto/ec/ecp_nistz256-x86.s
@@ -4378,19 +4378,15 @@ L009pic:
 	orl	4(%edi),%eax
 	orl	8(%edi),%eax
 	orl	12(%edi),%eax
+	movl	576(%esp),%ebx
+	notl	%ebx
+	orl	%ebx,%eax
+	movl	580(%esp),%ebx
+	notl	%ebx
+	orl	%ebx,%eax
+	orl	584(%esp),%eax
 .byte	62
 	jnz	L010add_proceed
-	movl	576(%esp),%eax
-	andl	580(%esp),%eax
-	movl	584(%esp),%ebx
-	jz	L010add_proceed
-	testl	%ebx,%ebx
-	jz	L011add_double
-	movl	616(%esp),%edi
-	xorl	%eax,%eax
-	movl	$24,%ecx
-.byte	252,243,171
-	jmp	L012add_done
 .align	4,0x90
 L011add_double:
 	movl	620(%esp),%esi
diff --git a/deps/openssl/config/archs/darwin-i386-cc/asm/crypto/include/internal/bn_conf.h b/deps/openssl/config/archs/darwin-i386-cc/asm/crypto/include/internal/bn_conf.h
index fb52156bd0..459055c96f 100644
--- a/deps/openssl/config/archs/darwin-i386-cc/asm/crypto/include/internal/bn_conf.h
+++ b/deps/openssl/config/archs/darwin-i386-cc/asm/crypto/include/internal/bn_conf.h
@@ -1,5 +1,5 @@
 /* WARNING: do not edit! */
-/* Generated by Makefile from crypto/include/internal/bn_conf.h.in */
+/* Generated by Makefile from include/crypto/bn_conf.h.in */
 /*
  * Copyright 2016 The OpenSSL Project Authors. All Rights Reserved.
  *
@@ -9,8 +9,8 @@
  * https://www.openssl.org/source/license.html
  */
 
-#ifndef HEADER_BN_CONF_H
-# define HEADER_BN_CONF_H
+#ifndef OSSL_CRYPTO_BN_CONF_H
+# define OSSL_CRYPTO_BN_CONF_H
 
 /*
  * The contents of this file are not used in the UEFI build, as
diff --git a/deps/openssl/config/archs/darwin-i386-cc/asm/crypto/include/internal/dso_conf.h b/deps/openssl/config/archs/darwin-i386-cc/asm/crypto/include/internal/dso_conf.h
index a69309195e..e2d05cdbf4 100644
--- a/deps/openssl/config/archs/darwin-i386-cc/asm/crypto/include/internal/dso_conf.h
+++ b/deps/openssl/config/archs/darwin-i386-cc/asm/crypto/include/internal/dso_conf.h
@@ -1,5 +1,5 @@
 /* WARNING: do not edit! */
-/* Generated by Makefile from crypto/include/internal/dso_conf.h.in */
+/* Generated by Makefile from include/crypto/dso_conf.h.in */
 /*
  * Copyright 2016-2019 The OpenSSL Project Authors. All Rights Reserved.
  *
@@ -9,8 +9,8 @@
  * https://www.openssl.org/source/license.html
  */
 
-#ifndef HEADER_DSO_CONF_H
-# define HEADER_DSO_CONF_H
+#ifndef OSSL_CRYPTO_DSO_CONF_H
+# define OSSL_CRYPTO_DSO_CONF_H
 # define DSO_DLFCN
 # define HAVE_DLFCN_H
 # define DSO_EXTENSION ".dylib"
diff --git a/deps/openssl/config/archs/darwin-i386-cc/asm/include/openssl/opensslconf.h b/deps/openssl/config/archs/darwin-i386-cc/asm/include/openssl/opensslconf.h
index 77a271f995..7602fb815a 100644
--- a/deps/openssl/config/archs/darwin-i386-cc/asm/include/openssl/opensslconf.h
+++ b/deps/openssl/config/archs/darwin-i386-cc/asm/include/openssl/opensslconf.h
@@ -99,9 +99,6 @@ extern "C" {
 #ifndef OPENSSL_NO_DYNAMIC_ENGINE
 # define OPENSSL_NO_DYNAMIC_ENGINE
 #endif
-#ifndef OPENSSL_NO_AFALGENG
-# define OPENSSL_NO_AFALGENG
-#endif
 
 
 /*
diff --git a/deps/openssl/config/archs/darwin-i386-cc/asm/include/progs.h b/deps/openssl/config/archs/darwin-i386-cc/asm/include/progs.h
index 9b3d270e20..308c65601b 100644
--- a/deps/openssl/config/archs/darwin-i386-cc/asm/include/progs.h
+++ b/deps/openssl/config/archs/darwin-i386-cc/asm/include/progs.h
@@ -2,7 +2,7 @@
  * WARNING: do not edit!
  * Generated by apps/progs.pl
  *
- * Copyright 1995-2019 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 1995-2020 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
diff --git a/deps/openssl/config/archs/darwin-i386-cc/asm/openssl-cl.gypi b/deps/openssl/config/archs/darwin-i386-cc/asm/openssl-cl.gypi
index 35d5734b53..aa3222e6e6 100644
--- a/deps/openssl/config/archs/darwin-i386-cc/asm/openssl-cl.gypi
+++ b/deps/openssl/config/archs/darwin-i386-cc/asm/openssl-cl.gypi
@@ -15,6 +15,7 @@
       'RC4_ASM',
       'MD5_ASM',
       'RMD160_ASM',
+      'AESNI_ASM',
       'VPAES_ASM',
       'WHIRLPOOL_ASM',
       'GHASH_ASM',
diff --git a/deps/openssl/config/archs/darwin-i386-cc/asm/openssl.gypi b/deps/openssl/config/archs/darwin-i386-cc/asm/openssl.gypi
index 38d1fdcc00..5ff6a9e193 100644
--- a/deps/openssl/config/archs/darwin-i386-cc/asm/openssl.gypi
+++ b/deps/openssl/config/archs/darwin-i386-cc/asm/openssl.gypi
@@ -712,6 +712,7 @@
       'RC4_ASM',
       'MD5_ASM',
       'RMD160_ASM',
+      'AESNI_ASM',
       'VPAES_ASM',
       'WHIRLPOOL_ASM',
       'GHASH_ASM',
diff --git a/deps/openssl/config/archs/darwin-i386-cc/asm_avx2/configdata.pm b/deps/openssl/config/archs/darwin-i386-cc/asm_avx2/configdata.pm
index e6aed64bed..a35bca92f0 100644
--- a/deps/openssl/config/archs/darwin-i386-cc/asm_avx2/configdata.pm
+++ b/deps/openssl/config/archs/darwin-i386-cc/asm_avx2/configdata.pm
@@ -48,14 +48,14 @@ our %config = (
   export_var_as_fn => "0",
   includes => [  ],
   lflags => [  ],
-  lib_defines => [ "OPENSSL_PIC", "OPENSSL_CPUID_OBJ", "OPENSSL_BN_ASM_PART_WORDS", "OPENSSL_IA32_SSE2", "OPENSSL_BN_ASM_MONT", "OPENSSL_BN_ASM_GF2m", "SHA1_ASM", "SHA256_ASM", "SHA512_ASM", "RC4_ASM", "MD5_ASM", "RMD160_ASM", "VPAES_ASM", "WHIRLPOOL_ASM", "GHASH_ASM", "ECP_NISTZ256_ASM", "POLY1305_ASM" ],
+  lib_defines => [ "OPENSSL_PIC", "OPENSSL_CPUID_OBJ", "OPENSSL_BN_ASM_PART_WORDS", "OPENSSL_IA32_SSE2", "OPENSSL_BN_ASM_MONT", "OPENSSL_BN_ASM_GF2m", "SHA1_ASM", "SHA256_ASM", "SHA512_ASM", "RC4_ASM", "MD5_ASM", "RMD160_ASM", "AESNI_ASM", "VPAES_ASM", "WHIRLPOOL_ASM", "GHASH_ASM", "ECP_NISTZ256_ASM", "POLY1305_ASM" ],
   libdir => "",
   major => "1",
   makedepprog => "\$(CROSS_COMPILE)../config/fake_gcc.pl",
   minor => "1.1",
   openssl_algorithm_defines => [ "OPENSSL_NO_COMP", "OPENSSL_NO_MD2", "OPENSSL_NO_RC5" ],
   openssl_api_defines => [  ],
-  openssl_other_defines => [ "OPENSSL_RAND_SEED_OS", "OPENSSL_NO_AFALGENG", "OPENSSL_NO_ASAN", "OPENSSL_NO_CRYPTO_MDEBUG", "OPENSSL_NO_CRYPTO_MDEBUG_BACKTRACE", "OPENSSL_NO_DEVCRYPTOENG", "OPENSSL_NO_EC_NISTP_64_GCC_128", "OPENSSL_NO_EGD", "OPENSSL_NO_EXTERNAL_TESTS", "OPENSSL_NO_FUZZ_AFL", "OPENSSL_NO_FUZZ_LIBFUZZER", "OPENSSL_NO_HEARTBEATS", "OPENSSL_NO_MSAN", "OPENSSL_NO_SCTP", "OPENSSL_NO_SSL3", "OPENSSL_NO_SSL3_METHOD", "OPENSSL_NO_UBSAN", "OPENSSL_NO_UNIT_TEST", "OPENSSL_NO_WEAK_SSL_CIPHERS", "OPENSSL_NO_DYNAMIC_ENGINE", "OPENSSL_NO_AFALGENG" ],
+  openssl_other_defines => [ "OPENSSL_RAND_SEED_OS", "OPENSSL_NO_AFALGENG", "OPENSSL_NO_ASAN", "OPENSSL_NO_CRYPTO_MDEBUG", "OPENSSL_NO_CRYPTO_MDEBUG_BACKTRACE", "OPENSSL_NO_DEVCRYPTOENG", "OPENSSL_NO_EC_NISTP_64_GCC_128", "OPENSSL_NO_EGD", "OPENSSL_NO_EXTERNAL_TESTS", "OPENSSL_NO_FUZZ_AFL", "OPENSSL_NO_FUZZ_LIBFUZZER", "OPENSSL_NO_HEARTBEATS", "OPENSSL_NO_MSAN", "OPENSSL_NO_SCTP", "OPENSSL_NO_SSL3", "OPENSSL_NO_SSL3_METHOD", "OPENSSL_NO_UBSAN", "OPENSSL_NO_UNIT_TEST", "OPENSSL_NO_WEAK_SSL_CIPHERS", "OPENSSL_NO_DYNAMIC_ENGINE" ],
   openssl_sys_defines => [ "OPENSSL_SYS_MACOSX" ],
   openssl_thread_defines => [ "OPENSSL_THREADS" ],
   openssldir => "",
@@ -111,8 +111,8 @@ our %config = (
   sourcedir => ".",
   target => "darwin-i386-cc",
   tdirs => [ "ossl_shim" ],
-  version => "1.1.1d",
-  version_num => "0x1010104fL",
+  version => "1.1.1e",
+  version_num => "0x1010105fL",
 );
 
 our %target = (
@@ -235,6 +235,7 @@ our @disablables = (
   "dgram",
   "dh",
   "dsa",
+  "dso",
   "dtls",
   "dynamic-engine",
   "ec",
@@ -352,8 +353,8 @@ our %unified_info = (
         {
             "" =>
                 [
-                    "crypto/include/internal/bn_conf.h",
-                    "crypto/include/internal/dso_conf.h",
+                    "include/crypto/bn_conf.h",
+                    "include/crypto/dso_conf.h",
                     "include/openssl/opensslconf.h",
                 ],
             "apps/asn1pars.o" =>
@@ -621,14 +622,6 @@ our %unified_info = (
                     "crypto/perlasm/cbc.pl",
                     "crypto/perlasm/x86asm.pl",
                 ],
-            "crypto/include/internal/bn_conf.h" =>
-                [
-                    "configdata.pm",
-                ],
-            "crypto/include/internal/dso_conf.h" =>
-                [
-                    "configdata.pm",
-                ],
             "crypto/rc4/rc4-586.s" =>
                 [
                     "crypto/perlasm/x86asm.pl",
@@ -704,6 +697,14 @@ our %unified_info = (
                 [
                     "libcrypto",
                 ],
+            "include/crypto/bn_conf.h" =>
+                [
+                    "configdata.pm",
+                ],
+            "include/crypto/dso_conf.h" =>
+                [
+                    "configdata.pm",
+                ],
             "include/openssl/opensslconf.h" =>
                 [
                     "configdata.pm",
@@ -1493,6 +1494,12 @@ our %unified_info = (
                     "libcrypto",
                     "test/libtestutil.a",
                 ],
+            "test/ssl_ctx_test" =>
+                [
+                    "libcrypto",
+                    "libssl",
+                    "test/libtestutil.a",
+                ],
             "test/ssl_test" =>
                 [
                     "libcrypto",
@@ -3224,7 +3231,6 @@ our %unified_info = (
                             "test/testutil/cb.o",
                             "test/testutil/driver.o",
                             "test/testutil/format_output.o",
-                            "test/testutil/init.o",
                             "test/testutil/main.o",
                             "test/testutil/output_helpers.o",
                             "test/testutil/random.o",
@@ -3232,6 +3238,7 @@ our %unified_info = (
                             "test/testutil/tap_bio.o",
                             "test/testutil/test_cleanup.o",
                             "test/testutil/tests.o",
+                            "test/testutil/testutil_init.o",
                         ],
                     "products" =>
                         {
@@ -3730,14 +3737,6 @@ our %unified_info = (
                 [
                     "crypto/ia64cpuid.S",
                 ],
-            "crypto/include/internal/bn_conf.h" =>
-                [
-                    "crypto/include/internal/bn_conf.h.in",
-                ],
-            "crypto/include/internal/dso_conf.h" =>
-                [
-                    "crypto/include/internal/dso_conf.h.in",
-                ],
             "crypto/md5/md5-586.s" =>
                 [
                     "crypto/md5/asm/md5-586.pl",
@@ -4178,6 +4177,14 @@ our %unified_info = (
                     "engines/asm/e_padlock-x86_64.pl",
                     "\$(PERLASM_SCHEME)",
                 ],
+            "include/crypto/bn_conf.h" =>
+                [
+                    "include/crypto/bn_conf.h.in",
+                ],
+            "include/crypto/dso_conf.h" =>
+                [
+                    "include/crypto/dso_conf.h.in",
+                ],
             "include/openssl/opensslconf.h" =>
                 [
                     "include/openssl/opensslconf.h.in",
@@ -4860,49 +4867,41 @@ our %unified_info = (
             "crypto/aes/aes_cbc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/aes/aes_cfb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/aes/aes_core.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/aes/aes_ecb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/aes/aes_ige.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/aes/aes_misc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/aes/aes_ofb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/aes/aes_wrap.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/aes/aesfx-sparcv9.o" =>
@@ -4912,7 +4911,6 @@ our %unified_info = (
             "crypto/aes/aesni-x86.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/aes/aest4-sparcv9.o" =>
@@ -4930,13 +4928,11 @@ our %unified_info = (
             "crypto/aes/vpaes-x86.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/aria/aria.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/arm64cpuid.o" =>
@@ -4950,613 +4946,511 @@ our %unified_info = (
             "crypto/asn1/a_bitstr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_d2i_fp.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_digest.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_dup.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_gentm.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_i2d_fp.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_int.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_mbstr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_object.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_octet.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_print.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_sign.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_strex.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_strnid.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_time.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_type.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_utctm.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_utf8.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_verify.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/ameth_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/asn1_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/asn1_gen.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/asn1_item_list.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/asn1_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/asn1_par.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/asn_mime.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/asn_moid.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/asn_mstbl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/asn_pack.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/bio_asn1.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/bio_ndef.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/d2i_pr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/d2i_pu.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/evp_asn1.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/f_int.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/f_string.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/i2d_pr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/i2d_pu.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/n_pkey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/nsseq.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/p5_pbe.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/p5_pbev2.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/p5_scrypt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/p8_pkey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/t_bitst.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/t_pkey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/t_spki.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/tasn_dec.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/tasn_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/tasn_fre.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/tasn_new.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/tasn_prn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/tasn_scn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/tasn_typ.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/tasn_utl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/x_algor.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/x_bignum.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/x_info.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/x_int64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/x_long.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/x_pkey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/x_sig.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/x_spki.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/x_val.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/async/arch/async_null.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/async/arch/async_posix.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/async/arch/async_win.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/async/async.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/async/async_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/async/async_wait.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bf/bf-586.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bf/bf_cfb64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bf/bf_ecb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bf/bf_ofb64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bf/bf_skey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/b_addr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/b_dump.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/b_print.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/b_sock.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/b_sock2.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bf_buff.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bf_lbuf.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bf_nbio.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bf_null.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bio_cb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bio_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bio_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bio_meth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bss_acpt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bss_bio.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bss_conn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bss_dgram.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bss_fd.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bss_file.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bss_log.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bss_mem.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bss_null.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bss_sock.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/blake2/blake2b.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/blake2/blake2s.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/blake2/m_blake2b.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/blake2/m_blake2s.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/armv4-gf2m.o" =>
@@ -5570,7 +5464,6 @@ our %unified_info = (
             "crypto/bn/bn-586.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn-mips.o" =>
@@ -5580,188 +5473,157 @@ our %unified_info = (
             "crypto/bn/bn_add.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_blind.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_const.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_ctx.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_depr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_dh.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_div.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_exp.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto",
                 ],
             "crypto/bn/bn_exp2.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_gcd.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_gf2m.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_intern.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_kron.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_mod.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_mont.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_mpi.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_mul.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_nist.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_prime.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_print.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_rand.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_recp.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_shift.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_sqr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_sqrt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_srp.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_word.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_x931p.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/co-586.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/mips-mont.o" =>
@@ -5791,25 +5653,21 @@ our %unified_info = (
             "crypto/bn/x86-gf2m.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/x86-mont.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/buffer/buf_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/buffer/buffer.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/buildinf.h" =>
@@ -5819,31 +5677,26 @@ our %unified_info = (
             "crypto/camellia/cmll-x86.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/camellia/cmll_cfb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/camellia/cmll_ctr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/camellia/cmll_ecb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/camellia/cmll_ofb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/camellia/cmllt4-sparcv9.o" =>
@@ -5853,31 +5706,26 @@ our %unified_info = (
             "crypto/cast/c_cfb64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cast/c_ecb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cast/c_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cast/c_ofb64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cast/c_skey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/chacha/chacha-armv4.o" =>
@@ -5895,284 +5743,237 @@ our %unified_info = (
             "crypto/chacha/chacha-x86.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cmac/cm_ameth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cmac/cm_pmeth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cmac/cmac.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_asn1.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_att.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_cd.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_dd.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_env.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_ess.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_io.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_kari.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_pwri.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_sd.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_smime.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/conf/conf_api.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/conf/conf_def.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/conf/conf_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/conf/conf_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/conf/conf_mall.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/conf/conf_mod.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/conf/conf_sap.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/conf/conf_ssl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cpt_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cryptlib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ct/ct_b64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ct/ct_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ct/ct_log.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ct/ct_oct.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ct/ct_policy.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ct/ct_prn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ct/ct_sct.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ct/ct_sct_ctx.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ct/ct_vfy.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ct/ct_x509v3.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ctype.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cversion.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto",
                 ],
             "crypto/des/cbc_cksm.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/cbc_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/cfb64ede.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/cfb64enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/cfb_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/crypt586.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/des-586.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/dest4-sparcv9.o" =>
@@ -6182,295 +5983,246 @@ our %unified_info = (
             "crypto/des/ecb3_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/ecb_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/fcrypt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/ofb64ede.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/ofb64enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/ofb_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/pcbc_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/qud_cksm.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/rand_key.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/set_key.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/str2key.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/xcbc_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_ameth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_asn1.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_check.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_depr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_gen.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_kdf.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_key.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_meth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_pmeth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_prn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_rfc5114.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_rfc7919.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dsa/dsa_ameth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dsa/dsa_asn1.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dsa/dsa_depr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dsa/dsa_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dsa/dsa_gen.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dsa/dsa_key.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dsa/dsa_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dsa/dsa_meth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dsa/dsa_ossl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dsa/dsa_pmeth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dsa/dsa_prn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dsa/dsa_sign.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dsa/dsa_vrf.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dso/dso_dl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dso/dso_dlfcn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dso/dso_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dso/dso_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dso/dso_openssl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dso/dso_vms.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dso/dso_win32.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ebcdic.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/curve25519.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/curve448/arch_32/f_impl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto/ec/curve448/arch_32",
                     "crypto/ec/curve448",
@@ -6478,7 +6230,6 @@ our %unified_info = (
             "crypto/ec/curve448/curve448.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto/ec/curve448/arch_32",
                     "crypto/ec/curve448",
@@ -6486,7 +6237,6 @@ our %unified_info = (
             "crypto/ec/curve448/curve448_tables.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto/ec/curve448/arch_32",
                     "crypto/ec/curve448",
@@ -6494,7 +6244,6 @@ our %unified_info = (
             "crypto/ec/curve448/eddsa.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto/ec/curve448/arch_32",
                     "crypto/ec/curve448",
@@ -6502,7 +6251,6 @@ our %unified_info = (
             "crypto/ec/curve448/f_generic.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto/ec/curve448/arch_32",
                     "crypto/ec/curve448",
@@ -6510,7 +6258,6 @@ our %unified_info = (
             "crypto/ec/curve448/scalar.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto/ec/curve448/arch_32",
                     "crypto/ec/curve448",
@@ -6518,163 +6265,136 @@ our %unified_info = (
             "crypto/ec/ec2_oct.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec2_smpl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec_ameth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec_asn1.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec_check.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec_curve.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec_cvt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec_key.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec_kmeth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec_mult.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec_oct.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec_pmeth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec_print.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecdh_kdf.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecdh_ossl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecdsa_ossl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecdsa_sign.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecdsa_vrf.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/eck_prn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecp_mont.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecp_nist.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecp_nistp224.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecp_nistp256.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecp_nistp521.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecp_nistputil.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecp_nistz256-armv4.o" =>
@@ -6692,235 +6412,196 @@ our %unified_info = (
             "crypto/ec/ecp_nistz256-x86.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecp_nistz256.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecp_oct.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecp_smpl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecx_meth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/eng_all.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/eng_cnf.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/eng_ctrl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/eng_dyn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/eng_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/eng_fat.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/eng_init.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/eng_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/eng_list.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/eng_openssl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/eng_pkey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/eng_rdrand.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/eng_table.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/tb_asnmth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/tb_cipher.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/tb_dh.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/tb_digest.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/tb_dsa.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/tb_eckey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/tb_pkmeth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/tb_rand.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/tb_rsa.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/err/err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/err/err_all.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/err/err_prn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/bio_b64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/bio_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/bio_md.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/bio_ok.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/c_allc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/c_alld.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/cmeth_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/digest.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/e_aes.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto",
                     "crypto/modes",
@@ -6928,21 +6609,18 @@ our %unified_info = (
             "crypto/evp/e_aes_cbc_hmac_sha1.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto/modes",
                 ],
             "crypto/evp/e_aes_cbc_hmac_sha256.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto/modes",
                 ],
             "crypto/evp/e_aria.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto",
                     "crypto/modes",
@@ -6950,13 +6628,11 @@ our %unified_info = (
             "crypto/evp/e_bf.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/e_camellia.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto",
                     "crypto/modes",
@@ -6964,81 +6640,68 @@ our %unified_info = (
             "crypto/evp/e_cast.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/e_chacha20_poly1305.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/e_des.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto",
                 ],
             "crypto/evp/e_des3.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto",
                 ],
             "crypto/evp/e_idea.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/e_null.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/e_old.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/e_rc2.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/e_rc4.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/e_rc4_hmac_md5.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/e_rc5.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/e_seed.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/e_sm4.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto",
                     "crypto/modes",
@@ -7046,334 +6709,272 @@ our %unified_info = (
             "crypto/evp/e_xcbc_d.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/encode.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/evp_cnf.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/evp_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/evp_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/evp_key.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/evp_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/evp_pbe.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/evp_pkey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/m_md2.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/m_md4.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/m_md5.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/m_md5_sha1.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/m_mdc2.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/m_null.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/m_ripemd.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/m_sha1.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/m_sha3.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto",
                 ],
             "crypto/evp/m_sigver.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/m_wp.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/names.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/p5_crpt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/p5_crpt2.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/p_dec.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/p_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/p_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/p_open.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/p_seal.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/p_sign.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/p_verify.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/pbe_scrypt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/pmeth_fn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/pmeth_gn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/pmeth_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ex_data.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/getenv.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/hmac/hm_ameth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/hmac/hm_pmeth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/hmac/hmac.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/idea/i_cbc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/idea/i_cfb64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/idea/i_ecb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/idea/i_ofb64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/idea/i_skey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
-            "crypto/include/internal/bn_conf.h" =>
-                [
-                    ".",
-                ],
-            "crypto/include/internal/dso_conf.h" =>
-                [
-                    ".",
-                ],
             "crypto/init.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/kdf/hkdf.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/kdf/kdf_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/kdf/scrypt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/kdf/tls1_prf.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/lhash/lh_stats.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/lhash/lhash.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/md4/md4_dgst.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/md4/md4_one.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/md5/md5-586.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/md5/md5-sparcv9.o" =>
@@ -7383,79 +6984,66 @@ our %unified_info = (
             "crypto/md5/md5_dgst.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/md5/md5_one.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/mdc2/mdc2_one.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/mdc2/mdc2dgst.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/mem.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/mem_dbg.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/mem_sec.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/modes/cbc128.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/modes/ccm128.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/modes/cfb128.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/modes/ctr128.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/modes/cts128.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/modes/gcm128.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto",
                 ],
@@ -7474,7 +7062,6 @@ our %unified_info = (
             "crypto/modes/ghash-x86.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/modes/ghashv8-armx.o" =>
@@ -7484,361 +7071,301 @@ our %unified_info = (
             "crypto/modes/ocb128.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/modes/ofb128.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/modes/wrap128.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/modes/xts128.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/o_dir.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/o_fips.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/o_fopen.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/o_init.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/o_str.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/o_time.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/objects/o_names.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/objects/obj_dat.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/objects/obj_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/objects/obj_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/objects/obj_xref.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ocsp/ocsp_asn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ocsp/ocsp_cl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ocsp/ocsp_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ocsp/ocsp_ext.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ocsp/ocsp_ht.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ocsp/ocsp_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ocsp/ocsp_prn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ocsp/ocsp_srv.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ocsp/ocsp_vfy.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ocsp/v3_ocsp.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pem/pem_all.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pem/pem_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pem/pem_info.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pem/pem_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pem/pem_oth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pem/pem_pk8.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pem/pem_pkey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pem/pem_sign.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pem/pem_x509.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pem/pem_xaux.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pem/pvkfmt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_add.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_asn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_attr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_crpt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_crt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_decr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_init.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_key.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_kiss.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_mutl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_npas.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_p8d.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_p8e.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_sbag.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_utl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/pk12err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs7/bio_pk7.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs7/pk7_asn1.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs7/pk7_attr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs7/pk7_doit.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs7/pk7_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs7/pk7_mime.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs7/pk7_smime.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs7/pkcs7err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/poly1305/poly1305-armv4.o" =>
@@ -7860,265 +7387,221 @@ our %unified_info = (
             "crypto/poly1305/poly1305-x86.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/poly1305/poly1305.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/poly1305/poly1305_ameth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/poly1305/poly1305_pmeth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rand/drbg_ctr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rand/drbg_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rand/rand_egd.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rand/rand_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rand/rand_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rand/rand_unix.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rand/rand_vms.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rand/rand_win.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rand/randfile.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rc2/rc2_cbc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rc2/rc2_ecb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rc2/rc2_skey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rc2/rc2cfb64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rc2/rc2ofb64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rc4/rc4-586.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ripemd/rmd-586.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ripemd/rmd_dgst.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ripemd/rmd_one.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_ameth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_asn1.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_chk.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_crpt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_depr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_gen.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_meth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_mp.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_none.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_oaep.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_ossl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_pk1.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_pmeth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_prn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_pss.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_saos.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_sign.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_ssl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_x931.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_x931g.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/s390xcpuid.o" =>
@@ -8128,31 +7611,26 @@ our %unified_info = (
             "crypto/seed/seed.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/seed/seed_cbc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/seed/seed_cfb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/seed/seed_ecb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/seed/seed_ofb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sha/keccak1600-armv4.o" =>
@@ -8162,13 +7640,11 @@ our %unified_info = (
             "crypto/sha/keccak1600.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sha/sha1-586.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sha/sha1-armv4-large.o" =>
@@ -8194,19 +7670,16 @@ our %unified_info = (
             "crypto/sha/sha1_one.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sha/sha1dgst.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sha/sha256-586.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sha/sha256-armv4.o" =>
@@ -8232,13 +7705,11 @@ our %unified_info = (
             "crypto/sha/sha256.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sha/sha512-586.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sha/sha512-armv4.o" =>
@@ -8264,727 +7735,606 @@ our %unified_info = (
             "crypto/sha/sha512.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/siphash/siphash.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/siphash/siphash_ameth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/siphash/siphash_pmeth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sm2/sm2_crypt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sm2/sm2_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sm2/sm2_pmeth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sm2/sm2_sign.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sm3/m_sm3.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sm3/sm3.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sm4/sm4.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/srp/srp_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/srp/srp_vfy.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/stack/stack.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/store/loader_file.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/store/store_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/store/store_init.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/store/store_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/store/store_register.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/store/store_strings.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/threads_none.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/threads_pthread.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/threads_win.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ts/ts_asn1.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ts/ts_conf.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ts/ts_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ts/ts_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ts/ts_req_print.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ts/ts_req_utils.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ts/ts_rsp_print.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ts/ts_rsp_sign.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ts/ts_rsp_utils.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ts/ts_rsp_verify.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ts/ts_verify_ctx.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/txt_db/txt_db.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ui/ui_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ui/ui_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ui/ui_null.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ui/ui_openssl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ui/ui_util.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/uid.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/whrlpool/wp-mmx.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/whrlpool/wp_block.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/whrlpool/wp_dgst.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/by_dir.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/by_file.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/t_crl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/t_req.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/t_x509.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_att.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_cmp.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_d2.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_def.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_ext.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_lu.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_meth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_obj.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_r2x.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_req.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_set.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_trs.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_txt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_v3.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_vfy.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_vpm.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509cset.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509name.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509rset.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509spki.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509type.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x_all.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x_attrib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x_crl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x_exten.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x_name.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x_pubkey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x_req.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x_x509.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x_x509a.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/pcy_cache.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/pcy_data.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/pcy_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/pcy_map.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/pcy_node.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/pcy_tree.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_addr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_admis.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_akey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_akeya.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_alt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_asid.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_bcons.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_bitst.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_conf.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_cpols.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_crld.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_enum.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_extku.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_genn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_ia5.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_info.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_int.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_ncons.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_pci.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_pcia.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_pcons.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_pku.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_pmaps.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_prn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_purp.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_skey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_sxnet.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_tlsf.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_utl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x86cpuid.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "engines/e_capi.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "engines/e_padlock-x86.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "engines/e_padlock.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "fuzz/asn1.o" =>
@@ -9035,6 +8385,14 @@ our %unified_info = (
                 [
                     "include",
                 ],
+            "include/crypto/bn_conf.h" =>
+                [
+                    ".",
+                ],
+            "include/crypto/dso_conf.h" =>
+                [
+                    ".",
+                ],
             "include/openssl/opensslconf.h" =>
                 [
                     ".",
@@ -9279,7 +8637,6 @@ our %unified_info = (
                 [
                     ".",
                     "include",
-                    "crypto/include",
                 ],
             "test/asn1_string_table_test.o" =>
                 [
@@ -9605,7 +8962,6 @@ our %unified_info = (
                 [
                     ".",
                     "include",
-                    "crypto/include",
                 ],
             "test/cipher_overhead_test.o" =>
                 [
@@ -9651,7 +9007,6 @@ our %unified_info = (
             "test/ctype_internal_test.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "test/curve448_internal_test.o" =>
@@ -9717,7 +9072,6 @@ our %unified_info = (
                 [
                     "include",
                     "crypto/ec",
-                    "crypto/include",
                 ],
             "test/ecdsatest.o" =>
                 [
@@ -9742,7 +9096,6 @@ our %unified_info = (
             "test/evp_extra_test.o" =>
                 [
                     "include",
-                    "crypto/include",
                 ],
             "test/evp_test.o" =>
                 [
@@ -9840,7 +9193,6 @@ our %unified_info = (
                 [
                     ".",
                     "include",
-                    "crypto/include",
                 ],
             "test/rc2test.o" =>
                 [
@@ -9890,18 +9242,15 @@ our %unified_info = (
                 [
                     ".",
                     "include",
-                    "crypto/include",
                 ],
             "test/sm2_internal_test.o" =>
                 [
                     "include",
-                    "crypto/include",
                 ],
             "test/sm4_internal_test.o" =>
                 [
                     ".",
                     "include",
-                    "crypto/include",
                 ],
             "test/srptest.o" =>
                 [
@@ -9912,6 +9261,10 @@ our %unified_info = (
                     ".",
                     "include",
                 ],
+            "test/ssl_ctx_test.o" =>
+                [
+                    "include",
+                ],
             "test/ssl_test.o" =>
                 [
                     "include",
@@ -9975,10 +9328,6 @@ our %unified_info = (
                 [
                     "include",
                 ],
-            "test/testutil/init.o" =>
-                [
-                    "include",
-                ],
             "test/testutil/main.o" =>
                 [
                     "include",
@@ -10007,6 +9356,10 @@ our %unified_info = (
                 [
                     "include",
                 ],
+            "test/testutil/testutil_init.o" =>
+                [
+                    "include",
+                ],
             "test/threadstest.o" =>
                 [
                     "include",
@@ -10271,6 +9624,7 @@ our %unified_info = (
             "test/sm4_internal_test",
             "test/srptest",
             "test/ssl_cert_table_internal_test",
+            "test/ssl_ctx_test",
             "test/ssl_test",
             "test/ssl_test_ctx_test",
             "test/sslapitest",
@@ -15226,7 +14580,6 @@ our %unified_info = (
                     "test/testutil/cb.o",
                     "test/testutil/driver.o",
                     "test/testutil/format_output.o",
-                    "test/testutil/init.o",
                     "test/testutil/main.o",
                     "test/testutil/output_helpers.o",
                     "test/testutil/random.o",
@@ -15234,6 +14587,7 @@ our %unified_info = (
                     "test/testutil/tap_bio.o",
                     "test/testutil/test_cleanup.o",
                     "test/testutil/tests.o",
+                    "test/testutil/testutil_init.o",
                 ],
             "test/md2test" =>
                 [
@@ -15461,6 +14815,14 @@ our %unified_info = (
                 [
                     "test/ssl_cert_table_internal_test.c",
                 ],
+            "test/ssl_ctx_test" =>
+                [
+                    "test/ssl_ctx_test.o",
+                ],
+            "test/ssl_ctx_test.o" =>
+                [
+                    "test/ssl_ctx_test.c",
+                ],
             "test/ssl_test" =>
                 [
                     "test/handshake_helper.o",
@@ -15563,10 +14925,6 @@ our %unified_info = (
                 [
                     "test/testutil/format_output.c",
                 ],
-            "test/testutil/init.o" =>
-                [
-                    "test/testutil/init.c",
-                ],
             "test/testutil/main.o" =>
                 [
                     "test/testutil/main.c",
@@ -15595,6 +14953,10 @@ our %unified_info = (
                 [
                     "test/testutil/tests.c",
                 ],
+            "test/testutil/testutil_init.o" =>
+                [
+                    "test/testutil/testutil_init.c",
+                ],
             "test/threadstest" =>
                 [
                     "test/threadstest.o",
diff --git a/deps/openssl/config/archs/darwin-i386-cc/asm_avx2/crypto/aes/aes-586.s b/deps/openssl/config/archs/darwin-i386-cc/asm_avx2/crypto/aes/aes-586.s
deleted file mode 100644
index 5e23147093..0000000000
--- a/deps/openssl/config/archs/darwin-i386-cc/asm_avx2/crypto/aes/aes-586.s
+++ /dev/null
@@ -1,3207 +0,0 @@
-.text
-.align	4
-__x86_AES_encrypt_compact:
-	movl	%edi,20(%esp)
-	xorl	(%edi),%eax
-	xorl	4(%edi),%ebx
-	xorl	8(%edi),%ecx
-	xorl	12(%edi),%edx
-	movl	240(%edi),%esi
-	leal	-2(%esi,%esi,1),%esi
-	leal	(%edi,%esi,8),%esi
-	movl	%esi,24(%esp)
-	movl	-128(%ebp),%edi
-	movl	-96(%ebp),%esi
-	movl	-64(%ebp),%edi
-	movl	-32(%ebp),%esi
-	movl	(%ebp),%edi
-	movl	32(%ebp),%esi
-	movl	64(%ebp),%edi
-	movl	96(%ebp),%esi
-.align	4,0x90
-L000loop:
-	movl	%eax,%esi
-	andl	$255,%esi
-	movzbl	-128(%ebp,%esi,1),%esi
-	movzbl	%bh,%edi
-	movzbl	-128(%ebp,%edi,1),%edi
-	shll	$8,%edi
-	xorl	%edi,%esi
-	movl	%ecx,%edi
-	shrl	$16,%edi
-	andl	$255,%edi
-	movzbl	-128(%ebp,%edi,1),%edi
-	shll	$16,%edi
-	xorl	%edi,%esi
-	movl	%edx,%edi
-	shrl	$24,%edi
-	movzbl	-128(%ebp,%edi,1),%edi
-	shll	$24,%edi
-	xorl	%edi,%esi
-	movl	%esi,4(%esp)
-	movl	%ebx,%esi
-	andl	$255,%esi
-	shrl	$16,%ebx
-	movzbl	-128(%ebp,%esi,1),%esi
-	movzbl	%ch,%edi
-	movzbl	-128(%ebp,%edi,1),%edi
-	shll	$8,%edi
-	xorl	%edi,%esi
-	movl	%edx,%edi
-	shrl	$16,%edi
-	andl	$255,%edi
-	movzbl	-128(%ebp,%edi,1),%edi
-	shll	$16,%edi
-	xorl	%edi,%esi
-	movl	%eax,%edi
-	shrl	$24,%edi
-	movzbl	-128(%ebp,%edi,1),%edi
-	shll	$24,%edi
-	xorl	%edi,%esi
-	movl	%esi,8(%esp)
-	movl	%ecx,%esi
-	andl	$255,%esi
-	shrl	$24,%ecx
-	movzbl	-128(%ebp,%esi,1),%esi
-	movzbl	%dh,%edi
-	movzbl	-128(%ebp,%edi,1),%edi
-	shll	$8,%edi
-	xorl	%edi,%esi
-	movl	%eax,%edi
-	shrl	$16,%edi
-	andl	$255,%edx
-	andl	$255,%edi
-	movzbl	-128(%ebp,%edi,1),%edi
-	shll	$16,%edi
-	xorl	%edi,%esi
-	movzbl	%bh,%edi
-	movzbl	-128(%ebp,%edi,1),%edi
-	shll	$24,%edi
-	xorl	%edi,%esi
-	andl	$255,%edx
-	movzbl	-128(%ebp,%edx,1),%edx
-	movzbl	%ah,%eax
-	movzbl	-128(%ebp,%eax,1),%eax
-	shll	$8,%eax
-	xorl	%eax,%edx
-	movl	4(%esp),%eax
-	andl	$255,%ebx
-	movzbl	-128(%ebp,%ebx,1),%ebx
-	shll	$16,%ebx
-	xorl	%ebx,%edx
-	movl	8(%esp),%ebx
-	movzbl	-128(%ebp,%ecx,1),%ecx
-	shll	$24,%ecx
-	xorl	%ecx,%edx
-	movl	%esi,%ecx
-	movl	$2155905152,%ebp
-	andl	%ecx,%ebp
-	leal	(%ecx,%ecx,1),%edi
-	movl	%ebp,%esi
-	shrl	$7,%ebp
-	andl	$4278124286,%edi
-	subl	%ebp,%esi
-	movl	%ecx,%ebp
-	andl	$454761243,%esi
-	rorl	$16,%ebp
-	xorl	%edi,%esi
-	movl	%ecx,%edi
-	xorl	%esi,%ecx
-	rorl	$24,%edi
-	xorl	%ebp,%esi
-	roll	$24,%ecx
-	xorl	%edi,%esi
-	movl	$2155905152,%ebp
-	xorl	%esi,%ecx
-	andl	%edx,%ebp
-	leal	(%edx,%edx,1),%edi
-	movl	%ebp,%esi
-	shrl	$7,%ebp
-	andl	$4278124286,%edi
-	subl	%ebp,%esi
-	movl	%edx,%ebp
-	andl	$454761243,%esi
-	rorl	$16,%ebp
-	xorl	%edi,%esi
-	movl	%edx,%edi
-	xorl	%esi,%edx
-	rorl	$24,%edi
-	xorl	%ebp,%esi
-	roll	$24,%edx
-	xorl	%edi,%esi
-	movl	$2155905152,%ebp
-	xorl	%esi,%edx
-	andl	%eax,%ebp
-	leal	(%eax,%eax,1),%edi
-	movl	%ebp,%esi
-	shrl	$7,%ebp
-	andl	$4278124286,%edi
-	subl	%ebp,%esi
-	movl	%eax,%ebp
-	andl	$454761243,%esi
-	rorl	$16,%ebp
-	xorl	%edi,%esi
-	movl	%eax,%edi
-	xorl	%esi,%eax
-	rorl	$24,%edi
-	xorl	%ebp,%esi
-	roll	$24,%eax
-	xorl	%edi,%esi
-	movl	$2155905152,%ebp
-	xorl	%esi,%eax
-	andl	%ebx,%ebp
-	leal	(%ebx,%ebx,1),%edi
-	movl	%ebp,%esi
-	shrl	$7,%ebp
-	andl	$4278124286,%edi
-	subl	%ebp,%esi
-	movl	%ebx,%ebp
-	andl	$454761243,%esi
-	rorl	$16,%ebp
-	xorl	%edi,%esi
-	movl	%ebx,%edi
-	xorl	%esi,%ebx
-	rorl	$24,%edi
-	xorl	%ebp,%esi
-	roll	$24,%ebx
-	xorl	%edi,%esi
-	xorl	%esi,%ebx
-	movl	20(%esp),%edi
-	movl	28(%esp),%ebp
-	addl	$16,%edi
-	xorl	(%edi),%eax
-	xorl	4(%edi),%ebx
-	xorl	8(%edi),%ecx
-	xorl	12(%edi),%edx
-	cmpl	24(%esp),%edi
-	movl	%edi,20(%esp)
-	jb	L000loop
-	movl	%eax,%esi
-	andl	$255,%esi
-	movzbl	-128(%ebp,%esi,1),%esi
-	movzbl	%bh,%edi
-	movzbl	-128(%ebp,%edi,1),%edi
-	shll	$8,%edi
-	xorl	%edi,%esi
-	movl	%ecx,%edi
-	shrl	$16,%edi
-	andl	$255,%edi
-	movzbl	-128(%ebp,%edi,1),%edi
-	shll	$16,%edi
-	xorl	%edi,%esi
-	movl	%edx,%edi
-	shrl	$24,%edi
-	movzbl	-128(%ebp,%edi,1),%edi
-	shll	$24,%edi
-	xorl	%edi,%esi
-	movl	%esi,4(%esp)
-	movl	%ebx,%esi
-	andl	$255,%esi
-	shrl	$16,%ebx
-	movzbl	-128(%ebp,%esi,1),%esi
-	movzbl	%ch,%edi
-	movzbl	-128(%ebp,%edi,1),%edi
-	shll	$8,%edi
-	xorl	%edi,%esi
-	movl	%edx,%edi
-	shrl	$16,%edi
-	andl	$255,%edi
-	movzbl	-128(%ebp,%edi,1),%edi
-	shll	$16,%edi
-	xorl	%edi,%esi
-	movl	%eax,%edi
-	shrl	$24,%edi
-	movzbl	-128(%ebp,%edi,1),%edi
-	shll	$24,%edi
-	xorl	%edi,%esi
-	movl	%esi,8(%esp)
-	movl	%ecx,%esi
-	andl	$255,%esi
-	shrl	$24,%ecx
-	movzbl	-128(%ebp,%esi,1),%esi
-	movzbl	%dh,%edi
-	movzbl	-128(%ebp,%edi,1),%edi
-	shll	$8,%edi
-	xorl	%edi,%esi
-	movl	%eax,%edi
-	shrl	$16,%edi
-	andl	$255,%edx
-	andl	$255,%edi
-	movzbl	-128(%ebp,%edi,1),%edi
-	shll	$16,%edi
-	xorl	%edi,%esi
-	movzbl	%bh,%edi
-	movzbl	-128(%ebp,%edi,1),%edi
-	shll	$24,%edi
-	xorl	%edi,%esi
-	movl	20(%esp),%edi
-	andl	$255,%edx
-	movzbl	-128(%ebp,%edx,1),%edx
-	movzbl	%ah,%eax
-	movzbl	-128(%ebp,%eax,1),%eax
-	shll	$8,%eax
-	xorl	%eax,%edx
-	movl	4(%esp),%eax
-	andl	$255,%ebx
-	movzbl	-128(%ebp,%ebx,1),%ebx
-	shll	$16,%ebx
-	xorl	%ebx,%edx
-	movl	8(%esp),%ebx
-	movzbl	-128(%ebp,%ecx,1),%ecx
-	shll	$24,%ecx
-	xorl	%ecx,%edx
-	movl	%esi,%ecx
-	xorl	16(%edi),%eax
-	xorl	20(%edi),%ebx
-	xorl	24(%edi),%ecx
-	xorl	28(%edi),%edx
-	ret
-.align	4
-__sse_AES_encrypt_compact:
-	pxor	(%edi),%mm0
-	pxor	8(%edi),%mm4
-	movl	240(%edi),%esi
-	leal	-2(%esi,%esi,1),%esi
-	leal	(%edi,%esi,8),%esi
-	movl	%esi,24(%esp)
-	movl	$454761243,%eax
-	movl	%eax,8(%esp)
-	movl	%eax,12(%esp)
-	movl	-128(%ebp),%eax
-	movl	-96(%ebp),%ebx
-	movl	-64(%ebp),%ecx
-	movl	-32(%ebp),%edx
-	movl	(%ebp),%eax
-	movl	32(%ebp),%ebx
-	movl	64(%ebp),%ecx
-	movl	96(%ebp),%edx
-.align	4,0x90
-L001loop:
-	pshufw	$8,%mm0,%mm1
-	pshufw	$13,%mm4,%mm5
-	movd	%mm1,%eax
-	movd	%mm5,%ebx
-	movl	%edi,20(%esp)
-	movzbl	%al,%esi
-	movzbl	%ah,%edx
-	pshufw	$13,%mm0,%mm2
-	movzbl	-128(%ebp,%esi,1),%ecx
-	movzbl	%bl,%edi
-	movzbl	-128(%ebp,%edx,1),%edx
-	shrl	$16,%eax
-	shll	$8,%edx
-	movzbl	-128(%ebp,%edi,1),%esi
-	movzbl	%bh,%edi
-	shll	$16,%esi
-	pshufw	$8,%mm4,%mm6
-	orl	%esi,%ecx
-	movzbl	-128(%ebp,%edi,1),%esi
-	movzbl	%ah,%edi
-	shll	$24,%esi
-	shrl	$16,%ebx
-	orl	%esi,%edx
-	movzbl	-128(%ebp,%edi,1),%esi
-	movzbl	%bh,%edi
-	shll	$8,%esi
-	orl	%esi,%ecx
-	movzbl	-128(%ebp,%edi,1),%esi
-	movzbl	%al,%edi
-	shll	$24,%esi
-	orl	%esi,%ecx
-	movzbl	-128(%ebp,%edi,1),%esi
-	movzbl	%bl,%edi
-	movd	%mm2,%eax
-	movd	%ecx,%mm0
-	movzbl	-128(%ebp,%edi,1),%ecx
-	movzbl	%ah,%edi
-	shll	$16,%ecx
-	movd	%mm6,%ebx
-	orl	%esi,%ecx
-	movzbl	-128(%ebp,%edi,1),%esi
-	movzbl	%bh,%edi
-	shll	$24,%esi
-	orl	%esi,%ecx
-	movzbl	-128(%ebp,%edi,1),%esi
-	movzbl	%bl,%edi
-	shll	$8,%esi
-	shrl	$16,%ebx
-	orl	%esi,%ecx
-	movzbl	-128(%ebp,%edi,1),%esi
-	movzbl	%al,%edi
-	shrl	$16,%eax
-	movd	%ecx,%mm1
-	movzbl	-128(%ebp,%edi,1),%ecx
-	movzbl	%ah,%edi
-	shll	$16,%ecx
-	andl	$255,%eax
-	orl	%esi,%ecx
-	punpckldq	%mm1,%mm0
-	movzbl	-128(%ebp,%edi,1),%esi
-	movzbl	%bh,%edi
-	shll	$24,%esi
-	andl	$255,%ebx
-	movzbl	-128(%ebp,%eax,1),%eax
-	orl	%esi,%ecx
-	shll	$16,%eax
-	movzbl	-128(%ebp,%edi,1),%esi
-	orl	%eax,%edx
-	shll	$8,%esi
-	movzbl	-128(%ebp,%ebx,1),%ebx
-	orl	%esi,%ecx
-	orl	%ebx,%edx
-	movl	20(%esp),%edi
-	movd	%ecx,%mm4
-	movd	%edx,%mm5
-	punpckldq	%mm5,%mm4
-	addl	$16,%edi
-	cmpl	24(%esp),%edi
-	ja	L002out
-	movq	8(%esp),%mm2
-	pxor	%mm3,%mm3
-	pxor	%mm7,%mm7
-	movq	%mm0,%mm1
-	movq	%mm4,%mm5
-	pcmpgtb	%mm0,%mm3
-	pcmpgtb	%mm4,%mm7
-	pand	%mm2,%mm3
-	pand	%mm2,%mm7
-	pshufw	$177,%mm0,%mm2
-	pshufw	$177,%mm4,%mm6
-	paddb	%mm0,%mm0
-	paddb	%mm4,%mm4
-	pxor	%mm3,%mm0
-	pxor	%mm7,%mm4
-	pshufw	$177,%mm2,%mm3
-	pshufw	$177,%mm6,%mm7
-	pxor	%mm0,%mm1
-	pxor	%mm4,%mm5
-	pxor	%mm2,%mm0
-	pxor	%mm6,%mm4
-	movq	%mm3,%mm2
-	movq	%mm7,%mm6
-	pslld	$8,%mm3
-	pslld	$8,%mm7
-	psrld	$24,%mm2
-	psrld	$24,%mm6
-	pxor	%mm3,%mm0
-	pxor	%mm7,%mm4
-	pxor	%mm2,%mm0
-	pxor	%mm6,%mm4
-	movq	%mm1,%mm3
-	movq	%mm5,%mm7
-	movq	(%edi),%mm2
-	movq	8(%edi),%mm6
-	psrld	$8,%mm1
-	psrld	$8,%mm5
-	movl	-128(%ebp),%eax
-	pslld	$24,%mm3
-	pslld	$24,%mm7
-	movl	-64(%ebp),%ebx
-	pxor	%mm1,%mm0
-	pxor	%mm5,%mm4
-	movl	(%ebp),%ecx
-	pxor	%mm3,%mm0
-	pxor	%mm7,%mm4
-	movl	64(%ebp),%edx
-	pxor	%mm2,%mm0
-	pxor	%mm6,%mm4
-	jmp	L001loop
-.align	4,0x90
-L002out:
-	pxor	(%edi),%mm0
-	pxor	8(%edi),%mm4
-	ret
-.align	4
-__x86_AES_encrypt:
-	movl	%edi,20(%esp)
-	xorl	(%edi),%eax
-	xorl	4(%edi),%ebx
-	xorl	8(%edi),%ecx
-	xorl	12(%edi),%edx
-	movl	240(%edi),%esi
-	leal	-2(%esi,%esi,1),%esi
-	leal	(%edi,%esi,8),%esi
-	movl	%esi,24(%esp)
-.align	4,0x90
-L003loop:
-	movl	%eax,%esi
-	andl	$255,%esi
-	movl	(%ebp,%esi,8),%esi
-	movzbl	%bh,%edi
-	xorl	3(%ebp,%edi,8),%esi
-	movl	%ecx,%edi
-	shrl	$16,%edi
-	andl	$255,%edi
-	xorl	2(%ebp,%edi,8),%esi
-	movl	%edx,%edi
-	shrl	$24,%edi
-	xorl	1(%ebp,%edi,8),%esi
-	movl	%esi,4(%esp)
-	movl	%ebx,%esi
-	andl	$255,%esi
-	shrl	$16,%ebx
-	movl	(%ebp,%esi,8),%esi
-	movzbl	%ch,%edi
-	xorl	3(%ebp,%edi,8),%esi
-	movl	%edx,%edi
-	shrl	$16,%edi
-	andl	$255,%edi
-	xorl	2(%ebp,%edi,8),%esi
-	movl	%eax,%edi
-	shrl	$24,%edi
-	xorl	1(%ebp,%edi,8),%esi
-	movl	%esi,8(%esp)
-	movl	%ecx,%esi
-	andl	$255,%esi
-	shrl	$24,%ecx
-	movl	(%ebp,%esi,8),%esi
-	movzbl	%dh,%edi
-	xorl	3(%ebp,%edi,8),%esi
-	movl	%eax,%edi
-	shrl	$16,%edi
-	andl	$255,%edx
-	andl	$255,%edi
-	xorl	2(%ebp,%edi,8),%esi
-	movzbl	%bh,%edi
-	xorl	1(%ebp,%edi,8),%esi
-	movl	20(%esp),%edi
-	movl	(%ebp,%edx,8),%edx
-	movzbl	%ah,%eax
-	xorl	3(%ebp,%eax,8),%edx
-	movl	4(%esp),%eax
-	andl	$255,%ebx
-	xorl	2(%ebp,%ebx,8),%edx
-	movl	8(%esp),%ebx
-	xorl	1(%ebp,%ecx,8),%edx
-	movl	%esi,%ecx
-	addl	$16,%edi
-	xorl	(%edi),%eax
-	xorl	4(%edi),%ebx
-	xorl	8(%edi),%ecx
-	xorl	12(%edi),%edx
-	cmpl	24(%esp),%edi
-	movl	%edi,20(%esp)
-	jb	L003loop
-	movl	%eax,%esi
-	andl	$255,%esi
-	movl	2(%ebp,%esi,8),%esi
-	andl	$255,%esi
-	movzbl	%bh,%edi
-	movl	(%ebp,%edi,8),%edi
-	andl	$65280,%edi
-	xorl	%edi,%esi
-	movl	%ecx,%edi
-	shrl	$16,%edi
-	andl	$255,%edi
-	movl	(%ebp,%edi,8),%edi
-	andl	$16711680,%edi
-	xorl	%edi,%esi
-	movl	%edx,%edi
-	shrl	$24,%edi
-	movl	2(%ebp,%edi,8),%edi
-	andl	$4278190080,%edi
-	xorl	%edi,%esi
-	movl	%esi,4(%esp)
-	movl	%ebx,%esi
-	andl	$255,%esi
-	shrl	$16,%ebx
-	movl	2(%ebp,%esi,8),%esi
-	andl	$255,%esi
-	movzbl	%ch,%edi
-	movl	(%ebp,%edi,8),%edi
-	andl	$65280,%edi
-	xorl	%edi,%esi
-	movl	%edx,%edi
-	shrl	$16,%edi
-	andl	$255,%edi
-	movl	(%ebp,%edi,8),%edi
-	andl	$16711680,%edi
-	xorl	%edi,%esi
-	movl	%eax,%edi
-	shrl	$24,%edi
-	movl	2(%ebp,%edi,8),%edi
-	andl	$4278190080,%edi
-	xorl	%edi,%esi
-	movl	%esi,8(%esp)
-	movl	%ecx,%esi
-	andl	$255,%esi
-	shrl	$24,%ecx
-	movl	2(%ebp,%esi,8),%esi
-	andl	$255,%esi
-	movzbl	%dh,%edi
-	movl	(%ebp,%edi,8),%edi
-	andl	$65280,%edi
-	xorl	%edi,%esi
-	movl	%eax,%edi
-	shrl	$16,%edi
-	andl	$255,%edx
-	andl	$255,%edi
-	movl	(%ebp,%edi,8),%edi
-	andl	$16711680,%edi
-	xorl	%edi,%esi
-	movzbl	%bh,%edi
-	movl	2(%ebp,%edi,8),%edi
-	andl	$4278190080,%edi
-	xorl	%edi,%esi
-	movl	20(%esp),%edi
-	andl	$255,%edx
-	movl	2(%ebp,%edx,8),%edx
-	andl	$255,%edx
-	movzbl	%ah,%eax
-	movl	(%ebp,%eax,8),%eax
-	andl	$65280,%eax
-	xorl	%eax,%edx
-	movl	4(%esp),%eax
-	andl	$255,%ebx
-	movl	(%ebp,%ebx,8),%ebx
-	andl	$16711680,%ebx
-	xorl	%ebx,%edx
-	movl	8(%esp),%ebx
-	movl	2(%ebp,%ecx,8),%ecx
-	andl	$4278190080,%ecx
-	xorl	%ecx,%edx
-	movl	%esi,%ecx
-	addl	$16,%edi
-	xorl	(%edi),%eax
-	xorl	4(%edi),%ebx
-	xorl	8(%edi),%ecx
-	xorl	12(%edi),%edx
-	ret
-.align	6,0x90
-LAES_Te:
-.long	2774754246,2774754246
-.long	2222750968,2222750968
-.long	2574743534,2574743534
-.long	2373680118,2373680118
-.long	234025727,234025727
-.long	3177933782,3177933782
-.long	2976870366,2976870366
-.long	1422247313,1422247313
-.long	1345335392,1345335392
-.long	50397442,50397442
-.long	2842126286,2842126286
-.long	2099981142,2099981142
-.long	436141799,436141799
-.long	1658312629,1658312629
-.long	3870010189,3870010189
-.long	2591454956,2591454956
-.long	1170918031,1170918031
-.long	2642575903,2642575903
-.long	1086966153,1086966153
-.long	2273148410,2273148410
-.long	368769775,368769775
-.long	3948501426,3948501426
-.long	3376891790,3376891790
-.long	200339707,200339707
-.long	3970805057,3970805057
-.long	1742001331,1742001331
-.long	4255294047,4255294047
-.long	3937382213,3937382213
-.long	3214711843,3214711843
-.long	4154762323,4154762323
-.long	2524082916,2524082916
-.long	1539358875,1539358875
-.long	3266819957,3266819957
-.long	486407649,486407649
-.long	2928907069,2928907069
-.long	1780885068,1780885068
-.long	1513502316,1513502316
-.long	1094664062,1094664062
-.long	49805301,49805301
-.long	1338821763,1338821763
-.long	1546925160,1546925160
-.long	4104496465,4104496465
-.long	887481809,887481809
-.long	150073849,150073849
-.long	2473685474,2473685474
-.long	1943591083,1943591083
-.long	1395732834,1395732834
-.long	1058346282,1058346282
-.long	201589768,201589768
-.long	1388824469,1388824469
-.long	1696801606,1696801606
-.long	1589887901,1589887901
-.long	672667696,672667696
-.long	2711000631,2711000631
-.long	251987210,251987210
-.long	3046808111,3046808111
-.long	151455502,151455502
-.long	907153956,907153956
-.long	2608889883,2608889883
-.long	1038279391,1038279391
-.long	652995533,652995533
-.long	1764173646,1764173646
-.long	3451040383,3451040383
-.long	2675275242,2675275242
-.long	453576978,453576978
-.long	2659418909,2659418909
-.long	1949051992,1949051992
-.long	773462580,773462580
-.long	756751158,756751158
-.long	2993581788,2993581788
-.long	3998898868,3998898868
-.long	4221608027,4221608027
-.long	4132590244,4132590244
-.long	1295727478,1295727478
-.long	1641469623,1641469623
-.long	3467883389,3467883389
-.long	2066295122,2066295122
-.long	1055122397,1055122397
-.long	1898917726,1898917726
-.long	2542044179,2542044179
-.long	4115878822,4115878822
-.long	1758581177,1758581177
-.long	0,0
-.long	753790401,753790401
-.long	1612718144,1612718144
-.long	536673507,536673507
-.long	3367088505,3367088505
-.long	3982187446,3982187446
-.long	3194645204,3194645204
-.long	1187761037,1187761037
-.long	3653156455,3653156455
-.long	1262041458,1262041458
-.long	3729410708,3729410708
-.long	3561770136,3561770136
-.long	3898103984,3898103984
-.long	1255133061,1255133061
-.long	1808847035,1808847035
-.long	720367557,720367557
-.long	3853167183,3853167183
-.long	385612781,385612781
-.long	3309519750,3309519750
-.long	3612167578,3612167578
-.long	1429418854,1429418854
-.long	2491778321,2491778321
-.long	3477423498,3477423498
-.long	284817897,284817897
-.long	100794884,100794884
-.long	2172616702,2172616702
-.long	4031795360,4031795360
-.long	1144798328,1144798328
-.long	3131023141,3131023141
-.long	3819481163,3819481163
-.long	4082192802,4082192802
-.long	4272137053,4272137053
-.long	3225436288,3225436288
-.long	2324664069,2324664069
-.long	2912064063,2912064063
-.long	3164445985,3164445985
-.long	1211644016,1211644016
-.long	83228145,83228145
-.long	3753688163,3753688163
-.long	3249976951,3249976951
-.long	1977277103,1977277103
-.long	1663115586,1663115586
-.long	806359072,806359072
-.long	452984805,452984805
-.long	250868733,250868733
-.long	1842533055,1842533055
-.long	1288555905,1288555905
-.long	336333848,336333848
-.long	890442534,890442534
-.long	804056259,804056259
-.long	3781124030,3781124030
-.long	2727843637,2727843637
-.long	3427026056,3427026056
-.long	957814574,957814574
-.long	1472513171,1472513171
-.long	4071073621,4071073621
-.long	2189328124,2189328124
-.long	1195195770,1195195770
-.long	2892260552,2892260552
-.long	3881655738,3881655738
-.long	723065138,723065138
-.long	2507371494,2507371494
-.long	2690670784,2690670784
-.long	2558624025,2558624025
-.long	3511635870,3511635870
-.long	2145180835,2145180835
-.long	1713513028,1713513028
-.long	2116692564,2116692564
-.long	2878378043,2878378043
-.long	2206763019,2206763019
-.long	3393603212,3393603212
-.long	703524551,703524551
-.long	3552098411,3552098411
-.long	1007948840,1007948840
-.long	2044649127,2044649127
-.long	3797835452,3797835452
-.long	487262998,487262998
-.long	1994120109,1994120109
-.long	1004593371,1004593371
-.long	1446130276,1446130276
-.long	1312438900,1312438900
-.long	503974420,503974420
-.long	3679013266,3679013266
-.long	168166924,168166924
-.long	1814307912,1814307912
-.long	3831258296,3831258296
-.long	1573044895,1573044895
-.long	1859376061,1859376061
-.long	4021070915,4021070915
-.long	2791465668,2791465668
-.long	2828112185,2828112185
-.long	2761266481,2761266481
-.long	937747667,937747667
-.long	2339994098,2339994098
-.long	854058965,854058965
-.long	1137232011,1137232011
-.long	1496790894,1496790894
-.long	3077402074,3077402074
-.long	2358086913,2358086913
-.long	1691735473,1691735473
-.long	3528347292,3528347292
-.long	3769215305,3769215305
-.long	3027004632,3027004632
-.long	4199962284,4199962284
-.long	133494003,133494003
-.long	636152527,636152527
-.long	2942657994,2942657994
-.long	2390391540,2390391540
-.long	3920539207,3920539207
-.long	403179536,403179536
-.long	3585784431,3585784431
-.long	2289596656,2289596656
-.long	1864705354,1864705354
-.long	1915629148,1915629148
-.long	605822008,605822008
-.long	4054230615,4054230615
-.long	3350508659,3350508659
-.long	1371981463,1371981463
-.long	602466507,602466507
-.long	2094914977,2094914977
-.long	2624877800,2624877800
-.long	555687742,555687742
-.long	3712699286,3712699286
-.long	3703422305,3703422305
-.long	2257292045,2257292045
-.long	2240449039,2240449039
-.long	2423288032,2423288032
-.long	1111375484,1111375484
-.long	3300242801,3300242801
-.long	2858837708,2858837708
-.long	3628615824,3628615824
-.long	84083462,84083462
-.long	32962295,32962295
-.long	302911004,302911004
-.long	2741068226,2741068226
-.long	1597322602,1597322602
-.long	4183250862,4183250862
-.long	3501832553,3501832553
-.long	2441512471,2441512471
-.long	1489093017,1489093017
-.long	656219450,656219450
-.long	3114180135,3114180135
-.long	954327513,954327513
-.long	335083755,335083755
-.long	3013122091,3013122091
-.long	856756514,856756514
-.long	3144247762,3144247762
-.long	1893325225,1893325225
-.long	2307821063,2307821063
-.long	2811532339,2811532339
-.long	3063651117,3063651117
-.long	572399164,572399164
-.long	2458355477,2458355477
-.long	552200649,552200649
-.long	1238290055,1238290055
-.long	4283782570,4283782570
-.long	2015897680,2015897680
-.long	2061492133,2061492133
-.long	2408352771,2408352771
-.long	4171342169,4171342169
-.long	2156497161,2156497161
-.long	386731290,386731290
-.long	3669999461,3669999461
-.long	837215959,837215959
-.long	3326231172,3326231172
-.long	3093850320,3093850320
-.long	3275833730,3275833730
-.long	2962856233,2962856233
-.long	1999449434,1999449434
-.long	286199582,286199582
-.long	3417354363,3417354363
-.long	4233385128,4233385128
-.long	3602627437,3602627437
-.long	974525996,974525996
-.byte	99,124,119,123,242,107,111,197
-.byte	48,1,103,43,254,215,171,118
-.byte	202,130,201,125,250,89,71,240
-.byte	173,212,162,175,156,164,114,192
-.byte	183,253,147,38,54,63,247,204
-.byte	52,165,229,241,113,216,49,21
-.byte	4,199,35,195,24,150,5,154
-.byte	7,18,128,226,235,39,178,117
-.byte	9,131,44,26,27,110,90,160
-.byte	82,59,214,179,41,227,47,132
-.byte	83,209,0,237,32,252,177,91
-.byte	106,203,190,57,74,76,88,207
-.byte	208,239,170,251,67,77,51,133
-.byte	69,249,2,127,80,60,159,168
-.byte	81,163,64,143,146,157,56,245
-.byte	188,182,218,33,16,255,243,210
-.byte	205,12,19,236,95,151,68,23
-.byte	196,167,126,61,100,93,25,115
-.byte	96,129,79,220,34,42,144,136
-.byte	70,238,184,20,222,94,11,219
-.byte	224,50,58,10,73,6,36,92
-.byte	194,211,172,98,145,149,228,121
-.byte	231,200,55,109,141,213,78,169
-.byte	108,86,244,234,101,122,174,8
-.byte	186,120,37,46,28,166,180,198
-.byte	232,221,116,31,75,189,139,138
-.byte	112,62,181,102,72,3,246,14
-.byte	97,53,87,185,134,193,29,158
-.byte	225,248,152,17,105,217,142,148
-.byte	155,30,135,233,206,85,40,223
-.byte	140,161,137,13,191,230,66,104
-.byte	65,153,45,15,176,84,187,22
-.byte	99,124,119,123,242,107,111,197
-.byte	48,1,103,43,254,215,171,118
-.byte	202,130,201,125,250,89,71,240
-.byte	173,212,162,175,156,164,114,192
-.byte	183,253,147,38,54,63,247,204
-.byte	52,165,229,241,113,216,49,21
-.byte	4,199,35,195,24,150,5,154
-.byte	7,18,128,226,235,39,178,117
-.byte	9,131,44,26,27,110,90,160
-.byte	82,59,214,179,41,227,47,132
-.byte	83,209,0,237,32,252,177,91
-.byte	106,203,190,57,74,76,88,207
-.byte	208,239,170,251,67,77,51,133
-.byte	69,249,2,127,80,60,159,168
-.byte	81,163,64,143,146,157,56,245
-.byte	188,182,218,33,16,255,243,210
-.byte	205,12,19,236,95,151,68,23
-.byte	196,167,126,61,100,93,25,115
-.byte	96,129,79,220,34,42,144,136
-.byte	70,238,184,20,222,94,11,219
-.byte	224,50,58,10,73,6,36,92
-.byte	194,211,172,98,145,149,228,121
-.byte	231,200,55,109,141,213,78,169
-.byte	108,86,244,234,101,122,174,8
-.byte	186,120,37,46,28,166,180,198
-.byte	232,221,116,31,75,189,139,138
-.byte	112,62,181,102,72,3,246,14
-.byte	97,53,87,185,134,193,29,158
-.byte	225,248,152,17,105,217,142,148
-.byte	155,30,135,233,206,85,40,223
-.byte	140,161,137,13,191,230,66,104
-.byte	65,153,45,15,176,84,187,22
-.byte	99,124,119,123,242,107,111,197
-.byte	48,1,103,43,254,215,171,118
-.byte	202,130,201,125,250,89,71,240
-.byte	173,212,162,175,156,164,114,192
-.byte	183,253,147,38,54,63,247,204
-.byte	52,165,229,241,113,216,49,21
-.byte	4,199,35,195,24,150,5,154
-.byte	7,18,128,226,235,39,178,117
-.byte	9,131,44,26,27,110,90,160
-.byte	82,59,214,179,41,227,47,132
-.byte	83,209,0,237,32,252,177,91
-.byte	106,203,190,57,74,76,88,207
-.byte	208,239,170,251,67,77,51,133
-.byte	69,249,2,127,80,60,159,168
-.byte	81,163,64,143,146,157,56,245
-.byte	188,182,218,33,16,255,243,210
-.byte	205,12,19,236,95,151,68,23
-.byte	196,167,126,61,100,93,25,115
-.byte	96,129,79,220,34,42,144,136
-.byte	70,238,184,20,222,94,11,219
-.byte	224,50,58,10,73,6,36,92
-.byte	194,211,172,98,145,149,228,121
-.byte	231,200,55,109,141,213,78,169
-.byte	108,86,244,234,101,122,174,8
-.byte	186,120,37,46,28,166,180,198
-.byte	232,221,116,31,75,189,139,138
-.byte	112,62,181,102,72,3,246,14
-.byte	97,53,87,185,134,193,29,158
-.byte	225,248,152,17,105,217,142,148
-.byte	155,30,135,233,206,85,40,223
-.byte	140,161,137,13,191,230,66,104
-.byte	65,153,45,15,176,84,187,22
-.byte	99,124,119,123,242,107,111,197
-.byte	48,1,103,43,254,215,171,118
-.byte	202,130,201,125,250,89,71,240
-.byte	173,212,162,175,156,164,114,192
-.byte	183,253,147,38,54,63,247,204
-.byte	52,165,229,241,113,216,49,21
-.byte	4,199,35,195,24,150,5,154
-.byte	7,18,128,226,235,39,178,117
-.byte	9,131,44,26,27,110,90,160
-.byte	82,59,214,179,41,227,47,132
-.byte	83,209,0,237,32,252,177,91
-.byte	106,203,190,57,74,76,88,207
-.byte	208,239,170,251,67,77,51,133
-.byte	69,249,2,127,80,60,159,168
-.byte	81,163,64,143,146,157,56,245
-.byte	188,182,218,33,16,255,243,210
-.byte	205,12,19,236,95,151,68,23
-.byte	196,167,126,61,100,93,25,115
-.byte	96,129,79,220,34,42,144,136
-.byte	70,238,184,20,222,94,11,219
-.byte	224,50,58,10,73,6,36,92
-.byte	194,211,172,98,145,149,228,121
-.byte	231,200,55,109,141,213,78,169
-.byte	108,86,244,234,101,122,174,8
-.byte	186,120,37,46,28,166,180,198
-.byte	232,221,116,31,75,189,139,138
-.byte	112,62,181,102,72,3,246,14
-.byte	97,53,87,185,134,193,29,158
-.byte	225,248,152,17,105,217,142,148
-.byte	155,30,135,233,206,85,40,223
-.byte	140,161,137,13,191,230,66,104
-.byte	65,153,45,15,176,84,187,22
-.long	1,2,4,8
-.long	16,32,64,128
-.long	27,54,0,0
-.long	0,0,0,0
-.globl	_AES_encrypt
-.align	4
-_AES_encrypt:
-L_AES_encrypt_begin:
-	pushl	%ebp
-	pushl	%ebx
-	pushl	%esi
-	pushl	%edi
-	movl	20(%esp),%esi
-	movl	28(%esp),%edi
-	movl	%esp,%eax
-	subl	$36,%esp
-	andl	$-64,%esp
-	leal	-127(%edi),%ebx
-	subl	%esp,%ebx
-	negl	%ebx
-	andl	$960,%ebx
-	subl	%ebx,%esp
-	addl	$4,%esp
-	movl	%eax,28(%esp)
-	call	L004pic_point
-L004pic_point:
-	popl	%ebp
-	movl	L_OPENSSL_ia32cap_P$non_lazy_ptr-L004pic_point(%ebp),%eax
-	leal	LAES_Te-L004pic_point(%ebp),%ebp
-	leal	764(%esp),%ebx
-	subl	%ebp,%ebx
-	andl	$768,%ebx
-	leal	2176(%ebp,%ebx,1),%ebp
-	btl	$25,(%eax)
-	jnc	L005x86
-	movq	(%esi),%mm0
-	movq	8(%esi),%mm4
-	call	__sse_AES_encrypt_compact
-	movl	28(%esp),%esp
-	movl	24(%esp),%esi
-	movq	%mm0,(%esi)
-	movq	%mm4,8(%esi)
-	emms
-	popl	%edi
-	popl	%esi
-	popl	%ebx
-	popl	%ebp
-	ret
-.align	4,0x90
-L005x86:
-	movl	%ebp,24(%esp)
-	movl	(%esi),%eax
-	movl	4(%esi),%ebx
-	movl	8(%esi),%ecx
-	movl	12(%esi),%edx
-	call	__x86_AES_encrypt_compact
-	movl	28(%esp),%esp
-	movl	24(%esp),%esi
-	movl	%eax,(%esi)
-	movl	%ebx,4(%esi)
-	movl	%ecx,8(%esi)
-	movl	%edx,12(%esi)
-	popl	%edi
-	popl	%esi
-	popl	%ebx
-	popl	%ebp
-	ret
-.align	4
-__x86_AES_decrypt_compact:
-	movl	%edi,20(%esp)
-	xorl	(%edi),%eax
-	xorl	4(%edi),%ebx
-	xorl	8(%edi),%ecx
-	xorl	12(%edi),%edx
-	movl	240(%edi),%esi
-	leal	-2(%esi,%esi,1),%esi
-	leal	(%edi,%esi,8),%esi
-	movl	%esi,24(%esp)
-	movl	-128(%ebp),%edi
-	movl	-96(%ebp),%esi
-	movl	-64(%ebp),%edi
-	movl	-32(%ebp),%esi
-	movl	(%ebp),%edi
-	movl	32(%ebp),%esi
-	movl	64(%ebp),%edi
-	movl	96(%ebp),%esi
-.align	4,0x90
-L006loop:
-	movl	%eax,%esi
-	andl	$255,%esi
-	movzbl	-128(%ebp,%esi,1),%esi
-	movzbl	%dh,%edi
-	movzbl	-128(%ebp,%edi,1),%edi
-	shll	$8,%edi
-	xorl	%edi,%esi
-	movl	%ecx,%edi
-	shrl	$16,%edi
-	andl	$255,%edi
-	movzbl	-128(%ebp,%edi,1),%edi
-	shll	$16,%edi
-	xorl	%edi,%esi
-	movl	%ebx,%edi
-	shrl	$24,%edi
-	movzbl	-128(%ebp,%edi,1),%edi
-	shll	$24,%edi
-	xorl	%edi,%esi
-	movl	%esi,4(%esp)
-	movl	%ebx,%esi
-	andl	$255,%esi
-	movzbl	-128(%ebp,%esi,1),%esi
-	movzbl	%ah,%edi
-	movzbl	-128(%ebp,%edi,1),%edi
-	shll	$8,%edi
-	xorl	%edi,%esi
-	movl	%edx,%edi
-	shrl	$16,%edi
-	andl	$255,%edi
-	movzbl	-128(%ebp,%edi,1),%edi
-	shll	$16,%edi
-	xorl	%edi,%esi
-	movl	%ecx,%edi
-	shrl	$24,%edi
-	movzbl	-128(%ebp,%edi,1),%edi
-	shll	$24,%edi
-	xorl	%edi,%esi
-	movl	%esi,8(%esp)
-	movl	%ecx,%esi
-	andl	$255,%esi
-	movzbl	-128(%ebp,%esi,1),%esi
-	movzbl	%bh,%edi
-	movzbl	-128(%ebp,%edi,1),%edi
-	shll	$8,%edi
-	xorl	%edi,%esi
-	movl	%eax,%edi
-	shrl	$16,%edi
-	andl	$255,%edi
-	movzbl	-128(%ebp,%edi,1),%edi
-	shll	$16,%edi
-	xorl	%edi,%esi
-	movl	%edx,%edi
-	shrl	$24,%edi
-	movzbl	-128(%ebp,%edi,1),%edi
-	shll	$24,%edi
-	xorl	%edi,%esi
-	andl	$255,%edx
-	movzbl	-128(%ebp,%edx,1),%edx
-	movzbl	%ch,%ecx
-	movzbl	-128(%ebp,%ecx,1),%ecx
-	shll	$8,%ecx
-	xorl	%ecx,%edx
-	movl	%esi,%ecx
-	shrl	$16,%ebx
-	andl	$255,%ebx
-	movzbl	-128(%ebp,%ebx,1),%ebx
-	shll	$16,%ebx
-	xorl	%ebx,%edx
-	shrl	$24,%eax
-	movzbl	-128(%ebp,%eax,1),%eax
-	shll	$24,%eax
-	xorl	%eax,%edx
-	movl	$2155905152,%edi
-	andl	%ecx,%edi
-	movl	%edi,%esi
-	shrl	$7,%edi
-	leal	(%ecx,%ecx,1),%eax
-	subl	%edi,%esi
-	andl	$4278124286,%eax
-	andl	$454761243,%esi
-	xorl	%esi,%eax
-	movl	$2155905152,%edi
-	andl	%eax,%edi
-	movl	%edi,%esi
-	shrl	$7,%edi
-	leal	(%eax,%eax,1),%ebx
-	subl	%edi,%esi
-	andl	$4278124286,%ebx
-	andl	$454761243,%esi
-	xorl	%ecx,%eax
-	xorl	%esi,%ebx
-	movl	$2155905152,%edi
-	andl	%ebx,%edi
-	movl	%edi,%esi
-	shrl	$7,%edi
-	leal	(%ebx,%ebx,1),%ebp
-	subl	%edi,%esi
-	andl	$4278124286,%ebp
-	andl	$454761243,%esi
-	xorl	%ecx,%ebx
-	roll	$8,%ecx
-	xorl	%esi,%ebp
-	xorl	%eax,%ecx
-	xorl	%ebp,%eax
-	xorl	%ebx,%ecx
-	xorl	%ebp,%ebx
-	roll	$24,%eax
-	xorl	%ebp,%ecx
-	roll	$16,%ebx
-	xorl	%eax,%ecx
-	roll	$8,%ebp
-	xorl	%ebx,%ecx
-	movl	4(%esp),%eax
-	xorl	%ebp,%ecx
-	movl	%ecx,12(%esp)
-	movl	$2155905152,%edi
-	andl	%edx,%edi
-	movl	%edi,%esi
-	shrl	$7,%edi
-	leal	(%edx,%edx,1),%ebx
-	subl	%edi,%esi
-	andl	$4278124286,%ebx
-	andl	$454761243,%esi
-	xorl	%esi,%ebx
-	movl	$2155905152,%edi
-	andl	%ebx,%edi
-	movl	%edi,%esi
-	shrl	$7,%edi
-	leal	(%ebx,%ebx,1),%ecx
-	subl	%edi,%esi
-	andl	$4278124286,%ecx
-	andl	$454761243,%esi
-	xorl	%edx,%ebx
-	xorl	%esi,%ecx
-	movl	$2155905152,%edi
-	andl	%ecx,%edi
-	movl	%edi,%esi
-	shrl	$7,%edi
-	leal	(%ecx,%ecx,1),%ebp
-	subl	%edi,%esi
-	andl	$4278124286,%ebp
-	andl	$454761243,%esi
-	xorl	%edx,%ecx
-	roll	$8,%edx
-	xorl	%esi,%ebp
-	xorl	%ebx,%edx
-	xorl	%ebp,%ebx
-	xorl	%ecx,%edx
-	xorl	%ebp,%ecx
-	roll	$24,%ebx
-	xorl	%ebp,%edx
-	roll	$16,%ecx
-	xorl	%ebx,%edx
-	roll	$8,%ebp
-	xorl	%ecx,%edx
-	movl	8(%esp),%ebx
-	xorl	%ebp,%edx
-	movl	%edx,16(%esp)
-	movl	$2155905152,%edi
-	andl	%eax,%edi
-	movl	%edi,%esi
-	shrl	$7,%edi
-	leal	(%eax,%eax,1),%ecx
-	subl	%edi,%esi
-	andl	$4278124286,%ecx
-	andl	$454761243,%esi
-	xorl	%esi,%ecx
-	movl	$2155905152,%edi
-	andl	%ecx,%edi
-	movl	%edi,%esi
-	shrl	$7,%edi
-	leal	(%ecx,%ecx,1),%edx
-	subl	%edi,%esi
-	andl	$4278124286,%edx
-	andl	$454761243,%esi
-	xorl	%eax,%ecx
-	xorl	%esi,%edx
-	movl	$2155905152,%edi
-	andl	%edx,%edi
-	movl	%edi,%esi
-	shrl	$7,%edi
-	leal	(%edx,%edx,1),%ebp
-	subl	%edi,%esi
-	andl	$4278124286,%ebp
-	andl	$454761243,%esi
-	xorl	%eax,%edx
-	roll	$8,%eax
-	xorl	%esi,%ebp
-	xorl	%ecx,%eax
-	xorl	%ebp,%ecx
-	xorl	%edx,%eax
-	xorl	%ebp,%edx
-	roll	$24,%ecx
-	xorl	%ebp,%eax
-	roll	$16,%edx
-	xorl	%ecx,%eax
-	roll	$8,%ebp
-	xorl	%edx,%eax
-	xorl	%ebp,%eax
-	movl	$2155905152,%edi
-	andl	%ebx,%edi
-	movl	%edi,%esi
-	shrl	$7,%edi
-	leal	(%ebx,%ebx,1),%ecx
-	subl	%edi,%esi
-	andl	$4278124286,%ecx
-	andl	$454761243,%esi
-	xorl	%esi,%ecx
-	movl	$2155905152,%edi
-	andl	%ecx,%edi
-	movl	%edi,%esi
-	shrl	$7,%edi
-	leal	(%ecx,%ecx,1),%edx
-	subl	%edi,%esi
-	andl	$4278124286,%edx
-	andl	$454761243,%esi
-	xorl	%ebx,%ecx
-	xorl	%esi,%edx
-	movl	$2155905152,%edi
-	andl	%edx,%edi
-	movl	%edi,%esi
-	shrl	$7,%edi
-	leal	(%edx,%edx,1),%ebp
-	subl	%edi,%esi
-	andl	$4278124286,%ebp
-	andl	$454761243,%esi
-	xorl	%ebx,%edx
-	roll	$8,%ebx
-	xorl	%esi,%ebp
-	xorl	%ecx,%ebx
-	xorl	%ebp,%ecx
-	xorl	%edx,%ebx
-	xorl	%ebp,%edx
-	roll	$24,%ecx
-	xorl	%ebp,%ebx
-	roll	$16,%edx
-	xorl	%ecx,%ebx
-	roll	$8,%ebp
-	xorl	%edx,%ebx
-	movl	12(%esp),%ecx
-	xorl	%ebp,%ebx
-	movl	16(%esp),%edx
-	movl	20(%esp),%edi
-	movl	28(%esp),%ebp
-	addl	$16,%edi
-	xorl	(%edi),%eax
-	xorl	4(%edi),%ebx
-	xorl	8(%edi),%ecx
-	xorl	12(%edi),%edx
-	cmpl	24(%esp),%edi
-	movl	%edi,20(%esp)
-	jb	L006loop
-	movl	%eax,%esi
-	andl	$255,%esi
-	movzbl	-128(%ebp,%esi,1),%esi
-	movzbl	%dh,%edi
-	movzbl	-128(%ebp,%edi,1),%edi
-	shll	$8,%edi
-	xorl	%edi,%esi
-	movl	%ecx,%edi
-	shrl	$16,%edi
-	andl	$255,%edi
-	movzbl	-128(%ebp,%edi,1),%edi
-	shll	$16,%edi
-	xorl	%edi,%esi
-	movl	%ebx,%edi
-	shrl	$24,%edi
-	movzbl	-128(%ebp,%edi,1),%edi
-	shll	$24,%edi
-	xorl	%edi,%esi
-	movl	%esi,4(%esp)
-	movl	%ebx,%esi
-	andl	$255,%esi
-	movzbl	-128(%ebp,%esi,1),%esi
-	movzbl	%ah,%edi
-	movzbl	-128(%ebp,%edi,1),%edi
-	shll	$8,%edi
-	xorl	%edi,%esi
-	movl	%edx,%edi
-	shrl	$16,%edi
-	andl	$255,%edi
-	movzbl	-128(%ebp,%edi,1),%edi
-	shll	$16,%edi
-	xorl	%edi,%esi
-	movl	%ecx,%edi
-	shrl	$24,%edi
-	movzbl	-128(%ebp,%edi,1),%edi
-	shll	$24,%edi
-	xorl	%edi,%esi
-	movl	%esi,8(%esp)
-	movl	%ecx,%esi
-	andl	$255,%esi
-	movzbl	-128(%ebp,%esi,1),%esi
-	movzbl	%bh,%edi
-	movzbl	-128(%ebp,%edi,1),%edi
-	shll	$8,%edi
-	xorl	%edi,%esi
-	movl	%eax,%edi
-	shrl	$16,%edi
-	andl	$255,%edi
-	movzbl	-128(%ebp,%edi,1),%edi
-	shll	$16,%edi
-	xorl	%edi,%esi
-	movl	%edx,%edi
-	shrl	$24,%edi
-	movzbl	-128(%ebp,%edi,1),%edi
-	shll	$24,%edi
-	xorl	%edi,%esi
-	movl	20(%esp),%edi
-	andl	$255,%edx
-	movzbl	-128(%ebp,%edx,1),%edx
-	movzbl	%ch,%ecx
-	movzbl	-128(%ebp,%ecx,1),%ecx
-	shll	$8,%ecx
-	xorl	%ecx,%edx
-	movl	%esi,%ecx
-	shrl	$16,%ebx
-	andl	$255,%ebx
-	movzbl	-128(%ebp,%ebx,1),%ebx
-	shll	$16,%ebx
-	xorl	%ebx,%edx
-	movl	8(%esp),%ebx
-	shrl	$24,%eax
-	movzbl	-128(%ebp,%eax,1),%eax
-	shll	$24,%eax
-	xorl	%eax,%edx
-	movl	4(%esp),%eax
-	xorl	16(%edi),%eax
-	xorl	20(%edi),%ebx
-	xorl	24(%edi),%ecx
-	xorl	28(%edi),%edx
-	ret
-.align	4
-__sse_AES_decrypt_compact:
-	pxor	(%edi),%mm0
-	pxor	8(%edi),%mm4
-	movl	240(%edi),%esi
-	leal	-2(%esi,%esi,1),%esi
-	leal	(%edi,%esi,8),%esi
-	movl	%esi,24(%esp)
-	movl	$454761243,%eax
-	movl	%eax,8(%esp)
-	movl	%eax,12(%esp)
-	movl	-128(%ebp),%eax
-	movl	-96(%ebp),%ebx
-	movl	-64(%ebp),%ecx
-	movl	-32(%ebp),%edx
-	movl	(%ebp),%eax
-	movl	32(%ebp),%ebx
-	movl	64(%ebp),%ecx
-	movl	96(%ebp),%edx
-.align	4,0x90
-L007loop:
-	pshufw	$12,%mm0,%mm1
-	pshufw	$9,%mm4,%mm5
-	movd	%mm1,%eax
-	movd	%mm5,%ebx
-	movl	%edi,20(%esp)
-	movzbl	%al,%esi
-	movzbl	%ah,%edx
-	pshufw	$6,%mm0,%mm2
-	movzbl	-128(%ebp,%esi,1),%ecx
-	movzbl	%bl,%edi
-	movzbl	-128(%ebp,%edx,1),%edx
-	shrl	$16,%eax
-	shll	$8,%edx
-	movzbl	-128(%ebp,%edi,1),%esi
-	movzbl	%bh,%edi
-	shll	$16,%esi
-	pshufw	$3,%mm4,%mm6
-	orl	%esi,%ecx
-	movzbl	-128(%ebp,%edi,1),%esi
-	movzbl	%ah,%edi
-	shll	$24,%esi
-	shrl	$16,%ebx
-	orl	%esi,%edx
-	movzbl	-128(%ebp,%edi,1),%esi
-	movzbl	%bh,%edi
-	shll	$24,%esi
-	orl	%esi,%ecx
-	movzbl	-128(%ebp,%edi,1),%esi
-	movzbl	%al,%edi
-	shll	$8,%esi
-	movd	%mm2,%eax
-	orl	%esi,%ecx
-	movzbl	-128(%ebp,%edi,1),%esi
-	movzbl	%bl,%edi
-	shll	$16,%esi
-	movd	%mm6,%ebx
-	movd	%ecx,%mm0
-	movzbl	-128(%ebp,%edi,1),%ecx
-	movzbl	%al,%edi
-	orl	%esi,%ecx
-	movzbl	-128(%ebp,%edi,1),%esi
-	movzbl	%bl,%edi
-	orl	%esi,%edx
-	movzbl	-128(%ebp,%edi,1),%esi
-	movzbl	%ah,%edi
-	shll	$16,%esi
-	shrl	$16,%eax
-	orl	%esi,%edx
-	movzbl	-128(%ebp,%edi,1),%esi
-	movzbl	%bh,%edi
-	shrl	$16,%ebx
-	shll	$8,%esi
-	movd	%edx,%mm1
-	movzbl	-128(%ebp,%edi,1),%edx
-	movzbl	%bh,%edi
-	shll	$24,%edx
-	andl	$255,%ebx
-	orl	%esi,%edx
-	punpckldq	%mm1,%mm0
-	movzbl	-128(%ebp,%edi,1),%esi
-	movzbl	%al,%edi
-	shll	$8,%esi
-	movzbl	%ah,%eax
-	movzbl	-128(%ebp,%ebx,1),%ebx
-	orl	%esi,%ecx
-	movzbl	-128(%ebp,%edi,1),%esi
-	orl	%ebx,%edx
-	shll	$16,%esi
-	movzbl	-128(%ebp,%eax,1),%eax
-	orl	%esi,%edx
-	shll	$24,%eax
-	orl	%eax,%ecx
-	movl	20(%esp),%edi
-	movd	%edx,%mm4
-	movd	%ecx,%mm5
-	punpckldq	%mm5,%mm4
-	addl	$16,%edi
-	cmpl	24(%esp),%edi
-	ja	L008out
-	movq	%mm0,%mm3
-	movq	%mm4,%mm7
-	pshufw	$228,%mm0,%mm2
-	pshufw	$228,%mm4,%mm6
-	movq	%mm0,%mm1
-	movq	%mm4,%mm5
-	pshufw	$177,%mm0,%mm0
-	pshufw	$177,%mm4,%mm4
-	pslld	$8,%mm2
-	pslld	$8,%mm6
-	psrld	$8,%mm3
-	psrld	$8,%mm7
-	pxor	%mm2,%mm0
-	pxor	%mm6,%mm4
-	pxor	%mm3,%mm0
-	pxor	%mm7,%mm4
-	pslld	$16,%mm2
-	pslld	$16,%mm6
-	psrld	$16,%mm3
-	psrld	$16,%mm7
-	pxor	%mm2,%mm0
-	pxor	%mm6,%mm4
-	pxor	%mm3,%mm0
-	pxor	%mm7,%mm4
-	movq	8(%esp),%mm3
-	pxor	%mm2,%mm2
-	pxor	%mm6,%mm6
-	pcmpgtb	%mm1,%mm2
-	pcmpgtb	%mm5,%mm6
-	pand	%mm3,%mm2
-	pand	%mm3,%mm6
-	paddb	%mm1,%mm1
-	paddb	%mm5,%mm5
-	pxor	%mm2,%mm1
-	pxor	%mm6,%mm5
-	movq	%mm1,%mm3
-	movq	%mm5,%mm7
-	movq	%mm1,%mm2
-	movq	%mm5,%mm6
-	pxor	%mm1,%mm0
-	pxor	%mm5,%mm4
-	pslld	$24,%mm3
-	pslld	$24,%mm7
-	psrld	$8,%mm2
-	psrld	$8,%mm6
-	pxor	%mm3,%mm0
-	pxor	%mm7,%mm4
-	pxor	%mm2,%mm0
-	pxor	%mm6,%mm4
-	movq	8(%esp),%mm2
-	pxor	%mm3,%mm3
-	pxor	%mm7,%mm7
-	pcmpgtb	%mm1,%mm3
-	pcmpgtb	%mm5,%mm7
-	pand	%mm2,%mm3
-	pand	%mm2,%mm7
-	paddb	%mm1,%mm1
-	paddb	%mm5,%mm5
-	pxor	%mm3,%mm1
-	pxor	%mm7,%mm5
-	pshufw	$177,%mm1,%mm3
-	pshufw	$177,%mm5,%mm7
-	pxor	%mm1,%mm0
-	pxor	%mm5,%mm4
-	pxor	%mm3,%mm0
-	pxor	%mm7,%mm4
-	pxor	%mm3,%mm3
-	pxor	%mm7,%mm7
-	pcmpgtb	%mm1,%mm3
-	pcmpgtb	%mm5,%mm7
-	pand	%mm2,%mm3
-	pand	%mm2,%mm7
-	paddb	%mm1,%mm1
-	paddb	%mm5,%mm5
-	pxor	%mm3,%mm1
-	pxor	%mm7,%mm5
-	pxor	%mm1,%mm0
-	pxor	%mm5,%mm4
-	movq	%mm1,%mm3
-	movq	%mm5,%mm7
-	pshufw	$177,%mm1,%mm2
-	pshufw	$177,%mm5,%mm6
-	pxor	%mm2,%mm0
-	pxor	%mm6,%mm4
-	pslld	$8,%mm1
-	pslld	$8,%mm5
-	psrld	$8,%mm3
-	psrld	$8,%mm7
-	movq	(%edi),%mm2
-	movq	8(%edi),%mm6
-	pxor	%mm1,%mm0
-	pxor	%mm5,%mm4
-	pxor	%mm3,%mm0
-	pxor	%mm7,%mm4
-	movl	-128(%ebp),%eax
-	pslld	$16,%mm1
-	pslld	$16,%mm5
-	movl	-64(%ebp),%ebx
-	psrld	$16,%mm3
-	psrld	$16,%mm7
-	movl	(%ebp),%ecx
-	pxor	%mm1,%mm0
-	pxor	%mm5,%mm4
-	movl	64(%ebp),%edx
-	pxor	%mm3,%mm0
-	pxor	%mm7,%mm4
-	pxor	%mm2,%mm0
-	pxor	%mm6,%mm4
-	jmp	L007loop
-.align	4,0x90
-L008out:
-	pxor	(%edi),%mm0
-	pxor	8(%edi),%mm4
-	ret
-.align	4
-__x86_AES_decrypt:
-	movl	%edi,20(%esp)
-	xorl	(%edi),%eax
-	xorl	4(%edi),%ebx
-	xorl	8(%edi),%ecx
-	xorl	12(%edi),%edx
-	movl	240(%edi),%esi
-	leal	-2(%esi,%esi,1),%esi
-	leal	(%edi,%esi,8),%esi
-	movl	%esi,24(%esp)
-.align	4,0x90
-L009loop:
-	movl	%eax,%esi
-	andl	$255,%esi
-	movl	(%ebp,%esi,8),%esi
-	movzbl	%dh,%edi
-	xorl	3(%ebp,%edi,8),%esi
-	movl	%ecx,%edi
-	shrl	$16,%edi
-	andl	$255,%edi
-	xorl	2(%ebp,%edi,8),%esi
-	movl	%ebx,%edi
-	shrl	$24,%edi
-	xorl	1(%ebp,%edi,8),%esi
-	movl	%esi,4(%esp)
-	movl	%ebx,%esi
-	andl	$255,%esi
-	movl	(%ebp,%esi,8),%esi
-	movzbl	%ah,%edi
-	xorl	3(%ebp,%edi,8),%esi
-	movl	%edx,%edi
-	shrl	$16,%edi
-	andl	$255,%edi
-	xorl	2(%ebp,%edi,8),%esi
-	movl	%ecx,%edi
-	shrl	$24,%edi
-	xorl	1(%ebp,%edi,8),%esi
-	movl	%esi,8(%esp)
-	movl	%ecx,%esi
-	andl	$255,%esi
-	movl	(%ebp,%esi,8),%esi
-	movzbl	%bh,%edi
-	xorl	3(%ebp,%edi,8),%esi
-	movl	%eax,%edi
-	shrl	$16,%edi
-	andl	$255,%edi
-	xorl	2(%ebp,%edi,8),%esi
-	movl	%edx,%edi
-	shrl	$24,%edi
-	xorl	1(%ebp,%edi,8),%esi
-	movl	20(%esp),%edi
-	andl	$255,%edx
-	movl	(%ebp,%edx,8),%edx
-	movzbl	%ch,%ecx
-	xorl	3(%ebp,%ecx,8),%edx
-	movl	%esi,%ecx
-	shrl	$16,%ebx
-	andl	$255,%ebx
-	xorl	2(%ebp,%ebx,8),%edx
-	movl	8(%esp),%ebx
-	shrl	$24,%eax
-	xorl	1(%ebp,%eax,8),%edx
-	movl	4(%esp),%eax
-	addl	$16,%edi
-	xorl	(%edi),%eax
-	xorl	4(%edi),%ebx
-	xorl	8(%edi),%ecx
-	xorl	12(%edi),%edx
-	cmpl	24(%esp),%edi
-	movl	%edi,20(%esp)
-	jb	L009loop
-	leal	2176(%ebp),%ebp
-	movl	-128(%ebp),%edi
-	movl	-96(%ebp),%esi
-	movl	-64(%ebp),%edi
-	movl	-32(%ebp),%esi
-	movl	(%ebp),%edi
-	movl	32(%ebp),%esi
-	movl	64(%ebp),%edi
-	movl	96(%ebp),%esi
-	leal	-128(%ebp),%ebp
-	movl	%eax,%esi
-	andl	$255,%esi
-	movzbl	(%ebp,%esi,1),%esi
-	movzbl	%dh,%edi
-	movzbl	(%ebp,%edi,1),%edi
-	shll	$8,%edi
-	xorl	%edi,%esi
-	movl	%ecx,%edi
-	shrl	$16,%edi
-	andl	$255,%edi
-	movzbl	(%ebp,%edi,1),%edi
-	shll	$16,%edi
-	xorl	%edi,%esi
-	movl	%ebx,%edi
-	shrl	$24,%edi
-	movzbl	(%ebp,%edi,1),%edi
-	shll	$24,%edi
-	xorl	%edi,%esi
-	movl	%esi,4(%esp)
-	movl	%ebx,%esi
-	andl	$255,%esi
-	movzbl	(%ebp,%esi,1),%esi
-	movzbl	%ah,%edi
-	movzbl	(%ebp,%edi,1),%edi
-	shll	$8,%edi
-	xorl	%edi,%esi
-	movl	%edx,%edi
-	shrl	$16,%edi
-	andl	$255,%edi
-	movzbl	(%ebp,%edi,1),%edi
-	shll	$16,%edi
-	xorl	%edi,%esi
-	movl	%ecx,%edi
-	shrl	$24,%edi
-	movzbl	(%ebp,%edi,1),%edi
-	shll	$24,%edi
-	xorl	%edi,%esi
-	movl	%esi,8(%esp)
-	movl	%ecx,%esi
-	andl	$255,%esi
-	movzbl	(%ebp,%esi,1),%esi
-	movzbl	%bh,%edi
-	movzbl	(%ebp,%edi,1),%edi
-	shll	$8,%edi
-	xorl	%edi,%esi
-	movl	%eax,%edi
-	shrl	$16,%edi
-	andl	$255,%edi
-	movzbl	(%ebp,%edi,1),%edi
-	shll	$16,%edi
-	xorl	%edi,%esi
-	movl	%edx,%edi
-	shrl	$24,%edi
-	movzbl	(%ebp,%edi,1),%edi
-	shll	$24,%edi
-	xorl	%edi,%esi
-	movl	20(%esp),%edi
-	andl	$255,%edx
-	movzbl	(%ebp,%edx,1),%edx
-	movzbl	%ch,%ecx
-	movzbl	(%ebp,%ecx,1),%ecx
-	shll	$8,%ecx
-	xorl	%ecx,%edx
-	movl	%esi,%ecx
-	shrl	$16,%ebx
-	andl	$255,%ebx
-	movzbl	(%ebp,%ebx,1),%ebx
-	shll	$16,%ebx
-	xorl	%ebx,%edx
-	movl	8(%esp),%ebx
-	shrl	$24,%eax
-	movzbl	(%ebp,%eax,1),%eax
-	shll	$24,%eax
-	xorl	%eax,%edx
-	movl	4(%esp),%eax
-	leal	-2048(%ebp),%ebp
-	addl	$16,%edi
-	xorl	(%edi),%eax
-	xorl	4(%edi),%ebx
-	xorl	8(%edi),%ecx
-	xorl	12(%edi),%edx
-	ret
-.align	6,0x90
-LAES_Td:
-.long	1353184337,1353184337
-.long	1399144830,1399144830
-.long	3282310938,3282310938
-.long	2522752826,2522752826
-.long	3412831035,3412831035
-.long	4047871263,4047871263
-.long	2874735276,2874735276
-.long	2466505547,2466505547
-.long	1442459680,1442459680
-.long	4134368941,4134368941
-.long	2440481928,2440481928
-.long	625738485,625738485
-.long	4242007375,4242007375
-.long	3620416197,3620416197
-.long	2151953702,2151953702
-.long	2409849525,2409849525
-.long	1230680542,1230680542
-.long	1729870373,1729870373
-.long	2551114309,2551114309
-.long	3787521629,3787521629
-.long	41234371,41234371
-.long	317738113,317738113
-.long	2744600205,2744600205
-.long	3338261355,3338261355
-.long	3881799427,3881799427
-.long	2510066197,2510066197
-.long	3950669247,3950669247
-.long	3663286933,3663286933
-.long	763608788,763608788
-.long	3542185048,3542185048
-.long	694804553,694804553
-.long	1154009486,1154009486
-.long	1787413109,1787413109
-.long	2021232372,2021232372
-.long	1799248025,1799248025
-.long	3715217703,3715217703
-.long	3058688446,3058688446
-.long	397248752,397248752
-.long	1722556617,1722556617
-.long	3023752829,3023752829
-.long	407560035,407560035
-.long	2184256229,2184256229
-.long	1613975959,1613975959
-.long	1165972322,1165972322
-.long	3765920945,3765920945
-.long	2226023355,2226023355
-.long	480281086,480281086
-.long	2485848313,2485848313
-.long	1483229296,1483229296
-.long	436028815,436028815
-.long	2272059028,2272059028
-.long	3086515026,3086515026
-.long	601060267,601060267
-.long	3791801202,3791801202
-.long	1468997603,1468997603
-.long	715871590,715871590
-.long	120122290,120122290
-.long	63092015,63092015
-.long	2591802758,2591802758
-.long	2768779219,2768779219
-.long	4068943920,4068943920
-.long	2997206819,2997206819
-.long	3127509762,3127509762
-.long	1552029421,1552029421
-.long	723308426,723308426
-.long	2461301159,2461301159
-.long	4042393587,4042393587
-.long	2715969870,2715969870
-.long	3455375973,3455375973
-.long	3586000134,3586000134
-.long	526529745,526529745
-.long	2331944644,2331944644
-.long	2639474228,2639474228
-.long	2689987490,2689987490
-.long	853641733,853641733
-.long	1978398372,1978398372
-.long	971801355,971801355
-.long	2867814464,2867814464
-.long	111112542,111112542
-.long	1360031421,1360031421
-.long	4186579262,4186579262
-.long	1023860118,1023860118
-.long	2919579357,2919579357
-.long	1186850381,1186850381
-.long	3045938321,3045938321
-.long	90031217,90031217
-.long	1876166148,1876166148
-.long	4279586912,4279586912
-.long	620468249,620468249
-.long	2548678102,2548678102
-.long	3426959497,3426959497
-.long	2006899047,2006899047
-.long	3175278768,3175278768
-.long	2290845959,2290845959
-.long	945494503,945494503
-.long	3689859193,3689859193
-.long	1191869601,1191869601
-.long	3910091388,3910091388
-.long	3374220536,3374220536
-.long	0,0
-.long	2206629897,2206629897
-.long	1223502642,1223502642
-.long	2893025566,2893025566
-.long	1316117100,1316117100
-.long	4227796733,4227796733
-.long	1446544655,1446544655
-.long	517320253,517320253
-.long	658058550,658058550
-.long	1691946762,1691946762
-.long	564550760,564550760
-.long	3511966619,3511966619
-.long	976107044,976107044
-.long	2976320012,2976320012
-.long	266819475,266819475
-.long	3533106868,3533106868
-.long	2660342555,2660342555
-.long	1338359936,1338359936
-.long	2720062561,2720062561
-.long	1766553434,1766553434
-.long	370807324,370807324
-.long	179999714,179999714
-.long	3844776128,3844776128
-.long	1138762300,1138762300
-.long	488053522,488053522
-.long	185403662,185403662
-.long	2915535858,2915535858
-.long	3114841645,3114841645
-.long	3366526484,3366526484
-.long	2233069911,2233069911
-.long	1275557295,1275557295
-.long	3151862254,3151862254
-.long	4250959779,4250959779
-.long	2670068215,2670068215
-.long	3170202204,3170202204
-.long	3309004356,3309004356
-.long	880737115,880737115
-.long	1982415755,1982415755
-.long	3703972811,3703972811
-.long	1761406390,1761406390
-.long	1676797112,1676797112
-.long	3403428311,3403428311
-.long	277177154,277177154
-.long	1076008723,1076008723
-.long	538035844,538035844
-.long	2099530373,2099530373
-.long	4164795346,4164795346
-.long	288553390,288553390
-.long	1839278535,1839278535
-.long	1261411869,1261411869
-.long	4080055004,4080055004
-.long	3964831245,3964831245
-.long	3504587127,3504587127
-.long	1813426987,1813426987
-.long	2579067049,2579067049
-.long	4199060497,4199060497
-.long	577038663,577038663
-.long	3297574056,3297574056
-.long	440397984,440397984
-.long	3626794326,3626794326
-.long	4019204898,4019204898
-.long	3343796615,3343796615
-.long	3251714265,3251714265
-.long	4272081548,4272081548
-.long	906744984,906744984
-.long	3481400742,3481400742
-.long	685669029,685669029
-.long	646887386,646887386
-.long	2764025151,2764025151
-.long	3835509292,3835509292
-.long	227702864,227702864
-.long	2613862250,2613862250
-.long	1648787028,1648787028
-.long	3256061430,3256061430
-.long	3904428176,3904428176
-.long	1593260334,1593260334
-.long	4121936770,4121936770
-.long	3196083615,3196083615
-.long	2090061929,2090061929
-.long	2838353263,2838353263
-.long	3004310991,3004310991
-.long	999926984,999926984
-.long	2809993232,2809993232
-.long	1852021992,1852021992
-.long	2075868123,2075868123
-.long	158869197,158869197
-.long	4095236462,4095236462
-.long	28809964,28809964
-.long	2828685187,2828685187
-.long	1701746150,1701746150
-.long	2129067946,2129067946
-.long	147831841,147831841
-.long	3873969647,3873969647
-.long	3650873274,3650873274
-.long	3459673930,3459673930
-.long	3557400554,3557400554
-.long	3598495785,3598495785
-.long	2947720241,2947720241
-.long	824393514,824393514
-.long	815048134,815048134
-.long	3227951669,3227951669
-.long	935087732,935087732
-.long	2798289660,2798289660
-.long	2966458592,2966458592
-.long	366520115,366520115
-.long	1251476721,1251476721
-.long	4158319681,4158319681
-.long	240176511,240176511
-.long	804688151,804688151
-.long	2379631990,2379631990
-.long	1303441219,1303441219
-.long	1414376140,1414376140
-.long	3741619940,3741619940
-.long	3820343710,3820343710
-.long	461924940,461924940
-.long	3089050817,3089050817
-.long	2136040774,2136040774
-.long	82468509,82468509
-.long	1563790337,1563790337
-.long	1937016826,1937016826
-.long	776014843,776014843
-.long	1511876531,1511876531
-.long	1389550482,1389550482
-.long	861278441,861278441
-.long	323475053,323475053
-.long	2355222426,2355222426
-.long	2047648055,2047648055
-.long	2383738969,2383738969
-.long	2302415851,2302415851
-.long	3995576782,3995576782
-.long	902390199,902390199
-.long	3991215329,3991215329
-.long	1018251130,1018251130
-.long	1507840668,1507840668
-.long	1064563285,1064563285
-.long	2043548696,2043548696
-.long	3208103795,3208103795
-.long	3939366739,3939366739
-.long	1537932639,1537932639
-.long	342834655,342834655
-.long	2262516856,2262516856
-.long	2180231114,2180231114
-.long	1053059257,1053059257
-.long	741614648,741614648
-.long	1598071746,1598071746
-.long	1925389590,1925389590
-.long	203809468,203809468
-.long	2336832552,2336832552
-.long	1100287487,1100287487
-.long	1895934009,1895934009
-.long	3736275976,3736275976
-.long	2632234200,2632234200
-.long	2428589668,2428589668
-.long	1636092795,1636092795
-.long	1890988757,1890988757
-.long	1952214088,1952214088
-.long	1113045200,1113045200
-.byte	82,9,106,213,48,54,165,56
-.byte	191,64,163,158,129,243,215,251
-.byte	124,227,57,130,155,47,255,135
-.byte	52,142,67,68,196,222,233,203
-.byte	84,123,148,50,166,194,35,61
-.byte	238,76,149,11,66,250,195,78
-.byte	8,46,161,102,40,217,36,178
-.byte	118,91,162,73,109,139,209,37
-.byte	114,248,246,100,134,104,152,22
-.byte	212,164,92,204,93,101,182,146
-.byte	108,112,72,80,253,237,185,218
-.byte	94,21,70,87,167,141,157,132
-.byte	144,216,171,0,140,188,211,10
-.byte	247,228,88,5,184,179,69,6
-.byte	208,44,30,143,202,63,15,2
-.byte	193,175,189,3,1,19,138,107
-.byte	58,145,17,65,79,103,220,234
-.byte	151,242,207,206,240,180,230,115
-.byte	150,172,116,34,231,173,53,133
-.byte	226,249,55,232,28,117,223,110
-.byte	71,241,26,113,29,41,197,137
-.byte	111,183,98,14,170,24,190,27
-.byte	252,86,62,75,198,210,121,32
-.byte	154,219,192,254,120,205,90,244
-.byte	31,221,168,51,136,7,199,49
-.byte	177,18,16,89,39,128,236,95
-.byte	96,81,127,169,25,181,74,13
-.byte	45,229,122,159,147,201,156,239
-.byte	160,224,59,77,174,42,245,176
-.byte	200,235,187,60,131,83,153,97
-.byte	23,43,4,126,186,119,214,38
-.byte	225,105,20,99,85,33,12,125
-.byte	82,9,106,213,48,54,165,56
-.byte	191,64,163,158,129,243,215,251
-.byte	124,227,57,130,155,47,255,135
-.byte	52,142,67,68,196,222,233,203
-.byte	84,123,148,50,166,194,35,61
-.byte	238,76,149,11,66,250,195,78
-.byte	8,46,161,102,40,217,36,178
-.byte	118,91,162,73,109,139,209,37
-.byte	114,248,246,100,134,104,152,22
-.byte	212,164,92,204,93,101,182,146
-.byte	108,112,72,80,253,237,185,218
-.byte	94,21,70,87,167,141,157,132
-.byte	144,216,171,0,140,188,211,10
-.byte	247,228,88,5,184,179,69,6
-.byte	208,44,30,143,202,63,15,2
-.byte	193,175,189,3,1,19,138,107
-.byte	58,145,17,65,79,103,220,234
-.byte	151,242,207,206,240,180,230,115
-.byte	150,172,116,34,231,173,53,133
-.byte	226,249,55,232,28,117,223,110
-.byte	71,241,26,113,29,41,197,137
-.byte	111,183,98,14,170,24,190,27
-.byte	252,86,62,75,198,210,121,32
-.byte	154,219,192,254,120,205,90,244
-.byte	31,221,168,51,136,7,199,49
-.byte	177,18,16,89,39,128,236,95
-.byte	96,81,127,169,25,181,74,13
-.byte	45,229,122,159,147,201,156,239
-.byte	160,224,59,77,174,42,245,176
-.byte	200,235,187,60,131,83,153,97
-.byte	23,43,4,126,186,119,214,38
-.byte	225,105,20,99,85,33,12,125
-.byte	82,9,106,213,48,54,165,56
-.byte	191,64,163,158,129,243,215,251
-.byte	124,227,57,130,155,47,255,135
-.byte	52,142,67,68,196,222,233,203
-.byte	84,123,148,50,166,194,35,61
-.byte	238,76,149,11,66,250,195,78
-.byte	8,46,161,102,40,217,36,178
-.byte	118,91,162,73,109,139,209,37
-.byte	114,248,246,100,134,104,152,22
-.byte	212,164,92,204,93,101,182,146
-.byte	108,112,72,80,253,237,185,218
-.byte	94,21,70,87,167,141,157,132
-.byte	144,216,171,0,140,188,211,10
-.byte	247,228,88,5,184,179,69,6
-.byte	208,44,30,143,202,63,15,2
-.byte	193,175,189,3,1,19,138,107
-.byte	58,145,17,65,79,103,220,234
-.byte	151,242,207,206,240,180,230,115
-.byte	150,172,116,34,231,173,53,133
-.byte	226,249,55,232,28,117,223,110
-.byte	71,241,26,113,29,41,197,137
-.byte	111,183,98,14,170,24,190,27
-.byte	252,86,62,75,198,210,121,32
-.byte	154,219,192,254,120,205,90,244
-.byte	31,221,168,51,136,7,199,49
-.byte	177,18,16,89,39,128,236,95
-.byte	96,81,127,169,25,181,74,13
-.byte	45,229,122,159,147,201,156,239
-.byte	160,224,59,77,174,42,245,176
-.byte	200,235,187,60,131,83,153,97
-.byte	23,43,4,126,186,119,214,38
-.byte	225,105,20,99,85,33,12,125
-.byte	82,9,106,213,48,54,165,56
-.byte	191,64,163,158,129,243,215,251
-.byte	124,227,57,130,155,47,255,135
-.byte	52,142,67,68,196,222,233,203
-.byte	84,123,148,50,166,194,35,61
-.byte	238,76,149,11,66,250,195,78
-.byte	8,46,161,102,40,217,36,178
-.byte	118,91,162,73,109,139,209,37
-.byte	114,248,246,100,134,104,152,22
-.byte	212,164,92,204,93,101,182,146
-.byte	108,112,72,80,253,237,185,218
-.byte	94,21,70,87,167,141,157,132
-.byte	144,216,171,0,140,188,211,10
-.byte	247,228,88,5,184,179,69,6
-.byte	208,44,30,143,202,63,15,2
-.byte	193,175,189,3,1,19,138,107
-.byte	58,145,17,65,79,103,220,234
-.byte	151,242,207,206,240,180,230,115
-.byte	150,172,116,34,231,173,53,133
-.byte	226,249,55,232,28,117,223,110
-.byte	71,241,26,113,29,41,197,137
-.byte	111,183,98,14,170,24,190,27
-.byte	252,86,62,75,198,210,121,32
-.byte	154,219,192,254,120,205,90,244
-.byte	31,221,168,51,136,7,199,49
-.byte	177,18,16,89,39,128,236,95
-.byte	96,81,127,169,25,181,74,13
-.byte	45,229,122,159,147,201,156,239
-.byte	160,224,59,77,174,42,245,176
-.byte	200,235,187,60,131,83,153,97
-.byte	23,43,4,126,186,119,214,38
-.byte	225,105,20,99,85,33,12,125
-.globl	_AES_decrypt
-.align	4
-_AES_decrypt:
-L_AES_decrypt_begin:
-	pushl	%ebp
-	pushl	%ebx
-	pushl	%esi
-	pushl	%edi
-	movl	20(%esp),%esi
-	movl	28(%esp),%edi
-	movl	%esp,%eax
-	subl	$36,%esp
-	andl	$-64,%esp
-	leal	-127(%edi),%ebx
-	subl	%esp,%ebx
-	negl	%ebx
-	andl	$960,%ebx
-	subl	%ebx,%esp
-	addl	$4,%esp
-	movl	%eax,28(%esp)
-	call	L010pic_point
-L010pic_point:
-	popl	%ebp
-	movl	L_OPENSSL_ia32cap_P$non_lazy_ptr-L010pic_point(%ebp),%eax
-	leal	LAES_Td-L010pic_point(%ebp),%ebp
-	leal	764(%esp),%ebx
-	subl	%ebp,%ebx
-	andl	$768,%ebx
-	leal	2176(%ebp,%ebx,1),%ebp
-	btl	$25,(%eax)
-	jnc	L011x86
-	movq	(%esi),%mm0
-	movq	8(%esi),%mm4
-	call	__sse_AES_decrypt_compact
-	movl	28(%esp),%esp
-	movl	24(%esp),%esi
-	movq	%mm0,(%esi)
-	movq	%mm4,8(%esi)
-	emms
-	popl	%edi
-	popl	%esi
-	popl	%ebx
-	popl	%ebp
-	ret
-.align	4,0x90
-L011x86:
-	movl	%ebp,24(%esp)
-	movl	(%esi),%eax
-	movl	4(%esi),%ebx
-	movl	8(%esi),%ecx
-	movl	12(%esi),%edx
-	call	__x86_AES_decrypt_compact
-	movl	28(%esp),%esp
-	movl	24(%esp),%esi
-	movl	%eax,(%esi)
-	movl	%ebx,4(%esi)
-	movl	%ecx,8(%esi)
-	movl	%edx,12(%esi)
-	popl	%edi
-	popl	%esi
-	popl	%ebx
-	popl	%ebp
-	ret
-.globl	_AES_cbc_encrypt
-.align	4
-_AES_cbc_encrypt:
-L_AES_cbc_encrypt_begin:
-	pushl	%ebp
-	pushl	%ebx
-	pushl	%esi
-	pushl	%edi
-	movl	28(%esp),%ecx
-	cmpl	$0,%ecx
-	je	L012drop_out
-	call	L013pic_point
-L013pic_point:
-	popl	%ebp
-	movl	L_OPENSSL_ia32cap_P$non_lazy_ptr-L013pic_point(%ebp),%eax
-	cmpl	$0,40(%esp)
-	leal	LAES_Te-L013pic_point(%ebp),%ebp
-	jne	L014picked_te
-	leal	LAES_Td-LAES_Te(%ebp),%ebp
-L014picked_te:
-	pushfl
-	cld
-	cmpl	$512,%ecx
-	jb	L015slow_way
-	testl	$15,%ecx
-	jnz	L015slow_way
-	btl	$28,(%eax)
-	jc	L015slow_way
-	leal	-324(%esp),%esi
-	andl	$-64,%esi
-	movl	%ebp,%eax
-	leal	2304(%ebp),%ebx
-	movl	%esi,%edx
-	andl	$4095,%eax
-	andl	$4095,%ebx
-	andl	$4095,%edx
-	cmpl	%ebx,%edx
-	jb	L016tbl_break_out
-	subl	%ebx,%edx
-	subl	%edx,%esi
-	jmp	L017tbl_ok
-.align	2,0x90
-L016tbl_break_out:
-	subl	%eax,%edx
-	andl	$4095,%edx
-	addl	$384,%edx
-	subl	%edx,%esi
-.align	2,0x90
-L017tbl_ok:
-	leal	24(%esp),%edx
-	xchgl	%esi,%esp
-	addl	$4,%esp
-	movl	%ebp,24(%esp)
-	movl	%esi,28(%esp)
-	movl	(%edx),%eax
-	movl	4(%edx),%ebx
-	movl	12(%edx),%edi
-	movl	16(%edx),%esi
-	movl	20(%edx),%edx
-	movl	%eax,32(%esp)
-	movl	%ebx,36(%esp)
-	movl	%ecx,40(%esp)
-	movl	%edi,44(%esp)
-	movl	%esi,48(%esp)
-	movl	$0,316(%esp)
-	movl	%edi,%ebx
-	movl	$61,%ecx
-	subl	%ebp,%ebx
-	movl	%edi,%esi
-	andl	$4095,%ebx
-	leal	76(%esp),%edi
-	cmpl	$2304,%ebx
-	jb	L018do_copy
-	cmpl	$3852,%ebx
-	jb	L019skip_copy
-.align	2,0x90
-L018do_copy:
-	movl	%edi,44(%esp)
-.long	2784229001
-L019skip_copy:
-	movl	$16,%edi
-.align	2,0x90
-L020prefetch_tbl:
-	movl	(%ebp),%eax
-	movl	32(%ebp),%ebx
-	movl	64(%ebp),%ecx
-	movl	96(%ebp),%esi
-	leal	128(%ebp),%ebp
-	subl	$1,%edi
-	jnz	L020prefetch_tbl
-	subl	$2048,%ebp
-	movl	32(%esp),%esi
-	movl	48(%esp),%edi
-	cmpl	$0,%edx
-	je	L021fast_decrypt
-	movl	(%edi),%eax
-	movl	4(%edi),%ebx
-.align	4,0x90
-L022fast_enc_loop:
-	movl	8(%edi),%ecx
-	movl	12(%edi),%edx
-	xorl	(%esi),%eax
-	xorl	4(%esi),%ebx
-	xorl	8(%esi),%ecx
-	xorl	12(%esi),%edx
-	movl	44(%esp),%edi
-	call	__x86_AES_encrypt
-	movl	32(%esp),%esi
-	movl	36(%esp),%edi
-	movl	%eax,(%edi)
-	movl	%ebx,4(%edi)
-	movl	%ecx,8(%edi)
-	movl	%edx,12(%edi)
-	leal	16(%esi),%esi
-	movl	40(%esp),%ecx
-	movl	%esi,32(%esp)
-	leal	16(%edi),%edx
-	movl	%edx,36(%esp)
-	subl	$16,%ecx
-	movl	%ecx,40(%esp)
-	jnz	L022fast_enc_loop
-	movl	48(%esp),%esi
-	movl	8(%edi),%ecx
-	movl	12(%edi),%edx
-	movl	%eax,(%esi)
-	movl	%ebx,4(%esi)
-	movl	%ecx,8(%esi)
-	movl	%edx,12(%esi)
-	cmpl	$0,316(%esp)
-	movl	44(%esp),%edi
-	je	L023skip_ezero
-	movl	$60,%ecx
-	xorl	%eax,%eax
-.align	2,0x90
-.long	2884892297
-L023skip_ezero:
-	movl	28(%esp),%esp
-	popfl
-L012drop_out:
-	popl	%edi
-	popl	%esi
-	popl	%ebx
-	popl	%ebp
-	ret
-	pushfl
-.align	4,0x90
-L021fast_decrypt:
-	cmpl	36(%esp),%esi
-	je	L024fast_dec_in_place
-	movl	%edi,52(%esp)
-.align	2,0x90
-.align	4,0x90
-L025fast_dec_loop:
-	movl	(%esi),%eax
-	movl	4(%esi),%ebx
-	movl	8(%esi),%ecx
-	movl	12(%esi),%edx
-	movl	44(%esp),%edi
-	call	__x86_AES_decrypt
-	movl	52(%esp),%edi
-	movl	40(%esp),%esi
-	xorl	(%edi),%eax
-	xorl	4(%edi),%ebx
-	xorl	8(%edi),%ecx
-	xorl	12(%edi),%edx
-	movl	36(%esp),%edi
-	movl	32(%esp),%esi
-	movl	%eax,(%edi)
-	movl	%ebx,4(%edi)
-	movl	%ecx,8(%edi)
-	movl	%edx,12(%edi)
-	movl	40(%esp),%ecx
-	movl	%esi,52(%esp)
-	leal	16(%esi),%esi
-	movl	%esi,32(%esp)
-	leal	16(%edi),%edi
-	movl	%edi,36(%esp)
-	subl	$16,%ecx
-	movl	%ecx,40(%esp)
-	jnz	L025fast_dec_loop
-	movl	52(%esp),%edi
-	movl	48(%esp),%esi
-	movl	(%edi),%eax
-	movl	4(%edi),%ebx
-	movl	8(%edi),%ecx
-	movl	12(%edi),%edx
-	movl	%eax,(%esi)
-	movl	%ebx,4(%esi)
-	movl	%ecx,8(%esi)
-	movl	%edx,12(%esi)
-	jmp	L026fast_dec_out
-.align	4,0x90
-L024fast_dec_in_place:
-L027fast_dec_in_place_loop:
-	movl	(%esi),%eax
-	movl	4(%esi),%ebx
-	movl	8(%esi),%ecx
-	movl	12(%esi),%edx
-	leal	60(%esp),%edi
-	movl	%eax,(%edi)
-	movl	%ebx,4(%edi)
-	movl	%ecx,8(%edi)
-	movl	%edx,12(%edi)
-	movl	44(%esp),%edi
-	call	__x86_AES_decrypt
-	movl	48(%esp),%edi
-	movl	36(%esp),%esi
-	xorl	(%edi),%eax
-	xorl	4(%edi),%ebx
-	xorl	8(%edi),%ecx
-	xorl	12(%edi),%edx
-	movl	%eax,(%esi)
-	movl	%ebx,4(%esi)
-	movl	%ecx,8(%esi)
-	movl	%edx,12(%esi)
-	leal	16(%esi),%esi
-	movl	%esi,36(%esp)
-	leal	60(%esp),%esi
-	movl	(%esi),%eax
-	movl	4(%esi),%ebx
-	movl	8(%esi),%ecx
-	movl	12(%esi),%edx
-	movl	%eax,(%edi)
-	movl	%ebx,4(%edi)
-	movl	%ecx,8(%edi)
-	movl	%edx,12(%edi)
-	movl	32(%esp),%esi
-	movl	40(%esp),%ecx
-	leal	16(%esi),%esi
-	movl	%esi,32(%esp)
-	subl	$16,%ecx
-	movl	%ecx,40(%esp)
-	jnz	L027fast_dec_in_place_loop
-.align	2,0x90
-L026fast_dec_out:
-	cmpl	$0,316(%esp)
-	movl	44(%esp),%edi
-	je	L028skip_dzero
-	movl	$60,%ecx
-	xorl	%eax,%eax
-.align	2,0x90
-.long	2884892297
-L028skip_dzero:
-	movl	28(%esp),%esp
-	popfl
-	popl	%edi
-	popl	%esi
-	popl	%ebx
-	popl	%ebp
-	ret
-	pushfl
-.align	4,0x90
-L015slow_way:
-	movl	(%eax),%eax
-	movl	36(%esp),%edi
-	leal	-80(%esp),%esi
-	andl	$-64,%esi
-	leal	-143(%edi),%ebx
-	subl	%esi,%ebx
-	negl	%ebx
-	andl	$960,%ebx
-	subl	%ebx,%esi
-	leal	768(%esi),%ebx
-	subl	%ebp,%ebx
-	andl	$768,%ebx
-	leal	2176(%ebp,%ebx,1),%ebp
-	leal	24(%esp),%edx
-	xchgl	%esi,%esp
-	addl	$4,%esp
-	movl	%ebp,24(%esp)
-	movl	%esi,28(%esp)
-	movl	%eax,52(%esp)
-	movl	(%edx),%eax
-	movl	4(%edx),%ebx
-	movl	16(%edx),%esi
-	movl	20(%edx),%edx
-	movl	%eax,32(%esp)
-	movl	%ebx,36(%esp)
-	movl	%ecx,40(%esp)
-	movl	%edi,44(%esp)
-	movl	%esi,48(%esp)
-	movl	%esi,%edi
-	movl	%eax,%esi
-	cmpl	$0,%edx
-	je	L029slow_decrypt
-	cmpl	$16,%ecx
-	movl	%ebx,%edx
-	jb	L030slow_enc_tail
-	btl	$25,52(%esp)
-	jnc	L031slow_enc_x86
-	movq	(%edi),%mm0
-	movq	8(%edi),%mm4
-.align	4,0x90
-L032slow_enc_loop_sse:
-	pxor	(%esi),%mm0
-	pxor	8(%esi),%mm4
-	movl	44(%esp),%edi
-	call	__sse_AES_encrypt_compact
-	movl	32(%esp),%esi
-	movl	36(%esp),%edi
-	movl	40(%esp),%ecx
-	movq	%mm0,(%edi)
-	movq	%mm4,8(%edi)
-	leal	16(%esi),%esi
-	movl	%esi,32(%esp)
-	leal	16(%edi),%edx
-	movl	%edx,36(%esp)
-	subl	$16,%ecx
-	cmpl	$16,%ecx
-	movl	%ecx,40(%esp)
-	jae	L032slow_enc_loop_sse
-	testl	$15,%ecx
-	jnz	L030slow_enc_tail
-	movl	48(%esp),%esi
-	movq	%mm0,(%esi)
-	movq	%mm4,8(%esi)
-	emms
-	movl	28(%esp),%esp
-	popfl
-	popl	%edi
-	popl	%esi
-	popl	%ebx
-	popl	%ebp
-	ret
-	pushfl
-.align	4,0x90
-L031slow_enc_x86:
-	movl	(%edi),%eax
-	movl	4(%edi),%ebx
-.align	2,0x90
-L033slow_enc_loop_x86:
-	movl	8(%edi),%ecx
-	movl	12(%edi),%edx
-	xorl	(%esi),%eax
-	xorl	4(%esi),%ebx
-	xorl	8(%esi),%ecx
-	xorl	12(%esi),%edx
-	movl	44(%esp),%edi
-	call	__x86_AES_encrypt_compact
-	movl	32(%esp),%esi
-	movl	36(%esp),%edi
-	movl	%eax,(%edi)
-	movl	%ebx,4(%edi)
-	movl	%ecx,8(%edi)
-	movl	%edx,12(%edi)
-	movl	40(%esp),%ecx
-	leal	16(%esi),%esi
-	movl	%esi,32(%esp)
-	leal	16(%edi),%edx
-	movl	%edx,36(%esp)
-	subl	$16,%ecx
-	cmpl	$16,%ecx
-	movl	%ecx,40(%esp)
-	jae	L033slow_enc_loop_x86
-	testl	$15,%ecx
-	jnz	L030slow_enc_tail
-	movl	48(%esp),%esi
-	movl	8(%edi),%ecx
-	movl	12(%edi),%edx
-	movl	%eax,(%esi)
-	movl	%ebx,4(%esi)
-	movl	%ecx,8(%esi)
-	movl	%edx,12(%esi)
-	movl	28(%esp),%esp
-	popfl
-	popl	%edi
-	popl	%esi
-	popl	%ebx
-	popl	%ebp
-	ret
-	pushfl
-.align	4,0x90
-L030slow_enc_tail:
-	emms
-	movl	%edx,%edi
-	movl	$16,%ebx
-	subl	%ecx,%ebx
-	cmpl	%esi,%edi
-	je	L034enc_in_place
-.align	2,0x90
-.long	2767451785
-	jmp	L035enc_skip_in_place
-L034enc_in_place:
-	leal	(%edi,%ecx,1),%edi
-L035enc_skip_in_place:
-	movl	%ebx,%ecx
-	xorl	%eax,%eax
-.align	2,0x90
-.long	2868115081
-	movl	48(%esp),%edi
-	movl	%edx,%esi
-	movl	(%edi),%eax
-	movl	4(%edi),%ebx
-	movl	$16,40(%esp)
-	jmp	L033slow_enc_loop_x86
-.align	4,0x90
-L029slow_decrypt:
-	btl	$25,52(%esp)
-	jnc	L036slow_dec_loop_x86
-.align	2,0x90
-L037slow_dec_loop_sse:
-	movq	(%esi),%mm0
-	movq	8(%esi),%mm4
-	movl	44(%esp),%edi
-	call	__sse_AES_decrypt_compact
-	movl	32(%esp),%esi
-	leal	60(%esp),%eax
-	movl	36(%esp),%ebx
-	movl	40(%esp),%ecx
-	movl	48(%esp),%edi
-	movq	(%esi),%mm1
-	movq	8(%esi),%mm5
-	pxor	(%edi),%mm0
-	pxor	8(%edi),%mm4
-	movq	%mm1,(%edi)
-	movq	%mm5,8(%edi)
-	subl	$16,%ecx
-	jc	L038slow_dec_partial_sse
-	movq	%mm0,(%ebx)
-	movq	%mm4,8(%ebx)
-	leal	16(%ebx),%ebx
-	movl	%ebx,36(%esp)
-	leal	16(%esi),%esi
-	movl	%esi,32(%esp)
-	movl	%ecx,40(%esp)
-	jnz	L037slow_dec_loop_sse
-	emms
-	movl	28(%esp),%esp
-	popfl
-	popl	%edi
-	popl	%esi
-	popl	%ebx
-	popl	%ebp
-	ret
-	pushfl
-.align	4,0x90
-L038slow_dec_partial_sse:
-	movq	%mm0,(%eax)
-	movq	%mm4,8(%eax)
-	emms
-	addl	$16,%ecx
-	movl	%ebx,%edi
-	movl	%eax,%esi
-.align	2,0x90
-.long	2767451785
-	movl	28(%esp),%esp
-	popfl
-	popl	%edi
-	popl	%esi
-	popl	%ebx
-	popl	%ebp
-	ret
-	pushfl
-.align	4,0x90
-L036slow_dec_loop_x86:
-	movl	(%esi),%eax
-	movl	4(%esi),%ebx
-	movl	8(%esi),%ecx
-	movl	12(%esi),%edx
-	leal	60(%esp),%edi
-	movl	%eax,(%edi)
-	movl	%ebx,4(%edi)
-	movl	%ecx,8(%edi)
-	movl	%edx,12(%edi)
-	movl	44(%esp),%edi
-	call	__x86_AES_decrypt_compact
-	movl	48(%esp),%edi
-	movl	40(%esp),%esi
-	xorl	(%edi),%eax
-	xorl	4(%edi),%ebx
-	xorl	8(%edi),%ecx
-	xorl	12(%edi),%edx
-	subl	$16,%esi
-	jc	L039slow_dec_partial_x86
-	movl	%esi,40(%esp)
-	movl	36(%esp),%esi
-	movl	%eax,(%esi)
-	movl	%ebx,4(%esi)
-	movl	%ecx,8(%esi)
-	movl	%edx,12(%esi)
-	leal	16(%esi),%esi
-	movl	%esi,36(%esp)
-	leal	60(%esp),%esi
-	movl	(%esi),%eax
-	movl	4(%esi),%ebx
-	movl	8(%esi),%ecx
-	movl	12(%esi),%edx
-	movl	%eax,(%edi)
-	movl	%ebx,4(%edi)
-	movl	%ecx,8(%edi)
-	movl	%edx,12(%edi)
-	movl	32(%esp),%esi
-	leal	16(%esi),%esi
-	movl	%esi,32(%esp)
-	jnz	L036slow_dec_loop_x86
-	movl	28(%esp),%esp
-	popfl
-	popl	%edi
-	popl	%esi
-	popl	%ebx
-	popl	%ebp
-	ret
-	pushfl
-.align	4,0x90
-L039slow_dec_partial_x86:
-	leal	60(%esp),%esi
-	movl	%eax,(%esi)
-	movl	%ebx,4(%esi)
-	movl	%ecx,8(%esi)
-	movl	%edx,12(%esi)
-	movl	32(%esp),%esi
-	movl	(%esi),%eax
-	movl	4(%esi),%ebx
-	movl	8(%esi),%ecx
-	movl	12(%esi),%edx
-	movl	%eax,(%edi)
-	movl	%ebx,4(%edi)
-	movl	%ecx,8(%edi)
-	movl	%edx,12(%edi)
-	movl	40(%esp),%ecx
-	movl	36(%esp),%edi
-	leal	60(%esp),%esi
-.align	2,0x90
-.long	2767451785
-	movl	28(%esp),%esp
-	popfl
-	popl	%edi
-	popl	%esi
-	popl	%ebx
-	popl	%ebp
-	ret
-.align	4
-__x86_AES_set_encrypt_key:
-	pushl	%ebp
-	pushl	%ebx
-	pushl	%esi
-	pushl	%edi
-	movl	24(%esp),%esi
-	movl	32(%esp),%edi
-	testl	$-1,%esi
-	jz	L040badpointer
-	testl	$-1,%edi
-	jz	L040badpointer
-	call	L041pic_point
-L041pic_point:
-	popl	%ebp
-	leal	LAES_Te-L041pic_point(%ebp),%ebp
-	leal	2176(%ebp),%ebp
-	movl	-128(%ebp),%eax
-	movl	-96(%ebp),%ebx
-	movl	-64(%ebp),%ecx
-	movl	-32(%ebp),%edx
-	movl	(%ebp),%eax
-	movl	32(%ebp),%ebx
-	movl	64(%ebp),%ecx
-	movl	96(%ebp),%edx
-	movl	28(%esp),%ecx
-	cmpl	$128,%ecx
-	je	L04210rounds
-	cmpl	$192,%ecx
-	je	L04312rounds
-	cmpl	$256,%ecx
-	je	L04414rounds
-	movl	$-2,%eax
-	jmp	L045exit
-L04210rounds:
-	movl	(%esi),%eax
-	movl	4(%esi),%ebx
-	movl	8(%esi),%ecx
-	movl	12(%esi),%edx
-	movl	%eax,(%edi)
-	movl	%ebx,4(%edi)
-	movl	%ecx,8(%edi)
-	movl	%edx,12(%edi)
-	xorl	%ecx,%ecx
-	jmp	L04610shortcut
-.align	2,0x90
-L04710loop:
-	movl	(%edi),%eax
-	movl	12(%edi),%edx
-L04610shortcut:
-	movzbl	%dl,%esi
-	movzbl	-128(%ebp,%esi,1),%ebx
-	movzbl	%dh,%esi
-	shll	$24,%ebx
-	xorl	%ebx,%eax
-	movzbl	-128(%ebp,%esi,1),%ebx
-	shrl	$16,%edx
-	movzbl	%dl,%esi
-	xorl	%ebx,%eax
-	movzbl	-128(%ebp,%esi,1),%ebx
-	movzbl	%dh,%esi
-	shll	$8,%ebx
-	xorl	%ebx,%eax
-	movzbl	-128(%ebp,%esi,1),%ebx
-	shll	$16,%ebx
-	xorl	%ebx,%eax
-	xorl	896(%ebp,%ecx,4),%eax
-	movl	%eax,16(%edi)
-	xorl	4(%edi),%eax
-	movl	%eax,20(%edi)
-	xorl	8(%edi),%eax
-	movl	%eax,24(%edi)
-	xorl	12(%edi),%eax
-	movl	%eax,28(%edi)
-	incl	%ecx
-	addl	$16,%edi
-	cmpl	$10,%ecx
-	jl	L04710loop
-	movl	$10,80(%edi)
-	xorl	%eax,%eax
-	jmp	L045exit
-L04312rounds:
-	movl	(%esi),%eax
-	movl	4(%esi),%ebx
-	movl	8(%esi),%ecx
-	movl	12(%esi),%edx
-	movl	%eax,(%edi)
-	movl	%ebx,4(%edi)
-	movl	%ecx,8(%edi)
-	movl	%edx,12(%edi)
-	movl	16(%esi),%ecx
-	movl	20(%esi),%edx
-	movl	%ecx,16(%edi)
-	movl	%edx,20(%edi)
-	xorl	%ecx,%ecx
-	jmp	L04812shortcut
-.align	2,0x90
-L04912loop:
-	movl	(%edi),%eax
-	movl	20(%edi),%edx
-L04812shortcut:
-	movzbl	%dl,%esi
-	movzbl	-128(%ebp,%esi,1),%ebx
-	movzbl	%dh,%esi
-	shll	$24,%ebx
-	xorl	%ebx,%eax
-	movzbl	-128(%ebp,%esi,1),%ebx
-	shrl	$16,%edx
-	movzbl	%dl,%esi
-	xorl	%ebx,%eax
-	movzbl	-128(%ebp,%esi,1),%ebx
-	movzbl	%dh,%esi
-	shll	$8,%ebx
-	xorl	%ebx,%eax
-	movzbl	-128(%ebp,%esi,1),%ebx
-	shll	$16,%ebx
-	xorl	%ebx,%eax
-	xorl	896(%ebp,%ecx,4),%eax
-	movl	%eax,24(%edi)
-	xorl	4(%edi),%eax
-	movl	%eax,28(%edi)
-	xorl	8(%edi),%eax
-	movl	%eax,32(%edi)
-	xorl	12(%edi),%eax
-	movl	%eax,36(%edi)
-	cmpl	$7,%ecx
-	je	L05012break
-	incl	%ecx
-	xorl	16(%edi),%eax
-	movl	%eax,40(%edi)
-	xorl	20(%edi),%eax
-	movl	%eax,44(%edi)
-	addl	$24,%edi
-	jmp	L04912loop
-L05012break:
-	movl	$12,72(%edi)
-	xorl	%eax,%eax
-	jmp	L045exit
-L04414rounds:
-	movl	(%esi),%eax
-	movl	4(%esi),%ebx
-	movl	8(%esi),%ecx
-	movl	12(%esi),%edx
-	movl	%eax,(%edi)
-	movl	%ebx,4(%edi)
-	movl	%ecx,8(%edi)
-	movl	%edx,12(%edi)
-	movl	16(%esi),%eax
-	movl	20(%esi),%ebx
-	movl	24(%esi),%ecx
-	movl	28(%esi),%edx
-	movl	%eax,16(%edi)
-	movl	%ebx,20(%edi)
-	movl	%ecx,24(%edi)
-	movl	%edx,28(%edi)
-	xorl	%ecx,%ecx
-	jmp	L05114shortcut
-.align	2,0x90
-L05214loop:
-	movl	28(%edi),%edx
-L05114shortcut:
-	movl	(%edi),%eax
-	movzbl	%dl,%esi
-	movzbl	-128(%ebp,%esi,1),%ebx
-	movzbl	%dh,%esi
-	shll	$24,%ebx
-	xorl	%ebx,%eax
-	movzbl	-128(%ebp,%esi,1),%ebx
-	shrl	$16,%edx
-	movzbl	%dl,%esi
-	xorl	%ebx,%eax
-	movzbl	-128(%ebp,%esi,1),%ebx
-	movzbl	%dh,%esi
-	shll	$8,%ebx
-	xorl	%ebx,%eax
-	movzbl	-128(%ebp,%esi,1),%ebx
-	shll	$16,%ebx
-	xorl	%ebx,%eax
-	xorl	896(%ebp,%ecx,4),%eax
-	movl	%eax,32(%edi)
-	xorl	4(%edi),%eax
-	movl	%eax,36(%edi)
-	xorl	8(%edi),%eax
-	movl	%eax,40(%edi)
-	xorl	12(%edi),%eax
-	movl	%eax,44(%edi)
-	cmpl	$6,%ecx
-	je	L05314break
-	incl	%ecx
-	movl	%eax,%edx
-	movl	16(%edi),%eax
-	movzbl	%dl,%esi
-	movzbl	-128(%ebp,%esi,1),%ebx
-	movzbl	%dh,%esi
-	xorl	%ebx,%eax
-	movzbl	-128(%ebp,%esi,1),%ebx
-	shrl	$16,%edx
-	shll	$8,%ebx
-	movzbl	%dl,%esi
-	xorl	%ebx,%eax
-	movzbl	-128(%ebp,%esi,1),%ebx
-	movzbl	%dh,%esi
-	shll	$16,%ebx
-	xorl	%ebx,%eax
-	movzbl	-128(%ebp,%esi,1),%ebx
-	shll	$24,%ebx
-	xorl	%ebx,%eax
-	movl	%eax,48(%edi)
-	xorl	20(%edi),%eax
-	movl	%eax,52(%edi)
-	xorl	24(%edi),%eax
-	movl	%eax,56(%edi)
-	xorl	28(%edi),%eax
-	movl	%eax,60(%edi)
-	addl	$32,%edi
-	jmp	L05214loop
-L05314break:
-	movl	$14,48(%edi)
-	xorl	%eax,%eax
-	jmp	L045exit
-L040badpointer:
-	movl	$-1,%eax
-L045exit:
-	popl	%edi
-	popl	%esi
-	popl	%ebx
-	popl	%ebp
-	ret
-.globl	_AES_set_encrypt_key
-.align	4
-_AES_set_encrypt_key:
-L_AES_set_encrypt_key_begin:
-	call	__x86_AES_set_encrypt_key
-	ret
-.globl	_AES_set_decrypt_key
-.align	4
-_AES_set_decrypt_key:
-L_AES_set_decrypt_key_begin:
-	call	__x86_AES_set_encrypt_key
-	cmpl	$0,%eax
-	je	L054proceed
-	ret
-L054proceed:
-	pushl	%ebp
-	pushl	%ebx
-	pushl	%esi
-	pushl	%edi
-	movl	28(%esp),%esi
-	movl	240(%esi),%ecx
-	leal	(,%ecx,4),%ecx
-	leal	(%esi,%ecx,4),%edi
-.align	2,0x90
-L055invert:
-	movl	(%esi),%eax
-	movl	4(%esi),%ebx
-	movl	(%edi),%ecx
-	movl	4(%edi),%edx
-	movl	%eax,(%edi)
-	movl	%ebx,4(%edi)
-	movl	%ecx,(%esi)
-	movl	%edx,4(%esi)
-	movl	8(%esi),%eax
-	movl	12(%esi),%ebx
-	movl	8(%edi),%ecx
-	movl	12(%edi),%edx
-	movl	%eax,8(%edi)
-	movl	%ebx,12(%edi)
-	movl	%ecx,8(%esi)
-	movl	%edx,12(%esi)
-	addl	$16,%esi
-	subl	$16,%edi
-	cmpl	%edi,%esi
-	jne	L055invert
-	movl	28(%esp),%edi
-	movl	240(%edi),%esi
-	leal	-2(%esi,%esi,1),%esi
-	leal	(%edi,%esi,8),%esi
-	movl	%esi,28(%esp)
-	movl	16(%edi),%eax
-.align	2,0x90
-L056permute:
-	addl	$16,%edi
-	movl	$2155905152,%ebp
-	andl	%eax,%ebp
-	leal	(%eax,%eax,1),%ebx
-	movl	%ebp,%esi
-	shrl	$7,%ebp
-	subl	%ebp,%esi
-	andl	$4278124286,%ebx
-	andl	$454761243,%esi
-	xorl	%esi,%ebx
-	movl	$2155905152,%ebp
-	andl	%ebx,%ebp
-	leal	(%ebx,%ebx,1),%ecx
-	movl	%ebp,%esi
-	shrl	$7,%ebp
-	subl	%ebp,%esi
-	andl	$4278124286,%ecx
-	andl	$454761243,%esi
-	xorl	%eax,%ebx
-	xorl	%esi,%ecx
-	movl	$2155905152,%ebp
-	andl	%ecx,%ebp
-	leal	(%ecx,%ecx,1),%edx
-	movl	%ebp,%esi
-	shrl	$7,%ebp
-	xorl	%eax,%ecx
-	subl	%ebp,%esi
-	andl	$4278124286,%edx
-	andl	$454761243,%esi
-	roll	$8,%eax
-	xorl	%esi,%edx
-	movl	4(%edi),%ebp
-	xorl	%ebx,%eax
-	xorl	%edx,%ebx
-	xorl	%ecx,%eax
-	roll	$24,%ebx
-	xorl	%edx,%ecx
-	xorl	%edx,%eax
-	roll	$16,%ecx
-	xorl	%ebx,%eax
-	roll	$8,%edx
-	xorl	%ecx,%eax
-	movl	%ebp,%ebx
-	xorl	%edx,%eax
-	movl	%eax,(%edi)
-	movl	$2155905152,%ebp
-	andl	%ebx,%ebp
-	leal	(%ebx,%ebx,1),%ecx
-	movl	%ebp,%esi
-	shrl	$7,%ebp
-	subl	%ebp,%esi
-	andl	$4278124286,%ecx
-	andl	$454761243,%esi
-	xorl	%esi,%ecx
-	movl	$2155905152,%ebp
-	andl	%ecx,%ebp
-	leal	(%ecx,%ecx,1),%edx
-	movl	%ebp,%esi
-	shrl	$7,%ebp
-	subl	%ebp,%esi
-	andl	$4278124286,%edx
-	andl	$454761243,%esi
-	xorl	%ebx,%ecx
-	xorl	%esi,%edx
-	movl	$2155905152,%ebp
-	andl	%edx,%ebp
-	leal	(%edx,%edx,1),%eax
-	movl	%ebp,%esi
-	shrl	$7,%ebp
-	xorl	%ebx,%edx
-	subl	%ebp,%esi
-	andl	$4278124286,%eax
-	andl	$454761243,%esi
-	roll	$8,%ebx
-	xorl	%esi,%eax
-	movl	8(%edi),%ebp
-	xorl	%ecx,%ebx
-	xorl	%eax,%ecx
-	xorl	%edx,%ebx
-	roll	$24,%ecx
-	xorl	%eax,%edx
-	xorl	%eax,%ebx
-	roll	$16,%edx
-	xorl	%ecx,%ebx
-	roll	$8,%eax
-	xorl	%edx,%ebx
-	movl	%ebp,%ecx
-	xorl	%eax,%ebx
-	movl	%ebx,4(%edi)
-	movl	$2155905152,%ebp
-	andl	%ecx,%ebp
-	leal	(%ecx,%ecx,1),%edx
-	movl	%ebp,%esi
-	shrl	$7,%ebp
-	subl	%ebp,%esi
-	andl	$4278124286,%edx
-	andl	$454761243,%esi
-	xorl	%esi,%edx
-	movl	$2155905152,%ebp
-	andl	%edx,%ebp
-	leal	(%edx,%edx,1),%eax
-	movl	%ebp,%esi
-	shrl	$7,%ebp
-	subl	%ebp,%esi
-	andl	$4278124286,%eax
-	andl	$454761243,%esi
-	xorl	%ecx,%edx
-	xorl	%esi,%eax
-	movl	$2155905152,%ebp
-	andl	%eax,%ebp
-	leal	(%eax,%eax,1),%ebx
-	movl	%ebp,%esi
-	shrl	$7,%ebp
-	xorl	%ecx,%eax
-	subl	%ebp,%esi
-	andl	$4278124286,%ebx
-	andl	$454761243,%esi
-	roll	$8,%ecx
-	xorl	%esi,%ebx
-	movl	12(%edi),%ebp
-	xorl	%edx,%ecx
-	xorl	%ebx,%edx
-	xorl	%eax,%ecx
-	roll	$24,%edx
-	xorl	%ebx,%eax
-	xorl	%ebx,%ecx
-	roll	$16,%eax
-	xorl	%edx,%ecx
-	roll	$8,%ebx
-	xorl	%eax,%ecx
-	movl	%ebp,%edx
-	xorl	%ebx,%ecx
-	movl	%ecx,8(%edi)
-	movl	$2155905152,%ebp
-	andl	%edx,%ebp
-	leal	(%edx,%edx,1),%eax
-	movl	%ebp,%esi
-	shrl	$7,%ebp
-	subl	%ebp,%esi
-	andl	$4278124286,%eax
-	andl	$454761243,%esi
-	xorl	%esi,%eax
-	movl	$2155905152,%ebp
-	andl	%eax,%ebp
-	leal	(%eax,%eax,1),%ebx
-	movl	%ebp,%esi
-	shrl	$7,%ebp
-	subl	%ebp,%esi
-	andl	$4278124286,%ebx
-	andl	$454761243,%esi
-	xorl	%edx,%eax
-	xorl	%esi,%ebx
-	movl	$2155905152,%ebp
-	andl	%ebx,%ebp
-	leal	(%ebx,%ebx,1),%ecx
-	movl	%ebp,%esi
-	shrl	$7,%ebp
-	xorl	%edx,%ebx
-	subl	%ebp,%esi
-	andl	$4278124286,%ecx
-	andl	$454761243,%esi
-	roll	$8,%edx
-	xorl	%esi,%ecx
-	movl	16(%edi),%ebp
-	xorl	%eax,%edx
-	xorl	%ecx,%eax
-	xorl	%ebx,%edx
-	roll	$24,%eax
-	xorl	%ecx,%ebx
-	xorl	%ecx,%edx
-	roll	$16,%ebx
-	xorl	%eax,%edx
-	roll	$8,%ecx
-	xorl	%ebx,%edx
-	movl	%ebp,%eax
-	xorl	%ecx,%edx
-	movl	%edx,12(%edi)
-	cmpl	28(%esp),%edi
-	jb	L056permute
-	xorl	%eax,%eax
-	popl	%edi
-	popl	%esi
-	popl	%ebx
-	popl	%ebp
-	ret
-.byte	65,69,83,32,102,111,114,32,120,56,54,44,32,67,82,89
-.byte	80,84,79,71,65,77,83,32,98,121,32,60,97,112,112,114
-.byte	111,64,111,112,101,110,115,115,108,46,111,114,103,62,0
-.section __IMPORT,__pointers,non_lazy_symbol_pointers
-L_OPENSSL_ia32cap_P$non_lazy_ptr:
-.indirect_symbol	_OPENSSL_ia32cap_P
-.long	0
-.comm	_OPENSSL_ia32cap_P,16,2
diff --git a/deps/openssl/config/archs/darwin-i386-cc/asm_avx2/crypto/buildinf.h b/deps/openssl/config/archs/darwin-i386-cc/asm_avx2/crypto/buildinf.h
index a78ae310fc..a925b543a9 100644
--- a/deps/openssl/config/archs/darwin-i386-cc/asm_avx2/crypto/buildinf.h
+++ b/deps/openssl/config/archs/darwin-i386-cc/asm_avx2/crypto/buildinf.h
@@ -11,7 +11,7 @@
  */
 
 #define PLATFORM "platform: darwin-i386-cc"
-#define DATE "built on: Fri Sep 13 15:58:46 2019 UTC"
+#define DATE "built on: Wed Mar 18 21:05:45 2020 UTC"
 
 /*
  * Generate compiler_flags as an array of individual characters. This is a
@@ -37,11 +37,12 @@ static const char compiler_flags[] = {
     '-','D','S','H','A','2','5','6','_','A','S','M',' ','-','D','S',
     'H','A','5','1','2','_','A','S','M',' ','-','D','R','C','4','_',
     'A','S','M',' ','-','D','M','D','5','_','A','S','M',' ','-','D',
-    'R','M','D','1','6','0','_','A','S','M',' ','-','D','V','P','A',
-    'E','S','_','A','S','M',' ','-','D','W','H','I','R','L','P','O',
-    'O','L','_','A','S','M',' ','-','D','G','H','A','S','H','_','A',
-    'S','M',' ','-','D','E','C','P','_','N','I','S','T','Z','2','5',
-    '6','_','A','S','M',' ','-','D','P','O','L','Y','1','3','0','5',
-    '_','A','S','M',' ','-','D','_','R','E','E','N','T','R','A','N',
-    'T',' ','-','D','N','D','E','B','U','G','\0'
+    'R','M','D','1','6','0','_','A','S','M',' ','-','D','A','E','S',
+    'N','I','_','A','S','M',' ','-','D','V','P','A','E','S','_','A',
+    'S','M',' ','-','D','W','H','I','R','L','P','O','O','L','_','A',
+    'S','M',' ','-','D','G','H','A','S','H','_','A','S','M',' ','-',
+    'D','E','C','P','_','N','I','S','T','Z','2','5','6','_','A','S',
+    'M',' ','-','D','P','O','L','Y','1','3','0','5','_','A','S','M',
+    ' ','-','D','_','R','E','E','N','T','R','A','N','T',' ','-','D',
+    'N','D','E','B','U','G','\0'
 };
diff --git a/deps/openssl/config/archs/darwin-i386-cc/asm_avx2/crypto/ec/ecp_nistz256-x86.s b/deps/openssl/config/archs/darwin-i386-cc/asm_avx2/crypto/ec/ecp_nistz256-x86.s
index a6736904f3..891647b7ed 100644
--- a/deps/openssl/config/archs/darwin-i386-cc/asm_avx2/crypto/ec/ecp_nistz256-x86.s
+++ b/deps/openssl/config/archs/darwin-i386-cc/asm_avx2/crypto/ec/ecp_nistz256-x86.s
@@ -4378,19 +4378,15 @@ L009pic:
 	orl	4(%edi),%eax
 	orl	8(%edi),%eax
 	orl	12(%edi),%eax
+	movl	576(%esp),%ebx
+	notl	%ebx
+	orl	%ebx,%eax
+	movl	580(%esp),%ebx
+	notl	%ebx
+	orl	%ebx,%eax
+	orl	584(%esp),%eax
 .byte	62
 	jnz	L010add_proceed
-	movl	576(%esp),%eax
-	andl	580(%esp),%eax
-	movl	584(%esp),%ebx
-	jz	L010add_proceed
-	testl	%ebx,%ebx
-	jz	L011add_double
-	movl	616(%esp),%edi
-	xorl	%eax,%eax
-	movl	$24,%ecx
-.byte	252,243,171
-	jmp	L012add_done
 .align	4,0x90
 L011add_double:
 	movl	620(%esp),%esi
diff --git a/deps/openssl/config/archs/darwin-i386-cc/asm_avx2/crypto/include/internal/bn_conf.h b/deps/openssl/config/archs/darwin-i386-cc/asm_avx2/crypto/include/internal/bn_conf.h
index fb52156bd0..459055c96f 100644
--- a/deps/openssl/config/archs/darwin-i386-cc/asm_avx2/crypto/include/internal/bn_conf.h
+++ b/deps/openssl/config/archs/darwin-i386-cc/asm_avx2/crypto/include/internal/bn_conf.h
@@ -1,5 +1,5 @@
 /* WARNING: do not edit! */
-/* Generated by Makefile from crypto/include/internal/bn_conf.h.in */
+/* Generated by Makefile from include/crypto/bn_conf.h.in */
 /*
  * Copyright 2016 The OpenSSL Project Authors. All Rights Reserved.
  *
@@ -9,8 +9,8 @@
  * https://www.openssl.org/source/license.html
  */
 
-#ifndef HEADER_BN_CONF_H
-# define HEADER_BN_CONF_H
+#ifndef OSSL_CRYPTO_BN_CONF_H
+# define OSSL_CRYPTO_BN_CONF_H
 
 /*
  * The contents of this file are not used in the UEFI build, as
diff --git a/deps/openssl/config/archs/darwin-i386-cc/asm_avx2/crypto/include/internal/dso_conf.h b/deps/openssl/config/archs/darwin-i386-cc/asm_avx2/crypto/include/internal/dso_conf.h
index a69309195e..e2d05cdbf4 100644
--- a/deps/openssl/config/archs/darwin-i386-cc/asm_avx2/crypto/include/internal/dso_conf.h
+++ b/deps/openssl/config/archs/darwin-i386-cc/asm_avx2/crypto/include/internal/dso_conf.h
@@ -1,5 +1,5 @@
 /* WARNING: do not edit! */
-/* Generated by Makefile from crypto/include/internal/dso_conf.h.in */
+/* Generated by Makefile from include/crypto/dso_conf.h.in */
 /*
  * Copyright 2016-2019 The OpenSSL Project Authors. All Rights Reserved.
  *
@@ -9,8 +9,8 @@
  * https://www.openssl.org/source/license.html
  */
 
-#ifndef HEADER_DSO_CONF_H
-# define HEADER_DSO_CONF_H
+#ifndef OSSL_CRYPTO_DSO_CONF_H
+# define OSSL_CRYPTO_DSO_CONF_H
 # define DSO_DLFCN
 # define HAVE_DLFCN_H
 # define DSO_EXTENSION ".dylib"
diff --git a/deps/openssl/config/archs/darwin-i386-cc/asm_avx2/include/openssl/opensslconf.h b/deps/openssl/config/archs/darwin-i386-cc/asm_avx2/include/openssl/opensslconf.h
index 77a271f995..7602fb815a 100644
--- a/deps/openssl/config/archs/darwin-i386-cc/asm_avx2/include/openssl/opensslconf.h
+++ b/deps/openssl/config/archs/darwin-i386-cc/asm_avx2/include/openssl/opensslconf.h
@@ -99,9 +99,6 @@ extern "C" {
 #ifndef OPENSSL_NO_DYNAMIC_ENGINE
 # define OPENSSL_NO_DYNAMIC_ENGINE
 #endif
-#ifndef OPENSSL_NO_AFALGENG
-# define OPENSSL_NO_AFALGENG
-#endif
 
 
 /*
diff --git a/deps/openssl/config/archs/darwin-i386-cc/asm_avx2/include/progs.h b/deps/openssl/config/archs/darwin-i386-cc/asm_avx2/include/progs.h
index 9b3d270e20..308c65601b 100644
--- a/deps/openssl/config/archs/darwin-i386-cc/asm_avx2/include/progs.h
+++ b/deps/openssl/config/archs/darwin-i386-cc/asm_avx2/include/progs.h
@@ -2,7 +2,7 @@
  * WARNING: do not edit!
  * Generated by apps/progs.pl
  *
- * Copyright 1995-2019 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 1995-2020 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
diff --git a/deps/openssl/config/archs/darwin-i386-cc/asm_avx2/openssl-cl.gypi b/deps/openssl/config/archs/darwin-i386-cc/asm_avx2/openssl-cl.gypi
index 35d5734b53..aa3222e6e6 100644
--- a/deps/openssl/config/archs/darwin-i386-cc/asm_avx2/openssl-cl.gypi
+++ b/deps/openssl/config/archs/darwin-i386-cc/asm_avx2/openssl-cl.gypi
@@ -15,6 +15,7 @@
       'RC4_ASM',
       'MD5_ASM',
       'RMD160_ASM',
+      'AESNI_ASM',
       'VPAES_ASM',
       'WHIRLPOOL_ASM',
       'GHASH_ASM',
diff --git a/deps/openssl/config/archs/darwin-i386-cc/asm_avx2/openssl.gypi b/deps/openssl/config/archs/darwin-i386-cc/asm_avx2/openssl.gypi
index c1f15b01a1..47e1ff6afa 100644
--- a/deps/openssl/config/archs/darwin-i386-cc/asm_avx2/openssl.gypi
+++ b/deps/openssl/config/archs/darwin-i386-cc/asm_avx2/openssl.gypi
@@ -712,6 +712,7 @@
       'RC4_ASM',
       'MD5_ASM',
       'RMD160_ASM',
+      'AESNI_ASM',
       'VPAES_ASM',
       'WHIRLPOOL_ASM',
       'GHASH_ASM',
diff --git a/deps/openssl/config/archs/darwin-i386-cc/no-asm/configdata.pm b/deps/openssl/config/archs/darwin-i386-cc/no-asm/configdata.pm
index a40cf9d26d..191fabfac7 100644
--- a/deps/openssl/config/archs/darwin-i386-cc/no-asm/configdata.pm
+++ b/deps/openssl/config/archs/darwin-i386-cc/no-asm/configdata.pm
@@ -54,7 +54,7 @@ our %config = (
   minor => "1.1",
   openssl_algorithm_defines => [ "OPENSSL_NO_COMP", "OPENSSL_NO_MD2", "OPENSSL_NO_RC5" ],
   openssl_api_defines => [  ],
-  openssl_other_defines => [ "OPENSSL_RAND_SEED_OS", "OPENSSL_NO_AFALGENG", "OPENSSL_NO_ASAN", "OPENSSL_NO_ASM", "OPENSSL_NO_CRYPTO_MDEBUG", "OPENSSL_NO_CRYPTO_MDEBUG_BACKTRACE", "OPENSSL_NO_DEVCRYPTOENG", "OPENSSL_NO_EC_NISTP_64_GCC_128", "OPENSSL_NO_EGD", "OPENSSL_NO_EXTERNAL_TESTS", "OPENSSL_NO_FUZZ_AFL", "OPENSSL_NO_FUZZ_LIBFUZZER", "OPENSSL_NO_HEARTBEATS", "OPENSSL_NO_MSAN", "OPENSSL_NO_SCTP", "OPENSSL_NO_SSL3", "OPENSSL_NO_SSL3_METHOD", "OPENSSL_NO_UBSAN", "OPENSSL_NO_UNIT_TEST", "OPENSSL_NO_WEAK_SSL_CIPHERS", "OPENSSL_NO_DYNAMIC_ENGINE", "OPENSSL_NO_AFALGENG" ],
+  openssl_other_defines => [ "OPENSSL_RAND_SEED_OS", "OPENSSL_NO_AFALGENG", "OPENSSL_NO_ASAN", "OPENSSL_NO_ASM", "OPENSSL_NO_CRYPTO_MDEBUG", "OPENSSL_NO_CRYPTO_MDEBUG_BACKTRACE", "OPENSSL_NO_DEVCRYPTOENG", "OPENSSL_NO_EC_NISTP_64_GCC_128", "OPENSSL_NO_EGD", "OPENSSL_NO_EXTERNAL_TESTS", "OPENSSL_NO_FUZZ_AFL", "OPENSSL_NO_FUZZ_LIBFUZZER", "OPENSSL_NO_HEARTBEATS", "OPENSSL_NO_MSAN", "OPENSSL_NO_SCTP", "OPENSSL_NO_SSL3", "OPENSSL_NO_SSL3_METHOD", "OPENSSL_NO_UBSAN", "OPENSSL_NO_UNIT_TEST", "OPENSSL_NO_WEAK_SSL_CIPHERS", "OPENSSL_NO_DYNAMIC_ENGINE" ],
   openssl_sys_defines => [ "OPENSSL_SYS_MACOSX" ],
   openssl_thread_defines => [ "OPENSSL_THREADS" ],
   openssldir => "",
@@ -110,8 +110,8 @@ our %config = (
   sourcedir => ".",
   target => "darwin-i386-cc",
   tdirs => [ "ossl_shim" ],
-  version => "1.1.1d",
-  version_num => "0x1010104fL",
+  version => "1.1.1e",
+  version_num => "0x1010105fL",
 );
 
 our %target = (
@@ -232,6 +232,7 @@ our @disablables = (
   "dgram",
   "dh",
   "dsa",
+  "dso",
   "dtls",
   "dynamic-engine",
   "ec",
@@ -350,8 +351,8 @@ our %unified_info = (
         {
             "" =>
                 [
-                    "crypto/include/internal/bn_conf.h",
-                    "crypto/include/internal/dso_conf.h",
+                    "include/crypto/bn_conf.h",
+                    "include/crypto/dso_conf.h",
                     "include/openssl/opensslconf.h",
                 ],
             "apps/asn1pars.o" =>
@@ -619,14 +620,6 @@ our %unified_info = (
                     "crypto/perlasm/cbc.pl",
                     "crypto/perlasm/x86asm.pl",
                 ],
-            "crypto/include/internal/bn_conf.h" =>
-                [
-                    "configdata.pm",
-                ],
-            "crypto/include/internal/dso_conf.h" =>
-                [
-                    "configdata.pm",
-                ],
             "crypto/rc4/rc4-586.s" =>
                 [
                     "crypto/perlasm/x86asm.pl",
@@ -702,6 +695,14 @@ our %unified_info = (
                 [
                     "libcrypto",
                 ],
+            "include/crypto/bn_conf.h" =>
+                [
+                    "configdata.pm",
+                ],
+            "include/crypto/dso_conf.h" =>
+                [
+                    "configdata.pm",
+                ],
             "include/openssl/opensslconf.h" =>
                 [
                     "configdata.pm",
@@ -1491,6 +1492,12 @@ our %unified_info = (
                     "libcrypto",
                     "test/libtestutil.a",
                 ],
+            "test/ssl_ctx_test" =>
+                [
+                    "libcrypto",
+                    "libssl",
+                    "test/libtestutil.a",
+                ],
             "test/ssl_test" =>
                 [
                     "libcrypto",
@@ -3209,7 +3216,6 @@ our %unified_info = (
                             "test/testutil/cb.o",
                             "test/testutil/driver.o",
                             "test/testutil/format_output.o",
-                            "test/testutil/init.o",
                             "test/testutil/main.o",
                             "test/testutil/output_helpers.o",
                             "test/testutil/random.o",
@@ -3217,6 +3223,7 @@ our %unified_info = (
                             "test/testutil/tap_bio.o",
                             "test/testutil/test_cleanup.o",
                             "test/testutil/tests.o",
+                            "test/testutil/testutil_init.o",
                         ],
                     "products" =>
                         {
@@ -3715,14 +3722,6 @@ our %unified_info = (
                 [
                     "crypto/ia64cpuid.S",
                 ],
-            "crypto/include/internal/bn_conf.h" =>
-                [
-                    "crypto/include/internal/bn_conf.h.in",
-                ],
-            "crypto/include/internal/dso_conf.h" =>
-                [
-                    "crypto/include/internal/dso_conf.h.in",
-                ],
             "crypto/md5/md5-586.s" =>
                 [
                     "crypto/md5/asm/md5-586.pl",
@@ -4163,6 +4162,14 @@ our %unified_info = (
                     "engines/asm/e_padlock-x86_64.pl",
                     "\$(PERLASM_SCHEME)",
                 ],
+            "include/crypto/bn_conf.h" =>
+                [
+                    "include/crypto/bn_conf.h.in",
+                ],
+            "include/crypto/dso_conf.h" =>
+                [
+                    "include/crypto/dso_conf.h.in",
+                ],
             "include/openssl/opensslconf.h" =>
                 [
                     "include/openssl/opensslconf.h.in",
@@ -4845,49 +4852,41 @@ our %unified_info = (
             "crypto/aes/aes_cbc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/aes/aes_cfb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/aes/aes_core.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/aes/aes_ecb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/aes/aes_ige.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/aes/aes_misc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/aes/aes_ofb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/aes/aes_wrap.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/aes/aesfx-sparcv9.o" =>
@@ -4909,7 +4908,6 @@ our %unified_info = (
             "crypto/aria/aria.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/arm64cpuid.o" =>
@@ -4923,613 +4921,511 @@ our %unified_info = (
             "crypto/asn1/a_bitstr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_d2i_fp.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_digest.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_dup.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_gentm.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_i2d_fp.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_int.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_mbstr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_object.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_octet.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_print.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_sign.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_strex.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_strnid.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_time.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_type.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_utctm.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_utf8.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_verify.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/ameth_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/asn1_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/asn1_gen.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/asn1_item_list.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/asn1_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/asn1_par.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/asn_mime.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/asn_moid.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/asn_mstbl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/asn_pack.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/bio_asn1.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/bio_ndef.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/d2i_pr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/d2i_pu.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/evp_asn1.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/f_int.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/f_string.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/i2d_pr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/i2d_pu.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/n_pkey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/nsseq.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/p5_pbe.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/p5_pbev2.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/p5_scrypt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/p8_pkey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/t_bitst.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/t_pkey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/t_spki.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/tasn_dec.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/tasn_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/tasn_fre.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/tasn_new.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/tasn_prn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/tasn_scn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/tasn_typ.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/tasn_utl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/x_algor.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/x_bignum.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/x_info.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/x_int64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/x_long.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/x_pkey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/x_sig.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/x_spki.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/x_val.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/async/arch/async_null.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/async/arch/async_posix.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/async/arch/async_win.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/async/async.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/async/async_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/async/async_wait.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bf/bf_cfb64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bf/bf_ecb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bf/bf_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bf/bf_ofb64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bf/bf_skey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/b_addr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/b_dump.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/b_print.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/b_sock.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/b_sock2.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bf_buff.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bf_lbuf.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bf_nbio.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bf_null.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bio_cb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bio_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bio_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bio_meth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bss_acpt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bss_bio.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bss_conn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bss_dgram.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bss_fd.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bss_file.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bss_log.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bss_mem.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bss_null.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bss_sock.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/blake2/blake2b.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/blake2/blake2s.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/blake2/m_blake2b.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/blake2/m_blake2s.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/armv4-gf2m.o" =>
@@ -5547,188 +5443,157 @@ our %unified_info = (
             "crypto/bn/bn_add.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_asm.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_blind.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_const.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_ctx.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_depr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_dh.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_div.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_exp.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto",
                 ],
             "crypto/bn/bn_exp2.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_gcd.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_gf2m.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_intern.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_kron.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_mod.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_mont.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_mpi.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_mul.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_nist.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_prime.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_print.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_rand.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_recp.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_shift.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_sqr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_sqrt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_srp.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_word.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_x931p.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/mips-mont.o" =>
@@ -5758,13 +5623,11 @@ our %unified_info = (
             "crypto/buffer/buf_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/buffer/buffer.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/buildinf.h" =>
@@ -5774,43 +5637,36 @@ our %unified_info = (
             "crypto/camellia/camellia.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/camellia/cmll_cbc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/camellia/cmll_cfb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/camellia/cmll_ctr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/camellia/cmll_ecb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/camellia/cmll_misc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/camellia/cmll_ofb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/camellia/cmllt4-sparcv9.o" =>
@@ -5820,31 +5676,26 @@ our %unified_info = (
             "crypto/cast/c_cfb64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cast/c_ecb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cast/c_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cast/c_ofb64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cast/c_skey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/chacha/chacha-armv4.o" =>
@@ -5862,278 +5713,232 @@ our %unified_info = (
             "crypto/chacha/chacha_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cmac/cm_ameth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cmac/cm_pmeth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cmac/cmac.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_asn1.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_att.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_cd.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_dd.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_env.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_ess.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_io.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_kari.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_pwri.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_sd.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_smime.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/conf/conf_api.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/conf/conf_def.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/conf/conf_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/conf/conf_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/conf/conf_mall.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/conf/conf_mod.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/conf/conf_sap.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/conf/conf_ssl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cpt_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cryptlib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ct/ct_b64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ct/ct_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ct/ct_log.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ct/ct_oct.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ct/ct_policy.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ct/ct_prn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ct/ct_sct.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ct/ct_sct_ctx.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ct/ct_vfy.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ct/ct_x509v3.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ctype.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cversion.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto",
                 ],
             "crypto/des/cbc_cksm.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/cbc_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/cfb64ede.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/cfb64enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/cfb_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/des_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/dest4-sparcv9.o" =>
@@ -6143,301 +5948,251 @@ our %unified_info = (
             "crypto/des/ecb3_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/ecb_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/fcrypt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/fcrypt_b.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/ofb64ede.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/ofb64enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/ofb_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/pcbc_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/qud_cksm.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/rand_key.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/set_key.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/str2key.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/xcbc_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_ameth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_asn1.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_check.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_depr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_gen.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_kdf.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_key.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_meth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_pmeth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_prn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_rfc5114.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_rfc7919.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dsa/dsa_ameth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dsa/dsa_asn1.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dsa/dsa_depr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dsa/dsa_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dsa/dsa_gen.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dsa/dsa_key.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dsa/dsa_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dsa/dsa_meth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dsa/dsa_ossl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dsa/dsa_pmeth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dsa/dsa_prn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dsa/dsa_sign.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dsa/dsa_vrf.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dso/dso_dl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dso/dso_dlfcn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dso/dso_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dso/dso_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dso/dso_openssl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dso/dso_vms.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dso/dso_win32.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ebcdic.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/curve25519.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/curve448/arch_32/f_impl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto/ec/curve448/arch_32",
                     "crypto/ec/curve448",
@@ -6445,7 +6200,6 @@ our %unified_info = (
             "crypto/ec/curve448/curve448.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto/ec/curve448/arch_32",
                     "crypto/ec/curve448",
@@ -6453,7 +6207,6 @@ our %unified_info = (
             "crypto/ec/curve448/curve448_tables.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto/ec/curve448/arch_32",
                     "crypto/ec/curve448",
@@ -6461,7 +6214,6 @@ our %unified_info = (
             "crypto/ec/curve448/eddsa.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto/ec/curve448/arch_32",
                     "crypto/ec/curve448",
@@ -6469,7 +6221,6 @@ our %unified_info = (
             "crypto/ec/curve448/f_generic.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto/ec/curve448/arch_32",
                     "crypto/ec/curve448",
@@ -6477,7 +6228,6 @@ our %unified_info = (
             "crypto/ec/curve448/scalar.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto/ec/curve448/arch_32",
                     "crypto/ec/curve448",
@@ -6485,163 +6235,136 @@ our %unified_info = (
             "crypto/ec/ec2_oct.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec2_smpl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec_ameth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec_asn1.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec_check.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec_curve.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec_cvt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec_key.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec_kmeth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec_mult.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec_oct.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec_pmeth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec_print.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecdh_kdf.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecdh_ossl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecdsa_ossl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecdsa_sign.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecdsa_vrf.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/eck_prn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecp_mont.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecp_nist.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecp_nistp224.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecp_nistp256.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecp_nistp521.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecp_nistputil.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecp_nistz256-armv4.o" =>
@@ -6659,223 +6382,186 @@ our %unified_info = (
             "crypto/ec/ecp_oct.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecp_smpl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecx_meth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/eng_all.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/eng_cnf.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/eng_ctrl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/eng_dyn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/eng_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/eng_fat.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/eng_init.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/eng_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/eng_list.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/eng_openssl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/eng_pkey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/eng_rdrand.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/eng_table.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/tb_asnmth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/tb_cipher.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/tb_dh.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/tb_digest.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/tb_dsa.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/tb_eckey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/tb_pkmeth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/tb_rand.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/tb_rsa.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/err/err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/err/err_all.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/err/err_prn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/bio_b64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/bio_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/bio_md.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/bio_ok.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/c_allc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/c_alld.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/cmeth_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/digest.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/e_aes.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto",
                     "crypto/modes",
@@ -6883,21 +6569,18 @@ our %unified_info = (
             "crypto/evp/e_aes_cbc_hmac_sha1.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto/modes",
                 ],
             "crypto/evp/e_aes_cbc_hmac_sha256.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto/modes",
                 ],
             "crypto/evp/e_aria.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto",
                     "crypto/modes",
@@ -6905,13 +6588,11 @@ our %unified_info = (
             "crypto/evp/e_bf.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/e_camellia.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto",
                     "crypto/modes",
@@ -6919,81 +6600,68 @@ our %unified_info = (
             "crypto/evp/e_cast.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/e_chacha20_poly1305.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/e_des.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto",
                 ],
             "crypto/evp/e_des3.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto",
                 ],
             "crypto/evp/e_idea.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/e_null.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/e_old.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/e_rc2.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/e_rc4.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/e_rc4_hmac_md5.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/e_rc5.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/e_seed.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/e_sm4.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto",
                     "crypto/modes",
@@ -7001,328 +6669,267 @@ our %unified_info = (
             "crypto/evp/e_xcbc_d.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/encode.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/evp_cnf.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/evp_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/evp_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/evp_key.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/evp_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/evp_pbe.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/evp_pkey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/m_md2.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/m_md4.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/m_md5.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/m_md5_sha1.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/m_mdc2.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/m_null.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/m_ripemd.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/m_sha1.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/m_sha3.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto",
                 ],
             "crypto/evp/m_sigver.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/m_wp.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/names.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/p5_crpt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/p5_crpt2.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/p_dec.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/p_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/p_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/p_open.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/p_seal.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/p_sign.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/p_verify.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/pbe_scrypt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/pmeth_fn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/pmeth_gn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/pmeth_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ex_data.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/getenv.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/hmac/hm_ameth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/hmac/hm_pmeth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/hmac/hmac.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/idea/i_cbc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/idea/i_cfb64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/idea/i_ecb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/idea/i_ofb64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/idea/i_skey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
-            "crypto/include/internal/bn_conf.h" =>
-                [
-                    ".",
-                ],
-            "crypto/include/internal/dso_conf.h" =>
-                [
-                    ".",
-                ],
             "crypto/init.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/kdf/hkdf.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/kdf/kdf_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/kdf/scrypt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/kdf/tls1_prf.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/lhash/lh_stats.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/lhash/lhash.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/md4/md4_dgst.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/md4/md4_one.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/md5/md5-sparcv9.o" =>
@@ -7332,85 +6939,71 @@ our %unified_info = (
             "crypto/md5/md5_dgst.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/md5/md5_one.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/mdc2/mdc2_one.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/mdc2/mdc2dgst.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/mem.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/mem_clr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/mem_dbg.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/mem_sec.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/modes/cbc128.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/modes/ccm128.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/modes/cfb128.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/modes/ctr128.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/modes/cts128.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/modes/gcm128.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto",
                 ],
@@ -7433,361 +7026,301 @@ our %unified_info = (
             "crypto/modes/ocb128.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/modes/ofb128.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/modes/wrap128.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/modes/xts128.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/o_dir.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/o_fips.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/o_fopen.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/o_init.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/o_str.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/o_time.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/objects/o_names.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/objects/obj_dat.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/objects/obj_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/objects/obj_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/objects/obj_xref.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ocsp/ocsp_asn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ocsp/ocsp_cl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ocsp/ocsp_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ocsp/ocsp_ext.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ocsp/ocsp_ht.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ocsp/ocsp_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ocsp/ocsp_prn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ocsp/ocsp_srv.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ocsp/ocsp_vfy.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ocsp/v3_ocsp.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pem/pem_all.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pem/pem_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pem/pem_info.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pem/pem_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pem/pem_oth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pem/pem_pk8.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pem/pem_pkey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pem/pem_sign.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pem/pem_x509.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pem/pem_xaux.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pem/pvkfmt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_add.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_asn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_attr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_crpt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_crt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_decr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_init.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_key.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_kiss.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_mutl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_npas.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_p8d.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_p8e.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_sbag.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_utl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/pk12err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs7/bio_pk7.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs7/pk7_asn1.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs7/pk7_attr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs7/pk7_doit.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs7/pk7_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs7/pk7_mime.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs7/pk7_smime.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs7/pkcs7err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/poly1305/poly1305-armv4.o" =>
@@ -7809,259 +7342,216 @@ our %unified_info = (
             "crypto/poly1305/poly1305.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/poly1305/poly1305_ameth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/poly1305/poly1305_pmeth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rand/drbg_ctr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rand/drbg_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rand/rand_egd.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rand/rand_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rand/rand_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rand/rand_unix.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rand/rand_vms.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rand/rand_win.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rand/randfile.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rc2/rc2_cbc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rc2/rc2_ecb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rc2/rc2_skey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rc2/rc2cfb64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rc2/rc2ofb64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rc4/rc4_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rc4/rc4_skey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ripemd/rmd_dgst.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ripemd/rmd_one.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_ameth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_asn1.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_chk.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_crpt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_depr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_gen.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_meth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_mp.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_none.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_oaep.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_ossl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_pk1.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_pmeth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_prn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_pss.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_saos.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_sign.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_ssl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_x931.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_x931g.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/s390xcpuid.o" =>
@@ -8071,31 +7561,26 @@ our %unified_info = (
             "crypto/seed/seed.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/seed/seed_cbc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/seed/seed_cfb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/seed/seed_ecb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/seed/seed_ofb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sha/keccak1600-armv4.o" =>
@@ -8105,7 +7590,6 @@ our %unified_info = (
             "crypto/sha/keccak1600.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sha/sha1-armv4-large.o" =>
@@ -8131,13 +7615,11 @@ our %unified_info = (
             "crypto/sha/sha1_one.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sha/sha1dgst.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sha/sha256-armv4.o" =>
@@ -8163,7 +7645,6 @@ our %unified_info = (
             "crypto/sha/sha256.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sha/sha512-armv4.o" =>
@@ -8189,709 +7670,591 @@ our %unified_info = (
             "crypto/sha/sha512.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/siphash/siphash.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/siphash/siphash_ameth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/siphash/siphash_pmeth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sm2/sm2_crypt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sm2/sm2_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sm2/sm2_pmeth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sm2/sm2_sign.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sm3/m_sm3.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sm3/sm3.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sm4/sm4.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/srp/srp_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/srp/srp_vfy.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/stack/stack.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/store/loader_file.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/store/store_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/store/store_init.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/store/store_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/store/store_register.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/store/store_strings.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/threads_none.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/threads_pthread.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/threads_win.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ts/ts_asn1.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ts/ts_conf.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ts/ts_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ts/ts_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ts/ts_req_print.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ts/ts_req_utils.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ts/ts_rsp_print.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ts/ts_rsp_sign.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ts/ts_rsp_utils.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ts/ts_rsp_verify.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ts/ts_verify_ctx.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/txt_db/txt_db.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ui/ui_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ui/ui_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ui/ui_null.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ui/ui_openssl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ui/ui_util.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/uid.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/whrlpool/wp_block.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/whrlpool/wp_dgst.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/by_dir.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/by_file.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/t_crl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/t_req.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/t_x509.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_att.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_cmp.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_d2.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_def.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_ext.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_lu.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_meth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_obj.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_r2x.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_req.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_set.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_trs.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_txt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_v3.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_vfy.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_vpm.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509cset.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509name.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509rset.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509spki.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509type.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x_all.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x_attrib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x_crl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x_exten.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x_name.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x_pubkey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x_req.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x_x509.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x_x509a.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/pcy_cache.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/pcy_data.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/pcy_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/pcy_map.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/pcy_node.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/pcy_tree.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_addr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_admis.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_akey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_akeya.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_alt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_asid.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_bcons.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_bitst.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_conf.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_cpols.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_crld.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_enum.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_extku.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_genn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_ia5.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_info.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_int.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_ncons.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_pci.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_pcia.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_pcons.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_pku.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_pmaps.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_prn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_purp.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_skey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_sxnet.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_tlsf.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_utl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "engines/e_capi.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "engines/e_padlock.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "fuzz/asn1.o" =>
@@ -8942,6 +8305,14 @@ our %unified_info = (
                 [
                     "include",
                 ],
+            "include/crypto/bn_conf.h" =>
+                [
+                    ".",
+                ],
+            "include/crypto/dso_conf.h" =>
+                [
+                    ".",
+                ],
             "include/openssl/opensslconf.h" =>
                 [
                     ".",
@@ -9186,7 +8557,6 @@ our %unified_info = (
                 [
                     ".",
                     "include",
-                    "crypto/include",
                 ],
             "test/asn1_string_table_test.o" =>
                 [
@@ -9512,7 +8882,6 @@ our %unified_info = (
                 [
                     ".",
                     "include",
-                    "crypto/include",
                 ],
             "test/cipher_overhead_test.o" =>
                 [
@@ -9558,7 +8927,6 @@ our %unified_info = (
             "test/ctype_internal_test.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "test/curve448_internal_test.o" =>
@@ -9624,7 +8992,6 @@ our %unified_info = (
                 [
                     "include",
                     "crypto/ec",
-                    "crypto/include",
                 ],
             "test/ecdsatest.o" =>
                 [
@@ -9649,7 +9016,6 @@ our %unified_info = (
             "test/evp_extra_test.o" =>
                 [
                     "include",
-                    "crypto/include",
                 ],
             "test/evp_test.o" =>
                 [
@@ -9747,7 +9113,6 @@ our %unified_info = (
                 [
                     ".",
                     "include",
-                    "crypto/include",
                 ],
             "test/rc2test.o" =>
                 [
@@ -9797,18 +9162,15 @@ our %unified_info = (
                 [
                     ".",
                     "include",
-                    "crypto/include",
                 ],
             "test/sm2_internal_test.o" =>
                 [
                     "include",
-                    "crypto/include",
                 ],
             "test/sm4_internal_test.o" =>
                 [
                     ".",
                     "include",
-                    "crypto/include",
                 ],
             "test/srptest.o" =>
                 [
@@ -9819,6 +9181,10 @@ our %unified_info = (
                     ".",
                     "include",
                 ],
+            "test/ssl_ctx_test.o" =>
+                [
+                    "include",
+                ],
             "test/ssl_test.o" =>
                 [
                     "include",
@@ -9882,10 +9248,6 @@ our %unified_info = (
                 [
                     "include",
                 ],
-            "test/testutil/init.o" =>
-                [
-                    "include",
-                ],
             "test/testutil/main.o" =>
                 [
                     "include",
@@ -9914,6 +9276,10 @@ our %unified_info = (
                 [
                     "include",
                 ],
+            "test/testutil/testutil_init.o" =>
+                [
+                    "include",
+                ],
             "test/threadstest.o" =>
                 [
                     "include",
@@ -10178,6 +9544,7 @@ our %unified_info = (
             "test/sm4_internal_test",
             "test/srptest",
             "test/ssl_cert_table_internal_test",
+            "test/ssl_ctx_test",
             "test/ssl_test",
             "test/ssl_test_ctx_test",
             "test/sslapitest",
@@ -15068,7 +14435,6 @@ our %unified_info = (
                     "test/testutil/cb.o",
                     "test/testutil/driver.o",
                     "test/testutil/format_output.o",
-                    "test/testutil/init.o",
                     "test/testutil/main.o",
                     "test/testutil/output_helpers.o",
                     "test/testutil/random.o",
@@ -15076,6 +14442,7 @@ our %unified_info = (
                     "test/testutil/tap_bio.o",
                     "test/testutil/test_cleanup.o",
                     "test/testutil/tests.o",
+                    "test/testutil/testutil_init.o",
                 ],
             "test/md2test" =>
                 [
@@ -15303,6 +14670,14 @@ our %unified_info = (
                 [
                     "test/ssl_cert_table_internal_test.c",
                 ],
+            "test/ssl_ctx_test" =>
+                [
+                    "test/ssl_ctx_test.o",
+                ],
+            "test/ssl_ctx_test.o" =>
+                [
+                    "test/ssl_ctx_test.c",
+                ],
             "test/ssl_test" =>
                 [
                     "test/handshake_helper.o",
@@ -15405,10 +14780,6 @@ our %unified_info = (
                 [
                     "test/testutil/format_output.c",
                 ],
-            "test/testutil/init.o" =>
-                [
-                    "test/testutil/init.c",
-                ],
             "test/testutil/main.o" =>
                 [
                     "test/testutil/main.c",
@@ -15437,6 +14808,10 @@ our %unified_info = (
                 [
                     "test/testutil/tests.c",
                 ],
+            "test/testutil/testutil_init.o" =>
+                [
+                    "test/testutil/testutil_init.c",
+                ],
             "test/threadstest" =>
                 [
                     "test/threadstest.o",
diff --git a/deps/openssl/config/archs/darwin-i386-cc/no-asm/crypto/buildinf.h b/deps/openssl/config/archs/darwin-i386-cc/no-asm/crypto/buildinf.h
index 5a6d99c66d..17da37fa07 100644
--- a/deps/openssl/config/archs/darwin-i386-cc/no-asm/crypto/buildinf.h
+++ b/deps/openssl/config/archs/darwin-i386-cc/no-asm/crypto/buildinf.h
@@ -11,7 +11,7 @@
  */
 
 #define PLATFORM "platform: darwin-i386-cc"
-#define DATE "built on: Fri Sep 13 15:58:53 2019 UTC"
+#define DATE "built on: Wed Mar 18 21:05:49 2020 UTC"
 
 /*
  * Generate compiler_flags as an array of individual characters. This is a
diff --git a/deps/openssl/config/archs/darwin-i386-cc/no-asm/crypto/include/internal/bn_conf.h b/deps/openssl/config/archs/darwin-i386-cc/no-asm/crypto/include/internal/bn_conf.h
index fb52156bd0..459055c96f 100644
--- a/deps/openssl/config/archs/darwin-i386-cc/no-asm/crypto/include/internal/bn_conf.h
+++ b/deps/openssl/config/archs/darwin-i386-cc/no-asm/crypto/include/internal/bn_conf.h
@@ -1,5 +1,5 @@
 /* WARNING: do not edit! */
-/* Generated by Makefile from crypto/include/internal/bn_conf.h.in */
+/* Generated by Makefile from include/crypto/bn_conf.h.in */
 /*
  * Copyright 2016 The OpenSSL Project Authors. All Rights Reserved.
  *
@@ -9,8 +9,8 @@
  * https://www.openssl.org/source/license.html
  */
 
-#ifndef HEADER_BN_CONF_H
-# define HEADER_BN_CONF_H
+#ifndef OSSL_CRYPTO_BN_CONF_H
+# define OSSL_CRYPTO_BN_CONF_H
 
 /*
  * The contents of this file are not used in the UEFI build, as
diff --git a/deps/openssl/config/archs/darwin-i386-cc/no-asm/crypto/include/internal/dso_conf.h b/deps/openssl/config/archs/darwin-i386-cc/no-asm/crypto/include/internal/dso_conf.h
index a69309195e..e2d05cdbf4 100644
--- a/deps/openssl/config/archs/darwin-i386-cc/no-asm/crypto/include/internal/dso_conf.h
+++ b/deps/openssl/config/archs/darwin-i386-cc/no-asm/crypto/include/internal/dso_conf.h
@@ -1,5 +1,5 @@
 /* WARNING: do not edit! */
-/* Generated by Makefile from crypto/include/internal/dso_conf.h.in */
+/* Generated by Makefile from include/crypto/dso_conf.h.in */
 /*
  * Copyright 2016-2019 The OpenSSL Project Authors. All Rights Reserved.
  *
@@ -9,8 +9,8 @@
  * https://www.openssl.org/source/license.html
  */
 
-#ifndef HEADER_DSO_CONF_H
-# define HEADER_DSO_CONF_H
+#ifndef OSSL_CRYPTO_DSO_CONF_H
+# define OSSL_CRYPTO_DSO_CONF_H
 # define DSO_DLFCN
 # define HAVE_DLFCN_H
 # define DSO_EXTENSION ".dylib"
diff --git a/deps/openssl/config/archs/darwin-i386-cc/no-asm/include/openssl/opensslconf.h b/deps/openssl/config/archs/darwin-i386-cc/no-asm/include/openssl/opensslconf.h
index 0688f41172..9dd40e7e28 100644
--- a/deps/openssl/config/archs/darwin-i386-cc/no-asm/include/openssl/opensslconf.h
+++ b/deps/openssl/config/archs/darwin-i386-cc/no-asm/include/openssl/opensslconf.h
@@ -102,9 +102,6 @@ extern "C" {
 #ifndef OPENSSL_NO_DYNAMIC_ENGINE
 # define OPENSSL_NO_DYNAMIC_ENGINE
 #endif
-#ifndef OPENSSL_NO_AFALGENG
-# define OPENSSL_NO_AFALGENG
-#endif
 
 
 /*
diff --git a/deps/openssl/config/archs/darwin-i386-cc/no-asm/include/progs.h b/deps/openssl/config/archs/darwin-i386-cc/no-asm/include/progs.h
index 9b3d270e20..308c65601b 100644
--- a/deps/openssl/config/archs/darwin-i386-cc/no-asm/include/progs.h
+++ b/deps/openssl/config/archs/darwin-i386-cc/no-asm/include/progs.h
@@ -2,7 +2,7 @@
  * WARNING: do not edit!
  * Generated by apps/progs.pl
  *
- * Copyright 1995-2019 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 1995-2020 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
diff --git a/deps/openssl/config/archs/darwin64-x86_64-cc/asm/configdata.pm b/deps/openssl/config/archs/darwin64-x86_64-cc/asm/configdata.pm
index 667d891890..b4e4f41215 100644
--- a/deps/openssl/config/archs/darwin64-x86_64-cc/asm/configdata.pm
+++ b/deps/openssl/config/archs/darwin64-x86_64-cc/asm/configdata.pm
@@ -48,14 +48,14 @@ our %config = (
   export_var_as_fn => "0",
   includes => [  ],
   lflags => [  ],
-  lib_defines => [ "OPENSSL_PIC", "OPENSSL_CPUID_OBJ", "OPENSSL_IA32_SSE2", "OPENSSL_BN_ASM_MONT", "OPENSSL_BN_ASM_MONT5", "OPENSSL_BN_ASM_GF2m", "SHA1_ASM", "SHA256_ASM", "SHA512_ASM", "KECCAK1600_ASM", "RC4_ASM", "MD5_ASM", "VPAES_ASM", "GHASH_ASM", "ECP_NISTZ256_ASM", "X25519_ASM", "POLY1305_ASM" ],
+  lib_defines => [ "OPENSSL_PIC", "OPENSSL_CPUID_OBJ", "OPENSSL_IA32_SSE2", "OPENSSL_BN_ASM_MONT", "OPENSSL_BN_ASM_MONT5", "OPENSSL_BN_ASM_GF2m", "SHA1_ASM", "SHA256_ASM", "SHA512_ASM", "KECCAK1600_ASM", "RC4_ASM", "MD5_ASM", "AESNI_ASM", "VPAES_ASM", "GHASH_ASM", "ECP_NISTZ256_ASM", "X25519_ASM", "POLY1305_ASM" ],
   libdir => "",
   major => "1",
   makedepprog => "\$(CROSS_COMPILE)gcc",
   minor => "1.1",
   openssl_algorithm_defines => [ "OPENSSL_NO_COMP", "OPENSSL_NO_MD2", "OPENSSL_NO_RC5" ],
   openssl_api_defines => [  ],
-  openssl_other_defines => [ "OPENSSL_RAND_SEED_OS", "OPENSSL_NO_AFALGENG", "OPENSSL_NO_ASAN", "OPENSSL_NO_CRYPTO_MDEBUG", "OPENSSL_NO_CRYPTO_MDEBUG_BACKTRACE", "OPENSSL_NO_DEVCRYPTOENG", "OPENSSL_NO_EC_NISTP_64_GCC_128", "OPENSSL_NO_EGD", "OPENSSL_NO_EXTERNAL_TESTS", "OPENSSL_NO_FUZZ_AFL", "OPENSSL_NO_FUZZ_LIBFUZZER", "OPENSSL_NO_HEARTBEATS", "OPENSSL_NO_MSAN", "OPENSSL_NO_SCTP", "OPENSSL_NO_SSL3", "OPENSSL_NO_SSL3_METHOD", "OPENSSL_NO_UBSAN", "OPENSSL_NO_UNIT_TEST", "OPENSSL_NO_WEAK_SSL_CIPHERS", "OPENSSL_NO_DYNAMIC_ENGINE", "OPENSSL_NO_AFALGENG" ],
+  openssl_other_defines => [ "OPENSSL_RAND_SEED_OS", "OPENSSL_NO_AFALGENG", "OPENSSL_NO_ASAN", "OPENSSL_NO_CRYPTO_MDEBUG", "OPENSSL_NO_CRYPTO_MDEBUG_BACKTRACE", "OPENSSL_NO_DEVCRYPTOENG", "OPENSSL_NO_EC_NISTP_64_GCC_128", "OPENSSL_NO_EGD", "OPENSSL_NO_EXTERNAL_TESTS", "OPENSSL_NO_FUZZ_AFL", "OPENSSL_NO_FUZZ_LIBFUZZER", "OPENSSL_NO_HEARTBEATS", "OPENSSL_NO_MSAN", "OPENSSL_NO_SCTP", "OPENSSL_NO_SSL3", "OPENSSL_NO_SSL3_METHOD", "OPENSSL_NO_UBSAN", "OPENSSL_NO_UNIT_TEST", "OPENSSL_NO_WEAK_SSL_CIPHERS", "OPENSSL_NO_DYNAMIC_ENGINE" ],
   openssl_sys_defines => [ "OPENSSL_SYS_MACOSX" ],
   openssl_thread_defines => [ "OPENSSL_THREADS" ],
   openssldir => "",
@@ -111,8 +111,8 @@ our %config = (
   sourcedir => ".",
   target => "darwin64-x86_64-cc",
   tdirs => [ "ossl_shim" ],
-  version => "1.1.1d",
-  version_num => "0x1010104fL",
+  version => "1.1.1e",
+  version_num => "0x1010105fL",
 );
 
 our %target = (
@@ -235,6 +235,7 @@ our @disablables = (
   "dgram",
   "dh",
   "dsa",
+  "dso",
   "dtls",
   "dynamic-engine",
   "ec",
@@ -352,8 +353,8 @@ our %unified_info = (
         {
             "" =>
                 [
-                    "crypto/include/internal/bn_conf.h",
-                    "crypto/include/internal/dso_conf.h",
+                    "include/crypto/bn_conf.h",
+                    "include/crypto/dso_conf.h",
                     "include/openssl/opensslconf.h",
                 ],
             "apps/asn1pars.o" =>
@@ -621,14 +622,6 @@ our %unified_info = (
                     "crypto/perlasm/cbc.pl",
                     "crypto/perlasm/x86asm.pl",
                 ],
-            "crypto/include/internal/bn_conf.h" =>
-                [
-                    "configdata.pm",
-                ],
-            "crypto/include/internal/dso_conf.h" =>
-                [
-                    "configdata.pm",
-                ],
             "crypto/rc4/rc4-586.s" =>
                 [
                     "crypto/perlasm/x86asm.pl",
@@ -704,6 +697,14 @@ our %unified_info = (
                 [
                     "libcrypto",
                 ],
+            "include/crypto/bn_conf.h" =>
+                [
+                    "configdata.pm",
+                ],
+            "include/crypto/dso_conf.h" =>
+                [
+                    "configdata.pm",
+                ],
             "include/openssl/opensslconf.h" =>
                 [
                     "configdata.pm",
@@ -1493,6 +1494,12 @@ our %unified_info = (
                     "libcrypto",
                     "test/libtestutil.a",
                 ],
+            "test/ssl_ctx_test" =>
+                [
+                    "libcrypto",
+                    "libssl",
+                    "test/libtestutil.a",
+                ],
             "test/ssl_test" =>
                 [
                     "libcrypto",
@@ -3247,7 +3254,6 @@ our %unified_info = (
                             "test/testutil/cb.o",
                             "test/testutil/driver.o",
                             "test/testutil/format_output.o",
-                            "test/testutil/init.o",
                             "test/testutil/main.o",
                             "test/testutil/output_helpers.o",
                             "test/testutil/random.o",
@@ -3255,6 +3261,7 @@ our %unified_info = (
                             "test/testutil/tap_bio.o",
                             "test/testutil/test_cleanup.o",
                             "test/testutil/tests.o",
+                            "test/testutil/testutil_init.o",
                         ],
                     "products" =>
                         {
@@ -3753,14 +3760,6 @@ our %unified_info = (
                 [
                     "crypto/ia64cpuid.S",
                 ],
-            "crypto/include/internal/bn_conf.h" =>
-                [
-                    "crypto/include/internal/bn_conf.h.in",
-                ],
-            "crypto/include/internal/dso_conf.h" =>
-                [
-                    "crypto/include/internal/dso_conf.h.in",
-                ],
             "crypto/md5/md5-586.s" =>
                 [
                     "crypto/md5/asm/md5-586.pl",
@@ -4201,6 +4200,14 @@ our %unified_info = (
                     "engines/asm/e_padlock-x86_64.pl",
                     "\$(PERLASM_SCHEME)",
                 ],
+            "include/crypto/bn_conf.h" =>
+                [
+                    "include/crypto/bn_conf.h.in",
+                ],
+            "include/crypto/dso_conf.h" =>
+                [
+                    "include/crypto/dso_conf.h.in",
+                ],
             "include/openssl/opensslconf.h" =>
                 [
                     "include/openssl/opensslconf.h.in",
@@ -4883,49 +4890,41 @@ our %unified_info = (
             "crypto/aes/aes_cbc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/aes/aes_cfb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/aes/aes_core.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/aes/aes_ecb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/aes/aes_ige.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/aes/aes_misc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/aes/aes_ofb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/aes/aes_wrap.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/aes/aesfx-sparcv9.o" =>
@@ -4935,25 +4934,21 @@ our %unified_info = (
             "crypto/aes/aesni-mb-x86_64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/aes/aesni-sha1-x86_64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/aes/aesni-sha256-x86_64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/aes/aesni-x86_64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/aes/aest4-sparcv9.o" =>
@@ -4971,13 +4966,11 @@ our %unified_info = (
             "crypto/aes/vpaes-x86_64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/aria/aria.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/arm64cpuid.o" =>
@@ -4991,613 +4984,511 @@ our %unified_info = (
             "crypto/asn1/a_bitstr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_d2i_fp.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_digest.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_dup.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_gentm.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_i2d_fp.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_int.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_mbstr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_object.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_octet.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_print.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_sign.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_strex.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_strnid.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_time.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_type.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_utctm.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_utf8.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_verify.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/ameth_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/asn1_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/asn1_gen.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/asn1_item_list.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/asn1_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/asn1_par.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/asn_mime.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/asn_moid.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/asn_mstbl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/asn_pack.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/bio_asn1.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/bio_ndef.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/d2i_pr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/d2i_pu.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/evp_asn1.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/f_int.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/f_string.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/i2d_pr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/i2d_pu.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/n_pkey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/nsseq.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/p5_pbe.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/p5_pbev2.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/p5_scrypt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/p8_pkey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/t_bitst.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/t_pkey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/t_spki.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/tasn_dec.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/tasn_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/tasn_fre.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/tasn_new.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/tasn_prn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/tasn_scn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/tasn_typ.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/tasn_utl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/x_algor.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/x_bignum.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/x_info.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/x_int64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/x_long.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/x_pkey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/x_sig.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/x_spki.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/x_val.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/async/arch/async_null.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/async/arch/async_posix.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/async/arch/async_win.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/async/async.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/async/async_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/async/async_wait.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bf/bf_cfb64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bf/bf_ecb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bf/bf_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bf/bf_ofb64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bf/bf_skey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/b_addr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/b_dump.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/b_print.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/b_sock.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/b_sock2.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bf_buff.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bf_lbuf.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bf_nbio.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bf_null.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bio_cb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bio_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bio_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bio_meth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bss_acpt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bss_bio.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bss_conn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bss_dgram.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bss_fd.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bss_file.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bss_log.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bss_mem.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bss_null.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bss_sock.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/blake2/blake2b.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/blake2/blake2s.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/blake2/m_blake2b.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/blake2/m_blake2s.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/armv4-gf2m.o" =>
@@ -5611,7 +5502,6 @@ our %unified_info = (
             "crypto/bn/asm/x86_64-gcc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn-mips.o" =>
@@ -5621,182 +5511,152 @@ our %unified_info = (
             "crypto/bn/bn_add.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_blind.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_const.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_ctx.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_depr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_dh.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_div.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_exp.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto",
                 ],
             "crypto/bn/bn_exp2.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_gcd.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_gf2m.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_intern.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_kron.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_mod.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_mont.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_mpi.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_mul.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_nist.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_prime.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_print.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_rand.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_recp.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_shift.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_sqr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_sqrt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_srp.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_word.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_x931p.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/mips-mont.o" =>
@@ -5806,19 +5666,16 @@ our %unified_info = (
             "crypto/bn/rsaz-avx2.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/rsaz-x86_64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/rsaz_exp.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/sparct4-mont.o" =>
@@ -5844,31 +5701,26 @@ our %unified_info = (
             "crypto/bn/x86_64-gf2m.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/x86_64-mont.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/x86_64-mont5.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/buffer/buf_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/buffer/buffer.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/buildinf.h" =>
@@ -5878,37 +5730,31 @@ our %unified_info = (
             "crypto/camellia/cmll-x86_64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/camellia/cmll_cfb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/camellia/cmll_ctr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/camellia/cmll_ecb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/camellia/cmll_misc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/camellia/cmll_ofb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/camellia/cmllt4-sparcv9.o" =>
@@ -5918,31 +5764,26 @@ our %unified_info = (
             "crypto/cast/c_cfb64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cast/c_ecb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cast/c_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cast/c_ofb64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cast/c_skey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/chacha/chacha-armv4.o" =>
@@ -5960,278 +5801,232 @@ our %unified_info = (
             "crypto/chacha/chacha-x86_64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cmac/cm_ameth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cmac/cm_pmeth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cmac/cmac.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_asn1.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_att.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_cd.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_dd.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_env.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_ess.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_io.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_kari.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_pwri.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_sd.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_smime.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/conf/conf_api.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/conf/conf_def.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/conf/conf_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/conf/conf_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/conf/conf_mall.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/conf/conf_mod.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/conf/conf_sap.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/conf/conf_ssl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cpt_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cryptlib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ct/ct_b64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ct/ct_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ct/ct_log.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ct/ct_oct.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ct/ct_policy.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ct/ct_prn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ct/ct_sct.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ct/ct_sct_ctx.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ct/ct_vfy.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ct/ct_x509v3.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ctype.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cversion.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto",
                 ],
             "crypto/des/cbc_cksm.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/cbc_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/cfb64ede.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/cfb64enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/cfb_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/des_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/dest4-sparcv9.o" =>
@@ -6241,301 +6036,251 @@ our %unified_info = (
             "crypto/des/ecb3_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/ecb_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/fcrypt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/fcrypt_b.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/ofb64ede.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/ofb64enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/ofb_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/pcbc_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/qud_cksm.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/rand_key.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/set_key.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/str2key.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/xcbc_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_ameth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_asn1.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_check.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_depr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_gen.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_kdf.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_key.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_meth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_pmeth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_prn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_rfc5114.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_rfc7919.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dsa/dsa_ameth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dsa/dsa_asn1.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dsa/dsa_depr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dsa/dsa_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dsa/dsa_gen.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dsa/dsa_key.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dsa/dsa_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dsa/dsa_meth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dsa/dsa_ossl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dsa/dsa_pmeth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dsa/dsa_prn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dsa/dsa_sign.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dsa/dsa_vrf.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dso/dso_dl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dso/dso_dlfcn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dso/dso_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dso/dso_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dso/dso_openssl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dso/dso_vms.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dso/dso_win32.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ebcdic.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/curve25519.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/curve448/arch_32/f_impl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto/ec/curve448/arch_32",
                     "crypto/ec/curve448",
@@ -6543,7 +6288,6 @@ our %unified_info = (
             "crypto/ec/curve448/curve448.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto/ec/curve448/arch_32",
                     "crypto/ec/curve448",
@@ -6551,7 +6295,6 @@ our %unified_info = (
             "crypto/ec/curve448/curve448_tables.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto/ec/curve448/arch_32",
                     "crypto/ec/curve448",
@@ -6559,7 +6302,6 @@ our %unified_info = (
             "crypto/ec/curve448/eddsa.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto/ec/curve448/arch_32",
                     "crypto/ec/curve448",
@@ -6567,7 +6309,6 @@ our %unified_info = (
             "crypto/ec/curve448/f_generic.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto/ec/curve448/arch_32",
                     "crypto/ec/curve448",
@@ -6575,7 +6316,6 @@ our %unified_info = (
             "crypto/ec/curve448/scalar.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto/ec/curve448/arch_32",
                     "crypto/ec/curve448",
@@ -6583,163 +6323,136 @@ our %unified_info = (
             "crypto/ec/ec2_oct.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec2_smpl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec_ameth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec_asn1.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec_check.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec_curve.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec_cvt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec_key.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec_kmeth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec_mult.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec_oct.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec_pmeth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec_print.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecdh_kdf.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecdh_ossl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecdsa_ossl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecdsa_sign.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecdsa_vrf.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/eck_prn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecp_mont.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecp_nist.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecp_nistp224.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecp_nistp256.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecp_nistp521.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecp_nistputil.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecp_nistz256-armv4.o" =>
@@ -6757,241 +6470,201 @@ our %unified_info = (
             "crypto/ec/ecp_nistz256-x86_64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecp_nistz256.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecp_oct.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecp_smpl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecx_meth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/x25519-x86_64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/eng_all.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/eng_cnf.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/eng_ctrl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/eng_dyn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/eng_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/eng_fat.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/eng_init.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/eng_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/eng_list.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/eng_openssl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/eng_pkey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/eng_rdrand.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/eng_table.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/tb_asnmth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/tb_cipher.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/tb_dh.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/tb_digest.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/tb_dsa.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/tb_eckey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/tb_pkmeth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/tb_rand.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/tb_rsa.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/err/err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/err/err_all.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/err/err_prn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/bio_b64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/bio_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/bio_md.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/bio_ok.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/c_allc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/c_alld.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/cmeth_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/digest.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/e_aes.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto",
                     "crypto/modes",
@@ -6999,21 +6672,18 @@ our %unified_info = (
             "crypto/evp/e_aes_cbc_hmac_sha1.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto/modes",
                 ],
             "crypto/evp/e_aes_cbc_hmac_sha256.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto/modes",
                 ],
             "crypto/evp/e_aria.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto",
                     "crypto/modes",
@@ -7021,13 +6691,11 @@ our %unified_info = (
             "crypto/evp/e_bf.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/e_camellia.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto",
                     "crypto/modes",
@@ -7035,81 +6703,68 @@ our %unified_info = (
             "crypto/evp/e_cast.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/e_chacha20_poly1305.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/e_des.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto",
                 ],
             "crypto/evp/e_des3.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto",
                 ],
             "crypto/evp/e_idea.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/e_null.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/e_old.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/e_rc2.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/e_rc4.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/e_rc4_hmac_md5.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/e_rc5.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/e_seed.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/e_sm4.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto",
                     "crypto/modes",
@@ -7117,328 +6772,267 @@ our %unified_info = (
             "crypto/evp/e_xcbc_d.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/encode.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/evp_cnf.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/evp_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/evp_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/evp_key.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/evp_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/evp_pbe.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/evp_pkey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/m_md2.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/m_md4.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/m_md5.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/m_md5_sha1.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/m_mdc2.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/m_null.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/m_ripemd.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/m_sha1.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/m_sha3.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto",
                 ],
             "crypto/evp/m_sigver.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/m_wp.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/names.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/p5_crpt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/p5_crpt2.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/p_dec.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/p_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/p_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/p_open.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/p_seal.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/p_sign.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/p_verify.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/pbe_scrypt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/pmeth_fn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/pmeth_gn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/pmeth_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ex_data.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/getenv.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/hmac/hm_ameth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/hmac/hm_pmeth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/hmac/hmac.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/idea/i_cbc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/idea/i_cfb64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/idea/i_ecb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/idea/i_ofb64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/idea/i_skey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
-            "crypto/include/internal/bn_conf.h" =>
-                [
-                    ".",
-                ],
-            "crypto/include/internal/dso_conf.h" =>
-                [
-                    ".",
-                ],
             "crypto/init.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/kdf/hkdf.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/kdf/kdf_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/kdf/scrypt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/kdf/tls1_prf.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/lhash/lh_stats.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/lhash/lhash.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/md4/md4_dgst.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/md4/md4_one.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/md5/md5-sparcv9.o" =>
@@ -7448,91 +7042,76 @@ our %unified_info = (
             "crypto/md5/md5-x86_64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/md5/md5_dgst.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/md5/md5_one.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/mdc2/mdc2_one.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/mdc2/mdc2dgst.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/mem.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/mem_dbg.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/mem_sec.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/modes/aesni-gcm-x86_64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/modes/cbc128.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/modes/ccm128.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/modes/cfb128.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/modes/ctr128.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/modes/cts128.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/modes/gcm128.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto",
                 ],
@@ -7551,7 +7130,6 @@ our %unified_info = (
             "crypto/modes/ghash-x86_64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/modes/ghashv8-armx.o" =>
@@ -7561,361 +7139,301 @@ our %unified_info = (
             "crypto/modes/ocb128.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/modes/ofb128.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/modes/wrap128.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/modes/xts128.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/o_dir.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/o_fips.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/o_fopen.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/o_init.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/o_str.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/o_time.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/objects/o_names.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/objects/obj_dat.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/objects/obj_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/objects/obj_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/objects/obj_xref.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ocsp/ocsp_asn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ocsp/ocsp_cl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ocsp/ocsp_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ocsp/ocsp_ext.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ocsp/ocsp_ht.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ocsp/ocsp_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ocsp/ocsp_prn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ocsp/ocsp_srv.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ocsp/ocsp_vfy.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ocsp/v3_ocsp.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pem/pem_all.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pem/pem_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pem/pem_info.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pem/pem_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pem/pem_oth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pem/pem_pk8.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pem/pem_pkey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pem/pem_sign.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pem/pem_x509.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pem/pem_xaux.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pem/pvkfmt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_add.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_asn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_attr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_crpt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_crt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_decr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_init.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_key.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_kiss.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_mutl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_npas.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_p8d.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_p8e.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_sbag.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_utl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/pk12err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs7/bio_pk7.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs7/pk7_asn1.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs7/pk7_attr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs7/pk7_doit.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs7/pk7_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs7/pk7_mime.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs7/pk7_smime.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs7/pkcs7err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/poly1305/poly1305-armv4.o" =>
@@ -7937,265 +7455,221 @@ our %unified_info = (
             "crypto/poly1305/poly1305-x86_64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/poly1305/poly1305.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/poly1305/poly1305_ameth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/poly1305/poly1305_pmeth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rand/drbg_ctr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rand/drbg_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rand/rand_egd.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rand/rand_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rand/rand_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rand/rand_unix.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rand/rand_vms.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rand/rand_win.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rand/randfile.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rc2/rc2_cbc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rc2/rc2_ecb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rc2/rc2_skey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rc2/rc2cfb64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rc2/rc2ofb64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rc4/rc4-md5-x86_64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rc4/rc4-x86_64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ripemd/rmd_dgst.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ripemd/rmd_one.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_ameth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_asn1.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_chk.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_crpt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_depr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_gen.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_meth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_mp.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_none.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_oaep.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_ossl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_pk1.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_pmeth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_prn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_pss.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_saos.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_sign.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_ssl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_x931.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_x931g.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/s390xcpuid.o" =>
@@ -8205,31 +7679,26 @@ our %unified_info = (
             "crypto/seed/seed.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/seed/seed_cbc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/seed/seed_cfb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/seed/seed_ecb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/seed/seed_ofb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sha/keccak1600-armv4.o" =>
@@ -8239,7 +7708,6 @@ our %unified_info = (
             "crypto/sha/keccak1600-x86_64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sha/sha1-armv4-large.o" =>
@@ -8253,7 +7721,6 @@ our %unified_info = (
             "crypto/sha/sha1-mb-x86_64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sha/sha1-mips.o" =>
@@ -8271,19 +7738,16 @@ our %unified_info = (
             "crypto/sha/sha1-x86_64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sha/sha1_one.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sha/sha1dgst.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sha/sha256-armv4.o" =>
@@ -8297,7 +7761,6 @@ our %unified_info = (
             "crypto/sha/sha256-mb-x86_64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sha/sha256-mips.o" =>
@@ -8315,13 +7778,11 @@ our %unified_info = (
             "crypto/sha/sha256-x86_64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sha/sha256.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sha/sha512-armv4.o" =>
@@ -8347,727 +7808,606 @@ our %unified_info = (
             "crypto/sha/sha512-x86_64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sha/sha512.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/siphash/siphash.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/siphash/siphash_ameth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/siphash/siphash_pmeth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sm2/sm2_crypt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sm2/sm2_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sm2/sm2_pmeth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sm2/sm2_sign.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sm3/m_sm3.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sm3/sm3.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sm4/sm4.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/srp/srp_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/srp/srp_vfy.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/stack/stack.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/store/loader_file.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/store/store_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/store/store_init.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/store/store_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/store/store_register.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/store/store_strings.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/threads_none.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/threads_pthread.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/threads_win.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ts/ts_asn1.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ts/ts_conf.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ts/ts_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ts/ts_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ts/ts_req_print.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ts/ts_req_utils.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ts/ts_rsp_print.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ts/ts_rsp_sign.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ts/ts_rsp_utils.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ts/ts_rsp_verify.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ts/ts_verify_ctx.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/txt_db/txt_db.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ui/ui_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ui/ui_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ui/ui_null.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ui/ui_openssl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ui/ui_util.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/uid.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/whrlpool/wp-x86_64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/whrlpool/wp_dgst.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/by_dir.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/by_file.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/t_crl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/t_req.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/t_x509.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_att.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_cmp.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_d2.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_def.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_ext.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_lu.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_meth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_obj.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_r2x.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_req.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_set.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_trs.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_txt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_v3.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_vfy.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_vpm.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509cset.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509name.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509rset.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509spki.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509type.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x_all.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x_attrib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x_crl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x_exten.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x_name.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x_pubkey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x_req.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x_x509.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x_x509a.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/pcy_cache.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/pcy_data.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/pcy_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/pcy_map.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/pcy_node.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/pcy_tree.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_addr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_admis.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_akey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_akeya.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_alt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_asid.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_bcons.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_bitst.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_conf.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_cpols.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_crld.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_enum.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_extku.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_genn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_ia5.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_info.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_int.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_ncons.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_pci.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_pcia.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_pcons.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_pku.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_pmaps.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_prn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_purp.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_skey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_sxnet.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_tlsf.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_utl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x86_64cpuid.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "engines/e_capi.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "engines/e_padlock-x86_64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "engines/e_padlock.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "fuzz/asn1.o" =>
@@ -9118,6 +8458,14 @@ our %unified_info = (
                 [
                     "include",
                 ],
+            "include/crypto/bn_conf.h" =>
+                [
+                    ".",
+                ],
+            "include/crypto/dso_conf.h" =>
+                [
+                    ".",
+                ],
             "include/openssl/opensslconf.h" =>
                 [
                     ".",
@@ -9362,7 +8710,6 @@ our %unified_info = (
                 [
                     ".",
                     "include",
-                    "crypto/include",
                 ],
             "test/asn1_string_table_test.o" =>
                 [
@@ -9688,7 +9035,6 @@ our %unified_info = (
                 [
                     ".",
                     "include",
-                    "crypto/include",
                 ],
             "test/cipher_overhead_test.o" =>
                 [
@@ -9734,7 +9080,6 @@ our %unified_info = (
             "test/ctype_internal_test.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "test/curve448_internal_test.o" =>
@@ -9800,7 +9145,6 @@ our %unified_info = (
                 [
                     "include",
                     "crypto/ec",
-                    "crypto/include",
                 ],
             "test/ecdsatest.o" =>
                 [
@@ -9825,7 +9169,6 @@ our %unified_info = (
             "test/evp_extra_test.o" =>
                 [
                     "include",
-                    "crypto/include",
                 ],
             "test/evp_test.o" =>
                 [
@@ -9923,7 +9266,6 @@ our %unified_info = (
                 [
                     ".",
                     "include",
-                    "crypto/include",
                 ],
             "test/rc2test.o" =>
                 [
@@ -9973,18 +9315,15 @@ our %unified_info = (
                 [
                     ".",
                     "include",
-                    "crypto/include",
                 ],
             "test/sm2_internal_test.o" =>
                 [
                     "include",
-                    "crypto/include",
                 ],
             "test/sm4_internal_test.o" =>
                 [
                     ".",
                     "include",
-                    "crypto/include",
                 ],
             "test/srptest.o" =>
                 [
@@ -9995,6 +9334,10 @@ our %unified_info = (
                     ".",
                     "include",
                 ],
+            "test/ssl_ctx_test.o" =>
+                [
+                    "include",
+                ],
             "test/ssl_test.o" =>
                 [
                     "include",
@@ -10058,10 +9401,6 @@ our %unified_info = (
                 [
                     "include",
                 ],
-            "test/testutil/init.o" =>
-                [
-                    "include",
-                ],
             "test/testutil/main.o" =>
                 [
                     "include",
@@ -10090,6 +9429,10 @@ our %unified_info = (
                 [
                     "include",
                 ],
+            "test/testutil/testutil_init.o" =>
+                [
+                    "include",
+                ],
             "test/threadstest.o" =>
                 [
                     "include",
@@ -10354,6 +9697,7 @@ our %unified_info = (
             "test/sm4_internal_test",
             "test/srptest",
             "test/ssl_cert_table_internal_test",
+            "test/ssl_ctx_test",
             "test/ssl_test",
             "test/ssl_test_ctx_test",
             "test/sslapitest",
@@ -15359,7 +14703,6 @@ our %unified_info = (
                     "test/testutil/cb.o",
                     "test/testutil/driver.o",
                     "test/testutil/format_output.o",
-                    "test/testutil/init.o",
                     "test/testutil/main.o",
                     "test/testutil/output_helpers.o",
                     "test/testutil/random.o",
@@ -15367,6 +14710,7 @@ our %unified_info = (
                     "test/testutil/tap_bio.o",
                     "test/testutil/test_cleanup.o",
                     "test/testutil/tests.o",
+                    "test/testutil/testutil_init.o",
                 ],
             "test/md2test" =>
                 [
@@ -15594,6 +14938,14 @@ our %unified_info = (
                 [
                     "test/ssl_cert_table_internal_test.c",
                 ],
+            "test/ssl_ctx_test" =>
+                [
+                    "test/ssl_ctx_test.o",
+                ],
+            "test/ssl_ctx_test.o" =>
+                [
+                    "test/ssl_ctx_test.c",
+                ],
             "test/ssl_test" =>
                 [
                     "test/handshake_helper.o",
@@ -15696,10 +15048,6 @@ our %unified_info = (
                 [
                     "test/testutil/format_output.c",
                 ],
-            "test/testutil/init.o" =>
-                [
-                    "test/testutil/init.c",
-                ],
             "test/testutil/main.o" =>
                 [
                     "test/testutil/main.c",
@@ -15728,6 +15076,10 @@ our %unified_info = (
                 [
                     "test/testutil/tests.c",
                 ],
+            "test/testutil/testutil_init.o" =>
+                [
+                    "test/testutil/testutil_init.c",
+                ],
             "test/threadstest" =>
                 [
                     "test/threadstest.o",
diff --git a/deps/openssl/config/archs/darwin64-x86_64-cc/asm/crypto/aes/aes-x86_64.s b/deps/openssl/config/archs/darwin64-x86_64-cc/asm/crypto/aes/aes-x86_64.s
deleted file mode 100644
index ee148d19dc..0000000000
--- a/deps/openssl/config/archs/darwin64-x86_64-cc/asm/crypto/aes/aes-x86_64.s
+++ /dev/null
@@ -1,2631 +0,0 @@
-.text	
-
-.p2align	4
-_x86_64_AES_encrypt:
-	xorl	0(%r15),%eax
-	xorl	4(%r15),%ebx
-	xorl	8(%r15),%ecx
-	xorl	12(%r15),%edx
-
-	movl	240(%r15),%r13d
-	subl	$1,%r13d
-	jmp	L$enc_loop
-.p2align	4
-L$enc_loop:
-
-	movzbl	%al,%esi
-	movzbl	%bl,%edi
-	movzbl	%cl,%ebp
-	movl	0(%r14,%rsi,8),%r10d
-	movl	0(%r14,%rdi,8),%r11d
-	movl	0(%r14,%rbp,8),%r12d
-
-	movzbl	%bh,%esi
-	movzbl	%ch,%edi
-	movzbl	%dl,%ebp
-	xorl	3(%r14,%rsi,8),%r10d
-	xorl	3(%r14,%rdi,8),%r11d
-	movl	0(%r14,%rbp,8),%r8d
-
-	movzbl	%dh,%esi
-	shrl	$16,%ecx
-	movzbl	%ah,%ebp
-	xorl	3(%r14,%rsi,8),%r12d
-	shrl	$16,%edx
-	xorl	3(%r14,%rbp,8),%r8d
-
-	shrl	$16,%ebx
-	leaq	16(%r15),%r15
-	shrl	$16,%eax
-
-	movzbl	%cl,%esi
-	movzbl	%dl,%edi
-	movzbl	%al,%ebp
-	xorl	2(%r14,%rsi,8),%r10d
-	xorl	2(%r14,%rdi,8),%r11d
-	xorl	2(%r14,%rbp,8),%r12d
-
-	movzbl	%dh,%esi
-	movzbl	%ah,%edi
-	movzbl	%bl,%ebp
-	xorl	1(%r14,%rsi,8),%r10d
-	xorl	1(%r14,%rdi,8),%r11d
-	xorl	2(%r14,%rbp,8),%r8d
-
-	movl	12(%r15),%edx
-	movzbl	%bh,%edi
-	movzbl	%ch,%ebp
-	movl	0(%r15),%eax
-	xorl	1(%r14,%rdi,8),%r12d
-	xorl	1(%r14,%rbp,8),%r8d
-
-	movl	4(%r15),%ebx
-	movl	8(%r15),%ecx
-	xorl	%r10d,%eax
-	xorl	%r11d,%ebx
-	xorl	%r12d,%ecx
-	xorl	%r8d,%edx
-	subl	$1,%r13d
-	jnz	L$enc_loop
-	movzbl	%al,%esi
-	movzbl	%bl,%edi
-	movzbl	%cl,%ebp
-	movzbl	2(%r14,%rsi,8),%r10d
-	movzbl	2(%r14,%rdi,8),%r11d
-	movzbl	2(%r14,%rbp,8),%r12d
-
-	movzbl	%dl,%esi
-	movzbl	%bh,%edi
-	movzbl	%ch,%ebp
-	movzbl	2(%r14,%rsi,8),%r8d
-	movl	0(%r14,%rdi,8),%edi
-	movl	0(%r14,%rbp,8),%ebp
-
-	andl	$0x0000ff00,%edi
-	andl	$0x0000ff00,%ebp
-
-	xorl	%edi,%r10d
-	xorl	%ebp,%r11d
-	shrl	$16,%ecx
-
-	movzbl	%dh,%esi
-	movzbl	%ah,%edi
-	shrl	$16,%edx
-	movl	0(%r14,%rsi,8),%esi
-	movl	0(%r14,%rdi,8),%edi
-
-	andl	$0x0000ff00,%esi
-	andl	$0x0000ff00,%edi
-	shrl	$16,%ebx
-	xorl	%esi,%r12d
-	xorl	%edi,%r8d
-	shrl	$16,%eax
-
-	movzbl	%cl,%esi
-	movzbl	%dl,%edi
-	movzbl	%al,%ebp
-	movl	0(%r14,%rsi,8),%esi
-	movl	0(%r14,%rdi,8),%edi
-	movl	0(%r14,%rbp,8),%ebp
-
-	andl	$0x00ff0000,%esi
-	andl	$0x00ff0000,%edi
-	andl	$0x00ff0000,%ebp
-
-	xorl	%esi,%r10d
-	xorl	%edi,%r11d
-	xorl	%ebp,%r12d
-
-	movzbl	%bl,%esi
-	movzbl	%dh,%edi
-	movzbl	%ah,%ebp
-	movl	0(%r14,%rsi,8),%esi
-	movl	2(%r14,%rdi,8),%edi
-	movl	2(%r14,%rbp,8),%ebp
-
-	andl	$0x00ff0000,%esi
-	andl	$0xff000000,%edi
-	andl	$0xff000000,%ebp
-
-	xorl	%esi,%r8d
-	xorl	%edi,%r10d
-	xorl	%ebp,%r11d
-
-	movzbl	%bh,%esi
-	movzbl	%ch,%edi
-	movl	16+12(%r15),%edx
-	movl	2(%r14,%rsi,8),%esi
-	movl	2(%r14,%rdi,8),%edi
-	movl	16+0(%r15),%eax
-
-	andl	$0xff000000,%esi
-	andl	$0xff000000,%edi
-
-	xorl	%esi,%r12d
-	xorl	%edi,%r8d
-
-	movl	16+4(%r15),%ebx
-	movl	16+8(%r15),%ecx
-	xorl	%r10d,%eax
-	xorl	%r11d,%ebx
-	xorl	%r12d,%ecx
-	xorl	%r8d,%edx
-.byte	0xf3,0xc3
-
-
-.p2align	4
-_x86_64_AES_encrypt_compact:
-
-	leaq	128(%r14),%r8
-	movl	0-128(%r8),%edi
-	movl	32-128(%r8),%ebp
-	movl	64-128(%r8),%r10d
-	movl	96-128(%r8),%r11d
-	movl	128-128(%r8),%edi
-	movl	160-128(%r8),%ebp
-	movl	192-128(%r8),%r10d
-	movl	224-128(%r8),%r11d
-	jmp	L$enc_loop_compact
-.p2align	4
-L$enc_loop_compact:
-	xorl	0(%r15),%eax
-	xorl	4(%r15),%ebx
-	xorl	8(%r15),%ecx
-	xorl	12(%r15),%edx
-	leaq	16(%r15),%r15
-	movzbl	%al,%r10d
-	movzbl	%bl,%r11d
-	movzbl	%cl,%r12d
-	movzbl	%dl,%r8d
-	movzbl	%bh,%esi
-	movzbl	%ch,%edi
-	shrl	$16,%ecx
-	movzbl	%dh,%ebp
-	movzbl	(%r14,%r10,1),%r10d
-	movzbl	(%r14,%r11,1),%r11d
-	movzbl	(%r14,%r12,1),%r12d
-	movzbl	(%r14,%r8,1),%r8d
-
-	movzbl	(%r14,%rsi,1),%r9d
-	movzbl	%ah,%esi
-	movzbl	(%r14,%rdi,1),%r13d
-	movzbl	%cl,%edi
-	movzbl	(%r14,%rbp,1),%ebp
-	movzbl	(%r14,%rsi,1),%esi
-
-	shll	$8,%r9d
-	shrl	$16,%edx
-	shll	$8,%r13d
-	xorl	%r9d,%r10d
-	shrl	$16,%eax
-	movzbl	%dl,%r9d
-	shrl	$16,%ebx
-	xorl	%r13d,%r11d
-	shll	$8,%ebp
-	movzbl	%al,%r13d
-	movzbl	(%r14,%rdi,1),%edi
-	xorl	%ebp,%r12d
-
-	shll	$8,%esi
-	movzbl	%bl,%ebp
-	shll	$16,%edi
-	xorl	%esi,%r8d
-	movzbl	(%r14,%r9,1),%r9d
-	movzbl	%dh,%esi
-	movzbl	(%r14,%r13,1),%r13d
-	xorl	%edi,%r10d
-
-	shrl	$8,%ecx
-	movzbl	%ah,%edi
-	shll	$16,%r9d
-	shrl	$8,%ebx
-	shll	$16,%r13d
-	xorl	%r9d,%r11d
-	movzbl	(%r14,%rbp,1),%ebp
-	movzbl	(%r14,%rsi,1),%esi
-	movzbl	(%r14,%rdi,1),%edi
-	movzbl	(%r14,%rcx,1),%edx
-	movzbl	(%r14,%rbx,1),%ecx
-
-	shll	$16,%ebp
-	xorl	%r13d,%r12d
-	shll	$24,%esi
-	xorl	%ebp,%r8d
-	shll	$24,%edi
-	xorl	%esi,%r10d
-	shll	$24,%edx
-	xorl	%edi,%r11d
-	shll	$24,%ecx
-	movl	%r10d,%eax
-	movl	%r11d,%ebx
-	xorl	%r12d,%ecx
-	xorl	%r8d,%edx
-	cmpq	16(%rsp),%r15
-	je	L$enc_compact_done
-	movl	$0x80808080,%r10d
-	movl	$0x80808080,%r11d
-	andl	%eax,%r10d
-	andl	%ebx,%r11d
-	movl	%r10d,%esi
-	movl	%r11d,%edi
-	shrl	$7,%r10d
-	leal	(%rax,%rax,1),%r8d
-	shrl	$7,%r11d
-	leal	(%rbx,%rbx,1),%r9d
-	subl	%r10d,%esi
-	subl	%r11d,%edi
-	andl	$0xfefefefe,%r8d
-	andl	$0xfefefefe,%r9d
-	andl	$0x1b1b1b1b,%esi
-	andl	$0x1b1b1b1b,%edi
-	movl	%eax,%r10d
-	movl	%ebx,%r11d
-	xorl	%esi,%r8d
-	xorl	%edi,%r9d
-
-	xorl	%r8d,%eax
-	xorl	%r9d,%ebx
-	movl	$0x80808080,%r12d
-	roll	$24,%eax
-	movl	$0x80808080,%ebp
-	roll	$24,%ebx
-	andl	%ecx,%r12d
-	andl	%edx,%ebp
-	xorl	%r8d,%eax
-	xorl	%r9d,%ebx
-	movl	%r12d,%esi
-	rorl	$16,%r10d
-	movl	%ebp,%edi
-	rorl	$16,%r11d
-	leal	(%rcx,%rcx,1),%r8d
-	shrl	$7,%r12d
-	xorl	%r10d,%eax
-	shrl	$7,%ebp
-	xorl	%r11d,%ebx
-	rorl	$8,%r10d
-	leal	(%rdx,%rdx,1),%r9d
-	rorl	$8,%r11d
-	subl	%r12d,%esi
-	subl	%ebp,%edi
-	xorl	%r10d,%eax
-	xorl	%r11d,%ebx
-
-	andl	$0xfefefefe,%r8d
-	andl	$0xfefefefe,%r9d
-	andl	$0x1b1b1b1b,%esi
-	andl	$0x1b1b1b1b,%edi
-	movl	%ecx,%r12d
-	movl	%edx,%ebp
-	xorl	%esi,%r8d
-	xorl	%edi,%r9d
-
-	rorl	$16,%r12d
-	xorl	%r8d,%ecx
-	rorl	$16,%ebp
-	xorl	%r9d,%edx
-	roll	$24,%ecx
-	movl	0(%r14),%esi
-	roll	$24,%edx
-	xorl	%r8d,%ecx
-	movl	64(%r14),%edi
-	xorl	%r9d,%edx
-	movl	128(%r14),%r8d
-	xorl	%r12d,%ecx
-	rorl	$8,%r12d
-	xorl	%ebp,%edx
-	rorl	$8,%ebp
-	xorl	%r12d,%ecx
-	movl	192(%r14),%r9d
-	xorl	%ebp,%edx
-	jmp	L$enc_loop_compact
-.p2align	4
-L$enc_compact_done:
-	xorl	0(%r15),%eax
-	xorl	4(%r15),%ebx
-	xorl	8(%r15),%ecx
-	xorl	12(%r15),%edx
-.byte	0xf3,0xc3
-
-
-.globl	_AES_encrypt
-
-.p2align	4
-.globl	_asm_AES_encrypt
-.private_extern	_asm_AES_encrypt
-_asm_AES_encrypt:
-_AES_encrypt:
-
-	movq	%rsp,%rax
-
-	pushq	%rbx
-
-	pushq	%rbp
-
-	pushq	%r12
-
-	pushq	%r13
-
-	pushq	%r14
-
-	pushq	%r15
-
-
-
-	leaq	-63(%rdx),%rcx
-	andq	$-64,%rsp
-	subq	%rsp,%rcx
-	negq	%rcx
-	andq	$0x3c0,%rcx
-	subq	%rcx,%rsp
-	subq	$32,%rsp
-
-	movq	%rsi,16(%rsp)
-	movq	%rax,24(%rsp)
-
-L$enc_prologue:
-
-	movq	%rdx,%r15
-	movl	240(%r15),%r13d
-
-	movl	0(%rdi),%eax
-	movl	4(%rdi),%ebx
-	movl	8(%rdi),%ecx
-	movl	12(%rdi),%edx
-
-	shll	$4,%r13d
-	leaq	(%r15,%r13,1),%rbp
-	movq	%r15,(%rsp)
-	movq	%rbp,8(%rsp)
-
-
-	leaq	L$AES_Te+2048(%rip),%r14
-	leaq	768(%rsp),%rbp
-	subq	%r14,%rbp
-	andq	$0x300,%rbp
-	leaq	(%r14,%rbp,1),%r14
-
-	call	_x86_64_AES_encrypt_compact
-
-	movq	16(%rsp),%r9
-	movq	24(%rsp),%rsi
-
-	movl	%eax,0(%r9)
-	movl	%ebx,4(%r9)
-	movl	%ecx,8(%r9)
-	movl	%edx,12(%r9)
-
-	movq	-48(%rsi),%r15
-
-	movq	-40(%rsi),%r14
-
-	movq	-32(%rsi),%r13
-
-	movq	-24(%rsi),%r12
-
-	movq	-16(%rsi),%rbp
-
-	movq	-8(%rsi),%rbx
-
-	leaq	(%rsi),%rsp
-
-L$enc_epilogue:
-	.byte	0xf3,0xc3
-
-
-
-.p2align	4
-_x86_64_AES_decrypt:
-	xorl	0(%r15),%eax
-	xorl	4(%r15),%ebx
-	xorl	8(%r15),%ecx
-	xorl	12(%r15),%edx
-
-	movl	240(%r15),%r13d
-	subl	$1,%r13d
-	jmp	L$dec_loop
-.p2align	4
-L$dec_loop:
-
-	movzbl	%al,%esi
-	movzbl	%bl,%edi
-	movzbl	%cl,%ebp
-	movl	0(%r14,%rsi,8),%r10d
-	movl	0(%r14,%rdi,8),%r11d
-	movl	0(%r14,%rbp,8),%r12d
-
-	movzbl	%dh,%esi
-	movzbl	%ah,%edi
-	movzbl	%dl,%ebp
-	xorl	3(%r14,%rsi,8),%r10d
-	xorl	3(%r14,%rdi,8),%r11d
-	movl	0(%r14,%rbp,8),%r8d
-
-	movzbl	%bh,%esi
-	shrl	$16,%eax
-	movzbl	%ch,%ebp
-	xorl	3(%r14,%rsi,8),%r12d
-	shrl	$16,%edx
-	xorl	3(%r14,%rbp,8),%r8d
-
-	shrl	$16,%ebx
-	leaq	16(%r15),%r15
-	shrl	$16,%ecx
-
-	movzbl	%cl,%esi
-	movzbl	%dl,%edi
-	movzbl	%al,%ebp
-	xorl	2(%r14,%rsi,8),%r10d
-	xorl	2(%r14,%rdi,8),%r11d
-	xorl	2(%r14,%rbp,8),%r12d
-
-	movzbl	%bh,%esi
-	movzbl	%ch,%edi
-	movzbl	%bl,%ebp
-	xorl	1(%r14,%rsi,8),%r10d
-	xorl	1(%r14,%rdi,8),%r11d
-	xorl	2(%r14,%rbp,8),%r8d
-
-	movzbl	%dh,%esi
-	movl	12(%r15),%edx
-	movzbl	%ah,%ebp
-	xorl	1(%r14,%rsi,8),%r12d
-	movl	0(%r15),%eax
-	xorl	1(%r14,%rbp,8),%r8d
-
-	xorl	%r10d,%eax
-	movl	4(%r15),%ebx
-	movl	8(%r15),%ecx
-	xorl	%r12d,%ecx
-	xorl	%r11d,%ebx
-	xorl	%r8d,%edx
-	subl	$1,%r13d
-	jnz	L$dec_loop
-	leaq	2048(%r14),%r14
-	movzbl	%al,%esi
-	movzbl	%bl,%edi
-	movzbl	%cl,%ebp
-	movzbl	(%r14,%rsi,1),%r10d
-	movzbl	(%r14,%rdi,1),%r11d
-	movzbl	(%r14,%rbp,1),%r12d
-
-	movzbl	%dl,%esi
-	movzbl	%dh,%edi
-	movzbl	%ah,%ebp
-	movzbl	(%r14,%rsi,1),%r8d
-	movzbl	(%r14,%rdi,1),%edi
-	movzbl	(%r14,%rbp,1),%ebp
-
-	shll	$8,%edi
-	shll	$8,%ebp
-
-	xorl	%edi,%r10d
-	xorl	%ebp,%r11d
-	shrl	$16,%edx
-
-	movzbl	%bh,%esi
-	movzbl	%ch,%edi
-	shrl	$16,%eax
-	movzbl	(%r14,%rsi,1),%esi
-	movzbl	(%r14,%rdi,1),%edi
-
-	shll	$8,%esi
-	shll	$8,%edi
-	shrl	$16,%ebx
-	xorl	%esi,%r12d
-	xorl	%edi,%r8d
-	shrl	$16,%ecx
-
-	movzbl	%cl,%esi
-	movzbl	%dl,%edi
-	movzbl	%al,%ebp
-	movzbl	(%r14,%rsi,1),%esi
-	movzbl	(%r14,%rdi,1),%edi
-	movzbl	(%r14,%rbp,1),%ebp
-
-	shll	$16,%esi
-	shll	$16,%edi
-	shll	$16,%ebp
-
-	xorl	%esi,%r10d
-	xorl	%edi,%r11d
-	xorl	%ebp,%r12d
-
-	movzbl	%bl,%esi
-	movzbl	%bh,%edi
-	movzbl	%ch,%ebp
-	movzbl	(%r14,%rsi,1),%esi
-	movzbl	(%r14,%rdi,1),%edi
-	movzbl	(%r14,%rbp,1),%ebp
-
-	shll	$16,%esi
-	shll	$24,%edi
-	shll	$24,%ebp
-
-	xorl	%esi,%r8d
-	xorl	%edi,%r10d
-	xorl	%ebp,%r11d
-
-	movzbl	%dh,%esi
-	movzbl	%ah,%edi
-	movl	16+12(%r15),%edx
-	movzbl	(%r14,%rsi,1),%esi
-	movzbl	(%r14,%rdi,1),%edi
-	movl	16+0(%r15),%eax
-
-	shll	$24,%esi
-	shll	$24,%edi
-
-	xorl	%esi,%r12d
-	xorl	%edi,%r8d
-
-	movl	16+4(%r15),%ebx
-	movl	16+8(%r15),%ecx
-	leaq	-2048(%r14),%r14
-	xorl	%r10d,%eax
-	xorl	%r11d,%ebx
-	xorl	%r12d,%ecx
-	xorl	%r8d,%edx
-.byte	0xf3,0xc3
-
-
-.p2align	4
-_x86_64_AES_decrypt_compact:
-
-	leaq	128(%r14),%r8
-	movl	0-128(%r8),%edi
-	movl	32-128(%r8),%ebp
-	movl	64-128(%r8),%r10d
-	movl	96-128(%r8),%r11d
-	movl	128-128(%r8),%edi
-	movl	160-128(%r8),%ebp
-	movl	192-128(%r8),%r10d
-	movl	224-128(%r8),%r11d
-	jmp	L$dec_loop_compact
-
-.p2align	4
-L$dec_loop_compact:
-	xorl	0(%r15),%eax
-	xorl	4(%r15),%ebx
-	xorl	8(%r15),%ecx
-	xorl	12(%r15),%edx
-	leaq	16(%r15),%r15
-	movzbl	%al,%r10d
-	movzbl	%bl,%r11d
-	movzbl	%cl,%r12d
-	movzbl	%dl,%r8d
-	movzbl	%dh,%esi
-	movzbl	%ah,%edi
-	shrl	$16,%edx
-	movzbl	%bh,%ebp
-	movzbl	(%r14,%r10,1),%r10d
-	movzbl	(%r14,%r11,1),%r11d
-	movzbl	(%r14,%r12,1),%r12d
-	movzbl	(%r14,%r8,1),%r8d
-
-	movzbl	(%r14,%rsi,1),%r9d
-	movzbl	%ch,%esi
-	movzbl	(%r14,%rdi,1),%r13d
-	movzbl	(%r14,%rbp,1),%ebp
-	movzbl	(%r14,%rsi,1),%esi
-
-	shrl	$16,%ecx
-	shll	$8,%r13d
-	shll	$8,%r9d
-	movzbl	%cl,%edi
-	shrl	$16,%eax
-	xorl	%r9d,%r10d
-	shrl	$16,%ebx
-	movzbl	%dl,%r9d
-
-	shll	$8,%ebp
-	xorl	%r13d,%r11d
-	shll	$8,%esi
-	movzbl	%al,%r13d
-	movzbl	(%r14,%rdi,1),%edi
-	xorl	%ebp,%r12d
-	movzbl	%bl,%ebp
-
-	shll	$16,%edi
-	xorl	%esi,%r8d
-	movzbl	(%r14,%r9,1),%r9d
-	movzbl	%bh,%esi
-	movzbl	(%r14,%rbp,1),%ebp
-	xorl	%edi,%r10d
-	movzbl	(%r14,%r13,1),%r13d
-	movzbl	%ch,%edi
-
-	shll	$16,%ebp
-	shll	$16,%r9d
-	shll	$16,%r13d
-	xorl	%ebp,%r8d
-	movzbl	%dh,%ebp
-	xorl	%r9d,%r11d
-	shrl	$8,%eax
-	xorl	%r13d,%r12d
-
-	movzbl	(%r14,%rsi,1),%esi
-	movzbl	(%r14,%rdi,1),%ebx
-	movzbl	(%r14,%rbp,1),%ecx
-	movzbl	(%r14,%rax,1),%edx
-
-	movl	%r10d,%eax
-	shll	$24,%esi
-	shll	$24,%ebx
-	shll	$24,%ecx
-	xorl	%esi,%eax
-	shll	$24,%edx
-	xorl	%r11d,%ebx
-	xorl	%r12d,%ecx
-	xorl	%r8d,%edx
-	cmpq	16(%rsp),%r15
-	je	L$dec_compact_done
-
-	movq	256+0(%r14),%rsi
-	shlq	$32,%rbx
-	shlq	$32,%rdx
-	movq	256+8(%r14),%rdi
-	orq	%rbx,%rax
-	orq	%rdx,%rcx
-	movq	256+16(%r14),%rbp
-	movq	%rsi,%r9
-	movq	%rsi,%r12
-	andq	%rax,%r9
-	andq	%rcx,%r12
-	movq	%r9,%rbx
-	movq	%r12,%rdx
-	shrq	$7,%r9
-	leaq	(%rax,%rax,1),%r8
-	shrq	$7,%r12
-	leaq	(%rcx,%rcx,1),%r11
-	subq	%r9,%rbx
-	subq	%r12,%rdx
-	andq	%rdi,%r8
-	andq	%rdi,%r11
-	andq	%rbp,%rbx
-	andq	%rbp,%rdx
-	xorq	%rbx,%r8
-	xorq	%rdx,%r11
-	movq	%rsi,%r10
-	movq	%rsi,%r13
-
-	andq	%r8,%r10
-	andq	%r11,%r13
-	movq	%r10,%rbx
-	movq	%r13,%rdx
-	shrq	$7,%r10
-	leaq	(%r8,%r8,1),%r9
-	shrq	$7,%r13
-	leaq	(%r11,%r11,1),%r12
-	subq	%r10,%rbx
-	subq	%r13,%rdx
-	andq	%rdi,%r9
-	andq	%rdi,%r12
-	andq	%rbp,%rbx
-	andq	%rbp,%rdx
-	xorq	%rbx,%r9
-	xorq	%rdx,%r12
-	movq	%rsi,%r10
-	movq	%rsi,%r13
-
-	andq	%r9,%r10
-	andq	%r12,%r13
-	movq	%r10,%rbx
-	movq	%r13,%rdx
-	shrq	$7,%r10
-	xorq	%rax,%r8
-	shrq	$7,%r13
-	xorq	%rcx,%r11
-	subq	%r10,%rbx
-	subq	%r13,%rdx
-	leaq	(%r9,%r9,1),%r10
-	leaq	(%r12,%r12,1),%r13
-	xorq	%rax,%r9
-	xorq	%rcx,%r12
-	andq	%rdi,%r10
-	andq	%rdi,%r13
-	andq	%rbp,%rbx
-	andq	%rbp,%rdx
-	xorq	%rbx,%r10
-	xorq	%rdx,%r13
-
-	xorq	%r10,%rax
-	xorq	%r13,%rcx
-	xorq	%r10,%r8
-	xorq	%r13,%r11
-	movq	%rax,%rbx
-	movq	%rcx,%rdx
-	xorq	%r10,%r9
-	shrq	$32,%rbx
-	xorq	%r13,%r12
-	shrq	$32,%rdx
-	xorq	%r8,%r10
-	roll	$8,%eax
-	xorq	%r11,%r13
-	roll	$8,%ecx
-	xorq	%r9,%r10
-	roll	$8,%ebx
-	xorq	%r12,%r13
-
-	roll	$8,%edx
-	xorl	%r10d,%eax
-	shrq	$32,%r10
-	xorl	%r13d,%ecx
-	shrq	$32,%r13
-	xorl	%r10d,%ebx
-	xorl	%r13d,%edx
-
-	movq	%r8,%r10
-	roll	$24,%r8d
-	movq	%r11,%r13
-	roll	$24,%r11d
-	shrq	$32,%r10
-	xorl	%r8d,%eax
-	shrq	$32,%r13
-	xorl	%r11d,%ecx
-	roll	$24,%r10d
-	movq	%r9,%r8
-	roll	$24,%r13d
-	movq	%r12,%r11
-	shrq	$32,%r8
-	xorl	%r10d,%ebx
-	shrq	$32,%r11
-	xorl	%r13d,%edx
-
-	movq	0(%r14),%rsi
-	roll	$16,%r9d
-	movq	64(%r14),%rdi
-	roll	$16,%r12d
-	movq	128(%r14),%rbp
-	roll	$16,%r8d
-	movq	192(%r14),%r10
-	xorl	%r9d,%eax
-	roll	$16,%r11d
-	xorl	%r12d,%ecx
-	movq	256(%r14),%r13
-	xorl	%r8d,%ebx
-	xorl	%r11d,%edx
-	jmp	L$dec_loop_compact
-.p2align	4
-L$dec_compact_done:
-	xorl	0(%r15),%eax
-	xorl	4(%r15),%ebx
-	xorl	8(%r15),%ecx
-	xorl	12(%r15),%edx
-.byte	0xf3,0xc3
-
-
-.globl	_AES_decrypt
-
-.p2align	4
-.globl	_asm_AES_decrypt
-.private_extern	_asm_AES_decrypt
-_asm_AES_decrypt:
-_AES_decrypt:
-
-	movq	%rsp,%rax
-
-	pushq	%rbx
-
-	pushq	%rbp
-
-	pushq	%r12
-
-	pushq	%r13
-
-	pushq	%r14
-
-	pushq	%r15
-
-
-
-	leaq	-63(%rdx),%rcx
-	andq	$-64,%rsp
-	subq	%rsp,%rcx
-	negq	%rcx
-	andq	$0x3c0,%rcx
-	subq	%rcx,%rsp
-	subq	$32,%rsp
-
-	movq	%rsi,16(%rsp)
-	movq	%rax,24(%rsp)
-
-L$dec_prologue:
-
-	movq	%rdx,%r15
-	movl	240(%r15),%r13d
-
-	movl	0(%rdi),%eax
-	movl	4(%rdi),%ebx
-	movl	8(%rdi),%ecx
-	movl	12(%rdi),%edx
-
-	shll	$4,%r13d
-	leaq	(%r15,%r13,1),%rbp
-	movq	%r15,(%rsp)
-	movq	%rbp,8(%rsp)
-
-
-	leaq	L$AES_Td+2048(%rip),%r14
-	leaq	768(%rsp),%rbp
-	subq	%r14,%rbp
-	andq	$0x300,%rbp
-	leaq	(%r14,%rbp,1),%r14
-	shrq	$3,%rbp
-	addq	%rbp,%r14
-
-	call	_x86_64_AES_decrypt_compact
-
-	movq	16(%rsp),%r9
-	movq	24(%rsp),%rsi
-
-	movl	%eax,0(%r9)
-	movl	%ebx,4(%r9)
-	movl	%ecx,8(%r9)
-	movl	%edx,12(%r9)
-
-	movq	-48(%rsi),%r15
-
-	movq	-40(%rsi),%r14
-
-	movq	-32(%rsi),%r13
-
-	movq	-24(%rsi),%r12
-
-	movq	-16(%rsi),%rbp
-
-	movq	-8(%rsi),%rbx
-
-	leaq	(%rsi),%rsp
-
-L$dec_epilogue:
-	.byte	0xf3,0xc3
-
-
-.globl	_AES_set_encrypt_key
-
-.p2align	4
-_AES_set_encrypt_key:
-
-	pushq	%rbx
-
-	pushq	%rbp
-
-	pushq	%r12
-
-	pushq	%r13
-
-	pushq	%r14
-
-	pushq	%r15
-
-	subq	$8,%rsp
-
-L$enc_key_prologue:
-
-	call	_x86_64_AES_set_encrypt_key
-
-	movq	40(%rsp),%rbp
-
-	movq	48(%rsp),%rbx
-
-	addq	$56,%rsp
-
-L$enc_key_epilogue:
-	.byte	0xf3,0xc3
-
-
-
-
-.p2align	4
-_x86_64_AES_set_encrypt_key:
-
-	movl	%esi,%ecx
-	movq	%rdi,%rsi
-	movq	%rdx,%rdi
-
-	testq	$-1,%rsi
-	jz	L$badpointer
-	testq	$-1,%rdi
-	jz	L$badpointer
-
-	leaq	L$AES_Te(%rip),%rbp
-	leaq	2048+128(%rbp),%rbp
-
-
-	movl	0-128(%rbp),%eax
-	movl	32-128(%rbp),%ebx
-	movl	64-128(%rbp),%r8d
-	movl	96-128(%rbp),%edx
-	movl	128-128(%rbp),%eax
-	movl	160-128(%rbp),%ebx
-	movl	192-128(%rbp),%r8d
-	movl	224-128(%rbp),%edx
-
-	cmpl	$128,%ecx
-	je	L$10rounds
-	cmpl	$192,%ecx
-	je	L$12rounds
-	cmpl	$256,%ecx
-	je	L$14rounds
-	movq	$-2,%rax
-	jmp	L$exit
-
-L$10rounds:
-	movq	0(%rsi),%rax
-	movq	8(%rsi),%rdx
-	movq	%rax,0(%rdi)
-	movq	%rdx,8(%rdi)
-
-	shrq	$32,%rdx
-	xorl	%ecx,%ecx
-	jmp	L$10shortcut
-.p2align	2
-L$10loop:
-	movl	0(%rdi),%eax
-	movl	12(%rdi),%edx
-L$10shortcut:
-	movzbl	%dl,%esi
-	movzbl	-128(%rbp,%rsi,1),%ebx
-	movzbl	%dh,%esi
-	shll	$24,%ebx
-	xorl	%ebx,%eax
-
-	movzbl	-128(%rbp,%rsi,1),%ebx
-	shrl	$16,%edx
-	movzbl	%dl,%esi
-	xorl	%ebx,%eax
-
-	movzbl	-128(%rbp,%rsi,1),%ebx
-	movzbl	%dh,%esi
-	shll	$8,%ebx
-	xorl	%ebx,%eax
-
-	movzbl	-128(%rbp,%rsi,1),%ebx
-	shll	$16,%ebx
-	xorl	%ebx,%eax
-
-	xorl	1024-128(%rbp,%rcx,4),%eax
-	movl	%eax,16(%rdi)
-	xorl	4(%rdi),%eax
-	movl	%eax,20(%rdi)
-	xorl	8(%rdi),%eax
-	movl	%eax,24(%rdi)
-	xorl	12(%rdi),%eax
-	movl	%eax,28(%rdi)
-	addl	$1,%ecx
-	leaq	16(%rdi),%rdi
-	cmpl	$10,%ecx
-	jl	L$10loop
-
-	movl	$10,80(%rdi)
-	xorq	%rax,%rax
-	jmp	L$exit
-
-L$12rounds:
-	movq	0(%rsi),%rax
-	movq	8(%rsi),%rbx
-	movq	16(%rsi),%rdx
-	movq	%rax,0(%rdi)
-	movq	%rbx,8(%rdi)
-	movq	%rdx,16(%rdi)
-
-	shrq	$32,%rdx
-	xorl	%ecx,%ecx
-	jmp	L$12shortcut
-.p2align	2
-L$12loop:
-	movl	0(%rdi),%eax
-	movl	20(%rdi),%edx
-L$12shortcut:
-	movzbl	%dl,%esi
-	movzbl	-128(%rbp,%rsi,1),%ebx
-	movzbl	%dh,%esi
-	shll	$24,%ebx
-	xorl	%ebx,%eax
-
-	movzbl	-128(%rbp,%rsi,1),%ebx
-	shrl	$16,%edx
-	movzbl	%dl,%esi
-	xorl	%ebx,%eax
-
-	movzbl	-128(%rbp,%rsi,1),%ebx
-	movzbl	%dh,%esi
-	shll	$8,%ebx
-	xorl	%ebx,%eax
-
-	movzbl	-128(%rbp,%rsi,1),%ebx
-	shll	$16,%ebx
-	xorl	%ebx,%eax
-
-	xorl	1024-128(%rbp,%rcx,4),%eax
-	movl	%eax,24(%rdi)
-	xorl	4(%rdi),%eax
-	movl	%eax,28(%rdi)
-	xorl	8(%rdi),%eax
-	movl	%eax,32(%rdi)
-	xorl	12(%rdi),%eax
-	movl	%eax,36(%rdi)
-
-	cmpl	$7,%ecx
-	je	L$12break
-	addl	$1,%ecx
-
-	xorl	16(%rdi),%eax
-	movl	%eax,40(%rdi)
-	xorl	20(%rdi),%eax
-	movl	%eax,44(%rdi)
-
-	leaq	24(%rdi),%rdi
-	jmp	L$12loop
-L$12break:
-	movl	$12,72(%rdi)
-	xorq	%rax,%rax
-	jmp	L$exit
-
-L$14rounds:
-	movq	0(%rsi),%rax
-	movq	8(%rsi),%rbx
-	movq	16(%rsi),%rcx
-	movq	24(%rsi),%rdx
-	movq	%rax,0(%rdi)
-	movq	%rbx,8(%rdi)
-	movq	%rcx,16(%rdi)
-	movq	%rdx,24(%rdi)
-
-	shrq	$32,%rdx
-	xorl	%ecx,%ecx
-	jmp	L$14shortcut
-.p2align	2
-L$14loop:
-	movl	0(%rdi),%eax
-	movl	28(%rdi),%edx
-L$14shortcut:
-	movzbl	%dl,%esi
-	movzbl	-128(%rbp,%rsi,1),%ebx
-	movzbl	%dh,%esi
-	shll	$24,%ebx
-	xorl	%ebx,%eax
-
-	movzbl	-128(%rbp,%rsi,1),%ebx
-	shrl	$16,%edx
-	movzbl	%dl,%esi
-	xorl	%ebx,%eax
-
-	movzbl	-128(%rbp,%rsi,1),%ebx
-	movzbl	%dh,%esi
-	shll	$8,%ebx
-	xorl	%ebx,%eax
-
-	movzbl	-128(%rbp,%rsi,1),%ebx
-	shll	$16,%ebx
-	xorl	%ebx,%eax
-
-	xorl	1024-128(%rbp,%rcx,4),%eax
-	movl	%eax,32(%rdi)
-	xorl	4(%rdi),%eax
-	movl	%eax,36(%rdi)
-	xorl	8(%rdi),%eax
-	movl	%eax,40(%rdi)
-	xorl	12(%rdi),%eax
-	movl	%eax,44(%rdi)
-
-	cmpl	$6,%ecx
-	je	L$14break
-	addl	$1,%ecx
-
-	movl	%eax,%edx
-	movl	16(%rdi),%eax
-	movzbl	%dl,%esi
-	movzbl	-128(%rbp,%rsi,1),%ebx
-	movzbl	%dh,%esi
-	xorl	%ebx,%eax
-
-	movzbl	-128(%rbp,%rsi,1),%ebx
-	shrl	$16,%edx
-	shll	$8,%ebx
-	movzbl	%dl,%esi
-	xorl	%ebx,%eax
-
-	movzbl	-128(%rbp,%rsi,1),%ebx
-	movzbl	%dh,%esi
-	shll	$16,%ebx
-	xorl	%ebx,%eax
-
-	movzbl	-128(%rbp,%rsi,1),%ebx
-	shll	$24,%ebx
-	xorl	%ebx,%eax
-
-	movl	%eax,48(%rdi)
-	xorl	20(%rdi),%eax
-	movl	%eax,52(%rdi)
-	xorl	24(%rdi),%eax
-	movl	%eax,56(%rdi)
-	xorl	28(%rdi),%eax
-	movl	%eax,60(%rdi)
-
-	leaq	32(%rdi),%rdi
-	jmp	L$14loop
-L$14break:
-	movl	$14,48(%rdi)
-	xorq	%rax,%rax
-	jmp	L$exit
-
-L$badpointer:
-	movq	$-1,%rax
-L$exit:
-.byte	0xf3,0xc3
-
-
-.globl	_AES_set_decrypt_key
-
-.p2align	4
-_AES_set_decrypt_key:
-
-	pushq	%rbx
-
-	pushq	%rbp
-
-	pushq	%r12
-
-	pushq	%r13
-
-	pushq	%r14
-
-	pushq	%r15
-
-	pushq	%rdx
-
-L$dec_key_prologue:
-
-	call	_x86_64_AES_set_encrypt_key
-	movq	(%rsp),%r8
-	cmpl	$0,%eax
-	jne	L$abort
-
-	movl	240(%r8),%r14d
-	xorq	%rdi,%rdi
-	leaq	(%rdi,%r14,4),%rcx
-	movq	%r8,%rsi
-	leaq	(%r8,%rcx,4),%rdi
-.p2align	2
-L$invert:
-	movq	0(%rsi),%rax
-	movq	8(%rsi),%rbx
-	movq	0(%rdi),%rcx
-	movq	8(%rdi),%rdx
-	movq	%rax,0(%rdi)
-	movq	%rbx,8(%rdi)
-	movq	%rcx,0(%rsi)
-	movq	%rdx,8(%rsi)
-	leaq	16(%rsi),%rsi
-	leaq	-16(%rdi),%rdi
-	cmpq	%rsi,%rdi
-	jne	L$invert
-
-	leaq	L$AES_Te+2048+1024(%rip),%rax
-
-	movq	40(%rax),%rsi
-	movq	48(%rax),%rdi
-	movq	56(%rax),%rbp
-
-	movq	%r8,%r15
-	subl	$1,%r14d
-.p2align	2
-L$permute:
-	leaq	16(%r15),%r15
-	movq	0(%r15),%rax
-	movq	8(%r15),%rcx
-	movq	%rsi,%r9
-	movq	%rsi,%r12
-	andq	%rax,%r9
-	andq	%rcx,%r12
-	movq	%r9,%rbx
-	movq	%r12,%rdx
-	shrq	$7,%r9
-	leaq	(%rax,%rax,1),%r8
-	shrq	$7,%r12
-	leaq	(%rcx,%rcx,1),%r11
-	subq	%r9,%rbx
-	subq	%r12,%rdx
-	andq	%rdi,%r8
-	andq	%rdi,%r11
-	andq	%rbp,%rbx
-	andq	%rbp,%rdx
-	xorq	%rbx,%r8
-	xorq	%rdx,%r11
-	movq	%rsi,%r10
-	movq	%rsi,%r13
-
-	andq	%r8,%r10
-	andq	%r11,%r13
-	movq	%r10,%rbx
-	movq	%r13,%rdx
-	shrq	$7,%r10
-	leaq	(%r8,%r8,1),%r9
-	shrq	$7,%r13
-	leaq	(%r11,%r11,1),%r12
-	subq	%r10,%rbx
-	subq	%r13,%rdx
-	andq	%rdi,%r9
-	andq	%rdi,%r12
-	andq	%rbp,%rbx
-	andq	%rbp,%rdx
-	xorq	%rbx,%r9
-	xorq	%rdx,%r12
-	movq	%rsi,%r10
-	movq	%rsi,%r13
-
-	andq	%r9,%r10
-	andq	%r12,%r13
-	movq	%r10,%rbx
-	movq	%r13,%rdx
-	shrq	$7,%r10
-	xorq	%rax,%r8
-	shrq	$7,%r13
-	xorq	%rcx,%r11
-	subq	%r10,%rbx
-	subq	%r13,%rdx
-	leaq	(%r9,%r9,1),%r10
-	leaq	(%r12,%r12,1),%r13
-	xorq	%rax,%r9
-	xorq	%rcx,%r12
-	andq	%rdi,%r10
-	andq	%rdi,%r13
-	andq	%rbp,%rbx
-	andq	%rbp,%rdx
-	xorq	%rbx,%r10
-	xorq	%rdx,%r13
-
-	xorq	%r10,%rax
-	xorq	%r13,%rcx
-	xorq	%r10,%r8
-	xorq	%r13,%r11
-	movq	%rax,%rbx
-	movq	%rcx,%rdx
-	xorq	%r10,%r9
-	shrq	$32,%rbx
-	xorq	%r13,%r12
-	shrq	$32,%rdx
-	xorq	%r8,%r10
-	roll	$8,%eax
-	xorq	%r11,%r13
-	roll	$8,%ecx
-	xorq	%r9,%r10
-	roll	$8,%ebx
-	xorq	%r12,%r13
-
-	roll	$8,%edx
-	xorl	%r10d,%eax
-	shrq	$32,%r10
-	xorl	%r13d,%ecx
-	shrq	$32,%r13
-	xorl	%r10d,%ebx
-	xorl	%r13d,%edx
-
-	movq	%r8,%r10
-	roll	$24,%r8d
-	movq	%r11,%r13
-	roll	$24,%r11d
-	shrq	$32,%r10
-	xorl	%r8d,%eax
-	shrq	$32,%r13
-	xorl	%r11d,%ecx
-	roll	$24,%r10d
-	movq	%r9,%r8
-	roll	$24,%r13d
-	movq	%r12,%r11
-	shrq	$32,%r8
-	xorl	%r10d,%ebx
-	shrq	$32,%r11
-	xorl	%r13d,%edx
-
-
-	roll	$16,%r9d
-
-	roll	$16,%r12d
-
-	roll	$16,%r8d
-
-	xorl	%r9d,%eax
-	roll	$16,%r11d
-	xorl	%r12d,%ecx
-
-	xorl	%r8d,%ebx
-	xorl	%r11d,%edx
-	movl	%eax,0(%r15)
-	movl	%ebx,4(%r15)
-	movl	%ecx,8(%r15)
-	movl	%edx,12(%r15)
-	subl	$1,%r14d
-	jnz	L$permute
-
-	xorq	%rax,%rax
-L$abort:
-	movq	8(%rsp),%r15
-
-	movq	16(%rsp),%r14
-
-	movq	24(%rsp),%r13
-
-	movq	32(%rsp),%r12
-
-	movq	40(%rsp),%rbp
-
-	movq	48(%rsp),%rbx
-
-	addq	$56,%rsp
-
-L$dec_key_epilogue:
-	.byte	0xf3,0xc3
-
-
-.globl	_AES_cbc_encrypt
-
-.p2align	4
-
-.globl	_asm_AES_cbc_encrypt
-.private_extern	_asm_AES_cbc_encrypt
-_asm_AES_cbc_encrypt:
-_AES_cbc_encrypt:
-
-	cmpq	$0,%rdx
-	je	L$cbc_epilogue
-	pushfq
-
-
-
-	pushq	%rbx
-
-	pushq	%rbp
-
-	pushq	%r12
-
-	pushq	%r13
-
-	pushq	%r14
-
-	pushq	%r15
-
-L$cbc_prologue:
-
-	cld
-	movl	%r9d,%r9d
-
-	leaq	L$AES_Te(%rip),%r14
-	leaq	L$AES_Td(%rip),%r10
-	cmpq	$0,%r9
-	cmoveq	%r10,%r14
-
-
-	movl	_OPENSSL_ia32cap_P(%rip),%r10d
-	cmpq	$512,%rdx
-	jb	L$cbc_slow_prologue
-	testq	$15,%rdx
-	jnz	L$cbc_slow_prologue
-	btl	$28,%r10d
-	jc	L$cbc_slow_prologue
-
-
-	leaq	-88-248(%rsp),%r15
-	andq	$-64,%r15
-
-
-	movq	%r14,%r10
-	leaq	2304(%r14),%r11
-	movq	%r15,%r12
-	andq	$0xFFF,%r10
-	andq	$0xFFF,%r11
-	andq	$0xFFF,%r12
-
-	cmpq	%r11,%r12
-	jb	L$cbc_te_break_out
-	subq	%r11,%r12
-	subq	%r12,%r15
-	jmp	L$cbc_te_ok
-L$cbc_te_break_out:
-	subq	%r10,%r12
-	andq	$0xFFF,%r12
-	addq	$320,%r12
-	subq	%r12,%r15
-.p2align	2
-L$cbc_te_ok:
-
-	xchgq	%rsp,%r15
-
-
-	movq	%r15,16(%rsp)
-
-L$cbc_fast_body:
-	movq	%rdi,24(%rsp)
-	movq	%rsi,32(%rsp)
-	movq	%rdx,40(%rsp)
-	movq	%rcx,48(%rsp)
-	movq	%r8,56(%rsp)
-	movl	$0,80+240(%rsp)
-	movq	%r8,%rbp
-	movq	%r9,%rbx
-	movq	%rsi,%r9
-	movq	%rdi,%r8
-	movq	%rcx,%r15
-
-	movl	240(%r15),%eax
-
-	movq	%r15,%r10
-	subq	%r14,%r10
-	andq	$0xfff,%r10
-	cmpq	$2304,%r10
-	jb	L$cbc_do_ecopy
-	cmpq	$4096-248,%r10
-	jb	L$cbc_skip_ecopy
-.p2align	2
-L$cbc_do_ecopy:
-	movq	%r15,%rsi
-	leaq	80(%rsp),%rdi
-	leaq	80(%rsp),%r15
-	movl	$30,%ecx
-.long	0x90A548F3
-	movl	%eax,(%rdi)
-L$cbc_skip_ecopy:
-	movq	%r15,0(%rsp)
-
-	movl	$18,%ecx
-.p2align	2
-L$cbc_prefetch_te:
-	movq	0(%r14),%r10
-	movq	32(%r14),%r11
-	movq	64(%r14),%r12
-	movq	96(%r14),%r13
-	leaq	128(%r14),%r14
-	subl	$1,%ecx
-	jnz	L$cbc_prefetch_te
-	leaq	-2304(%r14),%r14
-
-	cmpq	$0,%rbx
-	je	L$FAST_DECRYPT
-
-
-	movl	0(%rbp),%eax
-	movl	4(%rbp),%ebx
-	movl	8(%rbp),%ecx
-	movl	12(%rbp),%edx
-
-.p2align	2
-L$cbc_fast_enc_loop:
-	xorl	0(%r8),%eax
-	xorl	4(%r8),%ebx
-	xorl	8(%r8),%ecx
-	xorl	12(%r8),%edx
-	movq	0(%rsp),%r15
-	movq	%r8,24(%rsp)
-
-	call	_x86_64_AES_encrypt
-
-	movq	24(%rsp),%r8
-	movq	40(%rsp),%r10
-	movl	%eax,0(%r9)
-	movl	%ebx,4(%r9)
-	movl	%ecx,8(%r9)
-	movl	%edx,12(%r9)
-
-	leaq	16(%r8),%r8
-	leaq	16(%r9),%r9
-	subq	$16,%r10
-	testq	$-16,%r10
-	movq	%r10,40(%rsp)
-	jnz	L$cbc_fast_enc_loop
-	movq	56(%rsp),%rbp
-	movl	%eax,0(%rbp)
-	movl	%ebx,4(%rbp)
-	movl	%ecx,8(%rbp)
-	movl	%edx,12(%rbp)
-
-	jmp	L$cbc_fast_cleanup
-
-
-.p2align	4
-L$FAST_DECRYPT:
-	cmpq	%r8,%r9
-	je	L$cbc_fast_dec_in_place
-
-	movq	%rbp,64(%rsp)
-.p2align	2
-L$cbc_fast_dec_loop:
-	movl	0(%r8),%eax
-	movl	4(%r8),%ebx
-	movl	8(%r8),%ecx
-	movl	12(%r8),%edx
-	movq	0(%rsp),%r15
-	movq	%r8,24(%rsp)
-
-	call	_x86_64_AES_decrypt
-
-	movq	64(%rsp),%rbp
-	movq	24(%rsp),%r8
-	movq	40(%rsp),%r10
-	xorl	0(%rbp),%eax
-	xorl	4(%rbp),%ebx
-	xorl	8(%rbp),%ecx
-	xorl	12(%rbp),%edx
-	movq	%r8,%rbp
-
-	subq	$16,%r10
-	movq	%r10,40(%rsp)
-	movq	%rbp,64(%rsp)
-
-	movl	%eax,0(%r9)
-	movl	%ebx,4(%r9)
-	movl	%ecx,8(%r9)
-	movl	%edx,12(%r9)
-
-	leaq	16(%r8),%r8
-	leaq	16(%r9),%r9
-	jnz	L$cbc_fast_dec_loop
-	movq	56(%rsp),%r12
-	movq	0(%rbp),%r10
-	movq	8(%rbp),%r11
-	movq	%r10,0(%r12)
-	movq	%r11,8(%r12)
-	jmp	L$cbc_fast_cleanup
-
-.p2align	4
-L$cbc_fast_dec_in_place:
-	movq	0(%rbp),%r10
-	movq	8(%rbp),%r11
-	movq	%r10,0+64(%rsp)
-	movq	%r11,8+64(%rsp)
-.p2align	2
-L$cbc_fast_dec_in_place_loop:
-	movl	0(%r8),%eax
-	movl	4(%r8),%ebx
-	movl	8(%r8),%ecx
-	movl	12(%r8),%edx
-	movq	0(%rsp),%r15
-	movq	%r8,24(%rsp)
-
-	call	_x86_64_AES_decrypt
-
-	movq	24(%rsp),%r8
-	movq	40(%rsp),%r10
-	xorl	0+64(%rsp),%eax
-	xorl	4+64(%rsp),%ebx
-	xorl	8+64(%rsp),%ecx
-	xorl	12+64(%rsp),%edx
-
-	movq	0(%r8),%r11
-	movq	8(%r8),%r12
-	subq	$16,%r10
-	jz	L$cbc_fast_dec_in_place_done
-
-	movq	%r11,0+64(%rsp)
-	movq	%r12,8+64(%rsp)
-
-	movl	%eax,0(%r9)
-	movl	%ebx,4(%r9)
-	movl	%ecx,8(%r9)
-	movl	%edx,12(%r9)
-
-	leaq	16(%r8),%r8
-	leaq	16(%r9),%r9
-	movq	%r10,40(%rsp)
-	jmp	L$cbc_fast_dec_in_place_loop
-L$cbc_fast_dec_in_place_done:
-	movq	56(%rsp),%rdi
-	movq	%r11,0(%rdi)
-	movq	%r12,8(%rdi)
-
-	movl	%eax,0(%r9)
-	movl	%ebx,4(%r9)
-	movl	%ecx,8(%r9)
-	movl	%edx,12(%r9)
-
-.p2align	2
-L$cbc_fast_cleanup:
-	cmpl	$0,80+240(%rsp)
-	leaq	80(%rsp),%rdi
-	je	L$cbc_exit
-	movl	$30,%ecx
-	xorq	%rax,%rax
-.long	0x90AB48F3
-
-	jmp	L$cbc_exit
-
-
-.p2align	4
-L$cbc_slow_prologue:
-
-
-	leaq	-88(%rsp),%rbp
-	andq	$-64,%rbp
-
-	leaq	-88-63(%rcx),%r10
-	subq	%rbp,%r10
-	negq	%r10
-	andq	$0x3c0,%r10
-	subq	%r10,%rbp
-
-	xchgq	%rsp,%rbp
-
-
-	movq	%rbp,16(%rsp)
-
-L$cbc_slow_body:
-
-
-
-
-	movq	%r8,56(%rsp)
-	movq	%r8,%rbp
-	movq	%r9,%rbx
-	movq	%rsi,%r9
-	movq	%rdi,%r8
-	movq	%rcx,%r15
-	movq	%rdx,%r10
-
-	movl	240(%r15),%eax
-	movq	%r15,0(%rsp)
-	shll	$4,%eax
-	leaq	(%r15,%rax,1),%rax
-	movq	%rax,8(%rsp)
-
-
-	leaq	2048(%r14),%r14
-	leaq	768-8(%rsp),%rax
-	subq	%r14,%rax
-	andq	$0x300,%rax
-	leaq	(%r14,%rax,1),%r14
-
-	cmpq	$0,%rbx
-	je	L$SLOW_DECRYPT
-
-
-	testq	$-16,%r10
-	movl	0(%rbp),%eax
-	movl	4(%rbp),%ebx
-	movl	8(%rbp),%ecx
-	movl	12(%rbp),%edx
-	jz	L$cbc_slow_enc_tail
-
-.p2align	2
-L$cbc_slow_enc_loop:
-	xorl	0(%r8),%eax
-	xorl	4(%r8),%ebx
-	xorl	8(%r8),%ecx
-	xorl	12(%r8),%edx
-	movq	0(%rsp),%r15
-	movq	%r8,24(%rsp)
-	movq	%r9,32(%rsp)
-	movq	%r10,40(%rsp)
-
-	call	_x86_64_AES_encrypt_compact
-
-	movq	24(%rsp),%r8
-	movq	32(%rsp),%r9
-	movq	40(%rsp),%r10
-	movl	%eax,0(%r9)
-	movl	%ebx,4(%r9)
-	movl	%ecx,8(%r9)
-	movl	%edx,12(%r9)
-
-	leaq	16(%r8),%r8
-	leaq	16(%r9),%r9
-	subq	$16,%r10
-	testq	$-16,%r10
-	jnz	L$cbc_slow_enc_loop
-	testq	$15,%r10
-	jnz	L$cbc_slow_enc_tail
-	movq	56(%rsp),%rbp
-	movl	%eax,0(%rbp)
-	movl	%ebx,4(%rbp)
-	movl	%ecx,8(%rbp)
-	movl	%edx,12(%rbp)
-
-	jmp	L$cbc_exit
-
-.p2align	2
-L$cbc_slow_enc_tail:
-	movq	%rax,%r11
-	movq	%rcx,%r12
-	movq	%r10,%rcx
-	movq	%r8,%rsi
-	movq	%r9,%rdi
-.long	0x9066A4F3
-	movq	$16,%rcx
-	subq	%r10,%rcx
-	xorq	%rax,%rax
-.long	0x9066AAF3
-	movq	%r9,%r8
-	movq	$16,%r10
-	movq	%r11,%rax
-	movq	%r12,%rcx
-	jmp	L$cbc_slow_enc_loop
-
-.p2align	4
-L$SLOW_DECRYPT:
-	shrq	$3,%rax
-	addq	%rax,%r14
-
-	movq	0(%rbp),%r11
-	movq	8(%rbp),%r12
-	movq	%r11,0+64(%rsp)
-	movq	%r12,8+64(%rsp)
-
-.p2align	2
-L$cbc_slow_dec_loop:
-	movl	0(%r8),%eax
-	movl	4(%r8),%ebx
-	movl	8(%r8),%ecx
-	movl	12(%r8),%edx
-	movq	0(%rsp),%r15
-	movq	%r8,24(%rsp)
-	movq	%r9,32(%rsp)
-	movq	%r10,40(%rsp)
-
-	call	_x86_64_AES_decrypt_compact
-
-	movq	24(%rsp),%r8
-	movq	32(%rsp),%r9
-	movq	40(%rsp),%r10
-	xorl	0+64(%rsp),%eax
-	xorl	4+64(%rsp),%ebx
-	xorl	8+64(%rsp),%ecx
-	xorl	12+64(%rsp),%edx
-
-	movq	0(%r8),%r11
-	movq	8(%r8),%r12
-	subq	$16,%r10
-	jc	L$cbc_slow_dec_partial
-	jz	L$cbc_slow_dec_done
-
-	movq	%r11,0+64(%rsp)
-	movq	%r12,8+64(%rsp)
-
-	movl	%eax,0(%r9)
-	movl	%ebx,4(%r9)
-	movl	%ecx,8(%r9)
-	movl	%edx,12(%r9)
-
-	leaq	16(%r8),%r8
-	leaq	16(%r9),%r9
-	jmp	L$cbc_slow_dec_loop
-L$cbc_slow_dec_done:
-	movq	56(%rsp),%rdi
-	movq	%r11,0(%rdi)
-	movq	%r12,8(%rdi)
-
-	movl	%eax,0(%r9)
-	movl	%ebx,4(%r9)
-	movl	%ecx,8(%r9)
-	movl	%edx,12(%r9)
-
-	jmp	L$cbc_exit
-
-.p2align	2
-L$cbc_slow_dec_partial:
-	movq	56(%rsp),%rdi
-	movq	%r11,0(%rdi)
-	movq	%r12,8(%rdi)
-
-	movl	%eax,0+64(%rsp)
-	movl	%ebx,4+64(%rsp)
-	movl	%ecx,8+64(%rsp)
-	movl	%edx,12+64(%rsp)
-
-	movq	%r9,%rdi
-	leaq	64(%rsp),%rsi
-	leaq	16(%r10),%rcx
-.long	0x9066A4F3
-	jmp	L$cbc_exit
-
-.p2align	4
-L$cbc_exit:
-	movq	16(%rsp),%rsi
-
-	movq	(%rsi),%r15
-
-	movq	8(%rsi),%r14
-
-	movq	16(%rsi),%r13
-
-	movq	24(%rsi),%r12
-
-	movq	32(%rsi),%rbp
-
-	movq	40(%rsi),%rbx
-
-	leaq	48(%rsi),%rsp
-
-L$cbc_popfq:
-	popfq
-
-
-
-L$cbc_epilogue:
-	.byte	0xf3,0xc3
-
-
-.p2align	6
-L$AES_Te:
-.long	0xa56363c6,0xa56363c6
-.long	0x847c7cf8,0x847c7cf8
-.long	0x997777ee,0x997777ee
-.long	0x8d7b7bf6,0x8d7b7bf6
-.long	0x0df2f2ff,0x0df2f2ff
-.long	0xbd6b6bd6,0xbd6b6bd6
-.long	0xb16f6fde,0xb16f6fde
-.long	0x54c5c591,0x54c5c591
-.long	0x50303060,0x50303060
-.long	0x03010102,0x03010102
-.long	0xa96767ce,0xa96767ce
-.long	0x7d2b2b56,0x7d2b2b56
-.long	0x19fefee7,0x19fefee7
-.long	0x62d7d7b5,0x62d7d7b5
-.long	0xe6abab4d,0xe6abab4d
-.long	0x9a7676ec,0x9a7676ec
-.long	0x45caca8f,0x45caca8f
-.long	0x9d82821f,0x9d82821f
-.long	0x40c9c989,0x40c9c989
-.long	0x877d7dfa,0x877d7dfa
-.long	0x15fafaef,0x15fafaef
-.long	0xeb5959b2,0xeb5959b2
-.long	0xc947478e,0xc947478e
-.long	0x0bf0f0fb,0x0bf0f0fb
-.long	0xecadad41,0xecadad41
-.long	0x67d4d4b3,0x67d4d4b3
-.long	0xfda2a25f,0xfda2a25f
-.long	0xeaafaf45,0xeaafaf45
-.long	0xbf9c9c23,0xbf9c9c23
-.long	0xf7a4a453,0xf7a4a453
-.long	0x967272e4,0x967272e4
-.long	0x5bc0c09b,0x5bc0c09b
-.long	0xc2b7b775,0xc2b7b775
-.long	0x1cfdfde1,0x1cfdfde1
-.long	0xae93933d,0xae93933d
-.long	0x6a26264c,0x6a26264c
-.long	0x5a36366c,0x5a36366c
-.long	0x413f3f7e,0x413f3f7e
-.long	0x02f7f7f5,0x02f7f7f5
-.long	0x4fcccc83,0x4fcccc83
-.long	0x5c343468,0x5c343468
-.long	0xf4a5a551,0xf4a5a551
-.long	0x34e5e5d1,0x34e5e5d1
-.long	0x08f1f1f9,0x08f1f1f9
-.long	0x937171e2,0x937171e2
-.long	0x73d8d8ab,0x73d8d8ab
-.long	0x53313162,0x53313162
-.long	0x3f15152a,0x3f15152a
-.long	0x0c040408,0x0c040408
-.long	0x52c7c795,0x52c7c795
-.long	0x65232346,0x65232346
-.long	0x5ec3c39d,0x5ec3c39d
-.long	0x28181830,0x28181830
-.long	0xa1969637,0xa1969637
-.long	0x0f05050a,0x0f05050a
-.long	0xb59a9a2f,0xb59a9a2f
-.long	0x0907070e,0x0907070e
-.long	0x36121224,0x36121224
-.long	0x9b80801b,0x9b80801b
-.long	0x3de2e2df,0x3de2e2df
-.long	0x26ebebcd,0x26ebebcd
-.long	0x6927274e,0x6927274e
-.long	0xcdb2b27f,0xcdb2b27f
-.long	0x9f7575ea,0x9f7575ea
-.long	0x1b090912,0x1b090912
-.long	0x9e83831d,0x9e83831d
-.long	0x742c2c58,0x742c2c58
-.long	0x2e1a1a34,0x2e1a1a34
-.long	0x2d1b1b36,0x2d1b1b36
-.long	0xb26e6edc,0xb26e6edc
-.long	0xee5a5ab4,0xee5a5ab4
-.long	0xfba0a05b,0xfba0a05b
-.long	0xf65252a4,0xf65252a4
-.long	0x4d3b3b76,0x4d3b3b76
-.long	0x61d6d6b7,0x61d6d6b7
-.long	0xceb3b37d,0xceb3b37d
-.long	0x7b292952,0x7b292952
-.long	0x3ee3e3dd,0x3ee3e3dd
-.long	0x712f2f5e,0x712f2f5e
-.long	0x97848413,0x97848413
-.long	0xf55353a6,0xf55353a6
-.long	0x68d1d1b9,0x68d1d1b9
-.long	0x00000000,0x00000000
-.long	0x2cededc1,0x2cededc1
-.long	0x60202040,0x60202040
-.long	0x1ffcfce3,0x1ffcfce3
-.long	0xc8b1b179,0xc8b1b179
-.long	0xed5b5bb6,0xed5b5bb6
-.long	0xbe6a6ad4,0xbe6a6ad4
-.long	0x46cbcb8d,0x46cbcb8d
-.long	0xd9bebe67,0xd9bebe67
-.long	0x4b393972,0x4b393972
-.long	0xde4a4a94,0xde4a4a94
-.long	0xd44c4c98,0xd44c4c98
-.long	0xe85858b0,0xe85858b0
-.long	0x4acfcf85,0x4acfcf85
-.long	0x6bd0d0bb,0x6bd0d0bb
-.long	0x2aefefc5,0x2aefefc5
-.long	0xe5aaaa4f,0xe5aaaa4f
-.long	0x16fbfbed,0x16fbfbed
-.long	0xc5434386,0xc5434386
-.long	0xd74d4d9a,0xd74d4d9a
-.long	0x55333366,0x55333366
-.long	0x94858511,0x94858511
-.long	0xcf45458a,0xcf45458a
-.long	0x10f9f9e9,0x10f9f9e9
-.long	0x06020204,0x06020204
-.long	0x817f7ffe,0x817f7ffe
-.long	0xf05050a0,0xf05050a0
-.long	0x443c3c78,0x443c3c78
-.long	0xba9f9f25,0xba9f9f25
-.long	0xe3a8a84b,0xe3a8a84b
-.long	0xf35151a2,0xf35151a2
-.long	0xfea3a35d,0xfea3a35d
-.long	0xc0404080,0xc0404080
-.long	0x8a8f8f05,0x8a8f8f05
-.long	0xad92923f,0xad92923f
-.long	0xbc9d9d21,0xbc9d9d21
-.long	0x48383870,0x48383870
-.long	0x04f5f5f1,0x04f5f5f1
-.long	0xdfbcbc63,0xdfbcbc63
-.long	0xc1b6b677,0xc1b6b677
-.long	0x75dadaaf,0x75dadaaf
-.long	0x63212142,0x63212142
-.long	0x30101020,0x30101020
-.long	0x1affffe5,0x1affffe5
-.long	0x0ef3f3fd,0x0ef3f3fd
-.long	0x6dd2d2bf,0x6dd2d2bf
-.long	0x4ccdcd81,0x4ccdcd81
-.long	0x140c0c18,0x140c0c18
-.long	0x35131326,0x35131326
-.long	0x2fececc3,0x2fececc3
-.long	0xe15f5fbe,0xe15f5fbe
-.long	0xa2979735,0xa2979735
-.long	0xcc444488,0xcc444488
-.long	0x3917172e,0x3917172e
-.long	0x57c4c493,0x57c4c493
-.long	0xf2a7a755,0xf2a7a755
-.long	0x827e7efc,0x827e7efc
-.long	0x473d3d7a,0x473d3d7a
-.long	0xac6464c8,0xac6464c8
-.long	0xe75d5dba,0xe75d5dba
-.long	0x2b191932,0x2b191932
-.long	0x957373e6,0x957373e6
-.long	0xa06060c0,0xa06060c0
-.long	0x98818119,0x98818119
-.long	0xd14f4f9e,0xd14f4f9e
-.long	0x7fdcdca3,0x7fdcdca3
-.long	0x66222244,0x66222244
-.long	0x7e2a2a54,0x7e2a2a54
-.long	0xab90903b,0xab90903b
-.long	0x8388880b,0x8388880b
-.long	0xca46468c,0xca46468c
-.long	0x29eeeec7,0x29eeeec7
-.long	0xd3b8b86b,0xd3b8b86b
-.long	0x3c141428,0x3c141428
-.long	0x79dedea7,0x79dedea7
-.long	0xe25e5ebc,0xe25e5ebc
-.long	0x1d0b0b16,0x1d0b0b16
-.long	0x76dbdbad,0x76dbdbad
-.long	0x3be0e0db,0x3be0e0db
-.long	0x56323264,0x56323264
-.long	0x4e3a3a74,0x4e3a3a74
-.long	0x1e0a0a14,0x1e0a0a14
-.long	0xdb494992,0xdb494992
-.long	0x0a06060c,0x0a06060c
-.long	0x6c242448,0x6c242448
-.long	0xe45c5cb8,0xe45c5cb8
-.long	0x5dc2c29f,0x5dc2c29f
-.long	0x6ed3d3bd,0x6ed3d3bd
-.long	0xefacac43,0xefacac43
-.long	0xa66262c4,0xa66262c4
-.long	0xa8919139,0xa8919139
-.long	0xa4959531,0xa4959531
-.long	0x37e4e4d3,0x37e4e4d3
-.long	0x8b7979f2,0x8b7979f2
-.long	0x32e7e7d5,0x32e7e7d5
-.long	0x43c8c88b,0x43c8c88b
-.long	0x5937376e,0x5937376e
-.long	0xb76d6dda,0xb76d6dda
-.long	0x8c8d8d01,0x8c8d8d01
-.long	0x64d5d5b1,0x64d5d5b1
-.long	0xd24e4e9c,0xd24e4e9c
-.long	0xe0a9a949,0xe0a9a949
-.long	0xb46c6cd8,0xb46c6cd8
-.long	0xfa5656ac,0xfa5656ac
-.long	0x07f4f4f3,0x07f4f4f3
-.long	0x25eaeacf,0x25eaeacf
-.long	0xaf6565ca,0xaf6565ca
-.long	0x8e7a7af4,0x8e7a7af4
-.long	0xe9aeae47,0xe9aeae47
-.long	0x18080810,0x18080810
-.long	0xd5baba6f,0xd5baba6f
-.long	0x887878f0,0x887878f0
-.long	0x6f25254a,0x6f25254a
-.long	0x722e2e5c,0x722e2e5c
-.long	0x241c1c38,0x241c1c38
-.long	0xf1a6a657,0xf1a6a657
-.long	0xc7b4b473,0xc7b4b473
-.long	0x51c6c697,0x51c6c697
-.long	0x23e8e8cb,0x23e8e8cb
-.long	0x7cdddda1,0x7cdddda1
-.long	0x9c7474e8,0x9c7474e8
-.long	0x211f1f3e,0x211f1f3e
-.long	0xdd4b4b96,0xdd4b4b96
-.long	0xdcbdbd61,0xdcbdbd61
-.long	0x868b8b0d,0x868b8b0d
-.long	0x858a8a0f,0x858a8a0f
-.long	0x907070e0,0x907070e0
-.long	0x423e3e7c,0x423e3e7c
-.long	0xc4b5b571,0xc4b5b571
-.long	0xaa6666cc,0xaa6666cc
-.long	0xd8484890,0xd8484890
-.long	0x05030306,0x05030306
-.long	0x01f6f6f7,0x01f6f6f7
-.long	0x120e0e1c,0x120e0e1c
-.long	0xa36161c2,0xa36161c2
-.long	0x5f35356a,0x5f35356a
-.long	0xf95757ae,0xf95757ae
-.long	0xd0b9b969,0xd0b9b969
-.long	0x91868617,0x91868617
-.long	0x58c1c199,0x58c1c199
-.long	0x271d1d3a,0x271d1d3a
-.long	0xb99e9e27,0xb99e9e27
-.long	0x38e1e1d9,0x38e1e1d9
-.long	0x13f8f8eb,0x13f8f8eb
-.long	0xb398982b,0xb398982b
-.long	0x33111122,0x33111122
-.long	0xbb6969d2,0xbb6969d2
-.long	0x70d9d9a9,0x70d9d9a9
-.long	0x898e8e07,0x898e8e07
-.long	0xa7949433,0xa7949433
-.long	0xb69b9b2d,0xb69b9b2d
-.long	0x221e1e3c,0x221e1e3c
-.long	0x92878715,0x92878715
-.long	0x20e9e9c9,0x20e9e9c9
-.long	0x49cece87,0x49cece87
-.long	0xff5555aa,0xff5555aa
-.long	0x78282850,0x78282850
-.long	0x7adfdfa5,0x7adfdfa5
-.long	0x8f8c8c03,0x8f8c8c03
-.long	0xf8a1a159,0xf8a1a159
-.long	0x80898909,0x80898909
-.long	0x170d0d1a,0x170d0d1a
-.long	0xdabfbf65,0xdabfbf65
-.long	0x31e6e6d7,0x31e6e6d7
-.long	0xc6424284,0xc6424284
-.long	0xb86868d0,0xb86868d0
-.long	0xc3414182,0xc3414182
-.long	0xb0999929,0xb0999929
-.long	0x772d2d5a,0x772d2d5a
-.long	0x110f0f1e,0x110f0f1e
-.long	0xcbb0b07b,0xcbb0b07b
-.long	0xfc5454a8,0xfc5454a8
-.long	0xd6bbbb6d,0xd6bbbb6d
-.long	0x3a16162c,0x3a16162c
-.byte	0x63,0x7c,0x77,0x7b,0xf2,0x6b,0x6f,0xc5
-.byte	0x30,0x01,0x67,0x2b,0xfe,0xd7,0xab,0x76
-.byte	0xca,0x82,0xc9,0x7d,0xfa,0x59,0x47,0xf0
-.byte	0xad,0xd4,0xa2,0xaf,0x9c,0xa4,0x72,0xc0
-.byte	0xb7,0xfd,0x93,0x26,0x36,0x3f,0xf7,0xcc
-.byte	0x34,0xa5,0xe5,0xf1,0x71,0xd8,0x31,0x15
-.byte	0x04,0xc7,0x23,0xc3,0x18,0x96,0x05,0x9a
-.byte	0x07,0x12,0x80,0xe2,0xeb,0x27,0xb2,0x75
-.byte	0x09,0x83,0x2c,0x1a,0x1b,0x6e,0x5a,0xa0
-.byte	0x52,0x3b,0xd6,0xb3,0x29,0xe3,0x2f,0x84
-.byte	0x53,0xd1,0x00,0xed,0x20,0xfc,0xb1,0x5b
-.byte	0x6a,0xcb,0xbe,0x39,0x4a,0x4c,0x58,0xcf
-.byte	0xd0,0xef,0xaa,0xfb,0x43,0x4d,0x33,0x85
-.byte	0x45,0xf9,0x02,0x7f,0x50,0x3c,0x9f,0xa8
-.byte	0x51,0xa3,0x40,0x8f,0x92,0x9d,0x38,0xf5
-.byte	0xbc,0xb6,0xda,0x21,0x10,0xff,0xf3,0xd2
-.byte	0xcd,0x0c,0x13,0xec,0x5f,0x97,0x44,0x17
-.byte	0xc4,0xa7,0x7e,0x3d,0x64,0x5d,0x19,0x73
-.byte	0x60,0x81,0x4f,0xdc,0x22,0x2a,0x90,0x88
-.byte	0x46,0xee,0xb8,0x14,0xde,0x5e,0x0b,0xdb
-.byte	0xe0,0x32,0x3a,0x0a,0x49,0x06,0x24,0x5c
-.byte	0xc2,0xd3,0xac,0x62,0x91,0x95,0xe4,0x79
-.byte	0xe7,0xc8,0x37,0x6d,0x8d,0xd5,0x4e,0xa9
-.byte	0x6c,0x56,0xf4,0xea,0x65,0x7a,0xae,0x08
-.byte	0xba,0x78,0x25,0x2e,0x1c,0xa6,0xb4,0xc6
-.byte	0xe8,0xdd,0x74,0x1f,0x4b,0xbd,0x8b,0x8a
-.byte	0x70,0x3e,0xb5,0x66,0x48,0x03,0xf6,0x0e
-.byte	0x61,0x35,0x57,0xb9,0x86,0xc1,0x1d,0x9e
-.byte	0xe1,0xf8,0x98,0x11,0x69,0xd9,0x8e,0x94
-.byte	0x9b,0x1e,0x87,0xe9,0xce,0x55,0x28,0xdf
-.byte	0x8c,0xa1,0x89,0x0d,0xbf,0xe6,0x42,0x68
-.byte	0x41,0x99,0x2d,0x0f,0xb0,0x54,0xbb,0x16
-.byte	0x63,0x7c,0x77,0x7b,0xf2,0x6b,0x6f,0xc5
-.byte	0x30,0x01,0x67,0x2b,0xfe,0xd7,0xab,0x76
-.byte	0xca,0x82,0xc9,0x7d,0xfa,0x59,0x47,0xf0
-.byte	0xad,0xd4,0xa2,0xaf,0x9c,0xa4,0x72,0xc0
-.byte	0xb7,0xfd,0x93,0x26,0x36,0x3f,0xf7,0xcc
-.byte	0x34,0xa5,0xe5,0xf1,0x71,0xd8,0x31,0x15
-.byte	0x04,0xc7,0x23,0xc3,0x18,0x96,0x05,0x9a
-.byte	0x07,0x12,0x80,0xe2,0xeb,0x27,0xb2,0x75
-.byte	0x09,0x83,0x2c,0x1a,0x1b,0x6e,0x5a,0xa0
-.byte	0x52,0x3b,0xd6,0xb3,0x29,0xe3,0x2f,0x84
-.byte	0x53,0xd1,0x00,0xed,0x20,0xfc,0xb1,0x5b
-.byte	0x6a,0xcb,0xbe,0x39,0x4a,0x4c,0x58,0xcf
-.byte	0xd0,0xef,0xaa,0xfb,0x43,0x4d,0x33,0x85
-.byte	0x45,0xf9,0x02,0x7f,0x50,0x3c,0x9f,0xa8
-.byte	0x51,0xa3,0x40,0x8f,0x92,0x9d,0x38,0xf5
-.byte	0xbc,0xb6,0xda,0x21,0x10,0xff,0xf3,0xd2
-.byte	0xcd,0x0c,0x13,0xec,0x5f,0x97,0x44,0x17
-.byte	0xc4,0xa7,0x7e,0x3d,0x64,0x5d,0x19,0x73
-.byte	0x60,0x81,0x4f,0xdc,0x22,0x2a,0x90,0x88
-.byte	0x46,0xee,0xb8,0x14,0xde,0x5e,0x0b,0xdb
-.byte	0xe0,0x32,0x3a,0x0a,0x49,0x06,0x24,0x5c
-.byte	0xc2,0xd3,0xac,0x62,0x91,0x95,0xe4,0x79
-.byte	0xe7,0xc8,0x37,0x6d,0x8d,0xd5,0x4e,0xa9
-.byte	0x6c,0x56,0xf4,0xea,0x65,0x7a,0xae,0x08
-.byte	0xba,0x78,0x25,0x2e,0x1c,0xa6,0xb4,0xc6
-.byte	0xe8,0xdd,0x74,0x1f,0x4b,0xbd,0x8b,0x8a
-.byte	0x70,0x3e,0xb5,0x66,0x48,0x03,0xf6,0x0e
-.byte	0x61,0x35,0x57,0xb9,0x86,0xc1,0x1d,0x9e
-.byte	0xe1,0xf8,0x98,0x11,0x69,0xd9,0x8e,0x94
-.byte	0x9b,0x1e,0x87,0xe9,0xce,0x55,0x28,0xdf
-.byte	0x8c,0xa1,0x89,0x0d,0xbf,0xe6,0x42,0x68
-.byte	0x41,0x99,0x2d,0x0f,0xb0,0x54,0xbb,0x16
-.byte	0x63,0x7c,0x77,0x7b,0xf2,0x6b,0x6f,0xc5
-.byte	0x30,0x01,0x67,0x2b,0xfe,0xd7,0xab,0x76
-.byte	0xca,0x82,0xc9,0x7d,0xfa,0x59,0x47,0xf0
-.byte	0xad,0xd4,0xa2,0xaf,0x9c,0xa4,0x72,0xc0
-.byte	0xb7,0xfd,0x93,0x26,0x36,0x3f,0xf7,0xcc
-.byte	0x34,0xa5,0xe5,0xf1,0x71,0xd8,0x31,0x15
-.byte	0x04,0xc7,0x23,0xc3,0x18,0x96,0x05,0x9a
-.byte	0x07,0x12,0x80,0xe2,0xeb,0x27,0xb2,0x75
-.byte	0x09,0x83,0x2c,0x1a,0x1b,0x6e,0x5a,0xa0
-.byte	0x52,0x3b,0xd6,0xb3,0x29,0xe3,0x2f,0x84
-.byte	0x53,0xd1,0x00,0xed,0x20,0xfc,0xb1,0x5b
-.byte	0x6a,0xcb,0xbe,0x39,0x4a,0x4c,0x58,0xcf
-.byte	0xd0,0xef,0xaa,0xfb,0x43,0x4d,0x33,0x85
-.byte	0x45,0xf9,0x02,0x7f,0x50,0x3c,0x9f,0xa8
-.byte	0x51,0xa3,0x40,0x8f,0x92,0x9d,0x38,0xf5
-.byte	0xbc,0xb6,0xda,0x21,0x10,0xff,0xf3,0xd2
-.byte	0xcd,0x0c,0x13,0xec,0x5f,0x97,0x44,0x17
-.byte	0xc4,0xa7,0x7e,0x3d,0x64,0x5d,0x19,0x73
-.byte	0x60,0x81,0x4f,0xdc,0x22,0x2a,0x90,0x88
-.byte	0x46,0xee,0xb8,0x14,0xde,0x5e,0x0b,0xdb
-.byte	0xe0,0x32,0x3a,0x0a,0x49,0x06,0x24,0x5c
-.byte	0xc2,0xd3,0xac,0x62,0x91,0x95,0xe4,0x79
-.byte	0xe7,0xc8,0x37,0x6d,0x8d,0xd5,0x4e,0xa9
-.byte	0x6c,0x56,0xf4,0xea,0x65,0x7a,0xae,0x08
-.byte	0xba,0x78,0x25,0x2e,0x1c,0xa6,0xb4,0xc6
-.byte	0xe8,0xdd,0x74,0x1f,0x4b,0xbd,0x8b,0x8a
-.byte	0x70,0x3e,0xb5,0x66,0x48,0x03,0xf6,0x0e
-.byte	0x61,0x35,0x57,0xb9,0x86,0xc1,0x1d,0x9e
-.byte	0xe1,0xf8,0x98,0x11,0x69,0xd9,0x8e,0x94
-.byte	0x9b,0x1e,0x87,0xe9,0xce,0x55,0x28,0xdf
-.byte	0x8c,0xa1,0x89,0x0d,0xbf,0xe6,0x42,0x68
-.byte	0x41,0x99,0x2d,0x0f,0xb0,0x54,0xbb,0x16
-.byte	0x63,0x7c,0x77,0x7b,0xf2,0x6b,0x6f,0xc5
-.byte	0x30,0x01,0x67,0x2b,0xfe,0xd7,0xab,0x76
-.byte	0xca,0x82,0xc9,0x7d,0xfa,0x59,0x47,0xf0
-.byte	0xad,0xd4,0xa2,0xaf,0x9c,0xa4,0x72,0xc0
-.byte	0xb7,0xfd,0x93,0x26,0x36,0x3f,0xf7,0xcc
-.byte	0x34,0xa5,0xe5,0xf1,0x71,0xd8,0x31,0x15
-.byte	0x04,0xc7,0x23,0xc3,0x18,0x96,0x05,0x9a
-.byte	0x07,0x12,0x80,0xe2,0xeb,0x27,0xb2,0x75
-.byte	0x09,0x83,0x2c,0x1a,0x1b,0x6e,0x5a,0xa0
-.byte	0x52,0x3b,0xd6,0xb3,0x29,0xe3,0x2f,0x84
-.byte	0x53,0xd1,0x00,0xed,0x20,0xfc,0xb1,0x5b
-.byte	0x6a,0xcb,0xbe,0x39,0x4a,0x4c,0x58,0xcf
-.byte	0xd0,0xef,0xaa,0xfb,0x43,0x4d,0x33,0x85
-.byte	0x45,0xf9,0x02,0x7f,0x50,0x3c,0x9f,0xa8
-.byte	0x51,0xa3,0x40,0x8f,0x92,0x9d,0x38,0xf5
-.byte	0xbc,0xb6,0xda,0x21,0x10,0xff,0xf3,0xd2
-.byte	0xcd,0x0c,0x13,0xec,0x5f,0x97,0x44,0x17
-.byte	0xc4,0xa7,0x7e,0x3d,0x64,0x5d,0x19,0x73
-.byte	0x60,0x81,0x4f,0xdc,0x22,0x2a,0x90,0x88
-.byte	0x46,0xee,0xb8,0x14,0xde,0x5e,0x0b,0xdb
-.byte	0xe0,0x32,0x3a,0x0a,0x49,0x06,0x24,0x5c
-.byte	0xc2,0xd3,0xac,0x62,0x91,0x95,0xe4,0x79
-.byte	0xe7,0xc8,0x37,0x6d,0x8d,0xd5,0x4e,0xa9
-.byte	0x6c,0x56,0xf4,0xea,0x65,0x7a,0xae,0x08
-.byte	0xba,0x78,0x25,0x2e,0x1c,0xa6,0xb4,0xc6
-.byte	0xe8,0xdd,0x74,0x1f,0x4b,0xbd,0x8b,0x8a
-.byte	0x70,0x3e,0xb5,0x66,0x48,0x03,0xf6,0x0e
-.byte	0x61,0x35,0x57,0xb9,0x86,0xc1,0x1d,0x9e
-.byte	0xe1,0xf8,0x98,0x11,0x69,0xd9,0x8e,0x94
-.byte	0x9b,0x1e,0x87,0xe9,0xce,0x55,0x28,0xdf
-.byte	0x8c,0xa1,0x89,0x0d,0xbf,0xe6,0x42,0x68
-.byte	0x41,0x99,0x2d,0x0f,0xb0,0x54,0xbb,0x16
-.long	0x00000001, 0x00000002, 0x00000004, 0x00000008
-.long	0x00000010, 0x00000020, 0x00000040, 0x00000080
-.long	0x0000001b, 0x00000036, 0x80808080, 0x80808080
-.long	0xfefefefe, 0xfefefefe, 0x1b1b1b1b, 0x1b1b1b1b
-.p2align	6
-L$AES_Td:
-.long	0x50a7f451,0x50a7f451
-.long	0x5365417e,0x5365417e
-.long	0xc3a4171a,0xc3a4171a
-.long	0x965e273a,0x965e273a
-.long	0xcb6bab3b,0xcb6bab3b
-.long	0xf1459d1f,0xf1459d1f
-.long	0xab58faac,0xab58faac
-.long	0x9303e34b,0x9303e34b
-.long	0x55fa3020,0x55fa3020
-.long	0xf66d76ad,0xf66d76ad
-.long	0x9176cc88,0x9176cc88
-.long	0x254c02f5,0x254c02f5
-.long	0xfcd7e54f,0xfcd7e54f
-.long	0xd7cb2ac5,0xd7cb2ac5
-.long	0x80443526,0x80443526
-.long	0x8fa362b5,0x8fa362b5
-.long	0x495ab1de,0x495ab1de
-.long	0x671bba25,0x671bba25
-.long	0x980eea45,0x980eea45
-.long	0xe1c0fe5d,0xe1c0fe5d
-.long	0x02752fc3,0x02752fc3
-.long	0x12f04c81,0x12f04c81
-.long	0xa397468d,0xa397468d
-.long	0xc6f9d36b,0xc6f9d36b
-.long	0xe75f8f03,0xe75f8f03
-.long	0x959c9215,0x959c9215
-.long	0xeb7a6dbf,0xeb7a6dbf
-.long	0xda595295,0xda595295
-.long	0x2d83bed4,0x2d83bed4
-.long	0xd3217458,0xd3217458
-.long	0x2969e049,0x2969e049
-.long	0x44c8c98e,0x44c8c98e
-.long	0x6a89c275,0x6a89c275
-.long	0x78798ef4,0x78798ef4
-.long	0x6b3e5899,0x6b3e5899
-.long	0xdd71b927,0xdd71b927
-.long	0xb64fe1be,0xb64fe1be
-.long	0x17ad88f0,0x17ad88f0
-.long	0x66ac20c9,0x66ac20c9
-.long	0xb43ace7d,0xb43ace7d
-.long	0x184adf63,0x184adf63
-.long	0x82311ae5,0x82311ae5
-.long	0x60335197,0x60335197
-.long	0x457f5362,0x457f5362
-.long	0xe07764b1,0xe07764b1
-.long	0x84ae6bbb,0x84ae6bbb
-.long	0x1ca081fe,0x1ca081fe
-.long	0x942b08f9,0x942b08f9
-.long	0x58684870,0x58684870
-.long	0x19fd458f,0x19fd458f
-.long	0x876cde94,0x876cde94
-.long	0xb7f87b52,0xb7f87b52
-.long	0x23d373ab,0x23d373ab
-.long	0xe2024b72,0xe2024b72
-.long	0x578f1fe3,0x578f1fe3
-.long	0x2aab5566,0x2aab5566
-.long	0x0728ebb2,0x0728ebb2
-.long	0x03c2b52f,0x03c2b52f
-.long	0x9a7bc586,0x9a7bc586
-.long	0xa50837d3,0xa50837d3
-.long	0xf2872830,0xf2872830
-.long	0xb2a5bf23,0xb2a5bf23
-.long	0xba6a0302,0xba6a0302
-.long	0x5c8216ed,0x5c8216ed
-.long	0x2b1ccf8a,0x2b1ccf8a
-.long	0x92b479a7,0x92b479a7
-.long	0xf0f207f3,0xf0f207f3
-.long	0xa1e2694e,0xa1e2694e
-.long	0xcdf4da65,0xcdf4da65
-.long	0xd5be0506,0xd5be0506
-.long	0x1f6234d1,0x1f6234d1
-.long	0x8afea6c4,0x8afea6c4
-.long	0x9d532e34,0x9d532e34
-.long	0xa055f3a2,0xa055f3a2
-.long	0x32e18a05,0x32e18a05
-.long	0x75ebf6a4,0x75ebf6a4
-.long	0x39ec830b,0x39ec830b
-.long	0xaaef6040,0xaaef6040
-.long	0x069f715e,0x069f715e
-.long	0x51106ebd,0x51106ebd
-.long	0xf98a213e,0xf98a213e
-.long	0x3d06dd96,0x3d06dd96
-.long	0xae053edd,0xae053edd
-.long	0x46bde64d,0x46bde64d
-.long	0xb58d5491,0xb58d5491
-.long	0x055dc471,0x055dc471
-.long	0x6fd40604,0x6fd40604
-.long	0xff155060,0xff155060
-.long	0x24fb9819,0x24fb9819
-.long	0x97e9bdd6,0x97e9bdd6
-.long	0xcc434089,0xcc434089
-.long	0x779ed967,0x779ed967
-.long	0xbd42e8b0,0xbd42e8b0
-.long	0x888b8907,0x888b8907
-.long	0x385b19e7,0x385b19e7
-.long	0xdbeec879,0xdbeec879
-.long	0x470a7ca1,0x470a7ca1
-.long	0xe90f427c,0xe90f427c
-.long	0xc91e84f8,0xc91e84f8
-.long	0x00000000,0x00000000
-.long	0x83868009,0x83868009
-.long	0x48ed2b32,0x48ed2b32
-.long	0xac70111e,0xac70111e
-.long	0x4e725a6c,0x4e725a6c
-.long	0xfbff0efd,0xfbff0efd
-.long	0x5638850f,0x5638850f
-.long	0x1ed5ae3d,0x1ed5ae3d
-.long	0x27392d36,0x27392d36
-.long	0x64d90f0a,0x64d90f0a
-.long	0x21a65c68,0x21a65c68
-.long	0xd1545b9b,0xd1545b9b
-.long	0x3a2e3624,0x3a2e3624
-.long	0xb1670a0c,0xb1670a0c
-.long	0x0fe75793,0x0fe75793
-.long	0xd296eeb4,0xd296eeb4
-.long	0x9e919b1b,0x9e919b1b
-.long	0x4fc5c080,0x4fc5c080
-.long	0xa220dc61,0xa220dc61
-.long	0x694b775a,0x694b775a
-.long	0x161a121c,0x161a121c
-.long	0x0aba93e2,0x0aba93e2
-.long	0xe52aa0c0,0xe52aa0c0
-.long	0x43e0223c,0x43e0223c
-.long	0x1d171b12,0x1d171b12
-.long	0x0b0d090e,0x0b0d090e
-.long	0xadc78bf2,0xadc78bf2
-.long	0xb9a8b62d,0xb9a8b62d
-.long	0xc8a91e14,0xc8a91e14
-.long	0x8519f157,0x8519f157
-.long	0x4c0775af,0x4c0775af
-.long	0xbbdd99ee,0xbbdd99ee
-.long	0xfd607fa3,0xfd607fa3
-.long	0x9f2601f7,0x9f2601f7
-.long	0xbcf5725c,0xbcf5725c
-.long	0xc53b6644,0xc53b6644
-.long	0x347efb5b,0x347efb5b
-.long	0x7629438b,0x7629438b
-.long	0xdcc623cb,0xdcc623cb
-.long	0x68fcedb6,0x68fcedb6
-.long	0x63f1e4b8,0x63f1e4b8
-.long	0xcadc31d7,0xcadc31d7
-.long	0x10856342,0x10856342
-.long	0x40229713,0x40229713
-.long	0x2011c684,0x2011c684
-.long	0x7d244a85,0x7d244a85
-.long	0xf83dbbd2,0xf83dbbd2
-.long	0x1132f9ae,0x1132f9ae
-.long	0x6da129c7,0x6da129c7
-.long	0x4b2f9e1d,0x4b2f9e1d
-.long	0xf330b2dc,0xf330b2dc
-.long	0xec52860d,0xec52860d
-.long	0xd0e3c177,0xd0e3c177
-.long	0x6c16b32b,0x6c16b32b
-.long	0x99b970a9,0x99b970a9
-.long	0xfa489411,0xfa489411
-.long	0x2264e947,0x2264e947
-.long	0xc48cfca8,0xc48cfca8
-.long	0x1a3ff0a0,0x1a3ff0a0
-.long	0xd82c7d56,0xd82c7d56
-.long	0xef903322,0xef903322
-.long	0xc74e4987,0xc74e4987
-.long	0xc1d138d9,0xc1d138d9
-.long	0xfea2ca8c,0xfea2ca8c
-.long	0x360bd498,0x360bd498
-.long	0xcf81f5a6,0xcf81f5a6
-.long	0x28de7aa5,0x28de7aa5
-.long	0x268eb7da,0x268eb7da
-.long	0xa4bfad3f,0xa4bfad3f
-.long	0xe49d3a2c,0xe49d3a2c
-.long	0x0d927850,0x0d927850
-.long	0x9bcc5f6a,0x9bcc5f6a
-.long	0x62467e54,0x62467e54
-.long	0xc2138df6,0xc2138df6
-.long	0xe8b8d890,0xe8b8d890
-.long	0x5ef7392e,0x5ef7392e
-.long	0xf5afc382,0xf5afc382
-.long	0xbe805d9f,0xbe805d9f
-.long	0x7c93d069,0x7c93d069
-.long	0xa92dd56f,0xa92dd56f
-.long	0xb31225cf,0xb31225cf
-.long	0x3b99acc8,0x3b99acc8
-.long	0xa77d1810,0xa77d1810
-.long	0x6e639ce8,0x6e639ce8
-.long	0x7bbb3bdb,0x7bbb3bdb
-.long	0x097826cd,0x097826cd
-.long	0xf418596e,0xf418596e
-.long	0x01b79aec,0x01b79aec
-.long	0xa89a4f83,0xa89a4f83
-.long	0x656e95e6,0x656e95e6
-.long	0x7ee6ffaa,0x7ee6ffaa
-.long	0x08cfbc21,0x08cfbc21
-.long	0xe6e815ef,0xe6e815ef
-.long	0xd99be7ba,0xd99be7ba
-.long	0xce366f4a,0xce366f4a
-.long	0xd4099fea,0xd4099fea
-.long	0xd67cb029,0xd67cb029
-.long	0xafb2a431,0xafb2a431
-.long	0x31233f2a,0x31233f2a
-.long	0x3094a5c6,0x3094a5c6
-.long	0xc066a235,0xc066a235
-.long	0x37bc4e74,0x37bc4e74
-.long	0xa6ca82fc,0xa6ca82fc
-.long	0xb0d090e0,0xb0d090e0
-.long	0x15d8a733,0x15d8a733
-.long	0x4a9804f1,0x4a9804f1
-.long	0xf7daec41,0xf7daec41
-.long	0x0e50cd7f,0x0e50cd7f
-.long	0x2ff69117,0x2ff69117
-.long	0x8dd64d76,0x8dd64d76
-.long	0x4db0ef43,0x4db0ef43
-.long	0x544daacc,0x544daacc
-.long	0xdf0496e4,0xdf0496e4
-.long	0xe3b5d19e,0xe3b5d19e
-.long	0x1b886a4c,0x1b886a4c
-.long	0xb81f2cc1,0xb81f2cc1
-.long	0x7f516546,0x7f516546
-.long	0x04ea5e9d,0x04ea5e9d
-.long	0x5d358c01,0x5d358c01
-.long	0x737487fa,0x737487fa
-.long	0x2e410bfb,0x2e410bfb
-.long	0x5a1d67b3,0x5a1d67b3
-.long	0x52d2db92,0x52d2db92
-.long	0x335610e9,0x335610e9
-.long	0x1347d66d,0x1347d66d
-.long	0x8c61d79a,0x8c61d79a
-.long	0x7a0ca137,0x7a0ca137
-.long	0x8e14f859,0x8e14f859
-.long	0x893c13eb,0x893c13eb
-.long	0xee27a9ce,0xee27a9ce
-.long	0x35c961b7,0x35c961b7
-.long	0xede51ce1,0xede51ce1
-.long	0x3cb1477a,0x3cb1477a
-.long	0x59dfd29c,0x59dfd29c
-.long	0x3f73f255,0x3f73f255
-.long	0x79ce1418,0x79ce1418
-.long	0xbf37c773,0xbf37c773
-.long	0xeacdf753,0xeacdf753
-.long	0x5baafd5f,0x5baafd5f
-.long	0x146f3ddf,0x146f3ddf
-.long	0x86db4478,0x86db4478
-.long	0x81f3afca,0x81f3afca
-.long	0x3ec468b9,0x3ec468b9
-.long	0x2c342438,0x2c342438
-.long	0x5f40a3c2,0x5f40a3c2
-.long	0x72c31d16,0x72c31d16
-.long	0x0c25e2bc,0x0c25e2bc
-.long	0x8b493c28,0x8b493c28
-.long	0x41950dff,0x41950dff
-.long	0x7101a839,0x7101a839
-.long	0xdeb30c08,0xdeb30c08
-.long	0x9ce4b4d8,0x9ce4b4d8
-.long	0x90c15664,0x90c15664
-.long	0x6184cb7b,0x6184cb7b
-.long	0x70b632d5,0x70b632d5
-.long	0x745c6c48,0x745c6c48
-.long	0x4257b8d0,0x4257b8d0
-.byte	0x52,0x09,0x6a,0xd5,0x30,0x36,0xa5,0x38
-.byte	0xbf,0x40,0xa3,0x9e,0x81,0xf3,0xd7,0xfb
-.byte	0x7c,0xe3,0x39,0x82,0x9b,0x2f,0xff,0x87
-.byte	0x34,0x8e,0x43,0x44,0xc4,0xde,0xe9,0xcb
-.byte	0x54,0x7b,0x94,0x32,0xa6,0xc2,0x23,0x3d
-.byte	0xee,0x4c,0x95,0x0b,0x42,0xfa,0xc3,0x4e
-.byte	0x08,0x2e,0xa1,0x66,0x28,0xd9,0x24,0xb2
-.byte	0x76,0x5b,0xa2,0x49,0x6d,0x8b,0xd1,0x25
-.byte	0x72,0xf8,0xf6,0x64,0x86,0x68,0x98,0x16
-.byte	0xd4,0xa4,0x5c,0xcc,0x5d,0x65,0xb6,0x92
-.byte	0x6c,0x70,0x48,0x50,0xfd,0xed,0xb9,0xda
-.byte	0x5e,0x15,0x46,0x57,0xa7,0x8d,0x9d,0x84
-.byte	0x90,0xd8,0xab,0x00,0x8c,0xbc,0xd3,0x0a
-.byte	0xf7,0xe4,0x58,0x05,0xb8,0xb3,0x45,0x06
-.byte	0xd0,0x2c,0x1e,0x8f,0xca,0x3f,0x0f,0x02
-.byte	0xc1,0xaf,0xbd,0x03,0x01,0x13,0x8a,0x6b
-.byte	0x3a,0x91,0x11,0x41,0x4f,0x67,0xdc,0xea
-.byte	0x97,0xf2,0xcf,0xce,0xf0,0xb4,0xe6,0x73
-.byte	0x96,0xac,0x74,0x22,0xe7,0xad,0x35,0x85
-.byte	0xe2,0xf9,0x37,0xe8,0x1c,0x75,0xdf,0x6e
-.byte	0x47,0xf1,0x1a,0x71,0x1d,0x29,0xc5,0x89
-.byte	0x6f,0xb7,0x62,0x0e,0xaa,0x18,0xbe,0x1b
-.byte	0xfc,0x56,0x3e,0x4b,0xc6,0xd2,0x79,0x20
-.byte	0x9a,0xdb,0xc0,0xfe,0x78,0xcd,0x5a,0xf4
-.byte	0x1f,0xdd,0xa8,0x33,0x88,0x07,0xc7,0x31
-.byte	0xb1,0x12,0x10,0x59,0x27,0x80,0xec,0x5f
-.byte	0x60,0x51,0x7f,0xa9,0x19,0xb5,0x4a,0x0d
-.byte	0x2d,0xe5,0x7a,0x9f,0x93,0xc9,0x9c,0xef
-.byte	0xa0,0xe0,0x3b,0x4d,0xae,0x2a,0xf5,0xb0
-.byte	0xc8,0xeb,0xbb,0x3c,0x83,0x53,0x99,0x61
-.byte	0x17,0x2b,0x04,0x7e,0xba,0x77,0xd6,0x26
-.byte	0xe1,0x69,0x14,0x63,0x55,0x21,0x0c,0x7d
-.long	0x80808080, 0x80808080, 0xfefefefe, 0xfefefefe
-.long	0x1b1b1b1b, 0x1b1b1b1b, 0, 0
-.byte	0x52,0x09,0x6a,0xd5,0x30,0x36,0xa5,0x38
-.byte	0xbf,0x40,0xa3,0x9e,0x81,0xf3,0xd7,0xfb
-.byte	0x7c,0xe3,0x39,0x82,0x9b,0x2f,0xff,0x87
-.byte	0x34,0x8e,0x43,0x44,0xc4,0xde,0xe9,0xcb
-.byte	0x54,0x7b,0x94,0x32,0xa6,0xc2,0x23,0x3d
-.byte	0xee,0x4c,0x95,0x0b,0x42,0xfa,0xc3,0x4e
-.byte	0x08,0x2e,0xa1,0x66,0x28,0xd9,0x24,0xb2
-.byte	0x76,0x5b,0xa2,0x49,0x6d,0x8b,0xd1,0x25
-.byte	0x72,0xf8,0xf6,0x64,0x86,0x68,0x98,0x16
-.byte	0xd4,0xa4,0x5c,0xcc,0x5d,0x65,0xb6,0x92
-.byte	0x6c,0x70,0x48,0x50,0xfd,0xed,0xb9,0xda
-.byte	0x5e,0x15,0x46,0x57,0xa7,0x8d,0x9d,0x84
-.byte	0x90,0xd8,0xab,0x00,0x8c,0xbc,0xd3,0x0a
-.byte	0xf7,0xe4,0x58,0x05,0xb8,0xb3,0x45,0x06
-.byte	0xd0,0x2c,0x1e,0x8f,0xca,0x3f,0x0f,0x02
-.byte	0xc1,0xaf,0xbd,0x03,0x01,0x13,0x8a,0x6b
-.byte	0x3a,0x91,0x11,0x41,0x4f,0x67,0xdc,0xea
-.byte	0x97,0xf2,0xcf,0xce,0xf0,0xb4,0xe6,0x73
-.byte	0x96,0xac,0x74,0x22,0xe7,0xad,0x35,0x85
-.byte	0xe2,0xf9,0x37,0xe8,0x1c,0x75,0xdf,0x6e
-.byte	0x47,0xf1,0x1a,0x71,0x1d,0x29,0xc5,0x89
-.byte	0x6f,0xb7,0x62,0x0e,0xaa,0x18,0xbe,0x1b
-.byte	0xfc,0x56,0x3e,0x4b,0xc6,0xd2,0x79,0x20
-.byte	0x9a,0xdb,0xc0,0xfe,0x78,0xcd,0x5a,0xf4
-.byte	0x1f,0xdd,0xa8,0x33,0x88,0x07,0xc7,0x31
-.byte	0xb1,0x12,0x10,0x59,0x27,0x80,0xec,0x5f
-.byte	0x60,0x51,0x7f,0xa9,0x19,0xb5,0x4a,0x0d
-.byte	0x2d,0xe5,0x7a,0x9f,0x93,0xc9,0x9c,0xef
-.byte	0xa0,0xe0,0x3b,0x4d,0xae,0x2a,0xf5,0xb0
-.byte	0xc8,0xeb,0xbb,0x3c,0x83,0x53,0x99,0x61
-.byte	0x17,0x2b,0x04,0x7e,0xba,0x77,0xd6,0x26
-.byte	0xe1,0x69,0x14,0x63,0x55,0x21,0x0c,0x7d
-.long	0x80808080, 0x80808080, 0xfefefefe, 0xfefefefe
-.long	0x1b1b1b1b, 0x1b1b1b1b, 0, 0
-.byte	0x52,0x09,0x6a,0xd5,0x30,0x36,0xa5,0x38
-.byte	0xbf,0x40,0xa3,0x9e,0x81,0xf3,0xd7,0xfb
-.byte	0x7c,0xe3,0x39,0x82,0x9b,0x2f,0xff,0x87
-.byte	0x34,0x8e,0x43,0x44,0xc4,0xde,0xe9,0xcb
-.byte	0x54,0x7b,0x94,0x32,0xa6,0xc2,0x23,0x3d
-.byte	0xee,0x4c,0x95,0x0b,0x42,0xfa,0xc3,0x4e
-.byte	0x08,0x2e,0xa1,0x66,0x28,0xd9,0x24,0xb2
-.byte	0x76,0x5b,0xa2,0x49,0x6d,0x8b,0xd1,0x25
-.byte	0x72,0xf8,0xf6,0x64,0x86,0x68,0x98,0x16
-.byte	0xd4,0xa4,0x5c,0xcc,0x5d,0x65,0xb6,0x92
-.byte	0x6c,0x70,0x48,0x50,0xfd,0xed,0xb9,0xda
-.byte	0x5e,0x15,0x46,0x57,0xa7,0x8d,0x9d,0x84
-.byte	0x90,0xd8,0xab,0x00,0x8c,0xbc,0xd3,0x0a
-.byte	0xf7,0xe4,0x58,0x05,0xb8,0xb3,0x45,0x06
-.byte	0xd0,0x2c,0x1e,0x8f,0xca,0x3f,0x0f,0x02
-.byte	0xc1,0xaf,0xbd,0x03,0x01,0x13,0x8a,0x6b
-.byte	0x3a,0x91,0x11,0x41,0x4f,0x67,0xdc,0xea
-.byte	0x97,0xf2,0xcf,0xce,0xf0,0xb4,0xe6,0x73
-.byte	0x96,0xac,0x74,0x22,0xe7,0xad,0x35,0x85
-.byte	0xe2,0xf9,0x37,0xe8,0x1c,0x75,0xdf,0x6e
-.byte	0x47,0xf1,0x1a,0x71,0x1d,0x29,0xc5,0x89
-.byte	0x6f,0xb7,0x62,0x0e,0xaa,0x18,0xbe,0x1b
-.byte	0xfc,0x56,0x3e,0x4b,0xc6,0xd2,0x79,0x20
-.byte	0x9a,0xdb,0xc0,0xfe,0x78,0xcd,0x5a,0xf4
-.byte	0x1f,0xdd,0xa8,0x33,0x88,0x07,0xc7,0x31
-.byte	0xb1,0x12,0x10,0x59,0x27,0x80,0xec,0x5f
-.byte	0x60,0x51,0x7f,0xa9,0x19,0xb5,0x4a,0x0d
-.byte	0x2d,0xe5,0x7a,0x9f,0x93,0xc9,0x9c,0xef
-.byte	0xa0,0xe0,0x3b,0x4d,0xae,0x2a,0xf5,0xb0
-.byte	0xc8,0xeb,0xbb,0x3c,0x83,0x53,0x99,0x61
-.byte	0x17,0x2b,0x04,0x7e,0xba,0x77,0xd6,0x26
-.byte	0xe1,0x69,0x14,0x63,0x55,0x21,0x0c,0x7d
-.long	0x80808080, 0x80808080, 0xfefefefe, 0xfefefefe
-.long	0x1b1b1b1b, 0x1b1b1b1b, 0, 0
-.byte	0x52,0x09,0x6a,0xd5,0x30,0x36,0xa5,0x38
-.byte	0xbf,0x40,0xa3,0x9e,0x81,0xf3,0xd7,0xfb
-.byte	0x7c,0xe3,0x39,0x82,0x9b,0x2f,0xff,0x87
-.byte	0x34,0x8e,0x43,0x44,0xc4,0xde,0xe9,0xcb
-.byte	0x54,0x7b,0x94,0x32,0xa6,0xc2,0x23,0x3d
-.byte	0xee,0x4c,0x95,0x0b,0x42,0xfa,0xc3,0x4e
-.byte	0x08,0x2e,0xa1,0x66,0x28,0xd9,0x24,0xb2
-.byte	0x76,0x5b,0xa2,0x49,0x6d,0x8b,0xd1,0x25
-.byte	0x72,0xf8,0xf6,0x64,0x86,0x68,0x98,0x16
-.byte	0xd4,0xa4,0x5c,0xcc,0x5d,0x65,0xb6,0x92
-.byte	0x6c,0x70,0x48,0x50,0xfd,0xed,0xb9,0xda
-.byte	0x5e,0x15,0x46,0x57,0xa7,0x8d,0x9d,0x84
-.byte	0x90,0xd8,0xab,0x00,0x8c,0xbc,0xd3,0x0a
-.byte	0xf7,0xe4,0x58,0x05,0xb8,0xb3,0x45,0x06
-.byte	0xd0,0x2c,0x1e,0x8f,0xca,0x3f,0x0f,0x02
-.byte	0xc1,0xaf,0xbd,0x03,0x01,0x13,0x8a,0x6b
-.byte	0x3a,0x91,0x11,0x41,0x4f,0x67,0xdc,0xea
-.byte	0x97,0xf2,0xcf,0xce,0xf0,0xb4,0xe6,0x73
-.byte	0x96,0xac,0x74,0x22,0xe7,0xad,0x35,0x85
-.byte	0xe2,0xf9,0x37,0xe8,0x1c,0x75,0xdf,0x6e
-.byte	0x47,0xf1,0x1a,0x71,0x1d,0x29,0xc5,0x89
-.byte	0x6f,0xb7,0x62,0x0e,0xaa,0x18,0xbe,0x1b
-.byte	0xfc,0x56,0x3e,0x4b,0xc6,0xd2,0x79,0x20
-.byte	0x9a,0xdb,0xc0,0xfe,0x78,0xcd,0x5a,0xf4
-.byte	0x1f,0xdd,0xa8,0x33,0x88,0x07,0xc7,0x31
-.byte	0xb1,0x12,0x10,0x59,0x27,0x80,0xec,0x5f
-.byte	0x60,0x51,0x7f,0xa9,0x19,0xb5,0x4a,0x0d
-.byte	0x2d,0xe5,0x7a,0x9f,0x93,0xc9,0x9c,0xef
-.byte	0xa0,0xe0,0x3b,0x4d,0xae,0x2a,0xf5,0xb0
-.byte	0xc8,0xeb,0xbb,0x3c,0x83,0x53,0x99,0x61
-.byte	0x17,0x2b,0x04,0x7e,0xba,0x77,0xd6,0x26
-.byte	0xe1,0x69,0x14,0x63,0x55,0x21,0x0c,0x7d
-.long	0x80808080, 0x80808080, 0xfefefefe, 0xfefefefe
-.long	0x1b1b1b1b, 0x1b1b1b1b, 0, 0
-.byte	65,69,83,32,102,111,114,32,120,56,54,95,54,52,44,32,67,82,89,80,84,79,71,65,77,83,32,98,121,32,60,97,112,112,114,111,64,111,112,101,110,115,115,108,46,111,114,103,62,0
-.p2align	6
diff --git a/deps/openssl/config/archs/darwin64-x86_64-cc/asm/crypto/aes/aesni-sha1-x86_64.s b/deps/openssl/config/archs/darwin64-x86_64-cc/asm/crypto/aes/aesni-sha1-x86_64.s
index aed8f3a345..738aa6dc53 100644
--- a/deps/openssl/config/archs/darwin64-x86_64-cc/asm/crypto/aes/aesni-sha1-x86_64.s
+++ b/deps/openssl/config/archs/darwin64-x86_64-cc/asm/crypto/aes/aesni-sha1-x86_64.s
@@ -6,6 +6,7 @@
 .p2align	5
 _aesni_cbc_sha1_enc:
 
+
 	movl	_OPENSSL_ia32cap_P+0(%rip),%r10d
 	movq	_OPENSSL_ia32cap_P+4(%rip),%r11
 	btq	$61,%r11
@@ -19,6 +20,7 @@ _aesni_cbc_sha1_enc:
 	.byte	0xf3,0xc3
 
 
+
 .p2align	5
 aesni_cbc_sha1_enc_ssse3:
 
@@ -2718,6 +2720,7 @@ K_XX_XX:
 
 .p2align	5
 aesni_cbc_sha1_enc_shaext:
+
 	movq	8(%rsp),%r10
 	movdqu	(%r9),%xmm8
 	movd	16(%r9),%xmm9
diff --git a/deps/openssl/config/archs/darwin64-x86_64-cc/asm/crypto/aes/aesni-sha256-x86_64.s b/deps/openssl/config/archs/darwin64-x86_64-cc/asm/crypto/aes/aesni-sha256-x86_64.s
index 28cf0768ca..3aee22c3bc 100644
--- a/deps/openssl/config/archs/darwin64-x86_64-cc/asm/crypto/aes/aesni-sha256-x86_64.s
+++ b/deps/openssl/config/archs/darwin64-x86_64-cc/asm/crypto/aes/aesni-sha256-x86_64.s
@@ -5,6 +5,7 @@
 
 .p2align	4
 _aesni_cbc_sha256_enc:
+
 	leaq	_OPENSSL_ia32cap_P(%rip),%r11
 	movl	$1,%eax
 	cmpq	$0,%rdi
@@ -32,6 +33,7 @@ L$probe:
 	.byte	0xf3,0xc3
 
 
+
 .p2align	6
 
 K256:
@@ -2528,7 +2530,15 @@ L$oop_avx2:
 	vmovdqa	%ymm4,0(%rsp)
 	xorl	%r14d,%r14d
 	vmovdqa	%ymm5,32(%rsp)
+
+	movq	120(%rsp),%rsi
+
 	leaq	-64(%rsp),%rsp
+
+
+
+	movq	%rsi,-8(%rsp)
+
 	movl	%ebx,%esi
 	vmovdqa	%ymm6,0(%rsp)
 	xorl	%ecx,%esi
@@ -2542,6 +2552,12 @@ L$avx2_00_47:
 	vmovdqu	(%r13),%xmm9
 	vpinsrq	$0,%r13,%xmm15,%xmm15
 	leaq	-64(%rsp),%rsp
+
+
+	pushq	64-8(%rsp)
+
+	leaq	8(%rsp),%rsp
+
 	vpalignr	$4,%ymm0,%ymm1,%ymm4
 	addl	0+128(%rsp),%r11d
 	andl	%r8d,%r12d
@@ -2816,6 +2832,12 @@ L$avx2_00_47:
 	movl	%r9d,%r12d
 	vmovdqa	%ymm6,32(%rsp)
 	leaq	-64(%rsp),%rsp
+
+
+	pushq	64-8(%rsp)
+
+	leaq	8(%rsp),%rsp
+
 	vpalignr	$4,%ymm2,%ymm3,%ymm4
 	addl	0+128(%rsp),%r11d
 	andl	%r8d,%r12d
@@ -4029,10 +4051,12 @@ L$ower_avx2:
 	jbe	L$oop_avx2
 	leaq	(%rsp),%rbp
 
+
+
+
 L$done_avx2:
-	leaq	(%rbp),%rsp
-	movq	64+32(%rsp),%r8
-	movq	120(%rsp),%rsi
+	movq	64+32(%rbp),%r8
+	movq	64+56(%rbp),%rsi
 
 	vmovdqu	%xmm8,(%r8)
 	vzeroall
@@ -4057,6 +4081,7 @@ L$epilogue_avx2:
 
 .p2align	5
 aesni_cbc_sha256_enc_shaext:
+
 	movq	8(%rsp),%r10
 	leaq	K256+128(%rip),%rax
 	movdqu	(%r9),%xmm1
diff --git a/deps/openssl/config/archs/darwin64-x86_64-cc/asm/crypto/aes/aesni-x86_64.s b/deps/openssl/config/archs/darwin64-x86_64-cc/asm/crypto/aes/aesni-x86_64.s
index 6792a530f2..924900d84e 100644
--- a/deps/openssl/config/archs/darwin64-x86_64-cc/asm/crypto/aes/aesni-x86_64.s
+++ b/deps/openssl/config/archs/darwin64-x86_64-cc/asm/crypto/aes/aesni-x86_64.s
@@ -861,6 +861,7 @@ L$ecb_ret:
 
 .p2align	4
 _aesni_ccm64_encrypt_blocks:
+
 	movl	240(%rcx),%eax
 	movdqu	(%r8),%xmm6
 	movdqa	L$increment64(%rip),%xmm9
@@ -920,10 +921,12 @@ L$ccm64_enc2_loop:
 	pxor	%xmm6,%xmm6
 	.byte	0xf3,0xc3
 
+
 .globl	_aesni_ccm64_decrypt_blocks
 
 .p2align	4
 _aesni_ccm64_decrypt_blocks:
+
 	movl	240(%rcx),%eax
 	movups	(%r8),%xmm6
 	movdqu	(%r9),%xmm3
@@ -1017,6 +1020,7 @@ L$oop_enc1_6:
 	pxor	%xmm6,%xmm6
 	.byte	0xf3,0xc3
 
+
 .globl	_aesni_ctr32_encrypt_blocks
 
 .p2align	4
@@ -2785,6 +2789,7 @@ L$ocb_enc_epilogue:
 
 .p2align	5
 __ocb_encrypt6:
+
 	pxor	%xmm9,%xmm15
 	movdqu	(%rbx,%r12,1),%xmm11
 	movdqa	%xmm10,%xmm12
@@ -2885,8 +2890,10 @@ L$ocb_enc_loop6:
 
 
 
+
 .p2align	5
 __ocb_encrypt4:
+
 	pxor	%xmm9,%xmm15
 	movdqu	(%rbx,%r12,1),%xmm11
 	movdqa	%xmm10,%xmm12
@@ -2954,8 +2961,10 @@ L$ocb_enc_loop4:
 
 
 
+
 .p2align	5
 __ocb_encrypt1:
+
 	pxor	%xmm15,%xmm7
 	pxor	%xmm9,%xmm7
 	pxor	%xmm2,%xmm8
@@ -2988,6 +2997,7 @@ L$ocb_enc_loop1:
 	.byte	0xf3,0xc3
 
 
+
 .globl	_aesni_ocb_decrypt
 
 .p2align	5
@@ -3223,6 +3233,7 @@ L$ocb_dec_epilogue:
 
 .p2align	5
 __ocb_decrypt6:
+
 	pxor	%xmm9,%xmm15
 	movdqu	(%rbx,%r12,1),%xmm11
 	movdqa	%xmm10,%xmm12
@@ -3317,8 +3328,10 @@ L$ocb_dec_loop6:
 
 
 
+
 .p2align	5
 __ocb_decrypt4:
+
 	pxor	%xmm9,%xmm15
 	movdqu	(%rbx,%r12,1),%xmm11
 	movdqa	%xmm10,%xmm12
@@ -3382,8 +3395,10 @@ L$ocb_dec_loop4:
 
 
 
+
 .p2align	5
 __ocb_decrypt1:
+
 	pxor	%xmm15,%xmm7
 	pxor	%xmm9,%xmm7
 	pxor	%xmm7,%xmm2
@@ -3414,6 +3429,7 @@ L$ocb_dec_loop1:
 .byte	102,15,56,223,215
 	.byte	0xf3,0xc3
 
+
 .globl	_aesni_cbc_encrypt
 
 .p2align	4
@@ -4351,7 +4367,6 @@ L$enc_key_ret:
 	addq	$8,%rsp
 
 	.byte	0xf3,0xc3
-
 L$SEH_end_set_encrypt_key:
 
 .p2align	4
@@ -4424,6 +4439,7 @@ L$key_expansion_256b:
 	.byte	0xf3,0xc3
 
 
+
 .p2align	6
 L$bswap_mask:
 .byte	15,14,13,12,11,10,9,8,7,6,5,4,3,2,1,0
diff --git a/deps/openssl/config/archs/darwin64-x86_64-cc/asm/crypto/aes/bsaes-x86_64.s b/deps/openssl/config/archs/darwin64-x86_64-cc/asm/crypto/aes/bsaes-x86_64.s
deleted file mode 100644
index 2fefb75ac3..0000000000
--- a/deps/openssl/config/archs/darwin64-x86_64-cc/asm/crypto/aes/bsaes-x86_64.s
+++ /dev/null
@@ -1,2571 +0,0 @@
-.text	
-
-
-
-
-
-.p2align	6
-_bsaes_encrypt8:
-
-	leaq	L$BS0(%rip),%r11
-
-	movdqa	(%rax),%xmm8
-	leaq	16(%rax),%rax
-	movdqa	80(%r11),%xmm7
-	pxor	%xmm8,%xmm15
-	pxor	%xmm8,%xmm0
-	pxor	%xmm8,%xmm1
-	pxor	%xmm8,%xmm2
-.byte	102,68,15,56,0,255
-.byte	102,15,56,0,199
-	pxor	%xmm8,%xmm3
-	pxor	%xmm8,%xmm4
-.byte	102,15,56,0,207
-.byte	102,15,56,0,215
-	pxor	%xmm8,%xmm5
-	pxor	%xmm8,%xmm6
-.byte	102,15,56,0,223
-.byte	102,15,56,0,231
-.byte	102,15,56,0,239
-.byte	102,15,56,0,247
-_bsaes_encrypt8_bitslice:
-	movdqa	0(%r11),%xmm7
-	movdqa	16(%r11),%xmm8
-	movdqa	%xmm5,%xmm9
-	psrlq	$1,%xmm5
-	movdqa	%xmm3,%xmm10
-	psrlq	$1,%xmm3
-	pxor	%xmm6,%xmm5
-	pxor	%xmm4,%xmm3
-	pand	%xmm7,%xmm5
-	pand	%xmm7,%xmm3
-	pxor	%xmm5,%xmm6
-	psllq	$1,%xmm5
-	pxor	%xmm3,%xmm4
-	psllq	$1,%xmm3
-	pxor	%xmm9,%xmm5
-	pxor	%xmm10,%xmm3
-	movdqa	%xmm1,%xmm9
-	psrlq	$1,%xmm1
-	movdqa	%xmm15,%xmm10
-	psrlq	$1,%xmm15
-	pxor	%xmm2,%xmm1
-	pxor	%xmm0,%xmm15
-	pand	%xmm7,%xmm1
-	pand	%xmm7,%xmm15
-	pxor	%xmm1,%xmm2
-	psllq	$1,%xmm1
-	pxor	%xmm15,%xmm0
-	psllq	$1,%xmm15
-	pxor	%xmm9,%xmm1
-	pxor	%xmm10,%xmm15
-	movdqa	32(%r11),%xmm7
-	movdqa	%xmm4,%xmm9
-	psrlq	$2,%xmm4
-	movdqa	%xmm3,%xmm10
-	psrlq	$2,%xmm3
-	pxor	%xmm6,%xmm4
-	pxor	%xmm5,%xmm3
-	pand	%xmm8,%xmm4
-	pand	%xmm8,%xmm3
-	pxor	%xmm4,%xmm6
-	psllq	$2,%xmm4
-	pxor	%xmm3,%xmm5
-	psllq	$2,%xmm3
-	pxor	%xmm9,%xmm4
-	pxor	%xmm10,%xmm3
-	movdqa	%xmm0,%xmm9
-	psrlq	$2,%xmm0
-	movdqa	%xmm15,%xmm10
-	psrlq	$2,%xmm15
-	pxor	%xmm2,%xmm0
-	pxor	%xmm1,%xmm15
-	pand	%xmm8,%xmm0
-	pand	%xmm8,%xmm15
-	pxor	%xmm0,%xmm2
-	psllq	$2,%xmm0
-	pxor	%xmm15,%xmm1
-	psllq	$2,%xmm15
-	pxor	%xmm9,%xmm0
-	pxor	%xmm10,%xmm15
-	movdqa	%xmm2,%xmm9
-	psrlq	$4,%xmm2
-	movdqa	%xmm1,%xmm10
-	psrlq	$4,%xmm1
-	pxor	%xmm6,%xmm2
-	pxor	%xmm5,%xmm1
-	pand	%xmm7,%xmm2
-	pand	%xmm7,%xmm1
-	pxor	%xmm2,%xmm6
-	psllq	$4,%xmm2
-	pxor	%xmm1,%xmm5
-	psllq	$4,%xmm1
-	pxor	%xmm9,%xmm2
-	pxor	%xmm10,%xmm1
-	movdqa	%xmm0,%xmm9
-	psrlq	$4,%xmm0
-	movdqa	%xmm15,%xmm10
-	psrlq	$4,%xmm15
-	pxor	%xmm4,%xmm0
-	pxor	%xmm3,%xmm15
-	pand	%xmm7,%xmm0
-	pand	%xmm7,%xmm15
-	pxor	%xmm0,%xmm4
-	psllq	$4,%xmm0
-	pxor	%xmm15,%xmm3
-	psllq	$4,%xmm15
-	pxor	%xmm9,%xmm0
-	pxor	%xmm10,%xmm15
-	decl	%r10d
-	jmp	L$enc_sbox
-.p2align	4
-L$enc_loop:
-	pxor	0(%rax),%xmm15
-	pxor	16(%rax),%xmm0
-	pxor	32(%rax),%xmm1
-	pxor	48(%rax),%xmm2
-.byte	102,68,15,56,0,255
-.byte	102,15,56,0,199
-	pxor	64(%rax),%xmm3
-	pxor	80(%rax),%xmm4
-.byte	102,15,56,0,207
-.byte	102,15,56,0,215
-	pxor	96(%rax),%xmm5
-	pxor	112(%rax),%xmm6
-.byte	102,15,56,0,223
-.byte	102,15,56,0,231
-.byte	102,15,56,0,239
-.byte	102,15,56,0,247
-	leaq	128(%rax),%rax
-L$enc_sbox:
-	pxor	%xmm5,%xmm4
-	pxor	%xmm0,%xmm1
-	pxor	%xmm15,%xmm2
-	pxor	%xmm1,%xmm5
-	pxor	%xmm15,%xmm4
-
-	pxor	%xmm2,%xmm5
-	pxor	%xmm6,%xmm2
-	pxor	%xmm4,%xmm6
-	pxor	%xmm3,%xmm2
-	pxor	%xmm4,%xmm3
-	pxor	%xmm0,%xmm2
-
-	pxor	%xmm6,%xmm1
-	pxor	%xmm4,%xmm0
-	movdqa	%xmm6,%xmm10
-	movdqa	%xmm0,%xmm9
-	movdqa	%xmm4,%xmm8
-	movdqa	%xmm1,%xmm12
-	movdqa	%xmm5,%xmm11
-
-	pxor	%xmm3,%xmm10
-	pxor	%xmm1,%xmm9
-	pxor	%xmm2,%xmm8
-	movdqa	%xmm10,%xmm13
-	pxor	%xmm3,%xmm12
-	movdqa	%xmm9,%xmm7
-	pxor	%xmm15,%xmm11
-	movdqa	%xmm10,%xmm14
-
-	por	%xmm8,%xmm9
-	por	%xmm11,%xmm10
-	pxor	%xmm7,%xmm14
-	pand	%xmm11,%xmm13
-	pxor	%xmm8,%xmm11
-	pand	%xmm8,%xmm7
-	pand	%xmm11,%xmm14
-	movdqa	%xmm2,%xmm11
-	pxor	%xmm15,%xmm11
-	pand	%xmm11,%xmm12
-	pxor	%xmm12,%xmm10
-	pxor	%xmm12,%xmm9
-	movdqa	%xmm6,%xmm12
-	movdqa	%xmm4,%xmm11
-	pxor	%xmm0,%xmm12
-	pxor	%xmm5,%xmm11
-	movdqa	%xmm12,%xmm8
-	pand	%xmm11,%xmm12
-	por	%xmm11,%xmm8
-	pxor	%xmm12,%xmm7
-	pxor	%xmm14,%xmm10
-	pxor	%xmm13,%xmm9
-	pxor	%xmm14,%xmm8
-	movdqa	%xmm1,%xmm11
-	pxor	%xmm13,%xmm7
-	movdqa	%xmm3,%xmm12
-	pxor	%xmm13,%xmm8
-	movdqa	%xmm0,%xmm13
-	pand	%xmm2,%xmm11
-	movdqa	%xmm6,%xmm14
-	pand	%xmm15,%xmm12
-	pand	%xmm4,%xmm13
-	por	%xmm5,%xmm14
-	pxor	%xmm11,%xmm10
-	pxor	%xmm12,%xmm9
-	pxor	%xmm13,%xmm8
-	pxor	%xmm14,%xmm7
-
-
-
-
-
-	movdqa	%xmm10,%xmm11
-	pand	%xmm8,%xmm10
-	pxor	%xmm9,%xmm11
-
-	movdqa	%xmm7,%xmm13
-	movdqa	%xmm11,%xmm14
-	pxor	%xmm10,%xmm13
-	pand	%xmm13,%xmm14
-
-	movdqa	%xmm8,%xmm12
-	pxor	%xmm9,%xmm14
-	pxor	%xmm7,%xmm12
-
-	pxor	%xmm9,%xmm10
-
-	pand	%xmm10,%xmm12
-
-	movdqa	%xmm13,%xmm9
-	pxor	%xmm7,%xmm12
-
-	pxor	%xmm12,%xmm9
-	pxor	%xmm12,%xmm8
-
-	pand	%xmm7,%xmm9
-
-	pxor	%xmm9,%xmm13
-	pxor	%xmm9,%xmm8
-
-	pand	%xmm14,%xmm13
-
-	pxor	%xmm11,%xmm13
-	movdqa	%xmm5,%xmm11
-	movdqa	%xmm4,%xmm7
-	movdqa	%xmm14,%xmm9
-	pxor	%xmm13,%xmm9
-	pand	%xmm5,%xmm9
-	pxor	%xmm4,%xmm5
-	pand	%xmm14,%xmm4
-	pand	%xmm13,%xmm5
-	pxor	%xmm4,%xmm5
-	pxor	%xmm9,%xmm4
-	pxor	%xmm15,%xmm11
-	pxor	%xmm2,%xmm7
-	pxor	%xmm12,%xmm14
-	pxor	%xmm8,%xmm13
-	movdqa	%xmm14,%xmm10
-	movdqa	%xmm12,%xmm9
-	pxor	%xmm13,%xmm10
-	pxor	%xmm8,%xmm9
-	pand	%xmm11,%xmm10
-	pand	%xmm15,%xmm9
-	pxor	%xmm7,%xmm11
-	pxor	%xmm2,%xmm15
-	pand	%xmm14,%xmm7
-	pand	%xmm12,%xmm2
-	pand	%xmm13,%xmm11
-	pand	%xmm8,%xmm15
-	pxor	%xmm11,%xmm7
-	pxor	%xmm2,%xmm15
-	pxor	%xmm10,%xmm11
-	pxor	%xmm9,%xmm2
-	pxor	%xmm11,%xmm5
-	pxor	%xmm11,%xmm15
-	pxor	%xmm7,%xmm4
-	pxor	%xmm7,%xmm2
-
-	movdqa	%xmm6,%xmm11
-	movdqa	%xmm0,%xmm7
-	pxor	%xmm3,%xmm11
-	pxor	%xmm1,%xmm7
-	movdqa	%xmm14,%xmm10
-	movdqa	%xmm12,%xmm9
-	pxor	%xmm13,%xmm10
-	pxor	%xmm8,%xmm9
-	pand	%xmm11,%xmm10
-	pand	%xmm3,%xmm9
-	pxor	%xmm7,%xmm11
-	pxor	%xmm1,%xmm3
-	pand	%xmm14,%xmm7
-	pand	%xmm12,%xmm1
-	pand	%xmm13,%xmm11
-	pand	%xmm8,%xmm3
-	pxor	%xmm11,%xmm7
-	pxor	%xmm1,%xmm3
-	pxor	%xmm10,%xmm11
-	pxor	%xmm9,%xmm1
-	pxor	%xmm12,%xmm14
-	pxor	%xmm8,%xmm13
-	movdqa	%xmm14,%xmm10
-	pxor	%xmm13,%xmm10
-	pand	%xmm6,%xmm10
-	pxor	%xmm0,%xmm6
-	pand	%xmm14,%xmm0
-	pand	%xmm13,%xmm6
-	pxor	%xmm0,%xmm6
-	pxor	%xmm10,%xmm0
-	pxor	%xmm11,%xmm6
-	pxor	%xmm11,%xmm3
-	pxor	%xmm7,%xmm0
-	pxor	%xmm7,%xmm1
-	pxor	%xmm15,%xmm6
-	pxor	%xmm5,%xmm0
-	pxor	%xmm6,%xmm3
-	pxor	%xmm15,%xmm5
-	pxor	%xmm0,%xmm15
-
-	pxor	%xmm4,%xmm0
-	pxor	%xmm1,%xmm4
-	pxor	%xmm2,%xmm1
-	pxor	%xmm4,%xmm2
-	pxor	%xmm4,%xmm3
-
-	pxor	%xmm2,%xmm5
-	decl	%r10d
-	jl	L$enc_done
-	pshufd	$0x93,%xmm15,%xmm7
-	pshufd	$0x93,%xmm0,%xmm8
-	pxor	%xmm7,%xmm15
-	pshufd	$0x93,%xmm3,%xmm9
-	pxor	%xmm8,%xmm0
-	pshufd	$0x93,%xmm5,%xmm10
-	pxor	%xmm9,%xmm3
-	pshufd	$0x93,%xmm2,%xmm11
-	pxor	%xmm10,%xmm5
-	pshufd	$0x93,%xmm6,%xmm12
-	pxor	%xmm11,%xmm2
-	pshufd	$0x93,%xmm1,%xmm13
-	pxor	%xmm12,%xmm6
-	pshufd	$0x93,%xmm4,%xmm14
-	pxor	%xmm13,%xmm1
-	pxor	%xmm14,%xmm4
-
-	pxor	%xmm15,%xmm8
-	pxor	%xmm4,%xmm7
-	pxor	%xmm4,%xmm8
-	pshufd	$0x4E,%xmm15,%xmm15
-	pxor	%xmm0,%xmm9
-	pshufd	$0x4E,%xmm0,%xmm0
-	pxor	%xmm2,%xmm12
-	pxor	%xmm7,%xmm15
-	pxor	%xmm6,%xmm13
-	pxor	%xmm8,%xmm0
-	pxor	%xmm5,%xmm11
-	pshufd	$0x4E,%xmm2,%xmm7
-	pxor	%xmm1,%xmm14
-	pshufd	$0x4E,%xmm6,%xmm8
-	pxor	%xmm3,%xmm10
-	pshufd	$0x4E,%xmm5,%xmm2
-	pxor	%xmm4,%xmm10
-	pshufd	$0x4E,%xmm4,%xmm6
-	pxor	%xmm4,%xmm11
-	pshufd	$0x4E,%xmm1,%xmm5
-	pxor	%xmm11,%xmm7
-	pshufd	$0x4E,%xmm3,%xmm1
-	pxor	%xmm12,%xmm8
-	pxor	%xmm10,%xmm2
-	pxor	%xmm14,%xmm6
-	pxor	%xmm13,%xmm5
-	movdqa	%xmm7,%xmm3
-	pxor	%xmm9,%xmm1
-	movdqa	%xmm8,%xmm4
-	movdqa	48(%r11),%xmm7
-	jnz	L$enc_loop
-	movdqa	64(%r11),%xmm7
-	jmp	L$enc_loop
-.p2align	4
-L$enc_done:
-	movdqa	0(%r11),%xmm7
-	movdqa	16(%r11),%xmm8
-	movdqa	%xmm1,%xmm9
-	psrlq	$1,%xmm1
-	movdqa	%xmm2,%xmm10
-	psrlq	$1,%xmm2
-	pxor	%xmm4,%xmm1
-	pxor	%xmm6,%xmm2
-	pand	%xmm7,%xmm1
-	pand	%xmm7,%xmm2
-	pxor	%xmm1,%xmm4
-	psllq	$1,%xmm1
-	pxor	%xmm2,%xmm6
-	psllq	$1,%xmm2
-	pxor	%xmm9,%xmm1
-	pxor	%xmm10,%xmm2
-	movdqa	%xmm3,%xmm9
-	psrlq	$1,%xmm3
-	movdqa	%xmm15,%xmm10
-	psrlq	$1,%xmm15
-	pxor	%xmm5,%xmm3
-	pxor	%xmm0,%xmm15
-	pand	%xmm7,%xmm3
-	pand	%xmm7,%xmm15
-	pxor	%xmm3,%xmm5
-	psllq	$1,%xmm3
-	pxor	%xmm15,%xmm0
-	psllq	$1,%xmm15
-	pxor	%xmm9,%xmm3
-	pxor	%xmm10,%xmm15
-	movdqa	32(%r11),%xmm7
-	movdqa	%xmm6,%xmm9
-	psrlq	$2,%xmm6
-	movdqa	%xmm2,%xmm10
-	psrlq	$2,%xmm2
-	pxor	%xmm4,%xmm6
-	pxor	%xmm1,%xmm2
-	pand	%xmm8,%xmm6
-	pand	%xmm8,%xmm2
-	pxor	%xmm6,%xmm4
-	psllq	$2,%xmm6
-	pxor	%xmm2,%xmm1
-	psllq	$2,%xmm2
-	pxor	%xmm9,%xmm6
-	pxor	%xmm10,%xmm2
-	movdqa	%xmm0,%xmm9
-	psrlq	$2,%xmm0
-	movdqa	%xmm15,%xmm10
-	psrlq	$2,%xmm15
-	pxor	%xmm5,%xmm0
-	pxor	%xmm3,%xmm15
-	pand	%xmm8,%xmm0
-	pand	%xmm8,%xmm15
-	pxor	%xmm0,%xmm5
-	psllq	$2,%xmm0
-	pxor	%xmm15,%xmm3
-	psllq	$2,%xmm15
-	pxor	%xmm9,%xmm0
-	pxor	%xmm10,%xmm15
-	movdqa	%xmm5,%xmm9
-	psrlq	$4,%xmm5
-	movdqa	%xmm3,%xmm10
-	psrlq	$4,%xmm3
-	pxor	%xmm4,%xmm5
-	pxor	%xmm1,%xmm3
-	pand	%xmm7,%xmm5
-	pand	%xmm7,%xmm3
-	pxor	%xmm5,%xmm4
-	psllq	$4,%xmm5
-	pxor	%xmm3,%xmm1
-	psllq	$4,%xmm3
-	pxor	%xmm9,%xmm5
-	pxor	%xmm10,%xmm3
-	movdqa	%xmm0,%xmm9
-	psrlq	$4,%xmm0
-	movdqa	%xmm15,%xmm10
-	psrlq	$4,%xmm15
-	pxor	%xmm6,%xmm0
-	pxor	%xmm2,%xmm15
-	pand	%xmm7,%xmm0
-	pand	%xmm7,%xmm15
-	pxor	%xmm0,%xmm6
-	psllq	$4,%xmm0
-	pxor	%xmm15,%xmm2
-	psllq	$4,%xmm15
-	pxor	%xmm9,%xmm0
-	pxor	%xmm10,%xmm15
-	movdqa	(%rax),%xmm7
-	pxor	%xmm7,%xmm3
-	pxor	%xmm7,%xmm5
-	pxor	%xmm7,%xmm2
-	pxor	%xmm7,%xmm6
-	pxor	%xmm7,%xmm1
-	pxor	%xmm7,%xmm4
-	pxor	%xmm7,%xmm15
-	pxor	%xmm7,%xmm0
-	.byte	0xf3,0xc3
-
-
-
-
-.p2align	6
-_bsaes_decrypt8:
-
-	leaq	L$BS0(%rip),%r11
-
-	movdqa	(%rax),%xmm8
-	leaq	16(%rax),%rax
-	movdqa	-48(%r11),%xmm7
-	pxor	%xmm8,%xmm15
-	pxor	%xmm8,%xmm0
-	pxor	%xmm8,%xmm1
-	pxor	%xmm8,%xmm2
-.byte	102,68,15,56,0,255
-.byte	102,15,56,0,199
-	pxor	%xmm8,%xmm3
-	pxor	%xmm8,%xmm4
-.byte	102,15,56,0,207
-.byte	102,15,56,0,215
-	pxor	%xmm8,%xmm5
-	pxor	%xmm8,%xmm6
-.byte	102,15,56,0,223
-.byte	102,15,56,0,231
-.byte	102,15,56,0,239
-.byte	102,15,56,0,247
-	movdqa	0(%r11),%xmm7
-	movdqa	16(%r11),%xmm8
-	movdqa	%xmm5,%xmm9
-	psrlq	$1,%xmm5
-	movdqa	%xmm3,%xmm10
-	psrlq	$1,%xmm3
-	pxor	%xmm6,%xmm5
-	pxor	%xmm4,%xmm3
-	pand	%xmm7,%xmm5
-	pand	%xmm7,%xmm3
-	pxor	%xmm5,%xmm6
-	psllq	$1,%xmm5
-	pxor	%xmm3,%xmm4
-	psllq	$1,%xmm3
-	pxor	%xmm9,%xmm5
-	pxor	%xmm10,%xmm3
-	movdqa	%xmm1,%xmm9
-	psrlq	$1,%xmm1
-	movdqa	%xmm15,%xmm10
-	psrlq	$1,%xmm15
-	pxor	%xmm2,%xmm1
-	pxor	%xmm0,%xmm15
-	pand	%xmm7,%xmm1
-	pand	%xmm7,%xmm15
-	pxor	%xmm1,%xmm2
-	psllq	$1,%xmm1
-	pxor	%xmm15,%xmm0
-	psllq	$1,%xmm15
-	pxor	%xmm9,%xmm1
-	pxor	%xmm10,%xmm15
-	movdqa	32(%r11),%xmm7
-	movdqa	%xmm4,%xmm9
-	psrlq	$2,%xmm4
-	movdqa	%xmm3,%xmm10
-	psrlq	$2,%xmm3
-	pxor	%xmm6,%xmm4
-	pxor	%xmm5,%xmm3
-	pand	%xmm8,%xmm4
-	pand	%xmm8,%xmm3
-	pxor	%xmm4,%xmm6
-	psllq	$2,%xmm4
-	pxor	%xmm3,%xmm5
-	psllq	$2,%xmm3
-	pxor	%xmm9,%xmm4
-	pxor	%xmm10,%xmm3
-	movdqa	%xmm0,%xmm9
-	psrlq	$2,%xmm0
-	movdqa	%xmm15,%xmm10
-	psrlq	$2,%xmm15
-	pxor	%xmm2,%xmm0
-	pxor	%xmm1,%xmm15
-	pand	%xmm8,%xmm0
-	pand	%xmm8,%xmm15
-	pxor	%xmm0,%xmm2
-	psllq	$2,%xmm0
-	pxor	%xmm15,%xmm1
-	psllq	$2,%xmm15
-	pxor	%xmm9,%xmm0
-	pxor	%xmm10,%xmm15
-	movdqa	%xmm2,%xmm9
-	psrlq	$4,%xmm2
-	movdqa	%xmm1,%xmm10
-	psrlq	$4,%xmm1
-	pxor	%xmm6,%xmm2
-	pxor	%xmm5,%xmm1
-	pand	%xmm7,%xmm2
-	pand	%xmm7,%xmm1
-	pxor	%xmm2,%xmm6
-	psllq	$4,%xmm2
-	pxor	%xmm1,%xmm5
-	psllq	$4,%xmm1
-	pxor	%xmm9,%xmm2
-	pxor	%xmm10,%xmm1
-	movdqa	%xmm0,%xmm9
-	psrlq	$4,%xmm0
-	movdqa	%xmm15,%xmm10
-	psrlq	$4,%xmm15
-	pxor	%xmm4,%xmm0
-	pxor	%xmm3,%xmm15
-	pand	%xmm7,%xmm0
-	pand	%xmm7,%xmm15
-	pxor	%xmm0,%xmm4
-	psllq	$4,%xmm0
-	pxor	%xmm15,%xmm3
-	psllq	$4,%xmm15
-	pxor	%xmm9,%xmm0
-	pxor	%xmm10,%xmm15
-	decl	%r10d
-	jmp	L$dec_sbox
-.p2align	4
-L$dec_loop:
-	pxor	0(%rax),%xmm15
-	pxor	16(%rax),%xmm0
-	pxor	32(%rax),%xmm1
-	pxor	48(%rax),%xmm2
-.byte	102,68,15,56,0,255
-.byte	102,15,56,0,199
-	pxor	64(%rax),%xmm3
-	pxor	80(%rax),%xmm4
-.byte	102,15,56,0,207
-.byte	102,15,56,0,215
-	pxor	96(%rax),%xmm5
-	pxor	112(%rax),%xmm6
-.byte	102,15,56,0,223
-.byte	102,15,56,0,231
-.byte	102,15,56,0,239
-.byte	102,15,56,0,247
-	leaq	128(%rax),%rax
-L$dec_sbox:
-	pxor	%xmm3,%xmm2
-
-	pxor	%xmm6,%xmm3
-	pxor	%xmm6,%xmm1
-	pxor	%xmm3,%xmm5
-	pxor	%xmm5,%xmm6
-	pxor	%xmm6,%xmm0
-
-	pxor	%xmm0,%xmm15
-	pxor	%xmm4,%xmm1
-	pxor	%xmm15,%xmm2
-	pxor	%xmm15,%xmm4
-	pxor	%xmm2,%xmm0
-	movdqa	%xmm2,%xmm10
-	movdqa	%xmm6,%xmm9
-	movdqa	%xmm0,%xmm8
-	movdqa	%xmm3,%xmm12
-	movdqa	%xmm4,%xmm11
-
-	pxor	%xmm15,%xmm10
-	pxor	%xmm3,%xmm9
-	pxor	%xmm5,%xmm8
-	movdqa	%xmm10,%xmm13
-	pxor	%xmm15,%xmm12
-	movdqa	%xmm9,%xmm7
-	pxor	%xmm1,%xmm11
-	movdqa	%xmm10,%xmm14
-
-	por	%xmm8,%xmm9
-	por	%xmm11,%xmm10
-	pxor	%xmm7,%xmm14
-	pand	%xmm11,%xmm13
-	pxor	%xmm8,%xmm11
-	pand	%xmm8,%xmm7
-	pand	%xmm11,%xmm14
-	movdqa	%xmm5,%xmm11
-	pxor	%xmm1,%xmm11
-	pand	%xmm11,%xmm12
-	pxor	%xmm12,%xmm10
-	pxor	%xmm12,%xmm9
-	movdqa	%xmm2,%xmm12
-	movdqa	%xmm0,%xmm11
-	pxor	%xmm6,%xmm12
-	pxor	%xmm4,%xmm11
-	movdqa	%xmm12,%xmm8
-	pand	%xmm11,%xmm12
-	por	%xmm11,%xmm8
-	pxor	%xmm12,%xmm7
-	pxor	%xmm14,%xmm10
-	pxor	%xmm13,%xmm9
-	pxor	%xmm14,%xmm8
-	movdqa	%xmm3,%xmm11
-	pxor	%xmm13,%xmm7
-	movdqa	%xmm15,%xmm12
-	pxor	%xmm13,%xmm8
-	movdqa	%xmm6,%xmm13
-	pand	%xmm5,%xmm11
-	movdqa	%xmm2,%xmm14
-	pand	%xmm1,%xmm12
-	pand	%xmm0,%xmm13
-	por	%xmm4,%xmm14
-	pxor	%xmm11,%xmm10
-	pxor	%xmm12,%xmm9
-	pxor	%xmm13,%xmm8
-	pxor	%xmm14,%xmm7
-
-
-
-
-
-	movdqa	%xmm10,%xmm11
-	pand	%xmm8,%xmm10
-	pxor	%xmm9,%xmm11
-
-	movdqa	%xmm7,%xmm13
-	movdqa	%xmm11,%xmm14
-	pxor	%xmm10,%xmm13
-	pand	%xmm13,%xmm14
-
-	movdqa	%xmm8,%xmm12
-	pxor	%xmm9,%xmm14
-	pxor	%xmm7,%xmm12
-
-	pxor	%xmm9,%xmm10
-
-	pand	%xmm10,%xmm12
-
-	movdqa	%xmm13,%xmm9
-	pxor	%xmm7,%xmm12
-
-	pxor	%xmm12,%xmm9
-	pxor	%xmm12,%xmm8
-
-	pand	%xmm7,%xmm9
-
-	pxor	%xmm9,%xmm13
-	pxor	%xmm9,%xmm8
-
-	pand	%xmm14,%xmm13
-
-	pxor	%xmm11,%xmm13
-	movdqa	%xmm4,%xmm11
-	movdqa	%xmm0,%xmm7
-	movdqa	%xmm14,%xmm9
-	pxor	%xmm13,%xmm9
-	pand	%xmm4,%xmm9
-	pxor	%xmm0,%xmm4
-	pand	%xmm14,%xmm0
-	pand	%xmm13,%xmm4
-	pxor	%xmm0,%xmm4
-	pxor	%xmm9,%xmm0
-	pxor	%xmm1,%xmm11
-	pxor	%xmm5,%xmm7
-	pxor	%xmm12,%xmm14
-	pxor	%xmm8,%xmm13
-	movdqa	%xmm14,%xmm10
-	movdqa	%xmm12,%xmm9
-	pxor	%xmm13,%xmm10
-	pxor	%xmm8,%xmm9
-	pand	%xmm11,%xmm10
-	pand	%xmm1,%xmm9
-	pxor	%xmm7,%xmm11
-	pxor	%xmm5,%xmm1
-	pand	%xmm14,%xmm7
-	pand	%xmm12,%xmm5
-	pand	%xmm13,%xmm11
-	pand	%xmm8,%xmm1
-	pxor	%xmm11,%xmm7
-	pxor	%xmm5,%xmm1
-	pxor	%xmm10,%xmm11
-	pxor	%xmm9,%xmm5
-	pxor	%xmm11,%xmm4
-	pxor	%xmm11,%xmm1
-	pxor	%xmm7,%xmm0
-	pxor	%xmm7,%xmm5
-
-	movdqa	%xmm2,%xmm11
-	movdqa	%xmm6,%xmm7
-	pxor	%xmm15,%xmm11
-	pxor	%xmm3,%xmm7
-	movdqa	%xmm14,%xmm10
-	movdqa	%xmm12,%xmm9
-	pxor	%xmm13,%xmm10
-	pxor	%xmm8,%xmm9
-	pand	%xmm11,%xmm10
-	pand	%xmm15,%xmm9
-	pxor	%xmm7,%xmm11
-	pxor	%xmm3,%xmm15
-	pand	%xmm14,%xmm7
-	pand	%xmm12,%xmm3
-	pand	%xmm13,%xmm11
-	pand	%xmm8,%xmm15
-	pxor	%xmm11,%xmm7
-	pxor	%xmm3,%xmm15
-	pxor	%xmm10,%xmm11
-	pxor	%xmm9,%xmm3
-	pxor	%xmm12,%xmm14
-	pxor	%xmm8,%xmm13
-	movdqa	%xmm14,%xmm10
-	pxor	%xmm13,%xmm10
-	pand	%xmm2,%xmm10
-	pxor	%xmm6,%xmm2
-	pand	%xmm14,%xmm6
-	pand	%xmm13,%xmm2
-	pxor	%xmm6,%xmm2
-	pxor	%xmm10,%xmm6
-	pxor	%xmm11,%xmm2
-	pxor	%xmm11,%xmm15
-	pxor	%xmm7,%xmm6
-	pxor	%xmm7,%xmm3
-	pxor	%xmm6,%xmm0
-	pxor	%xmm4,%xmm5
-
-	pxor	%xmm0,%xmm3
-	pxor	%xmm6,%xmm1
-	pxor	%xmm6,%xmm4
-	pxor	%xmm1,%xmm3
-	pxor	%xmm15,%xmm6
-	pxor	%xmm4,%xmm3
-	pxor	%xmm5,%xmm2
-	pxor	%xmm0,%xmm5
-	pxor	%xmm3,%xmm2
-
-	pxor	%xmm15,%xmm3
-	pxor	%xmm2,%xmm6
-	decl	%r10d
-	jl	L$dec_done
-
-	pshufd	$0x4E,%xmm15,%xmm7
-	pshufd	$0x4E,%xmm2,%xmm13
-	pxor	%xmm15,%xmm7
-	pshufd	$0x4E,%xmm4,%xmm14
-	pxor	%xmm2,%xmm13
-	pshufd	$0x4E,%xmm0,%xmm8
-	pxor	%xmm4,%xmm14
-	pshufd	$0x4E,%xmm5,%xmm9
-	pxor	%xmm0,%xmm8
-	pshufd	$0x4E,%xmm3,%xmm10
-	pxor	%xmm5,%xmm9
-	pxor	%xmm13,%xmm15
-	pxor	%xmm13,%xmm0
-	pshufd	$0x4E,%xmm1,%xmm11
-	pxor	%xmm3,%xmm10
-	pxor	%xmm7,%xmm5
-	pxor	%xmm8,%xmm3
-	pshufd	$0x4E,%xmm6,%xmm12
-	pxor	%xmm1,%xmm11
-	pxor	%xmm14,%xmm0
-	pxor	%xmm9,%xmm1
-	pxor	%xmm6,%xmm12
-
-	pxor	%xmm14,%xmm5
-	pxor	%xmm13,%xmm3
-	pxor	%xmm13,%xmm1
-	pxor	%xmm10,%xmm6
-	pxor	%xmm11,%xmm2
-	pxor	%xmm14,%xmm1
-	pxor	%xmm14,%xmm6
-	pxor	%xmm12,%xmm4
-	pshufd	$0x93,%xmm15,%xmm7
-	pshufd	$0x93,%xmm0,%xmm8
-	pxor	%xmm7,%xmm15
-	pshufd	$0x93,%xmm5,%xmm9
-	pxor	%xmm8,%xmm0
-	pshufd	$0x93,%xmm3,%xmm10
-	pxor	%xmm9,%xmm5
-	pshufd	$0x93,%xmm1,%xmm11
-	pxor	%xmm10,%xmm3
-	pshufd	$0x93,%xmm6,%xmm12
-	pxor	%xmm11,%xmm1
-	pshufd	$0x93,%xmm2,%xmm13
-	pxor	%xmm12,%xmm6
-	pshufd	$0x93,%xmm4,%xmm14
-	pxor	%xmm13,%xmm2
-	pxor	%xmm14,%xmm4
-
-	pxor	%xmm15,%xmm8
-	pxor	%xmm4,%xmm7
-	pxor	%xmm4,%xmm8
-	pshufd	$0x4E,%xmm15,%xmm15
-	pxor	%xmm0,%xmm9
-	pshufd	$0x4E,%xmm0,%xmm0
-	pxor	%xmm1,%xmm12
-	pxor	%xmm7,%xmm15
-	pxor	%xmm6,%xmm13
-	pxor	%xmm8,%xmm0
-	pxor	%xmm3,%xmm11
-	pshufd	$0x4E,%xmm1,%xmm7
-	pxor	%xmm2,%xmm14
-	pshufd	$0x4E,%xmm6,%xmm8
-	pxor	%xmm5,%xmm10
-	pshufd	$0x4E,%xmm3,%xmm1
-	pxor	%xmm4,%xmm10
-	pshufd	$0x4E,%xmm4,%xmm6
-	pxor	%xmm4,%xmm11
-	pshufd	$0x4E,%xmm2,%xmm3
-	pxor	%xmm11,%xmm7
-	pshufd	$0x4E,%xmm5,%xmm2
-	pxor	%xmm12,%xmm8
-	pxor	%xmm1,%xmm10
-	pxor	%xmm14,%xmm6
-	pxor	%xmm3,%xmm13
-	movdqa	%xmm7,%xmm3
-	pxor	%xmm9,%xmm2
-	movdqa	%xmm13,%xmm5
-	movdqa	%xmm8,%xmm4
-	movdqa	%xmm2,%xmm1
-	movdqa	%xmm10,%xmm2
-	movdqa	-16(%r11),%xmm7
-	jnz	L$dec_loop
-	movdqa	-32(%r11),%xmm7
-	jmp	L$dec_loop
-.p2align	4
-L$dec_done:
-	movdqa	0(%r11),%xmm7
-	movdqa	16(%r11),%xmm8
-	movdqa	%xmm2,%xmm9
-	psrlq	$1,%xmm2
-	movdqa	%xmm1,%xmm10
-	psrlq	$1,%xmm1
-	pxor	%xmm4,%xmm2
-	pxor	%xmm6,%xmm1
-	pand	%xmm7,%xmm2
-	pand	%xmm7,%xmm1
-	pxor	%xmm2,%xmm4
-	psllq	$1,%xmm2
-	pxor	%xmm1,%xmm6
-	psllq	$1,%xmm1
-	pxor	%xmm9,%xmm2
-	pxor	%xmm10,%xmm1
-	movdqa	%xmm5,%xmm9
-	psrlq	$1,%xmm5
-	movdqa	%xmm15,%xmm10
-	psrlq	$1,%xmm15
-	pxor	%xmm3,%xmm5
-	pxor	%xmm0,%xmm15
-	pand	%xmm7,%xmm5
-	pand	%xmm7,%xmm15
-	pxor	%xmm5,%xmm3
-	psllq	$1,%xmm5
-	pxor	%xmm15,%xmm0
-	psllq	$1,%xmm15
-	pxor	%xmm9,%xmm5
-	pxor	%xmm10,%xmm15
-	movdqa	32(%r11),%xmm7
-	movdqa	%xmm6,%xmm9
-	psrlq	$2,%xmm6
-	movdqa	%xmm1,%xmm10
-	psrlq	$2,%xmm1
-	pxor	%xmm4,%xmm6
-	pxor	%xmm2,%xmm1
-	pand	%xmm8,%xmm6
-	pand	%xmm8,%xmm1
-	pxor	%xmm6,%xmm4
-	psllq	$2,%xmm6
-	pxor	%xmm1,%xmm2
-	psllq	$2,%xmm1
-	pxor	%xmm9,%xmm6
-	pxor	%xmm10,%xmm1
-	movdqa	%xmm0,%xmm9
-	psrlq	$2,%xmm0
-	movdqa	%xmm15,%xmm10
-	psrlq	$2,%xmm15
-	pxor	%xmm3,%xmm0
-	pxor	%xmm5,%xmm15
-	pand	%xmm8,%xmm0
-	pand	%xmm8,%xmm15
-	pxor	%xmm0,%xmm3
-	psllq	$2,%xmm0
-	pxor	%xmm15,%xmm5
-	psllq	$2,%xmm15
-	pxor	%xmm9,%xmm0
-	pxor	%xmm10,%xmm15
-	movdqa	%xmm3,%xmm9
-	psrlq	$4,%xmm3
-	movdqa	%xmm5,%xmm10
-	psrlq	$4,%xmm5
-	pxor	%xmm4,%xmm3
-	pxor	%xmm2,%xmm5
-	pand	%xmm7,%xmm3
-	pand	%xmm7,%xmm5
-	pxor	%xmm3,%xmm4
-	psllq	$4,%xmm3
-	pxor	%xmm5,%xmm2
-	psllq	$4,%xmm5
-	pxor	%xmm9,%xmm3
-	pxor	%xmm10,%xmm5
-	movdqa	%xmm0,%xmm9
-	psrlq	$4,%xmm0
-	movdqa	%xmm15,%xmm10
-	psrlq	$4,%xmm15
-	pxor	%xmm6,%xmm0
-	pxor	%xmm1,%xmm15
-	pand	%xmm7,%xmm0
-	pand	%xmm7,%xmm15
-	pxor	%xmm0,%xmm6
-	psllq	$4,%xmm0
-	pxor	%xmm15,%xmm1
-	psllq	$4,%xmm15
-	pxor	%xmm9,%xmm0
-	pxor	%xmm10,%xmm15
-	movdqa	(%rax),%xmm7
-	pxor	%xmm7,%xmm5
-	pxor	%xmm7,%xmm3
-	pxor	%xmm7,%xmm1
-	pxor	%xmm7,%xmm6
-	pxor	%xmm7,%xmm2
-	pxor	%xmm7,%xmm4
-	pxor	%xmm7,%xmm15
-	pxor	%xmm7,%xmm0
-	.byte	0xf3,0xc3
-
-
-
-.p2align	4
-_bsaes_key_convert:
-
-	leaq	L$masks(%rip),%r11
-	movdqu	(%rcx),%xmm7
-	leaq	16(%rcx),%rcx
-	movdqa	0(%r11),%xmm0
-	movdqa	16(%r11),%xmm1
-	movdqa	32(%r11),%xmm2
-	movdqa	48(%r11),%xmm3
-	movdqa	64(%r11),%xmm4
-	pcmpeqd	%xmm5,%xmm5
-
-	movdqu	(%rcx),%xmm6
-	movdqa	%xmm7,(%rax)
-	leaq	16(%rax),%rax
-	decl	%r10d
-	jmp	L$key_loop
-.p2align	4
-L$key_loop:
-.byte	102,15,56,0,244
-
-	movdqa	%xmm0,%xmm8
-	movdqa	%xmm1,%xmm9
-
-	pand	%xmm6,%xmm8
-	pand	%xmm6,%xmm9
-	movdqa	%xmm2,%xmm10
-	pcmpeqb	%xmm0,%xmm8
-	psllq	$4,%xmm0
-	movdqa	%xmm3,%xmm11
-	pcmpeqb	%xmm1,%xmm9
-	psllq	$4,%xmm1
-
-	pand	%xmm6,%xmm10
-	pand	%xmm6,%xmm11
-	movdqa	%xmm0,%xmm12
-	pcmpeqb	%xmm2,%xmm10
-	psllq	$4,%xmm2
-	movdqa	%xmm1,%xmm13
-	pcmpeqb	%xmm3,%xmm11
-	psllq	$4,%xmm3
-
-	movdqa	%xmm2,%xmm14
-	movdqa	%xmm3,%xmm15
-	pxor	%xmm5,%xmm8
-	pxor	%xmm5,%xmm9
-
-	pand	%xmm6,%xmm12
-	pand	%xmm6,%xmm13
-	movdqa	%xmm8,0(%rax)
-	pcmpeqb	%xmm0,%xmm12
-	psrlq	$4,%xmm0
-	movdqa	%xmm9,16(%rax)
-	pcmpeqb	%xmm1,%xmm13
-	psrlq	$4,%xmm1
-	leaq	16(%rcx),%rcx
-
-	pand	%xmm6,%xmm14
-	pand	%xmm6,%xmm15
-	movdqa	%xmm10,32(%rax)
-	pcmpeqb	%xmm2,%xmm14
-	psrlq	$4,%xmm2
-	movdqa	%xmm11,48(%rax)
-	pcmpeqb	%xmm3,%xmm15
-	psrlq	$4,%xmm3
-	movdqu	(%rcx),%xmm6
-
-	pxor	%xmm5,%xmm13
-	pxor	%xmm5,%xmm14
-	movdqa	%xmm12,64(%rax)
-	movdqa	%xmm13,80(%rax)
-	movdqa	%xmm14,96(%rax)
-	movdqa	%xmm15,112(%rax)
-	leaq	128(%rax),%rax
-	decl	%r10d
-	jnz	L$key_loop
-
-	movdqa	80(%r11),%xmm7
-
-	.byte	0xf3,0xc3
-
-
-
-.globl	_bsaes_cbc_encrypt
-
-.p2align	4
-_bsaes_cbc_encrypt:
-
-	cmpl	$0,%r9d
-	jne	_asm_AES_cbc_encrypt
-	cmpq	$128,%rdx
-	jb	_asm_AES_cbc_encrypt
-
-	movq	%rsp,%rax
-L$cbc_dec_prologue:
-	pushq	%rbp
-
-	pushq	%rbx
-
-	pushq	%r12
-
-	pushq	%r13
-
-	pushq	%r14
-
-	pushq	%r15
-
-	leaq	-72(%rsp),%rsp
-
-	movq	%rsp,%rbp
-
-	movl	240(%rcx),%eax
-	movq	%rdi,%r12
-	movq	%rsi,%r13
-	movq	%rdx,%r14
-	movq	%rcx,%r15
-	movq	%r8,%rbx
-	shrq	$4,%r14
-
-	movl	%eax,%edx
-	shlq	$7,%rax
-	subq	$96,%rax
-	subq	%rax,%rsp
-
-	movq	%rsp,%rax
-	movq	%r15,%rcx
-	movl	%edx,%r10d
-	call	_bsaes_key_convert
-	pxor	(%rsp),%xmm7
-	movdqa	%xmm6,(%rax)
-	movdqa	%xmm7,(%rsp)
-
-	movdqu	(%rbx),%xmm14
-	subq	$8,%r14
-L$cbc_dec_loop:
-	movdqu	0(%r12),%xmm15
-	movdqu	16(%r12),%xmm0
-	movdqu	32(%r12),%xmm1
-	movdqu	48(%r12),%xmm2
-	movdqu	64(%r12),%xmm3
-	movdqu	80(%r12),%xmm4
-	movq	%rsp,%rax
-	movdqu	96(%r12),%xmm5
-	movl	%edx,%r10d
-	movdqu	112(%r12),%xmm6
-	movdqa	%xmm14,32(%rbp)
-
-	call	_bsaes_decrypt8
-
-	pxor	32(%rbp),%xmm15
-	movdqu	0(%r12),%xmm7
-	movdqu	16(%r12),%xmm8
-	pxor	%xmm7,%xmm0
-	movdqu	32(%r12),%xmm9
-	pxor	%xmm8,%xmm5
-	movdqu	48(%r12),%xmm10
-	pxor	%xmm9,%xmm3
-	movdqu	64(%r12),%xmm11
-	pxor	%xmm10,%xmm1
-	movdqu	80(%r12),%xmm12
-	pxor	%xmm11,%xmm6
-	movdqu	96(%r12),%xmm13
-	pxor	%xmm12,%xmm2
-	movdqu	112(%r12),%xmm14
-	pxor	%xmm13,%xmm4
-	movdqu	%xmm15,0(%r13)
-	leaq	128(%r12),%r12
-	movdqu	%xmm0,16(%r13)
-	movdqu	%xmm5,32(%r13)
-	movdqu	%xmm3,48(%r13)
-	movdqu	%xmm1,64(%r13)
-	movdqu	%xmm6,80(%r13)
-	movdqu	%xmm2,96(%r13)
-	movdqu	%xmm4,112(%r13)
-	leaq	128(%r13),%r13
-	subq	$8,%r14
-	jnc	L$cbc_dec_loop
-
-	addq	$8,%r14
-	jz	L$cbc_dec_done
-
-	movdqu	0(%r12),%xmm15
-	movq	%rsp,%rax
-	movl	%edx,%r10d
-	cmpq	$2,%r14
-	jb	L$cbc_dec_one
-	movdqu	16(%r12),%xmm0
-	je	L$cbc_dec_two
-	movdqu	32(%r12),%xmm1
-	cmpq	$4,%r14
-	jb	L$cbc_dec_three
-	movdqu	48(%r12),%xmm2
-	je	L$cbc_dec_four
-	movdqu	64(%r12),%xmm3
-	cmpq	$6,%r14
-	jb	L$cbc_dec_five
-	movdqu	80(%r12),%xmm4
-	je	L$cbc_dec_six
-	movdqu	96(%r12),%xmm5
-	movdqa	%xmm14,32(%rbp)
-	call	_bsaes_decrypt8
-	pxor	32(%rbp),%xmm15
-	movdqu	0(%r12),%xmm7
-	movdqu	16(%r12),%xmm8
-	pxor	%xmm7,%xmm0
-	movdqu	32(%r12),%xmm9
-	pxor	%xmm8,%xmm5
-	movdqu	48(%r12),%xmm10
-	pxor	%xmm9,%xmm3
-	movdqu	64(%r12),%xmm11
-	pxor	%xmm10,%xmm1
-	movdqu	80(%r12),%xmm12
-	pxor	%xmm11,%xmm6
-	movdqu	96(%r12),%xmm14
-	pxor	%xmm12,%xmm2
-	movdqu	%xmm15,0(%r13)
-	movdqu	%xmm0,16(%r13)
-	movdqu	%xmm5,32(%r13)
-	movdqu	%xmm3,48(%r13)
-	movdqu	%xmm1,64(%r13)
-	movdqu	%xmm6,80(%r13)
-	movdqu	%xmm2,96(%r13)
-	jmp	L$cbc_dec_done
-.p2align	4
-L$cbc_dec_six:
-	movdqa	%xmm14,32(%rbp)
-	call	_bsaes_decrypt8
-	pxor	32(%rbp),%xmm15
-	movdqu	0(%r12),%xmm7
-	movdqu	16(%r12),%xmm8
-	pxor	%xmm7,%xmm0
-	movdqu	32(%r12),%xmm9
-	pxor	%xmm8,%xmm5
-	movdqu	48(%r12),%xmm10
-	pxor	%xmm9,%xmm3
-	movdqu	64(%r12),%xmm11
-	pxor	%xmm10,%xmm1
-	movdqu	80(%r12),%xmm14
-	pxor	%xmm11,%xmm6
-	movdqu	%xmm15,0(%r13)
-	movdqu	%xmm0,16(%r13)
-	movdqu	%xmm5,32(%r13)
-	movdqu	%xmm3,48(%r13)
-	movdqu	%xmm1,64(%r13)
-	movdqu	%xmm6,80(%r13)
-	jmp	L$cbc_dec_done
-.p2align	4
-L$cbc_dec_five:
-	movdqa	%xmm14,32(%rbp)
-	call	_bsaes_decrypt8
-	pxor	32(%rbp),%xmm15
-	movdqu	0(%r12),%xmm7
-	movdqu	16(%r12),%xmm8
-	pxor	%xmm7,%xmm0
-	movdqu	32(%r12),%xmm9
-	pxor	%xmm8,%xmm5
-	movdqu	48(%r12),%xmm10
-	pxor	%xmm9,%xmm3
-	movdqu	64(%r12),%xmm14
-	pxor	%xmm10,%xmm1
-	movdqu	%xmm15,0(%r13)
-	movdqu	%xmm0,16(%r13)
-	movdqu	%xmm5,32(%r13)
-	movdqu	%xmm3,48(%r13)
-	movdqu	%xmm1,64(%r13)
-	jmp	L$cbc_dec_done
-.p2align	4
-L$cbc_dec_four:
-	movdqa	%xmm14,32(%rbp)
-	call	_bsaes_decrypt8
-	pxor	32(%rbp),%xmm15
-	movdqu	0(%r12),%xmm7
-	movdqu	16(%r12),%xmm8
-	pxor	%xmm7,%xmm0
-	movdqu	32(%r12),%xmm9
-	pxor	%xmm8,%xmm5
-	movdqu	48(%r12),%xmm14
-	pxor	%xmm9,%xmm3
-	movdqu	%xmm15,0(%r13)
-	movdqu	%xmm0,16(%r13)
-	movdqu	%xmm5,32(%r13)
-	movdqu	%xmm3,48(%r13)
-	jmp	L$cbc_dec_done
-.p2align	4
-L$cbc_dec_three:
-	movdqa	%xmm14,32(%rbp)
-	call	_bsaes_decrypt8
-	pxor	32(%rbp),%xmm15
-	movdqu	0(%r12),%xmm7
-	movdqu	16(%r12),%xmm8
-	pxor	%xmm7,%xmm0
-	movdqu	32(%r12),%xmm14
-	pxor	%xmm8,%xmm5
-	movdqu	%xmm15,0(%r13)
-	movdqu	%xmm0,16(%r13)
-	movdqu	%xmm5,32(%r13)
-	jmp	L$cbc_dec_done
-.p2align	4
-L$cbc_dec_two:
-	movdqa	%xmm14,32(%rbp)
-	call	_bsaes_decrypt8
-	pxor	32(%rbp),%xmm15
-	movdqu	0(%r12),%xmm7
-	movdqu	16(%r12),%xmm14
-	pxor	%xmm7,%xmm0
-	movdqu	%xmm15,0(%r13)
-	movdqu	%xmm0,16(%r13)
-	jmp	L$cbc_dec_done
-.p2align	4
-L$cbc_dec_one:
-	leaq	(%r12),%rdi
-	leaq	32(%rbp),%rsi
-	leaq	(%r15),%rdx
-	call	_asm_AES_decrypt
-	pxor	32(%rbp),%xmm14
-	movdqu	%xmm14,(%r13)
-	movdqa	%xmm15,%xmm14
-
-L$cbc_dec_done:
-	movdqu	%xmm14,(%rbx)
-	leaq	(%rsp),%rax
-	pxor	%xmm0,%xmm0
-L$cbc_dec_bzero:
-	movdqa	%xmm0,0(%rax)
-	movdqa	%xmm0,16(%rax)
-	leaq	32(%rax),%rax
-	cmpq	%rax,%rbp
-	ja	L$cbc_dec_bzero
-
-	leaq	120(%rbp),%rax
-
-	movq	-48(%rax),%r15
-
-	movq	-40(%rax),%r14
-
-	movq	-32(%rax),%r13
-
-	movq	-24(%rax),%r12
-
-	movq	-16(%rax),%rbx
-
-	movq	-8(%rax),%rbp
-
-	leaq	(%rax),%rsp
-
-L$cbc_dec_epilogue:
-	.byte	0xf3,0xc3
-
-
-
-.globl	_bsaes_ctr32_encrypt_blocks
-
-.p2align	4
-_bsaes_ctr32_encrypt_blocks:
-
-	movq	%rsp,%rax
-L$ctr_enc_prologue:
-	pushq	%rbp
-
-	pushq	%rbx
-
-	pushq	%r12
-
-	pushq	%r13
-
-	pushq	%r14
-
-	pushq	%r15
-
-	leaq	-72(%rsp),%rsp
-
-	movq	%rsp,%rbp
-
-	movdqu	(%r8),%xmm0
-	movl	240(%rcx),%eax
-	movq	%rdi,%r12
-	movq	%rsi,%r13
-	movq	%rdx,%r14
-	movq	%rcx,%r15
-	movdqa	%xmm0,32(%rbp)
-	cmpq	$8,%rdx
-	jb	L$ctr_enc_short
-
-	movl	%eax,%ebx
-	shlq	$7,%rax
-	subq	$96,%rax
-	subq	%rax,%rsp
-
-	movq	%rsp,%rax
-	movq	%r15,%rcx
-	movl	%ebx,%r10d
-	call	_bsaes_key_convert
-	pxor	%xmm6,%xmm7
-	movdqa	%xmm7,(%rax)
-
-	movdqa	(%rsp),%xmm8
-	leaq	L$ADD1(%rip),%r11
-	movdqa	32(%rbp),%xmm15
-	movdqa	-32(%r11),%xmm7
-.byte	102,68,15,56,0,199
-.byte	102,68,15,56,0,255
-	movdqa	%xmm8,(%rsp)
-	jmp	L$ctr_enc_loop
-.p2align	4
-L$ctr_enc_loop:
-	movdqa	%xmm15,32(%rbp)
-	movdqa	%xmm15,%xmm0
-	movdqa	%xmm15,%xmm1
-	paddd	0(%r11),%xmm0
-	movdqa	%xmm15,%xmm2
-	paddd	16(%r11),%xmm1
-	movdqa	%xmm15,%xmm3
-	paddd	32(%r11),%xmm2
-	movdqa	%xmm15,%xmm4
-	paddd	48(%r11),%xmm3
-	movdqa	%xmm15,%xmm5
-	paddd	64(%r11),%xmm4
-	movdqa	%xmm15,%xmm6
-	paddd	80(%r11),%xmm5
-	paddd	96(%r11),%xmm6
-
-
-
-	movdqa	(%rsp),%xmm8
-	leaq	16(%rsp),%rax
-	movdqa	-16(%r11),%xmm7
-	pxor	%xmm8,%xmm15
-	pxor	%xmm8,%xmm0
-	pxor	%xmm8,%xmm1
-	pxor	%xmm8,%xmm2
-.byte	102,68,15,56,0,255
-.byte	102,15,56,0,199
-	pxor	%xmm8,%xmm3
-	pxor	%xmm8,%xmm4
-.byte	102,15,56,0,207
-.byte	102,15,56,0,215
-	pxor	%xmm8,%xmm5
-	pxor	%xmm8,%xmm6
-.byte	102,15,56,0,223
-.byte	102,15,56,0,231
-.byte	102,15,56,0,239
-.byte	102,15,56,0,247
-	leaq	L$BS0(%rip),%r11
-	movl	%ebx,%r10d
-
-	call	_bsaes_encrypt8_bitslice
-
-	subq	$8,%r14
-	jc	L$ctr_enc_loop_done
-
-	movdqu	0(%r12),%xmm7
-	movdqu	16(%r12),%xmm8
-	movdqu	32(%r12),%xmm9
-	movdqu	48(%r12),%xmm10
-	movdqu	64(%r12),%xmm11
-	movdqu	80(%r12),%xmm12
-	movdqu	96(%r12),%xmm13
-	movdqu	112(%r12),%xmm14
-	leaq	128(%r12),%r12
-	pxor	%xmm15,%xmm7
-	movdqa	32(%rbp),%xmm15
-	pxor	%xmm8,%xmm0
-	movdqu	%xmm7,0(%r13)
-	pxor	%xmm9,%xmm3
-	movdqu	%xmm0,16(%r13)
-	pxor	%xmm10,%xmm5
-	movdqu	%xmm3,32(%r13)
-	pxor	%xmm11,%xmm2
-	movdqu	%xmm5,48(%r13)
-	pxor	%xmm12,%xmm6
-	movdqu	%xmm2,64(%r13)
-	pxor	%xmm13,%xmm1
-	movdqu	%xmm6,80(%r13)
-	pxor	%xmm14,%xmm4
-	movdqu	%xmm1,96(%r13)
-	leaq	L$ADD1(%rip),%r11
-	movdqu	%xmm4,112(%r13)
-	leaq	128(%r13),%r13
-	paddd	112(%r11),%xmm15
-	jnz	L$ctr_enc_loop
-
-	jmp	L$ctr_enc_done
-.p2align	4
-L$ctr_enc_loop_done:
-	addq	$8,%r14
-	movdqu	0(%r12),%xmm7
-	pxor	%xmm7,%xmm15
-	movdqu	%xmm15,0(%r13)
-	cmpq	$2,%r14
-	jb	L$ctr_enc_done
-	movdqu	16(%r12),%xmm8
-	pxor	%xmm8,%xmm0
-	movdqu	%xmm0,16(%r13)
-	je	L$ctr_enc_done
-	movdqu	32(%r12),%xmm9
-	pxor	%xmm9,%xmm3
-	movdqu	%xmm3,32(%r13)
-	cmpq	$4,%r14
-	jb	L$ctr_enc_done
-	movdqu	48(%r12),%xmm10
-	pxor	%xmm10,%xmm5
-	movdqu	%xmm5,48(%r13)
-	je	L$ctr_enc_done
-	movdqu	64(%r12),%xmm11
-	pxor	%xmm11,%xmm2
-	movdqu	%xmm2,64(%r13)
-	cmpq	$6,%r14
-	jb	L$ctr_enc_done
-	movdqu	80(%r12),%xmm12
-	pxor	%xmm12,%xmm6
-	movdqu	%xmm6,80(%r13)
-	je	L$ctr_enc_done
-	movdqu	96(%r12),%xmm13
-	pxor	%xmm13,%xmm1
-	movdqu	%xmm1,96(%r13)
-	jmp	L$ctr_enc_done
-
-.p2align	4
-L$ctr_enc_short:
-	leaq	32(%rbp),%rdi
-	leaq	48(%rbp),%rsi
-	leaq	(%r15),%rdx
-	call	_asm_AES_encrypt
-	movdqu	(%r12),%xmm0
-	leaq	16(%r12),%r12
-	movl	44(%rbp),%eax
-	bswapl	%eax
-	pxor	48(%rbp),%xmm0
-	incl	%eax
-	movdqu	%xmm0,(%r13)
-	bswapl	%eax
-	leaq	16(%r13),%r13
-	movl	%eax,44(%rsp)
-	decq	%r14
-	jnz	L$ctr_enc_short
-
-L$ctr_enc_done:
-	leaq	(%rsp),%rax
-	pxor	%xmm0,%xmm0
-L$ctr_enc_bzero:
-	movdqa	%xmm0,0(%rax)
-	movdqa	%xmm0,16(%rax)
-	leaq	32(%rax),%rax
-	cmpq	%rax,%rbp
-	ja	L$ctr_enc_bzero
-
-	leaq	120(%rbp),%rax
-
-	movq	-48(%rax),%r15
-
-	movq	-40(%rax),%r14
-
-	movq	-32(%rax),%r13
-
-	movq	-24(%rax),%r12
-
-	movq	-16(%rax),%rbx
-
-	movq	-8(%rax),%rbp
-
-	leaq	(%rax),%rsp
-
-L$ctr_enc_epilogue:
-	.byte	0xf3,0xc3
-
-
-.globl	_bsaes_xts_encrypt
-
-.p2align	4
-_bsaes_xts_encrypt:
-
-	movq	%rsp,%rax
-L$xts_enc_prologue:
-	pushq	%rbp
-
-	pushq	%rbx
-
-	pushq	%r12
-
-	pushq	%r13
-
-	pushq	%r14
-
-	pushq	%r15
-
-	leaq	-72(%rsp),%rsp
-
-	movq	%rsp,%rbp
-
-	movq	%rdi,%r12
-	movq	%rsi,%r13
-	movq	%rdx,%r14
-	movq	%rcx,%r15
-
-	leaq	(%r9),%rdi
-	leaq	32(%rbp),%rsi
-	leaq	(%r8),%rdx
-	call	_asm_AES_encrypt
-
-	movl	240(%r15),%eax
-	movq	%r14,%rbx
-
-	movl	%eax,%edx
-	shlq	$7,%rax
-	subq	$96,%rax
-	subq	%rax,%rsp
-
-	movq	%rsp,%rax
-	movq	%r15,%rcx
-	movl	%edx,%r10d
-	call	_bsaes_key_convert
-	pxor	%xmm6,%xmm7
-	movdqa	%xmm7,(%rax)
-
-	andq	$-16,%r14
-	subq	$0x80,%rsp
-	movdqa	32(%rbp),%xmm6
-
-	pxor	%xmm14,%xmm14
-	movdqa	L$xts_magic(%rip),%xmm12
-	pcmpgtd	%xmm6,%xmm14
-
-	subq	$0x80,%r14
-	jc	L$xts_enc_short
-	jmp	L$xts_enc_loop
-
-.p2align	4
-L$xts_enc_loop:
-	pshufd	$0x13,%xmm14,%xmm13
-	pxor	%xmm14,%xmm14
-	movdqa	%xmm6,%xmm15
-	movdqa	%xmm6,0(%rsp)
-	paddq	%xmm6,%xmm6
-	pand	%xmm12,%xmm13
-	pcmpgtd	%xmm6,%xmm14
-	pxor	%xmm13,%xmm6
-	pshufd	$0x13,%xmm14,%xmm13
-	pxor	%xmm14,%xmm14
-	movdqa	%xmm6,%xmm0
-	movdqa	%xmm6,16(%rsp)
-	paddq	%xmm6,%xmm6
-	pand	%xmm12,%xmm13
-	pcmpgtd	%xmm6,%xmm14
-	pxor	%xmm13,%xmm6
-	movdqu	0(%r12),%xmm7
-	pshufd	$0x13,%xmm14,%xmm13
-	pxor	%xmm14,%xmm14
-	movdqa	%xmm6,%xmm1
-	movdqa	%xmm6,32(%rsp)
-	paddq	%xmm6,%xmm6
-	pand	%xmm12,%xmm13
-	pcmpgtd	%xmm6,%xmm14
-	pxor	%xmm13,%xmm6
-	movdqu	16(%r12),%xmm8
-	pxor	%xmm7,%xmm15
-	pshufd	$0x13,%xmm14,%xmm13
-	pxor	%xmm14,%xmm14
-	movdqa	%xmm6,%xmm2
-	movdqa	%xmm6,48(%rsp)
-	paddq	%xmm6,%xmm6
-	pand	%xmm12,%xmm13
-	pcmpgtd	%xmm6,%xmm14
-	pxor	%xmm13,%xmm6
-	movdqu	32(%r12),%xmm9
-	pxor	%xmm8,%xmm0
-	pshufd	$0x13,%xmm14,%xmm13
-	pxor	%xmm14,%xmm14
-	movdqa	%xmm6,%xmm3
-	movdqa	%xmm6,64(%rsp)
-	paddq	%xmm6,%xmm6
-	pand	%xmm12,%xmm13
-	pcmpgtd	%xmm6,%xmm14
-	pxor	%xmm13,%xmm6
-	movdqu	48(%r12),%xmm10
-	pxor	%xmm9,%xmm1
-	pshufd	$0x13,%xmm14,%xmm13
-	pxor	%xmm14,%xmm14
-	movdqa	%xmm6,%xmm4
-	movdqa	%xmm6,80(%rsp)
-	paddq	%xmm6,%xmm6
-	pand	%xmm12,%xmm13
-	pcmpgtd	%xmm6,%xmm14
-	pxor	%xmm13,%xmm6
-	movdqu	64(%r12),%xmm11
-	pxor	%xmm10,%xmm2
-	pshufd	$0x13,%xmm14,%xmm13
-	pxor	%xmm14,%xmm14
-	movdqa	%xmm6,%xmm5
-	movdqa	%xmm6,96(%rsp)
-	paddq	%xmm6,%xmm6
-	pand	%xmm12,%xmm13
-	pcmpgtd	%xmm6,%xmm14
-	pxor	%xmm13,%xmm6
-	movdqu	80(%r12),%xmm12
-	pxor	%xmm11,%xmm3
-	movdqu	96(%r12),%xmm13
-	pxor	%xmm12,%xmm4
-	movdqu	112(%r12),%xmm14
-	leaq	128(%r12),%r12
-	movdqa	%xmm6,112(%rsp)
-	pxor	%xmm13,%xmm5
-	leaq	128(%rsp),%rax
-	pxor	%xmm14,%xmm6
-	movl	%edx,%r10d
-
-	call	_bsaes_encrypt8
-
-	pxor	0(%rsp),%xmm15
-	pxor	16(%rsp),%xmm0
-	movdqu	%xmm15,0(%r13)
-	pxor	32(%rsp),%xmm3
-	movdqu	%xmm0,16(%r13)
-	pxor	48(%rsp),%xmm5
-	movdqu	%xmm3,32(%r13)
-	pxor	64(%rsp),%xmm2
-	movdqu	%xmm5,48(%r13)
-	pxor	80(%rsp),%xmm6
-	movdqu	%xmm2,64(%r13)
-	pxor	96(%rsp),%xmm1
-	movdqu	%xmm6,80(%r13)
-	pxor	112(%rsp),%xmm4
-	movdqu	%xmm1,96(%r13)
-	movdqu	%xmm4,112(%r13)
-	leaq	128(%r13),%r13
-
-	movdqa	112(%rsp),%xmm6
-	pxor	%xmm14,%xmm14
-	movdqa	L$xts_magic(%rip),%xmm12
-	pcmpgtd	%xmm6,%xmm14
-	pshufd	$0x13,%xmm14,%xmm13
-	pxor	%xmm14,%xmm14
-	paddq	%xmm6,%xmm6
-	pand	%xmm12,%xmm13
-	pcmpgtd	%xmm6,%xmm14
-	pxor	%xmm13,%xmm6
-
-	subq	$0x80,%r14
-	jnc	L$xts_enc_loop
-
-L$xts_enc_short:
-	addq	$0x80,%r14
-	jz	L$xts_enc_done
-	pshufd	$0x13,%xmm14,%xmm13
-	pxor	%xmm14,%xmm14
-	movdqa	%xmm6,%xmm15
-	movdqa	%xmm6,0(%rsp)
-	paddq	%xmm6,%xmm6
-	pand	%xmm12,%xmm13
-	pcmpgtd	%xmm6,%xmm14
-	pxor	%xmm13,%xmm6
-	pshufd	$0x13,%xmm14,%xmm13
-	pxor	%xmm14,%xmm14
-	movdqa	%xmm6,%xmm0
-	movdqa	%xmm6,16(%rsp)
-	paddq	%xmm6,%xmm6
-	pand	%xmm12,%xmm13
-	pcmpgtd	%xmm6,%xmm14
-	pxor	%xmm13,%xmm6
-	movdqu	0(%r12),%xmm7
-	cmpq	$16,%r14
-	je	L$xts_enc_1
-	pshufd	$0x13,%xmm14,%xmm13
-	pxor	%xmm14,%xmm14
-	movdqa	%xmm6,%xmm1
-	movdqa	%xmm6,32(%rsp)
-	paddq	%xmm6,%xmm6
-	pand	%xmm12,%xmm13
-	pcmpgtd	%xmm6,%xmm14
-	pxor	%xmm13,%xmm6
-	movdqu	16(%r12),%xmm8
-	cmpq	$32,%r14
-	je	L$xts_enc_2
-	pxor	%xmm7,%xmm15
-	pshufd	$0x13,%xmm14,%xmm13
-	pxor	%xmm14,%xmm14
-	movdqa	%xmm6,%xmm2
-	movdqa	%xmm6,48(%rsp)
-	paddq	%xmm6,%xmm6
-	pand	%xmm12,%xmm13
-	pcmpgtd	%xmm6,%xmm14
-	pxor	%xmm13,%xmm6
-	movdqu	32(%r12),%xmm9
-	cmpq	$48,%r14
-	je	L$xts_enc_3
-	pxor	%xmm8,%xmm0
-	pshufd	$0x13,%xmm14,%xmm13
-	pxor	%xmm14,%xmm14
-	movdqa	%xmm6,%xmm3
-	movdqa	%xmm6,64(%rsp)
-	paddq	%xmm6,%xmm6
-	pand	%xmm12,%xmm13
-	pcmpgtd	%xmm6,%xmm14
-	pxor	%xmm13,%xmm6
-	movdqu	48(%r12),%xmm10
-	cmpq	$64,%r14
-	je	L$xts_enc_4
-	pxor	%xmm9,%xmm1
-	pshufd	$0x13,%xmm14,%xmm13
-	pxor	%xmm14,%xmm14
-	movdqa	%xmm6,%xmm4
-	movdqa	%xmm6,80(%rsp)
-	paddq	%xmm6,%xmm6
-	pand	%xmm12,%xmm13
-	pcmpgtd	%xmm6,%xmm14
-	pxor	%xmm13,%xmm6
-	movdqu	64(%r12),%xmm11
-	cmpq	$80,%r14
-	je	L$xts_enc_5
-	pxor	%xmm10,%xmm2
-	pshufd	$0x13,%xmm14,%xmm13
-	pxor	%xmm14,%xmm14
-	movdqa	%xmm6,%xmm5
-	movdqa	%xmm6,96(%rsp)
-	paddq	%xmm6,%xmm6
-	pand	%xmm12,%xmm13
-	pcmpgtd	%xmm6,%xmm14
-	pxor	%xmm13,%xmm6
-	movdqu	80(%r12),%xmm12
-	cmpq	$96,%r14
-	je	L$xts_enc_6
-	pxor	%xmm11,%xmm3
-	movdqu	96(%r12),%xmm13
-	pxor	%xmm12,%xmm4
-	movdqa	%xmm6,112(%rsp)
-	leaq	112(%r12),%r12
-	pxor	%xmm13,%xmm5
-	leaq	128(%rsp),%rax
-	movl	%edx,%r10d
-
-	call	_bsaes_encrypt8
-
-	pxor	0(%rsp),%xmm15
-	pxor	16(%rsp),%xmm0
-	movdqu	%xmm15,0(%r13)
-	pxor	32(%rsp),%xmm3
-	movdqu	%xmm0,16(%r13)
-	pxor	48(%rsp),%xmm5
-	movdqu	%xmm3,32(%r13)
-	pxor	64(%rsp),%xmm2
-	movdqu	%xmm5,48(%r13)
-	pxor	80(%rsp),%xmm6
-	movdqu	%xmm2,64(%r13)
-	pxor	96(%rsp),%xmm1
-	movdqu	%xmm6,80(%r13)
-	movdqu	%xmm1,96(%r13)
-	leaq	112(%r13),%r13
-
-	movdqa	112(%rsp),%xmm6
-	jmp	L$xts_enc_done
-.p2align	4
-L$xts_enc_6:
-	pxor	%xmm11,%xmm3
-	leaq	96(%r12),%r12
-	pxor	%xmm12,%xmm4
-	leaq	128(%rsp),%rax
-	movl	%edx,%r10d
-
-	call	_bsaes_encrypt8
-
-	pxor	0(%rsp),%xmm15
-	pxor	16(%rsp),%xmm0
-	movdqu	%xmm15,0(%r13)
-	pxor	32(%rsp),%xmm3
-	movdqu	%xmm0,16(%r13)
-	pxor	48(%rsp),%xmm5
-	movdqu	%xmm3,32(%r13)
-	pxor	64(%rsp),%xmm2
-	movdqu	%xmm5,48(%r13)
-	pxor	80(%rsp),%xmm6
-	movdqu	%xmm2,64(%r13)
-	movdqu	%xmm6,80(%r13)
-	leaq	96(%r13),%r13
-
-	movdqa	96(%rsp),%xmm6
-	jmp	L$xts_enc_done
-.p2align	4
-L$xts_enc_5:
-	pxor	%xmm10,%xmm2
-	leaq	80(%r12),%r12
-	pxor	%xmm11,%xmm3
-	leaq	128(%rsp),%rax
-	movl	%edx,%r10d
-
-	call	_bsaes_encrypt8
-
-	pxor	0(%rsp),%xmm15
-	pxor	16(%rsp),%xmm0
-	movdqu	%xmm15,0(%r13)
-	pxor	32(%rsp),%xmm3
-	movdqu	%xmm0,16(%r13)
-	pxor	48(%rsp),%xmm5
-	movdqu	%xmm3,32(%r13)
-	pxor	64(%rsp),%xmm2
-	movdqu	%xmm5,48(%r13)
-	movdqu	%xmm2,64(%r13)
-	leaq	80(%r13),%r13
-
-	movdqa	80(%rsp),%xmm6
-	jmp	L$xts_enc_done
-.p2align	4
-L$xts_enc_4:
-	pxor	%xmm9,%xmm1
-	leaq	64(%r12),%r12
-	pxor	%xmm10,%xmm2
-	leaq	128(%rsp),%rax
-	movl	%edx,%r10d
-
-	call	_bsaes_encrypt8
-
-	pxor	0(%rsp),%xmm15
-	pxor	16(%rsp),%xmm0
-	movdqu	%xmm15,0(%r13)
-	pxor	32(%rsp),%xmm3
-	movdqu	%xmm0,16(%r13)
-	pxor	48(%rsp),%xmm5
-	movdqu	%xmm3,32(%r13)
-	movdqu	%xmm5,48(%r13)
-	leaq	64(%r13),%r13
-
-	movdqa	64(%rsp),%xmm6
-	jmp	L$xts_enc_done
-.p2align	4
-L$xts_enc_3:
-	pxor	%xmm8,%xmm0
-	leaq	48(%r12),%r12
-	pxor	%xmm9,%xmm1
-	leaq	128(%rsp),%rax
-	movl	%edx,%r10d
-
-	call	_bsaes_encrypt8
-
-	pxor	0(%rsp),%xmm15
-	pxor	16(%rsp),%xmm0
-	movdqu	%xmm15,0(%r13)
-	pxor	32(%rsp),%xmm3
-	movdqu	%xmm0,16(%r13)
-	movdqu	%xmm3,32(%r13)
-	leaq	48(%r13),%r13
-
-	movdqa	48(%rsp),%xmm6
-	jmp	L$xts_enc_done
-.p2align	4
-L$xts_enc_2:
-	pxor	%xmm7,%xmm15
-	leaq	32(%r12),%r12
-	pxor	%xmm8,%xmm0
-	leaq	128(%rsp),%rax
-	movl	%edx,%r10d
-
-	call	_bsaes_encrypt8
-
-	pxor	0(%rsp),%xmm15
-	pxor	16(%rsp),%xmm0
-	movdqu	%xmm15,0(%r13)
-	movdqu	%xmm0,16(%r13)
-	leaq	32(%r13),%r13
-
-	movdqa	32(%rsp),%xmm6
-	jmp	L$xts_enc_done
-.p2align	4
-L$xts_enc_1:
-	pxor	%xmm15,%xmm7
-	leaq	16(%r12),%r12
-	movdqa	%xmm7,32(%rbp)
-	leaq	32(%rbp),%rdi
-	leaq	32(%rbp),%rsi
-	leaq	(%r15),%rdx
-	call	_asm_AES_encrypt
-	pxor	32(%rbp),%xmm15
-
-
-
-
-
-	movdqu	%xmm15,0(%r13)
-	leaq	16(%r13),%r13
-
-	movdqa	16(%rsp),%xmm6
-
-L$xts_enc_done:
-	andl	$15,%ebx
-	jz	L$xts_enc_ret
-	movq	%r13,%rdx
-
-L$xts_enc_steal:
-	movzbl	(%r12),%eax
-	movzbl	-16(%rdx),%ecx
-	leaq	1(%r12),%r12
-	movb	%al,-16(%rdx)
-	movb	%cl,0(%rdx)
-	leaq	1(%rdx),%rdx
-	subl	$1,%ebx
-	jnz	L$xts_enc_steal
-
-	movdqu	-16(%r13),%xmm15
-	leaq	32(%rbp),%rdi
-	pxor	%xmm6,%xmm15
-	leaq	32(%rbp),%rsi
-	movdqa	%xmm15,32(%rbp)
-	leaq	(%r15),%rdx
-	call	_asm_AES_encrypt
-	pxor	32(%rbp),%xmm6
-	movdqu	%xmm6,-16(%r13)
-
-L$xts_enc_ret:
-	leaq	(%rsp),%rax
-	pxor	%xmm0,%xmm0
-L$xts_enc_bzero:
-	movdqa	%xmm0,0(%rax)
-	movdqa	%xmm0,16(%rax)
-	leaq	32(%rax),%rax
-	cmpq	%rax,%rbp
-	ja	L$xts_enc_bzero
-
-	leaq	120(%rbp),%rax
-
-	movq	-48(%rax),%r15
-
-	movq	-40(%rax),%r14
-
-	movq	-32(%rax),%r13
-
-	movq	-24(%rax),%r12
-
-	movq	-16(%rax),%rbx
-
-	movq	-8(%rax),%rbp
-
-	leaq	(%rax),%rsp
-
-L$xts_enc_epilogue:
-	.byte	0xf3,0xc3
-
-
-
-.globl	_bsaes_xts_decrypt
-
-.p2align	4
-_bsaes_xts_decrypt:
-
-	movq	%rsp,%rax
-L$xts_dec_prologue:
-	pushq	%rbp
-
-	pushq	%rbx
-
-	pushq	%r12
-
-	pushq	%r13
-
-	pushq	%r14
-
-	pushq	%r15
-
-	leaq	-72(%rsp),%rsp
-
-	movq	%rsp,%rbp
-	movq	%rdi,%r12
-	movq	%rsi,%r13
-	movq	%rdx,%r14
-	movq	%rcx,%r15
-
-	leaq	(%r9),%rdi
-	leaq	32(%rbp),%rsi
-	leaq	(%r8),%rdx
-	call	_asm_AES_encrypt
-
-	movl	240(%r15),%eax
-	movq	%r14,%rbx
-
-	movl	%eax,%edx
-	shlq	$7,%rax
-	subq	$96,%rax
-	subq	%rax,%rsp
-
-	movq	%rsp,%rax
-	movq	%r15,%rcx
-	movl	%edx,%r10d
-	call	_bsaes_key_convert
-	pxor	(%rsp),%xmm7
-	movdqa	%xmm6,(%rax)
-	movdqa	%xmm7,(%rsp)
-
-	xorl	%eax,%eax
-	andq	$-16,%r14
-	testl	$15,%ebx
-	setnz	%al
-	shlq	$4,%rax
-	subq	%rax,%r14
-
-	subq	$0x80,%rsp
-	movdqa	32(%rbp),%xmm6
-
-	pxor	%xmm14,%xmm14
-	movdqa	L$xts_magic(%rip),%xmm12
-	pcmpgtd	%xmm6,%xmm14
-
-	subq	$0x80,%r14
-	jc	L$xts_dec_short
-	jmp	L$xts_dec_loop
-
-.p2align	4
-L$xts_dec_loop:
-	pshufd	$0x13,%xmm14,%xmm13
-	pxor	%xmm14,%xmm14
-	movdqa	%xmm6,%xmm15
-	movdqa	%xmm6,0(%rsp)
-	paddq	%xmm6,%xmm6
-	pand	%xmm12,%xmm13
-	pcmpgtd	%xmm6,%xmm14
-	pxor	%xmm13,%xmm6
-	pshufd	$0x13,%xmm14,%xmm13
-	pxor	%xmm14,%xmm14
-	movdqa	%xmm6,%xmm0
-	movdqa	%xmm6,16(%rsp)
-	paddq	%xmm6,%xmm6
-	pand	%xmm12,%xmm13
-	pcmpgtd	%xmm6,%xmm14
-	pxor	%xmm13,%xmm6
-	movdqu	0(%r12),%xmm7
-	pshufd	$0x13,%xmm14,%xmm13
-	pxor	%xmm14,%xmm14
-	movdqa	%xmm6,%xmm1
-	movdqa	%xmm6,32(%rsp)
-	paddq	%xmm6,%xmm6
-	pand	%xmm12,%xmm13
-	pcmpgtd	%xmm6,%xmm14
-	pxor	%xmm13,%xmm6
-	movdqu	16(%r12),%xmm8
-	pxor	%xmm7,%xmm15
-	pshufd	$0x13,%xmm14,%xmm13
-	pxor	%xmm14,%xmm14
-	movdqa	%xmm6,%xmm2
-	movdqa	%xmm6,48(%rsp)
-	paddq	%xmm6,%xmm6
-	pand	%xmm12,%xmm13
-	pcmpgtd	%xmm6,%xmm14
-	pxor	%xmm13,%xmm6
-	movdqu	32(%r12),%xmm9
-	pxor	%xmm8,%xmm0
-	pshufd	$0x13,%xmm14,%xmm13
-	pxor	%xmm14,%xmm14
-	movdqa	%xmm6,%xmm3
-	movdqa	%xmm6,64(%rsp)
-	paddq	%xmm6,%xmm6
-	pand	%xmm12,%xmm13
-	pcmpgtd	%xmm6,%xmm14
-	pxor	%xmm13,%xmm6
-	movdqu	48(%r12),%xmm10
-	pxor	%xmm9,%xmm1
-	pshufd	$0x13,%xmm14,%xmm13
-	pxor	%xmm14,%xmm14
-	movdqa	%xmm6,%xmm4
-	movdqa	%xmm6,80(%rsp)
-	paddq	%xmm6,%xmm6
-	pand	%xmm12,%xmm13
-	pcmpgtd	%xmm6,%xmm14
-	pxor	%xmm13,%xmm6
-	movdqu	64(%r12),%xmm11
-	pxor	%xmm10,%xmm2
-	pshufd	$0x13,%xmm14,%xmm13
-	pxor	%xmm14,%xmm14
-	movdqa	%xmm6,%xmm5
-	movdqa	%xmm6,96(%rsp)
-	paddq	%xmm6,%xmm6
-	pand	%xmm12,%xmm13
-	pcmpgtd	%xmm6,%xmm14
-	pxor	%xmm13,%xmm6
-	movdqu	80(%r12),%xmm12
-	pxor	%xmm11,%xmm3
-	movdqu	96(%r12),%xmm13
-	pxor	%xmm12,%xmm4
-	movdqu	112(%r12),%xmm14
-	leaq	128(%r12),%r12
-	movdqa	%xmm6,112(%rsp)
-	pxor	%xmm13,%xmm5
-	leaq	128(%rsp),%rax
-	pxor	%xmm14,%xmm6
-	movl	%edx,%r10d
-
-	call	_bsaes_decrypt8
-
-	pxor	0(%rsp),%xmm15
-	pxor	16(%rsp),%xmm0
-	movdqu	%xmm15,0(%r13)
-	pxor	32(%rsp),%xmm5
-	movdqu	%xmm0,16(%r13)
-	pxor	48(%rsp),%xmm3
-	movdqu	%xmm5,32(%r13)
-	pxor	64(%rsp),%xmm1
-	movdqu	%xmm3,48(%r13)
-	pxor	80(%rsp),%xmm6
-	movdqu	%xmm1,64(%r13)
-	pxor	96(%rsp),%xmm2
-	movdqu	%xmm6,80(%r13)
-	pxor	112(%rsp),%xmm4
-	movdqu	%xmm2,96(%r13)
-	movdqu	%xmm4,112(%r13)
-	leaq	128(%r13),%r13
-
-	movdqa	112(%rsp),%xmm6
-	pxor	%xmm14,%xmm14
-	movdqa	L$xts_magic(%rip),%xmm12
-	pcmpgtd	%xmm6,%xmm14
-	pshufd	$0x13,%xmm14,%xmm13
-	pxor	%xmm14,%xmm14
-	paddq	%xmm6,%xmm6
-	pand	%xmm12,%xmm13
-	pcmpgtd	%xmm6,%xmm14
-	pxor	%xmm13,%xmm6
-
-	subq	$0x80,%r14
-	jnc	L$xts_dec_loop
-
-L$xts_dec_short:
-	addq	$0x80,%r14
-	jz	L$xts_dec_done
-	pshufd	$0x13,%xmm14,%xmm13
-	pxor	%xmm14,%xmm14
-	movdqa	%xmm6,%xmm15
-	movdqa	%xmm6,0(%rsp)
-	paddq	%xmm6,%xmm6
-	pand	%xmm12,%xmm13
-	pcmpgtd	%xmm6,%xmm14
-	pxor	%xmm13,%xmm6
-	pshufd	$0x13,%xmm14,%xmm13
-	pxor	%xmm14,%xmm14
-	movdqa	%xmm6,%xmm0
-	movdqa	%xmm6,16(%rsp)
-	paddq	%xmm6,%xmm6
-	pand	%xmm12,%xmm13
-	pcmpgtd	%xmm6,%xmm14
-	pxor	%xmm13,%xmm6
-	movdqu	0(%r12),%xmm7
-	cmpq	$16,%r14
-	je	L$xts_dec_1
-	pshufd	$0x13,%xmm14,%xmm13
-	pxor	%xmm14,%xmm14
-	movdqa	%xmm6,%xmm1
-	movdqa	%xmm6,32(%rsp)
-	paddq	%xmm6,%xmm6
-	pand	%xmm12,%xmm13
-	pcmpgtd	%xmm6,%xmm14
-	pxor	%xmm13,%xmm6
-	movdqu	16(%r12),%xmm8
-	cmpq	$32,%r14
-	je	L$xts_dec_2
-	pxor	%xmm7,%xmm15
-	pshufd	$0x13,%xmm14,%xmm13
-	pxor	%xmm14,%xmm14
-	movdqa	%xmm6,%xmm2
-	movdqa	%xmm6,48(%rsp)
-	paddq	%xmm6,%xmm6
-	pand	%xmm12,%xmm13
-	pcmpgtd	%xmm6,%xmm14
-	pxor	%xmm13,%xmm6
-	movdqu	32(%r12),%xmm9
-	cmpq	$48,%r14
-	je	L$xts_dec_3
-	pxor	%xmm8,%xmm0
-	pshufd	$0x13,%xmm14,%xmm13
-	pxor	%xmm14,%xmm14
-	movdqa	%xmm6,%xmm3
-	movdqa	%xmm6,64(%rsp)
-	paddq	%xmm6,%xmm6
-	pand	%xmm12,%xmm13
-	pcmpgtd	%xmm6,%xmm14
-	pxor	%xmm13,%xmm6
-	movdqu	48(%r12),%xmm10
-	cmpq	$64,%r14
-	je	L$xts_dec_4
-	pxor	%xmm9,%xmm1
-	pshufd	$0x13,%xmm14,%xmm13
-	pxor	%xmm14,%xmm14
-	movdqa	%xmm6,%xmm4
-	movdqa	%xmm6,80(%rsp)
-	paddq	%xmm6,%xmm6
-	pand	%xmm12,%xmm13
-	pcmpgtd	%xmm6,%xmm14
-	pxor	%xmm13,%xmm6
-	movdqu	64(%r12),%xmm11
-	cmpq	$80,%r14
-	je	L$xts_dec_5
-	pxor	%xmm10,%xmm2
-	pshufd	$0x13,%xmm14,%xmm13
-	pxor	%xmm14,%xmm14
-	movdqa	%xmm6,%xmm5
-	movdqa	%xmm6,96(%rsp)
-	paddq	%xmm6,%xmm6
-	pand	%xmm12,%xmm13
-	pcmpgtd	%xmm6,%xmm14
-	pxor	%xmm13,%xmm6
-	movdqu	80(%r12),%xmm12
-	cmpq	$96,%r14
-	je	L$xts_dec_6
-	pxor	%xmm11,%xmm3
-	movdqu	96(%r12),%xmm13
-	pxor	%xmm12,%xmm4
-	movdqa	%xmm6,112(%rsp)
-	leaq	112(%r12),%r12
-	pxor	%xmm13,%xmm5
-	leaq	128(%rsp),%rax
-	movl	%edx,%r10d
-
-	call	_bsaes_decrypt8
-
-	pxor	0(%rsp),%xmm15
-	pxor	16(%rsp),%xmm0
-	movdqu	%xmm15,0(%r13)
-	pxor	32(%rsp),%xmm5
-	movdqu	%xmm0,16(%r13)
-	pxor	48(%rsp),%xmm3
-	movdqu	%xmm5,32(%r13)
-	pxor	64(%rsp),%xmm1
-	movdqu	%xmm3,48(%r13)
-	pxor	80(%rsp),%xmm6
-	movdqu	%xmm1,64(%r13)
-	pxor	96(%rsp),%xmm2
-	movdqu	%xmm6,80(%r13)
-	movdqu	%xmm2,96(%r13)
-	leaq	112(%r13),%r13
-
-	movdqa	112(%rsp),%xmm6
-	jmp	L$xts_dec_done
-.p2align	4
-L$xts_dec_6:
-	pxor	%xmm11,%xmm3
-	leaq	96(%r12),%r12
-	pxor	%xmm12,%xmm4
-	leaq	128(%rsp),%rax
-	movl	%edx,%r10d
-
-	call	_bsaes_decrypt8
-
-	pxor	0(%rsp),%xmm15
-	pxor	16(%rsp),%xmm0
-	movdqu	%xmm15,0(%r13)
-	pxor	32(%rsp),%xmm5
-	movdqu	%xmm0,16(%r13)
-	pxor	48(%rsp),%xmm3
-	movdqu	%xmm5,32(%r13)
-	pxor	64(%rsp),%xmm1
-	movdqu	%xmm3,48(%r13)
-	pxor	80(%rsp),%xmm6
-	movdqu	%xmm1,64(%r13)
-	movdqu	%xmm6,80(%r13)
-	leaq	96(%r13),%r13
-
-	movdqa	96(%rsp),%xmm6
-	jmp	L$xts_dec_done
-.p2align	4
-L$xts_dec_5:
-	pxor	%xmm10,%xmm2
-	leaq	80(%r12),%r12
-	pxor	%xmm11,%xmm3
-	leaq	128(%rsp),%rax
-	movl	%edx,%r10d
-
-	call	_bsaes_decrypt8
-
-	pxor	0(%rsp),%xmm15
-	pxor	16(%rsp),%xmm0
-	movdqu	%xmm15,0(%r13)
-	pxor	32(%rsp),%xmm5
-	movdqu	%xmm0,16(%r13)
-	pxor	48(%rsp),%xmm3
-	movdqu	%xmm5,32(%r13)
-	pxor	64(%rsp),%xmm1
-	movdqu	%xmm3,48(%r13)
-	movdqu	%xmm1,64(%r13)
-	leaq	80(%r13),%r13
-
-	movdqa	80(%rsp),%xmm6
-	jmp	L$xts_dec_done
-.p2align	4
-L$xts_dec_4:
-	pxor	%xmm9,%xmm1
-	leaq	64(%r12),%r12
-	pxor	%xmm10,%xmm2
-	leaq	128(%rsp),%rax
-	movl	%edx,%r10d
-
-	call	_bsaes_decrypt8
-
-	pxor	0(%rsp),%xmm15
-	pxor	16(%rsp),%xmm0
-	movdqu	%xmm15,0(%r13)
-	pxor	32(%rsp),%xmm5
-	movdqu	%xmm0,16(%r13)
-	pxor	48(%rsp),%xmm3
-	movdqu	%xmm5,32(%r13)
-	movdqu	%xmm3,48(%r13)
-	leaq	64(%r13),%r13
-
-	movdqa	64(%rsp),%xmm6
-	jmp	L$xts_dec_done
-.p2align	4
-L$xts_dec_3:
-	pxor	%xmm8,%xmm0
-	leaq	48(%r12),%r12
-	pxor	%xmm9,%xmm1
-	leaq	128(%rsp),%rax
-	movl	%edx,%r10d
-
-	call	_bsaes_decrypt8
-
-	pxor	0(%rsp),%xmm15
-	pxor	16(%rsp),%xmm0
-	movdqu	%xmm15,0(%r13)
-	pxor	32(%rsp),%xmm5
-	movdqu	%xmm0,16(%r13)
-	movdqu	%xmm5,32(%r13)
-	leaq	48(%r13),%r13
-
-	movdqa	48(%rsp),%xmm6
-	jmp	L$xts_dec_done
-.p2align	4
-L$xts_dec_2:
-	pxor	%xmm7,%xmm15
-	leaq	32(%r12),%r12
-	pxor	%xmm8,%xmm0
-	leaq	128(%rsp),%rax
-	movl	%edx,%r10d
-
-	call	_bsaes_decrypt8
-
-	pxor	0(%rsp),%xmm15
-	pxor	16(%rsp),%xmm0
-	movdqu	%xmm15,0(%r13)
-	movdqu	%xmm0,16(%r13)
-	leaq	32(%r13),%r13
-
-	movdqa	32(%rsp),%xmm6
-	jmp	L$xts_dec_done
-.p2align	4
-L$xts_dec_1:
-	pxor	%xmm15,%xmm7
-	leaq	16(%r12),%r12
-	movdqa	%xmm7,32(%rbp)
-	leaq	32(%rbp),%rdi
-	leaq	32(%rbp),%rsi
-	leaq	(%r15),%rdx
-	call	_asm_AES_decrypt
-	pxor	32(%rbp),%xmm15
-
-
-
-
-
-	movdqu	%xmm15,0(%r13)
-	leaq	16(%r13),%r13
-
-	movdqa	16(%rsp),%xmm6
-
-L$xts_dec_done:
-	andl	$15,%ebx
-	jz	L$xts_dec_ret
-
-	pxor	%xmm14,%xmm14
-	movdqa	L$xts_magic(%rip),%xmm12
-	pcmpgtd	%xmm6,%xmm14
-	pshufd	$0x13,%xmm14,%xmm13
-	movdqa	%xmm6,%xmm5
-	paddq	%xmm6,%xmm6
-	pand	%xmm12,%xmm13
-	movdqu	(%r12),%xmm15
-	pxor	%xmm13,%xmm6
-
-	leaq	32(%rbp),%rdi
-	pxor	%xmm6,%xmm15
-	leaq	32(%rbp),%rsi
-	movdqa	%xmm15,32(%rbp)
-	leaq	(%r15),%rdx
-	call	_asm_AES_decrypt
-	pxor	32(%rbp),%xmm6
-	movq	%r13,%rdx
-	movdqu	%xmm6,(%r13)
-
-L$xts_dec_steal:
-	movzbl	16(%r12),%eax
-	movzbl	(%rdx),%ecx
-	leaq	1(%r12),%r12
-	movb	%al,(%rdx)
-	movb	%cl,16(%rdx)
-	leaq	1(%rdx),%rdx
-	subl	$1,%ebx
-	jnz	L$xts_dec_steal
-
-	movdqu	(%r13),%xmm15
-	leaq	32(%rbp),%rdi
-	pxor	%xmm5,%xmm15
-	leaq	32(%rbp),%rsi
-	movdqa	%xmm15,32(%rbp)
-	leaq	(%r15),%rdx
-	call	_asm_AES_decrypt
-	pxor	32(%rbp),%xmm5
-	movdqu	%xmm5,(%r13)
-
-L$xts_dec_ret:
-	leaq	(%rsp),%rax
-	pxor	%xmm0,%xmm0
-L$xts_dec_bzero:
-	movdqa	%xmm0,0(%rax)
-	movdqa	%xmm0,16(%rax)
-	leaq	32(%rax),%rax
-	cmpq	%rax,%rbp
-	ja	L$xts_dec_bzero
-
-	leaq	120(%rbp),%rax
-
-	movq	-48(%rax),%r15
-
-	movq	-40(%rax),%r14
-
-	movq	-32(%rax),%r13
-
-	movq	-24(%rax),%r12
-
-	movq	-16(%rax),%rbx
-
-	movq	-8(%rax),%rbp
-
-	leaq	(%rax),%rsp
-
-L$xts_dec_epilogue:
-	.byte	0xf3,0xc3
-
-
-
-.p2align	6
-_bsaes_const:
-L$M0ISR:
-.quad	0x0a0e0206070b0f03, 0x0004080c0d010509
-L$ISRM0:
-.quad	0x01040b0e0205080f, 0x0306090c00070a0d
-L$ISR:
-.quad	0x0504070602010003, 0x0f0e0d0c080b0a09
-L$BS0:
-.quad	0x5555555555555555, 0x5555555555555555
-L$BS1:
-.quad	0x3333333333333333, 0x3333333333333333
-L$BS2:
-.quad	0x0f0f0f0f0f0f0f0f, 0x0f0f0f0f0f0f0f0f
-L$SR:
-.quad	0x0504070600030201, 0x0f0e0d0c0a09080b
-L$SRM0:
-.quad	0x0304090e00050a0f, 0x01060b0c0207080d
-L$M0SR:
-.quad	0x0a0e02060f03070b, 0x0004080c05090d01
-L$SWPUP:
-.quad	0x0706050403020100, 0x0c0d0e0f0b0a0908
-L$SWPUPM0SR:
-.quad	0x0a0d02060c03070b, 0x0004080f05090e01
-L$ADD1:
-.quad	0x0000000000000000, 0x0000000100000000
-L$ADD2:
-.quad	0x0000000000000000, 0x0000000200000000
-L$ADD3:
-.quad	0x0000000000000000, 0x0000000300000000
-L$ADD4:
-.quad	0x0000000000000000, 0x0000000400000000
-L$ADD5:
-.quad	0x0000000000000000, 0x0000000500000000
-L$ADD6:
-.quad	0x0000000000000000, 0x0000000600000000
-L$ADD7:
-.quad	0x0000000000000000, 0x0000000700000000
-L$ADD8:
-.quad	0x0000000000000000, 0x0000000800000000
-L$xts_magic:
-.long	0x87,0,1,0
-L$masks:
-.quad	0x0101010101010101, 0x0101010101010101
-.quad	0x0202020202020202, 0x0202020202020202
-.quad	0x0404040404040404, 0x0404040404040404
-.quad	0x0808080808080808, 0x0808080808080808
-L$M0:
-.quad	0x02060a0e03070b0f, 0x0004080c0105090d
-L$63:
-.quad	0x6363636363636363, 0x6363636363636363
-.byte	66,105,116,45,115,108,105,99,101,100,32,65,69,83,32,102,111,114,32,120,56,54,95,54,52,47,83,83,83,69,51,44,32,69,109,105,108,105,97,32,75,195,164,115,112,101,114,44,32,80,101,116,101,114,32,83,99,104,119,97,98,101,44,32,65,110,100,121,32,80,111,108,121,97,107,111,118,0
-.p2align	6
-
diff --git a/deps/openssl/config/archs/darwin64-x86_64-cc/asm/crypto/bn/rsaz-x86_64.s b/deps/openssl/config/archs/darwin64-x86_64-cc/asm/crypto/bn/rsaz-x86_64.s
index eab5b54b2c..b572410a06 100644
--- a/deps/openssl/config/archs/darwin64-x86_64-cc/asm/crypto/bn/rsaz-x86_64.s
+++ b/deps/openssl/config/archs/darwin64-x86_64-cc/asm/crypto/bn/rsaz-x86_64.s
@@ -23,7 +23,7 @@ _rsaz_512_sqr:
 	subq	$128+24,%rsp
 
 L$sqr_body:
-	movq	%rdx,%rbp
+.byte	102,72,15,110,202
 	movq	(%rsi),%rdx
 	movq	8(%rsi),%rax
 	movq	%rcx,128(%rsp)
@@ -38,6 +38,7 @@ L$oop_sqr:
 	movl	%r8d,128+8(%rsp)
 
 	movq	%rdx,%rbx
+	movq	%rax,%rbp
 	mulq	%rdx
 	movq	%rax,%r8
 	movq	16(%rsi),%rax
@@ -76,31 +77,29 @@ L$oop_sqr:
 	mulq	%rbx
 	addq	%rax,%r14
 	movq	%rbx,%rax
-	movq	%rdx,%r15
-	adcq	$0,%r15
+	adcq	$0,%rdx
 
+	xorq	%rcx,%rcx
 	addq	%r8,%r8
-	movq	%r9,%rcx
-	adcq	%r9,%r9
+	movq	%rdx,%r15
+	adcq	$0,%rcx
 
 	mulq	%rax
-	movq	%rax,(%rsp)
-	addq	%rdx,%r8
-	adcq	$0,%r9
+	addq	%r8,%rdx
+	adcq	$0,%rcx
 
-	movq	%r8,8(%rsp)
-	shrq	$63,%rcx
+	movq	%rax,(%rsp)
+	movq	%rdx,8(%rsp)
 
 
-	movq	8(%rsi),%r8
 	movq	16(%rsi),%rax
-	mulq	%r8
+	mulq	%rbp
 	addq	%rax,%r10
 	movq	24(%rsi),%rax
 	movq	%rdx,%rbx
 	adcq	$0,%rbx
 
-	mulq	%r8
+	mulq	%rbp
 	addq	%rax,%r11
 	movq	32(%rsi),%rax
 	adcq	$0,%rdx
@@ -108,7 +107,7 @@ L$oop_sqr:
 	movq	%rdx,%rbx
 	adcq	$0,%rbx
 
-	mulq	%r8
+	mulq	%rbp
 	addq	%rax,%r12
 	movq	40(%rsi),%rax
 	adcq	$0,%rdx
@@ -116,7 +115,7 @@ L$oop_sqr:
 	movq	%rdx,%rbx
 	adcq	$0,%rbx
 
-	mulq	%r8
+	mulq	%rbp
 	addq	%rax,%r13
 	movq	48(%rsi),%rax
 	adcq	$0,%rdx
@@ -124,7 +123,7 @@ L$oop_sqr:
 	movq	%rdx,%rbx
 	adcq	$0,%rbx
 
-	mulq	%r8
+	mulq	%rbp
 	addq	%rax,%r14
 	movq	56(%rsi),%rax
 	adcq	$0,%rdx
@@ -132,39 +131,39 @@ L$oop_sqr:
 	movq	%rdx,%rbx
 	adcq	$0,%rbx
 
-	mulq	%r8
+	mulq	%rbp
 	addq	%rax,%r15
-	movq	%r8,%rax
+	movq	%rbp,%rax
 	adcq	$0,%rdx
 	addq	%rbx,%r15
-	movq	%rdx,%r8
-	movq	%r10,%rdx
-	adcq	$0,%r8
+	adcq	$0,%rdx
 
-	addq	%rdx,%rdx
-	leaq	(%rcx,%r10,2),%r10
-	movq	%r11,%rbx
-	adcq	%r11,%r11
+	xorq	%rbx,%rbx
+	addq	%r9,%r9
+	movq	%rdx,%r8
+	adcq	%r10,%r10
+	adcq	$0,%rbx
 
 	mulq	%rax
+
+	addq	%rcx,%rax
+	movq	16(%rsi),%rbp
 	addq	%rax,%r9
+	movq	24(%rsi),%rax
 	adcq	%rdx,%r10
-	adcq	$0,%r11
+	adcq	$0,%rbx
 
 	movq	%r9,16(%rsp)
 	movq	%r10,24(%rsp)
-	shrq	$63,%rbx
 
 
-	movq	16(%rsi),%r9
-	movq	24(%rsi),%rax
-	mulq	%r9
+	mulq	%rbp
 	addq	%rax,%r12
 	movq	32(%rsi),%rax
 	movq	%rdx,%rcx
 	adcq	$0,%rcx
 
-	mulq	%r9
+	mulq	%rbp
 	addq	%rax,%r13
 	movq	40(%rsi),%rax
 	adcq	$0,%rdx
@@ -172,7 +171,7 @@ L$oop_sqr:
 	movq	%rdx,%rcx
 	adcq	$0,%rcx
 
-	mulq	%r9
+	mulq	%rbp
 	addq	%rax,%r14
 	movq	48(%rsi),%rax
 	adcq	$0,%rdx
@@ -180,9 +179,7 @@ L$oop_sqr:
 	movq	%rdx,%rcx
 	adcq	$0,%rcx
 
-	mulq	%r9
-	movq	%r12,%r10
-	leaq	(%rbx,%r12,2),%r12
+	mulq	%rbp
 	addq	%rax,%r15
 	movq	56(%rsi),%rax
 	adcq	$0,%rdx
@@ -190,36 +187,40 @@ L$oop_sqr:
 	movq	%rdx,%rcx
 	adcq	$0,%rcx
 
-	mulq	%r9
-	shrq	$63,%r10
+	mulq	%rbp
 	addq	%rax,%r8
-	movq	%r9,%rax
+	movq	%rbp,%rax
 	adcq	$0,%rdx
 	addq	%rcx,%r8
-	movq	%rdx,%r9
-	adcq	$0,%r9
+	adcq	$0,%rdx
 
-	movq	%r13,%rcx
-	leaq	(%r10,%r13,2),%r13
+	xorq	%rcx,%rcx
+	addq	%r11,%r11
+	movq	%rdx,%r9
+	adcq	%r12,%r12
+	adcq	$0,%rcx
 
 	mulq	%rax
+
+	addq	%rbx,%rax
+	movq	24(%rsi),%r10
 	addq	%rax,%r11
+	movq	32(%rsi),%rax
 	adcq	%rdx,%r12
-	adcq	$0,%r13
+	adcq	$0,%rcx
 
 	movq	%r11,32(%rsp)
 	movq	%r12,40(%rsp)
-	shrq	$63,%rcx
 
 
-	movq	24(%rsi),%r10
-	movq	32(%rsi),%rax
+	movq	%rax,%r11
 	mulq	%r10
 	addq	%rax,%r14
 	movq	40(%rsi),%rax
 	movq	%rdx,%rbx
 	adcq	$0,%rbx
 
+	movq	%rax,%r12
 	mulq	%r10
 	addq	%rax,%r15
 	movq	48(%rsi),%rax
@@ -228,9 +229,8 @@ L$oop_sqr:
 	movq	%rdx,%rbx
 	adcq	$0,%rbx
 
+	movq	%rax,%rbp
 	mulq	%r10
-	movq	%r14,%r12
-	leaq	(%rcx,%r14,2),%r14
 	addq	%rax,%r8
 	movq	56(%rsi),%rax
 	adcq	$0,%rdx
@@ -239,32 +239,33 @@ L$oop_sqr:
 	adcq	$0,%rbx
 
 	mulq	%r10
-	shrq	$63,%r12
 	addq	%rax,%r9
 	movq	%r10,%rax
 	adcq	$0,%rdx
 	addq	%rbx,%r9
-	movq	%rdx,%r10
-	adcq	$0,%r10
+	adcq	$0,%rdx
 
-	movq	%r15,%rbx
-	leaq	(%r12,%r15,2),%r15
+	xorq	%rbx,%rbx
+	addq	%r13,%r13
+	movq	%rdx,%r10
+	adcq	%r14,%r14
+	adcq	$0,%rbx
 
 	mulq	%rax
+
+	addq	%rcx,%rax
 	addq	%rax,%r13
+	movq	%r12,%rax
 	adcq	%rdx,%r14
-	adcq	$0,%r15
+	adcq	$0,%rbx
 
 	movq	%r13,48(%rsp)
 	movq	%r14,56(%rsp)
-	shrq	$63,%rbx
 
 
-	movq	32(%rsi),%r11
-	movq	40(%rsi),%rax
 	mulq	%r11
 	addq	%rax,%r8
-	movq	48(%rsi),%rax
+	movq	%rbp,%rax
 	movq	%rdx,%rcx
 	adcq	$0,%rcx
 
@@ -272,97 +273,99 @@ L$oop_sqr:
 	addq	%rax,%r9
 	movq	56(%rsi),%rax
 	adcq	$0,%rdx
-	movq	%r8,%r12
-	leaq	(%rbx,%r8,2),%r8
 	addq	%rcx,%r9
 	movq	%rdx,%rcx
 	adcq	$0,%rcx
 
+	movq	%rax,%r14
 	mulq	%r11
-	shrq	$63,%r12
 	addq	%rax,%r10
 	movq	%r11,%rax
 	adcq	$0,%rdx
 	addq	%rcx,%r10
-	movq	%rdx,%r11
-	adcq	$0,%r11
+	adcq	$0,%rdx
 
-	movq	%r9,%rcx
-	leaq	(%r12,%r9,2),%r9
+	xorq	%rcx,%rcx
+	addq	%r15,%r15
+	movq	%rdx,%r11
+	adcq	%r8,%r8
+	adcq	$0,%rcx
 
 	mulq	%rax
+
+	addq	%rbx,%rax
 	addq	%rax,%r15
+	movq	%rbp,%rax
 	adcq	%rdx,%r8
-	adcq	$0,%r9
+	adcq	$0,%rcx
 
 	movq	%r15,64(%rsp)
 	movq	%r8,72(%rsp)
-	shrq	$63,%rcx
 
 
-	movq	40(%rsi),%r12
-	movq	48(%rsi),%rax
 	mulq	%r12
 	addq	%rax,%r10
-	movq	56(%rsi),%rax
+	movq	%r14,%rax
 	movq	%rdx,%rbx
 	adcq	$0,%rbx
 
 	mulq	%r12
 	addq	%rax,%r11
 	movq	%r12,%rax
-	movq	%r10,%r15
-	leaq	(%rcx,%r10,2),%r10
 	adcq	$0,%rdx
-	shrq	$63,%r15
 	addq	%rbx,%r11
-	movq	%rdx,%r12
-	adcq	$0,%r12
+	adcq	$0,%rdx
 
-	movq	%r11,%rbx
-	leaq	(%r15,%r11,2),%r11
+	xorq	%rbx,%rbx
+	addq	%r9,%r9
+	movq	%rdx,%r12
+	adcq	%r10,%r10
+	adcq	$0,%rbx
 
 	mulq	%rax
+
+	addq	%rcx,%rax
 	addq	%rax,%r9
+	movq	%r14,%rax
 	adcq	%rdx,%r10
-	adcq	$0,%r11
+	adcq	$0,%rbx
 
 	movq	%r9,80(%rsp)
 	movq	%r10,88(%rsp)
 
 
-	movq	48(%rsi),%r13
-	movq	56(%rsi),%rax
-	mulq	%r13
+	mulq	%rbp
 	addq	%rax,%r12
-	movq	%r13,%rax
-	movq	%rdx,%r13
-	adcq	$0,%r13
+	movq	%rbp,%rax
+	adcq	$0,%rdx
 
-	xorq	%r14,%r14
-	shlq	$1,%rbx
+	xorq	%rcx,%rcx
+	addq	%r11,%r11
+	movq	%rdx,%r13
 	adcq	%r12,%r12
-	adcq	%r13,%r13
-	adcq	%r14,%r14
+	adcq	$0,%rcx
 
 	mulq	%rax
+
+	addq	%rbx,%rax
 	addq	%rax,%r11
+	movq	%r14,%rax
 	adcq	%rdx,%r12
-	adcq	$0,%r13
+	adcq	$0,%rcx
 
 	movq	%r11,96(%rsp)
 	movq	%r12,104(%rsp)
 
 
-	movq	56(%rsi),%rax
-	mulq	%rax
-	addq	%rax,%r13
-	adcq	$0,%rdx
+	xorq	%rbx,%rbx
+	addq	%r13,%r13
+	adcq	$0,%rbx
 
-	addq	%rdx,%r14
+	mulq	%rax
 
-	movq	%r13,112(%rsp)
-	movq	%r14,120(%rsp)
+	addq	%rcx,%rax
+	addq	%r13,%rax
+	adcq	%rbx,%rdx
 
 	movq	(%rsp),%r8
 	movq	8(%rsp),%r9
@@ -372,6 +375,10 @@ L$oop_sqr:
 	movq	40(%rsp),%r13
 	movq	48(%rsp),%r14
 	movq	56(%rsp),%r15
+.byte	102,72,15,126,205
+
+	movq	%rax,112(%rsp)
+	movq	%rdx,120(%rsp)
 
 	call	__rsaz_512_reduce
 
@@ -400,9 +407,9 @@ L$oop_sqr:
 L$oop_sqrx:
 	movl	%r8d,128+8(%rsp)
 .byte	102,72,15,110,199
-.byte	102,72,15,110,205
 
 	mulxq	%rax,%r8,%r9
+	movq	%rax,%rbx
 
 	mulxq	16(%rsi),%rcx,%r10
 	xorq	%rbp,%rbp
@@ -410,40 +417,39 @@ L$oop_sqrx:
 	mulxq	24(%rsi),%rax,%r11
 	adcxq	%rcx,%r9
 
-	mulxq	32(%rsi),%rcx,%r12
+.byte	0xc4,0x62,0xf3,0xf6,0xa6,0x20,0x00,0x00,0x00
 	adcxq	%rax,%r10
 
-	mulxq	40(%rsi),%rax,%r13
+.byte	0xc4,0x62,0xfb,0xf6,0xae,0x28,0x00,0x00,0x00
 	adcxq	%rcx,%r11
 
-.byte	0xc4,0x62,0xf3,0xf6,0xb6,0x30,0x00,0x00,0x00
+	mulxq	48(%rsi),%rcx,%r14
 	adcxq	%rax,%r12
 	adcxq	%rcx,%r13
 
-.byte	0xc4,0x62,0xfb,0xf6,0xbe,0x38,0x00,0x00,0x00
+	mulxq	56(%rsi),%rax,%r15
 	adcxq	%rax,%r14
 	adcxq	%rbp,%r15
 
-	movq	%r9,%rcx
-	shldq	$1,%r8,%r9
-	shlq	$1,%r8
-
-	xorl	%ebp,%ebp
-	mulxq	%rdx,%rax,%rdx
-	adcxq	%rdx,%r8
-	movq	8(%rsi),%rdx
-	adcxq	%rbp,%r9
+	mulxq	%rdx,%rax,%rdi
+	movq	%rbx,%rdx
+	xorq	%rcx,%rcx
+	adoxq	%r8,%r8
+	adcxq	%rdi,%r8
+	adoxq	%rbp,%rcx
+	adcxq	%rbp,%rcx
 
 	movq	%rax,(%rsp)
 	movq	%r8,8(%rsp)
 
 
-	mulxq	16(%rsi),%rax,%rbx
+.byte	0xc4,0xe2,0xfb,0xf6,0x9e,0x10,0x00,0x00,0x00
 	adoxq	%rax,%r10
 	adcxq	%rbx,%r11
 
-.byte	0xc4,0x62,0xc3,0xf6,0x86,0x18,0x00,0x00,0x00
+	mulxq	24(%rsi),%rdi,%r8
 	adoxq	%rdi,%r11
+.byte	0x66
 	adcxq	%r8,%r12
 
 	mulxq	32(%rsi),%rax,%rbx
@@ -461,24 +467,25 @@ L$oop_sqrx:
 .byte	0xc4,0x62,0xc3,0xf6,0x86,0x38,0x00,0x00,0x00
 	adoxq	%rdi,%r15
 	adcxq	%rbp,%r8
+	mulxq	%rdx,%rax,%rdi
 	adoxq	%rbp,%r8
+.byte	0x48,0x8b,0x96,0x10,0x00,0x00,0x00
 
-	movq	%r11,%rbx
-	shldq	$1,%r10,%r11
-	shldq	$1,%rcx,%r10
+	xorq	%rbx,%rbx
+	adoxq	%r9,%r9
 
-	xorl	%ebp,%ebp
-	mulxq	%rdx,%rax,%rcx
-	movq	16(%rsi),%rdx
+	adcxq	%rcx,%rax
+	adoxq	%r10,%r10
 	adcxq	%rax,%r9
-	adcxq	%rcx,%r10
-	adcxq	%rbp,%r11
+	adoxq	%rbp,%rbx
+	adcxq	%rdi,%r10
+	adcxq	%rbp,%rbx
 
 	movq	%r9,16(%rsp)
 .byte	0x4c,0x89,0x94,0x24,0x18,0x00,0x00,0x00
 
 
-.byte	0xc4,0x62,0xc3,0xf6,0x8e,0x18,0x00,0x00,0x00
+	mulxq	24(%rsi),%rdi,%r9
 	adoxq	%rdi,%r12
 	adcxq	%r9,%r13
 
@@ -486,7 +493,7 @@ L$oop_sqrx:
 	adoxq	%rax,%r13
 	adcxq	%rcx,%r14
 
-	mulxq	40(%rsi),%rdi,%r9
+.byte	0xc4,0x62,0xc3,0xf6,0x8e,0x28,0x00,0x00,0x00
 	adoxq	%rdi,%r14
 	adcxq	%r9,%r15
 
@@ -494,27 +501,28 @@ L$oop_sqrx:
 	adoxq	%rax,%r15
 	adcxq	%rcx,%r8
 
-.byte	0xc4,0x62,0xc3,0xf6,0x8e,0x38,0x00,0x00,0x00
+	mulxq	56(%rsi),%rdi,%r9
 	adoxq	%rdi,%r8
 	adcxq	%rbp,%r9
+	mulxq	%rdx,%rax,%rdi
 	adoxq	%rbp,%r9
+	movq	24(%rsi),%rdx
 
-	movq	%r13,%rcx
-	shldq	$1,%r12,%r13
-	shldq	$1,%rbx,%r12
+	xorq	%rcx,%rcx
+	adoxq	%r11,%r11
 
-	xorl	%ebp,%ebp
-	mulxq	%rdx,%rax,%rdx
+	adcxq	%rbx,%rax
+	adoxq	%r12,%r12
 	adcxq	%rax,%r11
-	adcxq	%rdx,%r12
-	movq	24(%rsi),%rdx
-	adcxq	%rbp,%r13
+	adoxq	%rbp,%rcx
+	adcxq	%rdi,%r12
+	adcxq	%rbp,%rcx
 
 	movq	%r11,32(%rsp)
-.byte	0x4c,0x89,0xa4,0x24,0x28,0x00,0x00,0x00
+	movq	%r12,40(%rsp)
 
 
-.byte	0xc4,0xe2,0xfb,0xf6,0x9e,0x20,0x00,0x00,0x00
+	mulxq	32(%rsi),%rax,%rbx
 	adoxq	%rax,%r14
 	adcxq	%rbx,%r15
 
@@ -529,25 +537,25 @@ L$oop_sqrx:
 	mulxq	56(%rsi),%rdi,%r10
 	adoxq	%rdi,%r9
 	adcxq	%rbp,%r10
+	mulxq	%rdx,%rax,%rdi
 	adoxq	%rbp,%r10
+	movq	32(%rsi),%rdx
 
-.byte	0x66
-	movq	%r15,%rbx
-	shldq	$1,%r14,%r15
-	shldq	$1,%rcx,%r14
+	xorq	%rbx,%rbx
+	adoxq	%r13,%r13
 
-	xorl	%ebp,%ebp
-	mulxq	%rdx,%rax,%rdx
+	adcxq	%rcx,%rax
+	adoxq	%r14,%r14
 	adcxq	%rax,%r13
-	adcxq	%rdx,%r14
-	movq	32(%rsi),%rdx
-	adcxq	%rbp,%r15
+	adoxq	%rbp,%rbx
+	adcxq	%rdi,%r14
+	adcxq	%rbp,%rbx
 
 	movq	%r13,48(%rsp)
 	movq	%r14,56(%rsp)
 
 
-.byte	0xc4,0x62,0xc3,0xf6,0x9e,0x28,0x00,0x00,0x00
+	mulxq	40(%rsi),%rdi,%r11
 	adoxq	%rdi,%r8
 	adcxq	%r11,%r9
 
@@ -558,18 +566,19 @@ L$oop_sqrx:
 	mulxq	56(%rsi),%rdi,%r11
 	adoxq	%rdi,%r10
 	adcxq	%rbp,%r11
+	mulxq	%rdx,%rax,%rdi
+	movq	40(%rsi),%rdx
 	adoxq	%rbp,%r11
 
-	movq	%r9,%rcx
-	shldq	$1,%r8,%r9
-	shldq	$1,%rbx,%r8
+	xorq	%rcx,%rcx
+	adoxq	%r15,%r15
 
-	xorl	%ebp,%ebp
-	mulxq	%rdx,%rax,%rdx
+	adcxq	%rbx,%rax
+	adoxq	%r8,%r8
 	adcxq	%rax,%r15
-	adcxq	%rdx,%r8
-	movq	40(%rsi),%rdx
-	adcxq	%rbp,%r9
+	adoxq	%rbp,%rcx
+	adcxq	%rdi,%r8
+	adcxq	%rbp,%rcx
 
 	movq	%r15,64(%rsp)
 	movq	%r8,72(%rsp)
@@ -582,18 +591,19 @@ L$oop_sqrx:
 .byte	0xc4,0x62,0xc3,0xf6,0xa6,0x38,0x00,0x00,0x00
 	adoxq	%rdi,%r11
 	adcxq	%rbp,%r12
+	mulxq	%rdx,%rax,%rdi
 	adoxq	%rbp,%r12
+	movq	48(%rsi),%rdx
 
-	movq	%r11,%rbx
-	shldq	$1,%r10,%r11
-	shldq	$1,%rcx,%r10
+	xorq	%rbx,%rbx
+	adoxq	%r9,%r9
 
-	xorl	%ebp,%ebp
-	mulxq	%rdx,%rax,%rdx
+	adcxq	%rcx,%rax
+	adoxq	%r10,%r10
 	adcxq	%rax,%r9
-	adcxq	%rdx,%r10
-	movq	48(%rsi),%rdx
-	adcxq	%rbp,%r11
+	adcxq	%rdi,%r10
+	adoxq	%rbp,%rbx
+	adcxq	%rbp,%rbx
 
 	movq	%r9,80(%rsp)
 	movq	%r10,88(%rsp)
@@ -603,31 +613,31 @@ L$oop_sqrx:
 	adoxq	%rax,%r12
 	adoxq	%rbp,%r13
 
-	xorq	%r14,%r14
-	shldq	$1,%r13,%r14
-	shldq	$1,%r12,%r13
-	shldq	$1,%rbx,%r12
+	mulxq	%rdx,%rax,%rdi
+	xorq	%rcx,%rcx
+	movq	56(%rsi),%rdx
+	adoxq	%r11,%r11
 
-	xorl	%ebp,%ebp
-	mulxq	%rdx,%rax,%rdx
+	adcxq	%rbx,%rax
+	adoxq	%r12,%r12
 	adcxq	%rax,%r11
-	adcxq	%rdx,%r12
-	movq	56(%rsi),%rdx
-	adcxq	%rbp,%r13
+	adoxq	%rbp,%rcx
+	adcxq	%rdi,%r12
+	adcxq	%rbp,%rcx
 
 .byte	0x4c,0x89,0x9c,0x24,0x60,0x00,0x00,0x00
 .byte	0x4c,0x89,0xa4,0x24,0x68,0x00,0x00,0x00
 
 
 	mulxq	%rdx,%rax,%rdx
-	adoxq	%rax,%r13
-	adoxq	%rbp,%rdx
+	xorq	%rbx,%rbx
+	adoxq	%r13,%r13
 
-.byte	0x66
-	addq	%rdx,%r14
+	adcxq	%rcx,%rax
+	adoxq	%rbp,%rbx
+	adcxq	%r13,%rax
+	adcxq	%rdx,%rbx
 
-	movq	%r13,112(%rsp)
-	movq	%r14,120(%rsp)
 .byte	102,72,15,126,199
 .byte	102,72,15,126,205
 
@@ -641,6 +651,9 @@ L$oop_sqrx:
 	movq	48(%rsp),%r14
 	movq	56(%rsp),%r15
 
+	movq	%rax,112(%rsp)
+	movq	%rbx,120(%rsp)
+
 	call	__rsaz_512_reducex
 
 	addq	64(%rsp),%r8
@@ -1410,6 +1423,7 @@ L$mul_by_one_epilogue:
 
 .p2align	5
 __rsaz_512_reduce:
+
 	movq	%r8,%rbx
 	imulq	128+8(%rsp),%rbx
 	movq	0(%rbp),%rax
@@ -1491,9 +1505,11 @@ L$reduction_loop:
 	.byte	0xf3,0xc3
 
 
+
 .p2align	5
 __rsaz_512_reducex:
 
+
 	imulq	%r8,%rdx
 	xorq	%rsi,%rsi
 	movl	$8,%ecx
@@ -1547,8 +1563,10 @@ L$reduction_loopx:
 	.byte	0xf3,0xc3
 
 
+
 .p2align	5
 __rsaz_512_subtract:
+
 	movq	%r8,(%rdi)
 	movq	%r9,8(%rdi)
 	movq	%r10,16(%rdi)
@@ -1604,8 +1622,10 @@ __rsaz_512_subtract:
 	.byte	0xf3,0xc3
 
 
+
 .p2align	5
 __rsaz_512_mul:
+
 	leaq	8(%rsp),%rdi
 
 	movq	(%rsi),%rax
@@ -1746,8 +1766,10 @@ L$oop_mul:
 	.byte	0xf3,0xc3
 
 
+
 .p2align	5
 __rsaz_512_mulx:
+
 	mulxq	(%rsi),%rbx,%r8
 	movq	$-6,%rcx
 
@@ -1865,10 +1887,12 @@ L$oop_mulx:
 
 	.byte	0xf3,0xc3
 
+
 .globl	_rsaz_512_scatter4
 
 .p2align	4
 _rsaz_512_scatter4:
+
 	leaq	(%rdi,%rdx,8),%rdi
 	movl	$8,%r9d
 	jmp	L$oop_scatter
@@ -1883,10 +1907,12 @@ L$oop_scatter:
 	.byte	0xf3,0xc3
 
 
+
 .globl	_rsaz_512_gather4
 
 .p2align	4
 _rsaz_512_gather4:
+
 	movd	%edx,%xmm8
 	movdqa	L$inc+16(%rip),%xmm1
 	movdqa	L$inc(%rip),%xmm0
@@ -1952,6 +1978,7 @@ L$oop_gather:
 L$SEH_end_rsaz_512_gather4:
 
 
+
 .p2align	6
 L$inc:
 .long	0,0, 1,1
diff --git a/deps/openssl/config/archs/darwin64-x86_64-cc/asm/crypto/bn/x86_64-mont5.s b/deps/openssl/config/archs/darwin64-x86_64-cc/asm/crypto/bn/x86_64-mont5.s
index ee0ef1639a..6712682a60 100644
--- a/deps/openssl/config/archs/darwin64-x86_64-cc/asm/crypto/bn/x86_64-mont5.s
+++ b/deps/openssl/config/archs/darwin64-x86_64-cc/asm/crypto/bn/x86_64-mont5.s
@@ -550,6 +550,7 @@ L$mul4x_epilogue:
 
 .p2align	5
 mul4x_internal:
+
 	shlq	$5,%r9
 	movd	8(%rax),%xmm5
 	leaq	L$inc(%rip),%rax
@@ -1072,6 +1073,7 @@ L$inner4x:
 	movq	24(%rbp),%r15
 	jmp	L$sqr4x_sub_entry
 
+
 .globl	_bn_power5
 
 .p2align	5
@@ -1286,6 +1288,7 @@ __bn_sqr8x_internal:
 
 
 
+
 	leaq	32(%r10),%rbp
 	leaq	(%rsi,%r9,1),%rsi
 
@@ -1989,8 +1992,10 @@ L$8x_no_tail:
 	.byte	0xf3,0xc3
 
 
+
 .p2align	5
 __bn_post4x_internal:
+
 	movq	0(%rbp),%r12
 	leaq	(%rdi,%r9,1),%rbx
 	movq	%r9,%rcx
@@ -2042,10 +2047,12 @@ L$sqr4x_sub_entry:
 	negq	%r9
 	.byte	0xf3,0xc3
 
+
 .globl	_bn_from_montgomery
 
 .p2align	5
 _bn_from_montgomery:
+
 	testl	$7,%r9d
 	jz	bn_from_mont8x
 	xorl	%eax,%eax
@@ -2053,6 +2060,7 @@ _bn_from_montgomery:
 
 
 
+
 .p2align	5
 bn_from_mont8x:
 
@@ -2333,6 +2341,7 @@ L$mulx4x_epilogue:
 
 .p2align	5
 mulx4x_internal:
+
 	movq	%r9,8(%rsp)
 	movq	%r9,%r10
 	negq	%r9
@@ -2753,6 +2762,7 @@ L$mulx4x_inner:
 	jmp	L$sqrx4x_sub_entry
 
 
+
 .p2align	5
 bn_powerx5:
 
@@ -3509,6 +3519,7 @@ L$sqrx8x_no_tail:
 
 .p2align	5
 __bn_postx4x_internal:
+
 	movq	0(%rbp),%r12
 	movq	%rcx,%r10
 	movq	%rcx,%r9
@@ -3557,10 +3568,12 @@ L$sqrx4x_sub_entry:
 
 	.byte	0xf3,0xc3
 
+
 .globl	_bn_get_bits5
 
 .p2align	4
 _bn_get_bits5:
+
 	leaq	0(%rdi),%r10
 	leaq	1(%rdi),%r11
 	movl	%esi,%ecx
@@ -3576,10 +3589,12 @@ _bn_get_bits5:
 	.byte	0xf3,0xc3
 
 
+
 .globl	_bn_scatter5
 
 .p2align	4
 _bn_scatter5:
+
 	cmpl	$0,%esi
 	jz	L$scatter_epilogue
 	leaq	(%rdx,%rcx,8),%rdx
@@ -3594,12 +3609,14 @@ L$scatter_epilogue:
 	.byte	0xf3,0xc3
 
 
+
 .globl	_bn_gather5
 
 .p2align	5
 _bn_gather5:
 L$SEH_begin_bn_gather5:
 
+
 .byte	0x4c,0x8d,0x14,0x24
 .byte	0x48,0x81,0xec,0x08,0x01,0x00,0x00
 	leaq	L$inc(%rip),%rax
@@ -3757,6 +3774,7 @@ L$gather:
 	.byte	0xf3,0xc3
 L$SEH_end_bn_gather5:
 
+
 .p2align	6
 L$inc:
 .long	0,0, 1,1
diff --git a/deps/openssl/config/archs/darwin64-x86_64-cc/asm/crypto/buildinf.h b/deps/openssl/config/archs/darwin64-x86_64-cc/asm/crypto/buildinf.h
index a6d2dadb30..ab5367073d 100644
--- a/deps/openssl/config/archs/darwin64-x86_64-cc/asm/crypto/buildinf.h
+++ b/deps/openssl/config/archs/darwin64-x86_64-cc/asm/crypto/buildinf.h
@@ -11,7 +11,7 @@
  */
 
 #define PLATFORM "platform: darwin64-x86_64-cc"
-#define DATE "built on: Fri Sep 13 15:58:07 2019 UTC"
+#define DATE "built on: Wed Mar 18 21:05:19 2020 UTC"
 
 /*
  * Generate compiler_flags as an array of individual characters. This is a
@@ -35,11 +35,12 @@ static const char compiler_flags[] = {
     'A','2','5','6','_','A','S','M',' ','-','D','S','H','A','5','1',
     '2','_','A','S','M',' ','-','D','K','E','C','C','A','K','1','6',
     '0','0','_','A','S','M',' ','-','D','R','C','4','_','A','S','M',
-    ' ','-','D','M','D','5','_','A','S','M',' ','-','D','V','P','A',
-    'E','S','_','A','S','M',' ','-','D','G','H','A','S','H','_','A',
-    'S','M',' ','-','D','E','C','P','_','N','I','S','T','Z','2','5',
-    '6','_','A','S','M',' ','-','D','X','2','5','5','1','9','_','A',
-    'S','M',' ','-','D','P','O','L','Y','1','3','0','5','_','A','S',
-    'M',' ','-','D','_','R','E','E','N','T','R','A','N','T',' ','-',
-    'D','N','D','E','B','U','G','\0'
+    ' ','-','D','M','D','5','_','A','S','M',' ','-','D','A','E','S',
+    'N','I','_','A','S','M',' ','-','D','V','P','A','E','S','_','A',
+    'S','M',' ','-','D','G','H','A','S','H','_','A','S','M',' ','-',
+    'D','E','C','P','_','N','I','S','T','Z','2','5','6','_','A','S',
+    'M',' ','-','D','X','2','5','5','1','9','_','A','S','M',' ','-',
+    'D','P','O','L','Y','1','3','0','5','_','A','S','M',' ','-','D',
+    '_','R','E','E','N','T','R','A','N','T',' ','-','D','N','D','E',
+    'B','U','G','\0'
 };
diff --git a/deps/openssl/config/archs/darwin64-x86_64-cc/asm/crypto/camellia/cmll-x86_64.s b/deps/openssl/config/archs/darwin64-x86_64-cc/asm/crypto/camellia/cmll-x86_64.s
index 2ae924deec..d815175ff5 100644
--- a/deps/openssl/config/archs/darwin64-x86_64-cc/asm/crypto/camellia/cmll-x86_64.s
+++ b/deps/openssl/config/archs/darwin64-x86_64-cc/asm/crypto/camellia/cmll-x86_64.s
@@ -5,6 +5,7 @@
 
 .p2align	4
 _Camellia_EncryptBlock:
+
 	movl	$128,%eax
 	subl	%edi,%eax
 	movl	$3,%edi
@@ -12,6 +13,7 @@ _Camellia_EncryptBlock:
 	jmp	L$enc_rounds
 
 
+
 .globl	_Camellia_EncryptBlock_Rounds
 
 .p2align	4
@@ -78,6 +80,7 @@ L$enc_epilogue:
 
 .p2align	4
 _x86_64_Camellia_encrypt:
+
 	xorl	0(%r14),%r9d
 	xorl	4(%r14),%r8d
 	xorl	8(%r14),%r11d
@@ -283,10 +286,12 @@ L$edone:
 
 
 
+
 .globl	_Camellia_DecryptBlock
 
 .p2align	4
 _Camellia_DecryptBlock:
+
 	movl	$128,%eax
 	subl	%edi,%eax
 	movl	$3,%edi
@@ -294,6 +299,7 @@ _Camellia_DecryptBlock:
 	jmp	L$dec_rounds
 
 
+
 .globl	_Camellia_DecryptBlock_Rounds
 
 .p2align	4
@@ -360,6 +366,7 @@ L$dec_epilogue:
 
 .p2align	4
 _x86_64_Camellia_decrypt:
+
 	xorl	0(%r14),%r9d
 	xorl	4(%r14),%r8d
 	xorl	8(%r14),%r11d
@@ -564,6 +571,7 @@ L$ddone:
 
 .byte	0xf3,0xc3
 
+
 .globl	_Camellia_Ekeygen
 
 .p2align	4
diff --git a/deps/openssl/config/archs/darwin64-x86_64-cc/asm/crypto/ec/ecp_nistz256-x86_64.s b/deps/openssl/config/archs/darwin64-x86_64-cc/asm/crypto/ec/ecp_nistz256-x86_64.s
index ff7ae72344..dc6bed3b5b 100644
--- a/deps/openssl/config/archs/darwin64-x86_64-cc/asm/crypto/ec/ecp_nistz256-x86_64.s
+++ b/deps/openssl/config/archs/darwin64-x86_64-cc/asm/crypto/ec/ecp_nistz256-x86_64.s
@@ -3838,6 +3838,7 @@ L$ord_sqrx_epilogue:
 
 .p2align	5
 _ecp_nistz256_to_mont:
+
 	movl	$0x80100,%ecx
 	andl	_OPENSSL_ia32cap_P+8(%rip),%ecx
 	leaq	L$RR(%rip),%rdx
@@ -3850,6 +3851,7 @@ _ecp_nistz256_to_mont:
 
 
 
+
 .globl	_ecp_nistz256_mul_mont
 
 .p2align	5
@@ -4771,6 +4773,7 @@ L$from_epilogue:
 
 .p2align	5
 _ecp_nistz256_scatter_w5:
+
 	leal	-3(%rdx,%rdx,2),%edx
 	movdqa	0(%rsi),%xmm0
 	shll	$5,%edx
@@ -4791,6 +4794,7 @@ _ecp_nistz256_scatter_w5:
 
 
 
+
 .globl	_ecp_nistz256_gather_w5
 
 .p2align	5
@@ -4860,6 +4864,7 @@ L$SEH_end_ecp_nistz256_gather_w5:
 
 .p2align	5
 _ecp_nistz256_scatter_w7:
+
 	movdqu	0(%rsi),%xmm0
 	shll	$6,%edx
 	movdqu	16(%rsi),%xmm1
@@ -4875,6 +4880,7 @@ _ecp_nistz256_scatter_w7:
 
 
 
+
 .globl	_ecp_nistz256_gather_w7
 
 .p2align	5
@@ -5593,26 +5599,16 @@ L$point_addq_body:
 	orq	%r8,%r12
 	orq	%r9,%r12
 
-.byte	0x3e
-	jnz	L$add_proceedq
 .byte	102,73,15,126,208
 .byte	102,73,15,126,217
-	testq	%r8,%r8
-	jnz	L$add_proceedq
-	testq	%r9,%r9
-	jz	L$add_doubleq
 
-.byte	102,72,15,126,199
-	pxor	%xmm0,%xmm0
-	movdqu	%xmm0,0(%rdi)
-	movdqu	%xmm0,16(%rdi)
-	movdqu	%xmm0,32(%rdi)
-	movdqu	%xmm0,48(%rdi)
-	movdqu	%xmm0,64(%rdi)
-	movdqu	%xmm0,80(%rdi)
-	jmp	L$add_doneq
+	orq	%r8,%r12
+	orq	%r9,%r12
+
+
+.byte	0x3e
+	jnz	L$add_proceedq
 
-.p2align	5
 L$add_doubleq:
 .byte	102,72,15,126,206
 .byte	102,72,15,126,199
@@ -6694,26 +6690,16 @@ L$point_addx_body:
 	orq	%r8,%r12
 	orq	%r9,%r12
 
-.byte	0x3e
-	jnz	L$add_proceedx
 .byte	102,73,15,126,208
 .byte	102,73,15,126,217
-	testq	%r8,%r8
-	jnz	L$add_proceedx
-	testq	%r9,%r9
-	jz	L$add_doublex
 
-.byte	102,72,15,126,199
-	pxor	%xmm0,%xmm0
-	movdqu	%xmm0,0(%rdi)
-	movdqu	%xmm0,16(%rdi)
-	movdqu	%xmm0,32(%rdi)
-	movdqu	%xmm0,48(%rdi)
-	movdqu	%xmm0,64(%rdi)
-	movdqu	%xmm0,80(%rdi)
-	jmp	L$add_donex
+	orq	%r8,%r12
+	orq	%r9,%r12
+
+
+.byte	0x3e
+	jnz	L$add_proceedx
 
-.p2align	5
 L$add_doublex:
 .byte	102,72,15,126,206
 .byte	102,72,15,126,199
diff --git a/deps/openssl/config/archs/darwin64-x86_64-cc/asm/crypto/ec/x25519-x86_64.s b/deps/openssl/config/archs/darwin64-x86_64-cc/asm/crypto/ec/x25519-x86_64.s
index cdb602d4cc..158e849611 100644
--- a/deps/openssl/config/archs/darwin64-x86_64-cc/asm/crypto/ec/x25519-x86_64.s
+++ b/deps/openssl/config/archs/darwin64-x86_64-cc/asm/crypto/ec/x25519-x86_64.s
@@ -382,6 +382,7 @@ L$fe51_mul121666_epilogue:
 
 .p2align	5
 _x25519_fe64_eligible:
+
 	movl	_OPENSSL_ia32cap_P+8(%rip),%ecx
 	xorl	%eax,%eax
 	andl	$0x80100,%ecx
@@ -390,6 +391,7 @@ _x25519_fe64_eligible:
 	.byte	0xf3,0xc3
 
 
+
 .globl	_x25519_fe64_mul
 
 .p2align	5
@@ -616,6 +618,7 @@ L$fe64_sqr_epilogue:
 .p2align	5
 _x25519_fe64_mul121666:
 L$fe64_mul121666_body:
+
 	movl	$121666,%edx
 	mulxq	0(%rsi),%r8,%rcx
 	mulxq	8(%rsi),%r9,%rax
@@ -646,11 +649,13 @@ L$fe64_mul121666_epilogue:
 	.byte	0xf3,0xc3
 
 
+
 .globl	_x25519_fe64_add
 
 .p2align	5
 _x25519_fe64_add:
 L$fe64_add_body:
+
 	movq	0(%rsi),%r8
 	movq	8(%rsi),%r9
 	movq	16(%rsi),%r10
@@ -681,11 +686,13 @@ L$fe64_add_epilogue:
 	.byte	0xf3,0xc3
 
 
+
 .globl	_x25519_fe64_sub
 
 .p2align	5
 _x25519_fe64_sub:
 L$fe64_sub_body:
+
 	movq	0(%rsi),%r8
 	movq	8(%rsi),%r9
 	movq	16(%rsi),%r10
@@ -716,11 +723,13 @@ L$fe64_sub_epilogue:
 	.byte	0xf3,0xc3
 
 
+
 .globl	_x25519_fe64_tobytes
 
 .p2align	5
 _x25519_fe64_tobytes:
 L$fe64_to_body:
+
 	movq	0(%rsi),%r8
 	movq	8(%rsi),%r9
 	movq	16(%rsi),%r10
@@ -757,4 +766,5 @@ L$fe64_to_body:
 L$fe64_to_epilogue:
 	.byte	0xf3,0xc3
 
+
 .byte	88,50,53,53,49,57,32,112,114,105,109,105,116,105,118,101,115,32,102,111,114,32,120,56,54,95,54,52,44,32,67,82,89,80,84,79,71,65,77,83,32,98,121,32,60,97,112,112,114,111,64,111,112,101,110,115,115,108,46,111,114,103,62,0
diff --git a/deps/openssl/config/archs/darwin64-x86_64-cc/asm/crypto/include/internal/bn_conf.h b/deps/openssl/config/archs/darwin64-x86_64-cc/asm/crypto/include/internal/bn_conf.h
index 34bd8b78b4..5312ef5a7a 100644
--- a/deps/openssl/config/archs/darwin64-x86_64-cc/asm/crypto/include/internal/bn_conf.h
+++ b/deps/openssl/config/archs/darwin64-x86_64-cc/asm/crypto/include/internal/bn_conf.h
@@ -1,5 +1,5 @@
 /* WARNING: do not edit! */
-/* Generated by Makefile from crypto/include/internal/bn_conf.h.in */
+/* Generated by Makefile from include/crypto/bn_conf.h.in */
 /*
  * Copyright 2016 The OpenSSL Project Authors. All Rights Reserved.
  *
@@ -9,8 +9,8 @@
  * https://www.openssl.org/source/license.html
  */
 
-#ifndef HEADER_BN_CONF_H
-# define HEADER_BN_CONF_H
+#ifndef OSSL_CRYPTO_BN_CONF_H
+# define OSSL_CRYPTO_BN_CONF_H
 
 /*
  * The contents of this file are not used in the UEFI build, as
diff --git a/deps/openssl/config/archs/darwin64-x86_64-cc/asm/crypto/include/internal/dso_conf.h b/deps/openssl/config/archs/darwin64-x86_64-cc/asm/crypto/include/internal/dso_conf.h
index a69309195e..e2d05cdbf4 100644
--- a/deps/openssl/config/archs/darwin64-x86_64-cc/asm/crypto/include/internal/dso_conf.h
+++ b/deps/openssl/config/archs/darwin64-x86_64-cc/asm/crypto/include/internal/dso_conf.h
@@ -1,5 +1,5 @@
 /* WARNING: do not edit! */
-/* Generated by Makefile from crypto/include/internal/dso_conf.h.in */
+/* Generated by Makefile from include/crypto/dso_conf.h.in */
 /*
  * Copyright 2016-2019 The OpenSSL Project Authors. All Rights Reserved.
  *
@@ -9,8 +9,8 @@
  * https://www.openssl.org/source/license.html
  */
 
-#ifndef HEADER_DSO_CONF_H
-# define HEADER_DSO_CONF_H
+#ifndef OSSL_CRYPTO_DSO_CONF_H
+# define OSSL_CRYPTO_DSO_CONF_H
 # define DSO_DLFCN
 # define HAVE_DLFCN_H
 # define DSO_EXTENSION ".dylib"
diff --git a/deps/openssl/config/archs/darwin64-x86_64-cc/asm/crypto/modes/aesni-gcm-x86_64.s b/deps/openssl/config/archs/darwin64-x86_64-cc/asm/crypto/modes/aesni-gcm-x86_64.s
index d5920186ce..c26df9da7e 100644
--- a/deps/openssl/config/archs/darwin64-x86_64-cc/asm/crypto/modes/aesni-gcm-x86_64.s
+++ b/deps/openssl/config/archs/darwin64-x86_64-cc/asm/crypto/modes/aesni-gcm-x86_64.s
@@ -3,6 +3,7 @@
 
 .p2align	5
 _aesni_ctr32_ghash_6x:
+
 	vmovdqu	32(%r11),%xmm2
 	subq	$6,%rdx
 	vpxor	%xmm4,%xmm4,%xmm4
@@ -311,6 +312,7 @@ L$6x_done:
 
 	.byte	0xf3,0xc3
 
+
 .globl	_aesni_gcm_decrypt
 
 .p2align	5
@@ -416,6 +418,7 @@ L$gcm_dec_abort:
 
 .p2align	5
 _aesni_ctr32_6x:
+
 	vmovdqu	0-128(%rcx),%xmm4
 	vmovdqu	32(%r11),%xmm2
 	leaq	-1(%rbp),%r13
@@ -504,6 +507,7 @@ L$handle_ctr32_2:
 	jmp	L$oop_ctr32
 
 
+
 .globl	_aesni_gcm_encrypt
 
 .p2align	5
diff --git a/deps/openssl/config/archs/darwin64-x86_64-cc/asm/crypto/poly1305/poly1305-x86_64.s b/deps/openssl/config/archs/darwin64-x86_64-cc/asm/crypto/poly1305/poly1305-x86_64.s
index cbc8c80816..19e55e1d32 100644
--- a/deps/openssl/config/archs/darwin64-x86_64-cc/asm/crypto/poly1305/poly1305-x86_64.s
+++ b/deps/openssl/config/archs/darwin64-x86_64-cc/asm/crypto/poly1305/poly1305-x86_64.s
@@ -12,6 +12,7 @@
 
 .p2align	5
 _poly1305_init:
+
 	xorq	%rax,%rax
 	movq	%rax,0(%rdi)
 	movq	%rax,8(%rdi)
@@ -50,6 +51,7 @@ L$no_key:
 
 
 
+
 .p2align	5
 _poly1305_blocks:
 
@@ -161,6 +163,7 @@ L$blocks_epilogue:
 
 .p2align	5
 _poly1305_emit:
+
 L$emit:
 	movq	0(%rdi),%r8
 	movq	8(%rdi),%r9
@@ -183,8 +186,10 @@ L$emit:
 	.byte	0xf3,0xc3
 
 
+
 .p2align	5
 __poly1305_block:
+
 	mulq	%r14
 	movq	%rax,%r9
 	movq	%r11,%rax
@@ -227,8 +232,10 @@ __poly1305_block:
 
 
 
+
 .p2align	5
 __poly1305_init_avx:
+
 	movq	%r11,%r14
 	movq	%r12,%rbx
 	xorq	%rbp,%rbp
@@ -389,6 +396,7 @@ __poly1305_init_avx:
 
 
 
+
 .p2align	5
 poly1305_blocks_avx:
 
@@ -1214,6 +1222,7 @@ L$short_tail_avx:
 
 .p2align	5
 poly1305_emit_avx:
+
 	cmpl	$0,20(%rdi)
 	je	L$emit
 
@@ -1266,6 +1275,7 @@ poly1305_emit_avx:
 	.byte	0xf3,0xc3
 
 
+
 .p2align	5
 poly1305_blocks_avx2:
 
@@ -2448,6 +2458,7 @@ L$tail_avx512:
 
 .p2align	5
 poly1305_init_base2_44:
+
 	xorq	%rax,%rax
 	movq	%rax,0(%rdi)
 	movq	%rax,8(%rdi)
@@ -2483,8 +2494,10 @@ L$init_base2_44:
 	.byte	0xf3,0xc3
 
 
+
 .p2align	5
 poly1305_blocks_vpmadd52:
+
 	shrq	$4,%rdx
 	jz	L$no_data_vpmadd52
 
@@ -2593,8 +2606,10 @@ L$no_data_vpmadd52:
 	.byte	0xf3,0xc3
 
 
+
 .p2align	5
 poly1305_blocks_vpmadd52_4x:
+
 	shrq	$4,%rdx
 	jz	L$no_data_vpmadd52_4x
 
@@ -3021,8 +3036,10 @@ L$no_data_vpmadd52_4x:
 	.byte	0xf3,0xc3
 
 
+
 .p2align	5
 poly1305_blocks_vpmadd52_8x:
+
 	shrq	$4,%rdx
 	jz	L$no_data_vpmadd52_8x
 
@@ -3365,8 +3382,10 @@ L$no_data_vpmadd52_8x:
 	.byte	0xf3,0xc3
 
 
+
 .p2align	5
 poly1305_emit_base2_44:
+
 	movq	0(%rdi),%r8
 	movq	8(%rdi),%r9
 	movq	16(%rdi),%r10
@@ -3398,6 +3417,7 @@ poly1305_emit_base2_44:
 
 	.byte	0xf3,0xc3
 
+
 .p2align	6
 L$const:
 L$mask24:
@@ -3435,6 +3455,7 @@ L$x_mask42:
 
 .p2align	4
 _xor128_encrypt_n_pad:
+
 	subq	%rdx,%rsi
 	subq	%rdx,%rdi
 	movq	%rcx,%r10
@@ -3478,10 +3499,12 @@ L$done_enc:
 	.byte	0xf3,0xc3
 
 
+
 .globl	_xor128_decrypt_n_pad
 
 .p2align	4
 _xor128_decrypt_n_pad:
+
 	subq	%rdx,%rsi
 	subq	%rdx,%rdi
 	movq	%rcx,%r10
diff --git a/deps/openssl/config/archs/darwin64-x86_64-cc/asm/crypto/rc4/rc4-x86_64.s b/deps/openssl/config/archs/darwin64-x86_64-cc/asm/crypto/rc4/rc4-x86_64.s
index 8bfb48b74a..8b6186f0e2 100644
--- a/deps/openssl/config/archs/darwin64-x86_64-cc/asm/crypto/rc4/rc4-x86_64.s
+++ b/deps/openssl/config/archs/darwin64-x86_64-cc/asm/crypto/rc4/rc4-x86_64.s
@@ -4,11 +4,12 @@
 .globl	_RC4
 
 .p2align	4
-_RC4:	orq	%rsi,%rsi
+_RC4:
+
+	orq	%rsi,%rsi
 	jne	L$entry
 	.byte	0xf3,0xc3
 L$entry:
-
 	pushq	%rbx
 
 	pushq	%r12
@@ -530,6 +531,7 @@ L$epilogue:
 
 .p2align	4
 _RC4_set_key:
+
 	leaq	8(%rdi),%rdi
 	leaq	(%rdx,%rsi,1),%rdx
 	negq	%rsi
@@ -598,10 +600,12 @@ L$exit_key:
 	.byte	0xf3,0xc3
 
 
+
 .globl	_RC4_options
 
 .p2align	4
 _RC4_options:
+
 	leaq	L$opts(%rip),%rax
 	movl	_OPENSSL_ia32cap_P(%rip),%edx
 	btl	$20,%edx
@@ -614,6 +618,7 @@ L$8xchar:
 	addq	$12,%rax
 L$done:
 	.byte	0xf3,0xc3
+
 .p2align	6
 L$opts:
 .byte	114,99,52,40,56,120,44,105,110,116,41,0
diff --git a/deps/openssl/config/archs/darwin64-x86_64-cc/asm/crypto/sha/keccak1600-x86_64.s b/deps/openssl/config/archs/darwin64-x86_64-cc/asm/crypto/sha/keccak1600-x86_64.s
index ec096c5ab0..5105d9818b 100644
--- a/deps/openssl/config/archs/darwin64-x86_64-cc/asm/crypto/sha/keccak1600-x86_64.s
+++ b/deps/openssl/config/archs/darwin64-x86_64-cc/asm/crypto/sha/keccak1600-x86_64.s
@@ -3,6 +3,7 @@
 
 .p2align	5
 __KeccakF1600:
+
 	movq	60(%rdi),%rax
 	movq	68(%rdi),%rbx
 	movq	76(%rdi),%rcx
@@ -258,6 +259,7 @@ L$oop:
 
 
 
+
 .p2align	5
 KeccakF1600:
 
diff --git a/deps/openssl/config/archs/darwin64-x86_64-cc/asm/crypto/sha/sha1-x86_64.s b/deps/openssl/config/archs/darwin64-x86_64-cc/asm/crypto/sha/sha1-x86_64.s
index 02472d0b7d..fb22d41c1a 100644
--- a/deps/openssl/config/archs/darwin64-x86_64-cc/asm/crypto/sha/sha1-x86_64.s
+++ b/deps/openssl/config/archs/darwin64-x86_64-cc/asm/crypto/sha/sha1-x86_64.s
@@ -1421,10 +1421,10 @@ L$oop_shaext:
 	pshufd	$27,%xmm1,%xmm1
 	movdqu	%xmm0,(%rdi)
 	movd	%xmm1,16(%rdi)
-
 	.byte	0xf3,0xc3
 
 
+
 .p2align	4
 sha1_block_data_order_ssse3:
 _ssse3_shortcut:
diff --git a/deps/openssl/config/archs/darwin64-x86_64-cc/asm/crypto/sha/sha256-x86_64.s b/deps/openssl/config/archs/darwin64-x86_64-cc/asm/crypto/sha/sha256-x86_64.s
index e43cdd7040..3952a775b9 100644
--- a/deps/openssl/config/archs/darwin64-x86_64-cc/asm/crypto/sha/sha256-x86_64.s
+++ b/deps/openssl/config/archs/darwin64-x86_64-cc/asm/crypto/sha/sha256-x86_64.s
@@ -1775,6 +1775,7 @@ K256:
 .p2align	6
 sha256_block_data_order_shaext:
 _shaext_shortcut:
+
 	leaq	K256+128(%rip),%rcx
 	movdqu	(%rdi),%xmm1
 	movdqu	16(%rdi),%xmm2
@@ -1979,6 +1980,7 @@ L$oop_shaext:
 	.byte	0xf3,0xc3
 
 
+
 .p2align	6
 sha256_block_data_order_ssse3:
 
@@ -4238,7 +4240,15 @@ L$oop_avx2:
 	vmovdqa	%ymm4,0(%rsp)
 	xorl	%r14d,%r14d
 	vmovdqa	%ymm5,32(%rsp)
+
+	movq	88(%rsp),%rdi
+
 	leaq	-64(%rsp),%rsp
+
+
+
+	movq	%rdi,-8(%rsp)
+
 	movl	%ebx,%edi
 	vmovdqa	%ymm6,0(%rsp)
 	xorl	%ecx,%edi
@@ -4250,6 +4260,12 @@ L$oop_avx2:
 .p2align	4
 L$avx2_00_47:
 	leaq	-64(%rsp),%rsp
+
+
+	pushq	64-8(%rsp)
+
+	leaq	8(%rsp),%rsp
+
 	vpalignr	$4,%ymm0,%ymm1,%ymm4
 	addl	0+128(%rsp),%r11d
 	andl	%r8d,%r12d
@@ -4505,6 +4521,12 @@ L$avx2_00_47:
 	movl	%r9d,%r12d
 	vmovdqa	%ymm6,32(%rsp)
 	leaq	-64(%rsp),%rsp
+
+
+	pushq	64-8(%rsp)
+
+	leaq	8(%rsp),%rsp
+
 	vpalignr	$4,%ymm2,%ymm3,%ymm4
 	addl	0+128(%rsp),%r11d
 	andl	%r8d,%r12d
@@ -5380,6 +5402,8 @@ L$ower_avx2:
 
 	leaq	448(%rsp),%rsp
 
+
+
 	addl	0(%rdi),%eax
 	addl	4(%rdi),%ebx
 	addl	8(%rdi),%ecx
@@ -5405,9 +5429,11 @@ L$ower_avx2:
 	jbe	L$oop_avx2
 	leaq	(%rsp),%rbp
 
+
+
+
 L$done_avx2:
-	leaq	(%rbp),%rsp
-	movq	88(%rsp),%rsi
+	movq	88(%rbp),%rsi
 
 	vzeroupper
 	movq	-48(%rsi),%r15
diff --git a/deps/openssl/config/archs/darwin64-x86_64-cc/asm/crypto/sha/sha512-x86_64.s b/deps/openssl/config/archs/darwin64-x86_64-cc/asm/crypto/sha/sha512-x86_64.s
index 51ace9a686..6348b0a2c0 100644
--- a/deps/openssl/config/archs/darwin64-x86_64-cc/asm/crypto/sha/sha512-x86_64.s
+++ b/deps/openssl/config/archs/darwin64-x86_64-cc/asm/crypto/sha/sha512-x86_64.s
@@ -4165,7 +4165,15 @@ L$oop_avx2:
 	vmovdqa	%ymm10,64(%rsp)
 	vpaddq	64(%rbp),%ymm6,%ymm10
 	vmovdqa	%ymm11,96(%rsp)
+
+	movq	152(%rsp),%rdi
+
 	leaq	-128(%rsp),%rsp
+
+
+
+	movq	%rdi,-8(%rsp)
+
 	vpaddq	96(%rbp),%ymm7,%ymm11
 	vmovdqa	%ymm8,0(%rsp)
 	xorq	%r14,%r14
@@ -4181,6 +4189,12 @@ L$oop_avx2:
 .p2align	4
 L$avx2_00_47:
 	leaq	-128(%rsp),%rsp
+
+
+	pushq	128-8(%rsp)
+
+	leaq	8(%rsp),%rsp
+
 	vpalignr	$8,%ymm0,%ymm1,%ymm8
 	addq	0+256(%rsp),%r11
 	andq	%r8,%r12
@@ -4474,6 +4488,12 @@ L$avx2_00_47:
 	movq	%r9,%r12
 	vmovdqa	%ymm10,96(%rsp)
 	leaq	-128(%rsp),%rsp
+
+
+	pushq	128-8(%rsp)
+
+	leaq	8(%rsp),%rsp
+
 	vpalignr	$8,%ymm4,%ymm5,%ymm8
 	addq	0+256(%rsp),%r11
 	andq	%r8,%r12
@@ -5387,6 +5407,8 @@ L$ower_avx2:
 
 	leaq	1152(%rsp),%rsp
 
+
+
 	addq	0(%rdi),%rax
 	addq	8(%rdi),%rbx
 	addq	16(%rdi),%rcx
@@ -5412,9 +5434,11 @@ L$ower_avx2:
 	jbe	L$oop_avx2
 	leaq	(%rsp),%rbp
 
+
+
+
 L$done_avx2:
-	leaq	(%rbp),%rsp
-	movq	152(%rsp),%rsi
+	movq	152(%rbp),%rsi
 
 	vzeroupper
 	movq	-48(%rsi),%r15
diff --git a/deps/openssl/config/archs/darwin64-x86_64-cc/asm/crypto/x86_64cpuid.s b/deps/openssl/config/archs/darwin64-x86_64-cc/asm/crypto/x86_64cpuid.s
index 05afede678..32a92da69f 100644
--- a/deps/openssl/config/archs/darwin64-x86_64-cc/asm/crypto/x86_64cpuid.s
+++ b/deps/openssl/config/archs/darwin64-x86_64-cc/asm/crypto/x86_64cpuid.s
@@ -13,6 +13,7 @@
 
 .p2align	4
 _OPENSSL_atomic_add:
+
 	movl	(%rdi),%eax
 L$spin:	leaq	(%rsi,%rax,1),%r8
 .byte	0xf0
@@ -23,16 +24,19 @@ L$spin:	leaq	(%rsi,%rax,1),%r8
 	.byte	0xf3,0xc3
 
 
+
 .globl	_OPENSSL_rdtsc
 
 .p2align	4
 _OPENSSL_rdtsc:
+
 	rdtsc
 	shlq	$32,%rdx
 	orq	%rdx,%rax
 	.byte	0xf3,0xc3
 
 
+
 .globl	_OPENSSL_ia32_cpuid
 
 .p2align	4
@@ -206,6 +210,7 @@ L$done:
 
 .p2align	4
 _OPENSSL_cleanse:
+
 	xorq	%rax,%rax
 	cmpq	$15,%rsi
 	jae	L$ot
@@ -237,10 +242,12 @@ L$aligned:
 	.byte	0xf3,0xc3
 
 
+
 .globl	_CRYPTO_memcmp
 
 .p2align	4
 _CRYPTO_memcmp:
+
 	xorq	%rax,%rax
 	xorq	%r10,%r10
 	cmpq	$0,%rdx
@@ -270,10 +277,12 @@ L$oop_cmp:
 L$no_data:
 	.byte	0xf3,0xc3
 
+
 .globl	_OPENSSL_wipe_cpu
 
 .p2align	4
 _OPENSSL_wipe_cpu:
+
 	pxor	%xmm0,%xmm0
 	pxor	%xmm1,%xmm1
 	pxor	%xmm2,%xmm2
@@ -301,10 +310,12 @@ _OPENSSL_wipe_cpu:
 	leaq	8(%rsp),%rax
 	.byte	0xf3,0xc3
 
+
 .globl	_OPENSSL_instrument_bus
 
 .p2align	4
 _OPENSSL_instrument_bus:
+
 	movq	%rdi,%r10
 	movq	%rsi,%rcx
 	movq	%rsi,%r11
@@ -333,10 +344,12 @@ L$oop:	rdtsc
 	.byte	0xf3,0xc3
 
 
+
 .globl	_OPENSSL_instrument_bus2
 
 .p2align	4
 _OPENSSL_instrument_bus2:
+
 	movq	%rdi,%r10
 	movq	%rsi,%rcx
 	movq	%rdx,%r11
@@ -380,10 +393,12 @@ L$done2:
 	subq	%rcx,%rax
 	.byte	0xf3,0xc3
 
+
 .globl	_OPENSSL_ia32_rdrand_bytes
 
 .p2align	4
 _OPENSSL_ia32_rdrand_bytes:
+
 	xorq	%rax,%rax
 	cmpq	$0,%rsi
 	je	L$done_rdrand_bytes
@@ -421,10 +436,12 @@ L$done_rdrand_bytes:
 	xorq	%r10,%r10
 	.byte	0xf3,0xc3
 
+
 .globl	_OPENSSL_ia32_rdseed_bytes
 
 .p2align	4
 _OPENSSL_ia32_rdseed_bytes:
+
 	xorq	%rax,%rax
 	cmpq	$0,%rsi
 	je	L$done_rdseed_bytes
diff --git a/deps/openssl/config/archs/darwin64-x86_64-cc/asm/include/openssl/opensslconf.h b/deps/openssl/config/archs/darwin64-x86_64-cc/asm/include/openssl/opensslconf.h
index 2a63d7a6ba..25a4ebf76a 100644
--- a/deps/openssl/config/archs/darwin64-x86_64-cc/asm/include/openssl/opensslconf.h
+++ b/deps/openssl/config/archs/darwin64-x86_64-cc/asm/include/openssl/opensslconf.h
@@ -99,9 +99,6 @@ extern "C" {
 #ifndef OPENSSL_NO_DYNAMIC_ENGINE
 # define OPENSSL_NO_DYNAMIC_ENGINE
 #endif
-#ifndef OPENSSL_NO_AFALGENG
-# define OPENSSL_NO_AFALGENG
-#endif
 
 
 /*
diff --git a/deps/openssl/config/archs/darwin64-x86_64-cc/asm/include/progs.h b/deps/openssl/config/archs/darwin64-x86_64-cc/asm/include/progs.h
index 9b3d270e20..308c65601b 100644
--- a/deps/openssl/config/archs/darwin64-x86_64-cc/asm/include/progs.h
+++ b/deps/openssl/config/archs/darwin64-x86_64-cc/asm/include/progs.h
@@ -2,7 +2,7 @@
  * WARNING: do not edit!
  * Generated by apps/progs.pl
  *
- * Copyright 1995-2019 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 1995-2020 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
diff --git a/deps/openssl/config/archs/darwin64-x86_64-cc/asm/openssl-cl.gypi b/deps/openssl/config/archs/darwin64-x86_64-cc/asm/openssl-cl.gypi
index 95e8dc567e..152f3f9fa5 100644
--- a/deps/openssl/config/archs/darwin64-x86_64-cc/asm/openssl-cl.gypi
+++ b/deps/openssl/config/archs/darwin64-x86_64-cc/asm/openssl-cl.gypi
@@ -15,6 +15,7 @@
       'KECCAK1600_ASM',
       'RC4_ASM',
       'MD5_ASM',
+      'AESNI_ASM',
       'VPAES_ASM',
       'GHASH_ASM',
       'ECP_NISTZ256_ASM',
diff --git a/deps/openssl/config/archs/darwin64-x86_64-cc/asm/openssl.gypi b/deps/openssl/config/archs/darwin64-x86_64-cc/asm/openssl.gypi
index f87225df69..3b44bb5fc8 100644
--- a/deps/openssl/config/archs/darwin64-x86_64-cc/asm/openssl.gypi
+++ b/deps/openssl/config/archs/darwin64-x86_64-cc/asm/openssl.gypi
@@ -722,6 +722,7 @@
       'KECCAK1600_ASM',
       'RC4_ASM',
       'MD5_ASM',
+      'AESNI_ASM',
       'VPAES_ASM',
       'GHASH_ASM',
       'ECP_NISTZ256_ASM',
diff --git a/deps/openssl/config/archs/darwin64-x86_64-cc/asm_avx2/configdata.pm b/deps/openssl/config/archs/darwin64-x86_64-cc/asm_avx2/configdata.pm
index 32bcc2c466..e07de8a9b5 100644
--- a/deps/openssl/config/archs/darwin64-x86_64-cc/asm_avx2/configdata.pm
+++ b/deps/openssl/config/archs/darwin64-x86_64-cc/asm_avx2/configdata.pm
@@ -48,14 +48,14 @@ our %config = (
   export_var_as_fn => "0",
   includes => [  ],
   lflags => [  ],
-  lib_defines => [ "OPENSSL_PIC", "OPENSSL_CPUID_OBJ", "OPENSSL_IA32_SSE2", "OPENSSL_BN_ASM_MONT", "OPENSSL_BN_ASM_MONT5", "OPENSSL_BN_ASM_GF2m", "SHA1_ASM", "SHA256_ASM", "SHA512_ASM", "KECCAK1600_ASM", "RC4_ASM", "MD5_ASM", "VPAES_ASM", "GHASH_ASM", "ECP_NISTZ256_ASM", "X25519_ASM", "POLY1305_ASM" ],
+  lib_defines => [ "OPENSSL_PIC", "OPENSSL_CPUID_OBJ", "OPENSSL_IA32_SSE2", "OPENSSL_BN_ASM_MONT", "OPENSSL_BN_ASM_MONT5", "OPENSSL_BN_ASM_GF2m", "SHA1_ASM", "SHA256_ASM", "SHA512_ASM", "KECCAK1600_ASM", "RC4_ASM", "MD5_ASM", "AESNI_ASM", "VPAES_ASM", "GHASH_ASM", "ECP_NISTZ256_ASM", "X25519_ASM", "POLY1305_ASM" ],
   libdir => "",
   major => "1",
   makedepprog => "\$(CROSS_COMPILE)../config/fake_gcc.pl",
   minor => "1.1",
   openssl_algorithm_defines => [ "OPENSSL_NO_COMP", "OPENSSL_NO_MD2", "OPENSSL_NO_RC5" ],
   openssl_api_defines => [  ],
-  openssl_other_defines => [ "OPENSSL_RAND_SEED_OS", "OPENSSL_NO_AFALGENG", "OPENSSL_NO_ASAN", "OPENSSL_NO_CRYPTO_MDEBUG", "OPENSSL_NO_CRYPTO_MDEBUG_BACKTRACE", "OPENSSL_NO_DEVCRYPTOENG", "OPENSSL_NO_EC_NISTP_64_GCC_128", "OPENSSL_NO_EGD", "OPENSSL_NO_EXTERNAL_TESTS", "OPENSSL_NO_FUZZ_AFL", "OPENSSL_NO_FUZZ_LIBFUZZER", "OPENSSL_NO_HEARTBEATS", "OPENSSL_NO_MSAN", "OPENSSL_NO_SCTP", "OPENSSL_NO_SSL3", "OPENSSL_NO_SSL3_METHOD", "OPENSSL_NO_UBSAN", "OPENSSL_NO_UNIT_TEST", "OPENSSL_NO_WEAK_SSL_CIPHERS", "OPENSSL_NO_DYNAMIC_ENGINE", "OPENSSL_NO_AFALGENG" ],
+  openssl_other_defines => [ "OPENSSL_RAND_SEED_OS", "OPENSSL_NO_AFALGENG", "OPENSSL_NO_ASAN", "OPENSSL_NO_CRYPTO_MDEBUG", "OPENSSL_NO_CRYPTO_MDEBUG_BACKTRACE", "OPENSSL_NO_DEVCRYPTOENG", "OPENSSL_NO_EC_NISTP_64_GCC_128", "OPENSSL_NO_EGD", "OPENSSL_NO_EXTERNAL_TESTS", "OPENSSL_NO_FUZZ_AFL", "OPENSSL_NO_FUZZ_LIBFUZZER", "OPENSSL_NO_HEARTBEATS", "OPENSSL_NO_MSAN", "OPENSSL_NO_SCTP", "OPENSSL_NO_SSL3", "OPENSSL_NO_SSL3_METHOD", "OPENSSL_NO_UBSAN", "OPENSSL_NO_UNIT_TEST", "OPENSSL_NO_WEAK_SSL_CIPHERS", "OPENSSL_NO_DYNAMIC_ENGINE" ],
   openssl_sys_defines => [ "OPENSSL_SYS_MACOSX" ],
   openssl_thread_defines => [ "OPENSSL_THREADS" ],
   openssldir => "",
@@ -111,8 +111,8 @@ our %config = (
   sourcedir => ".",
   target => "darwin64-x86_64-cc",
   tdirs => [ "ossl_shim" ],
-  version => "1.1.1d",
-  version_num => "0x1010104fL",
+  version => "1.1.1e",
+  version_num => "0x1010105fL",
 );
 
 our %target = (
@@ -235,6 +235,7 @@ our @disablables = (
   "dgram",
   "dh",
   "dsa",
+  "dso",
   "dtls",
   "dynamic-engine",
   "ec",
@@ -352,8 +353,8 @@ our %unified_info = (
         {
             "" =>
                 [
-                    "crypto/include/internal/bn_conf.h",
-                    "crypto/include/internal/dso_conf.h",
+                    "include/crypto/bn_conf.h",
+                    "include/crypto/dso_conf.h",
                     "include/openssl/opensslconf.h",
                 ],
             "apps/asn1pars.o" =>
@@ -621,14 +622,6 @@ our %unified_info = (
                     "crypto/perlasm/cbc.pl",
                     "crypto/perlasm/x86asm.pl",
                 ],
-            "crypto/include/internal/bn_conf.h" =>
-                [
-                    "configdata.pm",
-                ],
-            "crypto/include/internal/dso_conf.h" =>
-                [
-                    "configdata.pm",
-                ],
             "crypto/rc4/rc4-586.s" =>
                 [
                     "crypto/perlasm/x86asm.pl",
@@ -704,6 +697,14 @@ our %unified_info = (
                 [
                     "libcrypto",
                 ],
+            "include/crypto/bn_conf.h" =>
+                [
+                    "configdata.pm",
+                ],
+            "include/crypto/dso_conf.h" =>
+                [
+                    "configdata.pm",
+                ],
             "include/openssl/opensslconf.h" =>
                 [
                     "configdata.pm",
@@ -1493,6 +1494,12 @@ our %unified_info = (
                     "libcrypto",
                     "test/libtestutil.a",
                 ],
+            "test/ssl_ctx_test" =>
+                [
+                    "libcrypto",
+                    "libssl",
+                    "test/libtestutil.a",
+                ],
             "test/ssl_test" =>
                 [
                     "libcrypto",
@@ -3247,7 +3254,6 @@ our %unified_info = (
                             "test/testutil/cb.o",
                             "test/testutil/driver.o",
                             "test/testutil/format_output.o",
-                            "test/testutil/init.o",
                             "test/testutil/main.o",
                             "test/testutil/output_helpers.o",
                             "test/testutil/random.o",
@@ -3255,6 +3261,7 @@ our %unified_info = (
                             "test/testutil/tap_bio.o",
                             "test/testutil/test_cleanup.o",
                             "test/testutil/tests.o",
+                            "test/testutil/testutil_init.o",
                         ],
                     "products" =>
                         {
@@ -3753,14 +3760,6 @@ our %unified_info = (
                 [
                     "crypto/ia64cpuid.S",
                 ],
-            "crypto/include/internal/bn_conf.h" =>
-                [
-                    "crypto/include/internal/bn_conf.h.in",
-                ],
-            "crypto/include/internal/dso_conf.h" =>
-                [
-                    "crypto/include/internal/dso_conf.h.in",
-                ],
             "crypto/md5/md5-586.s" =>
                 [
                     "crypto/md5/asm/md5-586.pl",
@@ -4201,6 +4200,14 @@ our %unified_info = (
                     "engines/asm/e_padlock-x86_64.pl",
                     "\$(PERLASM_SCHEME)",
                 ],
+            "include/crypto/bn_conf.h" =>
+                [
+                    "include/crypto/bn_conf.h.in",
+                ],
+            "include/crypto/dso_conf.h" =>
+                [
+                    "include/crypto/dso_conf.h.in",
+                ],
             "include/openssl/opensslconf.h" =>
                 [
                     "include/openssl/opensslconf.h.in",
@@ -4883,49 +4890,41 @@ our %unified_info = (
             "crypto/aes/aes_cbc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/aes/aes_cfb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/aes/aes_core.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/aes/aes_ecb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/aes/aes_ige.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/aes/aes_misc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/aes/aes_ofb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/aes/aes_wrap.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/aes/aesfx-sparcv9.o" =>
@@ -4935,25 +4934,21 @@ our %unified_info = (
             "crypto/aes/aesni-mb-x86_64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/aes/aesni-sha1-x86_64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/aes/aesni-sha256-x86_64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/aes/aesni-x86_64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/aes/aest4-sparcv9.o" =>
@@ -4971,13 +4966,11 @@ our %unified_info = (
             "crypto/aes/vpaes-x86_64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/aria/aria.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/arm64cpuid.o" =>
@@ -4991,613 +4984,511 @@ our %unified_info = (
             "crypto/asn1/a_bitstr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_d2i_fp.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_digest.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_dup.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_gentm.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_i2d_fp.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_int.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_mbstr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_object.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_octet.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_print.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_sign.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_strex.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_strnid.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_time.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_type.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_utctm.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_utf8.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_verify.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/ameth_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/asn1_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/asn1_gen.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/asn1_item_list.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/asn1_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/asn1_par.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/asn_mime.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/asn_moid.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/asn_mstbl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/asn_pack.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/bio_asn1.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/bio_ndef.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/d2i_pr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/d2i_pu.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/evp_asn1.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/f_int.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/f_string.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/i2d_pr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/i2d_pu.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/n_pkey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/nsseq.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/p5_pbe.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/p5_pbev2.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/p5_scrypt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/p8_pkey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/t_bitst.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/t_pkey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/t_spki.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/tasn_dec.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/tasn_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/tasn_fre.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/tasn_new.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/tasn_prn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/tasn_scn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/tasn_typ.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/tasn_utl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/x_algor.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/x_bignum.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/x_info.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/x_int64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/x_long.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/x_pkey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/x_sig.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/x_spki.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/x_val.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/async/arch/async_null.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/async/arch/async_posix.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/async/arch/async_win.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/async/async.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/async/async_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/async/async_wait.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bf/bf_cfb64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bf/bf_ecb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bf/bf_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bf/bf_ofb64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bf/bf_skey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/b_addr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/b_dump.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/b_print.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/b_sock.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/b_sock2.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bf_buff.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bf_lbuf.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bf_nbio.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bf_null.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bio_cb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bio_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bio_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bio_meth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bss_acpt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bss_bio.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bss_conn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bss_dgram.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bss_fd.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bss_file.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bss_log.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bss_mem.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bss_null.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bss_sock.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/blake2/blake2b.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/blake2/blake2s.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/blake2/m_blake2b.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/blake2/m_blake2s.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/armv4-gf2m.o" =>
@@ -5611,7 +5502,6 @@ our %unified_info = (
             "crypto/bn/asm/x86_64-gcc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn-mips.o" =>
@@ -5621,182 +5511,152 @@ our %unified_info = (
             "crypto/bn/bn_add.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_blind.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_const.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_ctx.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_depr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_dh.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_div.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_exp.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto",
                 ],
             "crypto/bn/bn_exp2.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_gcd.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_gf2m.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_intern.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_kron.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_mod.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_mont.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_mpi.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_mul.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_nist.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_prime.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_print.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_rand.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_recp.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_shift.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_sqr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_sqrt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_srp.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_word.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_x931p.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/mips-mont.o" =>
@@ -5806,19 +5666,16 @@ our %unified_info = (
             "crypto/bn/rsaz-avx2.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/rsaz-x86_64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/rsaz_exp.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/sparct4-mont.o" =>
@@ -5844,31 +5701,26 @@ our %unified_info = (
             "crypto/bn/x86_64-gf2m.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/x86_64-mont.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/x86_64-mont5.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/buffer/buf_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/buffer/buffer.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/buildinf.h" =>
@@ -5878,37 +5730,31 @@ our %unified_info = (
             "crypto/camellia/cmll-x86_64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/camellia/cmll_cfb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/camellia/cmll_ctr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/camellia/cmll_ecb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/camellia/cmll_misc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/camellia/cmll_ofb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/camellia/cmllt4-sparcv9.o" =>
@@ -5918,31 +5764,26 @@ our %unified_info = (
             "crypto/cast/c_cfb64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cast/c_ecb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cast/c_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cast/c_ofb64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cast/c_skey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/chacha/chacha-armv4.o" =>
@@ -5960,278 +5801,232 @@ our %unified_info = (
             "crypto/chacha/chacha-x86_64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cmac/cm_ameth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cmac/cm_pmeth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cmac/cmac.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_asn1.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_att.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_cd.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_dd.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_env.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_ess.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_io.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_kari.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_pwri.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_sd.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_smime.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/conf/conf_api.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/conf/conf_def.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/conf/conf_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/conf/conf_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/conf/conf_mall.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/conf/conf_mod.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/conf/conf_sap.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/conf/conf_ssl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cpt_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cryptlib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ct/ct_b64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ct/ct_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ct/ct_log.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ct/ct_oct.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ct/ct_policy.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ct/ct_prn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ct/ct_sct.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ct/ct_sct_ctx.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ct/ct_vfy.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ct/ct_x509v3.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ctype.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cversion.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto",
                 ],
             "crypto/des/cbc_cksm.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/cbc_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/cfb64ede.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/cfb64enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/cfb_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/des_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/dest4-sparcv9.o" =>
@@ -6241,301 +6036,251 @@ our %unified_info = (
             "crypto/des/ecb3_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/ecb_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/fcrypt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/fcrypt_b.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/ofb64ede.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/ofb64enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/ofb_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/pcbc_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/qud_cksm.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/rand_key.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/set_key.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/str2key.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/xcbc_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_ameth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_asn1.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_check.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_depr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_gen.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_kdf.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_key.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_meth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_pmeth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_prn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_rfc5114.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_rfc7919.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dsa/dsa_ameth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dsa/dsa_asn1.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dsa/dsa_depr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dsa/dsa_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dsa/dsa_gen.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dsa/dsa_key.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dsa/dsa_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dsa/dsa_meth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dsa/dsa_ossl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dsa/dsa_pmeth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dsa/dsa_prn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dsa/dsa_sign.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dsa/dsa_vrf.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dso/dso_dl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dso/dso_dlfcn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dso/dso_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dso/dso_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dso/dso_openssl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dso/dso_vms.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dso/dso_win32.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ebcdic.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/curve25519.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/curve448/arch_32/f_impl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto/ec/curve448/arch_32",
                     "crypto/ec/curve448",
@@ -6543,7 +6288,6 @@ our %unified_info = (
             "crypto/ec/curve448/curve448.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto/ec/curve448/arch_32",
                     "crypto/ec/curve448",
@@ -6551,7 +6295,6 @@ our %unified_info = (
             "crypto/ec/curve448/curve448_tables.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto/ec/curve448/arch_32",
                     "crypto/ec/curve448",
@@ -6559,7 +6302,6 @@ our %unified_info = (
             "crypto/ec/curve448/eddsa.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto/ec/curve448/arch_32",
                     "crypto/ec/curve448",
@@ -6567,7 +6309,6 @@ our %unified_info = (
             "crypto/ec/curve448/f_generic.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto/ec/curve448/arch_32",
                     "crypto/ec/curve448",
@@ -6575,7 +6316,6 @@ our %unified_info = (
             "crypto/ec/curve448/scalar.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto/ec/curve448/arch_32",
                     "crypto/ec/curve448",
@@ -6583,163 +6323,136 @@ our %unified_info = (
             "crypto/ec/ec2_oct.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec2_smpl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec_ameth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec_asn1.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec_check.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec_curve.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec_cvt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec_key.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec_kmeth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec_mult.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec_oct.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec_pmeth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec_print.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecdh_kdf.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecdh_ossl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecdsa_ossl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecdsa_sign.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecdsa_vrf.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/eck_prn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecp_mont.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecp_nist.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecp_nistp224.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecp_nistp256.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecp_nistp521.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecp_nistputil.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecp_nistz256-armv4.o" =>
@@ -6757,241 +6470,201 @@ our %unified_info = (
             "crypto/ec/ecp_nistz256-x86_64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecp_nistz256.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecp_oct.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecp_smpl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecx_meth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/x25519-x86_64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/eng_all.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/eng_cnf.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/eng_ctrl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/eng_dyn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/eng_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/eng_fat.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/eng_init.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/eng_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/eng_list.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/eng_openssl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/eng_pkey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/eng_rdrand.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/eng_table.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/tb_asnmth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/tb_cipher.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/tb_dh.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/tb_digest.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/tb_dsa.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/tb_eckey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/tb_pkmeth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/tb_rand.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/tb_rsa.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/err/err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/err/err_all.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/err/err_prn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/bio_b64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/bio_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/bio_md.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/bio_ok.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/c_allc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/c_alld.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/cmeth_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/digest.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/e_aes.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto",
                     "crypto/modes",
@@ -6999,21 +6672,18 @@ our %unified_info = (
             "crypto/evp/e_aes_cbc_hmac_sha1.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto/modes",
                 ],
             "crypto/evp/e_aes_cbc_hmac_sha256.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto/modes",
                 ],
             "crypto/evp/e_aria.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto",
                     "crypto/modes",
@@ -7021,13 +6691,11 @@ our %unified_info = (
             "crypto/evp/e_bf.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/e_camellia.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto",
                     "crypto/modes",
@@ -7035,81 +6703,68 @@ our %unified_info = (
             "crypto/evp/e_cast.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/e_chacha20_poly1305.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/e_des.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto",
                 ],
             "crypto/evp/e_des3.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto",
                 ],
             "crypto/evp/e_idea.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/e_null.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/e_old.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/e_rc2.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/e_rc4.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/e_rc4_hmac_md5.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/e_rc5.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/e_seed.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/e_sm4.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto",
                     "crypto/modes",
@@ -7117,328 +6772,267 @@ our %unified_info = (
             "crypto/evp/e_xcbc_d.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/encode.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/evp_cnf.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/evp_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/evp_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/evp_key.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/evp_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/evp_pbe.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/evp_pkey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/m_md2.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/m_md4.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/m_md5.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/m_md5_sha1.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/m_mdc2.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/m_null.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/m_ripemd.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/m_sha1.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/m_sha3.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto",
                 ],
             "crypto/evp/m_sigver.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/m_wp.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/names.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/p5_crpt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/p5_crpt2.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/p_dec.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/p_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/p_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/p_open.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/p_seal.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/p_sign.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/p_verify.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/pbe_scrypt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/pmeth_fn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/pmeth_gn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/pmeth_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ex_data.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/getenv.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/hmac/hm_ameth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/hmac/hm_pmeth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/hmac/hmac.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/idea/i_cbc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/idea/i_cfb64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/idea/i_ecb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/idea/i_ofb64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/idea/i_skey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
-            "crypto/include/internal/bn_conf.h" =>
-                [
-                    ".",
-                ],
-            "crypto/include/internal/dso_conf.h" =>
-                [
-                    ".",
-                ],
             "crypto/init.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/kdf/hkdf.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/kdf/kdf_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/kdf/scrypt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/kdf/tls1_prf.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/lhash/lh_stats.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/lhash/lhash.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/md4/md4_dgst.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/md4/md4_one.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/md5/md5-sparcv9.o" =>
@@ -7448,91 +7042,76 @@ our %unified_info = (
             "crypto/md5/md5-x86_64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/md5/md5_dgst.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/md5/md5_one.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/mdc2/mdc2_one.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/mdc2/mdc2dgst.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/mem.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/mem_dbg.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/mem_sec.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/modes/aesni-gcm-x86_64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/modes/cbc128.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/modes/ccm128.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/modes/cfb128.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/modes/ctr128.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/modes/cts128.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/modes/gcm128.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto",
                 ],
@@ -7551,7 +7130,6 @@ our %unified_info = (
             "crypto/modes/ghash-x86_64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/modes/ghashv8-armx.o" =>
@@ -7561,361 +7139,301 @@ our %unified_info = (
             "crypto/modes/ocb128.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/modes/ofb128.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/modes/wrap128.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/modes/xts128.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/o_dir.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/o_fips.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/o_fopen.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/o_init.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/o_str.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/o_time.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/objects/o_names.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/objects/obj_dat.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/objects/obj_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/objects/obj_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/objects/obj_xref.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ocsp/ocsp_asn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ocsp/ocsp_cl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ocsp/ocsp_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ocsp/ocsp_ext.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ocsp/ocsp_ht.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ocsp/ocsp_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ocsp/ocsp_prn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ocsp/ocsp_srv.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ocsp/ocsp_vfy.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ocsp/v3_ocsp.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pem/pem_all.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pem/pem_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pem/pem_info.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pem/pem_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pem/pem_oth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pem/pem_pk8.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pem/pem_pkey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pem/pem_sign.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pem/pem_x509.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pem/pem_xaux.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pem/pvkfmt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_add.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_asn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_attr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_crpt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_crt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_decr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_init.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_key.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_kiss.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_mutl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_npas.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_p8d.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_p8e.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_sbag.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_utl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/pk12err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs7/bio_pk7.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs7/pk7_asn1.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs7/pk7_attr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs7/pk7_doit.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs7/pk7_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs7/pk7_mime.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs7/pk7_smime.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs7/pkcs7err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/poly1305/poly1305-armv4.o" =>
@@ -7937,265 +7455,221 @@ our %unified_info = (
             "crypto/poly1305/poly1305-x86_64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/poly1305/poly1305.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/poly1305/poly1305_ameth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/poly1305/poly1305_pmeth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rand/drbg_ctr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rand/drbg_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rand/rand_egd.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rand/rand_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rand/rand_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rand/rand_unix.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rand/rand_vms.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rand/rand_win.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rand/randfile.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rc2/rc2_cbc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rc2/rc2_ecb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rc2/rc2_skey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rc2/rc2cfb64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rc2/rc2ofb64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rc4/rc4-md5-x86_64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rc4/rc4-x86_64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ripemd/rmd_dgst.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ripemd/rmd_one.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_ameth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_asn1.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_chk.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_crpt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_depr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_gen.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_meth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_mp.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_none.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_oaep.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_ossl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_pk1.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_pmeth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_prn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_pss.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_saos.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_sign.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_ssl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_x931.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_x931g.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/s390xcpuid.o" =>
@@ -8205,31 +7679,26 @@ our %unified_info = (
             "crypto/seed/seed.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/seed/seed_cbc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/seed/seed_cfb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/seed/seed_ecb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/seed/seed_ofb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sha/keccak1600-armv4.o" =>
@@ -8239,7 +7708,6 @@ our %unified_info = (
             "crypto/sha/keccak1600-x86_64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sha/sha1-armv4-large.o" =>
@@ -8253,7 +7721,6 @@ our %unified_info = (
             "crypto/sha/sha1-mb-x86_64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sha/sha1-mips.o" =>
@@ -8271,19 +7738,16 @@ our %unified_info = (
             "crypto/sha/sha1-x86_64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sha/sha1_one.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sha/sha1dgst.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sha/sha256-armv4.o" =>
@@ -8297,7 +7761,6 @@ our %unified_info = (
             "crypto/sha/sha256-mb-x86_64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sha/sha256-mips.o" =>
@@ -8315,13 +7778,11 @@ our %unified_info = (
             "crypto/sha/sha256-x86_64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sha/sha256.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sha/sha512-armv4.o" =>
@@ -8347,727 +7808,606 @@ our %unified_info = (
             "crypto/sha/sha512-x86_64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sha/sha512.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/siphash/siphash.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/siphash/siphash_ameth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/siphash/siphash_pmeth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sm2/sm2_crypt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sm2/sm2_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sm2/sm2_pmeth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sm2/sm2_sign.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sm3/m_sm3.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sm3/sm3.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sm4/sm4.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/srp/srp_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/srp/srp_vfy.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/stack/stack.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/store/loader_file.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/store/store_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/store/store_init.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/store/store_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/store/store_register.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/store/store_strings.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/threads_none.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/threads_pthread.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/threads_win.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ts/ts_asn1.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ts/ts_conf.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ts/ts_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ts/ts_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ts/ts_req_print.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ts/ts_req_utils.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ts/ts_rsp_print.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ts/ts_rsp_sign.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ts/ts_rsp_utils.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ts/ts_rsp_verify.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ts/ts_verify_ctx.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/txt_db/txt_db.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ui/ui_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ui/ui_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ui/ui_null.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ui/ui_openssl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ui/ui_util.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/uid.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/whrlpool/wp-x86_64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/whrlpool/wp_dgst.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/by_dir.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/by_file.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/t_crl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/t_req.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/t_x509.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_att.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_cmp.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_d2.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_def.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_ext.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_lu.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_meth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_obj.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_r2x.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_req.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_set.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_trs.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_txt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_v3.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_vfy.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_vpm.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509cset.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509name.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509rset.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509spki.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509type.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x_all.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x_attrib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x_crl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x_exten.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x_name.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x_pubkey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x_req.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x_x509.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x_x509a.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/pcy_cache.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/pcy_data.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/pcy_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/pcy_map.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/pcy_node.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/pcy_tree.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_addr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_admis.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_akey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_akeya.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_alt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_asid.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_bcons.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_bitst.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_conf.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_cpols.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_crld.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_enum.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_extku.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_genn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_ia5.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_info.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_int.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_ncons.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_pci.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_pcia.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_pcons.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_pku.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_pmaps.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_prn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_purp.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_skey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_sxnet.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_tlsf.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_utl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x86_64cpuid.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "engines/e_capi.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "engines/e_padlock-x86_64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "engines/e_padlock.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "fuzz/asn1.o" =>
@@ -9118,6 +8458,14 @@ our %unified_info = (
                 [
                     "include",
                 ],
+            "include/crypto/bn_conf.h" =>
+                [
+                    ".",
+                ],
+            "include/crypto/dso_conf.h" =>
+                [
+                    ".",
+                ],
             "include/openssl/opensslconf.h" =>
                 [
                     ".",
@@ -9362,7 +8710,6 @@ our %unified_info = (
                 [
                     ".",
                     "include",
-                    "crypto/include",
                 ],
             "test/asn1_string_table_test.o" =>
                 [
@@ -9688,7 +9035,6 @@ our %unified_info = (
                 [
                     ".",
                     "include",
-                    "crypto/include",
                 ],
             "test/cipher_overhead_test.o" =>
                 [
@@ -9734,7 +9080,6 @@ our %unified_info = (
             "test/ctype_internal_test.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "test/curve448_internal_test.o" =>
@@ -9800,7 +9145,6 @@ our %unified_info = (
                 [
                     "include",
                     "crypto/ec",
-                    "crypto/include",
                 ],
             "test/ecdsatest.o" =>
                 [
@@ -9825,7 +9169,6 @@ our %unified_info = (
             "test/evp_extra_test.o" =>
                 [
                     "include",
-                    "crypto/include",
                 ],
             "test/evp_test.o" =>
                 [
@@ -9923,7 +9266,6 @@ our %unified_info = (
                 [
                     ".",
                     "include",
-                    "crypto/include",
                 ],
             "test/rc2test.o" =>
                 [
@@ -9973,18 +9315,15 @@ our %unified_info = (
                 [
                     ".",
                     "include",
-                    "crypto/include",
                 ],
             "test/sm2_internal_test.o" =>
                 [
                     "include",
-                    "crypto/include",
                 ],
             "test/sm4_internal_test.o" =>
                 [
                     ".",
                     "include",
-                    "crypto/include",
                 ],
             "test/srptest.o" =>
                 [
@@ -9995,6 +9334,10 @@ our %unified_info = (
                     ".",
                     "include",
                 ],
+            "test/ssl_ctx_test.o" =>
+                [
+                    "include",
+                ],
             "test/ssl_test.o" =>
                 [
                     "include",
@@ -10058,10 +9401,6 @@ our %unified_info = (
                 [
                     "include",
                 ],
-            "test/testutil/init.o" =>
-                [
-                    "include",
-                ],
             "test/testutil/main.o" =>
                 [
                     "include",
@@ -10090,6 +9429,10 @@ our %unified_info = (
                 [
                     "include",
                 ],
+            "test/testutil/testutil_init.o" =>
+                [
+                    "include",
+                ],
             "test/threadstest.o" =>
                 [
                     "include",
@@ -10354,6 +9697,7 @@ our %unified_info = (
             "test/sm4_internal_test",
             "test/srptest",
             "test/ssl_cert_table_internal_test",
+            "test/ssl_ctx_test",
             "test/ssl_test",
             "test/ssl_test_ctx_test",
             "test/sslapitest",
@@ -15359,7 +14703,6 @@ our %unified_info = (
                     "test/testutil/cb.o",
                     "test/testutil/driver.o",
                     "test/testutil/format_output.o",
-                    "test/testutil/init.o",
                     "test/testutil/main.o",
                     "test/testutil/output_helpers.o",
                     "test/testutil/random.o",
@@ -15367,6 +14710,7 @@ our %unified_info = (
                     "test/testutil/tap_bio.o",
                     "test/testutil/test_cleanup.o",
                     "test/testutil/tests.o",
+                    "test/testutil/testutil_init.o",
                 ],
             "test/md2test" =>
                 [
@@ -15594,6 +14938,14 @@ our %unified_info = (
                 [
                     "test/ssl_cert_table_internal_test.c",
                 ],
+            "test/ssl_ctx_test" =>
+                [
+                    "test/ssl_ctx_test.o",
+                ],
+            "test/ssl_ctx_test.o" =>
+                [
+                    "test/ssl_ctx_test.c",
+                ],
             "test/ssl_test" =>
                 [
                     "test/handshake_helper.o",
@@ -15696,10 +15048,6 @@ our %unified_info = (
                 [
                     "test/testutil/format_output.c",
                 ],
-            "test/testutil/init.o" =>
-                [
-                    "test/testutil/init.c",
-                ],
             "test/testutil/main.o" =>
                 [
                     "test/testutil/main.c",
@@ -15728,6 +15076,10 @@ our %unified_info = (
                 [
                     "test/testutil/tests.c",
                 ],
+            "test/testutil/testutil_init.o" =>
+                [
+                    "test/testutil/testutil_init.c",
+                ],
             "test/threadstest" =>
                 [
                     "test/threadstest.o",
diff --git a/deps/openssl/config/archs/darwin64-x86_64-cc/asm_avx2/crypto/aes/aes-x86_64.s b/deps/openssl/config/archs/darwin64-x86_64-cc/asm_avx2/crypto/aes/aes-x86_64.s
deleted file mode 100644
index ee148d19dc..0000000000
--- a/deps/openssl/config/archs/darwin64-x86_64-cc/asm_avx2/crypto/aes/aes-x86_64.s
+++ /dev/null
@@ -1,2631 +0,0 @@
-.text	
-
-.p2align	4
-_x86_64_AES_encrypt:
-	xorl	0(%r15),%eax
-	xorl	4(%r15),%ebx
-	xorl	8(%r15),%ecx
-	xorl	12(%r15),%edx
-
-	movl	240(%r15),%r13d
-	subl	$1,%r13d
-	jmp	L$enc_loop
-.p2align	4
-L$enc_loop:
-
-	movzbl	%al,%esi
-	movzbl	%bl,%edi
-	movzbl	%cl,%ebp
-	movl	0(%r14,%rsi,8),%r10d
-	movl	0(%r14,%rdi,8),%r11d
-	movl	0(%r14,%rbp,8),%r12d
-
-	movzbl	%bh,%esi
-	movzbl	%ch,%edi
-	movzbl	%dl,%ebp
-	xorl	3(%r14,%rsi,8),%r10d
-	xorl	3(%r14,%rdi,8),%r11d
-	movl	0(%r14,%rbp,8),%r8d
-
-	movzbl	%dh,%esi
-	shrl	$16,%ecx
-	movzbl	%ah,%ebp
-	xorl	3(%r14,%rsi,8),%r12d
-	shrl	$16,%edx
-	xorl	3(%r14,%rbp,8),%r8d
-
-	shrl	$16,%ebx
-	leaq	16(%r15),%r15
-	shrl	$16,%eax
-
-	movzbl	%cl,%esi
-	movzbl	%dl,%edi
-	movzbl	%al,%ebp
-	xorl	2(%r14,%rsi,8),%r10d
-	xorl	2(%r14,%rdi,8),%r11d
-	xorl	2(%r14,%rbp,8),%r12d
-
-	movzbl	%dh,%esi
-	movzbl	%ah,%edi
-	movzbl	%bl,%ebp
-	xorl	1(%r14,%rsi,8),%r10d
-	xorl	1(%r14,%rdi,8),%r11d
-	xorl	2(%r14,%rbp,8),%r8d
-
-	movl	12(%r15),%edx
-	movzbl	%bh,%edi
-	movzbl	%ch,%ebp
-	movl	0(%r15),%eax
-	xorl	1(%r14,%rdi,8),%r12d
-	xorl	1(%r14,%rbp,8),%r8d
-
-	movl	4(%r15),%ebx
-	movl	8(%r15),%ecx
-	xorl	%r10d,%eax
-	xorl	%r11d,%ebx
-	xorl	%r12d,%ecx
-	xorl	%r8d,%edx
-	subl	$1,%r13d
-	jnz	L$enc_loop
-	movzbl	%al,%esi
-	movzbl	%bl,%edi
-	movzbl	%cl,%ebp
-	movzbl	2(%r14,%rsi,8),%r10d
-	movzbl	2(%r14,%rdi,8),%r11d
-	movzbl	2(%r14,%rbp,8),%r12d
-
-	movzbl	%dl,%esi
-	movzbl	%bh,%edi
-	movzbl	%ch,%ebp
-	movzbl	2(%r14,%rsi,8),%r8d
-	movl	0(%r14,%rdi,8),%edi
-	movl	0(%r14,%rbp,8),%ebp
-
-	andl	$0x0000ff00,%edi
-	andl	$0x0000ff00,%ebp
-
-	xorl	%edi,%r10d
-	xorl	%ebp,%r11d
-	shrl	$16,%ecx
-
-	movzbl	%dh,%esi
-	movzbl	%ah,%edi
-	shrl	$16,%edx
-	movl	0(%r14,%rsi,8),%esi
-	movl	0(%r14,%rdi,8),%edi
-
-	andl	$0x0000ff00,%esi
-	andl	$0x0000ff00,%edi
-	shrl	$16,%ebx
-	xorl	%esi,%r12d
-	xorl	%edi,%r8d
-	shrl	$16,%eax
-
-	movzbl	%cl,%esi
-	movzbl	%dl,%edi
-	movzbl	%al,%ebp
-	movl	0(%r14,%rsi,8),%esi
-	movl	0(%r14,%rdi,8),%edi
-	movl	0(%r14,%rbp,8),%ebp
-
-	andl	$0x00ff0000,%esi
-	andl	$0x00ff0000,%edi
-	andl	$0x00ff0000,%ebp
-
-	xorl	%esi,%r10d
-	xorl	%edi,%r11d
-	xorl	%ebp,%r12d
-
-	movzbl	%bl,%esi
-	movzbl	%dh,%edi
-	movzbl	%ah,%ebp
-	movl	0(%r14,%rsi,8),%esi
-	movl	2(%r14,%rdi,8),%edi
-	movl	2(%r14,%rbp,8),%ebp
-
-	andl	$0x00ff0000,%esi
-	andl	$0xff000000,%edi
-	andl	$0xff000000,%ebp
-
-	xorl	%esi,%r8d
-	xorl	%edi,%r10d
-	xorl	%ebp,%r11d
-
-	movzbl	%bh,%esi
-	movzbl	%ch,%edi
-	movl	16+12(%r15),%edx
-	movl	2(%r14,%rsi,8),%esi
-	movl	2(%r14,%rdi,8),%edi
-	movl	16+0(%r15),%eax
-
-	andl	$0xff000000,%esi
-	andl	$0xff000000,%edi
-
-	xorl	%esi,%r12d
-	xorl	%edi,%r8d
-
-	movl	16+4(%r15),%ebx
-	movl	16+8(%r15),%ecx
-	xorl	%r10d,%eax
-	xorl	%r11d,%ebx
-	xorl	%r12d,%ecx
-	xorl	%r8d,%edx
-.byte	0xf3,0xc3
-
-
-.p2align	4
-_x86_64_AES_encrypt_compact:
-
-	leaq	128(%r14),%r8
-	movl	0-128(%r8),%edi
-	movl	32-128(%r8),%ebp
-	movl	64-128(%r8),%r10d
-	movl	96-128(%r8),%r11d
-	movl	128-128(%r8),%edi
-	movl	160-128(%r8),%ebp
-	movl	192-128(%r8),%r10d
-	movl	224-128(%r8),%r11d
-	jmp	L$enc_loop_compact
-.p2align	4
-L$enc_loop_compact:
-	xorl	0(%r15),%eax
-	xorl	4(%r15),%ebx
-	xorl	8(%r15),%ecx
-	xorl	12(%r15),%edx
-	leaq	16(%r15),%r15
-	movzbl	%al,%r10d
-	movzbl	%bl,%r11d
-	movzbl	%cl,%r12d
-	movzbl	%dl,%r8d
-	movzbl	%bh,%esi
-	movzbl	%ch,%edi
-	shrl	$16,%ecx
-	movzbl	%dh,%ebp
-	movzbl	(%r14,%r10,1),%r10d
-	movzbl	(%r14,%r11,1),%r11d
-	movzbl	(%r14,%r12,1),%r12d
-	movzbl	(%r14,%r8,1),%r8d
-
-	movzbl	(%r14,%rsi,1),%r9d
-	movzbl	%ah,%esi
-	movzbl	(%r14,%rdi,1),%r13d
-	movzbl	%cl,%edi
-	movzbl	(%r14,%rbp,1),%ebp
-	movzbl	(%r14,%rsi,1),%esi
-
-	shll	$8,%r9d
-	shrl	$16,%edx
-	shll	$8,%r13d
-	xorl	%r9d,%r10d
-	shrl	$16,%eax
-	movzbl	%dl,%r9d
-	shrl	$16,%ebx
-	xorl	%r13d,%r11d
-	shll	$8,%ebp
-	movzbl	%al,%r13d
-	movzbl	(%r14,%rdi,1),%edi
-	xorl	%ebp,%r12d
-
-	shll	$8,%esi
-	movzbl	%bl,%ebp
-	shll	$16,%edi
-	xorl	%esi,%r8d
-	movzbl	(%r14,%r9,1),%r9d
-	movzbl	%dh,%esi
-	movzbl	(%r14,%r13,1),%r13d
-	xorl	%edi,%r10d
-
-	shrl	$8,%ecx
-	movzbl	%ah,%edi
-	shll	$16,%r9d
-	shrl	$8,%ebx
-	shll	$16,%r13d
-	xorl	%r9d,%r11d
-	movzbl	(%r14,%rbp,1),%ebp
-	movzbl	(%r14,%rsi,1),%esi
-	movzbl	(%r14,%rdi,1),%edi
-	movzbl	(%r14,%rcx,1),%edx
-	movzbl	(%r14,%rbx,1),%ecx
-
-	shll	$16,%ebp
-	xorl	%r13d,%r12d
-	shll	$24,%esi
-	xorl	%ebp,%r8d
-	shll	$24,%edi
-	xorl	%esi,%r10d
-	shll	$24,%edx
-	xorl	%edi,%r11d
-	shll	$24,%ecx
-	movl	%r10d,%eax
-	movl	%r11d,%ebx
-	xorl	%r12d,%ecx
-	xorl	%r8d,%edx
-	cmpq	16(%rsp),%r15
-	je	L$enc_compact_done
-	movl	$0x80808080,%r10d
-	movl	$0x80808080,%r11d
-	andl	%eax,%r10d
-	andl	%ebx,%r11d
-	movl	%r10d,%esi
-	movl	%r11d,%edi
-	shrl	$7,%r10d
-	leal	(%rax,%rax,1),%r8d
-	shrl	$7,%r11d
-	leal	(%rbx,%rbx,1),%r9d
-	subl	%r10d,%esi
-	subl	%r11d,%edi
-	andl	$0xfefefefe,%r8d
-	andl	$0xfefefefe,%r9d
-	andl	$0x1b1b1b1b,%esi
-	andl	$0x1b1b1b1b,%edi
-	movl	%eax,%r10d
-	movl	%ebx,%r11d
-	xorl	%esi,%r8d
-	xorl	%edi,%r9d
-
-	xorl	%r8d,%eax
-	xorl	%r9d,%ebx
-	movl	$0x80808080,%r12d
-	roll	$24,%eax
-	movl	$0x80808080,%ebp
-	roll	$24,%ebx
-	andl	%ecx,%r12d
-	andl	%edx,%ebp
-	xorl	%r8d,%eax
-	xorl	%r9d,%ebx
-	movl	%r12d,%esi
-	rorl	$16,%r10d
-	movl	%ebp,%edi
-	rorl	$16,%r11d
-	leal	(%rcx,%rcx,1),%r8d
-	shrl	$7,%r12d
-	xorl	%r10d,%eax
-	shrl	$7,%ebp
-	xorl	%r11d,%ebx
-	rorl	$8,%r10d
-	leal	(%rdx,%rdx,1),%r9d
-	rorl	$8,%r11d
-	subl	%r12d,%esi
-	subl	%ebp,%edi
-	xorl	%r10d,%eax
-	xorl	%r11d,%ebx
-
-	andl	$0xfefefefe,%r8d
-	andl	$0xfefefefe,%r9d
-	andl	$0x1b1b1b1b,%esi
-	andl	$0x1b1b1b1b,%edi
-	movl	%ecx,%r12d
-	movl	%edx,%ebp
-	xorl	%esi,%r8d
-	xorl	%edi,%r9d
-
-	rorl	$16,%r12d
-	xorl	%r8d,%ecx
-	rorl	$16,%ebp
-	xorl	%r9d,%edx
-	roll	$24,%ecx
-	movl	0(%r14),%esi
-	roll	$24,%edx
-	xorl	%r8d,%ecx
-	movl	64(%r14),%edi
-	xorl	%r9d,%edx
-	movl	128(%r14),%r8d
-	xorl	%r12d,%ecx
-	rorl	$8,%r12d
-	xorl	%ebp,%edx
-	rorl	$8,%ebp
-	xorl	%r12d,%ecx
-	movl	192(%r14),%r9d
-	xorl	%ebp,%edx
-	jmp	L$enc_loop_compact
-.p2align	4
-L$enc_compact_done:
-	xorl	0(%r15),%eax
-	xorl	4(%r15),%ebx
-	xorl	8(%r15),%ecx
-	xorl	12(%r15),%edx
-.byte	0xf3,0xc3
-
-
-.globl	_AES_encrypt
-
-.p2align	4
-.globl	_asm_AES_encrypt
-.private_extern	_asm_AES_encrypt
-_asm_AES_encrypt:
-_AES_encrypt:
-
-	movq	%rsp,%rax
-
-	pushq	%rbx
-
-	pushq	%rbp
-
-	pushq	%r12
-
-	pushq	%r13
-
-	pushq	%r14
-
-	pushq	%r15
-
-
-
-	leaq	-63(%rdx),%rcx
-	andq	$-64,%rsp
-	subq	%rsp,%rcx
-	negq	%rcx
-	andq	$0x3c0,%rcx
-	subq	%rcx,%rsp
-	subq	$32,%rsp
-
-	movq	%rsi,16(%rsp)
-	movq	%rax,24(%rsp)
-
-L$enc_prologue:
-
-	movq	%rdx,%r15
-	movl	240(%r15),%r13d
-
-	movl	0(%rdi),%eax
-	movl	4(%rdi),%ebx
-	movl	8(%rdi),%ecx
-	movl	12(%rdi),%edx
-
-	shll	$4,%r13d
-	leaq	(%r15,%r13,1),%rbp
-	movq	%r15,(%rsp)
-	movq	%rbp,8(%rsp)
-
-
-	leaq	L$AES_Te+2048(%rip),%r14
-	leaq	768(%rsp),%rbp
-	subq	%r14,%rbp
-	andq	$0x300,%rbp
-	leaq	(%r14,%rbp,1),%r14
-
-	call	_x86_64_AES_encrypt_compact
-
-	movq	16(%rsp),%r9
-	movq	24(%rsp),%rsi
-
-	movl	%eax,0(%r9)
-	movl	%ebx,4(%r9)
-	movl	%ecx,8(%r9)
-	movl	%edx,12(%r9)
-
-	movq	-48(%rsi),%r15
-
-	movq	-40(%rsi),%r14
-
-	movq	-32(%rsi),%r13
-
-	movq	-24(%rsi),%r12
-
-	movq	-16(%rsi),%rbp
-
-	movq	-8(%rsi),%rbx
-
-	leaq	(%rsi),%rsp
-
-L$enc_epilogue:
-	.byte	0xf3,0xc3
-
-
-
-.p2align	4
-_x86_64_AES_decrypt:
-	xorl	0(%r15),%eax
-	xorl	4(%r15),%ebx
-	xorl	8(%r15),%ecx
-	xorl	12(%r15),%edx
-
-	movl	240(%r15),%r13d
-	subl	$1,%r13d
-	jmp	L$dec_loop
-.p2align	4
-L$dec_loop:
-
-	movzbl	%al,%esi
-	movzbl	%bl,%edi
-	movzbl	%cl,%ebp
-	movl	0(%r14,%rsi,8),%r10d
-	movl	0(%r14,%rdi,8),%r11d
-	movl	0(%r14,%rbp,8),%r12d
-
-	movzbl	%dh,%esi
-	movzbl	%ah,%edi
-	movzbl	%dl,%ebp
-	xorl	3(%r14,%rsi,8),%r10d
-	xorl	3(%r14,%rdi,8),%r11d
-	movl	0(%r14,%rbp,8),%r8d
-
-	movzbl	%bh,%esi
-	shrl	$16,%eax
-	movzbl	%ch,%ebp
-	xorl	3(%r14,%rsi,8),%r12d
-	shrl	$16,%edx
-	xorl	3(%r14,%rbp,8),%r8d
-
-	shrl	$16,%ebx
-	leaq	16(%r15),%r15
-	shrl	$16,%ecx
-
-	movzbl	%cl,%esi
-	movzbl	%dl,%edi
-	movzbl	%al,%ebp
-	xorl	2(%r14,%rsi,8),%r10d
-	xorl	2(%r14,%rdi,8),%r11d
-	xorl	2(%r14,%rbp,8),%r12d
-
-	movzbl	%bh,%esi
-	movzbl	%ch,%edi
-	movzbl	%bl,%ebp
-	xorl	1(%r14,%rsi,8),%r10d
-	xorl	1(%r14,%rdi,8),%r11d
-	xorl	2(%r14,%rbp,8),%r8d
-
-	movzbl	%dh,%esi
-	movl	12(%r15),%edx
-	movzbl	%ah,%ebp
-	xorl	1(%r14,%rsi,8),%r12d
-	movl	0(%r15),%eax
-	xorl	1(%r14,%rbp,8),%r8d
-
-	xorl	%r10d,%eax
-	movl	4(%r15),%ebx
-	movl	8(%r15),%ecx
-	xorl	%r12d,%ecx
-	xorl	%r11d,%ebx
-	xorl	%r8d,%edx
-	subl	$1,%r13d
-	jnz	L$dec_loop
-	leaq	2048(%r14),%r14
-	movzbl	%al,%esi
-	movzbl	%bl,%edi
-	movzbl	%cl,%ebp
-	movzbl	(%r14,%rsi,1),%r10d
-	movzbl	(%r14,%rdi,1),%r11d
-	movzbl	(%r14,%rbp,1),%r12d
-
-	movzbl	%dl,%esi
-	movzbl	%dh,%edi
-	movzbl	%ah,%ebp
-	movzbl	(%r14,%rsi,1),%r8d
-	movzbl	(%r14,%rdi,1),%edi
-	movzbl	(%r14,%rbp,1),%ebp
-
-	shll	$8,%edi
-	shll	$8,%ebp
-
-	xorl	%edi,%r10d
-	xorl	%ebp,%r11d
-	shrl	$16,%edx
-
-	movzbl	%bh,%esi
-	movzbl	%ch,%edi
-	shrl	$16,%eax
-	movzbl	(%r14,%rsi,1),%esi
-	movzbl	(%r14,%rdi,1),%edi
-
-	shll	$8,%esi
-	shll	$8,%edi
-	shrl	$16,%ebx
-	xorl	%esi,%r12d
-	xorl	%edi,%r8d
-	shrl	$16,%ecx
-
-	movzbl	%cl,%esi
-	movzbl	%dl,%edi
-	movzbl	%al,%ebp
-	movzbl	(%r14,%rsi,1),%esi
-	movzbl	(%r14,%rdi,1),%edi
-	movzbl	(%r14,%rbp,1),%ebp
-
-	shll	$16,%esi
-	shll	$16,%edi
-	shll	$16,%ebp
-
-	xorl	%esi,%r10d
-	xorl	%edi,%r11d
-	xorl	%ebp,%r12d
-
-	movzbl	%bl,%esi
-	movzbl	%bh,%edi
-	movzbl	%ch,%ebp
-	movzbl	(%r14,%rsi,1),%esi
-	movzbl	(%r14,%rdi,1),%edi
-	movzbl	(%r14,%rbp,1),%ebp
-
-	shll	$16,%esi
-	shll	$24,%edi
-	shll	$24,%ebp
-
-	xorl	%esi,%r8d
-	xorl	%edi,%r10d
-	xorl	%ebp,%r11d
-
-	movzbl	%dh,%esi
-	movzbl	%ah,%edi
-	movl	16+12(%r15),%edx
-	movzbl	(%r14,%rsi,1),%esi
-	movzbl	(%r14,%rdi,1),%edi
-	movl	16+0(%r15),%eax
-
-	shll	$24,%esi
-	shll	$24,%edi
-
-	xorl	%esi,%r12d
-	xorl	%edi,%r8d
-
-	movl	16+4(%r15),%ebx
-	movl	16+8(%r15),%ecx
-	leaq	-2048(%r14),%r14
-	xorl	%r10d,%eax
-	xorl	%r11d,%ebx
-	xorl	%r12d,%ecx
-	xorl	%r8d,%edx
-.byte	0xf3,0xc3
-
-
-.p2align	4
-_x86_64_AES_decrypt_compact:
-
-	leaq	128(%r14),%r8
-	movl	0-128(%r8),%edi
-	movl	32-128(%r8),%ebp
-	movl	64-128(%r8),%r10d
-	movl	96-128(%r8),%r11d
-	movl	128-128(%r8),%edi
-	movl	160-128(%r8),%ebp
-	movl	192-128(%r8),%r10d
-	movl	224-128(%r8),%r11d
-	jmp	L$dec_loop_compact
-
-.p2align	4
-L$dec_loop_compact:
-	xorl	0(%r15),%eax
-	xorl	4(%r15),%ebx
-	xorl	8(%r15),%ecx
-	xorl	12(%r15),%edx
-	leaq	16(%r15),%r15
-	movzbl	%al,%r10d
-	movzbl	%bl,%r11d
-	movzbl	%cl,%r12d
-	movzbl	%dl,%r8d
-	movzbl	%dh,%esi
-	movzbl	%ah,%edi
-	shrl	$16,%edx
-	movzbl	%bh,%ebp
-	movzbl	(%r14,%r10,1),%r10d
-	movzbl	(%r14,%r11,1),%r11d
-	movzbl	(%r14,%r12,1),%r12d
-	movzbl	(%r14,%r8,1),%r8d
-
-	movzbl	(%r14,%rsi,1),%r9d
-	movzbl	%ch,%esi
-	movzbl	(%r14,%rdi,1),%r13d
-	movzbl	(%r14,%rbp,1),%ebp
-	movzbl	(%r14,%rsi,1),%esi
-
-	shrl	$16,%ecx
-	shll	$8,%r13d
-	shll	$8,%r9d
-	movzbl	%cl,%edi
-	shrl	$16,%eax
-	xorl	%r9d,%r10d
-	shrl	$16,%ebx
-	movzbl	%dl,%r9d
-
-	shll	$8,%ebp
-	xorl	%r13d,%r11d
-	shll	$8,%esi
-	movzbl	%al,%r13d
-	movzbl	(%r14,%rdi,1),%edi
-	xorl	%ebp,%r12d
-	movzbl	%bl,%ebp
-
-	shll	$16,%edi
-	xorl	%esi,%r8d
-	movzbl	(%r14,%r9,1),%r9d
-	movzbl	%bh,%esi
-	movzbl	(%r14,%rbp,1),%ebp
-	xorl	%edi,%r10d
-	movzbl	(%r14,%r13,1),%r13d
-	movzbl	%ch,%edi
-
-	shll	$16,%ebp
-	shll	$16,%r9d
-	shll	$16,%r13d
-	xorl	%ebp,%r8d
-	movzbl	%dh,%ebp
-	xorl	%r9d,%r11d
-	shrl	$8,%eax
-	xorl	%r13d,%r12d
-
-	movzbl	(%r14,%rsi,1),%esi
-	movzbl	(%r14,%rdi,1),%ebx
-	movzbl	(%r14,%rbp,1),%ecx
-	movzbl	(%r14,%rax,1),%edx
-
-	movl	%r10d,%eax
-	shll	$24,%esi
-	shll	$24,%ebx
-	shll	$24,%ecx
-	xorl	%esi,%eax
-	shll	$24,%edx
-	xorl	%r11d,%ebx
-	xorl	%r12d,%ecx
-	xorl	%r8d,%edx
-	cmpq	16(%rsp),%r15
-	je	L$dec_compact_done
-
-	movq	256+0(%r14),%rsi
-	shlq	$32,%rbx
-	shlq	$32,%rdx
-	movq	256+8(%r14),%rdi
-	orq	%rbx,%rax
-	orq	%rdx,%rcx
-	movq	256+16(%r14),%rbp
-	movq	%rsi,%r9
-	movq	%rsi,%r12
-	andq	%rax,%r9
-	andq	%rcx,%r12
-	movq	%r9,%rbx
-	movq	%r12,%rdx
-	shrq	$7,%r9
-	leaq	(%rax,%rax,1),%r8
-	shrq	$7,%r12
-	leaq	(%rcx,%rcx,1),%r11
-	subq	%r9,%rbx
-	subq	%r12,%rdx
-	andq	%rdi,%r8
-	andq	%rdi,%r11
-	andq	%rbp,%rbx
-	andq	%rbp,%rdx
-	xorq	%rbx,%r8
-	xorq	%rdx,%r11
-	movq	%rsi,%r10
-	movq	%rsi,%r13
-
-	andq	%r8,%r10
-	andq	%r11,%r13
-	movq	%r10,%rbx
-	movq	%r13,%rdx
-	shrq	$7,%r10
-	leaq	(%r8,%r8,1),%r9
-	shrq	$7,%r13
-	leaq	(%r11,%r11,1),%r12
-	subq	%r10,%rbx
-	subq	%r13,%rdx
-	andq	%rdi,%r9
-	andq	%rdi,%r12
-	andq	%rbp,%rbx
-	andq	%rbp,%rdx
-	xorq	%rbx,%r9
-	xorq	%rdx,%r12
-	movq	%rsi,%r10
-	movq	%rsi,%r13
-
-	andq	%r9,%r10
-	andq	%r12,%r13
-	movq	%r10,%rbx
-	movq	%r13,%rdx
-	shrq	$7,%r10
-	xorq	%rax,%r8
-	shrq	$7,%r13
-	xorq	%rcx,%r11
-	subq	%r10,%rbx
-	subq	%r13,%rdx
-	leaq	(%r9,%r9,1),%r10
-	leaq	(%r12,%r12,1),%r13
-	xorq	%rax,%r9
-	xorq	%rcx,%r12
-	andq	%rdi,%r10
-	andq	%rdi,%r13
-	andq	%rbp,%rbx
-	andq	%rbp,%rdx
-	xorq	%rbx,%r10
-	xorq	%rdx,%r13
-
-	xorq	%r10,%rax
-	xorq	%r13,%rcx
-	xorq	%r10,%r8
-	xorq	%r13,%r11
-	movq	%rax,%rbx
-	movq	%rcx,%rdx
-	xorq	%r10,%r9
-	shrq	$32,%rbx
-	xorq	%r13,%r12
-	shrq	$32,%rdx
-	xorq	%r8,%r10
-	roll	$8,%eax
-	xorq	%r11,%r13
-	roll	$8,%ecx
-	xorq	%r9,%r10
-	roll	$8,%ebx
-	xorq	%r12,%r13
-
-	roll	$8,%edx
-	xorl	%r10d,%eax
-	shrq	$32,%r10
-	xorl	%r13d,%ecx
-	shrq	$32,%r13
-	xorl	%r10d,%ebx
-	xorl	%r13d,%edx
-
-	movq	%r8,%r10
-	roll	$24,%r8d
-	movq	%r11,%r13
-	roll	$24,%r11d
-	shrq	$32,%r10
-	xorl	%r8d,%eax
-	shrq	$32,%r13
-	xorl	%r11d,%ecx
-	roll	$24,%r10d
-	movq	%r9,%r8
-	roll	$24,%r13d
-	movq	%r12,%r11
-	shrq	$32,%r8
-	xorl	%r10d,%ebx
-	shrq	$32,%r11
-	xorl	%r13d,%edx
-
-	movq	0(%r14),%rsi
-	roll	$16,%r9d
-	movq	64(%r14),%rdi
-	roll	$16,%r12d
-	movq	128(%r14),%rbp
-	roll	$16,%r8d
-	movq	192(%r14),%r10
-	xorl	%r9d,%eax
-	roll	$16,%r11d
-	xorl	%r12d,%ecx
-	movq	256(%r14),%r13
-	xorl	%r8d,%ebx
-	xorl	%r11d,%edx
-	jmp	L$dec_loop_compact
-.p2align	4
-L$dec_compact_done:
-	xorl	0(%r15),%eax
-	xorl	4(%r15),%ebx
-	xorl	8(%r15),%ecx
-	xorl	12(%r15),%edx
-.byte	0xf3,0xc3
-
-
-.globl	_AES_decrypt
-
-.p2align	4
-.globl	_asm_AES_decrypt
-.private_extern	_asm_AES_decrypt
-_asm_AES_decrypt:
-_AES_decrypt:
-
-	movq	%rsp,%rax
-
-	pushq	%rbx
-
-	pushq	%rbp
-
-	pushq	%r12
-
-	pushq	%r13
-
-	pushq	%r14
-
-	pushq	%r15
-
-
-
-	leaq	-63(%rdx),%rcx
-	andq	$-64,%rsp
-	subq	%rsp,%rcx
-	negq	%rcx
-	andq	$0x3c0,%rcx
-	subq	%rcx,%rsp
-	subq	$32,%rsp
-
-	movq	%rsi,16(%rsp)
-	movq	%rax,24(%rsp)
-
-L$dec_prologue:
-
-	movq	%rdx,%r15
-	movl	240(%r15),%r13d
-
-	movl	0(%rdi),%eax
-	movl	4(%rdi),%ebx
-	movl	8(%rdi),%ecx
-	movl	12(%rdi),%edx
-
-	shll	$4,%r13d
-	leaq	(%r15,%r13,1),%rbp
-	movq	%r15,(%rsp)
-	movq	%rbp,8(%rsp)
-
-
-	leaq	L$AES_Td+2048(%rip),%r14
-	leaq	768(%rsp),%rbp
-	subq	%r14,%rbp
-	andq	$0x300,%rbp
-	leaq	(%r14,%rbp,1),%r14
-	shrq	$3,%rbp
-	addq	%rbp,%r14
-
-	call	_x86_64_AES_decrypt_compact
-
-	movq	16(%rsp),%r9
-	movq	24(%rsp),%rsi
-
-	movl	%eax,0(%r9)
-	movl	%ebx,4(%r9)
-	movl	%ecx,8(%r9)
-	movl	%edx,12(%r9)
-
-	movq	-48(%rsi),%r15
-
-	movq	-40(%rsi),%r14
-
-	movq	-32(%rsi),%r13
-
-	movq	-24(%rsi),%r12
-
-	movq	-16(%rsi),%rbp
-
-	movq	-8(%rsi),%rbx
-
-	leaq	(%rsi),%rsp
-
-L$dec_epilogue:
-	.byte	0xf3,0xc3
-
-
-.globl	_AES_set_encrypt_key
-
-.p2align	4
-_AES_set_encrypt_key:
-
-	pushq	%rbx
-
-	pushq	%rbp
-
-	pushq	%r12
-
-	pushq	%r13
-
-	pushq	%r14
-
-	pushq	%r15
-
-	subq	$8,%rsp
-
-L$enc_key_prologue:
-
-	call	_x86_64_AES_set_encrypt_key
-
-	movq	40(%rsp),%rbp
-
-	movq	48(%rsp),%rbx
-
-	addq	$56,%rsp
-
-L$enc_key_epilogue:
-	.byte	0xf3,0xc3
-
-
-
-
-.p2align	4
-_x86_64_AES_set_encrypt_key:
-
-	movl	%esi,%ecx
-	movq	%rdi,%rsi
-	movq	%rdx,%rdi
-
-	testq	$-1,%rsi
-	jz	L$badpointer
-	testq	$-1,%rdi
-	jz	L$badpointer
-
-	leaq	L$AES_Te(%rip),%rbp
-	leaq	2048+128(%rbp),%rbp
-
-
-	movl	0-128(%rbp),%eax
-	movl	32-128(%rbp),%ebx
-	movl	64-128(%rbp),%r8d
-	movl	96-128(%rbp),%edx
-	movl	128-128(%rbp),%eax
-	movl	160-128(%rbp),%ebx
-	movl	192-128(%rbp),%r8d
-	movl	224-128(%rbp),%edx
-
-	cmpl	$128,%ecx
-	je	L$10rounds
-	cmpl	$192,%ecx
-	je	L$12rounds
-	cmpl	$256,%ecx
-	je	L$14rounds
-	movq	$-2,%rax
-	jmp	L$exit
-
-L$10rounds:
-	movq	0(%rsi),%rax
-	movq	8(%rsi),%rdx
-	movq	%rax,0(%rdi)
-	movq	%rdx,8(%rdi)
-
-	shrq	$32,%rdx
-	xorl	%ecx,%ecx
-	jmp	L$10shortcut
-.p2align	2
-L$10loop:
-	movl	0(%rdi),%eax
-	movl	12(%rdi),%edx
-L$10shortcut:
-	movzbl	%dl,%esi
-	movzbl	-128(%rbp,%rsi,1),%ebx
-	movzbl	%dh,%esi
-	shll	$24,%ebx
-	xorl	%ebx,%eax
-
-	movzbl	-128(%rbp,%rsi,1),%ebx
-	shrl	$16,%edx
-	movzbl	%dl,%esi
-	xorl	%ebx,%eax
-
-	movzbl	-128(%rbp,%rsi,1),%ebx
-	movzbl	%dh,%esi
-	shll	$8,%ebx
-	xorl	%ebx,%eax
-
-	movzbl	-128(%rbp,%rsi,1),%ebx
-	shll	$16,%ebx
-	xorl	%ebx,%eax
-
-	xorl	1024-128(%rbp,%rcx,4),%eax
-	movl	%eax,16(%rdi)
-	xorl	4(%rdi),%eax
-	movl	%eax,20(%rdi)
-	xorl	8(%rdi),%eax
-	movl	%eax,24(%rdi)
-	xorl	12(%rdi),%eax
-	movl	%eax,28(%rdi)
-	addl	$1,%ecx
-	leaq	16(%rdi),%rdi
-	cmpl	$10,%ecx
-	jl	L$10loop
-
-	movl	$10,80(%rdi)
-	xorq	%rax,%rax
-	jmp	L$exit
-
-L$12rounds:
-	movq	0(%rsi),%rax
-	movq	8(%rsi),%rbx
-	movq	16(%rsi),%rdx
-	movq	%rax,0(%rdi)
-	movq	%rbx,8(%rdi)
-	movq	%rdx,16(%rdi)
-
-	shrq	$32,%rdx
-	xorl	%ecx,%ecx
-	jmp	L$12shortcut
-.p2align	2
-L$12loop:
-	movl	0(%rdi),%eax
-	movl	20(%rdi),%edx
-L$12shortcut:
-	movzbl	%dl,%esi
-	movzbl	-128(%rbp,%rsi,1),%ebx
-	movzbl	%dh,%esi
-	shll	$24,%ebx
-	xorl	%ebx,%eax
-
-	movzbl	-128(%rbp,%rsi,1),%ebx
-	shrl	$16,%edx
-	movzbl	%dl,%esi
-	xorl	%ebx,%eax
-
-	movzbl	-128(%rbp,%rsi,1),%ebx
-	movzbl	%dh,%esi
-	shll	$8,%ebx
-	xorl	%ebx,%eax
-
-	movzbl	-128(%rbp,%rsi,1),%ebx
-	shll	$16,%ebx
-	xorl	%ebx,%eax
-
-	xorl	1024-128(%rbp,%rcx,4),%eax
-	movl	%eax,24(%rdi)
-	xorl	4(%rdi),%eax
-	movl	%eax,28(%rdi)
-	xorl	8(%rdi),%eax
-	movl	%eax,32(%rdi)
-	xorl	12(%rdi),%eax
-	movl	%eax,36(%rdi)
-
-	cmpl	$7,%ecx
-	je	L$12break
-	addl	$1,%ecx
-
-	xorl	16(%rdi),%eax
-	movl	%eax,40(%rdi)
-	xorl	20(%rdi),%eax
-	movl	%eax,44(%rdi)
-
-	leaq	24(%rdi),%rdi
-	jmp	L$12loop
-L$12break:
-	movl	$12,72(%rdi)
-	xorq	%rax,%rax
-	jmp	L$exit
-
-L$14rounds:
-	movq	0(%rsi),%rax
-	movq	8(%rsi),%rbx
-	movq	16(%rsi),%rcx
-	movq	24(%rsi),%rdx
-	movq	%rax,0(%rdi)
-	movq	%rbx,8(%rdi)
-	movq	%rcx,16(%rdi)
-	movq	%rdx,24(%rdi)
-
-	shrq	$32,%rdx
-	xorl	%ecx,%ecx
-	jmp	L$14shortcut
-.p2align	2
-L$14loop:
-	movl	0(%rdi),%eax
-	movl	28(%rdi),%edx
-L$14shortcut:
-	movzbl	%dl,%esi
-	movzbl	-128(%rbp,%rsi,1),%ebx
-	movzbl	%dh,%esi
-	shll	$24,%ebx
-	xorl	%ebx,%eax
-
-	movzbl	-128(%rbp,%rsi,1),%ebx
-	shrl	$16,%edx
-	movzbl	%dl,%esi
-	xorl	%ebx,%eax
-
-	movzbl	-128(%rbp,%rsi,1),%ebx
-	movzbl	%dh,%esi
-	shll	$8,%ebx
-	xorl	%ebx,%eax
-
-	movzbl	-128(%rbp,%rsi,1),%ebx
-	shll	$16,%ebx
-	xorl	%ebx,%eax
-
-	xorl	1024-128(%rbp,%rcx,4),%eax
-	movl	%eax,32(%rdi)
-	xorl	4(%rdi),%eax
-	movl	%eax,36(%rdi)
-	xorl	8(%rdi),%eax
-	movl	%eax,40(%rdi)
-	xorl	12(%rdi),%eax
-	movl	%eax,44(%rdi)
-
-	cmpl	$6,%ecx
-	je	L$14break
-	addl	$1,%ecx
-
-	movl	%eax,%edx
-	movl	16(%rdi),%eax
-	movzbl	%dl,%esi
-	movzbl	-128(%rbp,%rsi,1),%ebx
-	movzbl	%dh,%esi
-	xorl	%ebx,%eax
-
-	movzbl	-128(%rbp,%rsi,1),%ebx
-	shrl	$16,%edx
-	shll	$8,%ebx
-	movzbl	%dl,%esi
-	xorl	%ebx,%eax
-
-	movzbl	-128(%rbp,%rsi,1),%ebx
-	movzbl	%dh,%esi
-	shll	$16,%ebx
-	xorl	%ebx,%eax
-
-	movzbl	-128(%rbp,%rsi,1),%ebx
-	shll	$24,%ebx
-	xorl	%ebx,%eax
-
-	movl	%eax,48(%rdi)
-	xorl	20(%rdi),%eax
-	movl	%eax,52(%rdi)
-	xorl	24(%rdi),%eax
-	movl	%eax,56(%rdi)
-	xorl	28(%rdi),%eax
-	movl	%eax,60(%rdi)
-
-	leaq	32(%rdi),%rdi
-	jmp	L$14loop
-L$14break:
-	movl	$14,48(%rdi)
-	xorq	%rax,%rax
-	jmp	L$exit
-
-L$badpointer:
-	movq	$-1,%rax
-L$exit:
-.byte	0xf3,0xc3
-
-
-.globl	_AES_set_decrypt_key
-
-.p2align	4
-_AES_set_decrypt_key:
-
-	pushq	%rbx
-
-	pushq	%rbp
-
-	pushq	%r12
-
-	pushq	%r13
-
-	pushq	%r14
-
-	pushq	%r15
-
-	pushq	%rdx
-
-L$dec_key_prologue:
-
-	call	_x86_64_AES_set_encrypt_key
-	movq	(%rsp),%r8
-	cmpl	$0,%eax
-	jne	L$abort
-
-	movl	240(%r8),%r14d
-	xorq	%rdi,%rdi
-	leaq	(%rdi,%r14,4),%rcx
-	movq	%r8,%rsi
-	leaq	(%r8,%rcx,4),%rdi
-.p2align	2
-L$invert:
-	movq	0(%rsi),%rax
-	movq	8(%rsi),%rbx
-	movq	0(%rdi),%rcx
-	movq	8(%rdi),%rdx
-	movq	%rax,0(%rdi)
-	movq	%rbx,8(%rdi)
-	movq	%rcx,0(%rsi)
-	movq	%rdx,8(%rsi)
-	leaq	16(%rsi),%rsi
-	leaq	-16(%rdi),%rdi
-	cmpq	%rsi,%rdi
-	jne	L$invert
-
-	leaq	L$AES_Te+2048+1024(%rip),%rax
-
-	movq	40(%rax),%rsi
-	movq	48(%rax),%rdi
-	movq	56(%rax),%rbp
-
-	movq	%r8,%r15
-	subl	$1,%r14d
-.p2align	2
-L$permute:
-	leaq	16(%r15),%r15
-	movq	0(%r15),%rax
-	movq	8(%r15),%rcx
-	movq	%rsi,%r9
-	movq	%rsi,%r12
-	andq	%rax,%r9
-	andq	%rcx,%r12
-	movq	%r9,%rbx
-	movq	%r12,%rdx
-	shrq	$7,%r9
-	leaq	(%rax,%rax,1),%r8
-	shrq	$7,%r12
-	leaq	(%rcx,%rcx,1),%r11
-	subq	%r9,%rbx
-	subq	%r12,%rdx
-	andq	%rdi,%r8
-	andq	%rdi,%r11
-	andq	%rbp,%rbx
-	andq	%rbp,%rdx
-	xorq	%rbx,%r8
-	xorq	%rdx,%r11
-	movq	%rsi,%r10
-	movq	%rsi,%r13
-
-	andq	%r8,%r10
-	andq	%r11,%r13
-	movq	%r10,%rbx
-	movq	%r13,%rdx
-	shrq	$7,%r10
-	leaq	(%r8,%r8,1),%r9
-	shrq	$7,%r13
-	leaq	(%r11,%r11,1),%r12
-	subq	%r10,%rbx
-	subq	%r13,%rdx
-	andq	%rdi,%r9
-	andq	%rdi,%r12
-	andq	%rbp,%rbx
-	andq	%rbp,%rdx
-	xorq	%rbx,%r9
-	xorq	%rdx,%r12
-	movq	%rsi,%r10
-	movq	%rsi,%r13
-
-	andq	%r9,%r10
-	andq	%r12,%r13
-	movq	%r10,%rbx
-	movq	%r13,%rdx
-	shrq	$7,%r10
-	xorq	%rax,%r8
-	shrq	$7,%r13
-	xorq	%rcx,%r11
-	subq	%r10,%rbx
-	subq	%r13,%rdx
-	leaq	(%r9,%r9,1),%r10
-	leaq	(%r12,%r12,1),%r13
-	xorq	%rax,%r9
-	xorq	%rcx,%r12
-	andq	%rdi,%r10
-	andq	%rdi,%r13
-	andq	%rbp,%rbx
-	andq	%rbp,%rdx
-	xorq	%rbx,%r10
-	xorq	%rdx,%r13
-
-	xorq	%r10,%rax
-	xorq	%r13,%rcx
-	xorq	%r10,%r8
-	xorq	%r13,%r11
-	movq	%rax,%rbx
-	movq	%rcx,%rdx
-	xorq	%r10,%r9
-	shrq	$32,%rbx
-	xorq	%r13,%r12
-	shrq	$32,%rdx
-	xorq	%r8,%r10
-	roll	$8,%eax
-	xorq	%r11,%r13
-	roll	$8,%ecx
-	xorq	%r9,%r10
-	roll	$8,%ebx
-	xorq	%r12,%r13
-
-	roll	$8,%edx
-	xorl	%r10d,%eax
-	shrq	$32,%r10
-	xorl	%r13d,%ecx
-	shrq	$32,%r13
-	xorl	%r10d,%ebx
-	xorl	%r13d,%edx
-
-	movq	%r8,%r10
-	roll	$24,%r8d
-	movq	%r11,%r13
-	roll	$24,%r11d
-	shrq	$32,%r10
-	xorl	%r8d,%eax
-	shrq	$32,%r13
-	xorl	%r11d,%ecx
-	roll	$24,%r10d
-	movq	%r9,%r8
-	roll	$24,%r13d
-	movq	%r12,%r11
-	shrq	$32,%r8
-	xorl	%r10d,%ebx
-	shrq	$32,%r11
-	xorl	%r13d,%edx
-
-
-	roll	$16,%r9d
-
-	roll	$16,%r12d
-
-	roll	$16,%r8d
-
-	xorl	%r9d,%eax
-	roll	$16,%r11d
-	xorl	%r12d,%ecx
-
-	xorl	%r8d,%ebx
-	xorl	%r11d,%edx
-	movl	%eax,0(%r15)
-	movl	%ebx,4(%r15)
-	movl	%ecx,8(%r15)
-	movl	%edx,12(%r15)
-	subl	$1,%r14d
-	jnz	L$permute
-
-	xorq	%rax,%rax
-L$abort:
-	movq	8(%rsp),%r15
-
-	movq	16(%rsp),%r14
-
-	movq	24(%rsp),%r13
-
-	movq	32(%rsp),%r12
-
-	movq	40(%rsp),%rbp
-
-	movq	48(%rsp),%rbx
-
-	addq	$56,%rsp
-
-L$dec_key_epilogue:
-	.byte	0xf3,0xc3
-
-
-.globl	_AES_cbc_encrypt
-
-.p2align	4
-
-.globl	_asm_AES_cbc_encrypt
-.private_extern	_asm_AES_cbc_encrypt
-_asm_AES_cbc_encrypt:
-_AES_cbc_encrypt:
-
-	cmpq	$0,%rdx
-	je	L$cbc_epilogue
-	pushfq
-
-
-
-	pushq	%rbx
-
-	pushq	%rbp
-
-	pushq	%r12
-
-	pushq	%r13
-
-	pushq	%r14
-
-	pushq	%r15
-
-L$cbc_prologue:
-
-	cld
-	movl	%r9d,%r9d
-
-	leaq	L$AES_Te(%rip),%r14
-	leaq	L$AES_Td(%rip),%r10
-	cmpq	$0,%r9
-	cmoveq	%r10,%r14
-
-
-	movl	_OPENSSL_ia32cap_P(%rip),%r10d
-	cmpq	$512,%rdx
-	jb	L$cbc_slow_prologue
-	testq	$15,%rdx
-	jnz	L$cbc_slow_prologue
-	btl	$28,%r10d
-	jc	L$cbc_slow_prologue
-
-
-	leaq	-88-248(%rsp),%r15
-	andq	$-64,%r15
-
-
-	movq	%r14,%r10
-	leaq	2304(%r14),%r11
-	movq	%r15,%r12
-	andq	$0xFFF,%r10
-	andq	$0xFFF,%r11
-	andq	$0xFFF,%r12
-
-	cmpq	%r11,%r12
-	jb	L$cbc_te_break_out
-	subq	%r11,%r12
-	subq	%r12,%r15
-	jmp	L$cbc_te_ok
-L$cbc_te_break_out:
-	subq	%r10,%r12
-	andq	$0xFFF,%r12
-	addq	$320,%r12
-	subq	%r12,%r15
-.p2align	2
-L$cbc_te_ok:
-
-	xchgq	%rsp,%r15
-
-
-	movq	%r15,16(%rsp)
-
-L$cbc_fast_body:
-	movq	%rdi,24(%rsp)
-	movq	%rsi,32(%rsp)
-	movq	%rdx,40(%rsp)
-	movq	%rcx,48(%rsp)
-	movq	%r8,56(%rsp)
-	movl	$0,80+240(%rsp)
-	movq	%r8,%rbp
-	movq	%r9,%rbx
-	movq	%rsi,%r9
-	movq	%rdi,%r8
-	movq	%rcx,%r15
-
-	movl	240(%r15),%eax
-
-	movq	%r15,%r10
-	subq	%r14,%r10
-	andq	$0xfff,%r10
-	cmpq	$2304,%r10
-	jb	L$cbc_do_ecopy
-	cmpq	$4096-248,%r10
-	jb	L$cbc_skip_ecopy
-.p2align	2
-L$cbc_do_ecopy:
-	movq	%r15,%rsi
-	leaq	80(%rsp),%rdi
-	leaq	80(%rsp),%r15
-	movl	$30,%ecx
-.long	0x90A548F3
-	movl	%eax,(%rdi)
-L$cbc_skip_ecopy:
-	movq	%r15,0(%rsp)
-
-	movl	$18,%ecx
-.p2align	2
-L$cbc_prefetch_te:
-	movq	0(%r14),%r10
-	movq	32(%r14),%r11
-	movq	64(%r14),%r12
-	movq	96(%r14),%r13
-	leaq	128(%r14),%r14
-	subl	$1,%ecx
-	jnz	L$cbc_prefetch_te
-	leaq	-2304(%r14),%r14
-
-	cmpq	$0,%rbx
-	je	L$FAST_DECRYPT
-
-
-	movl	0(%rbp),%eax
-	movl	4(%rbp),%ebx
-	movl	8(%rbp),%ecx
-	movl	12(%rbp),%edx
-
-.p2align	2
-L$cbc_fast_enc_loop:
-	xorl	0(%r8),%eax
-	xorl	4(%r8),%ebx
-	xorl	8(%r8),%ecx
-	xorl	12(%r8),%edx
-	movq	0(%rsp),%r15
-	movq	%r8,24(%rsp)
-
-	call	_x86_64_AES_encrypt
-
-	movq	24(%rsp),%r8
-	movq	40(%rsp),%r10
-	movl	%eax,0(%r9)
-	movl	%ebx,4(%r9)
-	movl	%ecx,8(%r9)
-	movl	%edx,12(%r9)
-
-	leaq	16(%r8),%r8
-	leaq	16(%r9),%r9
-	subq	$16,%r10
-	testq	$-16,%r10
-	movq	%r10,40(%rsp)
-	jnz	L$cbc_fast_enc_loop
-	movq	56(%rsp),%rbp
-	movl	%eax,0(%rbp)
-	movl	%ebx,4(%rbp)
-	movl	%ecx,8(%rbp)
-	movl	%edx,12(%rbp)
-
-	jmp	L$cbc_fast_cleanup
-
-
-.p2align	4
-L$FAST_DECRYPT:
-	cmpq	%r8,%r9
-	je	L$cbc_fast_dec_in_place
-
-	movq	%rbp,64(%rsp)
-.p2align	2
-L$cbc_fast_dec_loop:
-	movl	0(%r8),%eax
-	movl	4(%r8),%ebx
-	movl	8(%r8),%ecx
-	movl	12(%r8),%edx
-	movq	0(%rsp),%r15
-	movq	%r8,24(%rsp)
-
-	call	_x86_64_AES_decrypt
-
-	movq	64(%rsp),%rbp
-	movq	24(%rsp),%r8
-	movq	40(%rsp),%r10
-	xorl	0(%rbp),%eax
-	xorl	4(%rbp),%ebx
-	xorl	8(%rbp),%ecx
-	xorl	12(%rbp),%edx
-	movq	%r8,%rbp
-
-	subq	$16,%r10
-	movq	%r10,40(%rsp)
-	movq	%rbp,64(%rsp)
-
-	movl	%eax,0(%r9)
-	movl	%ebx,4(%r9)
-	movl	%ecx,8(%r9)
-	movl	%edx,12(%r9)
-
-	leaq	16(%r8),%r8
-	leaq	16(%r9),%r9
-	jnz	L$cbc_fast_dec_loop
-	movq	56(%rsp),%r12
-	movq	0(%rbp),%r10
-	movq	8(%rbp),%r11
-	movq	%r10,0(%r12)
-	movq	%r11,8(%r12)
-	jmp	L$cbc_fast_cleanup
-
-.p2align	4
-L$cbc_fast_dec_in_place:
-	movq	0(%rbp),%r10
-	movq	8(%rbp),%r11
-	movq	%r10,0+64(%rsp)
-	movq	%r11,8+64(%rsp)
-.p2align	2
-L$cbc_fast_dec_in_place_loop:
-	movl	0(%r8),%eax
-	movl	4(%r8),%ebx
-	movl	8(%r8),%ecx
-	movl	12(%r8),%edx
-	movq	0(%rsp),%r15
-	movq	%r8,24(%rsp)
-
-	call	_x86_64_AES_decrypt
-
-	movq	24(%rsp),%r8
-	movq	40(%rsp),%r10
-	xorl	0+64(%rsp),%eax
-	xorl	4+64(%rsp),%ebx
-	xorl	8+64(%rsp),%ecx
-	xorl	12+64(%rsp),%edx
-
-	movq	0(%r8),%r11
-	movq	8(%r8),%r12
-	subq	$16,%r10
-	jz	L$cbc_fast_dec_in_place_done
-
-	movq	%r11,0+64(%rsp)
-	movq	%r12,8+64(%rsp)
-
-	movl	%eax,0(%r9)
-	movl	%ebx,4(%r9)
-	movl	%ecx,8(%r9)
-	movl	%edx,12(%r9)
-
-	leaq	16(%r8),%r8
-	leaq	16(%r9),%r9
-	movq	%r10,40(%rsp)
-	jmp	L$cbc_fast_dec_in_place_loop
-L$cbc_fast_dec_in_place_done:
-	movq	56(%rsp),%rdi
-	movq	%r11,0(%rdi)
-	movq	%r12,8(%rdi)
-
-	movl	%eax,0(%r9)
-	movl	%ebx,4(%r9)
-	movl	%ecx,8(%r9)
-	movl	%edx,12(%r9)
-
-.p2align	2
-L$cbc_fast_cleanup:
-	cmpl	$0,80+240(%rsp)
-	leaq	80(%rsp),%rdi
-	je	L$cbc_exit
-	movl	$30,%ecx
-	xorq	%rax,%rax
-.long	0x90AB48F3
-
-	jmp	L$cbc_exit
-
-
-.p2align	4
-L$cbc_slow_prologue:
-
-
-	leaq	-88(%rsp),%rbp
-	andq	$-64,%rbp
-
-	leaq	-88-63(%rcx),%r10
-	subq	%rbp,%r10
-	negq	%r10
-	andq	$0x3c0,%r10
-	subq	%r10,%rbp
-
-	xchgq	%rsp,%rbp
-
-
-	movq	%rbp,16(%rsp)
-
-L$cbc_slow_body:
-
-
-
-
-	movq	%r8,56(%rsp)
-	movq	%r8,%rbp
-	movq	%r9,%rbx
-	movq	%rsi,%r9
-	movq	%rdi,%r8
-	movq	%rcx,%r15
-	movq	%rdx,%r10
-
-	movl	240(%r15),%eax
-	movq	%r15,0(%rsp)
-	shll	$4,%eax
-	leaq	(%r15,%rax,1),%rax
-	movq	%rax,8(%rsp)
-
-
-	leaq	2048(%r14),%r14
-	leaq	768-8(%rsp),%rax
-	subq	%r14,%rax
-	andq	$0x300,%rax
-	leaq	(%r14,%rax,1),%r14
-
-	cmpq	$0,%rbx
-	je	L$SLOW_DECRYPT
-
-
-	testq	$-16,%r10
-	movl	0(%rbp),%eax
-	movl	4(%rbp),%ebx
-	movl	8(%rbp),%ecx
-	movl	12(%rbp),%edx
-	jz	L$cbc_slow_enc_tail
-
-.p2align	2
-L$cbc_slow_enc_loop:
-	xorl	0(%r8),%eax
-	xorl	4(%r8),%ebx
-	xorl	8(%r8),%ecx
-	xorl	12(%r8),%edx
-	movq	0(%rsp),%r15
-	movq	%r8,24(%rsp)
-	movq	%r9,32(%rsp)
-	movq	%r10,40(%rsp)
-
-	call	_x86_64_AES_encrypt_compact
-
-	movq	24(%rsp),%r8
-	movq	32(%rsp),%r9
-	movq	40(%rsp),%r10
-	movl	%eax,0(%r9)
-	movl	%ebx,4(%r9)
-	movl	%ecx,8(%r9)
-	movl	%edx,12(%r9)
-
-	leaq	16(%r8),%r8
-	leaq	16(%r9),%r9
-	subq	$16,%r10
-	testq	$-16,%r10
-	jnz	L$cbc_slow_enc_loop
-	testq	$15,%r10
-	jnz	L$cbc_slow_enc_tail
-	movq	56(%rsp),%rbp
-	movl	%eax,0(%rbp)
-	movl	%ebx,4(%rbp)
-	movl	%ecx,8(%rbp)
-	movl	%edx,12(%rbp)
-
-	jmp	L$cbc_exit
-
-.p2align	2
-L$cbc_slow_enc_tail:
-	movq	%rax,%r11
-	movq	%rcx,%r12
-	movq	%r10,%rcx
-	movq	%r8,%rsi
-	movq	%r9,%rdi
-.long	0x9066A4F3
-	movq	$16,%rcx
-	subq	%r10,%rcx
-	xorq	%rax,%rax
-.long	0x9066AAF3
-	movq	%r9,%r8
-	movq	$16,%r10
-	movq	%r11,%rax
-	movq	%r12,%rcx
-	jmp	L$cbc_slow_enc_loop
-
-.p2align	4
-L$SLOW_DECRYPT:
-	shrq	$3,%rax
-	addq	%rax,%r14
-
-	movq	0(%rbp),%r11
-	movq	8(%rbp),%r12
-	movq	%r11,0+64(%rsp)
-	movq	%r12,8+64(%rsp)
-
-.p2align	2
-L$cbc_slow_dec_loop:
-	movl	0(%r8),%eax
-	movl	4(%r8),%ebx
-	movl	8(%r8),%ecx
-	movl	12(%r8),%edx
-	movq	0(%rsp),%r15
-	movq	%r8,24(%rsp)
-	movq	%r9,32(%rsp)
-	movq	%r10,40(%rsp)
-
-	call	_x86_64_AES_decrypt_compact
-
-	movq	24(%rsp),%r8
-	movq	32(%rsp),%r9
-	movq	40(%rsp),%r10
-	xorl	0+64(%rsp),%eax
-	xorl	4+64(%rsp),%ebx
-	xorl	8+64(%rsp),%ecx
-	xorl	12+64(%rsp),%edx
-
-	movq	0(%r8),%r11
-	movq	8(%r8),%r12
-	subq	$16,%r10
-	jc	L$cbc_slow_dec_partial
-	jz	L$cbc_slow_dec_done
-
-	movq	%r11,0+64(%rsp)
-	movq	%r12,8+64(%rsp)
-
-	movl	%eax,0(%r9)
-	movl	%ebx,4(%r9)
-	movl	%ecx,8(%r9)
-	movl	%edx,12(%r9)
-
-	leaq	16(%r8),%r8
-	leaq	16(%r9),%r9
-	jmp	L$cbc_slow_dec_loop
-L$cbc_slow_dec_done:
-	movq	56(%rsp),%rdi
-	movq	%r11,0(%rdi)
-	movq	%r12,8(%rdi)
-
-	movl	%eax,0(%r9)
-	movl	%ebx,4(%r9)
-	movl	%ecx,8(%r9)
-	movl	%edx,12(%r9)
-
-	jmp	L$cbc_exit
-
-.p2align	2
-L$cbc_slow_dec_partial:
-	movq	56(%rsp),%rdi
-	movq	%r11,0(%rdi)
-	movq	%r12,8(%rdi)
-
-	movl	%eax,0+64(%rsp)
-	movl	%ebx,4+64(%rsp)
-	movl	%ecx,8+64(%rsp)
-	movl	%edx,12+64(%rsp)
-
-	movq	%r9,%rdi
-	leaq	64(%rsp),%rsi
-	leaq	16(%r10),%rcx
-.long	0x9066A4F3
-	jmp	L$cbc_exit
-
-.p2align	4
-L$cbc_exit:
-	movq	16(%rsp),%rsi
-
-	movq	(%rsi),%r15
-
-	movq	8(%rsi),%r14
-
-	movq	16(%rsi),%r13
-
-	movq	24(%rsi),%r12
-
-	movq	32(%rsi),%rbp
-
-	movq	40(%rsi),%rbx
-
-	leaq	48(%rsi),%rsp
-
-L$cbc_popfq:
-	popfq
-
-
-
-L$cbc_epilogue:
-	.byte	0xf3,0xc3
-
-
-.p2align	6
-L$AES_Te:
-.long	0xa56363c6,0xa56363c6
-.long	0x847c7cf8,0x847c7cf8
-.long	0x997777ee,0x997777ee
-.long	0x8d7b7bf6,0x8d7b7bf6
-.long	0x0df2f2ff,0x0df2f2ff
-.long	0xbd6b6bd6,0xbd6b6bd6
-.long	0xb16f6fde,0xb16f6fde
-.long	0x54c5c591,0x54c5c591
-.long	0x50303060,0x50303060
-.long	0x03010102,0x03010102
-.long	0xa96767ce,0xa96767ce
-.long	0x7d2b2b56,0x7d2b2b56
-.long	0x19fefee7,0x19fefee7
-.long	0x62d7d7b5,0x62d7d7b5
-.long	0xe6abab4d,0xe6abab4d
-.long	0x9a7676ec,0x9a7676ec
-.long	0x45caca8f,0x45caca8f
-.long	0x9d82821f,0x9d82821f
-.long	0x40c9c989,0x40c9c989
-.long	0x877d7dfa,0x877d7dfa
-.long	0x15fafaef,0x15fafaef
-.long	0xeb5959b2,0xeb5959b2
-.long	0xc947478e,0xc947478e
-.long	0x0bf0f0fb,0x0bf0f0fb
-.long	0xecadad41,0xecadad41
-.long	0x67d4d4b3,0x67d4d4b3
-.long	0xfda2a25f,0xfda2a25f
-.long	0xeaafaf45,0xeaafaf45
-.long	0xbf9c9c23,0xbf9c9c23
-.long	0xf7a4a453,0xf7a4a453
-.long	0x967272e4,0x967272e4
-.long	0x5bc0c09b,0x5bc0c09b
-.long	0xc2b7b775,0xc2b7b775
-.long	0x1cfdfde1,0x1cfdfde1
-.long	0xae93933d,0xae93933d
-.long	0x6a26264c,0x6a26264c
-.long	0x5a36366c,0x5a36366c
-.long	0x413f3f7e,0x413f3f7e
-.long	0x02f7f7f5,0x02f7f7f5
-.long	0x4fcccc83,0x4fcccc83
-.long	0x5c343468,0x5c343468
-.long	0xf4a5a551,0xf4a5a551
-.long	0x34e5e5d1,0x34e5e5d1
-.long	0x08f1f1f9,0x08f1f1f9
-.long	0x937171e2,0x937171e2
-.long	0x73d8d8ab,0x73d8d8ab
-.long	0x53313162,0x53313162
-.long	0x3f15152a,0x3f15152a
-.long	0x0c040408,0x0c040408
-.long	0x52c7c795,0x52c7c795
-.long	0x65232346,0x65232346
-.long	0x5ec3c39d,0x5ec3c39d
-.long	0x28181830,0x28181830
-.long	0xa1969637,0xa1969637
-.long	0x0f05050a,0x0f05050a
-.long	0xb59a9a2f,0xb59a9a2f
-.long	0x0907070e,0x0907070e
-.long	0x36121224,0x36121224
-.long	0x9b80801b,0x9b80801b
-.long	0x3de2e2df,0x3de2e2df
-.long	0x26ebebcd,0x26ebebcd
-.long	0x6927274e,0x6927274e
-.long	0xcdb2b27f,0xcdb2b27f
-.long	0x9f7575ea,0x9f7575ea
-.long	0x1b090912,0x1b090912
-.long	0x9e83831d,0x9e83831d
-.long	0x742c2c58,0x742c2c58
-.long	0x2e1a1a34,0x2e1a1a34
-.long	0x2d1b1b36,0x2d1b1b36
-.long	0xb26e6edc,0xb26e6edc
-.long	0xee5a5ab4,0xee5a5ab4
-.long	0xfba0a05b,0xfba0a05b
-.long	0xf65252a4,0xf65252a4
-.long	0x4d3b3b76,0x4d3b3b76
-.long	0x61d6d6b7,0x61d6d6b7
-.long	0xceb3b37d,0xceb3b37d
-.long	0x7b292952,0x7b292952
-.long	0x3ee3e3dd,0x3ee3e3dd
-.long	0x712f2f5e,0x712f2f5e
-.long	0x97848413,0x97848413
-.long	0xf55353a6,0xf55353a6
-.long	0x68d1d1b9,0x68d1d1b9
-.long	0x00000000,0x00000000
-.long	0x2cededc1,0x2cededc1
-.long	0x60202040,0x60202040
-.long	0x1ffcfce3,0x1ffcfce3
-.long	0xc8b1b179,0xc8b1b179
-.long	0xed5b5bb6,0xed5b5bb6
-.long	0xbe6a6ad4,0xbe6a6ad4
-.long	0x46cbcb8d,0x46cbcb8d
-.long	0xd9bebe67,0xd9bebe67
-.long	0x4b393972,0x4b393972
-.long	0xde4a4a94,0xde4a4a94
-.long	0xd44c4c98,0xd44c4c98
-.long	0xe85858b0,0xe85858b0
-.long	0x4acfcf85,0x4acfcf85
-.long	0x6bd0d0bb,0x6bd0d0bb
-.long	0x2aefefc5,0x2aefefc5
-.long	0xe5aaaa4f,0xe5aaaa4f
-.long	0x16fbfbed,0x16fbfbed
-.long	0xc5434386,0xc5434386
-.long	0xd74d4d9a,0xd74d4d9a
-.long	0x55333366,0x55333366
-.long	0x94858511,0x94858511
-.long	0xcf45458a,0xcf45458a
-.long	0x10f9f9e9,0x10f9f9e9
-.long	0x06020204,0x06020204
-.long	0x817f7ffe,0x817f7ffe
-.long	0xf05050a0,0xf05050a0
-.long	0x443c3c78,0x443c3c78
-.long	0xba9f9f25,0xba9f9f25
-.long	0xe3a8a84b,0xe3a8a84b
-.long	0xf35151a2,0xf35151a2
-.long	0xfea3a35d,0xfea3a35d
-.long	0xc0404080,0xc0404080
-.long	0x8a8f8f05,0x8a8f8f05
-.long	0xad92923f,0xad92923f
-.long	0xbc9d9d21,0xbc9d9d21
-.long	0x48383870,0x48383870
-.long	0x04f5f5f1,0x04f5f5f1
-.long	0xdfbcbc63,0xdfbcbc63
-.long	0xc1b6b677,0xc1b6b677
-.long	0x75dadaaf,0x75dadaaf
-.long	0x63212142,0x63212142
-.long	0x30101020,0x30101020
-.long	0x1affffe5,0x1affffe5
-.long	0x0ef3f3fd,0x0ef3f3fd
-.long	0x6dd2d2bf,0x6dd2d2bf
-.long	0x4ccdcd81,0x4ccdcd81
-.long	0x140c0c18,0x140c0c18
-.long	0x35131326,0x35131326
-.long	0x2fececc3,0x2fececc3
-.long	0xe15f5fbe,0xe15f5fbe
-.long	0xa2979735,0xa2979735
-.long	0xcc444488,0xcc444488
-.long	0x3917172e,0x3917172e
-.long	0x57c4c493,0x57c4c493
-.long	0xf2a7a755,0xf2a7a755
-.long	0x827e7efc,0x827e7efc
-.long	0x473d3d7a,0x473d3d7a
-.long	0xac6464c8,0xac6464c8
-.long	0xe75d5dba,0xe75d5dba
-.long	0x2b191932,0x2b191932
-.long	0x957373e6,0x957373e6
-.long	0xa06060c0,0xa06060c0
-.long	0x98818119,0x98818119
-.long	0xd14f4f9e,0xd14f4f9e
-.long	0x7fdcdca3,0x7fdcdca3
-.long	0x66222244,0x66222244
-.long	0x7e2a2a54,0x7e2a2a54
-.long	0xab90903b,0xab90903b
-.long	0x8388880b,0x8388880b
-.long	0xca46468c,0xca46468c
-.long	0x29eeeec7,0x29eeeec7
-.long	0xd3b8b86b,0xd3b8b86b
-.long	0x3c141428,0x3c141428
-.long	0x79dedea7,0x79dedea7
-.long	0xe25e5ebc,0xe25e5ebc
-.long	0x1d0b0b16,0x1d0b0b16
-.long	0x76dbdbad,0x76dbdbad
-.long	0x3be0e0db,0x3be0e0db
-.long	0x56323264,0x56323264
-.long	0x4e3a3a74,0x4e3a3a74
-.long	0x1e0a0a14,0x1e0a0a14
-.long	0xdb494992,0xdb494992
-.long	0x0a06060c,0x0a06060c
-.long	0x6c242448,0x6c242448
-.long	0xe45c5cb8,0xe45c5cb8
-.long	0x5dc2c29f,0x5dc2c29f
-.long	0x6ed3d3bd,0x6ed3d3bd
-.long	0xefacac43,0xefacac43
-.long	0xa66262c4,0xa66262c4
-.long	0xa8919139,0xa8919139
-.long	0xa4959531,0xa4959531
-.long	0x37e4e4d3,0x37e4e4d3
-.long	0x8b7979f2,0x8b7979f2
-.long	0x32e7e7d5,0x32e7e7d5
-.long	0x43c8c88b,0x43c8c88b
-.long	0x5937376e,0x5937376e
-.long	0xb76d6dda,0xb76d6dda
-.long	0x8c8d8d01,0x8c8d8d01
-.long	0x64d5d5b1,0x64d5d5b1
-.long	0xd24e4e9c,0xd24e4e9c
-.long	0xe0a9a949,0xe0a9a949
-.long	0xb46c6cd8,0xb46c6cd8
-.long	0xfa5656ac,0xfa5656ac
-.long	0x07f4f4f3,0x07f4f4f3
-.long	0x25eaeacf,0x25eaeacf
-.long	0xaf6565ca,0xaf6565ca
-.long	0x8e7a7af4,0x8e7a7af4
-.long	0xe9aeae47,0xe9aeae47
-.long	0x18080810,0x18080810
-.long	0xd5baba6f,0xd5baba6f
-.long	0x887878f0,0x887878f0
-.long	0x6f25254a,0x6f25254a
-.long	0x722e2e5c,0x722e2e5c
-.long	0x241c1c38,0x241c1c38
-.long	0xf1a6a657,0xf1a6a657
-.long	0xc7b4b473,0xc7b4b473
-.long	0x51c6c697,0x51c6c697
-.long	0x23e8e8cb,0x23e8e8cb
-.long	0x7cdddda1,0x7cdddda1
-.long	0x9c7474e8,0x9c7474e8
-.long	0x211f1f3e,0x211f1f3e
-.long	0xdd4b4b96,0xdd4b4b96
-.long	0xdcbdbd61,0xdcbdbd61
-.long	0x868b8b0d,0x868b8b0d
-.long	0x858a8a0f,0x858a8a0f
-.long	0x907070e0,0x907070e0
-.long	0x423e3e7c,0x423e3e7c
-.long	0xc4b5b571,0xc4b5b571
-.long	0xaa6666cc,0xaa6666cc
-.long	0xd8484890,0xd8484890
-.long	0x05030306,0x05030306
-.long	0x01f6f6f7,0x01f6f6f7
-.long	0x120e0e1c,0x120e0e1c
-.long	0xa36161c2,0xa36161c2
-.long	0x5f35356a,0x5f35356a
-.long	0xf95757ae,0xf95757ae
-.long	0xd0b9b969,0xd0b9b969
-.long	0x91868617,0x91868617
-.long	0x58c1c199,0x58c1c199
-.long	0x271d1d3a,0x271d1d3a
-.long	0xb99e9e27,0xb99e9e27
-.long	0x38e1e1d9,0x38e1e1d9
-.long	0x13f8f8eb,0x13f8f8eb
-.long	0xb398982b,0xb398982b
-.long	0x33111122,0x33111122
-.long	0xbb6969d2,0xbb6969d2
-.long	0x70d9d9a9,0x70d9d9a9
-.long	0x898e8e07,0x898e8e07
-.long	0xa7949433,0xa7949433
-.long	0xb69b9b2d,0xb69b9b2d
-.long	0x221e1e3c,0x221e1e3c
-.long	0x92878715,0x92878715
-.long	0x20e9e9c9,0x20e9e9c9
-.long	0x49cece87,0x49cece87
-.long	0xff5555aa,0xff5555aa
-.long	0x78282850,0x78282850
-.long	0x7adfdfa5,0x7adfdfa5
-.long	0x8f8c8c03,0x8f8c8c03
-.long	0xf8a1a159,0xf8a1a159
-.long	0x80898909,0x80898909
-.long	0x170d0d1a,0x170d0d1a
-.long	0xdabfbf65,0xdabfbf65
-.long	0x31e6e6d7,0x31e6e6d7
-.long	0xc6424284,0xc6424284
-.long	0xb86868d0,0xb86868d0
-.long	0xc3414182,0xc3414182
-.long	0xb0999929,0xb0999929
-.long	0x772d2d5a,0x772d2d5a
-.long	0x110f0f1e,0x110f0f1e
-.long	0xcbb0b07b,0xcbb0b07b
-.long	0xfc5454a8,0xfc5454a8
-.long	0xd6bbbb6d,0xd6bbbb6d
-.long	0x3a16162c,0x3a16162c
-.byte	0x63,0x7c,0x77,0x7b,0xf2,0x6b,0x6f,0xc5
-.byte	0x30,0x01,0x67,0x2b,0xfe,0xd7,0xab,0x76
-.byte	0xca,0x82,0xc9,0x7d,0xfa,0x59,0x47,0xf0
-.byte	0xad,0xd4,0xa2,0xaf,0x9c,0xa4,0x72,0xc0
-.byte	0xb7,0xfd,0x93,0x26,0x36,0x3f,0xf7,0xcc
-.byte	0x34,0xa5,0xe5,0xf1,0x71,0xd8,0x31,0x15
-.byte	0x04,0xc7,0x23,0xc3,0x18,0x96,0x05,0x9a
-.byte	0x07,0x12,0x80,0xe2,0xeb,0x27,0xb2,0x75
-.byte	0x09,0x83,0x2c,0x1a,0x1b,0x6e,0x5a,0xa0
-.byte	0x52,0x3b,0xd6,0xb3,0x29,0xe3,0x2f,0x84
-.byte	0x53,0xd1,0x00,0xed,0x20,0xfc,0xb1,0x5b
-.byte	0x6a,0xcb,0xbe,0x39,0x4a,0x4c,0x58,0xcf
-.byte	0xd0,0xef,0xaa,0xfb,0x43,0x4d,0x33,0x85
-.byte	0x45,0xf9,0x02,0x7f,0x50,0x3c,0x9f,0xa8
-.byte	0x51,0xa3,0x40,0x8f,0x92,0x9d,0x38,0xf5
-.byte	0xbc,0xb6,0xda,0x21,0x10,0xff,0xf3,0xd2
-.byte	0xcd,0x0c,0x13,0xec,0x5f,0x97,0x44,0x17
-.byte	0xc4,0xa7,0x7e,0x3d,0x64,0x5d,0x19,0x73
-.byte	0x60,0x81,0x4f,0xdc,0x22,0x2a,0x90,0x88
-.byte	0x46,0xee,0xb8,0x14,0xde,0x5e,0x0b,0xdb
-.byte	0xe0,0x32,0x3a,0x0a,0x49,0x06,0x24,0x5c
-.byte	0xc2,0xd3,0xac,0x62,0x91,0x95,0xe4,0x79
-.byte	0xe7,0xc8,0x37,0x6d,0x8d,0xd5,0x4e,0xa9
-.byte	0x6c,0x56,0xf4,0xea,0x65,0x7a,0xae,0x08
-.byte	0xba,0x78,0x25,0x2e,0x1c,0xa6,0xb4,0xc6
-.byte	0xe8,0xdd,0x74,0x1f,0x4b,0xbd,0x8b,0x8a
-.byte	0x70,0x3e,0xb5,0x66,0x48,0x03,0xf6,0x0e
-.byte	0x61,0x35,0x57,0xb9,0x86,0xc1,0x1d,0x9e
-.byte	0xe1,0xf8,0x98,0x11,0x69,0xd9,0x8e,0x94
-.byte	0x9b,0x1e,0x87,0xe9,0xce,0x55,0x28,0xdf
-.byte	0x8c,0xa1,0x89,0x0d,0xbf,0xe6,0x42,0x68
-.byte	0x41,0x99,0x2d,0x0f,0xb0,0x54,0xbb,0x16
-.byte	0x63,0x7c,0x77,0x7b,0xf2,0x6b,0x6f,0xc5
-.byte	0x30,0x01,0x67,0x2b,0xfe,0xd7,0xab,0x76
-.byte	0xca,0x82,0xc9,0x7d,0xfa,0x59,0x47,0xf0
-.byte	0xad,0xd4,0xa2,0xaf,0x9c,0xa4,0x72,0xc0
-.byte	0xb7,0xfd,0x93,0x26,0x36,0x3f,0xf7,0xcc
-.byte	0x34,0xa5,0xe5,0xf1,0x71,0xd8,0x31,0x15
-.byte	0x04,0xc7,0x23,0xc3,0x18,0x96,0x05,0x9a
-.byte	0x07,0x12,0x80,0xe2,0xeb,0x27,0xb2,0x75
-.byte	0x09,0x83,0x2c,0x1a,0x1b,0x6e,0x5a,0xa0
-.byte	0x52,0x3b,0xd6,0xb3,0x29,0xe3,0x2f,0x84
-.byte	0x53,0xd1,0x00,0xed,0x20,0xfc,0xb1,0x5b
-.byte	0x6a,0xcb,0xbe,0x39,0x4a,0x4c,0x58,0xcf
-.byte	0xd0,0xef,0xaa,0xfb,0x43,0x4d,0x33,0x85
-.byte	0x45,0xf9,0x02,0x7f,0x50,0x3c,0x9f,0xa8
-.byte	0x51,0xa3,0x40,0x8f,0x92,0x9d,0x38,0xf5
-.byte	0xbc,0xb6,0xda,0x21,0x10,0xff,0xf3,0xd2
-.byte	0xcd,0x0c,0x13,0xec,0x5f,0x97,0x44,0x17
-.byte	0xc4,0xa7,0x7e,0x3d,0x64,0x5d,0x19,0x73
-.byte	0x60,0x81,0x4f,0xdc,0x22,0x2a,0x90,0x88
-.byte	0x46,0xee,0xb8,0x14,0xde,0x5e,0x0b,0xdb
-.byte	0xe0,0x32,0x3a,0x0a,0x49,0x06,0x24,0x5c
-.byte	0xc2,0xd3,0xac,0x62,0x91,0x95,0xe4,0x79
-.byte	0xe7,0xc8,0x37,0x6d,0x8d,0xd5,0x4e,0xa9
-.byte	0x6c,0x56,0xf4,0xea,0x65,0x7a,0xae,0x08
-.byte	0xba,0x78,0x25,0x2e,0x1c,0xa6,0xb4,0xc6
-.byte	0xe8,0xdd,0x74,0x1f,0x4b,0xbd,0x8b,0x8a
-.byte	0x70,0x3e,0xb5,0x66,0x48,0x03,0xf6,0x0e
-.byte	0x61,0x35,0x57,0xb9,0x86,0xc1,0x1d,0x9e
-.byte	0xe1,0xf8,0x98,0x11,0x69,0xd9,0x8e,0x94
-.byte	0x9b,0x1e,0x87,0xe9,0xce,0x55,0x28,0xdf
-.byte	0x8c,0xa1,0x89,0x0d,0xbf,0xe6,0x42,0x68
-.byte	0x41,0x99,0x2d,0x0f,0xb0,0x54,0xbb,0x16
-.byte	0x63,0x7c,0x77,0x7b,0xf2,0x6b,0x6f,0xc5
-.byte	0x30,0x01,0x67,0x2b,0xfe,0xd7,0xab,0x76
-.byte	0xca,0x82,0xc9,0x7d,0xfa,0x59,0x47,0xf0
-.byte	0xad,0xd4,0xa2,0xaf,0x9c,0xa4,0x72,0xc0
-.byte	0xb7,0xfd,0x93,0x26,0x36,0x3f,0xf7,0xcc
-.byte	0x34,0xa5,0xe5,0xf1,0x71,0xd8,0x31,0x15
-.byte	0x04,0xc7,0x23,0xc3,0x18,0x96,0x05,0x9a
-.byte	0x07,0x12,0x80,0xe2,0xeb,0x27,0xb2,0x75
-.byte	0x09,0x83,0x2c,0x1a,0x1b,0x6e,0x5a,0xa0
-.byte	0x52,0x3b,0xd6,0xb3,0x29,0xe3,0x2f,0x84
-.byte	0x53,0xd1,0x00,0xed,0x20,0xfc,0xb1,0x5b
-.byte	0x6a,0xcb,0xbe,0x39,0x4a,0x4c,0x58,0xcf
-.byte	0xd0,0xef,0xaa,0xfb,0x43,0x4d,0x33,0x85
-.byte	0x45,0xf9,0x02,0x7f,0x50,0x3c,0x9f,0xa8
-.byte	0x51,0xa3,0x40,0x8f,0x92,0x9d,0x38,0xf5
-.byte	0xbc,0xb6,0xda,0x21,0x10,0xff,0xf3,0xd2
-.byte	0xcd,0x0c,0x13,0xec,0x5f,0x97,0x44,0x17
-.byte	0xc4,0xa7,0x7e,0x3d,0x64,0x5d,0x19,0x73
-.byte	0x60,0x81,0x4f,0xdc,0x22,0x2a,0x90,0x88
-.byte	0x46,0xee,0xb8,0x14,0xde,0x5e,0x0b,0xdb
-.byte	0xe0,0x32,0x3a,0x0a,0x49,0x06,0x24,0x5c
-.byte	0xc2,0xd3,0xac,0x62,0x91,0x95,0xe4,0x79
-.byte	0xe7,0xc8,0x37,0x6d,0x8d,0xd5,0x4e,0xa9
-.byte	0x6c,0x56,0xf4,0xea,0x65,0x7a,0xae,0x08
-.byte	0xba,0x78,0x25,0x2e,0x1c,0xa6,0xb4,0xc6
-.byte	0xe8,0xdd,0x74,0x1f,0x4b,0xbd,0x8b,0x8a
-.byte	0x70,0x3e,0xb5,0x66,0x48,0x03,0xf6,0x0e
-.byte	0x61,0x35,0x57,0xb9,0x86,0xc1,0x1d,0x9e
-.byte	0xe1,0xf8,0x98,0x11,0x69,0xd9,0x8e,0x94
-.byte	0x9b,0x1e,0x87,0xe9,0xce,0x55,0x28,0xdf
-.byte	0x8c,0xa1,0x89,0x0d,0xbf,0xe6,0x42,0x68
-.byte	0x41,0x99,0x2d,0x0f,0xb0,0x54,0xbb,0x16
-.byte	0x63,0x7c,0x77,0x7b,0xf2,0x6b,0x6f,0xc5
-.byte	0x30,0x01,0x67,0x2b,0xfe,0xd7,0xab,0x76
-.byte	0xca,0x82,0xc9,0x7d,0xfa,0x59,0x47,0xf0
-.byte	0xad,0xd4,0xa2,0xaf,0x9c,0xa4,0x72,0xc0
-.byte	0xb7,0xfd,0x93,0x26,0x36,0x3f,0xf7,0xcc
-.byte	0x34,0xa5,0xe5,0xf1,0x71,0xd8,0x31,0x15
-.byte	0x04,0xc7,0x23,0xc3,0x18,0x96,0x05,0x9a
-.byte	0x07,0x12,0x80,0xe2,0xeb,0x27,0xb2,0x75
-.byte	0x09,0x83,0x2c,0x1a,0x1b,0x6e,0x5a,0xa0
-.byte	0x52,0x3b,0xd6,0xb3,0x29,0xe3,0x2f,0x84
-.byte	0x53,0xd1,0x00,0xed,0x20,0xfc,0xb1,0x5b
-.byte	0x6a,0xcb,0xbe,0x39,0x4a,0x4c,0x58,0xcf
-.byte	0xd0,0xef,0xaa,0xfb,0x43,0x4d,0x33,0x85
-.byte	0x45,0xf9,0x02,0x7f,0x50,0x3c,0x9f,0xa8
-.byte	0x51,0xa3,0x40,0x8f,0x92,0x9d,0x38,0xf5
-.byte	0xbc,0xb6,0xda,0x21,0x10,0xff,0xf3,0xd2
-.byte	0xcd,0x0c,0x13,0xec,0x5f,0x97,0x44,0x17
-.byte	0xc4,0xa7,0x7e,0x3d,0x64,0x5d,0x19,0x73
-.byte	0x60,0x81,0x4f,0xdc,0x22,0x2a,0x90,0x88
-.byte	0x46,0xee,0xb8,0x14,0xde,0x5e,0x0b,0xdb
-.byte	0xe0,0x32,0x3a,0x0a,0x49,0x06,0x24,0x5c
-.byte	0xc2,0xd3,0xac,0x62,0x91,0x95,0xe4,0x79
-.byte	0xe7,0xc8,0x37,0x6d,0x8d,0xd5,0x4e,0xa9
-.byte	0x6c,0x56,0xf4,0xea,0x65,0x7a,0xae,0x08
-.byte	0xba,0x78,0x25,0x2e,0x1c,0xa6,0xb4,0xc6
-.byte	0xe8,0xdd,0x74,0x1f,0x4b,0xbd,0x8b,0x8a
-.byte	0x70,0x3e,0xb5,0x66,0x48,0x03,0xf6,0x0e
-.byte	0x61,0x35,0x57,0xb9,0x86,0xc1,0x1d,0x9e
-.byte	0xe1,0xf8,0x98,0x11,0x69,0xd9,0x8e,0x94
-.byte	0x9b,0x1e,0x87,0xe9,0xce,0x55,0x28,0xdf
-.byte	0x8c,0xa1,0x89,0x0d,0xbf,0xe6,0x42,0x68
-.byte	0x41,0x99,0x2d,0x0f,0xb0,0x54,0xbb,0x16
-.long	0x00000001, 0x00000002, 0x00000004, 0x00000008
-.long	0x00000010, 0x00000020, 0x00000040, 0x00000080
-.long	0x0000001b, 0x00000036, 0x80808080, 0x80808080
-.long	0xfefefefe, 0xfefefefe, 0x1b1b1b1b, 0x1b1b1b1b
-.p2align	6
-L$AES_Td:
-.long	0x50a7f451,0x50a7f451
-.long	0x5365417e,0x5365417e
-.long	0xc3a4171a,0xc3a4171a
-.long	0x965e273a,0x965e273a
-.long	0xcb6bab3b,0xcb6bab3b
-.long	0xf1459d1f,0xf1459d1f
-.long	0xab58faac,0xab58faac
-.long	0x9303e34b,0x9303e34b
-.long	0x55fa3020,0x55fa3020
-.long	0xf66d76ad,0xf66d76ad
-.long	0x9176cc88,0x9176cc88
-.long	0x254c02f5,0x254c02f5
-.long	0xfcd7e54f,0xfcd7e54f
-.long	0xd7cb2ac5,0xd7cb2ac5
-.long	0x80443526,0x80443526
-.long	0x8fa362b5,0x8fa362b5
-.long	0x495ab1de,0x495ab1de
-.long	0x671bba25,0x671bba25
-.long	0x980eea45,0x980eea45
-.long	0xe1c0fe5d,0xe1c0fe5d
-.long	0x02752fc3,0x02752fc3
-.long	0x12f04c81,0x12f04c81
-.long	0xa397468d,0xa397468d
-.long	0xc6f9d36b,0xc6f9d36b
-.long	0xe75f8f03,0xe75f8f03
-.long	0x959c9215,0x959c9215
-.long	0xeb7a6dbf,0xeb7a6dbf
-.long	0xda595295,0xda595295
-.long	0x2d83bed4,0x2d83bed4
-.long	0xd3217458,0xd3217458
-.long	0x2969e049,0x2969e049
-.long	0x44c8c98e,0x44c8c98e
-.long	0x6a89c275,0x6a89c275
-.long	0x78798ef4,0x78798ef4
-.long	0x6b3e5899,0x6b3e5899
-.long	0xdd71b927,0xdd71b927
-.long	0xb64fe1be,0xb64fe1be
-.long	0x17ad88f0,0x17ad88f0
-.long	0x66ac20c9,0x66ac20c9
-.long	0xb43ace7d,0xb43ace7d
-.long	0x184adf63,0x184adf63
-.long	0x82311ae5,0x82311ae5
-.long	0x60335197,0x60335197
-.long	0x457f5362,0x457f5362
-.long	0xe07764b1,0xe07764b1
-.long	0x84ae6bbb,0x84ae6bbb
-.long	0x1ca081fe,0x1ca081fe
-.long	0x942b08f9,0x942b08f9
-.long	0x58684870,0x58684870
-.long	0x19fd458f,0x19fd458f
-.long	0x876cde94,0x876cde94
-.long	0xb7f87b52,0xb7f87b52
-.long	0x23d373ab,0x23d373ab
-.long	0xe2024b72,0xe2024b72
-.long	0x578f1fe3,0x578f1fe3
-.long	0x2aab5566,0x2aab5566
-.long	0x0728ebb2,0x0728ebb2
-.long	0x03c2b52f,0x03c2b52f
-.long	0x9a7bc586,0x9a7bc586
-.long	0xa50837d3,0xa50837d3
-.long	0xf2872830,0xf2872830
-.long	0xb2a5bf23,0xb2a5bf23
-.long	0xba6a0302,0xba6a0302
-.long	0x5c8216ed,0x5c8216ed
-.long	0x2b1ccf8a,0x2b1ccf8a
-.long	0x92b479a7,0x92b479a7
-.long	0xf0f207f3,0xf0f207f3
-.long	0xa1e2694e,0xa1e2694e
-.long	0xcdf4da65,0xcdf4da65
-.long	0xd5be0506,0xd5be0506
-.long	0x1f6234d1,0x1f6234d1
-.long	0x8afea6c4,0x8afea6c4
-.long	0x9d532e34,0x9d532e34
-.long	0xa055f3a2,0xa055f3a2
-.long	0x32e18a05,0x32e18a05
-.long	0x75ebf6a4,0x75ebf6a4
-.long	0x39ec830b,0x39ec830b
-.long	0xaaef6040,0xaaef6040
-.long	0x069f715e,0x069f715e
-.long	0x51106ebd,0x51106ebd
-.long	0xf98a213e,0xf98a213e
-.long	0x3d06dd96,0x3d06dd96
-.long	0xae053edd,0xae053edd
-.long	0x46bde64d,0x46bde64d
-.long	0xb58d5491,0xb58d5491
-.long	0x055dc471,0x055dc471
-.long	0x6fd40604,0x6fd40604
-.long	0xff155060,0xff155060
-.long	0x24fb9819,0x24fb9819
-.long	0x97e9bdd6,0x97e9bdd6
-.long	0xcc434089,0xcc434089
-.long	0x779ed967,0x779ed967
-.long	0xbd42e8b0,0xbd42e8b0
-.long	0x888b8907,0x888b8907
-.long	0x385b19e7,0x385b19e7
-.long	0xdbeec879,0xdbeec879
-.long	0x470a7ca1,0x470a7ca1
-.long	0xe90f427c,0xe90f427c
-.long	0xc91e84f8,0xc91e84f8
-.long	0x00000000,0x00000000
-.long	0x83868009,0x83868009
-.long	0x48ed2b32,0x48ed2b32
-.long	0xac70111e,0xac70111e
-.long	0x4e725a6c,0x4e725a6c
-.long	0xfbff0efd,0xfbff0efd
-.long	0x5638850f,0x5638850f
-.long	0x1ed5ae3d,0x1ed5ae3d
-.long	0x27392d36,0x27392d36
-.long	0x64d90f0a,0x64d90f0a
-.long	0x21a65c68,0x21a65c68
-.long	0xd1545b9b,0xd1545b9b
-.long	0x3a2e3624,0x3a2e3624
-.long	0xb1670a0c,0xb1670a0c
-.long	0x0fe75793,0x0fe75793
-.long	0xd296eeb4,0xd296eeb4
-.long	0x9e919b1b,0x9e919b1b
-.long	0x4fc5c080,0x4fc5c080
-.long	0xa220dc61,0xa220dc61
-.long	0x694b775a,0x694b775a
-.long	0x161a121c,0x161a121c
-.long	0x0aba93e2,0x0aba93e2
-.long	0xe52aa0c0,0xe52aa0c0
-.long	0x43e0223c,0x43e0223c
-.long	0x1d171b12,0x1d171b12
-.long	0x0b0d090e,0x0b0d090e
-.long	0xadc78bf2,0xadc78bf2
-.long	0xb9a8b62d,0xb9a8b62d
-.long	0xc8a91e14,0xc8a91e14
-.long	0x8519f157,0x8519f157
-.long	0x4c0775af,0x4c0775af
-.long	0xbbdd99ee,0xbbdd99ee
-.long	0xfd607fa3,0xfd607fa3
-.long	0x9f2601f7,0x9f2601f7
-.long	0xbcf5725c,0xbcf5725c
-.long	0xc53b6644,0xc53b6644
-.long	0x347efb5b,0x347efb5b
-.long	0x7629438b,0x7629438b
-.long	0xdcc623cb,0xdcc623cb
-.long	0x68fcedb6,0x68fcedb6
-.long	0x63f1e4b8,0x63f1e4b8
-.long	0xcadc31d7,0xcadc31d7
-.long	0x10856342,0x10856342
-.long	0x40229713,0x40229713
-.long	0x2011c684,0x2011c684
-.long	0x7d244a85,0x7d244a85
-.long	0xf83dbbd2,0xf83dbbd2
-.long	0x1132f9ae,0x1132f9ae
-.long	0x6da129c7,0x6da129c7
-.long	0x4b2f9e1d,0x4b2f9e1d
-.long	0xf330b2dc,0xf330b2dc
-.long	0xec52860d,0xec52860d
-.long	0xd0e3c177,0xd0e3c177
-.long	0x6c16b32b,0x6c16b32b
-.long	0x99b970a9,0x99b970a9
-.long	0xfa489411,0xfa489411
-.long	0x2264e947,0x2264e947
-.long	0xc48cfca8,0xc48cfca8
-.long	0x1a3ff0a0,0x1a3ff0a0
-.long	0xd82c7d56,0xd82c7d56
-.long	0xef903322,0xef903322
-.long	0xc74e4987,0xc74e4987
-.long	0xc1d138d9,0xc1d138d9
-.long	0xfea2ca8c,0xfea2ca8c
-.long	0x360bd498,0x360bd498
-.long	0xcf81f5a6,0xcf81f5a6
-.long	0x28de7aa5,0x28de7aa5
-.long	0x268eb7da,0x268eb7da
-.long	0xa4bfad3f,0xa4bfad3f
-.long	0xe49d3a2c,0xe49d3a2c
-.long	0x0d927850,0x0d927850
-.long	0x9bcc5f6a,0x9bcc5f6a
-.long	0x62467e54,0x62467e54
-.long	0xc2138df6,0xc2138df6
-.long	0xe8b8d890,0xe8b8d890
-.long	0x5ef7392e,0x5ef7392e
-.long	0xf5afc382,0xf5afc382
-.long	0xbe805d9f,0xbe805d9f
-.long	0x7c93d069,0x7c93d069
-.long	0xa92dd56f,0xa92dd56f
-.long	0xb31225cf,0xb31225cf
-.long	0x3b99acc8,0x3b99acc8
-.long	0xa77d1810,0xa77d1810
-.long	0x6e639ce8,0x6e639ce8
-.long	0x7bbb3bdb,0x7bbb3bdb
-.long	0x097826cd,0x097826cd
-.long	0xf418596e,0xf418596e
-.long	0x01b79aec,0x01b79aec
-.long	0xa89a4f83,0xa89a4f83
-.long	0x656e95e6,0x656e95e6
-.long	0x7ee6ffaa,0x7ee6ffaa
-.long	0x08cfbc21,0x08cfbc21
-.long	0xe6e815ef,0xe6e815ef
-.long	0xd99be7ba,0xd99be7ba
-.long	0xce366f4a,0xce366f4a
-.long	0xd4099fea,0xd4099fea
-.long	0xd67cb029,0xd67cb029
-.long	0xafb2a431,0xafb2a431
-.long	0x31233f2a,0x31233f2a
-.long	0x3094a5c6,0x3094a5c6
-.long	0xc066a235,0xc066a235
-.long	0x37bc4e74,0x37bc4e74
-.long	0xa6ca82fc,0xa6ca82fc
-.long	0xb0d090e0,0xb0d090e0
-.long	0x15d8a733,0x15d8a733
-.long	0x4a9804f1,0x4a9804f1
-.long	0xf7daec41,0xf7daec41
-.long	0x0e50cd7f,0x0e50cd7f
-.long	0x2ff69117,0x2ff69117
-.long	0x8dd64d76,0x8dd64d76
-.long	0x4db0ef43,0x4db0ef43
-.long	0x544daacc,0x544daacc
-.long	0xdf0496e4,0xdf0496e4
-.long	0xe3b5d19e,0xe3b5d19e
-.long	0x1b886a4c,0x1b886a4c
-.long	0xb81f2cc1,0xb81f2cc1
-.long	0x7f516546,0x7f516546
-.long	0x04ea5e9d,0x04ea5e9d
-.long	0x5d358c01,0x5d358c01
-.long	0x737487fa,0x737487fa
-.long	0x2e410bfb,0x2e410bfb
-.long	0x5a1d67b3,0x5a1d67b3
-.long	0x52d2db92,0x52d2db92
-.long	0x335610e9,0x335610e9
-.long	0x1347d66d,0x1347d66d
-.long	0x8c61d79a,0x8c61d79a
-.long	0x7a0ca137,0x7a0ca137
-.long	0x8e14f859,0x8e14f859
-.long	0x893c13eb,0x893c13eb
-.long	0xee27a9ce,0xee27a9ce
-.long	0x35c961b7,0x35c961b7
-.long	0xede51ce1,0xede51ce1
-.long	0x3cb1477a,0x3cb1477a
-.long	0x59dfd29c,0x59dfd29c
-.long	0x3f73f255,0x3f73f255
-.long	0x79ce1418,0x79ce1418
-.long	0xbf37c773,0xbf37c773
-.long	0xeacdf753,0xeacdf753
-.long	0x5baafd5f,0x5baafd5f
-.long	0x146f3ddf,0x146f3ddf
-.long	0x86db4478,0x86db4478
-.long	0x81f3afca,0x81f3afca
-.long	0x3ec468b9,0x3ec468b9
-.long	0x2c342438,0x2c342438
-.long	0x5f40a3c2,0x5f40a3c2
-.long	0x72c31d16,0x72c31d16
-.long	0x0c25e2bc,0x0c25e2bc
-.long	0x8b493c28,0x8b493c28
-.long	0x41950dff,0x41950dff
-.long	0x7101a839,0x7101a839
-.long	0xdeb30c08,0xdeb30c08
-.long	0x9ce4b4d8,0x9ce4b4d8
-.long	0x90c15664,0x90c15664
-.long	0x6184cb7b,0x6184cb7b
-.long	0x70b632d5,0x70b632d5
-.long	0x745c6c48,0x745c6c48
-.long	0x4257b8d0,0x4257b8d0
-.byte	0x52,0x09,0x6a,0xd5,0x30,0x36,0xa5,0x38
-.byte	0xbf,0x40,0xa3,0x9e,0x81,0xf3,0xd7,0xfb
-.byte	0x7c,0xe3,0x39,0x82,0x9b,0x2f,0xff,0x87
-.byte	0x34,0x8e,0x43,0x44,0xc4,0xde,0xe9,0xcb
-.byte	0x54,0x7b,0x94,0x32,0xa6,0xc2,0x23,0x3d
-.byte	0xee,0x4c,0x95,0x0b,0x42,0xfa,0xc3,0x4e
-.byte	0x08,0x2e,0xa1,0x66,0x28,0xd9,0x24,0xb2
-.byte	0x76,0x5b,0xa2,0x49,0x6d,0x8b,0xd1,0x25
-.byte	0x72,0xf8,0xf6,0x64,0x86,0x68,0x98,0x16
-.byte	0xd4,0xa4,0x5c,0xcc,0x5d,0x65,0xb6,0x92
-.byte	0x6c,0x70,0x48,0x50,0xfd,0xed,0xb9,0xda
-.byte	0x5e,0x15,0x46,0x57,0xa7,0x8d,0x9d,0x84
-.byte	0x90,0xd8,0xab,0x00,0x8c,0xbc,0xd3,0x0a
-.byte	0xf7,0xe4,0x58,0x05,0xb8,0xb3,0x45,0x06
-.byte	0xd0,0x2c,0x1e,0x8f,0xca,0x3f,0x0f,0x02
-.byte	0xc1,0xaf,0xbd,0x03,0x01,0x13,0x8a,0x6b
-.byte	0x3a,0x91,0x11,0x41,0x4f,0x67,0xdc,0xea
-.byte	0x97,0xf2,0xcf,0xce,0xf0,0xb4,0xe6,0x73
-.byte	0x96,0xac,0x74,0x22,0xe7,0xad,0x35,0x85
-.byte	0xe2,0xf9,0x37,0xe8,0x1c,0x75,0xdf,0x6e
-.byte	0x47,0xf1,0x1a,0x71,0x1d,0x29,0xc5,0x89
-.byte	0x6f,0xb7,0x62,0x0e,0xaa,0x18,0xbe,0x1b
-.byte	0xfc,0x56,0x3e,0x4b,0xc6,0xd2,0x79,0x20
-.byte	0x9a,0xdb,0xc0,0xfe,0x78,0xcd,0x5a,0xf4
-.byte	0x1f,0xdd,0xa8,0x33,0x88,0x07,0xc7,0x31
-.byte	0xb1,0x12,0x10,0x59,0x27,0x80,0xec,0x5f
-.byte	0x60,0x51,0x7f,0xa9,0x19,0xb5,0x4a,0x0d
-.byte	0x2d,0xe5,0x7a,0x9f,0x93,0xc9,0x9c,0xef
-.byte	0xa0,0xe0,0x3b,0x4d,0xae,0x2a,0xf5,0xb0
-.byte	0xc8,0xeb,0xbb,0x3c,0x83,0x53,0x99,0x61
-.byte	0x17,0x2b,0x04,0x7e,0xba,0x77,0xd6,0x26
-.byte	0xe1,0x69,0x14,0x63,0x55,0x21,0x0c,0x7d
-.long	0x80808080, 0x80808080, 0xfefefefe, 0xfefefefe
-.long	0x1b1b1b1b, 0x1b1b1b1b, 0, 0
-.byte	0x52,0x09,0x6a,0xd5,0x30,0x36,0xa5,0x38
-.byte	0xbf,0x40,0xa3,0x9e,0x81,0xf3,0xd7,0xfb
-.byte	0x7c,0xe3,0x39,0x82,0x9b,0x2f,0xff,0x87
-.byte	0x34,0x8e,0x43,0x44,0xc4,0xde,0xe9,0xcb
-.byte	0x54,0x7b,0x94,0x32,0xa6,0xc2,0x23,0x3d
-.byte	0xee,0x4c,0x95,0x0b,0x42,0xfa,0xc3,0x4e
-.byte	0x08,0x2e,0xa1,0x66,0x28,0xd9,0x24,0xb2
-.byte	0x76,0x5b,0xa2,0x49,0x6d,0x8b,0xd1,0x25
-.byte	0x72,0xf8,0xf6,0x64,0x86,0x68,0x98,0x16
-.byte	0xd4,0xa4,0x5c,0xcc,0x5d,0x65,0xb6,0x92
-.byte	0x6c,0x70,0x48,0x50,0xfd,0xed,0xb9,0xda
-.byte	0x5e,0x15,0x46,0x57,0xa7,0x8d,0x9d,0x84
-.byte	0x90,0xd8,0xab,0x00,0x8c,0xbc,0xd3,0x0a
-.byte	0xf7,0xe4,0x58,0x05,0xb8,0xb3,0x45,0x06
-.byte	0xd0,0x2c,0x1e,0x8f,0xca,0x3f,0x0f,0x02
-.byte	0xc1,0xaf,0xbd,0x03,0x01,0x13,0x8a,0x6b
-.byte	0x3a,0x91,0x11,0x41,0x4f,0x67,0xdc,0xea
-.byte	0x97,0xf2,0xcf,0xce,0xf0,0xb4,0xe6,0x73
-.byte	0x96,0xac,0x74,0x22,0xe7,0xad,0x35,0x85
-.byte	0xe2,0xf9,0x37,0xe8,0x1c,0x75,0xdf,0x6e
-.byte	0x47,0xf1,0x1a,0x71,0x1d,0x29,0xc5,0x89
-.byte	0x6f,0xb7,0x62,0x0e,0xaa,0x18,0xbe,0x1b
-.byte	0xfc,0x56,0x3e,0x4b,0xc6,0xd2,0x79,0x20
-.byte	0x9a,0xdb,0xc0,0xfe,0x78,0xcd,0x5a,0xf4
-.byte	0x1f,0xdd,0xa8,0x33,0x88,0x07,0xc7,0x31
-.byte	0xb1,0x12,0x10,0x59,0x27,0x80,0xec,0x5f
-.byte	0x60,0x51,0x7f,0xa9,0x19,0xb5,0x4a,0x0d
-.byte	0x2d,0xe5,0x7a,0x9f,0x93,0xc9,0x9c,0xef
-.byte	0xa0,0xe0,0x3b,0x4d,0xae,0x2a,0xf5,0xb0
-.byte	0xc8,0xeb,0xbb,0x3c,0x83,0x53,0x99,0x61
-.byte	0x17,0x2b,0x04,0x7e,0xba,0x77,0xd6,0x26
-.byte	0xe1,0x69,0x14,0x63,0x55,0x21,0x0c,0x7d
-.long	0x80808080, 0x80808080, 0xfefefefe, 0xfefefefe
-.long	0x1b1b1b1b, 0x1b1b1b1b, 0, 0
-.byte	0x52,0x09,0x6a,0xd5,0x30,0x36,0xa5,0x38
-.byte	0xbf,0x40,0xa3,0x9e,0x81,0xf3,0xd7,0xfb
-.byte	0x7c,0xe3,0x39,0x82,0x9b,0x2f,0xff,0x87
-.byte	0x34,0x8e,0x43,0x44,0xc4,0xde,0xe9,0xcb
-.byte	0x54,0x7b,0x94,0x32,0xa6,0xc2,0x23,0x3d
-.byte	0xee,0x4c,0x95,0x0b,0x42,0xfa,0xc3,0x4e
-.byte	0x08,0x2e,0xa1,0x66,0x28,0xd9,0x24,0xb2
-.byte	0x76,0x5b,0xa2,0x49,0x6d,0x8b,0xd1,0x25
-.byte	0x72,0xf8,0xf6,0x64,0x86,0x68,0x98,0x16
-.byte	0xd4,0xa4,0x5c,0xcc,0x5d,0x65,0xb6,0x92
-.byte	0x6c,0x70,0x48,0x50,0xfd,0xed,0xb9,0xda
-.byte	0x5e,0x15,0x46,0x57,0xa7,0x8d,0x9d,0x84
-.byte	0x90,0xd8,0xab,0x00,0x8c,0xbc,0xd3,0x0a
-.byte	0xf7,0xe4,0x58,0x05,0xb8,0xb3,0x45,0x06
-.byte	0xd0,0x2c,0x1e,0x8f,0xca,0x3f,0x0f,0x02
-.byte	0xc1,0xaf,0xbd,0x03,0x01,0x13,0x8a,0x6b
-.byte	0x3a,0x91,0x11,0x41,0x4f,0x67,0xdc,0xea
-.byte	0x97,0xf2,0xcf,0xce,0xf0,0xb4,0xe6,0x73
-.byte	0x96,0xac,0x74,0x22,0xe7,0xad,0x35,0x85
-.byte	0xe2,0xf9,0x37,0xe8,0x1c,0x75,0xdf,0x6e
-.byte	0x47,0xf1,0x1a,0x71,0x1d,0x29,0xc5,0x89
-.byte	0x6f,0xb7,0x62,0x0e,0xaa,0x18,0xbe,0x1b
-.byte	0xfc,0x56,0x3e,0x4b,0xc6,0xd2,0x79,0x20
-.byte	0x9a,0xdb,0xc0,0xfe,0x78,0xcd,0x5a,0xf4
-.byte	0x1f,0xdd,0xa8,0x33,0x88,0x07,0xc7,0x31
-.byte	0xb1,0x12,0x10,0x59,0x27,0x80,0xec,0x5f
-.byte	0x60,0x51,0x7f,0xa9,0x19,0xb5,0x4a,0x0d
-.byte	0x2d,0xe5,0x7a,0x9f,0x93,0xc9,0x9c,0xef
-.byte	0xa0,0xe0,0x3b,0x4d,0xae,0x2a,0xf5,0xb0
-.byte	0xc8,0xeb,0xbb,0x3c,0x83,0x53,0x99,0x61
-.byte	0x17,0x2b,0x04,0x7e,0xba,0x77,0xd6,0x26
-.byte	0xe1,0x69,0x14,0x63,0x55,0x21,0x0c,0x7d
-.long	0x80808080, 0x80808080, 0xfefefefe, 0xfefefefe
-.long	0x1b1b1b1b, 0x1b1b1b1b, 0, 0
-.byte	0x52,0x09,0x6a,0xd5,0x30,0x36,0xa5,0x38
-.byte	0xbf,0x40,0xa3,0x9e,0x81,0xf3,0xd7,0xfb
-.byte	0x7c,0xe3,0x39,0x82,0x9b,0x2f,0xff,0x87
-.byte	0x34,0x8e,0x43,0x44,0xc4,0xde,0xe9,0xcb
-.byte	0x54,0x7b,0x94,0x32,0xa6,0xc2,0x23,0x3d
-.byte	0xee,0x4c,0x95,0x0b,0x42,0xfa,0xc3,0x4e
-.byte	0x08,0x2e,0xa1,0x66,0x28,0xd9,0x24,0xb2
-.byte	0x76,0x5b,0xa2,0x49,0x6d,0x8b,0xd1,0x25
-.byte	0x72,0xf8,0xf6,0x64,0x86,0x68,0x98,0x16
-.byte	0xd4,0xa4,0x5c,0xcc,0x5d,0x65,0xb6,0x92
-.byte	0x6c,0x70,0x48,0x50,0xfd,0xed,0xb9,0xda
-.byte	0x5e,0x15,0x46,0x57,0xa7,0x8d,0x9d,0x84
-.byte	0x90,0xd8,0xab,0x00,0x8c,0xbc,0xd3,0x0a
-.byte	0xf7,0xe4,0x58,0x05,0xb8,0xb3,0x45,0x06
-.byte	0xd0,0x2c,0x1e,0x8f,0xca,0x3f,0x0f,0x02
-.byte	0xc1,0xaf,0xbd,0x03,0x01,0x13,0x8a,0x6b
-.byte	0x3a,0x91,0x11,0x41,0x4f,0x67,0xdc,0xea
-.byte	0x97,0xf2,0xcf,0xce,0xf0,0xb4,0xe6,0x73
-.byte	0x96,0xac,0x74,0x22,0xe7,0xad,0x35,0x85
-.byte	0xe2,0xf9,0x37,0xe8,0x1c,0x75,0xdf,0x6e
-.byte	0x47,0xf1,0x1a,0x71,0x1d,0x29,0xc5,0x89
-.byte	0x6f,0xb7,0x62,0x0e,0xaa,0x18,0xbe,0x1b
-.byte	0xfc,0x56,0x3e,0x4b,0xc6,0xd2,0x79,0x20
-.byte	0x9a,0xdb,0xc0,0xfe,0x78,0xcd,0x5a,0xf4
-.byte	0x1f,0xdd,0xa8,0x33,0x88,0x07,0xc7,0x31
-.byte	0xb1,0x12,0x10,0x59,0x27,0x80,0xec,0x5f
-.byte	0x60,0x51,0x7f,0xa9,0x19,0xb5,0x4a,0x0d
-.byte	0x2d,0xe5,0x7a,0x9f,0x93,0xc9,0x9c,0xef
-.byte	0xa0,0xe0,0x3b,0x4d,0xae,0x2a,0xf5,0xb0
-.byte	0xc8,0xeb,0xbb,0x3c,0x83,0x53,0x99,0x61
-.byte	0x17,0x2b,0x04,0x7e,0xba,0x77,0xd6,0x26
-.byte	0xe1,0x69,0x14,0x63,0x55,0x21,0x0c,0x7d
-.long	0x80808080, 0x80808080, 0xfefefefe, 0xfefefefe
-.long	0x1b1b1b1b, 0x1b1b1b1b, 0, 0
-.byte	65,69,83,32,102,111,114,32,120,56,54,95,54,52,44,32,67,82,89,80,84,79,71,65,77,83,32,98,121,32,60,97,112,112,114,111,64,111,112,101,110,115,115,108,46,111,114,103,62,0
-.p2align	6
diff --git a/deps/openssl/config/archs/darwin64-x86_64-cc/asm_avx2/crypto/aes/aesni-sha1-x86_64.s b/deps/openssl/config/archs/darwin64-x86_64-cc/asm_avx2/crypto/aes/aesni-sha1-x86_64.s
index aed8f3a345..738aa6dc53 100644
--- a/deps/openssl/config/archs/darwin64-x86_64-cc/asm_avx2/crypto/aes/aesni-sha1-x86_64.s
+++ b/deps/openssl/config/archs/darwin64-x86_64-cc/asm_avx2/crypto/aes/aesni-sha1-x86_64.s
@@ -6,6 +6,7 @@
 .p2align	5
 _aesni_cbc_sha1_enc:
 
+
 	movl	_OPENSSL_ia32cap_P+0(%rip),%r10d
 	movq	_OPENSSL_ia32cap_P+4(%rip),%r11
 	btq	$61,%r11
@@ -19,6 +20,7 @@ _aesni_cbc_sha1_enc:
 	.byte	0xf3,0xc3
 
 
+
 .p2align	5
 aesni_cbc_sha1_enc_ssse3:
 
@@ -2718,6 +2720,7 @@ K_XX_XX:
 
 .p2align	5
 aesni_cbc_sha1_enc_shaext:
+
 	movq	8(%rsp),%r10
 	movdqu	(%r9),%xmm8
 	movd	16(%r9),%xmm9
diff --git a/deps/openssl/config/archs/darwin64-x86_64-cc/asm_avx2/crypto/aes/aesni-sha256-x86_64.s b/deps/openssl/config/archs/darwin64-x86_64-cc/asm_avx2/crypto/aes/aesni-sha256-x86_64.s
index 28cf0768ca..3aee22c3bc 100644
--- a/deps/openssl/config/archs/darwin64-x86_64-cc/asm_avx2/crypto/aes/aesni-sha256-x86_64.s
+++ b/deps/openssl/config/archs/darwin64-x86_64-cc/asm_avx2/crypto/aes/aesni-sha256-x86_64.s
@@ -5,6 +5,7 @@
 
 .p2align	4
 _aesni_cbc_sha256_enc:
+
 	leaq	_OPENSSL_ia32cap_P(%rip),%r11
 	movl	$1,%eax
 	cmpq	$0,%rdi
@@ -32,6 +33,7 @@ L$probe:
 	.byte	0xf3,0xc3
 
 
+
 .p2align	6
 
 K256:
@@ -2528,7 +2530,15 @@ L$oop_avx2:
 	vmovdqa	%ymm4,0(%rsp)
 	xorl	%r14d,%r14d
 	vmovdqa	%ymm5,32(%rsp)
+
+	movq	120(%rsp),%rsi
+
 	leaq	-64(%rsp),%rsp
+
+
+
+	movq	%rsi,-8(%rsp)
+
 	movl	%ebx,%esi
 	vmovdqa	%ymm6,0(%rsp)
 	xorl	%ecx,%esi
@@ -2542,6 +2552,12 @@ L$avx2_00_47:
 	vmovdqu	(%r13),%xmm9
 	vpinsrq	$0,%r13,%xmm15,%xmm15
 	leaq	-64(%rsp),%rsp
+
+
+	pushq	64-8(%rsp)
+
+	leaq	8(%rsp),%rsp
+
 	vpalignr	$4,%ymm0,%ymm1,%ymm4
 	addl	0+128(%rsp),%r11d
 	andl	%r8d,%r12d
@@ -2816,6 +2832,12 @@ L$avx2_00_47:
 	movl	%r9d,%r12d
 	vmovdqa	%ymm6,32(%rsp)
 	leaq	-64(%rsp),%rsp
+
+
+	pushq	64-8(%rsp)
+
+	leaq	8(%rsp),%rsp
+
 	vpalignr	$4,%ymm2,%ymm3,%ymm4
 	addl	0+128(%rsp),%r11d
 	andl	%r8d,%r12d
@@ -4029,10 +4051,12 @@ L$ower_avx2:
 	jbe	L$oop_avx2
 	leaq	(%rsp),%rbp
 
+
+
+
 L$done_avx2:
-	leaq	(%rbp),%rsp
-	movq	64+32(%rsp),%r8
-	movq	120(%rsp),%rsi
+	movq	64+32(%rbp),%r8
+	movq	64+56(%rbp),%rsi
 
 	vmovdqu	%xmm8,(%r8)
 	vzeroall
@@ -4057,6 +4081,7 @@ L$epilogue_avx2:
 
 .p2align	5
 aesni_cbc_sha256_enc_shaext:
+
 	movq	8(%rsp),%r10
 	leaq	K256+128(%rip),%rax
 	movdqu	(%r9),%xmm1
diff --git a/deps/openssl/config/archs/darwin64-x86_64-cc/asm_avx2/crypto/aes/aesni-x86_64.s b/deps/openssl/config/archs/darwin64-x86_64-cc/asm_avx2/crypto/aes/aesni-x86_64.s
index 6792a530f2..924900d84e 100644
--- a/deps/openssl/config/archs/darwin64-x86_64-cc/asm_avx2/crypto/aes/aesni-x86_64.s
+++ b/deps/openssl/config/archs/darwin64-x86_64-cc/asm_avx2/crypto/aes/aesni-x86_64.s
@@ -861,6 +861,7 @@ L$ecb_ret:
 
 .p2align	4
 _aesni_ccm64_encrypt_blocks:
+
 	movl	240(%rcx),%eax
 	movdqu	(%r8),%xmm6
 	movdqa	L$increment64(%rip),%xmm9
@@ -920,10 +921,12 @@ L$ccm64_enc2_loop:
 	pxor	%xmm6,%xmm6
 	.byte	0xf3,0xc3
 
+
 .globl	_aesni_ccm64_decrypt_blocks
 
 .p2align	4
 _aesni_ccm64_decrypt_blocks:
+
 	movl	240(%rcx),%eax
 	movups	(%r8),%xmm6
 	movdqu	(%r9),%xmm3
@@ -1017,6 +1020,7 @@ L$oop_enc1_6:
 	pxor	%xmm6,%xmm6
 	.byte	0xf3,0xc3
 
+
 .globl	_aesni_ctr32_encrypt_blocks
 
 .p2align	4
@@ -2785,6 +2789,7 @@ L$ocb_enc_epilogue:
 
 .p2align	5
 __ocb_encrypt6:
+
 	pxor	%xmm9,%xmm15
 	movdqu	(%rbx,%r12,1),%xmm11
 	movdqa	%xmm10,%xmm12
@@ -2885,8 +2890,10 @@ L$ocb_enc_loop6:
 
 
 
+
 .p2align	5
 __ocb_encrypt4:
+
 	pxor	%xmm9,%xmm15
 	movdqu	(%rbx,%r12,1),%xmm11
 	movdqa	%xmm10,%xmm12
@@ -2954,8 +2961,10 @@ L$ocb_enc_loop4:
 
 
 
+
 .p2align	5
 __ocb_encrypt1:
+
 	pxor	%xmm15,%xmm7
 	pxor	%xmm9,%xmm7
 	pxor	%xmm2,%xmm8
@@ -2988,6 +2997,7 @@ L$ocb_enc_loop1:
 	.byte	0xf3,0xc3
 
 
+
 .globl	_aesni_ocb_decrypt
 
 .p2align	5
@@ -3223,6 +3233,7 @@ L$ocb_dec_epilogue:
 
 .p2align	5
 __ocb_decrypt6:
+
 	pxor	%xmm9,%xmm15
 	movdqu	(%rbx,%r12,1),%xmm11
 	movdqa	%xmm10,%xmm12
@@ -3317,8 +3328,10 @@ L$ocb_dec_loop6:
 
 
 
+
 .p2align	5
 __ocb_decrypt4:
+
 	pxor	%xmm9,%xmm15
 	movdqu	(%rbx,%r12,1),%xmm11
 	movdqa	%xmm10,%xmm12
@@ -3382,8 +3395,10 @@ L$ocb_dec_loop4:
 
 
 
+
 .p2align	5
 __ocb_decrypt1:
+
 	pxor	%xmm15,%xmm7
 	pxor	%xmm9,%xmm7
 	pxor	%xmm7,%xmm2
@@ -3414,6 +3429,7 @@ L$ocb_dec_loop1:
 .byte	102,15,56,223,215
 	.byte	0xf3,0xc3
 
+
 .globl	_aesni_cbc_encrypt
 
 .p2align	4
@@ -4351,7 +4367,6 @@ L$enc_key_ret:
 	addq	$8,%rsp
 
 	.byte	0xf3,0xc3
-
 L$SEH_end_set_encrypt_key:
 
 .p2align	4
@@ -4424,6 +4439,7 @@ L$key_expansion_256b:
 	.byte	0xf3,0xc3
 
 
+
 .p2align	6
 L$bswap_mask:
 .byte	15,14,13,12,11,10,9,8,7,6,5,4,3,2,1,0
diff --git a/deps/openssl/config/archs/darwin64-x86_64-cc/asm_avx2/crypto/aes/bsaes-x86_64.s b/deps/openssl/config/archs/darwin64-x86_64-cc/asm_avx2/crypto/aes/bsaes-x86_64.s
deleted file mode 100644
index 2fefb75ac3..0000000000
--- a/deps/openssl/config/archs/darwin64-x86_64-cc/asm_avx2/crypto/aes/bsaes-x86_64.s
+++ /dev/null
@@ -1,2571 +0,0 @@
-.text	
-
-
-
-
-
-.p2align	6
-_bsaes_encrypt8:
-
-	leaq	L$BS0(%rip),%r11
-
-	movdqa	(%rax),%xmm8
-	leaq	16(%rax),%rax
-	movdqa	80(%r11),%xmm7
-	pxor	%xmm8,%xmm15
-	pxor	%xmm8,%xmm0
-	pxor	%xmm8,%xmm1
-	pxor	%xmm8,%xmm2
-.byte	102,68,15,56,0,255
-.byte	102,15,56,0,199
-	pxor	%xmm8,%xmm3
-	pxor	%xmm8,%xmm4
-.byte	102,15,56,0,207
-.byte	102,15,56,0,215
-	pxor	%xmm8,%xmm5
-	pxor	%xmm8,%xmm6
-.byte	102,15,56,0,223
-.byte	102,15,56,0,231
-.byte	102,15,56,0,239
-.byte	102,15,56,0,247
-_bsaes_encrypt8_bitslice:
-	movdqa	0(%r11),%xmm7
-	movdqa	16(%r11),%xmm8
-	movdqa	%xmm5,%xmm9
-	psrlq	$1,%xmm5
-	movdqa	%xmm3,%xmm10
-	psrlq	$1,%xmm3
-	pxor	%xmm6,%xmm5
-	pxor	%xmm4,%xmm3
-	pand	%xmm7,%xmm5
-	pand	%xmm7,%xmm3
-	pxor	%xmm5,%xmm6
-	psllq	$1,%xmm5
-	pxor	%xmm3,%xmm4
-	psllq	$1,%xmm3
-	pxor	%xmm9,%xmm5
-	pxor	%xmm10,%xmm3
-	movdqa	%xmm1,%xmm9
-	psrlq	$1,%xmm1
-	movdqa	%xmm15,%xmm10
-	psrlq	$1,%xmm15
-	pxor	%xmm2,%xmm1
-	pxor	%xmm0,%xmm15
-	pand	%xmm7,%xmm1
-	pand	%xmm7,%xmm15
-	pxor	%xmm1,%xmm2
-	psllq	$1,%xmm1
-	pxor	%xmm15,%xmm0
-	psllq	$1,%xmm15
-	pxor	%xmm9,%xmm1
-	pxor	%xmm10,%xmm15
-	movdqa	32(%r11),%xmm7
-	movdqa	%xmm4,%xmm9
-	psrlq	$2,%xmm4
-	movdqa	%xmm3,%xmm10
-	psrlq	$2,%xmm3
-	pxor	%xmm6,%xmm4
-	pxor	%xmm5,%xmm3
-	pand	%xmm8,%xmm4
-	pand	%xmm8,%xmm3
-	pxor	%xmm4,%xmm6
-	psllq	$2,%xmm4
-	pxor	%xmm3,%xmm5
-	psllq	$2,%xmm3
-	pxor	%xmm9,%xmm4
-	pxor	%xmm10,%xmm3
-	movdqa	%xmm0,%xmm9
-	psrlq	$2,%xmm0
-	movdqa	%xmm15,%xmm10
-	psrlq	$2,%xmm15
-	pxor	%xmm2,%xmm0
-	pxor	%xmm1,%xmm15
-	pand	%xmm8,%xmm0
-	pand	%xmm8,%xmm15
-	pxor	%xmm0,%xmm2
-	psllq	$2,%xmm0
-	pxor	%xmm15,%xmm1
-	psllq	$2,%xmm15
-	pxor	%xmm9,%xmm0
-	pxor	%xmm10,%xmm15
-	movdqa	%xmm2,%xmm9
-	psrlq	$4,%xmm2
-	movdqa	%xmm1,%xmm10
-	psrlq	$4,%xmm1
-	pxor	%xmm6,%xmm2
-	pxor	%xmm5,%xmm1
-	pand	%xmm7,%xmm2
-	pand	%xmm7,%xmm1
-	pxor	%xmm2,%xmm6
-	psllq	$4,%xmm2
-	pxor	%xmm1,%xmm5
-	psllq	$4,%xmm1
-	pxor	%xmm9,%xmm2
-	pxor	%xmm10,%xmm1
-	movdqa	%xmm0,%xmm9
-	psrlq	$4,%xmm0
-	movdqa	%xmm15,%xmm10
-	psrlq	$4,%xmm15
-	pxor	%xmm4,%xmm0
-	pxor	%xmm3,%xmm15
-	pand	%xmm7,%xmm0
-	pand	%xmm7,%xmm15
-	pxor	%xmm0,%xmm4
-	psllq	$4,%xmm0
-	pxor	%xmm15,%xmm3
-	psllq	$4,%xmm15
-	pxor	%xmm9,%xmm0
-	pxor	%xmm10,%xmm15
-	decl	%r10d
-	jmp	L$enc_sbox
-.p2align	4
-L$enc_loop:
-	pxor	0(%rax),%xmm15
-	pxor	16(%rax),%xmm0
-	pxor	32(%rax),%xmm1
-	pxor	48(%rax),%xmm2
-.byte	102,68,15,56,0,255
-.byte	102,15,56,0,199
-	pxor	64(%rax),%xmm3
-	pxor	80(%rax),%xmm4
-.byte	102,15,56,0,207
-.byte	102,15,56,0,215
-	pxor	96(%rax),%xmm5
-	pxor	112(%rax),%xmm6
-.byte	102,15,56,0,223
-.byte	102,15,56,0,231
-.byte	102,15,56,0,239
-.byte	102,15,56,0,247
-	leaq	128(%rax),%rax
-L$enc_sbox:
-	pxor	%xmm5,%xmm4
-	pxor	%xmm0,%xmm1
-	pxor	%xmm15,%xmm2
-	pxor	%xmm1,%xmm5
-	pxor	%xmm15,%xmm4
-
-	pxor	%xmm2,%xmm5
-	pxor	%xmm6,%xmm2
-	pxor	%xmm4,%xmm6
-	pxor	%xmm3,%xmm2
-	pxor	%xmm4,%xmm3
-	pxor	%xmm0,%xmm2
-
-	pxor	%xmm6,%xmm1
-	pxor	%xmm4,%xmm0
-	movdqa	%xmm6,%xmm10
-	movdqa	%xmm0,%xmm9
-	movdqa	%xmm4,%xmm8
-	movdqa	%xmm1,%xmm12
-	movdqa	%xmm5,%xmm11
-
-	pxor	%xmm3,%xmm10
-	pxor	%xmm1,%xmm9
-	pxor	%xmm2,%xmm8
-	movdqa	%xmm10,%xmm13
-	pxor	%xmm3,%xmm12
-	movdqa	%xmm9,%xmm7
-	pxor	%xmm15,%xmm11
-	movdqa	%xmm10,%xmm14
-
-	por	%xmm8,%xmm9
-	por	%xmm11,%xmm10
-	pxor	%xmm7,%xmm14
-	pand	%xmm11,%xmm13
-	pxor	%xmm8,%xmm11
-	pand	%xmm8,%xmm7
-	pand	%xmm11,%xmm14
-	movdqa	%xmm2,%xmm11
-	pxor	%xmm15,%xmm11
-	pand	%xmm11,%xmm12
-	pxor	%xmm12,%xmm10
-	pxor	%xmm12,%xmm9
-	movdqa	%xmm6,%xmm12
-	movdqa	%xmm4,%xmm11
-	pxor	%xmm0,%xmm12
-	pxor	%xmm5,%xmm11
-	movdqa	%xmm12,%xmm8
-	pand	%xmm11,%xmm12
-	por	%xmm11,%xmm8
-	pxor	%xmm12,%xmm7
-	pxor	%xmm14,%xmm10
-	pxor	%xmm13,%xmm9
-	pxor	%xmm14,%xmm8
-	movdqa	%xmm1,%xmm11
-	pxor	%xmm13,%xmm7
-	movdqa	%xmm3,%xmm12
-	pxor	%xmm13,%xmm8
-	movdqa	%xmm0,%xmm13
-	pand	%xmm2,%xmm11
-	movdqa	%xmm6,%xmm14
-	pand	%xmm15,%xmm12
-	pand	%xmm4,%xmm13
-	por	%xmm5,%xmm14
-	pxor	%xmm11,%xmm10
-	pxor	%xmm12,%xmm9
-	pxor	%xmm13,%xmm8
-	pxor	%xmm14,%xmm7
-
-
-
-
-
-	movdqa	%xmm10,%xmm11
-	pand	%xmm8,%xmm10
-	pxor	%xmm9,%xmm11
-
-	movdqa	%xmm7,%xmm13
-	movdqa	%xmm11,%xmm14
-	pxor	%xmm10,%xmm13
-	pand	%xmm13,%xmm14
-
-	movdqa	%xmm8,%xmm12
-	pxor	%xmm9,%xmm14
-	pxor	%xmm7,%xmm12
-
-	pxor	%xmm9,%xmm10
-
-	pand	%xmm10,%xmm12
-
-	movdqa	%xmm13,%xmm9
-	pxor	%xmm7,%xmm12
-
-	pxor	%xmm12,%xmm9
-	pxor	%xmm12,%xmm8
-
-	pand	%xmm7,%xmm9
-
-	pxor	%xmm9,%xmm13
-	pxor	%xmm9,%xmm8
-
-	pand	%xmm14,%xmm13
-
-	pxor	%xmm11,%xmm13
-	movdqa	%xmm5,%xmm11
-	movdqa	%xmm4,%xmm7
-	movdqa	%xmm14,%xmm9
-	pxor	%xmm13,%xmm9
-	pand	%xmm5,%xmm9
-	pxor	%xmm4,%xmm5
-	pand	%xmm14,%xmm4
-	pand	%xmm13,%xmm5
-	pxor	%xmm4,%xmm5
-	pxor	%xmm9,%xmm4
-	pxor	%xmm15,%xmm11
-	pxor	%xmm2,%xmm7
-	pxor	%xmm12,%xmm14
-	pxor	%xmm8,%xmm13
-	movdqa	%xmm14,%xmm10
-	movdqa	%xmm12,%xmm9
-	pxor	%xmm13,%xmm10
-	pxor	%xmm8,%xmm9
-	pand	%xmm11,%xmm10
-	pand	%xmm15,%xmm9
-	pxor	%xmm7,%xmm11
-	pxor	%xmm2,%xmm15
-	pand	%xmm14,%xmm7
-	pand	%xmm12,%xmm2
-	pand	%xmm13,%xmm11
-	pand	%xmm8,%xmm15
-	pxor	%xmm11,%xmm7
-	pxor	%xmm2,%xmm15
-	pxor	%xmm10,%xmm11
-	pxor	%xmm9,%xmm2
-	pxor	%xmm11,%xmm5
-	pxor	%xmm11,%xmm15
-	pxor	%xmm7,%xmm4
-	pxor	%xmm7,%xmm2
-
-	movdqa	%xmm6,%xmm11
-	movdqa	%xmm0,%xmm7
-	pxor	%xmm3,%xmm11
-	pxor	%xmm1,%xmm7
-	movdqa	%xmm14,%xmm10
-	movdqa	%xmm12,%xmm9
-	pxor	%xmm13,%xmm10
-	pxor	%xmm8,%xmm9
-	pand	%xmm11,%xmm10
-	pand	%xmm3,%xmm9
-	pxor	%xmm7,%xmm11
-	pxor	%xmm1,%xmm3
-	pand	%xmm14,%xmm7
-	pand	%xmm12,%xmm1
-	pand	%xmm13,%xmm11
-	pand	%xmm8,%xmm3
-	pxor	%xmm11,%xmm7
-	pxor	%xmm1,%xmm3
-	pxor	%xmm10,%xmm11
-	pxor	%xmm9,%xmm1
-	pxor	%xmm12,%xmm14
-	pxor	%xmm8,%xmm13
-	movdqa	%xmm14,%xmm10
-	pxor	%xmm13,%xmm10
-	pand	%xmm6,%xmm10
-	pxor	%xmm0,%xmm6
-	pand	%xmm14,%xmm0
-	pand	%xmm13,%xmm6
-	pxor	%xmm0,%xmm6
-	pxor	%xmm10,%xmm0
-	pxor	%xmm11,%xmm6
-	pxor	%xmm11,%xmm3
-	pxor	%xmm7,%xmm0
-	pxor	%xmm7,%xmm1
-	pxor	%xmm15,%xmm6
-	pxor	%xmm5,%xmm0
-	pxor	%xmm6,%xmm3
-	pxor	%xmm15,%xmm5
-	pxor	%xmm0,%xmm15
-
-	pxor	%xmm4,%xmm0
-	pxor	%xmm1,%xmm4
-	pxor	%xmm2,%xmm1
-	pxor	%xmm4,%xmm2
-	pxor	%xmm4,%xmm3
-
-	pxor	%xmm2,%xmm5
-	decl	%r10d
-	jl	L$enc_done
-	pshufd	$0x93,%xmm15,%xmm7
-	pshufd	$0x93,%xmm0,%xmm8
-	pxor	%xmm7,%xmm15
-	pshufd	$0x93,%xmm3,%xmm9
-	pxor	%xmm8,%xmm0
-	pshufd	$0x93,%xmm5,%xmm10
-	pxor	%xmm9,%xmm3
-	pshufd	$0x93,%xmm2,%xmm11
-	pxor	%xmm10,%xmm5
-	pshufd	$0x93,%xmm6,%xmm12
-	pxor	%xmm11,%xmm2
-	pshufd	$0x93,%xmm1,%xmm13
-	pxor	%xmm12,%xmm6
-	pshufd	$0x93,%xmm4,%xmm14
-	pxor	%xmm13,%xmm1
-	pxor	%xmm14,%xmm4
-
-	pxor	%xmm15,%xmm8
-	pxor	%xmm4,%xmm7
-	pxor	%xmm4,%xmm8
-	pshufd	$0x4E,%xmm15,%xmm15
-	pxor	%xmm0,%xmm9
-	pshufd	$0x4E,%xmm0,%xmm0
-	pxor	%xmm2,%xmm12
-	pxor	%xmm7,%xmm15
-	pxor	%xmm6,%xmm13
-	pxor	%xmm8,%xmm0
-	pxor	%xmm5,%xmm11
-	pshufd	$0x4E,%xmm2,%xmm7
-	pxor	%xmm1,%xmm14
-	pshufd	$0x4E,%xmm6,%xmm8
-	pxor	%xmm3,%xmm10
-	pshufd	$0x4E,%xmm5,%xmm2
-	pxor	%xmm4,%xmm10
-	pshufd	$0x4E,%xmm4,%xmm6
-	pxor	%xmm4,%xmm11
-	pshufd	$0x4E,%xmm1,%xmm5
-	pxor	%xmm11,%xmm7
-	pshufd	$0x4E,%xmm3,%xmm1
-	pxor	%xmm12,%xmm8
-	pxor	%xmm10,%xmm2
-	pxor	%xmm14,%xmm6
-	pxor	%xmm13,%xmm5
-	movdqa	%xmm7,%xmm3
-	pxor	%xmm9,%xmm1
-	movdqa	%xmm8,%xmm4
-	movdqa	48(%r11),%xmm7
-	jnz	L$enc_loop
-	movdqa	64(%r11),%xmm7
-	jmp	L$enc_loop
-.p2align	4
-L$enc_done:
-	movdqa	0(%r11),%xmm7
-	movdqa	16(%r11),%xmm8
-	movdqa	%xmm1,%xmm9
-	psrlq	$1,%xmm1
-	movdqa	%xmm2,%xmm10
-	psrlq	$1,%xmm2
-	pxor	%xmm4,%xmm1
-	pxor	%xmm6,%xmm2
-	pand	%xmm7,%xmm1
-	pand	%xmm7,%xmm2
-	pxor	%xmm1,%xmm4
-	psllq	$1,%xmm1
-	pxor	%xmm2,%xmm6
-	psllq	$1,%xmm2
-	pxor	%xmm9,%xmm1
-	pxor	%xmm10,%xmm2
-	movdqa	%xmm3,%xmm9
-	psrlq	$1,%xmm3
-	movdqa	%xmm15,%xmm10
-	psrlq	$1,%xmm15
-	pxor	%xmm5,%xmm3
-	pxor	%xmm0,%xmm15
-	pand	%xmm7,%xmm3
-	pand	%xmm7,%xmm15
-	pxor	%xmm3,%xmm5
-	psllq	$1,%xmm3
-	pxor	%xmm15,%xmm0
-	psllq	$1,%xmm15
-	pxor	%xmm9,%xmm3
-	pxor	%xmm10,%xmm15
-	movdqa	32(%r11),%xmm7
-	movdqa	%xmm6,%xmm9
-	psrlq	$2,%xmm6
-	movdqa	%xmm2,%xmm10
-	psrlq	$2,%xmm2
-	pxor	%xmm4,%xmm6
-	pxor	%xmm1,%xmm2
-	pand	%xmm8,%xmm6
-	pand	%xmm8,%xmm2
-	pxor	%xmm6,%xmm4
-	psllq	$2,%xmm6
-	pxor	%xmm2,%xmm1
-	psllq	$2,%xmm2
-	pxor	%xmm9,%xmm6
-	pxor	%xmm10,%xmm2
-	movdqa	%xmm0,%xmm9
-	psrlq	$2,%xmm0
-	movdqa	%xmm15,%xmm10
-	psrlq	$2,%xmm15
-	pxor	%xmm5,%xmm0
-	pxor	%xmm3,%xmm15
-	pand	%xmm8,%xmm0
-	pand	%xmm8,%xmm15
-	pxor	%xmm0,%xmm5
-	psllq	$2,%xmm0
-	pxor	%xmm15,%xmm3
-	psllq	$2,%xmm15
-	pxor	%xmm9,%xmm0
-	pxor	%xmm10,%xmm15
-	movdqa	%xmm5,%xmm9
-	psrlq	$4,%xmm5
-	movdqa	%xmm3,%xmm10
-	psrlq	$4,%xmm3
-	pxor	%xmm4,%xmm5
-	pxor	%xmm1,%xmm3
-	pand	%xmm7,%xmm5
-	pand	%xmm7,%xmm3
-	pxor	%xmm5,%xmm4
-	psllq	$4,%xmm5
-	pxor	%xmm3,%xmm1
-	psllq	$4,%xmm3
-	pxor	%xmm9,%xmm5
-	pxor	%xmm10,%xmm3
-	movdqa	%xmm0,%xmm9
-	psrlq	$4,%xmm0
-	movdqa	%xmm15,%xmm10
-	psrlq	$4,%xmm15
-	pxor	%xmm6,%xmm0
-	pxor	%xmm2,%xmm15
-	pand	%xmm7,%xmm0
-	pand	%xmm7,%xmm15
-	pxor	%xmm0,%xmm6
-	psllq	$4,%xmm0
-	pxor	%xmm15,%xmm2
-	psllq	$4,%xmm15
-	pxor	%xmm9,%xmm0
-	pxor	%xmm10,%xmm15
-	movdqa	(%rax),%xmm7
-	pxor	%xmm7,%xmm3
-	pxor	%xmm7,%xmm5
-	pxor	%xmm7,%xmm2
-	pxor	%xmm7,%xmm6
-	pxor	%xmm7,%xmm1
-	pxor	%xmm7,%xmm4
-	pxor	%xmm7,%xmm15
-	pxor	%xmm7,%xmm0
-	.byte	0xf3,0xc3
-
-
-
-
-.p2align	6
-_bsaes_decrypt8:
-
-	leaq	L$BS0(%rip),%r11
-
-	movdqa	(%rax),%xmm8
-	leaq	16(%rax),%rax
-	movdqa	-48(%r11),%xmm7
-	pxor	%xmm8,%xmm15
-	pxor	%xmm8,%xmm0
-	pxor	%xmm8,%xmm1
-	pxor	%xmm8,%xmm2
-.byte	102,68,15,56,0,255
-.byte	102,15,56,0,199
-	pxor	%xmm8,%xmm3
-	pxor	%xmm8,%xmm4
-.byte	102,15,56,0,207
-.byte	102,15,56,0,215
-	pxor	%xmm8,%xmm5
-	pxor	%xmm8,%xmm6
-.byte	102,15,56,0,223
-.byte	102,15,56,0,231
-.byte	102,15,56,0,239
-.byte	102,15,56,0,247
-	movdqa	0(%r11),%xmm7
-	movdqa	16(%r11),%xmm8
-	movdqa	%xmm5,%xmm9
-	psrlq	$1,%xmm5
-	movdqa	%xmm3,%xmm10
-	psrlq	$1,%xmm3
-	pxor	%xmm6,%xmm5
-	pxor	%xmm4,%xmm3
-	pand	%xmm7,%xmm5
-	pand	%xmm7,%xmm3
-	pxor	%xmm5,%xmm6
-	psllq	$1,%xmm5
-	pxor	%xmm3,%xmm4
-	psllq	$1,%xmm3
-	pxor	%xmm9,%xmm5
-	pxor	%xmm10,%xmm3
-	movdqa	%xmm1,%xmm9
-	psrlq	$1,%xmm1
-	movdqa	%xmm15,%xmm10
-	psrlq	$1,%xmm15
-	pxor	%xmm2,%xmm1
-	pxor	%xmm0,%xmm15
-	pand	%xmm7,%xmm1
-	pand	%xmm7,%xmm15
-	pxor	%xmm1,%xmm2
-	psllq	$1,%xmm1
-	pxor	%xmm15,%xmm0
-	psllq	$1,%xmm15
-	pxor	%xmm9,%xmm1
-	pxor	%xmm10,%xmm15
-	movdqa	32(%r11),%xmm7
-	movdqa	%xmm4,%xmm9
-	psrlq	$2,%xmm4
-	movdqa	%xmm3,%xmm10
-	psrlq	$2,%xmm3
-	pxor	%xmm6,%xmm4
-	pxor	%xmm5,%xmm3
-	pand	%xmm8,%xmm4
-	pand	%xmm8,%xmm3
-	pxor	%xmm4,%xmm6
-	psllq	$2,%xmm4
-	pxor	%xmm3,%xmm5
-	psllq	$2,%xmm3
-	pxor	%xmm9,%xmm4
-	pxor	%xmm10,%xmm3
-	movdqa	%xmm0,%xmm9
-	psrlq	$2,%xmm0
-	movdqa	%xmm15,%xmm10
-	psrlq	$2,%xmm15
-	pxor	%xmm2,%xmm0
-	pxor	%xmm1,%xmm15
-	pand	%xmm8,%xmm0
-	pand	%xmm8,%xmm15
-	pxor	%xmm0,%xmm2
-	psllq	$2,%xmm0
-	pxor	%xmm15,%xmm1
-	psllq	$2,%xmm15
-	pxor	%xmm9,%xmm0
-	pxor	%xmm10,%xmm15
-	movdqa	%xmm2,%xmm9
-	psrlq	$4,%xmm2
-	movdqa	%xmm1,%xmm10
-	psrlq	$4,%xmm1
-	pxor	%xmm6,%xmm2
-	pxor	%xmm5,%xmm1
-	pand	%xmm7,%xmm2
-	pand	%xmm7,%xmm1
-	pxor	%xmm2,%xmm6
-	psllq	$4,%xmm2
-	pxor	%xmm1,%xmm5
-	psllq	$4,%xmm1
-	pxor	%xmm9,%xmm2
-	pxor	%xmm10,%xmm1
-	movdqa	%xmm0,%xmm9
-	psrlq	$4,%xmm0
-	movdqa	%xmm15,%xmm10
-	psrlq	$4,%xmm15
-	pxor	%xmm4,%xmm0
-	pxor	%xmm3,%xmm15
-	pand	%xmm7,%xmm0
-	pand	%xmm7,%xmm15
-	pxor	%xmm0,%xmm4
-	psllq	$4,%xmm0
-	pxor	%xmm15,%xmm3
-	psllq	$4,%xmm15
-	pxor	%xmm9,%xmm0
-	pxor	%xmm10,%xmm15
-	decl	%r10d
-	jmp	L$dec_sbox
-.p2align	4
-L$dec_loop:
-	pxor	0(%rax),%xmm15
-	pxor	16(%rax),%xmm0
-	pxor	32(%rax),%xmm1
-	pxor	48(%rax),%xmm2
-.byte	102,68,15,56,0,255
-.byte	102,15,56,0,199
-	pxor	64(%rax),%xmm3
-	pxor	80(%rax),%xmm4
-.byte	102,15,56,0,207
-.byte	102,15,56,0,215
-	pxor	96(%rax),%xmm5
-	pxor	112(%rax),%xmm6
-.byte	102,15,56,0,223
-.byte	102,15,56,0,231
-.byte	102,15,56,0,239
-.byte	102,15,56,0,247
-	leaq	128(%rax),%rax
-L$dec_sbox:
-	pxor	%xmm3,%xmm2
-
-	pxor	%xmm6,%xmm3
-	pxor	%xmm6,%xmm1
-	pxor	%xmm3,%xmm5
-	pxor	%xmm5,%xmm6
-	pxor	%xmm6,%xmm0
-
-	pxor	%xmm0,%xmm15
-	pxor	%xmm4,%xmm1
-	pxor	%xmm15,%xmm2
-	pxor	%xmm15,%xmm4
-	pxor	%xmm2,%xmm0
-	movdqa	%xmm2,%xmm10
-	movdqa	%xmm6,%xmm9
-	movdqa	%xmm0,%xmm8
-	movdqa	%xmm3,%xmm12
-	movdqa	%xmm4,%xmm11
-
-	pxor	%xmm15,%xmm10
-	pxor	%xmm3,%xmm9
-	pxor	%xmm5,%xmm8
-	movdqa	%xmm10,%xmm13
-	pxor	%xmm15,%xmm12
-	movdqa	%xmm9,%xmm7
-	pxor	%xmm1,%xmm11
-	movdqa	%xmm10,%xmm14
-
-	por	%xmm8,%xmm9
-	por	%xmm11,%xmm10
-	pxor	%xmm7,%xmm14
-	pand	%xmm11,%xmm13
-	pxor	%xmm8,%xmm11
-	pand	%xmm8,%xmm7
-	pand	%xmm11,%xmm14
-	movdqa	%xmm5,%xmm11
-	pxor	%xmm1,%xmm11
-	pand	%xmm11,%xmm12
-	pxor	%xmm12,%xmm10
-	pxor	%xmm12,%xmm9
-	movdqa	%xmm2,%xmm12
-	movdqa	%xmm0,%xmm11
-	pxor	%xmm6,%xmm12
-	pxor	%xmm4,%xmm11
-	movdqa	%xmm12,%xmm8
-	pand	%xmm11,%xmm12
-	por	%xmm11,%xmm8
-	pxor	%xmm12,%xmm7
-	pxor	%xmm14,%xmm10
-	pxor	%xmm13,%xmm9
-	pxor	%xmm14,%xmm8
-	movdqa	%xmm3,%xmm11
-	pxor	%xmm13,%xmm7
-	movdqa	%xmm15,%xmm12
-	pxor	%xmm13,%xmm8
-	movdqa	%xmm6,%xmm13
-	pand	%xmm5,%xmm11
-	movdqa	%xmm2,%xmm14
-	pand	%xmm1,%xmm12
-	pand	%xmm0,%xmm13
-	por	%xmm4,%xmm14
-	pxor	%xmm11,%xmm10
-	pxor	%xmm12,%xmm9
-	pxor	%xmm13,%xmm8
-	pxor	%xmm14,%xmm7
-
-
-
-
-
-	movdqa	%xmm10,%xmm11
-	pand	%xmm8,%xmm10
-	pxor	%xmm9,%xmm11
-
-	movdqa	%xmm7,%xmm13
-	movdqa	%xmm11,%xmm14
-	pxor	%xmm10,%xmm13
-	pand	%xmm13,%xmm14
-
-	movdqa	%xmm8,%xmm12
-	pxor	%xmm9,%xmm14
-	pxor	%xmm7,%xmm12
-
-	pxor	%xmm9,%xmm10
-
-	pand	%xmm10,%xmm12
-
-	movdqa	%xmm13,%xmm9
-	pxor	%xmm7,%xmm12
-
-	pxor	%xmm12,%xmm9
-	pxor	%xmm12,%xmm8
-
-	pand	%xmm7,%xmm9
-
-	pxor	%xmm9,%xmm13
-	pxor	%xmm9,%xmm8
-
-	pand	%xmm14,%xmm13
-
-	pxor	%xmm11,%xmm13
-	movdqa	%xmm4,%xmm11
-	movdqa	%xmm0,%xmm7
-	movdqa	%xmm14,%xmm9
-	pxor	%xmm13,%xmm9
-	pand	%xmm4,%xmm9
-	pxor	%xmm0,%xmm4
-	pand	%xmm14,%xmm0
-	pand	%xmm13,%xmm4
-	pxor	%xmm0,%xmm4
-	pxor	%xmm9,%xmm0
-	pxor	%xmm1,%xmm11
-	pxor	%xmm5,%xmm7
-	pxor	%xmm12,%xmm14
-	pxor	%xmm8,%xmm13
-	movdqa	%xmm14,%xmm10
-	movdqa	%xmm12,%xmm9
-	pxor	%xmm13,%xmm10
-	pxor	%xmm8,%xmm9
-	pand	%xmm11,%xmm10
-	pand	%xmm1,%xmm9
-	pxor	%xmm7,%xmm11
-	pxor	%xmm5,%xmm1
-	pand	%xmm14,%xmm7
-	pand	%xmm12,%xmm5
-	pand	%xmm13,%xmm11
-	pand	%xmm8,%xmm1
-	pxor	%xmm11,%xmm7
-	pxor	%xmm5,%xmm1
-	pxor	%xmm10,%xmm11
-	pxor	%xmm9,%xmm5
-	pxor	%xmm11,%xmm4
-	pxor	%xmm11,%xmm1
-	pxor	%xmm7,%xmm0
-	pxor	%xmm7,%xmm5
-
-	movdqa	%xmm2,%xmm11
-	movdqa	%xmm6,%xmm7
-	pxor	%xmm15,%xmm11
-	pxor	%xmm3,%xmm7
-	movdqa	%xmm14,%xmm10
-	movdqa	%xmm12,%xmm9
-	pxor	%xmm13,%xmm10
-	pxor	%xmm8,%xmm9
-	pand	%xmm11,%xmm10
-	pand	%xmm15,%xmm9
-	pxor	%xmm7,%xmm11
-	pxor	%xmm3,%xmm15
-	pand	%xmm14,%xmm7
-	pand	%xmm12,%xmm3
-	pand	%xmm13,%xmm11
-	pand	%xmm8,%xmm15
-	pxor	%xmm11,%xmm7
-	pxor	%xmm3,%xmm15
-	pxor	%xmm10,%xmm11
-	pxor	%xmm9,%xmm3
-	pxor	%xmm12,%xmm14
-	pxor	%xmm8,%xmm13
-	movdqa	%xmm14,%xmm10
-	pxor	%xmm13,%xmm10
-	pand	%xmm2,%xmm10
-	pxor	%xmm6,%xmm2
-	pand	%xmm14,%xmm6
-	pand	%xmm13,%xmm2
-	pxor	%xmm6,%xmm2
-	pxor	%xmm10,%xmm6
-	pxor	%xmm11,%xmm2
-	pxor	%xmm11,%xmm15
-	pxor	%xmm7,%xmm6
-	pxor	%xmm7,%xmm3
-	pxor	%xmm6,%xmm0
-	pxor	%xmm4,%xmm5
-
-	pxor	%xmm0,%xmm3
-	pxor	%xmm6,%xmm1
-	pxor	%xmm6,%xmm4
-	pxor	%xmm1,%xmm3
-	pxor	%xmm15,%xmm6
-	pxor	%xmm4,%xmm3
-	pxor	%xmm5,%xmm2
-	pxor	%xmm0,%xmm5
-	pxor	%xmm3,%xmm2
-
-	pxor	%xmm15,%xmm3
-	pxor	%xmm2,%xmm6
-	decl	%r10d
-	jl	L$dec_done
-
-	pshufd	$0x4E,%xmm15,%xmm7
-	pshufd	$0x4E,%xmm2,%xmm13
-	pxor	%xmm15,%xmm7
-	pshufd	$0x4E,%xmm4,%xmm14
-	pxor	%xmm2,%xmm13
-	pshufd	$0x4E,%xmm0,%xmm8
-	pxor	%xmm4,%xmm14
-	pshufd	$0x4E,%xmm5,%xmm9
-	pxor	%xmm0,%xmm8
-	pshufd	$0x4E,%xmm3,%xmm10
-	pxor	%xmm5,%xmm9
-	pxor	%xmm13,%xmm15
-	pxor	%xmm13,%xmm0
-	pshufd	$0x4E,%xmm1,%xmm11
-	pxor	%xmm3,%xmm10
-	pxor	%xmm7,%xmm5
-	pxor	%xmm8,%xmm3
-	pshufd	$0x4E,%xmm6,%xmm12
-	pxor	%xmm1,%xmm11
-	pxor	%xmm14,%xmm0
-	pxor	%xmm9,%xmm1
-	pxor	%xmm6,%xmm12
-
-	pxor	%xmm14,%xmm5
-	pxor	%xmm13,%xmm3
-	pxor	%xmm13,%xmm1
-	pxor	%xmm10,%xmm6
-	pxor	%xmm11,%xmm2
-	pxor	%xmm14,%xmm1
-	pxor	%xmm14,%xmm6
-	pxor	%xmm12,%xmm4
-	pshufd	$0x93,%xmm15,%xmm7
-	pshufd	$0x93,%xmm0,%xmm8
-	pxor	%xmm7,%xmm15
-	pshufd	$0x93,%xmm5,%xmm9
-	pxor	%xmm8,%xmm0
-	pshufd	$0x93,%xmm3,%xmm10
-	pxor	%xmm9,%xmm5
-	pshufd	$0x93,%xmm1,%xmm11
-	pxor	%xmm10,%xmm3
-	pshufd	$0x93,%xmm6,%xmm12
-	pxor	%xmm11,%xmm1
-	pshufd	$0x93,%xmm2,%xmm13
-	pxor	%xmm12,%xmm6
-	pshufd	$0x93,%xmm4,%xmm14
-	pxor	%xmm13,%xmm2
-	pxor	%xmm14,%xmm4
-
-	pxor	%xmm15,%xmm8
-	pxor	%xmm4,%xmm7
-	pxor	%xmm4,%xmm8
-	pshufd	$0x4E,%xmm15,%xmm15
-	pxor	%xmm0,%xmm9
-	pshufd	$0x4E,%xmm0,%xmm0
-	pxor	%xmm1,%xmm12
-	pxor	%xmm7,%xmm15
-	pxor	%xmm6,%xmm13
-	pxor	%xmm8,%xmm0
-	pxor	%xmm3,%xmm11
-	pshufd	$0x4E,%xmm1,%xmm7
-	pxor	%xmm2,%xmm14
-	pshufd	$0x4E,%xmm6,%xmm8
-	pxor	%xmm5,%xmm10
-	pshufd	$0x4E,%xmm3,%xmm1
-	pxor	%xmm4,%xmm10
-	pshufd	$0x4E,%xmm4,%xmm6
-	pxor	%xmm4,%xmm11
-	pshufd	$0x4E,%xmm2,%xmm3
-	pxor	%xmm11,%xmm7
-	pshufd	$0x4E,%xmm5,%xmm2
-	pxor	%xmm12,%xmm8
-	pxor	%xmm1,%xmm10
-	pxor	%xmm14,%xmm6
-	pxor	%xmm3,%xmm13
-	movdqa	%xmm7,%xmm3
-	pxor	%xmm9,%xmm2
-	movdqa	%xmm13,%xmm5
-	movdqa	%xmm8,%xmm4
-	movdqa	%xmm2,%xmm1
-	movdqa	%xmm10,%xmm2
-	movdqa	-16(%r11),%xmm7
-	jnz	L$dec_loop
-	movdqa	-32(%r11),%xmm7
-	jmp	L$dec_loop
-.p2align	4
-L$dec_done:
-	movdqa	0(%r11),%xmm7
-	movdqa	16(%r11),%xmm8
-	movdqa	%xmm2,%xmm9
-	psrlq	$1,%xmm2
-	movdqa	%xmm1,%xmm10
-	psrlq	$1,%xmm1
-	pxor	%xmm4,%xmm2
-	pxor	%xmm6,%xmm1
-	pand	%xmm7,%xmm2
-	pand	%xmm7,%xmm1
-	pxor	%xmm2,%xmm4
-	psllq	$1,%xmm2
-	pxor	%xmm1,%xmm6
-	psllq	$1,%xmm1
-	pxor	%xmm9,%xmm2
-	pxor	%xmm10,%xmm1
-	movdqa	%xmm5,%xmm9
-	psrlq	$1,%xmm5
-	movdqa	%xmm15,%xmm10
-	psrlq	$1,%xmm15
-	pxor	%xmm3,%xmm5
-	pxor	%xmm0,%xmm15
-	pand	%xmm7,%xmm5
-	pand	%xmm7,%xmm15
-	pxor	%xmm5,%xmm3
-	psllq	$1,%xmm5
-	pxor	%xmm15,%xmm0
-	psllq	$1,%xmm15
-	pxor	%xmm9,%xmm5
-	pxor	%xmm10,%xmm15
-	movdqa	32(%r11),%xmm7
-	movdqa	%xmm6,%xmm9
-	psrlq	$2,%xmm6
-	movdqa	%xmm1,%xmm10
-	psrlq	$2,%xmm1
-	pxor	%xmm4,%xmm6
-	pxor	%xmm2,%xmm1
-	pand	%xmm8,%xmm6
-	pand	%xmm8,%xmm1
-	pxor	%xmm6,%xmm4
-	psllq	$2,%xmm6
-	pxor	%xmm1,%xmm2
-	psllq	$2,%xmm1
-	pxor	%xmm9,%xmm6
-	pxor	%xmm10,%xmm1
-	movdqa	%xmm0,%xmm9
-	psrlq	$2,%xmm0
-	movdqa	%xmm15,%xmm10
-	psrlq	$2,%xmm15
-	pxor	%xmm3,%xmm0
-	pxor	%xmm5,%xmm15
-	pand	%xmm8,%xmm0
-	pand	%xmm8,%xmm15
-	pxor	%xmm0,%xmm3
-	psllq	$2,%xmm0
-	pxor	%xmm15,%xmm5
-	psllq	$2,%xmm15
-	pxor	%xmm9,%xmm0
-	pxor	%xmm10,%xmm15
-	movdqa	%xmm3,%xmm9
-	psrlq	$4,%xmm3
-	movdqa	%xmm5,%xmm10
-	psrlq	$4,%xmm5
-	pxor	%xmm4,%xmm3
-	pxor	%xmm2,%xmm5
-	pand	%xmm7,%xmm3
-	pand	%xmm7,%xmm5
-	pxor	%xmm3,%xmm4
-	psllq	$4,%xmm3
-	pxor	%xmm5,%xmm2
-	psllq	$4,%xmm5
-	pxor	%xmm9,%xmm3
-	pxor	%xmm10,%xmm5
-	movdqa	%xmm0,%xmm9
-	psrlq	$4,%xmm0
-	movdqa	%xmm15,%xmm10
-	psrlq	$4,%xmm15
-	pxor	%xmm6,%xmm0
-	pxor	%xmm1,%xmm15
-	pand	%xmm7,%xmm0
-	pand	%xmm7,%xmm15
-	pxor	%xmm0,%xmm6
-	psllq	$4,%xmm0
-	pxor	%xmm15,%xmm1
-	psllq	$4,%xmm15
-	pxor	%xmm9,%xmm0
-	pxor	%xmm10,%xmm15
-	movdqa	(%rax),%xmm7
-	pxor	%xmm7,%xmm5
-	pxor	%xmm7,%xmm3
-	pxor	%xmm7,%xmm1
-	pxor	%xmm7,%xmm6
-	pxor	%xmm7,%xmm2
-	pxor	%xmm7,%xmm4
-	pxor	%xmm7,%xmm15
-	pxor	%xmm7,%xmm0
-	.byte	0xf3,0xc3
-
-
-
-.p2align	4
-_bsaes_key_convert:
-
-	leaq	L$masks(%rip),%r11
-	movdqu	(%rcx),%xmm7
-	leaq	16(%rcx),%rcx
-	movdqa	0(%r11),%xmm0
-	movdqa	16(%r11),%xmm1
-	movdqa	32(%r11),%xmm2
-	movdqa	48(%r11),%xmm3
-	movdqa	64(%r11),%xmm4
-	pcmpeqd	%xmm5,%xmm5
-
-	movdqu	(%rcx),%xmm6
-	movdqa	%xmm7,(%rax)
-	leaq	16(%rax),%rax
-	decl	%r10d
-	jmp	L$key_loop
-.p2align	4
-L$key_loop:
-.byte	102,15,56,0,244
-
-	movdqa	%xmm0,%xmm8
-	movdqa	%xmm1,%xmm9
-
-	pand	%xmm6,%xmm8
-	pand	%xmm6,%xmm9
-	movdqa	%xmm2,%xmm10
-	pcmpeqb	%xmm0,%xmm8
-	psllq	$4,%xmm0
-	movdqa	%xmm3,%xmm11
-	pcmpeqb	%xmm1,%xmm9
-	psllq	$4,%xmm1
-
-	pand	%xmm6,%xmm10
-	pand	%xmm6,%xmm11
-	movdqa	%xmm0,%xmm12
-	pcmpeqb	%xmm2,%xmm10
-	psllq	$4,%xmm2
-	movdqa	%xmm1,%xmm13
-	pcmpeqb	%xmm3,%xmm11
-	psllq	$4,%xmm3
-
-	movdqa	%xmm2,%xmm14
-	movdqa	%xmm3,%xmm15
-	pxor	%xmm5,%xmm8
-	pxor	%xmm5,%xmm9
-
-	pand	%xmm6,%xmm12
-	pand	%xmm6,%xmm13
-	movdqa	%xmm8,0(%rax)
-	pcmpeqb	%xmm0,%xmm12
-	psrlq	$4,%xmm0
-	movdqa	%xmm9,16(%rax)
-	pcmpeqb	%xmm1,%xmm13
-	psrlq	$4,%xmm1
-	leaq	16(%rcx),%rcx
-
-	pand	%xmm6,%xmm14
-	pand	%xmm6,%xmm15
-	movdqa	%xmm10,32(%rax)
-	pcmpeqb	%xmm2,%xmm14
-	psrlq	$4,%xmm2
-	movdqa	%xmm11,48(%rax)
-	pcmpeqb	%xmm3,%xmm15
-	psrlq	$4,%xmm3
-	movdqu	(%rcx),%xmm6
-
-	pxor	%xmm5,%xmm13
-	pxor	%xmm5,%xmm14
-	movdqa	%xmm12,64(%rax)
-	movdqa	%xmm13,80(%rax)
-	movdqa	%xmm14,96(%rax)
-	movdqa	%xmm15,112(%rax)
-	leaq	128(%rax),%rax
-	decl	%r10d
-	jnz	L$key_loop
-
-	movdqa	80(%r11),%xmm7
-
-	.byte	0xf3,0xc3
-
-
-
-.globl	_bsaes_cbc_encrypt
-
-.p2align	4
-_bsaes_cbc_encrypt:
-
-	cmpl	$0,%r9d
-	jne	_asm_AES_cbc_encrypt
-	cmpq	$128,%rdx
-	jb	_asm_AES_cbc_encrypt
-
-	movq	%rsp,%rax
-L$cbc_dec_prologue:
-	pushq	%rbp
-
-	pushq	%rbx
-
-	pushq	%r12
-
-	pushq	%r13
-
-	pushq	%r14
-
-	pushq	%r15
-
-	leaq	-72(%rsp),%rsp
-
-	movq	%rsp,%rbp
-
-	movl	240(%rcx),%eax
-	movq	%rdi,%r12
-	movq	%rsi,%r13
-	movq	%rdx,%r14
-	movq	%rcx,%r15
-	movq	%r8,%rbx
-	shrq	$4,%r14
-
-	movl	%eax,%edx
-	shlq	$7,%rax
-	subq	$96,%rax
-	subq	%rax,%rsp
-
-	movq	%rsp,%rax
-	movq	%r15,%rcx
-	movl	%edx,%r10d
-	call	_bsaes_key_convert
-	pxor	(%rsp),%xmm7
-	movdqa	%xmm6,(%rax)
-	movdqa	%xmm7,(%rsp)
-
-	movdqu	(%rbx),%xmm14
-	subq	$8,%r14
-L$cbc_dec_loop:
-	movdqu	0(%r12),%xmm15
-	movdqu	16(%r12),%xmm0
-	movdqu	32(%r12),%xmm1
-	movdqu	48(%r12),%xmm2
-	movdqu	64(%r12),%xmm3
-	movdqu	80(%r12),%xmm4
-	movq	%rsp,%rax
-	movdqu	96(%r12),%xmm5
-	movl	%edx,%r10d
-	movdqu	112(%r12),%xmm6
-	movdqa	%xmm14,32(%rbp)
-
-	call	_bsaes_decrypt8
-
-	pxor	32(%rbp),%xmm15
-	movdqu	0(%r12),%xmm7
-	movdqu	16(%r12),%xmm8
-	pxor	%xmm7,%xmm0
-	movdqu	32(%r12),%xmm9
-	pxor	%xmm8,%xmm5
-	movdqu	48(%r12),%xmm10
-	pxor	%xmm9,%xmm3
-	movdqu	64(%r12),%xmm11
-	pxor	%xmm10,%xmm1
-	movdqu	80(%r12),%xmm12
-	pxor	%xmm11,%xmm6
-	movdqu	96(%r12),%xmm13
-	pxor	%xmm12,%xmm2
-	movdqu	112(%r12),%xmm14
-	pxor	%xmm13,%xmm4
-	movdqu	%xmm15,0(%r13)
-	leaq	128(%r12),%r12
-	movdqu	%xmm0,16(%r13)
-	movdqu	%xmm5,32(%r13)
-	movdqu	%xmm3,48(%r13)
-	movdqu	%xmm1,64(%r13)
-	movdqu	%xmm6,80(%r13)
-	movdqu	%xmm2,96(%r13)
-	movdqu	%xmm4,112(%r13)
-	leaq	128(%r13),%r13
-	subq	$8,%r14
-	jnc	L$cbc_dec_loop
-
-	addq	$8,%r14
-	jz	L$cbc_dec_done
-
-	movdqu	0(%r12),%xmm15
-	movq	%rsp,%rax
-	movl	%edx,%r10d
-	cmpq	$2,%r14
-	jb	L$cbc_dec_one
-	movdqu	16(%r12),%xmm0
-	je	L$cbc_dec_two
-	movdqu	32(%r12),%xmm1
-	cmpq	$4,%r14
-	jb	L$cbc_dec_three
-	movdqu	48(%r12),%xmm2
-	je	L$cbc_dec_four
-	movdqu	64(%r12),%xmm3
-	cmpq	$6,%r14
-	jb	L$cbc_dec_five
-	movdqu	80(%r12),%xmm4
-	je	L$cbc_dec_six
-	movdqu	96(%r12),%xmm5
-	movdqa	%xmm14,32(%rbp)
-	call	_bsaes_decrypt8
-	pxor	32(%rbp),%xmm15
-	movdqu	0(%r12),%xmm7
-	movdqu	16(%r12),%xmm8
-	pxor	%xmm7,%xmm0
-	movdqu	32(%r12),%xmm9
-	pxor	%xmm8,%xmm5
-	movdqu	48(%r12),%xmm10
-	pxor	%xmm9,%xmm3
-	movdqu	64(%r12),%xmm11
-	pxor	%xmm10,%xmm1
-	movdqu	80(%r12),%xmm12
-	pxor	%xmm11,%xmm6
-	movdqu	96(%r12),%xmm14
-	pxor	%xmm12,%xmm2
-	movdqu	%xmm15,0(%r13)
-	movdqu	%xmm0,16(%r13)
-	movdqu	%xmm5,32(%r13)
-	movdqu	%xmm3,48(%r13)
-	movdqu	%xmm1,64(%r13)
-	movdqu	%xmm6,80(%r13)
-	movdqu	%xmm2,96(%r13)
-	jmp	L$cbc_dec_done
-.p2align	4
-L$cbc_dec_six:
-	movdqa	%xmm14,32(%rbp)
-	call	_bsaes_decrypt8
-	pxor	32(%rbp),%xmm15
-	movdqu	0(%r12),%xmm7
-	movdqu	16(%r12),%xmm8
-	pxor	%xmm7,%xmm0
-	movdqu	32(%r12),%xmm9
-	pxor	%xmm8,%xmm5
-	movdqu	48(%r12),%xmm10
-	pxor	%xmm9,%xmm3
-	movdqu	64(%r12),%xmm11
-	pxor	%xmm10,%xmm1
-	movdqu	80(%r12),%xmm14
-	pxor	%xmm11,%xmm6
-	movdqu	%xmm15,0(%r13)
-	movdqu	%xmm0,16(%r13)
-	movdqu	%xmm5,32(%r13)
-	movdqu	%xmm3,48(%r13)
-	movdqu	%xmm1,64(%r13)
-	movdqu	%xmm6,80(%r13)
-	jmp	L$cbc_dec_done
-.p2align	4
-L$cbc_dec_five:
-	movdqa	%xmm14,32(%rbp)
-	call	_bsaes_decrypt8
-	pxor	32(%rbp),%xmm15
-	movdqu	0(%r12),%xmm7
-	movdqu	16(%r12),%xmm8
-	pxor	%xmm7,%xmm0
-	movdqu	32(%r12),%xmm9
-	pxor	%xmm8,%xmm5
-	movdqu	48(%r12),%xmm10
-	pxor	%xmm9,%xmm3
-	movdqu	64(%r12),%xmm14
-	pxor	%xmm10,%xmm1
-	movdqu	%xmm15,0(%r13)
-	movdqu	%xmm0,16(%r13)
-	movdqu	%xmm5,32(%r13)
-	movdqu	%xmm3,48(%r13)
-	movdqu	%xmm1,64(%r13)
-	jmp	L$cbc_dec_done
-.p2align	4
-L$cbc_dec_four:
-	movdqa	%xmm14,32(%rbp)
-	call	_bsaes_decrypt8
-	pxor	32(%rbp),%xmm15
-	movdqu	0(%r12),%xmm7
-	movdqu	16(%r12),%xmm8
-	pxor	%xmm7,%xmm0
-	movdqu	32(%r12),%xmm9
-	pxor	%xmm8,%xmm5
-	movdqu	48(%r12),%xmm14
-	pxor	%xmm9,%xmm3
-	movdqu	%xmm15,0(%r13)
-	movdqu	%xmm0,16(%r13)
-	movdqu	%xmm5,32(%r13)
-	movdqu	%xmm3,48(%r13)
-	jmp	L$cbc_dec_done
-.p2align	4
-L$cbc_dec_three:
-	movdqa	%xmm14,32(%rbp)
-	call	_bsaes_decrypt8
-	pxor	32(%rbp),%xmm15
-	movdqu	0(%r12),%xmm7
-	movdqu	16(%r12),%xmm8
-	pxor	%xmm7,%xmm0
-	movdqu	32(%r12),%xmm14
-	pxor	%xmm8,%xmm5
-	movdqu	%xmm15,0(%r13)
-	movdqu	%xmm0,16(%r13)
-	movdqu	%xmm5,32(%r13)
-	jmp	L$cbc_dec_done
-.p2align	4
-L$cbc_dec_two:
-	movdqa	%xmm14,32(%rbp)
-	call	_bsaes_decrypt8
-	pxor	32(%rbp),%xmm15
-	movdqu	0(%r12),%xmm7
-	movdqu	16(%r12),%xmm14
-	pxor	%xmm7,%xmm0
-	movdqu	%xmm15,0(%r13)
-	movdqu	%xmm0,16(%r13)
-	jmp	L$cbc_dec_done
-.p2align	4
-L$cbc_dec_one:
-	leaq	(%r12),%rdi
-	leaq	32(%rbp),%rsi
-	leaq	(%r15),%rdx
-	call	_asm_AES_decrypt
-	pxor	32(%rbp),%xmm14
-	movdqu	%xmm14,(%r13)
-	movdqa	%xmm15,%xmm14
-
-L$cbc_dec_done:
-	movdqu	%xmm14,(%rbx)
-	leaq	(%rsp),%rax
-	pxor	%xmm0,%xmm0
-L$cbc_dec_bzero:
-	movdqa	%xmm0,0(%rax)
-	movdqa	%xmm0,16(%rax)
-	leaq	32(%rax),%rax
-	cmpq	%rax,%rbp
-	ja	L$cbc_dec_bzero
-
-	leaq	120(%rbp),%rax
-
-	movq	-48(%rax),%r15
-
-	movq	-40(%rax),%r14
-
-	movq	-32(%rax),%r13
-
-	movq	-24(%rax),%r12
-
-	movq	-16(%rax),%rbx
-
-	movq	-8(%rax),%rbp
-
-	leaq	(%rax),%rsp
-
-L$cbc_dec_epilogue:
-	.byte	0xf3,0xc3
-
-
-
-.globl	_bsaes_ctr32_encrypt_blocks
-
-.p2align	4
-_bsaes_ctr32_encrypt_blocks:
-
-	movq	%rsp,%rax
-L$ctr_enc_prologue:
-	pushq	%rbp
-
-	pushq	%rbx
-
-	pushq	%r12
-
-	pushq	%r13
-
-	pushq	%r14
-
-	pushq	%r15
-
-	leaq	-72(%rsp),%rsp
-
-	movq	%rsp,%rbp
-
-	movdqu	(%r8),%xmm0
-	movl	240(%rcx),%eax
-	movq	%rdi,%r12
-	movq	%rsi,%r13
-	movq	%rdx,%r14
-	movq	%rcx,%r15
-	movdqa	%xmm0,32(%rbp)
-	cmpq	$8,%rdx
-	jb	L$ctr_enc_short
-
-	movl	%eax,%ebx
-	shlq	$7,%rax
-	subq	$96,%rax
-	subq	%rax,%rsp
-
-	movq	%rsp,%rax
-	movq	%r15,%rcx
-	movl	%ebx,%r10d
-	call	_bsaes_key_convert
-	pxor	%xmm6,%xmm7
-	movdqa	%xmm7,(%rax)
-
-	movdqa	(%rsp),%xmm8
-	leaq	L$ADD1(%rip),%r11
-	movdqa	32(%rbp),%xmm15
-	movdqa	-32(%r11),%xmm7
-.byte	102,68,15,56,0,199
-.byte	102,68,15,56,0,255
-	movdqa	%xmm8,(%rsp)
-	jmp	L$ctr_enc_loop
-.p2align	4
-L$ctr_enc_loop:
-	movdqa	%xmm15,32(%rbp)
-	movdqa	%xmm15,%xmm0
-	movdqa	%xmm15,%xmm1
-	paddd	0(%r11),%xmm0
-	movdqa	%xmm15,%xmm2
-	paddd	16(%r11),%xmm1
-	movdqa	%xmm15,%xmm3
-	paddd	32(%r11),%xmm2
-	movdqa	%xmm15,%xmm4
-	paddd	48(%r11),%xmm3
-	movdqa	%xmm15,%xmm5
-	paddd	64(%r11),%xmm4
-	movdqa	%xmm15,%xmm6
-	paddd	80(%r11),%xmm5
-	paddd	96(%r11),%xmm6
-
-
-
-	movdqa	(%rsp),%xmm8
-	leaq	16(%rsp),%rax
-	movdqa	-16(%r11),%xmm7
-	pxor	%xmm8,%xmm15
-	pxor	%xmm8,%xmm0
-	pxor	%xmm8,%xmm1
-	pxor	%xmm8,%xmm2
-.byte	102,68,15,56,0,255
-.byte	102,15,56,0,199
-	pxor	%xmm8,%xmm3
-	pxor	%xmm8,%xmm4
-.byte	102,15,56,0,207
-.byte	102,15,56,0,215
-	pxor	%xmm8,%xmm5
-	pxor	%xmm8,%xmm6
-.byte	102,15,56,0,223
-.byte	102,15,56,0,231
-.byte	102,15,56,0,239
-.byte	102,15,56,0,247
-	leaq	L$BS0(%rip),%r11
-	movl	%ebx,%r10d
-
-	call	_bsaes_encrypt8_bitslice
-
-	subq	$8,%r14
-	jc	L$ctr_enc_loop_done
-
-	movdqu	0(%r12),%xmm7
-	movdqu	16(%r12),%xmm8
-	movdqu	32(%r12),%xmm9
-	movdqu	48(%r12),%xmm10
-	movdqu	64(%r12),%xmm11
-	movdqu	80(%r12),%xmm12
-	movdqu	96(%r12),%xmm13
-	movdqu	112(%r12),%xmm14
-	leaq	128(%r12),%r12
-	pxor	%xmm15,%xmm7
-	movdqa	32(%rbp),%xmm15
-	pxor	%xmm8,%xmm0
-	movdqu	%xmm7,0(%r13)
-	pxor	%xmm9,%xmm3
-	movdqu	%xmm0,16(%r13)
-	pxor	%xmm10,%xmm5
-	movdqu	%xmm3,32(%r13)
-	pxor	%xmm11,%xmm2
-	movdqu	%xmm5,48(%r13)
-	pxor	%xmm12,%xmm6
-	movdqu	%xmm2,64(%r13)
-	pxor	%xmm13,%xmm1
-	movdqu	%xmm6,80(%r13)
-	pxor	%xmm14,%xmm4
-	movdqu	%xmm1,96(%r13)
-	leaq	L$ADD1(%rip),%r11
-	movdqu	%xmm4,112(%r13)
-	leaq	128(%r13),%r13
-	paddd	112(%r11),%xmm15
-	jnz	L$ctr_enc_loop
-
-	jmp	L$ctr_enc_done
-.p2align	4
-L$ctr_enc_loop_done:
-	addq	$8,%r14
-	movdqu	0(%r12),%xmm7
-	pxor	%xmm7,%xmm15
-	movdqu	%xmm15,0(%r13)
-	cmpq	$2,%r14
-	jb	L$ctr_enc_done
-	movdqu	16(%r12),%xmm8
-	pxor	%xmm8,%xmm0
-	movdqu	%xmm0,16(%r13)
-	je	L$ctr_enc_done
-	movdqu	32(%r12),%xmm9
-	pxor	%xmm9,%xmm3
-	movdqu	%xmm3,32(%r13)
-	cmpq	$4,%r14
-	jb	L$ctr_enc_done
-	movdqu	48(%r12),%xmm10
-	pxor	%xmm10,%xmm5
-	movdqu	%xmm5,48(%r13)
-	je	L$ctr_enc_done
-	movdqu	64(%r12),%xmm11
-	pxor	%xmm11,%xmm2
-	movdqu	%xmm2,64(%r13)
-	cmpq	$6,%r14
-	jb	L$ctr_enc_done
-	movdqu	80(%r12),%xmm12
-	pxor	%xmm12,%xmm6
-	movdqu	%xmm6,80(%r13)
-	je	L$ctr_enc_done
-	movdqu	96(%r12),%xmm13
-	pxor	%xmm13,%xmm1
-	movdqu	%xmm1,96(%r13)
-	jmp	L$ctr_enc_done
-
-.p2align	4
-L$ctr_enc_short:
-	leaq	32(%rbp),%rdi
-	leaq	48(%rbp),%rsi
-	leaq	(%r15),%rdx
-	call	_asm_AES_encrypt
-	movdqu	(%r12),%xmm0
-	leaq	16(%r12),%r12
-	movl	44(%rbp),%eax
-	bswapl	%eax
-	pxor	48(%rbp),%xmm0
-	incl	%eax
-	movdqu	%xmm0,(%r13)
-	bswapl	%eax
-	leaq	16(%r13),%r13
-	movl	%eax,44(%rsp)
-	decq	%r14
-	jnz	L$ctr_enc_short
-
-L$ctr_enc_done:
-	leaq	(%rsp),%rax
-	pxor	%xmm0,%xmm0
-L$ctr_enc_bzero:
-	movdqa	%xmm0,0(%rax)
-	movdqa	%xmm0,16(%rax)
-	leaq	32(%rax),%rax
-	cmpq	%rax,%rbp
-	ja	L$ctr_enc_bzero
-
-	leaq	120(%rbp),%rax
-
-	movq	-48(%rax),%r15
-
-	movq	-40(%rax),%r14
-
-	movq	-32(%rax),%r13
-
-	movq	-24(%rax),%r12
-
-	movq	-16(%rax),%rbx
-
-	movq	-8(%rax),%rbp
-
-	leaq	(%rax),%rsp
-
-L$ctr_enc_epilogue:
-	.byte	0xf3,0xc3
-
-
-.globl	_bsaes_xts_encrypt
-
-.p2align	4
-_bsaes_xts_encrypt:
-
-	movq	%rsp,%rax
-L$xts_enc_prologue:
-	pushq	%rbp
-
-	pushq	%rbx
-
-	pushq	%r12
-
-	pushq	%r13
-
-	pushq	%r14
-
-	pushq	%r15
-
-	leaq	-72(%rsp),%rsp
-
-	movq	%rsp,%rbp
-
-	movq	%rdi,%r12
-	movq	%rsi,%r13
-	movq	%rdx,%r14
-	movq	%rcx,%r15
-
-	leaq	(%r9),%rdi
-	leaq	32(%rbp),%rsi
-	leaq	(%r8),%rdx
-	call	_asm_AES_encrypt
-
-	movl	240(%r15),%eax
-	movq	%r14,%rbx
-
-	movl	%eax,%edx
-	shlq	$7,%rax
-	subq	$96,%rax
-	subq	%rax,%rsp
-
-	movq	%rsp,%rax
-	movq	%r15,%rcx
-	movl	%edx,%r10d
-	call	_bsaes_key_convert
-	pxor	%xmm6,%xmm7
-	movdqa	%xmm7,(%rax)
-
-	andq	$-16,%r14
-	subq	$0x80,%rsp
-	movdqa	32(%rbp),%xmm6
-
-	pxor	%xmm14,%xmm14
-	movdqa	L$xts_magic(%rip),%xmm12
-	pcmpgtd	%xmm6,%xmm14
-
-	subq	$0x80,%r14
-	jc	L$xts_enc_short
-	jmp	L$xts_enc_loop
-
-.p2align	4
-L$xts_enc_loop:
-	pshufd	$0x13,%xmm14,%xmm13
-	pxor	%xmm14,%xmm14
-	movdqa	%xmm6,%xmm15
-	movdqa	%xmm6,0(%rsp)
-	paddq	%xmm6,%xmm6
-	pand	%xmm12,%xmm13
-	pcmpgtd	%xmm6,%xmm14
-	pxor	%xmm13,%xmm6
-	pshufd	$0x13,%xmm14,%xmm13
-	pxor	%xmm14,%xmm14
-	movdqa	%xmm6,%xmm0
-	movdqa	%xmm6,16(%rsp)
-	paddq	%xmm6,%xmm6
-	pand	%xmm12,%xmm13
-	pcmpgtd	%xmm6,%xmm14
-	pxor	%xmm13,%xmm6
-	movdqu	0(%r12),%xmm7
-	pshufd	$0x13,%xmm14,%xmm13
-	pxor	%xmm14,%xmm14
-	movdqa	%xmm6,%xmm1
-	movdqa	%xmm6,32(%rsp)
-	paddq	%xmm6,%xmm6
-	pand	%xmm12,%xmm13
-	pcmpgtd	%xmm6,%xmm14
-	pxor	%xmm13,%xmm6
-	movdqu	16(%r12),%xmm8
-	pxor	%xmm7,%xmm15
-	pshufd	$0x13,%xmm14,%xmm13
-	pxor	%xmm14,%xmm14
-	movdqa	%xmm6,%xmm2
-	movdqa	%xmm6,48(%rsp)
-	paddq	%xmm6,%xmm6
-	pand	%xmm12,%xmm13
-	pcmpgtd	%xmm6,%xmm14
-	pxor	%xmm13,%xmm6
-	movdqu	32(%r12),%xmm9
-	pxor	%xmm8,%xmm0
-	pshufd	$0x13,%xmm14,%xmm13
-	pxor	%xmm14,%xmm14
-	movdqa	%xmm6,%xmm3
-	movdqa	%xmm6,64(%rsp)
-	paddq	%xmm6,%xmm6
-	pand	%xmm12,%xmm13
-	pcmpgtd	%xmm6,%xmm14
-	pxor	%xmm13,%xmm6
-	movdqu	48(%r12),%xmm10
-	pxor	%xmm9,%xmm1
-	pshufd	$0x13,%xmm14,%xmm13
-	pxor	%xmm14,%xmm14
-	movdqa	%xmm6,%xmm4
-	movdqa	%xmm6,80(%rsp)
-	paddq	%xmm6,%xmm6
-	pand	%xmm12,%xmm13
-	pcmpgtd	%xmm6,%xmm14
-	pxor	%xmm13,%xmm6
-	movdqu	64(%r12),%xmm11
-	pxor	%xmm10,%xmm2
-	pshufd	$0x13,%xmm14,%xmm13
-	pxor	%xmm14,%xmm14
-	movdqa	%xmm6,%xmm5
-	movdqa	%xmm6,96(%rsp)
-	paddq	%xmm6,%xmm6
-	pand	%xmm12,%xmm13
-	pcmpgtd	%xmm6,%xmm14
-	pxor	%xmm13,%xmm6
-	movdqu	80(%r12),%xmm12
-	pxor	%xmm11,%xmm3
-	movdqu	96(%r12),%xmm13
-	pxor	%xmm12,%xmm4
-	movdqu	112(%r12),%xmm14
-	leaq	128(%r12),%r12
-	movdqa	%xmm6,112(%rsp)
-	pxor	%xmm13,%xmm5
-	leaq	128(%rsp),%rax
-	pxor	%xmm14,%xmm6
-	movl	%edx,%r10d
-
-	call	_bsaes_encrypt8
-
-	pxor	0(%rsp),%xmm15
-	pxor	16(%rsp),%xmm0
-	movdqu	%xmm15,0(%r13)
-	pxor	32(%rsp),%xmm3
-	movdqu	%xmm0,16(%r13)
-	pxor	48(%rsp),%xmm5
-	movdqu	%xmm3,32(%r13)
-	pxor	64(%rsp),%xmm2
-	movdqu	%xmm5,48(%r13)
-	pxor	80(%rsp),%xmm6
-	movdqu	%xmm2,64(%r13)
-	pxor	96(%rsp),%xmm1
-	movdqu	%xmm6,80(%r13)
-	pxor	112(%rsp),%xmm4
-	movdqu	%xmm1,96(%r13)
-	movdqu	%xmm4,112(%r13)
-	leaq	128(%r13),%r13
-
-	movdqa	112(%rsp),%xmm6
-	pxor	%xmm14,%xmm14
-	movdqa	L$xts_magic(%rip),%xmm12
-	pcmpgtd	%xmm6,%xmm14
-	pshufd	$0x13,%xmm14,%xmm13
-	pxor	%xmm14,%xmm14
-	paddq	%xmm6,%xmm6
-	pand	%xmm12,%xmm13
-	pcmpgtd	%xmm6,%xmm14
-	pxor	%xmm13,%xmm6
-
-	subq	$0x80,%r14
-	jnc	L$xts_enc_loop
-
-L$xts_enc_short:
-	addq	$0x80,%r14
-	jz	L$xts_enc_done
-	pshufd	$0x13,%xmm14,%xmm13
-	pxor	%xmm14,%xmm14
-	movdqa	%xmm6,%xmm15
-	movdqa	%xmm6,0(%rsp)
-	paddq	%xmm6,%xmm6
-	pand	%xmm12,%xmm13
-	pcmpgtd	%xmm6,%xmm14
-	pxor	%xmm13,%xmm6
-	pshufd	$0x13,%xmm14,%xmm13
-	pxor	%xmm14,%xmm14
-	movdqa	%xmm6,%xmm0
-	movdqa	%xmm6,16(%rsp)
-	paddq	%xmm6,%xmm6
-	pand	%xmm12,%xmm13
-	pcmpgtd	%xmm6,%xmm14
-	pxor	%xmm13,%xmm6
-	movdqu	0(%r12),%xmm7
-	cmpq	$16,%r14
-	je	L$xts_enc_1
-	pshufd	$0x13,%xmm14,%xmm13
-	pxor	%xmm14,%xmm14
-	movdqa	%xmm6,%xmm1
-	movdqa	%xmm6,32(%rsp)
-	paddq	%xmm6,%xmm6
-	pand	%xmm12,%xmm13
-	pcmpgtd	%xmm6,%xmm14
-	pxor	%xmm13,%xmm6
-	movdqu	16(%r12),%xmm8
-	cmpq	$32,%r14
-	je	L$xts_enc_2
-	pxor	%xmm7,%xmm15
-	pshufd	$0x13,%xmm14,%xmm13
-	pxor	%xmm14,%xmm14
-	movdqa	%xmm6,%xmm2
-	movdqa	%xmm6,48(%rsp)
-	paddq	%xmm6,%xmm6
-	pand	%xmm12,%xmm13
-	pcmpgtd	%xmm6,%xmm14
-	pxor	%xmm13,%xmm6
-	movdqu	32(%r12),%xmm9
-	cmpq	$48,%r14
-	je	L$xts_enc_3
-	pxor	%xmm8,%xmm0
-	pshufd	$0x13,%xmm14,%xmm13
-	pxor	%xmm14,%xmm14
-	movdqa	%xmm6,%xmm3
-	movdqa	%xmm6,64(%rsp)
-	paddq	%xmm6,%xmm6
-	pand	%xmm12,%xmm13
-	pcmpgtd	%xmm6,%xmm14
-	pxor	%xmm13,%xmm6
-	movdqu	48(%r12),%xmm10
-	cmpq	$64,%r14
-	je	L$xts_enc_4
-	pxor	%xmm9,%xmm1
-	pshufd	$0x13,%xmm14,%xmm13
-	pxor	%xmm14,%xmm14
-	movdqa	%xmm6,%xmm4
-	movdqa	%xmm6,80(%rsp)
-	paddq	%xmm6,%xmm6
-	pand	%xmm12,%xmm13
-	pcmpgtd	%xmm6,%xmm14
-	pxor	%xmm13,%xmm6
-	movdqu	64(%r12),%xmm11
-	cmpq	$80,%r14
-	je	L$xts_enc_5
-	pxor	%xmm10,%xmm2
-	pshufd	$0x13,%xmm14,%xmm13
-	pxor	%xmm14,%xmm14
-	movdqa	%xmm6,%xmm5
-	movdqa	%xmm6,96(%rsp)
-	paddq	%xmm6,%xmm6
-	pand	%xmm12,%xmm13
-	pcmpgtd	%xmm6,%xmm14
-	pxor	%xmm13,%xmm6
-	movdqu	80(%r12),%xmm12
-	cmpq	$96,%r14
-	je	L$xts_enc_6
-	pxor	%xmm11,%xmm3
-	movdqu	96(%r12),%xmm13
-	pxor	%xmm12,%xmm4
-	movdqa	%xmm6,112(%rsp)
-	leaq	112(%r12),%r12
-	pxor	%xmm13,%xmm5
-	leaq	128(%rsp),%rax
-	movl	%edx,%r10d
-
-	call	_bsaes_encrypt8
-
-	pxor	0(%rsp),%xmm15
-	pxor	16(%rsp),%xmm0
-	movdqu	%xmm15,0(%r13)
-	pxor	32(%rsp),%xmm3
-	movdqu	%xmm0,16(%r13)
-	pxor	48(%rsp),%xmm5
-	movdqu	%xmm3,32(%r13)
-	pxor	64(%rsp),%xmm2
-	movdqu	%xmm5,48(%r13)
-	pxor	80(%rsp),%xmm6
-	movdqu	%xmm2,64(%r13)
-	pxor	96(%rsp),%xmm1
-	movdqu	%xmm6,80(%r13)
-	movdqu	%xmm1,96(%r13)
-	leaq	112(%r13),%r13
-
-	movdqa	112(%rsp),%xmm6
-	jmp	L$xts_enc_done
-.p2align	4
-L$xts_enc_6:
-	pxor	%xmm11,%xmm3
-	leaq	96(%r12),%r12
-	pxor	%xmm12,%xmm4
-	leaq	128(%rsp),%rax
-	movl	%edx,%r10d
-
-	call	_bsaes_encrypt8
-
-	pxor	0(%rsp),%xmm15
-	pxor	16(%rsp),%xmm0
-	movdqu	%xmm15,0(%r13)
-	pxor	32(%rsp),%xmm3
-	movdqu	%xmm0,16(%r13)
-	pxor	48(%rsp),%xmm5
-	movdqu	%xmm3,32(%r13)
-	pxor	64(%rsp),%xmm2
-	movdqu	%xmm5,48(%r13)
-	pxor	80(%rsp),%xmm6
-	movdqu	%xmm2,64(%r13)
-	movdqu	%xmm6,80(%r13)
-	leaq	96(%r13),%r13
-
-	movdqa	96(%rsp),%xmm6
-	jmp	L$xts_enc_done
-.p2align	4
-L$xts_enc_5:
-	pxor	%xmm10,%xmm2
-	leaq	80(%r12),%r12
-	pxor	%xmm11,%xmm3
-	leaq	128(%rsp),%rax
-	movl	%edx,%r10d
-
-	call	_bsaes_encrypt8
-
-	pxor	0(%rsp),%xmm15
-	pxor	16(%rsp),%xmm0
-	movdqu	%xmm15,0(%r13)
-	pxor	32(%rsp),%xmm3
-	movdqu	%xmm0,16(%r13)
-	pxor	48(%rsp),%xmm5
-	movdqu	%xmm3,32(%r13)
-	pxor	64(%rsp),%xmm2
-	movdqu	%xmm5,48(%r13)
-	movdqu	%xmm2,64(%r13)
-	leaq	80(%r13),%r13
-
-	movdqa	80(%rsp),%xmm6
-	jmp	L$xts_enc_done
-.p2align	4
-L$xts_enc_4:
-	pxor	%xmm9,%xmm1
-	leaq	64(%r12),%r12
-	pxor	%xmm10,%xmm2
-	leaq	128(%rsp),%rax
-	movl	%edx,%r10d
-
-	call	_bsaes_encrypt8
-
-	pxor	0(%rsp),%xmm15
-	pxor	16(%rsp),%xmm0
-	movdqu	%xmm15,0(%r13)
-	pxor	32(%rsp),%xmm3
-	movdqu	%xmm0,16(%r13)
-	pxor	48(%rsp),%xmm5
-	movdqu	%xmm3,32(%r13)
-	movdqu	%xmm5,48(%r13)
-	leaq	64(%r13),%r13
-
-	movdqa	64(%rsp),%xmm6
-	jmp	L$xts_enc_done
-.p2align	4
-L$xts_enc_3:
-	pxor	%xmm8,%xmm0
-	leaq	48(%r12),%r12
-	pxor	%xmm9,%xmm1
-	leaq	128(%rsp),%rax
-	movl	%edx,%r10d
-
-	call	_bsaes_encrypt8
-
-	pxor	0(%rsp),%xmm15
-	pxor	16(%rsp),%xmm0
-	movdqu	%xmm15,0(%r13)
-	pxor	32(%rsp),%xmm3
-	movdqu	%xmm0,16(%r13)
-	movdqu	%xmm3,32(%r13)
-	leaq	48(%r13),%r13
-
-	movdqa	48(%rsp),%xmm6
-	jmp	L$xts_enc_done
-.p2align	4
-L$xts_enc_2:
-	pxor	%xmm7,%xmm15
-	leaq	32(%r12),%r12
-	pxor	%xmm8,%xmm0
-	leaq	128(%rsp),%rax
-	movl	%edx,%r10d
-
-	call	_bsaes_encrypt8
-
-	pxor	0(%rsp),%xmm15
-	pxor	16(%rsp),%xmm0
-	movdqu	%xmm15,0(%r13)
-	movdqu	%xmm0,16(%r13)
-	leaq	32(%r13),%r13
-
-	movdqa	32(%rsp),%xmm6
-	jmp	L$xts_enc_done
-.p2align	4
-L$xts_enc_1:
-	pxor	%xmm15,%xmm7
-	leaq	16(%r12),%r12
-	movdqa	%xmm7,32(%rbp)
-	leaq	32(%rbp),%rdi
-	leaq	32(%rbp),%rsi
-	leaq	(%r15),%rdx
-	call	_asm_AES_encrypt
-	pxor	32(%rbp),%xmm15
-
-
-
-
-
-	movdqu	%xmm15,0(%r13)
-	leaq	16(%r13),%r13
-
-	movdqa	16(%rsp),%xmm6
-
-L$xts_enc_done:
-	andl	$15,%ebx
-	jz	L$xts_enc_ret
-	movq	%r13,%rdx
-
-L$xts_enc_steal:
-	movzbl	(%r12),%eax
-	movzbl	-16(%rdx),%ecx
-	leaq	1(%r12),%r12
-	movb	%al,-16(%rdx)
-	movb	%cl,0(%rdx)
-	leaq	1(%rdx),%rdx
-	subl	$1,%ebx
-	jnz	L$xts_enc_steal
-
-	movdqu	-16(%r13),%xmm15
-	leaq	32(%rbp),%rdi
-	pxor	%xmm6,%xmm15
-	leaq	32(%rbp),%rsi
-	movdqa	%xmm15,32(%rbp)
-	leaq	(%r15),%rdx
-	call	_asm_AES_encrypt
-	pxor	32(%rbp),%xmm6
-	movdqu	%xmm6,-16(%r13)
-
-L$xts_enc_ret:
-	leaq	(%rsp),%rax
-	pxor	%xmm0,%xmm0
-L$xts_enc_bzero:
-	movdqa	%xmm0,0(%rax)
-	movdqa	%xmm0,16(%rax)
-	leaq	32(%rax),%rax
-	cmpq	%rax,%rbp
-	ja	L$xts_enc_bzero
-
-	leaq	120(%rbp),%rax
-
-	movq	-48(%rax),%r15
-
-	movq	-40(%rax),%r14
-
-	movq	-32(%rax),%r13
-
-	movq	-24(%rax),%r12
-
-	movq	-16(%rax),%rbx
-
-	movq	-8(%rax),%rbp
-
-	leaq	(%rax),%rsp
-
-L$xts_enc_epilogue:
-	.byte	0xf3,0xc3
-
-
-
-.globl	_bsaes_xts_decrypt
-
-.p2align	4
-_bsaes_xts_decrypt:
-
-	movq	%rsp,%rax
-L$xts_dec_prologue:
-	pushq	%rbp
-
-	pushq	%rbx
-
-	pushq	%r12
-
-	pushq	%r13
-
-	pushq	%r14
-
-	pushq	%r15
-
-	leaq	-72(%rsp),%rsp
-
-	movq	%rsp,%rbp
-	movq	%rdi,%r12
-	movq	%rsi,%r13
-	movq	%rdx,%r14
-	movq	%rcx,%r15
-
-	leaq	(%r9),%rdi
-	leaq	32(%rbp),%rsi
-	leaq	(%r8),%rdx
-	call	_asm_AES_encrypt
-
-	movl	240(%r15),%eax
-	movq	%r14,%rbx
-
-	movl	%eax,%edx
-	shlq	$7,%rax
-	subq	$96,%rax
-	subq	%rax,%rsp
-
-	movq	%rsp,%rax
-	movq	%r15,%rcx
-	movl	%edx,%r10d
-	call	_bsaes_key_convert
-	pxor	(%rsp),%xmm7
-	movdqa	%xmm6,(%rax)
-	movdqa	%xmm7,(%rsp)
-
-	xorl	%eax,%eax
-	andq	$-16,%r14
-	testl	$15,%ebx
-	setnz	%al
-	shlq	$4,%rax
-	subq	%rax,%r14
-
-	subq	$0x80,%rsp
-	movdqa	32(%rbp),%xmm6
-
-	pxor	%xmm14,%xmm14
-	movdqa	L$xts_magic(%rip),%xmm12
-	pcmpgtd	%xmm6,%xmm14
-
-	subq	$0x80,%r14
-	jc	L$xts_dec_short
-	jmp	L$xts_dec_loop
-
-.p2align	4
-L$xts_dec_loop:
-	pshufd	$0x13,%xmm14,%xmm13
-	pxor	%xmm14,%xmm14
-	movdqa	%xmm6,%xmm15
-	movdqa	%xmm6,0(%rsp)
-	paddq	%xmm6,%xmm6
-	pand	%xmm12,%xmm13
-	pcmpgtd	%xmm6,%xmm14
-	pxor	%xmm13,%xmm6
-	pshufd	$0x13,%xmm14,%xmm13
-	pxor	%xmm14,%xmm14
-	movdqa	%xmm6,%xmm0
-	movdqa	%xmm6,16(%rsp)
-	paddq	%xmm6,%xmm6
-	pand	%xmm12,%xmm13
-	pcmpgtd	%xmm6,%xmm14
-	pxor	%xmm13,%xmm6
-	movdqu	0(%r12),%xmm7
-	pshufd	$0x13,%xmm14,%xmm13
-	pxor	%xmm14,%xmm14
-	movdqa	%xmm6,%xmm1
-	movdqa	%xmm6,32(%rsp)
-	paddq	%xmm6,%xmm6
-	pand	%xmm12,%xmm13
-	pcmpgtd	%xmm6,%xmm14
-	pxor	%xmm13,%xmm6
-	movdqu	16(%r12),%xmm8
-	pxor	%xmm7,%xmm15
-	pshufd	$0x13,%xmm14,%xmm13
-	pxor	%xmm14,%xmm14
-	movdqa	%xmm6,%xmm2
-	movdqa	%xmm6,48(%rsp)
-	paddq	%xmm6,%xmm6
-	pand	%xmm12,%xmm13
-	pcmpgtd	%xmm6,%xmm14
-	pxor	%xmm13,%xmm6
-	movdqu	32(%r12),%xmm9
-	pxor	%xmm8,%xmm0
-	pshufd	$0x13,%xmm14,%xmm13
-	pxor	%xmm14,%xmm14
-	movdqa	%xmm6,%xmm3
-	movdqa	%xmm6,64(%rsp)
-	paddq	%xmm6,%xmm6
-	pand	%xmm12,%xmm13
-	pcmpgtd	%xmm6,%xmm14
-	pxor	%xmm13,%xmm6
-	movdqu	48(%r12),%xmm10
-	pxor	%xmm9,%xmm1
-	pshufd	$0x13,%xmm14,%xmm13
-	pxor	%xmm14,%xmm14
-	movdqa	%xmm6,%xmm4
-	movdqa	%xmm6,80(%rsp)
-	paddq	%xmm6,%xmm6
-	pand	%xmm12,%xmm13
-	pcmpgtd	%xmm6,%xmm14
-	pxor	%xmm13,%xmm6
-	movdqu	64(%r12),%xmm11
-	pxor	%xmm10,%xmm2
-	pshufd	$0x13,%xmm14,%xmm13
-	pxor	%xmm14,%xmm14
-	movdqa	%xmm6,%xmm5
-	movdqa	%xmm6,96(%rsp)
-	paddq	%xmm6,%xmm6
-	pand	%xmm12,%xmm13
-	pcmpgtd	%xmm6,%xmm14
-	pxor	%xmm13,%xmm6
-	movdqu	80(%r12),%xmm12
-	pxor	%xmm11,%xmm3
-	movdqu	96(%r12),%xmm13
-	pxor	%xmm12,%xmm4
-	movdqu	112(%r12),%xmm14
-	leaq	128(%r12),%r12
-	movdqa	%xmm6,112(%rsp)
-	pxor	%xmm13,%xmm5
-	leaq	128(%rsp),%rax
-	pxor	%xmm14,%xmm6
-	movl	%edx,%r10d
-
-	call	_bsaes_decrypt8
-
-	pxor	0(%rsp),%xmm15
-	pxor	16(%rsp),%xmm0
-	movdqu	%xmm15,0(%r13)
-	pxor	32(%rsp),%xmm5
-	movdqu	%xmm0,16(%r13)
-	pxor	48(%rsp),%xmm3
-	movdqu	%xmm5,32(%r13)
-	pxor	64(%rsp),%xmm1
-	movdqu	%xmm3,48(%r13)
-	pxor	80(%rsp),%xmm6
-	movdqu	%xmm1,64(%r13)
-	pxor	96(%rsp),%xmm2
-	movdqu	%xmm6,80(%r13)
-	pxor	112(%rsp),%xmm4
-	movdqu	%xmm2,96(%r13)
-	movdqu	%xmm4,112(%r13)
-	leaq	128(%r13),%r13
-
-	movdqa	112(%rsp),%xmm6
-	pxor	%xmm14,%xmm14
-	movdqa	L$xts_magic(%rip),%xmm12
-	pcmpgtd	%xmm6,%xmm14
-	pshufd	$0x13,%xmm14,%xmm13
-	pxor	%xmm14,%xmm14
-	paddq	%xmm6,%xmm6
-	pand	%xmm12,%xmm13
-	pcmpgtd	%xmm6,%xmm14
-	pxor	%xmm13,%xmm6
-
-	subq	$0x80,%r14
-	jnc	L$xts_dec_loop
-
-L$xts_dec_short:
-	addq	$0x80,%r14
-	jz	L$xts_dec_done
-	pshufd	$0x13,%xmm14,%xmm13
-	pxor	%xmm14,%xmm14
-	movdqa	%xmm6,%xmm15
-	movdqa	%xmm6,0(%rsp)
-	paddq	%xmm6,%xmm6
-	pand	%xmm12,%xmm13
-	pcmpgtd	%xmm6,%xmm14
-	pxor	%xmm13,%xmm6
-	pshufd	$0x13,%xmm14,%xmm13
-	pxor	%xmm14,%xmm14
-	movdqa	%xmm6,%xmm0
-	movdqa	%xmm6,16(%rsp)
-	paddq	%xmm6,%xmm6
-	pand	%xmm12,%xmm13
-	pcmpgtd	%xmm6,%xmm14
-	pxor	%xmm13,%xmm6
-	movdqu	0(%r12),%xmm7
-	cmpq	$16,%r14
-	je	L$xts_dec_1
-	pshufd	$0x13,%xmm14,%xmm13
-	pxor	%xmm14,%xmm14
-	movdqa	%xmm6,%xmm1
-	movdqa	%xmm6,32(%rsp)
-	paddq	%xmm6,%xmm6
-	pand	%xmm12,%xmm13
-	pcmpgtd	%xmm6,%xmm14
-	pxor	%xmm13,%xmm6
-	movdqu	16(%r12),%xmm8
-	cmpq	$32,%r14
-	je	L$xts_dec_2
-	pxor	%xmm7,%xmm15
-	pshufd	$0x13,%xmm14,%xmm13
-	pxor	%xmm14,%xmm14
-	movdqa	%xmm6,%xmm2
-	movdqa	%xmm6,48(%rsp)
-	paddq	%xmm6,%xmm6
-	pand	%xmm12,%xmm13
-	pcmpgtd	%xmm6,%xmm14
-	pxor	%xmm13,%xmm6
-	movdqu	32(%r12),%xmm9
-	cmpq	$48,%r14
-	je	L$xts_dec_3
-	pxor	%xmm8,%xmm0
-	pshufd	$0x13,%xmm14,%xmm13
-	pxor	%xmm14,%xmm14
-	movdqa	%xmm6,%xmm3
-	movdqa	%xmm6,64(%rsp)
-	paddq	%xmm6,%xmm6
-	pand	%xmm12,%xmm13
-	pcmpgtd	%xmm6,%xmm14
-	pxor	%xmm13,%xmm6
-	movdqu	48(%r12),%xmm10
-	cmpq	$64,%r14
-	je	L$xts_dec_4
-	pxor	%xmm9,%xmm1
-	pshufd	$0x13,%xmm14,%xmm13
-	pxor	%xmm14,%xmm14
-	movdqa	%xmm6,%xmm4
-	movdqa	%xmm6,80(%rsp)
-	paddq	%xmm6,%xmm6
-	pand	%xmm12,%xmm13
-	pcmpgtd	%xmm6,%xmm14
-	pxor	%xmm13,%xmm6
-	movdqu	64(%r12),%xmm11
-	cmpq	$80,%r14
-	je	L$xts_dec_5
-	pxor	%xmm10,%xmm2
-	pshufd	$0x13,%xmm14,%xmm13
-	pxor	%xmm14,%xmm14
-	movdqa	%xmm6,%xmm5
-	movdqa	%xmm6,96(%rsp)
-	paddq	%xmm6,%xmm6
-	pand	%xmm12,%xmm13
-	pcmpgtd	%xmm6,%xmm14
-	pxor	%xmm13,%xmm6
-	movdqu	80(%r12),%xmm12
-	cmpq	$96,%r14
-	je	L$xts_dec_6
-	pxor	%xmm11,%xmm3
-	movdqu	96(%r12),%xmm13
-	pxor	%xmm12,%xmm4
-	movdqa	%xmm6,112(%rsp)
-	leaq	112(%r12),%r12
-	pxor	%xmm13,%xmm5
-	leaq	128(%rsp),%rax
-	movl	%edx,%r10d
-
-	call	_bsaes_decrypt8
-
-	pxor	0(%rsp),%xmm15
-	pxor	16(%rsp),%xmm0
-	movdqu	%xmm15,0(%r13)
-	pxor	32(%rsp),%xmm5
-	movdqu	%xmm0,16(%r13)
-	pxor	48(%rsp),%xmm3
-	movdqu	%xmm5,32(%r13)
-	pxor	64(%rsp),%xmm1
-	movdqu	%xmm3,48(%r13)
-	pxor	80(%rsp),%xmm6
-	movdqu	%xmm1,64(%r13)
-	pxor	96(%rsp),%xmm2
-	movdqu	%xmm6,80(%r13)
-	movdqu	%xmm2,96(%r13)
-	leaq	112(%r13),%r13
-
-	movdqa	112(%rsp),%xmm6
-	jmp	L$xts_dec_done
-.p2align	4
-L$xts_dec_6:
-	pxor	%xmm11,%xmm3
-	leaq	96(%r12),%r12
-	pxor	%xmm12,%xmm4
-	leaq	128(%rsp),%rax
-	movl	%edx,%r10d
-
-	call	_bsaes_decrypt8
-
-	pxor	0(%rsp),%xmm15
-	pxor	16(%rsp),%xmm0
-	movdqu	%xmm15,0(%r13)
-	pxor	32(%rsp),%xmm5
-	movdqu	%xmm0,16(%r13)
-	pxor	48(%rsp),%xmm3
-	movdqu	%xmm5,32(%r13)
-	pxor	64(%rsp),%xmm1
-	movdqu	%xmm3,48(%r13)
-	pxor	80(%rsp),%xmm6
-	movdqu	%xmm1,64(%r13)
-	movdqu	%xmm6,80(%r13)
-	leaq	96(%r13),%r13
-
-	movdqa	96(%rsp),%xmm6
-	jmp	L$xts_dec_done
-.p2align	4
-L$xts_dec_5:
-	pxor	%xmm10,%xmm2
-	leaq	80(%r12),%r12
-	pxor	%xmm11,%xmm3
-	leaq	128(%rsp),%rax
-	movl	%edx,%r10d
-
-	call	_bsaes_decrypt8
-
-	pxor	0(%rsp),%xmm15
-	pxor	16(%rsp),%xmm0
-	movdqu	%xmm15,0(%r13)
-	pxor	32(%rsp),%xmm5
-	movdqu	%xmm0,16(%r13)
-	pxor	48(%rsp),%xmm3
-	movdqu	%xmm5,32(%r13)
-	pxor	64(%rsp),%xmm1
-	movdqu	%xmm3,48(%r13)
-	movdqu	%xmm1,64(%r13)
-	leaq	80(%r13),%r13
-
-	movdqa	80(%rsp),%xmm6
-	jmp	L$xts_dec_done
-.p2align	4
-L$xts_dec_4:
-	pxor	%xmm9,%xmm1
-	leaq	64(%r12),%r12
-	pxor	%xmm10,%xmm2
-	leaq	128(%rsp),%rax
-	movl	%edx,%r10d
-
-	call	_bsaes_decrypt8
-
-	pxor	0(%rsp),%xmm15
-	pxor	16(%rsp),%xmm0
-	movdqu	%xmm15,0(%r13)
-	pxor	32(%rsp),%xmm5
-	movdqu	%xmm0,16(%r13)
-	pxor	48(%rsp),%xmm3
-	movdqu	%xmm5,32(%r13)
-	movdqu	%xmm3,48(%r13)
-	leaq	64(%r13),%r13
-
-	movdqa	64(%rsp),%xmm6
-	jmp	L$xts_dec_done
-.p2align	4
-L$xts_dec_3:
-	pxor	%xmm8,%xmm0
-	leaq	48(%r12),%r12
-	pxor	%xmm9,%xmm1
-	leaq	128(%rsp),%rax
-	movl	%edx,%r10d
-
-	call	_bsaes_decrypt8
-
-	pxor	0(%rsp),%xmm15
-	pxor	16(%rsp),%xmm0
-	movdqu	%xmm15,0(%r13)
-	pxor	32(%rsp),%xmm5
-	movdqu	%xmm0,16(%r13)
-	movdqu	%xmm5,32(%r13)
-	leaq	48(%r13),%r13
-
-	movdqa	48(%rsp),%xmm6
-	jmp	L$xts_dec_done
-.p2align	4
-L$xts_dec_2:
-	pxor	%xmm7,%xmm15
-	leaq	32(%r12),%r12
-	pxor	%xmm8,%xmm0
-	leaq	128(%rsp),%rax
-	movl	%edx,%r10d
-
-	call	_bsaes_decrypt8
-
-	pxor	0(%rsp),%xmm15
-	pxor	16(%rsp),%xmm0
-	movdqu	%xmm15,0(%r13)
-	movdqu	%xmm0,16(%r13)
-	leaq	32(%r13),%r13
-
-	movdqa	32(%rsp),%xmm6
-	jmp	L$xts_dec_done
-.p2align	4
-L$xts_dec_1:
-	pxor	%xmm15,%xmm7
-	leaq	16(%r12),%r12
-	movdqa	%xmm7,32(%rbp)
-	leaq	32(%rbp),%rdi
-	leaq	32(%rbp),%rsi
-	leaq	(%r15),%rdx
-	call	_asm_AES_decrypt
-	pxor	32(%rbp),%xmm15
-
-
-
-
-
-	movdqu	%xmm15,0(%r13)
-	leaq	16(%r13),%r13
-
-	movdqa	16(%rsp),%xmm6
-
-L$xts_dec_done:
-	andl	$15,%ebx
-	jz	L$xts_dec_ret
-
-	pxor	%xmm14,%xmm14
-	movdqa	L$xts_magic(%rip),%xmm12
-	pcmpgtd	%xmm6,%xmm14
-	pshufd	$0x13,%xmm14,%xmm13
-	movdqa	%xmm6,%xmm5
-	paddq	%xmm6,%xmm6
-	pand	%xmm12,%xmm13
-	movdqu	(%r12),%xmm15
-	pxor	%xmm13,%xmm6
-
-	leaq	32(%rbp),%rdi
-	pxor	%xmm6,%xmm15
-	leaq	32(%rbp),%rsi
-	movdqa	%xmm15,32(%rbp)
-	leaq	(%r15),%rdx
-	call	_asm_AES_decrypt
-	pxor	32(%rbp),%xmm6
-	movq	%r13,%rdx
-	movdqu	%xmm6,(%r13)
-
-L$xts_dec_steal:
-	movzbl	16(%r12),%eax
-	movzbl	(%rdx),%ecx
-	leaq	1(%r12),%r12
-	movb	%al,(%rdx)
-	movb	%cl,16(%rdx)
-	leaq	1(%rdx),%rdx
-	subl	$1,%ebx
-	jnz	L$xts_dec_steal
-
-	movdqu	(%r13),%xmm15
-	leaq	32(%rbp),%rdi
-	pxor	%xmm5,%xmm15
-	leaq	32(%rbp),%rsi
-	movdqa	%xmm15,32(%rbp)
-	leaq	(%r15),%rdx
-	call	_asm_AES_decrypt
-	pxor	32(%rbp),%xmm5
-	movdqu	%xmm5,(%r13)
-
-L$xts_dec_ret:
-	leaq	(%rsp),%rax
-	pxor	%xmm0,%xmm0
-L$xts_dec_bzero:
-	movdqa	%xmm0,0(%rax)
-	movdqa	%xmm0,16(%rax)
-	leaq	32(%rax),%rax
-	cmpq	%rax,%rbp
-	ja	L$xts_dec_bzero
-
-	leaq	120(%rbp),%rax
-
-	movq	-48(%rax),%r15
-
-	movq	-40(%rax),%r14
-
-	movq	-32(%rax),%r13
-
-	movq	-24(%rax),%r12
-
-	movq	-16(%rax),%rbx
-
-	movq	-8(%rax),%rbp
-
-	leaq	(%rax),%rsp
-
-L$xts_dec_epilogue:
-	.byte	0xf3,0xc3
-
-
-
-.p2align	6
-_bsaes_const:
-L$M0ISR:
-.quad	0x0a0e0206070b0f03, 0x0004080c0d010509
-L$ISRM0:
-.quad	0x01040b0e0205080f, 0x0306090c00070a0d
-L$ISR:
-.quad	0x0504070602010003, 0x0f0e0d0c080b0a09
-L$BS0:
-.quad	0x5555555555555555, 0x5555555555555555
-L$BS1:
-.quad	0x3333333333333333, 0x3333333333333333
-L$BS2:
-.quad	0x0f0f0f0f0f0f0f0f, 0x0f0f0f0f0f0f0f0f
-L$SR:
-.quad	0x0504070600030201, 0x0f0e0d0c0a09080b
-L$SRM0:
-.quad	0x0304090e00050a0f, 0x01060b0c0207080d
-L$M0SR:
-.quad	0x0a0e02060f03070b, 0x0004080c05090d01
-L$SWPUP:
-.quad	0x0706050403020100, 0x0c0d0e0f0b0a0908
-L$SWPUPM0SR:
-.quad	0x0a0d02060c03070b, 0x0004080f05090e01
-L$ADD1:
-.quad	0x0000000000000000, 0x0000000100000000
-L$ADD2:
-.quad	0x0000000000000000, 0x0000000200000000
-L$ADD3:
-.quad	0x0000000000000000, 0x0000000300000000
-L$ADD4:
-.quad	0x0000000000000000, 0x0000000400000000
-L$ADD5:
-.quad	0x0000000000000000, 0x0000000500000000
-L$ADD6:
-.quad	0x0000000000000000, 0x0000000600000000
-L$ADD7:
-.quad	0x0000000000000000, 0x0000000700000000
-L$ADD8:
-.quad	0x0000000000000000, 0x0000000800000000
-L$xts_magic:
-.long	0x87,0,1,0
-L$masks:
-.quad	0x0101010101010101, 0x0101010101010101
-.quad	0x0202020202020202, 0x0202020202020202
-.quad	0x0404040404040404, 0x0404040404040404
-.quad	0x0808080808080808, 0x0808080808080808
-L$M0:
-.quad	0x02060a0e03070b0f, 0x0004080c0105090d
-L$63:
-.quad	0x6363636363636363, 0x6363636363636363
-.byte	66,105,116,45,115,108,105,99,101,100,32,65,69,83,32,102,111,114,32,120,56,54,95,54,52,47,83,83,83,69,51,44,32,69,109,105,108,105,97,32,75,195,164,115,112,101,114,44,32,80,101,116,101,114,32,83,99,104,119,97,98,101,44,32,65,110,100,121,32,80,111,108,121,97,107,111,118,0
-.p2align	6
-
diff --git a/deps/openssl/config/archs/darwin64-x86_64-cc/asm_avx2/crypto/bn/rsaz-x86_64.s b/deps/openssl/config/archs/darwin64-x86_64-cc/asm_avx2/crypto/bn/rsaz-x86_64.s
index eab5b54b2c..b572410a06 100644
--- a/deps/openssl/config/archs/darwin64-x86_64-cc/asm_avx2/crypto/bn/rsaz-x86_64.s
+++ b/deps/openssl/config/archs/darwin64-x86_64-cc/asm_avx2/crypto/bn/rsaz-x86_64.s
@@ -23,7 +23,7 @@ _rsaz_512_sqr:
 	subq	$128+24,%rsp
 
 L$sqr_body:
-	movq	%rdx,%rbp
+.byte	102,72,15,110,202
 	movq	(%rsi),%rdx
 	movq	8(%rsi),%rax
 	movq	%rcx,128(%rsp)
@@ -38,6 +38,7 @@ L$oop_sqr:
 	movl	%r8d,128+8(%rsp)
 
 	movq	%rdx,%rbx
+	movq	%rax,%rbp
 	mulq	%rdx
 	movq	%rax,%r8
 	movq	16(%rsi),%rax
@@ -76,31 +77,29 @@ L$oop_sqr:
 	mulq	%rbx
 	addq	%rax,%r14
 	movq	%rbx,%rax
-	movq	%rdx,%r15
-	adcq	$0,%r15
+	adcq	$0,%rdx
 
+	xorq	%rcx,%rcx
 	addq	%r8,%r8
-	movq	%r9,%rcx
-	adcq	%r9,%r9
+	movq	%rdx,%r15
+	adcq	$0,%rcx
 
 	mulq	%rax
-	movq	%rax,(%rsp)
-	addq	%rdx,%r8
-	adcq	$0,%r9
+	addq	%r8,%rdx
+	adcq	$0,%rcx
 
-	movq	%r8,8(%rsp)
-	shrq	$63,%rcx
+	movq	%rax,(%rsp)
+	movq	%rdx,8(%rsp)
 
 
-	movq	8(%rsi),%r8
 	movq	16(%rsi),%rax
-	mulq	%r8
+	mulq	%rbp
 	addq	%rax,%r10
 	movq	24(%rsi),%rax
 	movq	%rdx,%rbx
 	adcq	$0,%rbx
 
-	mulq	%r8
+	mulq	%rbp
 	addq	%rax,%r11
 	movq	32(%rsi),%rax
 	adcq	$0,%rdx
@@ -108,7 +107,7 @@ L$oop_sqr:
 	movq	%rdx,%rbx
 	adcq	$0,%rbx
 
-	mulq	%r8
+	mulq	%rbp
 	addq	%rax,%r12
 	movq	40(%rsi),%rax
 	adcq	$0,%rdx
@@ -116,7 +115,7 @@ L$oop_sqr:
 	movq	%rdx,%rbx
 	adcq	$0,%rbx
 
-	mulq	%r8
+	mulq	%rbp
 	addq	%rax,%r13
 	movq	48(%rsi),%rax
 	adcq	$0,%rdx
@@ -124,7 +123,7 @@ L$oop_sqr:
 	movq	%rdx,%rbx
 	adcq	$0,%rbx
 
-	mulq	%r8
+	mulq	%rbp
 	addq	%rax,%r14
 	movq	56(%rsi),%rax
 	adcq	$0,%rdx
@@ -132,39 +131,39 @@ L$oop_sqr:
 	movq	%rdx,%rbx
 	adcq	$0,%rbx
 
-	mulq	%r8
+	mulq	%rbp
 	addq	%rax,%r15
-	movq	%r8,%rax
+	movq	%rbp,%rax
 	adcq	$0,%rdx
 	addq	%rbx,%r15
-	movq	%rdx,%r8
-	movq	%r10,%rdx
-	adcq	$0,%r8
+	adcq	$0,%rdx
 
-	addq	%rdx,%rdx
-	leaq	(%rcx,%r10,2),%r10
-	movq	%r11,%rbx
-	adcq	%r11,%r11
+	xorq	%rbx,%rbx
+	addq	%r9,%r9
+	movq	%rdx,%r8
+	adcq	%r10,%r10
+	adcq	$0,%rbx
 
 	mulq	%rax
+
+	addq	%rcx,%rax
+	movq	16(%rsi),%rbp
 	addq	%rax,%r9
+	movq	24(%rsi),%rax
 	adcq	%rdx,%r10
-	adcq	$0,%r11
+	adcq	$0,%rbx
 
 	movq	%r9,16(%rsp)
 	movq	%r10,24(%rsp)
-	shrq	$63,%rbx
 
 
-	movq	16(%rsi),%r9
-	movq	24(%rsi),%rax
-	mulq	%r9
+	mulq	%rbp
 	addq	%rax,%r12
 	movq	32(%rsi),%rax
 	movq	%rdx,%rcx
 	adcq	$0,%rcx
 
-	mulq	%r9
+	mulq	%rbp
 	addq	%rax,%r13
 	movq	40(%rsi),%rax
 	adcq	$0,%rdx
@@ -172,7 +171,7 @@ L$oop_sqr:
 	movq	%rdx,%rcx
 	adcq	$0,%rcx
 
-	mulq	%r9
+	mulq	%rbp
 	addq	%rax,%r14
 	movq	48(%rsi),%rax
 	adcq	$0,%rdx
@@ -180,9 +179,7 @@ L$oop_sqr:
 	movq	%rdx,%rcx
 	adcq	$0,%rcx
 
-	mulq	%r9
-	movq	%r12,%r10
-	leaq	(%rbx,%r12,2),%r12
+	mulq	%rbp
 	addq	%rax,%r15
 	movq	56(%rsi),%rax
 	adcq	$0,%rdx
@@ -190,36 +187,40 @@ L$oop_sqr:
 	movq	%rdx,%rcx
 	adcq	$0,%rcx
 
-	mulq	%r9
-	shrq	$63,%r10
+	mulq	%rbp
 	addq	%rax,%r8
-	movq	%r9,%rax
+	movq	%rbp,%rax
 	adcq	$0,%rdx
 	addq	%rcx,%r8
-	movq	%rdx,%r9
-	adcq	$0,%r9
+	adcq	$0,%rdx
 
-	movq	%r13,%rcx
-	leaq	(%r10,%r13,2),%r13
+	xorq	%rcx,%rcx
+	addq	%r11,%r11
+	movq	%rdx,%r9
+	adcq	%r12,%r12
+	adcq	$0,%rcx
 
 	mulq	%rax
+
+	addq	%rbx,%rax
+	movq	24(%rsi),%r10
 	addq	%rax,%r11
+	movq	32(%rsi),%rax
 	adcq	%rdx,%r12
-	adcq	$0,%r13
+	adcq	$0,%rcx
 
 	movq	%r11,32(%rsp)
 	movq	%r12,40(%rsp)
-	shrq	$63,%rcx
 
 
-	movq	24(%rsi),%r10
-	movq	32(%rsi),%rax
+	movq	%rax,%r11
 	mulq	%r10
 	addq	%rax,%r14
 	movq	40(%rsi),%rax
 	movq	%rdx,%rbx
 	adcq	$0,%rbx
 
+	movq	%rax,%r12
 	mulq	%r10
 	addq	%rax,%r15
 	movq	48(%rsi),%rax
@@ -228,9 +229,8 @@ L$oop_sqr:
 	movq	%rdx,%rbx
 	adcq	$0,%rbx
 
+	movq	%rax,%rbp
 	mulq	%r10
-	movq	%r14,%r12
-	leaq	(%rcx,%r14,2),%r14
 	addq	%rax,%r8
 	movq	56(%rsi),%rax
 	adcq	$0,%rdx
@@ -239,32 +239,33 @@ L$oop_sqr:
 	adcq	$0,%rbx
 
 	mulq	%r10
-	shrq	$63,%r12
 	addq	%rax,%r9
 	movq	%r10,%rax
 	adcq	$0,%rdx
 	addq	%rbx,%r9
-	movq	%rdx,%r10
-	adcq	$0,%r10
+	adcq	$0,%rdx
 
-	movq	%r15,%rbx
-	leaq	(%r12,%r15,2),%r15
+	xorq	%rbx,%rbx
+	addq	%r13,%r13
+	movq	%rdx,%r10
+	adcq	%r14,%r14
+	adcq	$0,%rbx
 
 	mulq	%rax
+
+	addq	%rcx,%rax
 	addq	%rax,%r13
+	movq	%r12,%rax
 	adcq	%rdx,%r14
-	adcq	$0,%r15
+	adcq	$0,%rbx
 
 	movq	%r13,48(%rsp)
 	movq	%r14,56(%rsp)
-	shrq	$63,%rbx
 
 
-	movq	32(%rsi),%r11
-	movq	40(%rsi),%rax
 	mulq	%r11
 	addq	%rax,%r8
-	movq	48(%rsi),%rax
+	movq	%rbp,%rax
 	movq	%rdx,%rcx
 	adcq	$0,%rcx
 
@@ -272,97 +273,99 @@ L$oop_sqr:
 	addq	%rax,%r9
 	movq	56(%rsi),%rax
 	adcq	$0,%rdx
-	movq	%r8,%r12
-	leaq	(%rbx,%r8,2),%r8
 	addq	%rcx,%r9
 	movq	%rdx,%rcx
 	adcq	$0,%rcx
 
+	movq	%rax,%r14
 	mulq	%r11
-	shrq	$63,%r12
 	addq	%rax,%r10
 	movq	%r11,%rax
 	adcq	$0,%rdx
 	addq	%rcx,%r10
-	movq	%rdx,%r11
-	adcq	$0,%r11
+	adcq	$0,%rdx
 
-	movq	%r9,%rcx
-	leaq	(%r12,%r9,2),%r9
+	xorq	%rcx,%rcx
+	addq	%r15,%r15
+	movq	%rdx,%r11
+	adcq	%r8,%r8
+	adcq	$0,%rcx
 
 	mulq	%rax
+
+	addq	%rbx,%rax
 	addq	%rax,%r15
+	movq	%rbp,%rax
 	adcq	%rdx,%r8
-	adcq	$0,%r9
+	adcq	$0,%rcx
 
 	movq	%r15,64(%rsp)
 	movq	%r8,72(%rsp)
-	shrq	$63,%rcx
 
 
-	movq	40(%rsi),%r12
-	movq	48(%rsi),%rax
 	mulq	%r12
 	addq	%rax,%r10
-	movq	56(%rsi),%rax
+	movq	%r14,%rax
 	movq	%rdx,%rbx
 	adcq	$0,%rbx
 
 	mulq	%r12
 	addq	%rax,%r11
 	movq	%r12,%rax
-	movq	%r10,%r15
-	leaq	(%rcx,%r10,2),%r10
 	adcq	$0,%rdx
-	shrq	$63,%r15
 	addq	%rbx,%r11
-	movq	%rdx,%r12
-	adcq	$0,%r12
+	adcq	$0,%rdx
 
-	movq	%r11,%rbx
-	leaq	(%r15,%r11,2),%r11
+	xorq	%rbx,%rbx
+	addq	%r9,%r9
+	movq	%rdx,%r12
+	adcq	%r10,%r10
+	adcq	$0,%rbx
 
 	mulq	%rax
+
+	addq	%rcx,%rax
 	addq	%rax,%r9
+	movq	%r14,%rax
 	adcq	%rdx,%r10
-	adcq	$0,%r11
+	adcq	$0,%rbx
 
 	movq	%r9,80(%rsp)
 	movq	%r10,88(%rsp)
 
 
-	movq	48(%rsi),%r13
-	movq	56(%rsi),%rax
-	mulq	%r13
+	mulq	%rbp
 	addq	%rax,%r12
-	movq	%r13,%rax
-	movq	%rdx,%r13
-	adcq	$0,%r13
+	movq	%rbp,%rax
+	adcq	$0,%rdx
 
-	xorq	%r14,%r14
-	shlq	$1,%rbx
+	xorq	%rcx,%rcx
+	addq	%r11,%r11
+	movq	%rdx,%r13
 	adcq	%r12,%r12
-	adcq	%r13,%r13
-	adcq	%r14,%r14
+	adcq	$0,%rcx
 
 	mulq	%rax
+
+	addq	%rbx,%rax
 	addq	%rax,%r11
+	movq	%r14,%rax
 	adcq	%rdx,%r12
-	adcq	$0,%r13
+	adcq	$0,%rcx
 
 	movq	%r11,96(%rsp)
 	movq	%r12,104(%rsp)
 
 
-	movq	56(%rsi),%rax
-	mulq	%rax
-	addq	%rax,%r13
-	adcq	$0,%rdx
+	xorq	%rbx,%rbx
+	addq	%r13,%r13
+	adcq	$0,%rbx
 
-	addq	%rdx,%r14
+	mulq	%rax
 
-	movq	%r13,112(%rsp)
-	movq	%r14,120(%rsp)
+	addq	%rcx,%rax
+	addq	%r13,%rax
+	adcq	%rbx,%rdx
 
 	movq	(%rsp),%r8
 	movq	8(%rsp),%r9
@@ -372,6 +375,10 @@ L$oop_sqr:
 	movq	40(%rsp),%r13
 	movq	48(%rsp),%r14
 	movq	56(%rsp),%r15
+.byte	102,72,15,126,205
+
+	movq	%rax,112(%rsp)
+	movq	%rdx,120(%rsp)
 
 	call	__rsaz_512_reduce
 
@@ -400,9 +407,9 @@ L$oop_sqr:
 L$oop_sqrx:
 	movl	%r8d,128+8(%rsp)
 .byte	102,72,15,110,199
-.byte	102,72,15,110,205
 
 	mulxq	%rax,%r8,%r9
+	movq	%rax,%rbx
 
 	mulxq	16(%rsi),%rcx,%r10
 	xorq	%rbp,%rbp
@@ -410,40 +417,39 @@ L$oop_sqrx:
 	mulxq	24(%rsi),%rax,%r11
 	adcxq	%rcx,%r9
 
-	mulxq	32(%rsi),%rcx,%r12
+.byte	0xc4,0x62,0xf3,0xf6,0xa6,0x20,0x00,0x00,0x00
 	adcxq	%rax,%r10
 
-	mulxq	40(%rsi),%rax,%r13
+.byte	0xc4,0x62,0xfb,0xf6,0xae,0x28,0x00,0x00,0x00
 	adcxq	%rcx,%r11
 
-.byte	0xc4,0x62,0xf3,0xf6,0xb6,0x30,0x00,0x00,0x00
+	mulxq	48(%rsi),%rcx,%r14
 	adcxq	%rax,%r12
 	adcxq	%rcx,%r13
 
-.byte	0xc4,0x62,0xfb,0xf6,0xbe,0x38,0x00,0x00,0x00
+	mulxq	56(%rsi),%rax,%r15
 	adcxq	%rax,%r14
 	adcxq	%rbp,%r15
 
-	movq	%r9,%rcx
-	shldq	$1,%r8,%r9
-	shlq	$1,%r8
-
-	xorl	%ebp,%ebp
-	mulxq	%rdx,%rax,%rdx
-	adcxq	%rdx,%r8
-	movq	8(%rsi),%rdx
-	adcxq	%rbp,%r9
+	mulxq	%rdx,%rax,%rdi
+	movq	%rbx,%rdx
+	xorq	%rcx,%rcx
+	adoxq	%r8,%r8
+	adcxq	%rdi,%r8
+	adoxq	%rbp,%rcx
+	adcxq	%rbp,%rcx
 
 	movq	%rax,(%rsp)
 	movq	%r8,8(%rsp)
 
 
-	mulxq	16(%rsi),%rax,%rbx
+.byte	0xc4,0xe2,0xfb,0xf6,0x9e,0x10,0x00,0x00,0x00
 	adoxq	%rax,%r10
 	adcxq	%rbx,%r11
 
-.byte	0xc4,0x62,0xc3,0xf6,0x86,0x18,0x00,0x00,0x00
+	mulxq	24(%rsi),%rdi,%r8
 	adoxq	%rdi,%r11
+.byte	0x66
 	adcxq	%r8,%r12
 
 	mulxq	32(%rsi),%rax,%rbx
@@ -461,24 +467,25 @@ L$oop_sqrx:
 .byte	0xc4,0x62,0xc3,0xf6,0x86,0x38,0x00,0x00,0x00
 	adoxq	%rdi,%r15
 	adcxq	%rbp,%r8
+	mulxq	%rdx,%rax,%rdi
 	adoxq	%rbp,%r8
+.byte	0x48,0x8b,0x96,0x10,0x00,0x00,0x00
 
-	movq	%r11,%rbx
-	shldq	$1,%r10,%r11
-	shldq	$1,%rcx,%r10
+	xorq	%rbx,%rbx
+	adoxq	%r9,%r9
 
-	xorl	%ebp,%ebp
-	mulxq	%rdx,%rax,%rcx
-	movq	16(%rsi),%rdx
+	adcxq	%rcx,%rax
+	adoxq	%r10,%r10
 	adcxq	%rax,%r9
-	adcxq	%rcx,%r10
-	adcxq	%rbp,%r11
+	adoxq	%rbp,%rbx
+	adcxq	%rdi,%r10
+	adcxq	%rbp,%rbx
 
 	movq	%r9,16(%rsp)
 .byte	0x4c,0x89,0x94,0x24,0x18,0x00,0x00,0x00
 
 
-.byte	0xc4,0x62,0xc3,0xf6,0x8e,0x18,0x00,0x00,0x00
+	mulxq	24(%rsi),%rdi,%r9
 	adoxq	%rdi,%r12
 	adcxq	%r9,%r13
 
@@ -486,7 +493,7 @@ L$oop_sqrx:
 	adoxq	%rax,%r13
 	adcxq	%rcx,%r14
 
-	mulxq	40(%rsi),%rdi,%r9
+.byte	0xc4,0x62,0xc3,0xf6,0x8e,0x28,0x00,0x00,0x00
 	adoxq	%rdi,%r14
 	adcxq	%r9,%r15
 
@@ -494,27 +501,28 @@ L$oop_sqrx:
 	adoxq	%rax,%r15
 	adcxq	%rcx,%r8
 
-.byte	0xc4,0x62,0xc3,0xf6,0x8e,0x38,0x00,0x00,0x00
+	mulxq	56(%rsi),%rdi,%r9
 	adoxq	%rdi,%r8
 	adcxq	%rbp,%r9
+	mulxq	%rdx,%rax,%rdi
 	adoxq	%rbp,%r9
+	movq	24(%rsi),%rdx
 
-	movq	%r13,%rcx
-	shldq	$1,%r12,%r13
-	shldq	$1,%rbx,%r12
+	xorq	%rcx,%rcx
+	adoxq	%r11,%r11
 
-	xorl	%ebp,%ebp
-	mulxq	%rdx,%rax,%rdx
+	adcxq	%rbx,%rax
+	adoxq	%r12,%r12
 	adcxq	%rax,%r11
-	adcxq	%rdx,%r12
-	movq	24(%rsi),%rdx
-	adcxq	%rbp,%r13
+	adoxq	%rbp,%rcx
+	adcxq	%rdi,%r12
+	adcxq	%rbp,%rcx
 
 	movq	%r11,32(%rsp)
-.byte	0x4c,0x89,0xa4,0x24,0x28,0x00,0x00,0x00
+	movq	%r12,40(%rsp)
 
 
-.byte	0xc4,0xe2,0xfb,0xf6,0x9e,0x20,0x00,0x00,0x00
+	mulxq	32(%rsi),%rax,%rbx
 	adoxq	%rax,%r14
 	adcxq	%rbx,%r15
 
@@ -529,25 +537,25 @@ L$oop_sqrx:
 	mulxq	56(%rsi),%rdi,%r10
 	adoxq	%rdi,%r9
 	adcxq	%rbp,%r10
+	mulxq	%rdx,%rax,%rdi
 	adoxq	%rbp,%r10
+	movq	32(%rsi),%rdx
 
-.byte	0x66
-	movq	%r15,%rbx
-	shldq	$1,%r14,%r15
-	shldq	$1,%rcx,%r14
+	xorq	%rbx,%rbx
+	adoxq	%r13,%r13
 
-	xorl	%ebp,%ebp
-	mulxq	%rdx,%rax,%rdx
+	adcxq	%rcx,%rax
+	adoxq	%r14,%r14
 	adcxq	%rax,%r13
-	adcxq	%rdx,%r14
-	movq	32(%rsi),%rdx
-	adcxq	%rbp,%r15
+	adoxq	%rbp,%rbx
+	adcxq	%rdi,%r14
+	adcxq	%rbp,%rbx
 
 	movq	%r13,48(%rsp)
 	movq	%r14,56(%rsp)
 
 
-.byte	0xc4,0x62,0xc3,0xf6,0x9e,0x28,0x00,0x00,0x00
+	mulxq	40(%rsi),%rdi,%r11
 	adoxq	%rdi,%r8
 	adcxq	%r11,%r9
 
@@ -558,18 +566,19 @@ L$oop_sqrx:
 	mulxq	56(%rsi),%rdi,%r11
 	adoxq	%rdi,%r10
 	adcxq	%rbp,%r11
+	mulxq	%rdx,%rax,%rdi
+	movq	40(%rsi),%rdx
 	adoxq	%rbp,%r11
 
-	movq	%r9,%rcx
-	shldq	$1,%r8,%r9
-	shldq	$1,%rbx,%r8
+	xorq	%rcx,%rcx
+	adoxq	%r15,%r15
 
-	xorl	%ebp,%ebp
-	mulxq	%rdx,%rax,%rdx
+	adcxq	%rbx,%rax
+	adoxq	%r8,%r8
 	adcxq	%rax,%r15
-	adcxq	%rdx,%r8
-	movq	40(%rsi),%rdx
-	adcxq	%rbp,%r9
+	adoxq	%rbp,%rcx
+	adcxq	%rdi,%r8
+	adcxq	%rbp,%rcx
 
 	movq	%r15,64(%rsp)
 	movq	%r8,72(%rsp)
@@ -582,18 +591,19 @@ L$oop_sqrx:
 .byte	0xc4,0x62,0xc3,0xf6,0xa6,0x38,0x00,0x00,0x00
 	adoxq	%rdi,%r11
 	adcxq	%rbp,%r12
+	mulxq	%rdx,%rax,%rdi
 	adoxq	%rbp,%r12
+	movq	48(%rsi),%rdx
 
-	movq	%r11,%rbx
-	shldq	$1,%r10,%r11
-	shldq	$1,%rcx,%r10
+	xorq	%rbx,%rbx
+	adoxq	%r9,%r9
 
-	xorl	%ebp,%ebp
-	mulxq	%rdx,%rax,%rdx
+	adcxq	%rcx,%rax
+	adoxq	%r10,%r10
 	adcxq	%rax,%r9
-	adcxq	%rdx,%r10
-	movq	48(%rsi),%rdx
-	adcxq	%rbp,%r11
+	adcxq	%rdi,%r10
+	adoxq	%rbp,%rbx
+	adcxq	%rbp,%rbx
 
 	movq	%r9,80(%rsp)
 	movq	%r10,88(%rsp)
@@ -603,31 +613,31 @@ L$oop_sqrx:
 	adoxq	%rax,%r12
 	adoxq	%rbp,%r13
 
-	xorq	%r14,%r14
-	shldq	$1,%r13,%r14
-	shldq	$1,%r12,%r13
-	shldq	$1,%rbx,%r12
+	mulxq	%rdx,%rax,%rdi
+	xorq	%rcx,%rcx
+	movq	56(%rsi),%rdx
+	adoxq	%r11,%r11
 
-	xorl	%ebp,%ebp
-	mulxq	%rdx,%rax,%rdx
+	adcxq	%rbx,%rax
+	adoxq	%r12,%r12
 	adcxq	%rax,%r11
-	adcxq	%rdx,%r12
-	movq	56(%rsi),%rdx
-	adcxq	%rbp,%r13
+	adoxq	%rbp,%rcx
+	adcxq	%rdi,%r12
+	adcxq	%rbp,%rcx
 
 .byte	0x4c,0x89,0x9c,0x24,0x60,0x00,0x00,0x00
 .byte	0x4c,0x89,0xa4,0x24,0x68,0x00,0x00,0x00
 
 
 	mulxq	%rdx,%rax,%rdx
-	adoxq	%rax,%r13
-	adoxq	%rbp,%rdx
+	xorq	%rbx,%rbx
+	adoxq	%r13,%r13
 
-.byte	0x66
-	addq	%rdx,%r14
+	adcxq	%rcx,%rax
+	adoxq	%rbp,%rbx
+	adcxq	%r13,%rax
+	adcxq	%rdx,%rbx
 
-	movq	%r13,112(%rsp)
-	movq	%r14,120(%rsp)
 .byte	102,72,15,126,199
 .byte	102,72,15,126,205
 
@@ -641,6 +651,9 @@ L$oop_sqrx:
 	movq	48(%rsp),%r14
 	movq	56(%rsp),%r15
 
+	movq	%rax,112(%rsp)
+	movq	%rbx,120(%rsp)
+
 	call	__rsaz_512_reducex
 
 	addq	64(%rsp),%r8
@@ -1410,6 +1423,7 @@ L$mul_by_one_epilogue:
 
 .p2align	5
 __rsaz_512_reduce:
+
 	movq	%r8,%rbx
 	imulq	128+8(%rsp),%rbx
 	movq	0(%rbp),%rax
@@ -1491,9 +1505,11 @@ L$reduction_loop:
 	.byte	0xf3,0xc3
 
 
+
 .p2align	5
 __rsaz_512_reducex:
 
+
 	imulq	%r8,%rdx
 	xorq	%rsi,%rsi
 	movl	$8,%ecx
@@ -1547,8 +1563,10 @@ L$reduction_loopx:
 	.byte	0xf3,0xc3
 
 
+
 .p2align	5
 __rsaz_512_subtract:
+
 	movq	%r8,(%rdi)
 	movq	%r9,8(%rdi)
 	movq	%r10,16(%rdi)
@@ -1604,8 +1622,10 @@ __rsaz_512_subtract:
 	.byte	0xf3,0xc3
 
 
+
 .p2align	5
 __rsaz_512_mul:
+
 	leaq	8(%rsp),%rdi
 
 	movq	(%rsi),%rax
@@ -1746,8 +1766,10 @@ L$oop_mul:
 	.byte	0xf3,0xc3
 
 
+
 .p2align	5
 __rsaz_512_mulx:
+
 	mulxq	(%rsi),%rbx,%r8
 	movq	$-6,%rcx
 
@@ -1865,10 +1887,12 @@ L$oop_mulx:
 
 	.byte	0xf3,0xc3
 
+
 .globl	_rsaz_512_scatter4
 
 .p2align	4
 _rsaz_512_scatter4:
+
 	leaq	(%rdi,%rdx,8),%rdi
 	movl	$8,%r9d
 	jmp	L$oop_scatter
@@ -1883,10 +1907,12 @@ L$oop_scatter:
 	.byte	0xf3,0xc3
 
 
+
 .globl	_rsaz_512_gather4
 
 .p2align	4
 _rsaz_512_gather4:
+
 	movd	%edx,%xmm8
 	movdqa	L$inc+16(%rip),%xmm1
 	movdqa	L$inc(%rip),%xmm0
@@ -1952,6 +1978,7 @@ L$oop_gather:
 L$SEH_end_rsaz_512_gather4:
 
 
+
 .p2align	6
 L$inc:
 .long	0,0, 1,1
diff --git a/deps/openssl/config/archs/darwin64-x86_64-cc/asm_avx2/crypto/bn/x86_64-mont5.s b/deps/openssl/config/archs/darwin64-x86_64-cc/asm_avx2/crypto/bn/x86_64-mont5.s
index ee0ef1639a..6712682a60 100644
--- a/deps/openssl/config/archs/darwin64-x86_64-cc/asm_avx2/crypto/bn/x86_64-mont5.s
+++ b/deps/openssl/config/archs/darwin64-x86_64-cc/asm_avx2/crypto/bn/x86_64-mont5.s
@@ -550,6 +550,7 @@ L$mul4x_epilogue:
 
 .p2align	5
 mul4x_internal:
+
 	shlq	$5,%r9
 	movd	8(%rax),%xmm5
 	leaq	L$inc(%rip),%rax
@@ -1072,6 +1073,7 @@ L$inner4x:
 	movq	24(%rbp),%r15
 	jmp	L$sqr4x_sub_entry
 
+
 .globl	_bn_power5
 
 .p2align	5
@@ -1286,6 +1288,7 @@ __bn_sqr8x_internal:
 
 
 
+
 	leaq	32(%r10),%rbp
 	leaq	(%rsi,%r9,1),%rsi
 
@@ -1989,8 +1992,10 @@ L$8x_no_tail:
 	.byte	0xf3,0xc3
 
 
+
 .p2align	5
 __bn_post4x_internal:
+
 	movq	0(%rbp),%r12
 	leaq	(%rdi,%r9,1),%rbx
 	movq	%r9,%rcx
@@ -2042,10 +2047,12 @@ L$sqr4x_sub_entry:
 	negq	%r9
 	.byte	0xf3,0xc3
 
+
 .globl	_bn_from_montgomery
 
 .p2align	5
 _bn_from_montgomery:
+
 	testl	$7,%r9d
 	jz	bn_from_mont8x
 	xorl	%eax,%eax
@@ -2053,6 +2060,7 @@ _bn_from_montgomery:
 
 
 
+
 .p2align	5
 bn_from_mont8x:
 
@@ -2333,6 +2341,7 @@ L$mulx4x_epilogue:
 
 .p2align	5
 mulx4x_internal:
+
 	movq	%r9,8(%rsp)
 	movq	%r9,%r10
 	negq	%r9
@@ -2753,6 +2762,7 @@ L$mulx4x_inner:
 	jmp	L$sqrx4x_sub_entry
 
 
+
 .p2align	5
 bn_powerx5:
 
@@ -3509,6 +3519,7 @@ L$sqrx8x_no_tail:
 
 .p2align	5
 __bn_postx4x_internal:
+
 	movq	0(%rbp),%r12
 	movq	%rcx,%r10
 	movq	%rcx,%r9
@@ -3557,10 +3568,12 @@ L$sqrx4x_sub_entry:
 
 	.byte	0xf3,0xc3
 
+
 .globl	_bn_get_bits5
 
 .p2align	4
 _bn_get_bits5:
+
 	leaq	0(%rdi),%r10
 	leaq	1(%rdi),%r11
 	movl	%esi,%ecx
@@ -3576,10 +3589,12 @@ _bn_get_bits5:
 	.byte	0xf3,0xc3
 
 
+
 .globl	_bn_scatter5
 
 .p2align	4
 _bn_scatter5:
+
 	cmpl	$0,%esi
 	jz	L$scatter_epilogue
 	leaq	(%rdx,%rcx,8),%rdx
@@ -3594,12 +3609,14 @@ L$scatter_epilogue:
 	.byte	0xf3,0xc3
 
 
+
 .globl	_bn_gather5
 
 .p2align	5
 _bn_gather5:
 L$SEH_begin_bn_gather5:
 
+
 .byte	0x4c,0x8d,0x14,0x24
 .byte	0x48,0x81,0xec,0x08,0x01,0x00,0x00
 	leaq	L$inc(%rip),%rax
@@ -3757,6 +3774,7 @@ L$gather:
 	.byte	0xf3,0xc3
 L$SEH_end_bn_gather5:
 
+
 .p2align	6
 L$inc:
 .long	0,0, 1,1
diff --git a/deps/openssl/config/archs/darwin64-x86_64-cc/asm_avx2/crypto/buildinf.h b/deps/openssl/config/archs/darwin64-x86_64-cc/asm_avx2/crypto/buildinf.h
index da2e3d5150..7847154abb 100644
--- a/deps/openssl/config/archs/darwin64-x86_64-cc/asm_avx2/crypto/buildinf.h
+++ b/deps/openssl/config/archs/darwin64-x86_64-cc/asm_avx2/crypto/buildinf.h
@@ -11,7 +11,7 @@
  */
 
 #define PLATFORM "platform: darwin64-x86_64-cc"
-#define DATE "built on: Fri Sep 13 15:58:21 2019 UTC"
+#define DATE "built on: Wed Mar 18 21:05:29 2020 UTC"
 
 /*
  * Generate compiler_flags as an array of individual characters. This is a
@@ -36,11 +36,12 @@ static const char compiler_flags[] = {
     'S','H','A','2','5','6','_','A','S','M',' ','-','D','S','H','A',
     '5','1','2','_','A','S','M',' ','-','D','K','E','C','C','A','K',
     '1','6','0','0','_','A','S','M',' ','-','D','R','C','4','_','A',
-    'S','M',' ','-','D','M','D','5','_','A','S','M',' ','-','D','V',
-    'P','A','E','S','_','A','S','M',' ','-','D','G','H','A','S','H',
-    '_','A','S','M',' ','-','D','E','C','P','_','N','I','S','T','Z',
-    '2','5','6','_','A','S','M',' ','-','D','X','2','5','5','1','9',
-    '_','A','S','M',' ','-','D','P','O','L','Y','1','3','0','5','_',
-    'A','S','M',' ','-','D','_','R','E','E','N','T','R','A','N','T',
-    ' ','-','D','N','D','E','B','U','G','\0'
+    'S','M',' ','-','D','M','D','5','_','A','S','M',' ','-','D','A',
+    'E','S','N','I','_','A','S','M',' ','-','D','V','P','A','E','S',
+    '_','A','S','M',' ','-','D','G','H','A','S','H','_','A','S','M',
+    ' ','-','D','E','C','P','_','N','I','S','T','Z','2','5','6','_',
+    'A','S','M',' ','-','D','X','2','5','5','1','9','_','A','S','M',
+    ' ','-','D','P','O','L','Y','1','3','0','5','_','A','S','M',' ',
+    '-','D','_','R','E','E','N','T','R','A','N','T',' ','-','D','N',
+    'D','E','B','U','G','\0'
 };
diff --git a/deps/openssl/config/archs/darwin64-x86_64-cc/asm_avx2/crypto/camellia/cmll-x86_64.s b/deps/openssl/config/archs/darwin64-x86_64-cc/asm_avx2/crypto/camellia/cmll-x86_64.s
index 2ae924deec..d815175ff5 100644
--- a/deps/openssl/config/archs/darwin64-x86_64-cc/asm_avx2/crypto/camellia/cmll-x86_64.s
+++ b/deps/openssl/config/archs/darwin64-x86_64-cc/asm_avx2/crypto/camellia/cmll-x86_64.s
@@ -5,6 +5,7 @@
 
 .p2align	4
 _Camellia_EncryptBlock:
+
 	movl	$128,%eax
 	subl	%edi,%eax
 	movl	$3,%edi
@@ -12,6 +13,7 @@ _Camellia_EncryptBlock:
 	jmp	L$enc_rounds
 
 
+
 .globl	_Camellia_EncryptBlock_Rounds
 
 .p2align	4
@@ -78,6 +80,7 @@ L$enc_epilogue:
 
 .p2align	4
 _x86_64_Camellia_encrypt:
+
 	xorl	0(%r14),%r9d
 	xorl	4(%r14),%r8d
 	xorl	8(%r14),%r11d
@@ -283,10 +286,12 @@ L$edone:
 
 
 
+
 .globl	_Camellia_DecryptBlock
 
 .p2align	4
 _Camellia_DecryptBlock:
+
 	movl	$128,%eax
 	subl	%edi,%eax
 	movl	$3,%edi
@@ -294,6 +299,7 @@ _Camellia_DecryptBlock:
 	jmp	L$dec_rounds
 
 
+
 .globl	_Camellia_DecryptBlock_Rounds
 
 .p2align	4
@@ -360,6 +366,7 @@ L$dec_epilogue:
 
 .p2align	4
 _x86_64_Camellia_decrypt:
+
 	xorl	0(%r14),%r9d
 	xorl	4(%r14),%r8d
 	xorl	8(%r14),%r11d
@@ -564,6 +571,7 @@ L$ddone:
 
 .byte	0xf3,0xc3
 
+
 .globl	_Camellia_Ekeygen
 
 .p2align	4
diff --git a/deps/openssl/config/archs/darwin64-x86_64-cc/asm_avx2/crypto/ec/ecp_nistz256-x86_64.s b/deps/openssl/config/archs/darwin64-x86_64-cc/asm_avx2/crypto/ec/ecp_nistz256-x86_64.s
index ff7ae72344..dc6bed3b5b 100644
--- a/deps/openssl/config/archs/darwin64-x86_64-cc/asm_avx2/crypto/ec/ecp_nistz256-x86_64.s
+++ b/deps/openssl/config/archs/darwin64-x86_64-cc/asm_avx2/crypto/ec/ecp_nistz256-x86_64.s
@@ -3838,6 +3838,7 @@ L$ord_sqrx_epilogue:
 
 .p2align	5
 _ecp_nistz256_to_mont:
+
 	movl	$0x80100,%ecx
 	andl	_OPENSSL_ia32cap_P+8(%rip),%ecx
 	leaq	L$RR(%rip),%rdx
@@ -3850,6 +3851,7 @@ _ecp_nistz256_to_mont:
 
 
 
+
 .globl	_ecp_nistz256_mul_mont
 
 .p2align	5
@@ -4771,6 +4773,7 @@ L$from_epilogue:
 
 .p2align	5
 _ecp_nistz256_scatter_w5:
+
 	leal	-3(%rdx,%rdx,2),%edx
 	movdqa	0(%rsi),%xmm0
 	shll	$5,%edx
@@ -4791,6 +4794,7 @@ _ecp_nistz256_scatter_w5:
 
 
 
+
 .globl	_ecp_nistz256_gather_w5
 
 .p2align	5
@@ -4860,6 +4864,7 @@ L$SEH_end_ecp_nistz256_gather_w5:
 
 .p2align	5
 _ecp_nistz256_scatter_w7:
+
 	movdqu	0(%rsi),%xmm0
 	shll	$6,%edx
 	movdqu	16(%rsi),%xmm1
@@ -4875,6 +4880,7 @@ _ecp_nistz256_scatter_w7:
 
 
 
+
 .globl	_ecp_nistz256_gather_w7
 
 .p2align	5
@@ -5593,26 +5599,16 @@ L$point_addq_body:
 	orq	%r8,%r12
 	orq	%r9,%r12
 
-.byte	0x3e
-	jnz	L$add_proceedq
 .byte	102,73,15,126,208
 .byte	102,73,15,126,217
-	testq	%r8,%r8
-	jnz	L$add_proceedq
-	testq	%r9,%r9
-	jz	L$add_doubleq
 
-.byte	102,72,15,126,199
-	pxor	%xmm0,%xmm0
-	movdqu	%xmm0,0(%rdi)
-	movdqu	%xmm0,16(%rdi)
-	movdqu	%xmm0,32(%rdi)
-	movdqu	%xmm0,48(%rdi)
-	movdqu	%xmm0,64(%rdi)
-	movdqu	%xmm0,80(%rdi)
-	jmp	L$add_doneq
+	orq	%r8,%r12
+	orq	%r9,%r12
+
+
+.byte	0x3e
+	jnz	L$add_proceedq
 
-.p2align	5
 L$add_doubleq:
 .byte	102,72,15,126,206
 .byte	102,72,15,126,199
@@ -6694,26 +6690,16 @@ L$point_addx_body:
 	orq	%r8,%r12
 	orq	%r9,%r12
 
-.byte	0x3e
-	jnz	L$add_proceedx
 .byte	102,73,15,126,208
 .byte	102,73,15,126,217
-	testq	%r8,%r8
-	jnz	L$add_proceedx
-	testq	%r9,%r9
-	jz	L$add_doublex
 
-.byte	102,72,15,126,199
-	pxor	%xmm0,%xmm0
-	movdqu	%xmm0,0(%rdi)
-	movdqu	%xmm0,16(%rdi)
-	movdqu	%xmm0,32(%rdi)
-	movdqu	%xmm0,48(%rdi)
-	movdqu	%xmm0,64(%rdi)
-	movdqu	%xmm0,80(%rdi)
-	jmp	L$add_donex
+	orq	%r8,%r12
+	orq	%r9,%r12
+
+
+.byte	0x3e
+	jnz	L$add_proceedx
 
-.p2align	5
 L$add_doublex:
 .byte	102,72,15,126,206
 .byte	102,72,15,126,199
diff --git a/deps/openssl/config/archs/darwin64-x86_64-cc/asm_avx2/crypto/ec/x25519-x86_64.s b/deps/openssl/config/archs/darwin64-x86_64-cc/asm_avx2/crypto/ec/x25519-x86_64.s
index cdb602d4cc..158e849611 100644
--- a/deps/openssl/config/archs/darwin64-x86_64-cc/asm_avx2/crypto/ec/x25519-x86_64.s
+++ b/deps/openssl/config/archs/darwin64-x86_64-cc/asm_avx2/crypto/ec/x25519-x86_64.s
@@ -382,6 +382,7 @@ L$fe51_mul121666_epilogue:
 
 .p2align	5
 _x25519_fe64_eligible:
+
 	movl	_OPENSSL_ia32cap_P+8(%rip),%ecx
 	xorl	%eax,%eax
 	andl	$0x80100,%ecx
@@ -390,6 +391,7 @@ _x25519_fe64_eligible:
 	.byte	0xf3,0xc3
 
 
+
 .globl	_x25519_fe64_mul
 
 .p2align	5
@@ -616,6 +618,7 @@ L$fe64_sqr_epilogue:
 .p2align	5
 _x25519_fe64_mul121666:
 L$fe64_mul121666_body:
+
 	movl	$121666,%edx
 	mulxq	0(%rsi),%r8,%rcx
 	mulxq	8(%rsi),%r9,%rax
@@ -646,11 +649,13 @@ L$fe64_mul121666_epilogue:
 	.byte	0xf3,0xc3
 
 
+
 .globl	_x25519_fe64_add
 
 .p2align	5
 _x25519_fe64_add:
 L$fe64_add_body:
+
 	movq	0(%rsi),%r8
 	movq	8(%rsi),%r9
 	movq	16(%rsi),%r10
@@ -681,11 +686,13 @@ L$fe64_add_epilogue:
 	.byte	0xf3,0xc3
 
 
+
 .globl	_x25519_fe64_sub
 
 .p2align	5
 _x25519_fe64_sub:
 L$fe64_sub_body:
+
 	movq	0(%rsi),%r8
 	movq	8(%rsi),%r9
 	movq	16(%rsi),%r10
@@ -716,11 +723,13 @@ L$fe64_sub_epilogue:
 	.byte	0xf3,0xc3
 
 
+
 .globl	_x25519_fe64_tobytes
 
 .p2align	5
 _x25519_fe64_tobytes:
 L$fe64_to_body:
+
 	movq	0(%rsi),%r8
 	movq	8(%rsi),%r9
 	movq	16(%rsi),%r10
@@ -757,4 +766,5 @@ L$fe64_to_body:
 L$fe64_to_epilogue:
 	.byte	0xf3,0xc3
 
+
 .byte	88,50,53,53,49,57,32,112,114,105,109,105,116,105,118,101,115,32,102,111,114,32,120,56,54,95,54,52,44,32,67,82,89,80,84,79,71,65,77,83,32,98,121,32,60,97,112,112,114,111,64,111,112,101,110,115,115,108,46,111,114,103,62,0
diff --git a/deps/openssl/config/archs/darwin64-x86_64-cc/asm_avx2/crypto/include/internal/bn_conf.h b/deps/openssl/config/archs/darwin64-x86_64-cc/asm_avx2/crypto/include/internal/bn_conf.h
index 34bd8b78b4..5312ef5a7a 100644
--- a/deps/openssl/config/archs/darwin64-x86_64-cc/asm_avx2/crypto/include/internal/bn_conf.h
+++ b/deps/openssl/config/archs/darwin64-x86_64-cc/asm_avx2/crypto/include/internal/bn_conf.h
@@ -1,5 +1,5 @@
 /* WARNING: do not edit! */
-/* Generated by Makefile from crypto/include/internal/bn_conf.h.in */
+/* Generated by Makefile from include/crypto/bn_conf.h.in */
 /*
  * Copyright 2016 The OpenSSL Project Authors. All Rights Reserved.
  *
@@ -9,8 +9,8 @@
  * https://www.openssl.org/source/license.html
  */
 
-#ifndef HEADER_BN_CONF_H
-# define HEADER_BN_CONF_H
+#ifndef OSSL_CRYPTO_BN_CONF_H
+# define OSSL_CRYPTO_BN_CONF_H
 
 /*
  * The contents of this file are not used in the UEFI build, as
diff --git a/deps/openssl/config/archs/darwin64-x86_64-cc/asm_avx2/crypto/include/internal/dso_conf.h b/deps/openssl/config/archs/darwin64-x86_64-cc/asm_avx2/crypto/include/internal/dso_conf.h
index a69309195e..e2d05cdbf4 100644
--- a/deps/openssl/config/archs/darwin64-x86_64-cc/asm_avx2/crypto/include/internal/dso_conf.h
+++ b/deps/openssl/config/archs/darwin64-x86_64-cc/asm_avx2/crypto/include/internal/dso_conf.h
@@ -1,5 +1,5 @@
 /* WARNING: do not edit! */
-/* Generated by Makefile from crypto/include/internal/dso_conf.h.in */
+/* Generated by Makefile from include/crypto/dso_conf.h.in */
 /*
  * Copyright 2016-2019 The OpenSSL Project Authors. All Rights Reserved.
  *
@@ -9,8 +9,8 @@
  * https://www.openssl.org/source/license.html
  */
 
-#ifndef HEADER_DSO_CONF_H
-# define HEADER_DSO_CONF_H
+#ifndef OSSL_CRYPTO_DSO_CONF_H
+# define OSSL_CRYPTO_DSO_CONF_H
 # define DSO_DLFCN
 # define HAVE_DLFCN_H
 # define DSO_EXTENSION ".dylib"
diff --git a/deps/openssl/config/archs/darwin64-x86_64-cc/asm_avx2/crypto/modes/aesni-gcm-x86_64.s b/deps/openssl/config/archs/darwin64-x86_64-cc/asm_avx2/crypto/modes/aesni-gcm-x86_64.s
index d5920186ce..c26df9da7e 100644
--- a/deps/openssl/config/archs/darwin64-x86_64-cc/asm_avx2/crypto/modes/aesni-gcm-x86_64.s
+++ b/deps/openssl/config/archs/darwin64-x86_64-cc/asm_avx2/crypto/modes/aesni-gcm-x86_64.s
@@ -3,6 +3,7 @@
 
 .p2align	5
 _aesni_ctr32_ghash_6x:
+
 	vmovdqu	32(%r11),%xmm2
 	subq	$6,%rdx
 	vpxor	%xmm4,%xmm4,%xmm4
@@ -311,6 +312,7 @@ L$6x_done:
 
 	.byte	0xf3,0xc3
 
+
 .globl	_aesni_gcm_decrypt
 
 .p2align	5
@@ -416,6 +418,7 @@ L$gcm_dec_abort:
 
 .p2align	5
 _aesni_ctr32_6x:
+
 	vmovdqu	0-128(%rcx),%xmm4
 	vmovdqu	32(%r11),%xmm2
 	leaq	-1(%rbp),%r13
@@ -504,6 +507,7 @@ L$handle_ctr32_2:
 	jmp	L$oop_ctr32
 
 
+
 .globl	_aesni_gcm_encrypt
 
 .p2align	5
diff --git a/deps/openssl/config/archs/darwin64-x86_64-cc/asm_avx2/crypto/poly1305/poly1305-x86_64.s b/deps/openssl/config/archs/darwin64-x86_64-cc/asm_avx2/crypto/poly1305/poly1305-x86_64.s
index cf3ca1a4db..f6afad8ff0 100644
--- a/deps/openssl/config/archs/darwin64-x86_64-cc/asm_avx2/crypto/poly1305/poly1305-x86_64.s
+++ b/deps/openssl/config/archs/darwin64-x86_64-cc/asm_avx2/crypto/poly1305/poly1305-x86_64.s
@@ -12,6 +12,7 @@
 
 .p2align	5
 _poly1305_init:
+
 	xorq	%rax,%rax
 	movq	%rax,0(%rdi)
 	movq	%rax,8(%rdi)
@@ -45,6 +46,7 @@ L$no_key:
 
 
 
+
 .p2align	5
 _poly1305_blocks:
 
@@ -156,6 +158,7 @@ L$blocks_epilogue:
 
 .p2align	5
 _poly1305_emit:
+
 L$emit:
 	movq	0(%rdi),%r8
 	movq	8(%rdi),%r9
@@ -178,8 +181,10 @@ L$emit:
 	.byte	0xf3,0xc3
 
 
+
 .p2align	5
 __poly1305_block:
+
 	mulq	%r14
 	movq	%rax,%r9
 	movq	%r11,%rax
@@ -222,8 +227,10 @@ __poly1305_block:
 
 
 
+
 .p2align	5
 __poly1305_init_avx:
+
 	movq	%r11,%r14
 	movq	%r12,%rbx
 	xorq	%rbp,%rbp
@@ -384,6 +391,7 @@ __poly1305_init_avx:
 
 
 
+
 .p2align	5
 poly1305_blocks_avx:
 
@@ -1209,6 +1217,7 @@ L$short_tail_avx:
 
 .p2align	5
 poly1305_emit_avx:
+
 	cmpl	$0,20(%rdi)
 	je	L$emit
 
@@ -1261,6 +1270,7 @@ poly1305_emit_avx:
 	.byte	0xf3,0xc3
 
 
+
 .p2align	5
 poly1305_blocks_avx2:
 
@@ -1929,6 +1939,7 @@ L$x_mask42:
 
 .p2align	4
 _xor128_encrypt_n_pad:
+
 	subq	%rdx,%rsi
 	subq	%rdx,%rdi
 	movq	%rcx,%r10
@@ -1972,10 +1983,12 @@ L$done_enc:
 	.byte	0xf3,0xc3
 
 
+
 .globl	_xor128_decrypt_n_pad
 
 .p2align	4
 _xor128_decrypt_n_pad:
+
 	subq	%rdx,%rsi
 	subq	%rdx,%rdi
 	movq	%rcx,%r10
diff --git a/deps/openssl/config/archs/darwin64-x86_64-cc/asm_avx2/crypto/rc4/rc4-x86_64.s b/deps/openssl/config/archs/darwin64-x86_64-cc/asm_avx2/crypto/rc4/rc4-x86_64.s
index 8bfb48b74a..8b6186f0e2 100644
--- a/deps/openssl/config/archs/darwin64-x86_64-cc/asm_avx2/crypto/rc4/rc4-x86_64.s
+++ b/deps/openssl/config/archs/darwin64-x86_64-cc/asm_avx2/crypto/rc4/rc4-x86_64.s
@@ -4,11 +4,12 @@
 .globl	_RC4
 
 .p2align	4
-_RC4:	orq	%rsi,%rsi
+_RC4:
+
+	orq	%rsi,%rsi
 	jne	L$entry
 	.byte	0xf3,0xc3
 L$entry:
-
 	pushq	%rbx
 
 	pushq	%r12
@@ -530,6 +531,7 @@ L$epilogue:
 
 .p2align	4
 _RC4_set_key:
+
 	leaq	8(%rdi),%rdi
 	leaq	(%rdx,%rsi,1),%rdx
 	negq	%rsi
@@ -598,10 +600,12 @@ L$exit_key:
 	.byte	0xf3,0xc3
 
 
+
 .globl	_RC4_options
 
 .p2align	4
 _RC4_options:
+
 	leaq	L$opts(%rip),%rax
 	movl	_OPENSSL_ia32cap_P(%rip),%edx
 	btl	$20,%edx
@@ -614,6 +618,7 @@ L$8xchar:
 	addq	$12,%rax
 L$done:
 	.byte	0xf3,0xc3
+
 .p2align	6
 L$opts:
 .byte	114,99,52,40,56,120,44,105,110,116,41,0
diff --git a/deps/openssl/config/archs/darwin64-x86_64-cc/asm_avx2/crypto/sha/keccak1600-x86_64.s b/deps/openssl/config/archs/darwin64-x86_64-cc/asm_avx2/crypto/sha/keccak1600-x86_64.s
index ec096c5ab0..5105d9818b 100644
--- a/deps/openssl/config/archs/darwin64-x86_64-cc/asm_avx2/crypto/sha/keccak1600-x86_64.s
+++ b/deps/openssl/config/archs/darwin64-x86_64-cc/asm_avx2/crypto/sha/keccak1600-x86_64.s
@@ -3,6 +3,7 @@
 
 .p2align	5
 __KeccakF1600:
+
 	movq	60(%rdi),%rax
 	movq	68(%rdi),%rbx
 	movq	76(%rdi),%rcx
@@ -258,6 +259,7 @@ L$oop:
 
 
 
+
 .p2align	5
 KeccakF1600:
 
diff --git a/deps/openssl/config/archs/darwin64-x86_64-cc/asm_avx2/crypto/sha/sha1-x86_64.s b/deps/openssl/config/archs/darwin64-x86_64-cc/asm_avx2/crypto/sha/sha1-x86_64.s
index 02472d0b7d..fb22d41c1a 100644
--- a/deps/openssl/config/archs/darwin64-x86_64-cc/asm_avx2/crypto/sha/sha1-x86_64.s
+++ b/deps/openssl/config/archs/darwin64-x86_64-cc/asm_avx2/crypto/sha/sha1-x86_64.s
@@ -1421,10 +1421,10 @@ L$oop_shaext:
 	pshufd	$27,%xmm1,%xmm1
 	movdqu	%xmm0,(%rdi)
 	movd	%xmm1,16(%rdi)
-
 	.byte	0xf3,0xc3
 
 
+
 .p2align	4
 sha1_block_data_order_ssse3:
 _ssse3_shortcut:
diff --git a/deps/openssl/config/archs/darwin64-x86_64-cc/asm_avx2/crypto/sha/sha256-x86_64.s b/deps/openssl/config/archs/darwin64-x86_64-cc/asm_avx2/crypto/sha/sha256-x86_64.s
index e43cdd7040..3952a775b9 100644
--- a/deps/openssl/config/archs/darwin64-x86_64-cc/asm_avx2/crypto/sha/sha256-x86_64.s
+++ b/deps/openssl/config/archs/darwin64-x86_64-cc/asm_avx2/crypto/sha/sha256-x86_64.s
@@ -1775,6 +1775,7 @@ K256:
 .p2align	6
 sha256_block_data_order_shaext:
 _shaext_shortcut:
+
 	leaq	K256+128(%rip),%rcx
 	movdqu	(%rdi),%xmm1
 	movdqu	16(%rdi),%xmm2
@@ -1979,6 +1980,7 @@ L$oop_shaext:
 	.byte	0xf3,0xc3
 
 
+
 .p2align	6
 sha256_block_data_order_ssse3:
 
@@ -4238,7 +4240,15 @@ L$oop_avx2:
 	vmovdqa	%ymm4,0(%rsp)
 	xorl	%r14d,%r14d
 	vmovdqa	%ymm5,32(%rsp)
+
+	movq	88(%rsp),%rdi
+
 	leaq	-64(%rsp),%rsp
+
+
+
+	movq	%rdi,-8(%rsp)
+
 	movl	%ebx,%edi
 	vmovdqa	%ymm6,0(%rsp)
 	xorl	%ecx,%edi
@@ -4250,6 +4260,12 @@ L$oop_avx2:
 .p2align	4
 L$avx2_00_47:
 	leaq	-64(%rsp),%rsp
+
+
+	pushq	64-8(%rsp)
+
+	leaq	8(%rsp),%rsp
+
 	vpalignr	$4,%ymm0,%ymm1,%ymm4
 	addl	0+128(%rsp),%r11d
 	andl	%r8d,%r12d
@@ -4505,6 +4521,12 @@ L$avx2_00_47:
 	movl	%r9d,%r12d
 	vmovdqa	%ymm6,32(%rsp)
 	leaq	-64(%rsp),%rsp
+
+
+	pushq	64-8(%rsp)
+
+	leaq	8(%rsp),%rsp
+
 	vpalignr	$4,%ymm2,%ymm3,%ymm4
 	addl	0+128(%rsp),%r11d
 	andl	%r8d,%r12d
@@ -5380,6 +5402,8 @@ L$ower_avx2:
 
 	leaq	448(%rsp),%rsp
 
+
+
 	addl	0(%rdi),%eax
 	addl	4(%rdi),%ebx
 	addl	8(%rdi),%ecx
@@ -5405,9 +5429,11 @@ L$ower_avx2:
 	jbe	L$oop_avx2
 	leaq	(%rsp),%rbp
 
+
+
+
 L$done_avx2:
-	leaq	(%rbp),%rsp
-	movq	88(%rsp),%rsi
+	movq	88(%rbp),%rsi
 
 	vzeroupper
 	movq	-48(%rsi),%r15
diff --git a/deps/openssl/config/archs/darwin64-x86_64-cc/asm_avx2/crypto/sha/sha512-x86_64.s b/deps/openssl/config/archs/darwin64-x86_64-cc/asm_avx2/crypto/sha/sha512-x86_64.s
index 51ace9a686..6348b0a2c0 100644
--- a/deps/openssl/config/archs/darwin64-x86_64-cc/asm_avx2/crypto/sha/sha512-x86_64.s
+++ b/deps/openssl/config/archs/darwin64-x86_64-cc/asm_avx2/crypto/sha/sha512-x86_64.s
@@ -4165,7 +4165,15 @@ L$oop_avx2:
 	vmovdqa	%ymm10,64(%rsp)
 	vpaddq	64(%rbp),%ymm6,%ymm10
 	vmovdqa	%ymm11,96(%rsp)
+
+	movq	152(%rsp),%rdi
+
 	leaq	-128(%rsp),%rsp
+
+
+
+	movq	%rdi,-8(%rsp)
+
 	vpaddq	96(%rbp),%ymm7,%ymm11
 	vmovdqa	%ymm8,0(%rsp)
 	xorq	%r14,%r14
@@ -4181,6 +4189,12 @@ L$oop_avx2:
 .p2align	4
 L$avx2_00_47:
 	leaq	-128(%rsp),%rsp
+
+
+	pushq	128-8(%rsp)
+
+	leaq	8(%rsp),%rsp
+
 	vpalignr	$8,%ymm0,%ymm1,%ymm8
 	addq	0+256(%rsp),%r11
 	andq	%r8,%r12
@@ -4474,6 +4488,12 @@ L$avx2_00_47:
 	movq	%r9,%r12
 	vmovdqa	%ymm10,96(%rsp)
 	leaq	-128(%rsp),%rsp
+
+
+	pushq	128-8(%rsp)
+
+	leaq	8(%rsp),%rsp
+
 	vpalignr	$8,%ymm4,%ymm5,%ymm8
 	addq	0+256(%rsp),%r11
 	andq	%r8,%r12
@@ -5387,6 +5407,8 @@ L$ower_avx2:
 
 	leaq	1152(%rsp),%rsp
 
+
+
 	addq	0(%rdi),%rax
 	addq	8(%rdi),%rbx
 	addq	16(%rdi),%rcx
@@ -5412,9 +5434,11 @@ L$ower_avx2:
 	jbe	L$oop_avx2
 	leaq	(%rsp),%rbp
 
+
+
+
 L$done_avx2:
-	leaq	(%rbp),%rsp
-	movq	152(%rsp),%rsi
+	movq	152(%rbp),%rsi
 
 	vzeroupper
 	movq	-48(%rsi),%r15
diff --git a/deps/openssl/config/archs/darwin64-x86_64-cc/asm_avx2/crypto/x86_64cpuid.s b/deps/openssl/config/archs/darwin64-x86_64-cc/asm_avx2/crypto/x86_64cpuid.s
index 05afede678..32a92da69f 100644
--- a/deps/openssl/config/archs/darwin64-x86_64-cc/asm_avx2/crypto/x86_64cpuid.s
+++ b/deps/openssl/config/archs/darwin64-x86_64-cc/asm_avx2/crypto/x86_64cpuid.s
@@ -13,6 +13,7 @@
 
 .p2align	4
 _OPENSSL_atomic_add:
+
 	movl	(%rdi),%eax
 L$spin:	leaq	(%rsi,%rax,1),%r8
 .byte	0xf0
@@ -23,16 +24,19 @@ L$spin:	leaq	(%rsi,%rax,1),%r8
 	.byte	0xf3,0xc3
 
 
+
 .globl	_OPENSSL_rdtsc
 
 .p2align	4
 _OPENSSL_rdtsc:
+
 	rdtsc
 	shlq	$32,%rdx
 	orq	%rdx,%rax
 	.byte	0xf3,0xc3
 
 
+
 .globl	_OPENSSL_ia32_cpuid
 
 .p2align	4
@@ -206,6 +210,7 @@ L$done:
 
 .p2align	4
 _OPENSSL_cleanse:
+
 	xorq	%rax,%rax
 	cmpq	$15,%rsi
 	jae	L$ot
@@ -237,10 +242,12 @@ L$aligned:
 	.byte	0xf3,0xc3
 
 
+
 .globl	_CRYPTO_memcmp
 
 .p2align	4
 _CRYPTO_memcmp:
+
 	xorq	%rax,%rax
 	xorq	%r10,%r10
 	cmpq	$0,%rdx
@@ -270,10 +277,12 @@ L$oop_cmp:
 L$no_data:
 	.byte	0xf3,0xc3
 
+
 .globl	_OPENSSL_wipe_cpu
 
 .p2align	4
 _OPENSSL_wipe_cpu:
+
 	pxor	%xmm0,%xmm0
 	pxor	%xmm1,%xmm1
 	pxor	%xmm2,%xmm2
@@ -301,10 +310,12 @@ _OPENSSL_wipe_cpu:
 	leaq	8(%rsp),%rax
 	.byte	0xf3,0xc3
 
+
 .globl	_OPENSSL_instrument_bus
 
 .p2align	4
 _OPENSSL_instrument_bus:
+
 	movq	%rdi,%r10
 	movq	%rsi,%rcx
 	movq	%rsi,%r11
@@ -333,10 +344,12 @@ L$oop:	rdtsc
 	.byte	0xf3,0xc3
 
 
+
 .globl	_OPENSSL_instrument_bus2
 
 .p2align	4
 _OPENSSL_instrument_bus2:
+
 	movq	%rdi,%r10
 	movq	%rsi,%rcx
 	movq	%rdx,%r11
@@ -380,10 +393,12 @@ L$done2:
 	subq	%rcx,%rax
 	.byte	0xf3,0xc3
 
+
 .globl	_OPENSSL_ia32_rdrand_bytes
 
 .p2align	4
 _OPENSSL_ia32_rdrand_bytes:
+
 	xorq	%rax,%rax
 	cmpq	$0,%rsi
 	je	L$done_rdrand_bytes
@@ -421,10 +436,12 @@ L$done_rdrand_bytes:
 	xorq	%r10,%r10
 	.byte	0xf3,0xc3
 
+
 .globl	_OPENSSL_ia32_rdseed_bytes
 
 .p2align	4
 _OPENSSL_ia32_rdseed_bytes:
+
 	xorq	%rax,%rax
 	cmpq	$0,%rsi
 	je	L$done_rdseed_bytes
diff --git a/deps/openssl/config/archs/darwin64-x86_64-cc/asm_avx2/include/openssl/opensslconf.h b/deps/openssl/config/archs/darwin64-x86_64-cc/asm_avx2/include/openssl/opensslconf.h
index 2a63d7a6ba..25a4ebf76a 100644
--- a/deps/openssl/config/archs/darwin64-x86_64-cc/asm_avx2/include/openssl/opensslconf.h
+++ b/deps/openssl/config/archs/darwin64-x86_64-cc/asm_avx2/include/openssl/opensslconf.h
@@ -99,9 +99,6 @@ extern "C" {
 #ifndef OPENSSL_NO_DYNAMIC_ENGINE
 # define OPENSSL_NO_DYNAMIC_ENGINE
 #endif
-#ifndef OPENSSL_NO_AFALGENG
-# define OPENSSL_NO_AFALGENG
-#endif
 
 
 /*
diff --git a/deps/openssl/config/archs/darwin64-x86_64-cc/asm_avx2/include/progs.h b/deps/openssl/config/archs/darwin64-x86_64-cc/asm_avx2/include/progs.h
index 9b3d270e20..308c65601b 100644
--- a/deps/openssl/config/archs/darwin64-x86_64-cc/asm_avx2/include/progs.h
+++ b/deps/openssl/config/archs/darwin64-x86_64-cc/asm_avx2/include/progs.h
@@ -2,7 +2,7 @@
  * WARNING: do not edit!
  * Generated by apps/progs.pl
  *
- * Copyright 1995-2019 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 1995-2020 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
diff --git a/deps/openssl/config/archs/darwin64-x86_64-cc/asm_avx2/openssl-cl.gypi b/deps/openssl/config/archs/darwin64-x86_64-cc/asm_avx2/openssl-cl.gypi
index 95e8dc567e..152f3f9fa5 100644
--- a/deps/openssl/config/archs/darwin64-x86_64-cc/asm_avx2/openssl-cl.gypi
+++ b/deps/openssl/config/archs/darwin64-x86_64-cc/asm_avx2/openssl-cl.gypi
@@ -15,6 +15,7 @@
       'KECCAK1600_ASM',
       'RC4_ASM',
       'MD5_ASM',
+      'AESNI_ASM',
       'VPAES_ASM',
       'GHASH_ASM',
       'ECP_NISTZ256_ASM',
diff --git a/deps/openssl/config/archs/darwin64-x86_64-cc/asm_avx2/openssl.gypi b/deps/openssl/config/archs/darwin64-x86_64-cc/asm_avx2/openssl.gypi
index be4971efb1..3871c8129e 100644
--- a/deps/openssl/config/archs/darwin64-x86_64-cc/asm_avx2/openssl.gypi
+++ b/deps/openssl/config/archs/darwin64-x86_64-cc/asm_avx2/openssl.gypi
@@ -722,6 +722,7 @@
       'KECCAK1600_ASM',
       'RC4_ASM',
       'MD5_ASM',
+      'AESNI_ASM',
       'VPAES_ASM',
       'GHASH_ASM',
       'ECP_NISTZ256_ASM',
diff --git a/deps/openssl/config/archs/darwin64-x86_64-cc/no-asm/configdata.pm b/deps/openssl/config/archs/darwin64-x86_64-cc/no-asm/configdata.pm
index 02290abc08..12d99f475e 100644
--- a/deps/openssl/config/archs/darwin64-x86_64-cc/no-asm/configdata.pm
+++ b/deps/openssl/config/archs/darwin64-x86_64-cc/no-asm/configdata.pm
@@ -54,7 +54,7 @@ our %config = (
   minor => "1.1",
   openssl_algorithm_defines => [ "OPENSSL_NO_COMP", "OPENSSL_NO_MD2", "OPENSSL_NO_RC5" ],
   openssl_api_defines => [  ],
-  openssl_other_defines => [ "OPENSSL_RAND_SEED_OS", "OPENSSL_NO_AFALGENG", "OPENSSL_NO_ASAN", "OPENSSL_NO_ASM", "OPENSSL_NO_CRYPTO_MDEBUG", "OPENSSL_NO_CRYPTO_MDEBUG_BACKTRACE", "OPENSSL_NO_DEVCRYPTOENG", "OPENSSL_NO_EC_NISTP_64_GCC_128", "OPENSSL_NO_EGD", "OPENSSL_NO_EXTERNAL_TESTS", "OPENSSL_NO_FUZZ_AFL", "OPENSSL_NO_FUZZ_LIBFUZZER", "OPENSSL_NO_HEARTBEATS", "OPENSSL_NO_MSAN", "OPENSSL_NO_SCTP", "OPENSSL_NO_SSL3", "OPENSSL_NO_SSL3_METHOD", "OPENSSL_NO_UBSAN", "OPENSSL_NO_UNIT_TEST", "OPENSSL_NO_WEAK_SSL_CIPHERS", "OPENSSL_NO_DYNAMIC_ENGINE", "OPENSSL_NO_AFALGENG" ],
+  openssl_other_defines => [ "OPENSSL_RAND_SEED_OS", "OPENSSL_NO_AFALGENG", "OPENSSL_NO_ASAN", "OPENSSL_NO_ASM", "OPENSSL_NO_CRYPTO_MDEBUG", "OPENSSL_NO_CRYPTO_MDEBUG_BACKTRACE", "OPENSSL_NO_DEVCRYPTOENG", "OPENSSL_NO_EC_NISTP_64_GCC_128", "OPENSSL_NO_EGD", "OPENSSL_NO_EXTERNAL_TESTS", "OPENSSL_NO_FUZZ_AFL", "OPENSSL_NO_FUZZ_LIBFUZZER", "OPENSSL_NO_HEARTBEATS", "OPENSSL_NO_MSAN", "OPENSSL_NO_SCTP", "OPENSSL_NO_SSL3", "OPENSSL_NO_SSL3_METHOD", "OPENSSL_NO_UBSAN", "OPENSSL_NO_UNIT_TEST", "OPENSSL_NO_WEAK_SSL_CIPHERS", "OPENSSL_NO_DYNAMIC_ENGINE" ],
   openssl_sys_defines => [ "OPENSSL_SYS_MACOSX" ],
   openssl_thread_defines => [ "OPENSSL_THREADS" ],
   openssldir => "",
@@ -110,8 +110,8 @@ our %config = (
   sourcedir => ".",
   target => "darwin64-x86_64-cc",
   tdirs => [ "ossl_shim" ],
-  version => "1.1.1d",
-  version_num => "0x1010104fL",
+  version => "1.1.1e",
+  version_num => "0x1010105fL",
 );
 
 our %target = (
@@ -232,6 +232,7 @@ our @disablables = (
   "dgram",
   "dh",
   "dsa",
+  "dso",
   "dtls",
   "dynamic-engine",
   "ec",
@@ -350,8 +351,8 @@ our %unified_info = (
         {
             "" =>
                 [
-                    "crypto/include/internal/bn_conf.h",
-                    "crypto/include/internal/dso_conf.h",
+                    "include/crypto/bn_conf.h",
+                    "include/crypto/dso_conf.h",
                     "include/openssl/opensslconf.h",
                 ],
             "apps/asn1pars.o" =>
@@ -619,14 +620,6 @@ our %unified_info = (
                     "crypto/perlasm/cbc.pl",
                     "crypto/perlasm/x86asm.pl",
                 ],
-            "crypto/include/internal/bn_conf.h" =>
-                [
-                    "configdata.pm",
-                ],
-            "crypto/include/internal/dso_conf.h" =>
-                [
-                    "configdata.pm",
-                ],
             "crypto/rc4/rc4-586.s" =>
                 [
                     "crypto/perlasm/x86asm.pl",
@@ -702,6 +695,14 @@ our %unified_info = (
                 [
                     "libcrypto",
                 ],
+            "include/crypto/bn_conf.h" =>
+                [
+                    "configdata.pm",
+                ],
+            "include/crypto/dso_conf.h" =>
+                [
+                    "configdata.pm",
+                ],
             "include/openssl/opensslconf.h" =>
                 [
                     "configdata.pm",
@@ -1491,6 +1492,12 @@ our %unified_info = (
                     "libcrypto",
                     "test/libtestutil.a",
                 ],
+            "test/ssl_ctx_test" =>
+                [
+                    "libcrypto",
+                    "libssl",
+                    "test/libtestutil.a",
+                ],
             "test/ssl_test" =>
                 [
                     "libcrypto",
@@ -3209,7 +3216,6 @@ our %unified_info = (
                             "test/testutil/cb.o",
                             "test/testutil/driver.o",
                             "test/testutil/format_output.o",
-                            "test/testutil/init.o",
                             "test/testutil/main.o",
                             "test/testutil/output_helpers.o",
                             "test/testutil/random.o",
@@ -3217,6 +3223,7 @@ our %unified_info = (
                             "test/testutil/tap_bio.o",
                             "test/testutil/test_cleanup.o",
                             "test/testutil/tests.o",
+                            "test/testutil/testutil_init.o",
                         ],
                     "products" =>
                         {
@@ -3715,14 +3722,6 @@ our %unified_info = (
                 [
                     "crypto/ia64cpuid.S",
                 ],
-            "crypto/include/internal/bn_conf.h" =>
-                [
-                    "crypto/include/internal/bn_conf.h.in",
-                ],
-            "crypto/include/internal/dso_conf.h" =>
-                [
-                    "crypto/include/internal/dso_conf.h.in",
-                ],
             "crypto/md5/md5-586.s" =>
                 [
                     "crypto/md5/asm/md5-586.pl",
@@ -4163,6 +4162,14 @@ our %unified_info = (
                     "engines/asm/e_padlock-x86_64.pl",
                     "\$(PERLASM_SCHEME)",
                 ],
+            "include/crypto/bn_conf.h" =>
+                [
+                    "include/crypto/bn_conf.h.in",
+                ],
+            "include/crypto/dso_conf.h" =>
+                [
+                    "include/crypto/dso_conf.h.in",
+                ],
             "include/openssl/opensslconf.h" =>
                 [
                     "include/openssl/opensslconf.h.in",
@@ -4845,49 +4852,41 @@ our %unified_info = (
             "crypto/aes/aes_cbc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/aes/aes_cfb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/aes/aes_core.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/aes/aes_ecb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/aes/aes_ige.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/aes/aes_misc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/aes/aes_ofb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/aes/aes_wrap.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/aes/aesfx-sparcv9.o" =>
@@ -4909,7 +4908,6 @@ our %unified_info = (
             "crypto/aria/aria.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/arm64cpuid.o" =>
@@ -4923,613 +4921,511 @@ our %unified_info = (
             "crypto/asn1/a_bitstr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_d2i_fp.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_digest.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_dup.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_gentm.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_i2d_fp.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_int.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_mbstr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_object.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_octet.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_print.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_sign.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_strex.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_strnid.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_time.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_type.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_utctm.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_utf8.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_verify.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/ameth_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/asn1_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/asn1_gen.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/asn1_item_list.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/asn1_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/asn1_par.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/asn_mime.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/asn_moid.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/asn_mstbl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/asn_pack.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/bio_asn1.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/bio_ndef.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/d2i_pr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/d2i_pu.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/evp_asn1.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/f_int.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/f_string.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/i2d_pr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/i2d_pu.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/n_pkey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/nsseq.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/p5_pbe.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/p5_pbev2.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/p5_scrypt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/p8_pkey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/t_bitst.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/t_pkey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/t_spki.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/tasn_dec.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/tasn_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/tasn_fre.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/tasn_new.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/tasn_prn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/tasn_scn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/tasn_typ.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/tasn_utl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/x_algor.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/x_bignum.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/x_info.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/x_int64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/x_long.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/x_pkey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/x_sig.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/x_spki.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/x_val.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/async/arch/async_null.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/async/arch/async_posix.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/async/arch/async_win.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/async/async.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/async/async_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/async/async_wait.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bf/bf_cfb64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bf/bf_ecb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bf/bf_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bf/bf_ofb64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bf/bf_skey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/b_addr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/b_dump.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/b_print.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/b_sock.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/b_sock2.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bf_buff.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bf_lbuf.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bf_nbio.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bf_null.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bio_cb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bio_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bio_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bio_meth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bss_acpt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bss_bio.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bss_conn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bss_dgram.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bss_fd.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bss_file.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bss_log.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bss_mem.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bss_null.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bss_sock.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/blake2/blake2b.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/blake2/blake2s.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/blake2/m_blake2b.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/blake2/m_blake2s.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/armv4-gf2m.o" =>
@@ -5547,188 +5443,157 @@ our %unified_info = (
             "crypto/bn/bn_add.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_asm.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_blind.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_const.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_ctx.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_depr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_dh.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_div.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_exp.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto",
                 ],
             "crypto/bn/bn_exp2.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_gcd.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_gf2m.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_intern.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_kron.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_mod.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_mont.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_mpi.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_mul.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_nist.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_prime.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_print.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_rand.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_recp.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_shift.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_sqr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_sqrt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_srp.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_word.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_x931p.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/mips-mont.o" =>
@@ -5758,13 +5623,11 @@ our %unified_info = (
             "crypto/buffer/buf_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/buffer/buffer.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/buildinf.h" =>
@@ -5774,43 +5637,36 @@ our %unified_info = (
             "crypto/camellia/camellia.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/camellia/cmll_cbc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/camellia/cmll_cfb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/camellia/cmll_ctr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/camellia/cmll_ecb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/camellia/cmll_misc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/camellia/cmll_ofb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/camellia/cmllt4-sparcv9.o" =>
@@ -5820,31 +5676,26 @@ our %unified_info = (
             "crypto/cast/c_cfb64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cast/c_ecb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cast/c_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cast/c_ofb64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cast/c_skey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/chacha/chacha-armv4.o" =>
@@ -5862,278 +5713,232 @@ our %unified_info = (
             "crypto/chacha/chacha_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cmac/cm_ameth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cmac/cm_pmeth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cmac/cmac.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_asn1.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_att.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_cd.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_dd.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_env.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_ess.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_io.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_kari.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_pwri.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_sd.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_smime.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/conf/conf_api.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/conf/conf_def.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/conf/conf_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/conf/conf_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/conf/conf_mall.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/conf/conf_mod.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/conf/conf_sap.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/conf/conf_ssl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cpt_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cryptlib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ct/ct_b64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ct/ct_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ct/ct_log.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ct/ct_oct.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ct/ct_policy.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ct/ct_prn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ct/ct_sct.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ct/ct_sct_ctx.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ct/ct_vfy.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ct/ct_x509v3.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ctype.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cversion.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto",
                 ],
             "crypto/des/cbc_cksm.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/cbc_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/cfb64ede.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/cfb64enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/cfb_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/des_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/dest4-sparcv9.o" =>
@@ -6143,301 +5948,251 @@ our %unified_info = (
             "crypto/des/ecb3_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/ecb_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/fcrypt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/fcrypt_b.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/ofb64ede.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/ofb64enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/ofb_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/pcbc_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/qud_cksm.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/rand_key.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/set_key.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/str2key.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/xcbc_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_ameth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_asn1.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_check.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_depr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_gen.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_kdf.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_key.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_meth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_pmeth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_prn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_rfc5114.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_rfc7919.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dsa/dsa_ameth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dsa/dsa_asn1.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dsa/dsa_depr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dsa/dsa_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dsa/dsa_gen.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dsa/dsa_key.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dsa/dsa_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dsa/dsa_meth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dsa/dsa_ossl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dsa/dsa_pmeth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dsa/dsa_prn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dsa/dsa_sign.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dsa/dsa_vrf.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dso/dso_dl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dso/dso_dlfcn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dso/dso_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dso/dso_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dso/dso_openssl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dso/dso_vms.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dso/dso_win32.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ebcdic.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/curve25519.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/curve448/arch_32/f_impl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto/ec/curve448/arch_32",
                     "crypto/ec/curve448",
@@ -6445,7 +6200,6 @@ our %unified_info = (
             "crypto/ec/curve448/curve448.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto/ec/curve448/arch_32",
                     "crypto/ec/curve448",
@@ -6453,7 +6207,6 @@ our %unified_info = (
             "crypto/ec/curve448/curve448_tables.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto/ec/curve448/arch_32",
                     "crypto/ec/curve448",
@@ -6461,7 +6214,6 @@ our %unified_info = (
             "crypto/ec/curve448/eddsa.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto/ec/curve448/arch_32",
                     "crypto/ec/curve448",
@@ -6469,7 +6221,6 @@ our %unified_info = (
             "crypto/ec/curve448/f_generic.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto/ec/curve448/arch_32",
                     "crypto/ec/curve448",
@@ -6477,7 +6228,6 @@ our %unified_info = (
             "crypto/ec/curve448/scalar.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto/ec/curve448/arch_32",
                     "crypto/ec/curve448",
@@ -6485,163 +6235,136 @@ our %unified_info = (
             "crypto/ec/ec2_oct.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec2_smpl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec_ameth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec_asn1.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec_check.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec_curve.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec_cvt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec_key.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec_kmeth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec_mult.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec_oct.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec_pmeth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec_print.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecdh_kdf.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecdh_ossl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecdsa_ossl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecdsa_sign.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecdsa_vrf.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/eck_prn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecp_mont.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecp_nist.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecp_nistp224.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecp_nistp256.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecp_nistp521.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecp_nistputil.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecp_nistz256-armv4.o" =>
@@ -6659,223 +6382,186 @@ our %unified_info = (
             "crypto/ec/ecp_oct.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecp_smpl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecx_meth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/eng_all.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/eng_cnf.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/eng_ctrl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/eng_dyn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/eng_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/eng_fat.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/eng_init.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/eng_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/eng_list.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/eng_openssl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/eng_pkey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/eng_rdrand.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/eng_table.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/tb_asnmth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/tb_cipher.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/tb_dh.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/tb_digest.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/tb_dsa.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/tb_eckey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/tb_pkmeth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/tb_rand.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/tb_rsa.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/err/err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/err/err_all.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/err/err_prn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/bio_b64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/bio_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/bio_md.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/bio_ok.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/c_allc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/c_alld.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/cmeth_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/digest.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/e_aes.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto",
                     "crypto/modes",
@@ -6883,21 +6569,18 @@ our %unified_info = (
             "crypto/evp/e_aes_cbc_hmac_sha1.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto/modes",
                 ],
             "crypto/evp/e_aes_cbc_hmac_sha256.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto/modes",
                 ],
             "crypto/evp/e_aria.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto",
                     "crypto/modes",
@@ -6905,13 +6588,11 @@ our %unified_info = (
             "crypto/evp/e_bf.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/e_camellia.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto",
                     "crypto/modes",
@@ -6919,81 +6600,68 @@ our %unified_info = (
             "crypto/evp/e_cast.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/e_chacha20_poly1305.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/e_des.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto",
                 ],
             "crypto/evp/e_des3.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto",
                 ],
             "crypto/evp/e_idea.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/e_null.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/e_old.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/e_rc2.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/e_rc4.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/e_rc4_hmac_md5.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/e_rc5.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/e_seed.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/e_sm4.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto",
                     "crypto/modes",
@@ -7001,328 +6669,267 @@ our %unified_info = (
             "crypto/evp/e_xcbc_d.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/encode.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/evp_cnf.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/evp_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/evp_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/evp_key.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/evp_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/evp_pbe.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/evp_pkey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/m_md2.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/m_md4.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/m_md5.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/m_md5_sha1.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/m_mdc2.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/m_null.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/m_ripemd.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/m_sha1.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/m_sha3.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto",
                 ],
             "crypto/evp/m_sigver.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/m_wp.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/names.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/p5_crpt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/p5_crpt2.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/p_dec.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/p_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/p_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/p_open.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/p_seal.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/p_sign.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/p_verify.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/pbe_scrypt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/pmeth_fn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/pmeth_gn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/pmeth_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ex_data.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/getenv.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/hmac/hm_ameth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/hmac/hm_pmeth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/hmac/hmac.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/idea/i_cbc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/idea/i_cfb64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/idea/i_ecb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/idea/i_ofb64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/idea/i_skey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
-            "crypto/include/internal/bn_conf.h" =>
-                [
-                    ".",
-                ],
-            "crypto/include/internal/dso_conf.h" =>
-                [
-                    ".",
-                ],
             "crypto/init.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/kdf/hkdf.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/kdf/kdf_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/kdf/scrypt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/kdf/tls1_prf.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/lhash/lh_stats.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/lhash/lhash.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/md4/md4_dgst.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/md4/md4_one.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/md5/md5-sparcv9.o" =>
@@ -7332,85 +6939,71 @@ our %unified_info = (
             "crypto/md5/md5_dgst.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/md5/md5_one.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/mdc2/mdc2_one.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/mdc2/mdc2dgst.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/mem.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/mem_clr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/mem_dbg.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/mem_sec.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/modes/cbc128.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/modes/ccm128.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/modes/cfb128.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/modes/ctr128.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/modes/cts128.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/modes/gcm128.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto",
                 ],
@@ -7433,361 +7026,301 @@ our %unified_info = (
             "crypto/modes/ocb128.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/modes/ofb128.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/modes/wrap128.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/modes/xts128.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/o_dir.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/o_fips.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/o_fopen.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/o_init.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/o_str.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/o_time.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/objects/o_names.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/objects/obj_dat.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/objects/obj_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/objects/obj_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/objects/obj_xref.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ocsp/ocsp_asn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ocsp/ocsp_cl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ocsp/ocsp_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ocsp/ocsp_ext.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ocsp/ocsp_ht.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ocsp/ocsp_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ocsp/ocsp_prn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ocsp/ocsp_srv.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ocsp/ocsp_vfy.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ocsp/v3_ocsp.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pem/pem_all.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pem/pem_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pem/pem_info.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pem/pem_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pem/pem_oth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pem/pem_pk8.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pem/pem_pkey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pem/pem_sign.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pem/pem_x509.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pem/pem_xaux.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pem/pvkfmt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_add.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_asn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_attr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_crpt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_crt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_decr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_init.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_key.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_kiss.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_mutl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_npas.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_p8d.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_p8e.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_sbag.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_utl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/pk12err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs7/bio_pk7.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs7/pk7_asn1.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs7/pk7_attr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs7/pk7_doit.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs7/pk7_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs7/pk7_mime.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs7/pk7_smime.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs7/pkcs7err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/poly1305/poly1305-armv4.o" =>
@@ -7809,259 +7342,216 @@ our %unified_info = (
             "crypto/poly1305/poly1305.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/poly1305/poly1305_ameth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/poly1305/poly1305_pmeth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rand/drbg_ctr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rand/drbg_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rand/rand_egd.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rand/rand_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rand/rand_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rand/rand_unix.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rand/rand_vms.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rand/rand_win.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rand/randfile.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rc2/rc2_cbc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rc2/rc2_ecb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rc2/rc2_skey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rc2/rc2cfb64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rc2/rc2ofb64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rc4/rc4_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rc4/rc4_skey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ripemd/rmd_dgst.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ripemd/rmd_one.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_ameth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_asn1.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_chk.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_crpt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_depr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_gen.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_meth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_mp.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_none.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_oaep.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_ossl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_pk1.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_pmeth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_prn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_pss.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_saos.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_sign.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_ssl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_x931.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_x931g.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/s390xcpuid.o" =>
@@ -8071,31 +7561,26 @@ our %unified_info = (
             "crypto/seed/seed.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/seed/seed_cbc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/seed/seed_cfb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/seed/seed_ecb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/seed/seed_ofb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sha/keccak1600-armv4.o" =>
@@ -8105,7 +7590,6 @@ our %unified_info = (
             "crypto/sha/keccak1600.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sha/sha1-armv4-large.o" =>
@@ -8131,13 +7615,11 @@ our %unified_info = (
             "crypto/sha/sha1_one.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sha/sha1dgst.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sha/sha256-armv4.o" =>
@@ -8163,7 +7645,6 @@ our %unified_info = (
             "crypto/sha/sha256.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sha/sha512-armv4.o" =>
@@ -8189,709 +7670,591 @@ our %unified_info = (
             "crypto/sha/sha512.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/siphash/siphash.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/siphash/siphash_ameth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/siphash/siphash_pmeth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sm2/sm2_crypt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sm2/sm2_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sm2/sm2_pmeth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sm2/sm2_sign.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sm3/m_sm3.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sm3/sm3.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sm4/sm4.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/srp/srp_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/srp/srp_vfy.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/stack/stack.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/store/loader_file.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/store/store_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/store/store_init.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/store/store_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/store/store_register.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/store/store_strings.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/threads_none.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/threads_pthread.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/threads_win.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ts/ts_asn1.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ts/ts_conf.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ts/ts_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ts/ts_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ts/ts_req_print.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ts/ts_req_utils.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ts/ts_rsp_print.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ts/ts_rsp_sign.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ts/ts_rsp_utils.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ts/ts_rsp_verify.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ts/ts_verify_ctx.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/txt_db/txt_db.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ui/ui_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ui/ui_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ui/ui_null.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ui/ui_openssl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ui/ui_util.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/uid.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/whrlpool/wp_block.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/whrlpool/wp_dgst.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/by_dir.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/by_file.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/t_crl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/t_req.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/t_x509.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_att.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_cmp.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_d2.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_def.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_ext.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_lu.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_meth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_obj.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_r2x.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_req.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_set.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_trs.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_txt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_v3.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_vfy.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_vpm.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509cset.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509name.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509rset.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509spki.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509type.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x_all.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x_attrib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x_crl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x_exten.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x_name.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x_pubkey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x_req.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x_x509.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x_x509a.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/pcy_cache.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/pcy_data.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/pcy_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/pcy_map.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/pcy_node.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/pcy_tree.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_addr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_admis.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_akey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_akeya.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_alt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_asid.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_bcons.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_bitst.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_conf.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_cpols.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_crld.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_enum.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_extku.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_genn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_ia5.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_info.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_int.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_ncons.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_pci.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_pcia.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_pcons.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_pku.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_pmaps.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_prn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_purp.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_skey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_sxnet.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_tlsf.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_utl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "engines/e_capi.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "engines/e_padlock.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "fuzz/asn1.o" =>
@@ -8942,6 +8305,14 @@ our %unified_info = (
                 [
                     "include",
                 ],
+            "include/crypto/bn_conf.h" =>
+                [
+                    ".",
+                ],
+            "include/crypto/dso_conf.h" =>
+                [
+                    ".",
+                ],
             "include/openssl/opensslconf.h" =>
                 [
                     ".",
@@ -9186,7 +8557,6 @@ our %unified_info = (
                 [
                     ".",
                     "include",
-                    "crypto/include",
                 ],
             "test/asn1_string_table_test.o" =>
                 [
@@ -9512,7 +8882,6 @@ our %unified_info = (
                 [
                     ".",
                     "include",
-                    "crypto/include",
                 ],
             "test/cipher_overhead_test.o" =>
                 [
@@ -9558,7 +8927,6 @@ our %unified_info = (
             "test/ctype_internal_test.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "test/curve448_internal_test.o" =>
@@ -9624,7 +8992,6 @@ our %unified_info = (
                 [
                     "include",
                     "crypto/ec",
-                    "crypto/include",
                 ],
             "test/ecdsatest.o" =>
                 [
@@ -9649,7 +9016,6 @@ our %unified_info = (
             "test/evp_extra_test.o" =>
                 [
                     "include",
-                    "crypto/include",
                 ],
             "test/evp_test.o" =>
                 [
@@ -9747,7 +9113,6 @@ our %unified_info = (
                 [
                     ".",
                     "include",
-                    "crypto/include",
                 ],
             "test/rc2test.o" =>
                 [
@@ -9797,18 +9162,15 @@ our %unified_info = (
                 [
                     ".",
                     "include",
-                    "crypto/include",
                 ],
             "test/sm2_internal_test.o" =>
                 [
                     "include",
-                    "crypto/include",
                 ],
             "test/sm4_internal_test.o" =>
                 [
                     ".",
                     "include",
-                    "crypto/include",
                 ],
             "test/srptest.o" =>
                 [
@@ -9819,6 +9181,10 @@ our %unified_info = (
                     ".",
                     "include",
                 ],
+            "test/ssl_ctx_test.o" =>
+                [
+                    "include",
+                ],
             "test/ssl_test.o" =>
                 [
                     "include",
@@ -9882,10 +9248,6 @@ our %unified_info = (
                 [
                     "include",
                 ],
-            "test/testutil/init.o" =>
-                [
-                    "include",
-                ],
             "test/testutil/main.o" =>
                 [
                     "include",
@@ -9914,6 +9276,10 @@ our %unified_info = (
                 [
                     "include",
                 ],
+            "test/testutil/testutil_init.o" =>
+                [
+                    "include",
+                ],
             "test/threadstest.o" =>
                 [
                     "include",
@@ -10178,6 +9544,7 @@ our %unified_info = (
             "test/sm4_internal_test",
             "test/srptest",
             "test/ssl_cert_table_internal_test",
+            "test/ssl_ctx_test",
             "test/ssl_test",
             "test/ssl_test_ctx_test",
             "test/sslapitest",
@@ -15068,7 +14435,6 @@ our %unified_info = (
                     "test/testutil/cb.o",
                     "test/testutil/driver.o",
                     "test/testutil/format_output.o",
-                    "test/testutil/init.o",
                     "test/testutil/main.o",
                     "test/testutil/output_helpers.o",
                     "test/testutil/random.o",
@@ -15076,6 +14442,7 @@ our %unified_info = (
                     "test/testutil/tap_bio.o",
                     "test/testutil/test_cleanup.o",
                     "test/testutil/tests.o",
+                    "test/testutil/testutil_init.o",
                 ],
             "test/md2test" =>
                 [
@@ -15303,6 +14670,14 @@ our %unified_info = (
                 [
                     "test/ssl_cert_table_internal_test.c",
                 ],
+            "test/ssl_ctx_test" =>
+                [
+                    "test/ssl_ctx_test.o",
+                ],
+            "test/ssl_ctx_test.o" =>
+                [
+                    "test/ssl_ctx_test.c",
+                ],
             "test/ssl_test" =>
                 [
                     "test/handshake_helper.o",
@@ -15405,10 +14780,6 @@ our %unified_info = (
                 [
                     "test/testutil/format_output.c",
                 ],
-            "test/testutil/init.o" =>
-                [
-                    "test/testutil/init.c",
-                ],
             "test/testutil/main.o" =>
                 [
                     "test/testutil/main.c",
@@ -15437,6 +14808,10 @@ our %unified_info = (
                 [
                     "test/testutil/tests.c",
                 ],
+            "test/testutil/testutil_init.o" =>
+                [
+                    "test/testutil/testutil_init.c",
+                ],
             "test/threadstest" =>
                 [
                     "test/threadstest.o",
diff --git a/deps/openssl/config/archs/darwin64-x86_64-cc/no-asm/crypto/buildinf.h b/deps/openssl/config/archs/darwin64-x86_64-cc/no-asm/crypto/buildinf.h
index a2a8835315..43f321a7ac 100644
--- a/deps/openssl/config/archs/darwin64-x86_64-cc/no-asm/crypto/buildinf.h
+++ b/deps/openssl/config/archs/darwin64-x86_64-cc/no-asm/crypto/buildinf.h
@@ -11,7 +11,7 @@
  */
 
 #define PLATFORM "platform: darwin64-x86_64-cc"
-#define DATE "built on: Fri Sep 13 15:58:36 2019 UTC"
+#define DATE "built on: Wed Mar 18 21:05:38 2020 UTC"
 
 /*
  * Generate compiler_flags as an array of individual characters. This is a
diff --git a/deps/openssl/config/archs/darwin64-x86_64-cc/no-asm/crypto/include/internal/bn_conf.h b/deps/openssl/config/archs/darwin64-x86_64-cc/no-asm/crypto/include/internal/bn_conf.h
index 34bd8b78b4..5312ef5a7a 100644
--- a/deps/openssl/config/archs/darwin64-x86_64-cc/no-asm/crypto/include/internal/bn_conf.h
+++ b/deps/openssl/config/archs/darwin64-x86_64-cc/no-asm/crypto/include/internal/bn_conf.h
@@ -1,5 +1,5 @@
 /* WARNING: do not edit! */
-/* Generated by Makefile from crypto/include/internal/bn_conf.h.in */
+/* Generated by Makefile from include/crypto/bn_conf.h.in */
 /*
  * Copyright 2016 The OpenSSL Project Authors. All Rights Reserved.
  *
@@ -9,8 +9,8 @@
  * https://www.openssl.org/source/license.html
  */
 
-#ifndef HEADER_BN_CONF_H
-# define HEADER_BN_CONF_H
+#ifndef OSSL_CRYPTO_BN_CONF_H
+# define OSSL_CRYPTO_BN_CONF_H
 
 /*
  * The contents of this file are not used in the UEFI build, as
diff --git a/deps/openssl/config/archs/darwin64-x86_64-cc/no-asm/crypto/include/internal/dso_conf.h b/deps/openssl/config/archs/darwin64-x86_64-cc/no-asm/crypto/include/internal/dso_conf.h
index a69309195e..e2d05cdbf4 100644
--- a/deps/openssl/config/archs/darwin64-x86_64-cc/no-asm/crypto/include/internal/dso_conf.h
+++ b/deps/openssl/config/archs/darwin64-x86_64-cc/no-asm/crypto/include/internal/dso_conf.h
@@ -1,5 +1,5 @@
 /* WARNING: do not edit! */
-/* Generated by Makefile from crypto/include/internal/dso_conf.h.in */
+/* Generated by Makefile from include/crypto/dso_conf.h.in */
 /*
  * Copyright 2016-2019 The OpenSSL Project Authors. All Rights Reserved.
  *
@@ -9,8 +9,8 @@
  * https://www.openssl.org/source/license.html
  */
 
-#ifndef HEADER_DSO_CONF_H
-# define HEADER_DSO_CONF_H
+#ifndef OSSL_CRYPTO_DSO_CONF_H
+# define OSSL_CRYPTO_DSO_CONF_H
 # define DSO_DLFCN
 # define HAVE_DLFCN_H
 # define DSO_EXTENSION ".dylib"
diff --git a/deps/openssl/config/archs/darwin64-x86_64-cc/no-asm/include/openssl/opensslconf.h b/deps/openssl/config/archs/darwin64-x86_64-cc/no-asm/include/openssl/opensslconf.h
index 9079cf7ba8..30e08538dd 100644
--- a/deps/openssl/config/archs/darwin64-x86_64-cc/no-asm/include/openssl/opensslconf.h
+++ b/deps/openssl/config/archs/darwin64-x86_64-cc/no-asm/include/openssl/opensslconf.h
@@ -102,9 +102,6 @@ extern "C" {
 #ifndef OPENSSL_NO_DYNAMIC_ENGINE
 # define OPENSSL_NO_DYNAMIC_ENGINE
 #endif
-#ifndef OPENSSL_NO_AFALGENG
-# define OPENSSL_NO_AFALGENG
-#endif
 
 
 /*
diff --git a/deps/openssl/config/archs/darwin64-x86_64-cc/no-asm/include/progs.h b/deps/openssl/config/archs/darwin64-x86_64-cc/no-asm/include/progs.h
index 9b3d270e20..308c65601b 100644
--- a/deps/openssl/config/archs/darwin64-x86_64-cc/no-asm/include/progs.h
+++ b/deps/openssl/config/archs/darwin64-x86_64-cc/no-asm/include/progs.h
@@ -2,7 +2,7 @@
  * WARNING: do not edit!
  * Generated by apps/progs.pl
  *
- * Copyright 1995-2019 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 1995-2020 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
diff --git a/deps/openssl/config/archs/linux-aarch64/asm/configdata.pm b/deps/openssl/config/archs/linux-aarch64/asm/configdata.pm
index 832a223ee3..1e08556a96 100644
--- a/deps/openssl/config/archs/linux-aarch64/asm/configdata.pm
+++ b/deps/openssl/config/archs/linux-aarch64/asm/configdata.pm
@@ -55,7 +55,7 @@ our %config = (
   minor => "1.1",
   openssl_algorithm_defines => [ "OPENSSL_NO_COMP", "OPENSSL_NO_MD2", "OPENSSL_NO_RC5" ],
   openssl_api_defines => [  ],
-  openssl_other_defines => [ "OPENSSL_RAND_SEED_OS", "OPENSSL_NO_AFALGENG", "OPENSSL_NO_ASAN", "OPENSSL_NO_CRYPTO_MDEBUG", "OPENSSL_NO_CRYPTO_MDEBUG_BACKTRACE", "OPENSSL_NO_DEVCRYPTOENG", "OPENSSL_NO_EC_NISTP_64_GCC_128", "OPENSSL_NO_EGD", "OPENSSL_NO_EXTERNAL_TESTS", "OPENSSL_NO_FUZZ_AFL", "OPENSSL_NO_FUZZ_LIBFUZZER", "OPENSSL_NO_HEARTBEATS", "OPENSSL_NO_MSAN", "OPENSSL_NO_SCTP", "OPENSSL_NO_SSL3", "OPENSSL_NO_SSL3_METHOD", "OPENSSL_NO_UBSAN", "OPENSSL_NO_UNIT_TEST", "OPENSSL_NO_WEAK_SSL_CIPHERS", "OPENSSL_NO_DYNAMIC_ENGINE", "OPENSSL_NO_AFALGENG" ],
+  openssl_other_defines => [ "OPENSSL_RAND_SEED_OS", "OPENSSL_NO_AFALGENG", "OPENSSL_NO_ASAN", "OPENSSL_NO_CRYPTO_MDEBUG", "OPENSSL_NO_CRYPTO_MDEBUG_BACKTRACE", "OPENSSL_NO_DEVCRYPTOENG", "OPENSSL_NO_EC_NISTP_64_GCC_128", "OPENSSL_NO_EGD", "OPENSSL_NO_EXTERNAL_TESTS", "OPENSSL_NO_FUZZ_AFL", "OPENSSL_NO_FUZZ_LIBFUZZER", "OPENSSL_NO_HEARTBEATS", "OPENSSL_NO_MSAN", "OPENSSL_NO_SCTP", "OPENSSL_NO_SSL3", "OPENSSL_NO_SSL3_METHOD", "OPENSSL_NO_UBSAN", "OPENSSL_NO_UNIT_TEST", "OPENSSL_NO_WEAK_SSL_CIPHERS", "OPENSSL_NO_DYNAMIC_ENGINE" ],
   openssl_sys_defines => [  ],
   openssl_thread_defines => [ "OPENSSL_THREADS" ],
   openssldir => "",
@@ -111,8 +111,8 @@ our %config = (
   sourcedir => ".",
   target => "linux-aarch64",
   tdirs => [ "ossl_shim" ],
-  version => "1.1.1d",
-  version_num => "0x1010104fL",
+  version => "1.1.1e",
+  version_num => "0x1010105fL",
 );
 
 our %target = (
@@ -239,6 +239,7 @@ our @disablables = (
   "dgram",
   "dh",
   "dsa",
+  "dso",
   "dtls",
   "dynamic-engine",
   "ec",
@@ -356,8 +357,8 @@ our %unified_info = (
         {
             "" =>
                 [
-                    "crypto/include/internal/bn_conf.h",
-                    "crypto/include/internal/dso_conf.h",
+                    "include/crypto/bn_conf.h",
+                    "include/crypto/dso_conf.h",
                     "include/openssl/opensslconf.h",
                 ],
             "apps/asn1pars.o" =>
@@ -625,14 +626,6 @@ our %unified_info = (
                     "crypto/perlasm/cbc.pl",
                     "crypto/perlasm/x86asm.pl",
                 ],
-            "crypto/include/internal/bn_conf.h" =>
-                [
-                    "configdata.pm",
-                ],
-            "crypto/include/internal/dso_conf.h" =>
-                [
-                    "configdata.pm",
-                ],
             "crypto/rc4/rc4-586.s" =>
                 [
                     "crypto/perlasm/x86asm.pl",
@@ -708,6 +701,14 @@ our %unified_info = (
                 [
                     "libcrypto",
                 ],
+            "include/crypto/bn_conf.h" =>
+                [
+                    "configdata.pm",
+                ],
+            "include/crypto/dso_conf.h" =>
+                [
+                    "configdata.pm",
+                ],
             "include/openssl/opensslconf.h" =>
                 [
                     "configdata.pm",
@@ -1505,6 +1506,12 @@ our %unified_info = (
                     "libcrypto",
                     "test/libtestutil.a",
                 ],
+            "test/ssl_ctx_test" =>
+                [
+                    "libcrypto",
+                    "libssl",
+                    "test/libtestutil.a",
+                ],
             "test/ssl_test" =>
                 [
                     "libcrypto",
@@ -3234,7 +3241,6 @@ our %unified_info = (
                             "test/testutil/cb.o",
                             "test/testutil/driver.o",
                             "test/testutil/format_output.o",
-                            "test/testutil/init.o",
                             "test/testutil/main.o",
                             "test/testutil/output_helpers.o",
                             "test/testutil/random.o",
@@ -3242,6 +3248,7 @@ our %unified_info = (
                             "test/testutil/tap_bio.o",
                             "test/testutil/test_cleanup.o",
                             "test/testutil/tests.o",
+                            "test/testutil/testutil_init.o",
                         ],
                     "products" =>
                         {
@@ -3740,14 +3747,6 @@ our %unified_info = (
                 [
                     "crypto/ia64cpuid.S",
                 ],
-            "crypto/include/internal/bn_conf.h" =>
-                [
-                    "crypto/include/internal/bn_conf.h.in",
-                ],
-            "crypto/include/internal/dso_conf.h" =>
-                [
-                    "crypto/include/internal/dso_conf.h.in",
-                ],
             "crypto/md5/md5-586.s" =>
                 [
                     "crypto/md5/asm/md5-586.pl",
@@ -4188,6 +4187,14 @@ our %unified_info = (
                     "engines/asm/e_padlock-x86_64.pl",
                     "\$(PERLASM_SCHEME)",
                 ],
+            "include/crypto/bn_conf.h" =>
+                [
+                    "include/crypto/bn_conf.h.in",
+                ],
+            "include/crypto/dso_conf.h" =>
+                [
+                    "include/crypto/dso_conf.h.in",
+                ],
             "include/openssl/opensslconf.h" =>
                 [
                     "include/openssl/opensslconf.h.in",
@@ -4882,49 +4889,41 @@ our %unified_info = (
             "crypto/aes/aes_cbc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/aes/aes_cfb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/aes/aes_core.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/aes/aes_ecb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/aes/aes_ige.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/aes/aes_misc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/aes/aes_ofb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/aes/aes_wrap.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/aes/aesfx-sparcv9.o" =>
@@ -4938,7 +4937,6 @@ our %unified_info = (
             "crypto/aes/aesv8-armx.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto",
                 ],
@@ -4949,26 +4947,22 @@ our %unified_info = (
             "crypto/aes/vpaes-armv8.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/aria/aria.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/arm64cpuid.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto",
                 ],
             "crypto/armcap.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/armv4cpuid.o" =>
@@ -4978,613 +4972,511 @@ our %unified_info = (
             "crypto/asn1/a_bitstr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_d2i_fp.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_digest.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_dup.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_gentm.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_i2d_fp.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_int.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_mbstr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_object.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_octet.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_print.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_sign.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_strex.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_strnid.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_time.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_type.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_utctm.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_utf8.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_verify.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/ameth_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/asn1_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/asn1_gen.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/asn1_item_list.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/asn1_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/asn1_par.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/asn_mime.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/asn_moid.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/asn_mstbl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/asn_pack.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/bio_asn1.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/bio_ndef.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/d2i_pr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/d2i_pu.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/evp_asn1.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/f_int.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/f_string.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/i2d_pr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/i2d_pu.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/n_pkey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/nsseq.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/p5_pbe.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/p5_pbev2.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/p5_scrypt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/p8_pkey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/t_bitst.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/t_pkey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/t_spki.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/tasn_dec.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/tasn_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/tasn_fre.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/tasn_new.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/tasn_prn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/tasn_scn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/tasn_typ.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/tasn_utl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/x_algor.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/x_bignum.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/x_info.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/x_int64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/x_long.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/x_pkey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/x_sig.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/x_spki.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/x_val.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/async/arch/async_null.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/async/arch/async_posix.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/async/arch/async_win.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/async/async.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/async/async_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/async/async_wait.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bf/bf_cfb64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bf/bf_ecb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bf/bf_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bf/bf_ofb64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bf/bf_skey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/b_addr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/b_dump.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/b_print.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/b_sock.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/b_sock2.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bf_buff.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bf_lbuf.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bf_nbio.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bf_null.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bio_cb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bio_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bio_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bio_meth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bss_acpt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bss_bio.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bss_conn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bss_dgram.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bss_fd.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bss_file.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bss_log.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bss_mem.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bss_null.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bss_sock.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/blake2/blake2b.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/blake2/blake2s.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/blake2/m_blake2b.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/blake2/m_blake2s.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/armv4-gf2m.o" =>
@@ -5598,7 +5490,6 @@ our %unified_info = (
             "crypto/bn/armv8-mont.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn-mips.o" =>
@@ -5608,188 +5499,157 @@ our %unified_info = (
             "crypto/bn/bn_add.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_asm.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_blind.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_const.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_ctx.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_depr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_dh.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_div.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_exp.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto",
                 ],
             "crypto/bn/bn_exp2.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_gcd.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_gf2m.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_intern.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_kron.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_mod.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_mont.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_mpi.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_mul.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_nist.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_prime.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_print.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_rand.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_recp.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_shift.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_sqr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_sqrt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_srp.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_word.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_x931p.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/mips-mont.o" =>
@@ -5819,13 +5679,11 @@ our %unified_info = (
             "crypto/buffer/buf_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/buffer/buffer.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/buildinf.h" =>
@@ -5835,43 +5693,36 @@ our %unified_info = (
             "crypto/camellia/camellia.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/camellia/cmll_cbc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/camellia/cmll_cfb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/camellia/cmll_ctr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/camellia/cmll_ecb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/camellia/cmll_misc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/camellia/cmll_ofb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/camellia/cmllt4-sparcv9.o" =>
@@ -5881,31 +5732,26 @@ our %unified_info = (
             "crypto/cast/c_cfb64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cast/c_ecb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cast/c_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cast/c_ofb64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cast/c_skey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/chacha/chacha-armv4.o" =>
@@ -5915,7 +5761,6 @@ our %unified_info = (
             "crypto/chacha/chacha-armv8.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto",
                 ],
@@ -5926,272 +5771,227 @@ our %unified_info = (
             "crypto/cmac/cm_ameth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cmac/cm_pmeth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cmac/cmac.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_asn1.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_att.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_cd.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_dd.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_env.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_ess.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_io.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_kari.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_pwri.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_sd.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_smime.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/conf/conf_api.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/conf/conf_def.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/conf/conf_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/conf/conf_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/conf/conf_mall.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/conf/conf_mod.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/conf/conf_sap.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/conf/conf_ssl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cpt_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cryptlib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ct/ct_b64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ct/ct_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ct/ct_log.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ct/ct_oct.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ct/ct_policy.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ct/ct_prn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ct/ct_sct.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ct/ct_sct_ctx.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ct/ct_vfy.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ct/ct_x509v3.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ctype.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cversion.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto",
                 ],
             "crypto/des/cbc_cksm.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/cbc_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/cfb64ede.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/cfb64enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/cfb_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/des_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/dest4-sparcv9.o" =>
@@ -6201,301 +6001,251 @@ our %unified_info = (
             "crypto/des/ecb3_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/ecb_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/fcrypt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/fcrypt_b.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/ofb64ede.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/ofb64enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/ofb_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/pcbc_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/qud_cksm.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/rand_key.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/set_key.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/str2key.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/xcbc_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_ameth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_asn1.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_check.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_depr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_gen.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_kdf.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_key.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_meth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_pmeth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_prn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_rfc5114.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_rfc7919.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dsa/dsa_ameth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dsa/dsa_asn1.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dsa/dsa_depr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dsa/dsa_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dsa/dsa_gen.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dsa/dsa_key.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dsa/dsa_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dsa/dsa_meth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dsa/dsa_ossl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dsa/dsa_pmeth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dsa/dsa_prn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dsa/dsa_sign.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dsa/dsa_vrf.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dso/dso_dl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dso/dso_dlfcn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dso/dso_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dso/dso_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dso/dso_openssl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dso/dso_vms.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dso/dso_win32.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ebcdic.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/curve25519.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/curve448/arch_32/f_impl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto/ec/curve448/arch_32",
                     "crypto/ec/curve448",
@@ -6503,7 +6253,6 @@ our %unified_info = (
             "crypto/ec/curve448/curve448.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto/ec/curve448/arch_32",
                     "crypto/ec/curve448",
@@ -6511,7 +6260,6 @@ our %unified_info = (
             "crypto/ec/curve448/curve448_tables.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto/ec/curve448/arch_32",
                     "crypto/ec/curve448",
@@ -6519,7 +6267,6 @@ our %unified_info = (
             "crypto/ec/curve448/eddsa.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto/ec/curve448/arch_32",
                     "crypto/ec/curve448",
@@ -6527,7 +6274,6 @@ our %unified_info = (
             "crypto/ec/curve448/f_generic.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto/ec/curve448/arch_32",
                     "crypto/ec/curve448",
@@ -6535,7 +6281,6 @@ our %unified_info = (
             "crypto/ec/curve448/scalar.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto/ec/curve448/arch_32",
                     "crypto/ec/curve448",
@@ -6543,163 +6288,136 @@ our %unified_info = (
             "crypto/ec/ec2_oct.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec2_smpl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec_ameth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec_asn1.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec_check.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec_curve.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec_cvt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec_key.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec_kmeth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec_mult.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec_oct.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec_pmeth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec_print.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecdh_kdf.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecdh_ossl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecdsa_ossl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecdsa_sign.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecdsa_vrf.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/eck_prn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecp_mont.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecp_nist.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecp_nistp224.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecp_nistp256.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecp_nistp521.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecp_nistputil.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecp_nistz256-armv4.o" =>
@@ -6709,7 +6427,6 @@ our %unified_info = (
             "crypto/ec/ecp_nistz256-armv8.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto",
                 ],
@@ -6720,229 +6437,191 @@ our %unified_info = (
             "crypto/ec/ecp_nistz256.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecp_oct.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecp_smpl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecx_meth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/eng_all.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/eng_cnf.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/eng_ctrl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/eng_dyn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/eng_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/eng_fat.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/eng_init.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/eng_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/eng_list.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/eng_openssl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/eng_pkey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/eng_rdrand.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/eng_table.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/tb_asnmth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/tb_cipher.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/tb_dh.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/tb_digest.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/tb_dsa.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/tb_eckey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/tb_pkmeth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/tb_rand.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/tb_rsa.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/err/err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/err/err_all.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/err/err_prn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/bio_b64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/bio_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/bio_md.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/bio_ok.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/c_allc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/c_alld.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/cmeth_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/digest.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/e_aes.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto",
                     "crypto/modes",
@@ -6950,21 +6629,18 @@ our %unified_info = (
             "crypto/evp/e_aes_cbc_hmac_sha1.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto/modes",
                 ],
             "crypto/evp/e_aes_cbc_hmac_sha256.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto/modes",
                 ],
             "crypto/evp/e_aria.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto",
                     "crypto/modes",
@@ -6972,13 +6648,11 @@ our %unified_info = (
             "crypto/evp/e_bf.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/e_camellia.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto",
                     "crypto/modes",
@@ -6986,81 +6660,68 @@ our %unified_info = (
             "crypto/evp/e_cast.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/e_chacha20_poly1305.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/e_des.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto",
                 ],
             "crypto/evp/e_des3.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto",
                 ],
             "crypto/evp/e_idea.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/e_null.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/e_old.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/e_rc2.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/e_rc4.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/e_rc4_hmac_md5.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/e_rc5.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/e_seed.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/e_sm4.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto",
                     "crypto/modes",
@@ -7068,328 +6729,267 @@ our %unified_info = (
             "crypto/evp/e_xcbc_d.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/encode.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/evp_cnf.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/evp_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/evp_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/evp_key.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/evp_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/evp_pbe.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/evp_pkey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/m_md2.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/m_md4.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/m_md5.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/m_md5_sha1.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/m_mdc2.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/m_null.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/m_ripemd.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/m_sha1.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/m_sha3.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto",
                 ],
             "crypto/evp/m_sigver.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/m_wp.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/names.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/p5_crpt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/p5_crpt2.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/p_dec.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/p_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/p_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/p_open.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/p_seal.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/p_sign.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/p_verify.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/pbe_scrypt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/pmeth_fn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/pmeth_gn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/pmeth_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ex_data.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/getenv.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/hmac/hm_ameth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/hmac/hm_pmeth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/hmac/hmac.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/idea/i_cbc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/idea/i_cfb64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/idea/i_ecb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/idea/i_ofb64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/idea/i_skey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
-            "crypto/include/internal/bn_conf.h" =>
-                [
-                    ".",
-                ],
-            "crypto/include/internal/dso_conf.h" =>
-                [
-                    ".",
-                ],
             "crypto/init.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/kdf/hkdf.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/kdf/kdf_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/kdf/scrypt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/kdf/tls1_prf.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/lhash/lh_stats.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/lhash/lhash.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/md4/md4_dgst.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/md4/md4_one.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/md5/md5-sparcv9.o" =>
@@ -7399,79 +6999,66 @@ our %unified_info = (
             "crypto/md5/md5_dgst.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/md5/md5_one.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/mdc2/mdc2_one.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/mdc2/mdc2dgst.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/mem.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/mem_dbg.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/mem_sec.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/modes/cbc128.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/modes/ccm128.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/modes/cfb128.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/modes/ctr128.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/modes/cts128.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/modes/gcm128.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto",
                 ],
@@ -7490,368 +7077,307 @@ our %unified_info = (
             "crypto/modes/ghashv8-armx.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto",
                 ],
             "crypto/modes/ocb128.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/modes/ofb128.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/modes/wrap128.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/modes/xts128.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/o_dir.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/o_fips.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/o_fopen.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/o_init.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/o_str.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/o_time.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/objects/o_names.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/objects/obj_dat.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/objects/obj_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/objects/obj_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/objects/obj_xref.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ocsp/ocsp_asn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ocsp/ocsp_cl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ocsp/ocsp_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ocsp/ocsp_ext.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ocsp/ocsp_ht.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ocsp/ocsp_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ocsp/ocsp_prn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ocsp/ocsp_srv.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ocsp/ocsp_vfy.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ocsp/v3_ocsp.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pem/pem_all.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pem/pem_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pem/pem_info.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pem/pem_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pem/pem_oth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pem/pem_pk8.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pem/pem_pkey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pem/pem_sign.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pem/pem_x509.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pem/pem_xaux.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pem/pvkfmt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_add.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_asn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_attr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_crpt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_crt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_decr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_init.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_key.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_kiss.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_mutl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_npas.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_p8d.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_p8e.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_sbag.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_utl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/pk12err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs7/bio_pk7.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs7/pk7_asn1.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs7/pk7_attr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs7/pk7_doit.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs7/pk7_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs7/pk7_mime.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs7/pk7_smime.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs7/pkcs7err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/poly1305/poly1305-armv4.o" =>
@@ -7861,7 +7387,6 @@ our %unified_info = (
             "crypto/poly1305/poly1305-armv8.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto",
                 ],
@@ -7876,259 +7401,216 @@ our %unified_info = (
             "crypto/poly1305/poly1305.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/poly1305/poly1305_ameth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/poly1305/poly1305_pmeth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rand/drbg_ctr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rand/drbg_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rand/rand_egd.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rand/rand_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rand/rand_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rand/rand_unix.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rand/rand_vms.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rand/rand_win.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rand/randfile.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rc2/rc2_cbc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rc2/rc2_ecb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rc2/rc2_skey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rc2/rc2cfb64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rc2/rc2ofb64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rc4/rc4_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rc4/rc4_skey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ripemd/rmd_dgst.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ripemd/rmd_one.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_ameth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_asn1.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_chk.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_crpt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_depr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_gen.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_meth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_mp.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_none.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_oaep.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_ossl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_pk1.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_pmeth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_prn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_pss.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_saos.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_sign.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_ssl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_x931.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_x931g.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/s390xcpuid.o" =>
@@ -8138,31 +7620,26 @@ our %unified_info = (
             "crypto/seed/seed.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/seed/seed_cbc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/seed/seed_cfb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/seed/seed_ecb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/seed/seed_ofb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sha/keccak1600-armv4.o" =>
@@ -8172,7 +7649,6 @@ our %unified_info = (
             "crypto/sha/keccak1600-armv8.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sha/sha1-armv4-large.o" =>
@@ -8182,7 +7658,6 @@ our %unified_info = (
             "crypto/sha/sha1-armv8.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto",
                 ],
@@ -8201,13 +7676,11 @@ our %unified_info = (
             "crypto/sha/sha1_one.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sha/sha1dgst.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sha/sha256-armv4.o" =>
@@ -8217,7 +7690,6 @@ our %unified_info = (
             "crypto/sha/sha256-armv8.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto",
                 ],
@@ -8236,7 +7708,6 @@ our %unified_info = (
             "crypto/sha/sha256.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sha/sha512-armv4.o" =>
@@ -8246,7 +7717,6 @@ our %unified_info = (
             "crypto/sha/sha512-armv8.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto",
                 ],
@@ -8265,709 +7735,591 @@ our %unified_info = (
             "crypto/sha/sha512.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/siphash/siphash.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/siphash/siphash_ameth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/siphash/siphash_pmeth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sm2/sm2_crypt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sm2/sm2_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sm2/sm2_pmeth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sm2/sm2_sign.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sm3/m_sm3.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sm3/sm3.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sm4/sm4.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/srp/srp_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/srp/srp_vfy.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/stack/stack.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/store/loader_file.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/store/store_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/store/store_init.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/store/store_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/store/store_register.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/store/store_strings.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/threads_none.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/threads_pthread.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/threads_win.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ts/ts_asn1.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ts/ts_conf.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ts/ts_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ts/ts_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ts/ts_req_print.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ts/ts_req_utils.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ts/ts_rsp_print.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ts/ts_rsp_sign.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ts/ts_rsp_utils.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ts/ts_rsp_verify.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ts/ts_verify_ctx.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/txt_db/txt_db.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ui/ui_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ui/ui_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ui/ui_null.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ui/ui_openssl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ui/ui_util.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/uid.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/whrlpool/wp_block.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/whrlpool/wp_dgst.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/by_dir.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/by_file.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/t_crl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/t_req.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/t_x509.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_att.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_cmp.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_d2.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_def.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_ext.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_lu.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_meth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_obj.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_r2x.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_req.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_set.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_trs.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_txt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_v3.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_vfy.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_vpm.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509cset.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509name.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509rset.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509spki.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509type.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x_all.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x_attrib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x_crl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x_exten.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x_name.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x_pubkey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x_req.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x_x509.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x_x509a.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/pcy_cache.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/pcy_data.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/pcy_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/pcy_map.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/pcy_node.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/pcy_tree.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_addr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_admis.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_akey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_akeya.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_alt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_asid.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_bcons.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_bitst.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_conf.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_cpols.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_crld.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_enum.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_extku.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_genn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_ia5.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_info.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_int.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_ncons.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_pci.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_pcia.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_pcons.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_pku.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_pmaps.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_prn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_purp.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_skey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_sxnet.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_tlsf.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_utl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "engines/e_capi.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "engines/e_padlock.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "fuzz/asn1.o" =>
@@ -9018,6 +8370,14 @@ our %unified_info = (
                 [
                     "include",
                 ],
+            "include/crypto/bn_conf.h" =>
+                [
+                    ".",
+                ],
+            "include/crypto/dso_conf.h" =>
+                [
+                    ".",
+                ],
             "include/openssl/opensslconf.h" =>
                 [
                     ".",
@@ -9262,7 +8622,6 @@ our %unified_info = (
                 [
                     ".",
                     "include",
-                    "crypto/include",
                 ],
             "test/asn1_string_table_test.o" =>
                 [
@@ -9588,7 +8947,6 @@ our %unified_info = (
                 [
                     ".",
                     "include",
-                    "crypto/include",
                 ],
             "test/cipher_overhead_test.o" =>
                 [
@@ -9634,7 +8992,6 @@ our %unified_info = (
             "test/ctype_internal_test.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "test/curve448_internal_test.o" =>
@@ -9700,7 +9057,6 @@ our %unified_info = (
                 [
                     "include",
                     "crypto/ec",
-                    "crypto/include",
                 ],
             "test/ecdsatest.o" =>
                 [
@@ -9725,7 +9081,6 @@ our %unified_info = (
             "test/evp_extra_test.o" =>
                 [
                     "include",
-                    "crypto/include",
                 ],
             "test/evp_test.o" =>
                 [
@@ -9823,7 +9178,6 @@ our %unified_info = (
                 [
                     ".",
                     "include",
-                    "crypto/include",
                 ],
             "test/rc2test.o" =>
                 [
@@ -9873,18 +9227,15 @@ our %unified_info = (
                 [
                     ".",
                     "include",
-                    "crypto/include",
                 ],
             "test/sm2_internal_test.o" =>
                 [
                     "include",
-                    "crypto/include",
                 ],
             "test/sm4_internal_test.o" =>
                 [
                     ".",
                     "include",
-                    "crypto/include",
                 ],
             "test/srptest.o" =>
                 [
@@ -9895,6 +9246,10 @@ our %unified_info = (
                     ".",
                     "include",
                 ],
+            "test/ssl_ctx_test.o" =>
+                [
+                    "include",
+                ],
             "test/ssl_test.o" =>
                 [
                     "include",
@@ -9958,10 +9313,6 @@ our %unified_info = (
                 [
                     "include",
                 ],
-            "test/testutil/init.o" =>
-                [
-                    "include",
-                ],
             "test/testutil/main.o" =>
                 [
                     "include",
@@ -9990,6 +9341,10 @@ our %unified_info = (
                 [
                     "include",
                 ],
+            "test/testutil/testutil_init.o" =>
+                [
+                    "include",
+                ],
             "test/threadstest.o" =>
                 [
                     "include",
@@ -10254,6 +9609,7 @@ our %unified_info = (
             "test/sm4_internal_test",
             "test/srptest",
             "test/ssl_cert_table_internal_test",
+            "test/ssl_ctx_test",
             "test/ssl_test",
             "test/ssl_test_ctx_test",
             "test/sslapitest",
@@ -15199,7 +14555,6 @@ our %unified_info = (
                     "test/testutil/cb.o",
                     "test/testutil/driver.o",
                     "test/testutil/format_output.o",
-                    "test/testutil/init.o",
                     "test/testutil/main.o",
                     "test/testutil/output_helpers.o",
                     "test/testutil/random.o",
@@ -15207,6 +14562,7 @@ our %unified_info = (
                     "test/testutil/tap_bio.o",
                     "test/testutil/test_cleanup.o",
                     "test/testutil/tests.o",
+                    "test/testutil/testutil_init.o",
                 ],
             "test/md2test" =>
                 [
@@ -15434,6 +14790,14 @@ our %unified_info = (
                 [
                     "test/ssl_cert_table_internal_test.c",
                 ],
+            "test/ssl_ctx_test" =>
+                [
+                    "test/ssl_ctx_test.o",
+                ],
+            "test/ssl_ctx_test.o" =>
+                [
+                    "test/ssl_ctx_test.c",
+                ],
             "test/ssl_test" =>
                 [
                     "test/handshake_helper.o",
@@ -15536,10 +14900,6 @@ our %unified_info = (
                 [
                     "test/testutil/format_output.c",
                 ],
-            "test/testutil/init.o" =>
-                [
-                    "test/testutil/init.c",
-                ],
             "test/testutil/main.o" =>
                 [
                     "test/testutil/main.c",
@@ -15568,6 +14928,10 @@ our %unified_info = (
                 [
                     "test/testutil/tests.c",
                 ],
+            "test/testutil/testutil_init.o" =>
+                [
+                    "test/testutil/testutil_init.c",
+                ],
             "test/threadstest" =>
                 [
                     "test/threadstest.o",
diff --git a/deps/openssl/config/archs/linux-aarch64/asm/crypto/buildinf.h b/deps/openssl/config/archs/linux-aarch64/asm/crypto/buildinf.h
index 6046c7d5fd..ed35c1e5ca 100644
--- a/deps/openssl/config/archs/linux-aarch64/asm/crypto/buildinf.h
+++ b/deps/openssl/config/archs/linux-aarch64/asm/crypto/buildinf.h
@@ -11,7 +11,7 @@
  */
 
 #define PLATFORM "platform: linux-aarch64"
-#define DATE "built on: Fri Sep 13 15:58:56 2019 UTC"
+#define DATE "built on: Wed Mar 18 21:05:53 2020 UTC"
 
 /*
  * Generate compiler_flags as an array of individual characters. This is a
diff --git a/deps/openssl/config/archs/linux-aarch64/asm/crypto/ec/ecp_nistz256-armv8.S b/deps/openssl/config/archs/linux-aarch64/asm/crypto/ec/ecp_nistz256-armv8.S
index 9b625b9560..7caa581608 100644
--- a/deps/openssl/config/archs/linux-aarch64/asm/crypto/ec/ecp_nistz256-armv8.S
+++ b/deps/openssl/config/archs/linux-aarch64/asm/crypto/ec/ecp_nistz256-armv8.S
@@ -3015,7 +3015,7 @@ __ecp_nistz256_div_by_2:
 .align	5
 ecp_nistz256_point_double:
 .inst	0xd503233f		// paciasp
-	stp	x29,x30,[sp,#-80]!
+	stp	x29,x30,[sp,#-96]!
 	add	x29,sp,#0
 	stp	x19,x20,[sp,#16]
 	stp	x21,x22,[sp,#32]
@@ -3148,7 +3148,7 @@ ecp_nistz256_point_double:
 	add	sp,x29,#0		// destroy frame
 	ldp	x19,x20,[x29,#16]
 	ldp	x21,x22,[x29,#32]
-	ldp	x29,x30,[sp],#80
+	ldp	x29,x30,[sp],#96
 .inst	0xd50323bf		// autiasp
 	ret
 .size	ecp_nistz256_point_double,.-ecp_nistz256_point_double
@@ -3157,12 +3157,13 @@ ecp_nistz256_point_double:
 .align	5
 ecp_nistz256_point_add:
 .inst	0xd503233f		// paciasp
-	stp	x29,x30,[sp,#-80]!
+	stp	x29,x30,[sp,#-96]!
 	add	x29,sp,#0
 	stp	x19,x20,[sp,#16]
 	stp	x21,x22,[sp,#32]
 	stp	x23,x24,[sp,#48]
 	stp	x25,x26,[sp,#64]
+	stp	x27,x28,[sp,#80]
 	sub	sp,sp,#32*12
 
 	ldp	x4,x5,[x2,#64]	// in2_z
@@ -3176,7 +3177,7 @@ ecp_nistz256_point_add:
 	orr	x10,x6,x7
 	orr	x25,x8,x10
 	cmp	x25,#0
-	csetm	x25,ne		// !in2infty
+	csetm	x25,ne		// ~in2infty
 	add	x0,sp,#192
 	bl	__ecp_nistz256_sqr_mont	// p256_sqr_mont(Z2sqr, in2_z);
 
@@ -3186,7 +3187,7 @@ ecp_nistz256_point_add:
 	orr	x10,x6,x7
 	orr	x24,x8,x10
 	cmp	x24,#0
-	csetm	x24,ne		// !in1infty
+	csetm	x24,ne		// ~in1infty
 	add	x0,sp,#128
 	bl	__ecp_nistz256_sqr_mont	// p256_sqr_mont(Z1sqr, in1_z);
 
@@ -3227,7 +3228,7 @@ ecp_nistz256_point_add:
 
 	orr	x14,x14,x15	// see if result is zero
 	orr	x16,x16,x17
-	orr	x26,x14,x16
+	orr	x26,x14,x16	// ~is_equal(S1,S2)
 
 	add	x2,sp,#192
 	add	x0,sp,#256
@@ -3248,32 +3249,21 @@ ecp_nistz256_point_add:
 
 	orr	x14,x14,x15	// see if result is zero
 	orr	x16,x16,x17
-	orr	x14,x14,x16
-	tst	x14,x14
-	b.ne	.Ladd_proceed		// is_equal(U1,U2)?
+	orr	x14,x14,x16	// ~is_equal(U1,U2)
 
-	tst	x24,x25
-	b.eq	.Ladd_proceed		// (in1infty || in2infty)?
+	mvn	x27,x24	// -1/0 -> 0/-1
+	mvn	x28,x25	// -1/0 -> 0/-1
+	orr	x14,x14,x27
+	orr	x14,x14,x28
+	orr	x14,x14,x26
+	cbnz	x14,.Ladd_proceed	// if(~is_equal(U1,U2) | in1infty | in2infty | ~is_equal(S1,S2))
 
-	tst	x26,x26
-	b.eq	.Ladd_double		// is_equal(S1,S2)?
-
-	eor	x4,x4,x4
-	eor	x5,x5,x5
-	stp	x4,x5,[x21]
-	stp	x4,x5,[x21,#16]
-	stp	x4,x5,[x21,#32]
-	stp	x4,x5,[x21,#48]
-	stp	x4,x5,[x21,#64]
-	stp	x4,x5,[x21,#80]
-	b	.Ladd_done
-
-.align	4
 .Ladd_double:
 	mov	x1,x22
 	mov	x0,x21
 	ldp	x23,x24,[x29,#48]
 	ldp	x25,x26,[x29,#64]
+	ldp	x27,x28,[x29,#80]
 	add	sp,sp,#32*(12-4)	// difference in stack frames
 	b	.Ldouble_shortcut
 
@@ -3355,14 +3345,14 @@ ecp_nistz256_point_add:
 	ldp	x8,x9,[x23]		// in2
 	ldp	x10,x11,[x23,#16]
 	ldp	x14,x15,[x22,#0]	// in1
-	cmp	x24,#0			// !, remember?
+	cmp	x24,#0			// ~, remember?
 	ldp	x16,x17,[x22,#0+16]
 	csel	x8,x4,x8,ne
 	csel	x9,x5,x9,ne
 	ldp	x4,x5,[sp,#0+0+32]	// res
 	csel	x10,x6,x10,ne
 	csel	x11,x7,x11,ne
-	cmp	x25,#0			// !, remember?
+	cmp	x25,#0			// ~, remember?
 	ldp	x6,x7,[sp,#0+0+48]
 	csel	x14,x8,x14,ne
 	csel	x15,x9,x15,ne
@@ -3373,14 +3363,14 @@ ecp_nistz256_point_add:
 	stp	x14,x15,[x21,#0]
 	stp	x16,x17,[x21,#0+16]
 	ldp	x14,x15,[x22,#32]	// in1
-	cmp	x24,#0			// !, remember?
+	cmp	x24,#0			// ~, remember?
 	ldp	x16,x17,[x22,#32+16]
 	csel	x8,x4,x8,ne
 	csel	x9,x5,x9,ne
 	ldp	x4,x5,[sp,#0+32+32]	// res
 	csel	x10,x6,x10,ne
 	csel	x11,x7,x11,ne
-	cmp	x25,#0			// !, remember?
+	cmp	x25,#0			// ~, remember?
 	ldp	x6,x7,[sp,#0+32+48]
 	csel	x14,x8,x14,ne
 	csel	x15,x9,x15,ne
@@ -3391,13 +3381,13 @@ ecp_nistz256_point_add:
 	stp	x14,x15,[x21,#32]
 	stp	x16,x17,[x21,#32+16]
 	ldp	x14,x15,[x22,#64]	// in1
-	cmp	x24,#0			// !, remember?
+	cmp	x24,#0			// ~, remember?
 	ldp	x16,x17,[x22,#64+16]
 	csel	x8,x4,x8,ne
 	csel	x9,x5,x9,ne
 	csel	x10,x6,x10,ne
 	csel	x11,x7,x11,ne
-	cmp	x25,#0			// !, remember?
+	cmp	x25,#0			// ~, remember?
 	csel	x14,x8,x14,ne
 	csel	x15,x9,x15,ne
 	csel	x16,x10,x16,ne
@@ -3411,7 +3401,8 @@ ecp_nistz256_point_add:
 	ldp	x21,x22,[x29,#32]
 	ldp	x23,x24,[x29,#48]
 	ldp	x25,x26,[x29,#64]
-	ldp	x29,x30,[sp],#80
+	ldp	x27,x28,[x29,#80]
+	ldp	x29,x30,[sp],#96
 .inst	0xd50323bf		// autiasp
 	ret
 .size	ecp_nistz256_point_add,.-ecp_nistz256_point_add
@@ -3440,7 +3431,7 @@ ecp_nistz256_point_add_affine:
 	orr	x10,x6,x7
 	orr	x24,x8,x10
 	cmp	x24,#0
-	csetm	x24,ne		// !in1infty
+	csetm	x24,ne		// ~in1infty
 
 	ldp	x14,x15,[x2]	// in2_x
 	ldp	x16,x17,[x2,#16]
@@ -3454,7 +3445,7 @@ ecp_nistz256_point_add_affine:
 	orr	x8,x8,x10
 	orr	x25,x14,x8
 	cmp	x25,#0
-	csetm	x25,ne		// !in2infty
+	csetm	x25,ne		// ~in2infty
 
 	add	x0,sp,#128
 	bl	__ecp_nistz256_sqr_mont	// p256_sqr_mont(Z1sqr, in1_z);
@@ -3561,14 +3552,14 @@ ecp_nistz256_point_add_affine:
 	ldp	x8,x9,[x23]		// in2
 	ldp	x10,x11,[x23,#16]
 	ldp	x14,x15,[x22,#0]	// in1
-	cmp	x24,#0			// !, remember?
+	cmp	x24,#0			// ~, remember?
 	ldp	x16,x17,[x22,#0+16]
 	csel	x8,x4,x8,ne
 	csel	x9,x5,x9,ne
 	ldp	x4,x5,[sp,#0+0+32]	// res
 	csel	x10,x6,x10,ne
 	csel	x11,x7,x11,ne
-	cmp	x25,#0			// !, remember?
+	cmp	x25,#0			// ~, remember?
 	ldp	x6,x7,[sp,#0+0+48]
 	csel	x14,x8,x14,ne
 	csel	x15,x9,x15,ne
@@ -3580,14 +3571,14 @@ ecp_nistz256_point_add_affine:
 	stp	x16,x17,[x21,#0+16]
 	adr	x23,.Lone_mont-64
 	ldp	x14,x15,[x22,#32]	// in1
-	cmp	x24,#0			// !, remember?
+	cmp	x24,#0			// ~, remember?
 	ldp	x16,x17,[x22,#32+16]
 	csel	x8,x4,x8,ne
 	csel	x9,x5,x9,ne
 	ldp	x4,x5,[sp,#0+32+32]	// res
 	csel	x10,x6,x10,ne
 	csel	x11,x7,x11,ne
-	cmp	x25,#0			// !, remember?
+	cmp	x25,#0			// ~, remember?
 	ldp	x6,x7,[sp,#0+32+48]
 	csel	x14,x8,x14,ne
 	csel	x15,x9,x15,ne
@@ -3598,13 +3589,13 @@ ecp_nistz256_point_add_affine:
 	stp	x14,x15,[x21,#32]
 	stp	x16,x17,[x21,#32+16]
 	ldp	x14,x15,[x22,#64]	// in1
-	cmp	x24,#0			// !, remember?
+	cmp	x24,#0			// ~, remember?
 	ldp	x16,x17,[x22,#64+16]
 	csel	x8,x4,x8,ne
 	csel	x9,x5,x9,ne
 	csel	x10,x6,x10,ne
 	csel	x11,x7,x11,ne
-	cmp	x25,#0			// !, remember?
+	cmp	x25,#0			// ~, remember?
 	csel	x14,x8,x14,ne
 	csel	x15,x9,x15,ne
 	csel	x16,x10,x16,ne
diff --git a/deps/openssl/config/archs/linux-aarch64/asm/crypto/include/internal/bn_conf.h b/deps/openssl/config/archs/linux-aarch64/asm/crypto/include/internal/bn_conf.h
index 34bd8b78b4..5312ef5a7a 100644
--- a/deps/openssl/config/archs/linux-aarch64/asm/crypto/include/internal/bn_conf.h
+++ b/deps/openssl/config/archs/linux-aarch64/asm/crypto/include/internal/bn_conf.h
@@ -1,5 +1,5 @@
 /* WARNING: do not edit! */
-/* Generated by Makefile from crypto/include/internal/bn_conf.h.in */
+/* Generated by Makefile from include/crypto/bn_conf.h.in */
 /*
  * Copyright 2016 The OpenSSL Project Authors. All Rights Reserved.
  *
@@ -9,8 +9,8 @@
  * https://www.openssl.org/source/license.html
  */
 
-#ifndef HEADER_BN_CONF_H
-# define HEADER_BN_CONF_H
+#ifndef OSSL_CRYPTO_BN_CONF_H
+# define OSSL_CRYPTO_BN_CONF_H
 
 /*
  * The contents of this file are not used in the UEFI build, as
diff --git a/deps/openssl/config/archs/linux-aarch64/asm/crypto/include/internal/dso_conf.h b/deps/openssl/config/archs/linux-aarch64/asm/crypto/include/internal/dso_conf.h
index 252266ec2a..4b1167c3d8 100644
--- a/deps/openssl/config/archs/linux-aarch64/asm/crypto/include/internal/dso_conf.h
+++ b/deps/openssl/config/archs/linux-aarch64/asm/crypto/include/internal/dso_conf.h
@@ -1,5 +1,5 @@
 /* WARNING: do not edit! */
-/* Generated by Makefile from crypto/include/internal/dso_conf.h.in */
+/* Generated by Makefile from include/crypto/dso_conf.h.in */
 /*
  * Copyright 2016-2019 The OpenSSL Project Authors. All Rights Reserved.
  *
@@ -9,8 +9,8 @@
  * https://www.openssl.org/source/license.html
  */
 
-#ifndef HEADER_DSO_CONF_H
-# define HEADER_DSO_CONF_H
+#ifndef OSSL_CRYPTO_DSO_CONF_H
+# define OSSL_CRYPTO_DSO_CONF_H
 # define DSO_DLFCN
 # define HAVE_DLFCN_H
 # define DSO_EXTENSION ".so"
diff --git a/deps/openssl/config/archs/linux-aarch64/asm/crypto/sha/sha256-armv8.S b/deps/openssl/config/archs/linux-aarch64/asm/crypto/sha/sha256-armv8.S
index 7dcc98ea95..a8843c87d1 100644
--- a/deps/openssl/config/archs/linux-aarch64/asm/crypto/sha/sha256-armv8.S
+++ b/deps/openssl/config/archs/linux-aarch64/asm/crypto/sha/sha256-armv8.S
@@ -1,4 +1,4 @@
-// Copyright 2014-2019 The OpenSSL Project Authors. All Rights Reserved.
+// Copyright 2014-2020 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
diff --git a/deps/openssl/config/archs/linux-aarch64/asm/crypto/sha/sha512-armv8.S b/deps/openssl/config/archs/linux-aarch64/asm/crypto/sha/sha512-armv8.S
index d341c63a28..e86b69f011 100644
--- a/deps/openssl/config/archs/linux-aarch64/asm/crypto/sha/sha512-armv8.S
+++ b/deps/openssl/config/archs/linux-aarch64/asm/crypto/sha/sha512-armv8.S
@@ -1,4 +1,4 @@
-// Copyright 2014-2019 The OpenSSL Project Authors. All Rights Reserved.
+// Copyright 2014-2020 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
diff --git a/deps/openssl/config/archs/linux-aarch64/asm/include/openssl/opensslconf.h b/deps/openssl/config/archs/linux-aarch64/asm/include/openssl/opensslconf.h
index 30820b6051..937531fe9f 100644
--- a/deps/openssl/config/archs/linux-aarch64/asm/include/openssl/opensslconf.h
+++ b/deps/openssl/config/archs/linux-aarch64/asm/include/openssl/opensslconf.h
@@ -96,9 +96,6 @@ extern "C" {
 #ifndef OPENSSL_NO_DYNAMIC_ENGINE
 # define OPENSSL_NO_DYNAMIC_ENGINE
 #endif
-#ifndef OPENSSL_NO_AFALGENG
-# define OPENSSL_NO_AFALGENG
-#endif
 
 
 /*
diff --git a/deps/openssl/config/archs/linux-aarch64/asm/include/progs.h b/deps/openssl/config/archs/linux-aarch64/asm/include/progs.h
index 9b3d270e20..308c65601b 100644
--- a/deps/openssl/config/archs/linux-aarch64/asm/include/progs.h
+++ b/deps/openssl/config/archs/linux-aarch64/asm/include/progs.h
@@ -2,7 +2,7 @@
  * WARNING: do not edit!
  * Generated by apps/progs.pl
  *
- * Copyright 1995-2019 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 1995-2020 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
diff --git a/deps/openssl/config/archs/linux-aarch64/asm_avx2/configdata.pm b/deps/openssl/config/archs/linux-aarch64/asm_avx2/configdata.pm
index bfc02733dc..591ab6875b 100644
--- a/deps/openssl/config/archs/linux-aarch64/asm_avx2/configdata.pm
+++ b/deps/openssl/config/archs/linux-aarch64/asm_avx2/configdata.pm
@@ -55,7 +55,7 @@ our %config = (
   minor => "1.1",
   openssl_algorithm_defines => [ "OPENSSL_NO_COMP", "OPENSSL_NO_MD2", "OPENSSL_NO_RC5" ],
   openssl_api_defines => [  ],
-  openssl_other_defines => [ "OPENSSL_RAND_SEED_OS", "OPENSSL_NO_AFALGENG", "OPENSSL_NO_ASAN", "OPENSSL_NO_CRYPTO_MDEBUG", "OPENSSL_NO_CRYPTO_MDEBUG_BACKTRACE", "OPENSSL_NO_DEVCRYPTOENG", "OPENSSL_NO_EC_NISTP_64_GCC_128", "OPENSSL_NO_EGD", "OPENSSL_NO_EXTERNAL_TESTS", "OPENSSL_NO_FUZZ_AFL", "OPENSSL_NO_FUZZ_LIBFUZZER", "OPENSSL_NO_HEARTBEATS", "OPENSSL_NO_MSAN", "OPENSSL_NO_SCTP", "OPENSSL_NO_SSL3", "OPENSSL_NO_SSL3_METHOD", "OPENSSL_NO_UBSAN", "OPENSSL_NO_UNIT_TEST", "OPENSSL_NO_WEAK_SSL_CIPHERS", "OPENSSL_NO_DYNAMIC_ENGINE", "OPENSSL_NO_AFALGENG" ],
+  openssl_other_defines => [ "OPENSSL_RAND_SEED_OS", "OPENSSL_NO_AFALGENG", "OPENSSL_NO_ASAN", "OPENSSL_NO_CRYPTO_MDEBUG", "OPENSSL_NO_CRYPTO_MDEBUG_BACKTRACE", "OPENSSL_NO_DEVCRYPTOENG", "OPENSSL_NO_EC_NISTP_64_GCC_128", "OPENSSL_NO_EGD", "OPENSSL_NO_EXTERNAL_TESTS", "OPENSSL_NO_FUZZ_AFL", "OPENSSL_NO_FUZZ_LIBFUZZER", "OPENSSL_NO_HEARTBEATS", "OPENSSL_NO_MSAN", "OPENSSL_NO_SCTP", "OPENSSL_NO_SSL3", "OPENSSL_NO_SSL3_METHOD", "OPENSSL_NO_UBSAN", "OPENSSL_NO_UNIT_TEST", "OPENSSL_NO_WEAK_SSL_CIPHERS", "OPENSSL_NO_DYNAMIC_ENGINE" ],
   openssl_sys_defines => [  ],
   openssl_thread_defines => [ "OPENSSL_THREADS" ],
   openssldir => "",
@@ -111,8 +111,8 @@ our %config = (
   sourcedir => ".",
   target => "linux-aarch64",
   tdirs => [ "ossl_shim" ],
-  version => "1.1.1d",
-  version_num => "0x1010104fL",
+  version => "1.1.1e",
+  version_num => "0x1010105fL",
 );
 
 our %target = (
@@ -239,6 +239,7 @@ our @disablables = (
   "dgram",
   "dh",
   "dsa",
+  "dso",
   "dtls",
   "dynamic-engine",
   "ec",
@@ -356,8 +357,8 @@ our %unified_info = (
         {
             "" =>
                 [
-                    "crypto/include/internal/bn_conf.h",
-                    "crypto/include/internal/dso_conf.h",
+                    "include/crypto/bn_conf.h",
+                    "include/crypto/dso_conf.h",
                     "include/openssl/opensslconf.h",
                 ],
             "apps/asn1pars.o" =>
@@ -625,14 +626,6 @@ our %unified_info = (
                     "crypto/perlasm/cbc.pl",
                     "crypto/perlasm/x86asm.pl",
                 ],
-            "crypto/include/internal/bn_conf.h" =>
-                [
-                    "configdata.pm",
-                ],
-            "crypto/include/internal/dso_conf.h" =>
-                [
-                    "configdata.pm",
-                ],
             "crypto/rc4/rc4-586.s" =>
                 [
                     "crypto/perlasm/x86asm.pl",
@@ -708,6 +701,14 @@ our %unified_info = (
                 [
                     "libcrypto",
                 ],
+            "include/crypto/bn_conf.h" =>
+                [
+                    "configdata.pm",
+                ],
+            "include/crypto/dso_conf.h" =>
+                [
+                    "configdata.pm",
+                ],
             "include/openssl/opensslconf.h" =>
                 [
                     "configdata.pm",
@@ -1505,6 +1506,12 @@ our %unified_info = (
                     "libcrypto",
                     "test/libtestutil.a",
                 ],
+            "test/ssl_ctx_test" =>
+                [
+                    "libcrypto",
+                    "libssl",
+                    "test/libtestutil.a",
+                ],
             "test/ssl_test" =>
                 [
                     "libcrypto",
@@ -3234,7 +3241,6 @@ our %unified_info = (
                             "test/testutil/cb.o",
                             "test/testutil/driver.o",
                             "test/testutil/format_output.o",
-                            "test/testutil/init.o",
                             "test/testutil/main.o",
                             "test/testutil/output_helpers.o",
                             "test/testutil/random.o",
@@ -3242,6 +3248,7 @@ our %unified_info = (
                             "test/testutil/tap_bio.o",
                             "test/testutil/test_cleanup.o",
                             "test/testutil/tests.o",
+                            "test/testutil/testutil_init.o",
                         ],
                     "products" =>
                         {
@@ -3740,14 +3747,6 @@ our %unified_info = (
                 [
                     "crypto/ia64cpuid.S",
                 ],
-            "crypto/include/internal/bn_conf.h" =>
-                [
-                    "crypto/include/internal/bn_conf.h.in",
-                ],
-            "crypto/include/internal/dso_conf.h" =>
-                [
-                    "crypto/include/internal/dso_conf.h.in",
-                ],
             "crypto/md5/md5-586.s" =>
                 [
                     "crypto/md5/asm/md5-586.pl",
@@ -4188,6 +4187,14 @@ our %unified_info = (
                     "engines/asm/e_padlock-x86_64.pl",
                     "\$(PERLASM_SCHEME)",
                 ],
+            "include/crypto/bn_conf.h" =>
+                [
+                    "include/crypto/bn_conf.h.in",
+                ],
+            "include/crypto/dso_conf.h" =>
+                [
+                    "include/crypto/dso_conf.h.in",
+                ],
             "include/openssl/opensslconf.h" =>
                 [
                     "include/openssl/opensslconf.h.in",
@@ -4882,49 +4889,41 @@ our %unified_info = (
             "crypto/aes/aes_cbc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/aes/aes_cfb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/aes/aes_core.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/aes/aes_ecb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/aes/aes_ige.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/aes/aes_misc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/aes/aes_ofb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/aes/aes_wrap.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/aes/aesfx-sparcv9.o" =>
@@ -4938,7 +4937,6 @@ our %unified_info = (
             "crypto/aes/aesv8-armx.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto",
                 ],
@@ -4949,26 +4947,22 @@ our %unified_info = (
             "crypto/aes/vpaes-armv8.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/aria/aria.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/arm64cpuid.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto",
                 ],
             "crypto/armcap.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/armv4cpuid.o" =>
@@ -4978,613 +4972,511 @@ our %unified_info = (
             "crypto/asn1/a_bitstr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_d2i_fp.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_digest.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_dup.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_gentm.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_i2d_fp.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_int.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_mbstr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_object.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_octet.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_print.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_sign.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_strex.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_strnid.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_time.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_type.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_utctm.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_utf8.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_verify.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/ameth_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/asn1_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/asn1_gen.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/asn1_item_list.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/asn1_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/asn1_par.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/asn_mime.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/asn_moid.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/asn_mstbl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/asn_pack.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/bio_asn1.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/bio_ndef.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/d2i_pr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/d2i_pu.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/evp_asn1.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/f_int.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/f_string.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/i2d_pr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/i2d_pu.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/n_pkey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/nsseq.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/p5_pbe.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/p5_pbev2.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/p5_scrypt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/p8_pkey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/t_bitst.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/t_pkey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/t_spki.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/tasn_dec.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/tasn_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/tasn_fre.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/tasn_new.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/tasn_prn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/tasn_scn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/tasn_typ.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/tasn_utl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/x_algor.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/x_bignum.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/x_info.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/x_int64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/x_long.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/x_pkey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/x_sig.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/x_spki.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/x_val.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/async/arch/async_null.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/async/arch/async_posix.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/async/arch/async_win.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/async/async.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/async/async_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/async/async_wait.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bf/bf_cfb64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bf/bf_ecb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bf/bf_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bf/bf_ofb64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bf/bf_skey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/b_addr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/b_dump.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/b_print.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/b_sock.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/b_sock2.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bf_buff.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bf_lbuf.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bf_nbio.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bf_null.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bio_cb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bio_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bio_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bio_meth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bss_acpt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bss_bio.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bss_conn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bss_dgram.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bss_fd.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bss_file.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bss_log.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bss_mem.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bss_null.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bss_sock.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/blake2/blake2b.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/blake2/blake2s.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/blake2/m_blake2b.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/blake2/m_blake2s.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/armv4-gf2m.o" =>
@@ -5598,7 +5490,6 @@ our %unified_info = (
             "crypto/bn/armv8-mont.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn-mips.o" =>
@@ -5608,188 +5499,157 @@ our %unified_info = (
             "crypto/bn/bn_add.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_asm.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_blind.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_const.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_ctx.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_depr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_dh.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_div.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_exp.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto",
                 ],
             "crypto/bn/bn_exp2.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_gcd.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_gf2m.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_intern.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_kron.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_mod.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_mont.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_mpi.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_mul.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_nist.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_prime.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_print.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_rand.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_recp.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_shift.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_sqr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_sqrt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_srp.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_word.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_x931p.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/mips-mont.o" =>
@@ -5819,13 +5679,11 @@ our %unified_info = (
             "crypto/buffer/buf_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/buffer/buffer.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/buildinf.h" =>
@@ -5835,43 +5693,36 @@ our %unified_info = (
             "crypto/camellia/camellia.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/camellia/cmll_cbc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/camellia/cmll_cfb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/camellia/cmll_ctr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/camellia/cmll_ecb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/camellia/cmll_misc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/camellia/cmll_ofb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/camellia/cmllt4-sparcv9.o" =>
@@ -5881,31 +5732,26 @@ our %unified_info = (
             "crypto/cast/c_cfb64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cast/c_ecb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cast/c_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cast/c_ofb64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cast/c_skey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/chacha/chacha-armv4.o" =>
@@ -5915,7 +5761,6 @@ our %unified_info = (
             "crypto/chacha/chacha-armv8.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto",
                 ],
@@ -5926,272 +5771,227 @@ our %unified_info = (
             "crypto/cmac/cm_ameth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cmac/cm_pmeth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cmac/cmac.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_asn1.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_att.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_cd.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_dd.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_env.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_ess.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_io.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_kari.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_pwri.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_sd.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_smime.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/conf/conf_api.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/conf/conf_def.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/conf/conf_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/conf/conf_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/conf/conf_mall.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/conf/conf_mod.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/conf/conf_sap.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/conf/conf_ssl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cpt_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cryptlib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ct/ct_b64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ct/ct_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ct/ct_log.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ct/ct_oct.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ct/ct_policy.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ct/ct_prn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ct/ct_sct.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ct/ct_sct_ctx.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ct/ct_vfy.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ct/ct_x509v3.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ctype.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cversion.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto",
                 ],
             "crypto/des/cbc_cksm.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/cbc_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/cfb64ede.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/cfb64enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/cfb_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/des_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/dest4-sparcv9.o" =>
@@ -6201,301 +6001,251 @@ our %unified_info = (
             "crypto/des/ecb3_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/ecb_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/fcrypt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/fcrypt_b.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/ofb64ede.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/ofb64enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/ofb_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/pcbc_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/qud_cksm.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/rand_key.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/set_key.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/str2key.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/xcbc_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_ameth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_asn1.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_check.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_depr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_gen.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_kdf.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_key.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_meth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_pmeth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_prn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_rfc5114.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_rfc7919.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dsa/dsa_ameth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dsa/dsa_asn1.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dsa/dsa_depr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dsa/dsa_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dsa/dsa_gen.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dsa/dsa_key.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dsa/dsa_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dsa/dsa_meth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dsa/dsa_ossl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dsa/dsa_pmeth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dsa/dsa_prn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dsa/dsa_sign.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dsa/dsa_vrf.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dso/dso_dl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dso/dso_dlfcn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dso/dso_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dso/dso_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dso/dso_openssl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dso/dso_vms.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dso/dso_win32.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ebcdic.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/curve25519.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/curve448/arch_32/f_impl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto/ec/curve448/arch_32",
                     "crypto/ec/curve448",
@@ -6503,7 +6253,6 @@ our %unified_info = (
             "crypto/ec/curve448/curve448.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto/ec/curve448/arch_32",
                     "crypto/ec/curve448",
@@ -6511,7 +6260,6 @@ our %unified_info = (
             "crypto/ec/curve448/curve448_tables.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto/ec/curve448/arch_32",
                     "crypto/ec/curve448",
@@ -6519,7 +6267,6 @@ our %unified_info = (
             "crypto/ec/curve448/eddsa.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto/ec/curve448/arch_32",
                     "crypto/ec/curve448",
@@ -6527,7 +6274,6 @@ our %unified_info = (
             "crypto/ec/curve448/f_generic.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto/ec/curve448/arch_32",
                     "crypto/ec/curve448",
@@ -6535,7 +6281,6 @@ our %unified_info = (
             "crypto/ec/curve448/scalar.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto/ec/curve448/arch_32",
                     "crypto/ec/curve448",
@@ -6543,163 +6288,136 @@ our %unified_info = (
             "crypto/ec/ec2_oct.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec2_smpl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec_ameth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec_asn1.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec_check.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec_curve.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec_cvt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec_key.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec_kmeth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec_mult.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec_oct.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec_pmeth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec_print.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecdh_kdf.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecdh_ossl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecdsa_ossl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecdsa_sign.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecdsa_vrf.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/eck_prn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecp_mont.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecp_nist.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecp_nistp224.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecp_nistp256.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecp_nistp521.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecp_nistputil.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecp_nistz256-armv4.o" =>
@@ -6709,7 +6427,6 @@ our %unified_info = (
             "crypto/ec/ecp_nistz256-armv8.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto",
                 ],
@@ -6720,229 +6437,191 @@ our %unified_info = (
             "crypto/ec/ecp_nistz256.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecp_oct.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecp_smpl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecx_meth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/eng_all.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/eng_cnf.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/eng_ctrl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/eng_dyn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/eng_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/eng_fat.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/eng_init.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/eng_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/eng_list.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/eng_openssl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/eng_pkey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/eng_rdrand.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/eng_table.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/tb_asnmth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/tb_cipher.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/tb_dh.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/tb_digest.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/tb_dsa.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/tb_eckey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/tb_pkmeth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/tb_rand.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/tb_rsa.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/err/err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/err/err_all.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/err/err_prn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/bio_b64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/bio_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/bio_md.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/bio_ok.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/c_allc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/c_alld.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/cmeth_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/digest.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/e_aes.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto",
                     "crypto/modes",
@@ -6950,21 +6629,18 @@ our %unified_info = (
             "crypto/evp/e_aes_cbc_hmac_sha1.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto/modes",
                 ],
             "crypto/evp/e_aes_cbc_hmac_sha256.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto/modes",
                 ],
             "crypto/evp/e_aria.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto",
                     "crypto/modes",
@@ -6972,13 +6648,11 @@ our %unified_info = (
             "crypto/evp/e_bf.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/e_camellia.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto",
                     "crypto/modes",
@@ -6986,81 +6660,68 @@ our %unified_info = (
             "crypto/evp/e_cast.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/e_chacha20_poly1305.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/e_des.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto",
                 ],
             "crypto/evp/e_des3.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto",
                 ],
             "crypto/evp/e_idea.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/e_null.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/e_old.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/e_rc2.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/e_rc4.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/e_rc4_hmac_md5.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/e_rc5.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/e_seed.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/e_sm4.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto",
                     "crypto/modes",
@@ -7068,328 +6729,267 @@ our %unified_info = (
             "crypto/evp/e_xcbc_d.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/encode.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/evp_cnf.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/evp_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/evp_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/evp_key.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/evp_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/evp_pbe.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/evp_pkey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/m_md2.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/m_md4.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/m_md5.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/m_md5_sha1.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/m_mdc2.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/m_null.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/m_ripemd.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/m_sha1.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/m_sha3.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto",
                 ],
             "crypto/evp/m_sigver.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/m_wp.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/names.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/p5_crpt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/p5_crpt2.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/p_dec.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/p_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/p_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/p_open.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/p_seal.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/p_sign.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/p_verify.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/pbe_scrypt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/pmeth_fn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/pmeth_gn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/pmeth_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ex_data.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/getenv.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/hmac/hm_ameth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/hmac/hm_pmeth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/hmac/hmac.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/idea/i_cbc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/idea/i_cfb64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/idea/i_ecb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/idea/i_ofb64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/idea/i_skey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
-            "crypto/include/internal/bn_conf.h" =>
-                [
-                    ".",
-                ],
-            "crypto/include/internal/dso_conf.h" =>
-                [
-                    ".",
-                ],
             "crypto/init.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/kdf/hkdf.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/kdf/kdf_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/kdf/scrypt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/kdf/tls1_prf.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/lhash/lh_stats.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/lhash/lhash.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/md4/md4_dgst.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/md4/md4_one.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/md5/md5-sparcv9.o" =>
@@ -7399,79 +6999,66 @@ our %unified_info = (
             "crypto/md5/md5_dgst.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/md5/md5_one.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/mdc2/mdc2_one.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/mdc2/mdc2dgst.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/mem.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/mem_dbg.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/mem_sec.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/modes/cbc128.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/modes/ccm128.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/modes/cfb128.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/modes/ctr128.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/modes/cts128.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/modes/gcm128.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto",
                 ],
@@ -7490,368 +7077,307 @@ our %unified_info = (
             "crypto/modes/ghashv8-armx.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto",
                 ],
             "crypto/modes/ocb128.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/modes/ofb128.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/modes/wrap128.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/modes/xts128.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/o_dir.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/o_fips.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/o_fopen.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/o_init.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/o_str.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/o_time.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/objects/o_names.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/objects/obj_dat.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/objects/obj_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/objects/obj_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/objects/obj_xref.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ocsp/ocsp_asn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ocsp/ocsp_cl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ocsp/ocsp_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ocsp/ocsp_ext.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ocsp/ocsp_ht.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ocsp/ocsp_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ocsp/ocsp_prn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ocsp/ocsp_srv.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ocsp/ocsp_vfy.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ocsp/v3_ocsp.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pem/pem_all.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pem/pem_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pem/pem_info.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pem/pem_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pem/pem_oth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pem/pem_pk8.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pem/pem_pkey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pem/pem_sign.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pem/pem_x509.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pem/pem_xaux.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pem/pvkfmt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_add.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_asn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_attr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_crpt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_crt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_decr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_init.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_key.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_kiss.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_mutl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_npas.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_p8d.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_p8e.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_sbag.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_utl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/pk12err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs7/bio_pk7.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs7/pk7_asn1.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs7/pk7_attr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs7/pk7_doit.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs7/pk7_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs7/pk7_mime.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs7/pk7_smime.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs7/pkcs7err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/poly1305/poly1305-armv4.o" =>
@@ -7861,7 +7387,6 @@ our %unified_info = (
             "crypto/poly1305/poly1305-armv8.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto",
                 ],
@@ -7876,259 +7401,216 @@ our %unified_info = (
             "crypto/poly1305/poly1305.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/poly1305/poly1305_ameth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/poly1305/poly1305_pmeth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rand/drbg_ctr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rand/drbg_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rand/rand_egd.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rand/rand_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rand/rand_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rand/rand_unix.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rand/rand_vms.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rand/rand_win.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rand/randfile.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rc2/rc2_cbc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rc2/rc2_ecb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rc2/rc2_skey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rc2/rc2cfb64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rc2/rc2ofb64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rc4/rc4_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rc4/rc4_skey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ripemd/rmd_dgst.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ripemd/rmd_one.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_ameth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_asn1.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_chk.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_crpt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_depr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_gen.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_meth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_mp.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_none.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_oaep.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_ossl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_pk1.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_pmeth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_prn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_pss.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_saos.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_sign.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_ssl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_x931.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_x931g.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/s390xcpuid.o" =>
@@ -8138,31 +7620,26 @@ our %unified_info = (
             "crypto/seed/seed.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/seed/seed_cbc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/seed/seed_cfb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/seed/seed_ecb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/seed/seed_ofb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sha/keccak1600-armv4.o" =>
@@ -8172,7 +7649,6 @@ our %unified_info = (
             "crypto/sha/keccak1600-armv8.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sha/sha1-armv4-large.o" =>
@@ -8182,7 +7658,6 @@ our %unified_info = (
             "crypto/sha/sha1-armv8.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto",
                 ],
@@ -8201,13 +7676,11 @@ our %unified_info = (
             "crypto/sha/sha1_one.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sha/sha1dgst.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sha/sha256-armv4.o" =>
@@ -8217,7 +7690,6 @@ our %unified_info = (
             "crypto/sha/sha256-armv8.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto",
                 ],
@@ -8236,7 +7708,6 @@ our %unified_info = (
             "crypto/sha/sha256.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sha/sha512-armv4.o" =>
@@ -8246,7 +7717,6 @@ our %unified_info = (
             "crypto/sha/sha512-armv8.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto",
                 ],
@@ -8265,709 +7735,591 @@ our %unified_info = (
             "crypto/sha/sha512.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/siphash/siphash.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/siphash/siphash_ameth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/siphash/siphash_pmeth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sm2/sm2_crypt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sm2/sm2_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sm2/sm2_pmeth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sm2/sm2_sign.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sm3/m_sm3.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sm3/sm3.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sm4/sm4.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/srp/srp_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/srp/srp_vfy.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/stack/stack.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/store/loader_file.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/store/store_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/store/store_init.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/store/store_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/store/store_register.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/store/store_strings.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/threads_none.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/threads_pthread.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/threads_win.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ts/ts_asn1.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ts/ts_conf.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ts/ts_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ts/ts_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ts/ts_req_print.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ts/ts_req_utils.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ts/ts_rsp_print.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ts/ts_rsp_sign.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ts/ts_rsp_utils.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ts/ts_rsp_verify.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ts/ts_verify_ctx.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/txt_db/txt_db.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ui/ui_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ui/ui_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ui/ui_null.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ui/ui_openssl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ui/ui_util.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/uid.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/whrlpool/wp_block.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/whrlpool/wp_dgst.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/by_dir.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/by_file.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/t_crl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/t_req.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/t_x509.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_att.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_cmp.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_d2.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_def.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_ext.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_lu.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_meth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_obj.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_r2x.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_req.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_set.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_trs.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_txt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_v3.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_vfy.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_vpm.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509cset.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509name.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509rset.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509spki.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509type.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x_all.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x_attrib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x_crl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x_exten.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x_name.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x_pubkey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x_req.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x_x509.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x_x509a.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/pcy_cache.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/pcy_data.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/pcy_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/pcy_map.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/pcy_node.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/pcy_tree.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_addr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_admis.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_akey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_akeya.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_alt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_asid.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_bcons.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_bitst.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_conf.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_cpols.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_crld.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_enum.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_extku.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_genn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_ia5.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_info.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_int.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_ncons.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_pci.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_pcia.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_pcons.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_pku.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_pmaps.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_prn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_purp.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_skey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_sxnet.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_tlsf.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_utl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "engines/e_capi.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "engines/e_padlock.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "fuzz/asn1.o" =>
@@ -9018,6 +8370,14 @@ our %unified_info = (
                 [
                     "include",
                 ],
+            "include/crypto/bn_conf.h" =>
+                [
+                    ".",
+                ],
+            "include/crypto/dso_conf.h" =>
+                [
+                    ".",
+                ],
             "include/openssl/opensslconf.h" =>
                 [
                     ".",
@@ -9262,7 +8622,6 @@ our %unified_info = (
                 [
                     ".",
                     "include",
-                    "crypto/include",
                 ],
             "test/asn1_string_table_test.o" =>
                 [
@@ -9588,7 +8947,6 @@ our %unified_info = (
                 [
                     ".",
                     "include",
-                    "crypto/include",
                 ],
             "test/cipher_overhead_test.o" =>
                 [
@@ -9634,7 +8992,6 @@ our %unified_info = (
             "test/ctype_internal_test.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "test/curve448_internal_test.o" =>
@@ -9700,7 +9057,6 @@ our %unified_info = (
                 [
                     "include",
                     "crypto/ec",
-                    "crypto/include",
                 ],
             "test/ecdsatest.o" =>
                 [
@@ -9725,7 +9081,6 @@ our %unified_info = (
             "test/evp_extra_test.o" =>
                 [
                     "include",
-                    "crypto/include",
                 ],
             "test/evp_test.o" =>
                 [
@@ -9823,7 +9178,6 @@ our %unified_info = (
                 [
                     ".",
                     "include",
-                    "crypto/include",
                 ],
             "test/rc2test.o" =>
                 [
@@ -9873,18 +9227,15 @@ our %unified_info = (
                 [
                     ".",
                     "include",
-                    "crypto/include",
                 ],
             "test/sm2_internal_test.o" =>
                 [
                     "include",
-                    "crypto/include",
                 ],
             "test/sm4_internal_test.o" =>
                 [
                     ".",
                     "include",
-                    "crypto/include",
                 ],
             "test/srptest.o" =>
                 [
@@ -9895,6 +9246,10 @@ our %unified_info = (
                     ".",
                     "include",
                 ],
+            "test/ssl_ctx_test.o" =>
+                [
+                    "include",
+                ],
             "test/ssl_test.o" =>
                 [
                     "include",
@@ -9958,10 +9313,6 @@ our %unified_info = (
                 [
                     "include",
                 ],
-            "test/testutil/init.o" =>
-                [
-                    "include",
-                ],
             "test/testutil/main.o" =>
                 [
                     "include",
@@ -9990,6 +9341,10 @@ our %unified_info = (
                 [
                     "include",
                 ],
+            "test/testutil/testutil_init.o" =>
+                [
+                    "include",
+                ],
             "test/threadstest.o" =>
                 [
                     "include",
@@ -10254,6 +9609,7 @@ our %unified_info = (
             "test/sm4_internal_test",
             "test/srptest",
             "test/ssl_cert_table_internal_test",
+            "test/ssl_ctx_test",
             "test/ssl_test",
             "test/ssl_test_ctx_test",
             "test/sslapitest",
@@ -15199,7 +14555,6 @@ our %unified_info = (
                     "test/testutil/cb.o",
                     "test/testutil/driver.o",
                     "test/testutil/format_output.o",
-                    "test/testutil/init.o",
                     "test/testutil/main.o",
                     "test/testutil/output_helpers.o",
                     "test/testutil/random.o",
@@ -15207,6 +14562,7 @@ our %unified_info = (
                     "test/testutil/tap_bio.o",
                     "test/testutil/test_cleanup.o",
                     "test/testutil/tests.o",
+                    "test/testutil/testutil_init.o",
                 ],
             "test/md2test" =>
                 [
@@ -15434,6 +14790,14 @@ our %unified_info = (
                 [
                     "test/ssl_cert_table_internal_test.c",
                 ],
+            "test/ssl_ctx_test" =>
+                [
+                    "test/ssl_ctx_test.o",
+                ],
+            "test/ssl_ctx_test.o" =>
+                [
+                    "test/ssl_ctx_test.c",
+                ],
             "test/ssl_test" =>
                 [
                     "test/handshake_helper.o",
@@ -15536,10 +14900,6 @@ our %unified_info = (
                 [
                     "test/testutil/format_output.c",
                 ],
-            "test/testutil/init.o" =>
-                [
-                    "test/testutil/init.c",
-                ],
             "test/testutil/main.o" =>
                 [
                     "test/testutil/main.c",
@@ -15568,6 +14928,10 @@ our %unified_info = (
                 [
                     "test/testutil/tests.c",
                 ],
+            "test/testutil/testutil_init.o" =>
+                [
+                    "test/testutil/testutil_init.c",
+                ],
             "test/threadstest" =>
                 [
                     "test/threadstest.o",
diff --git a/deps/openssl/config/archs/linux-aarch64/asm_avx2/crypto/buildinf.h b/deps/openssl/config/archs/linux-aarch64/asm_avx2/crypto/buildinf.h
index 566cfdfd84..672273eb20 100644
--- a/deps/openssl/config/archs/linux-aarch64/asm_avx2/crypto/buildinf.h
+++ b/deps/openssl/config/archs/linux-aarch64/asm_avx2/crypto/buildinf.h
@@ -11,7 +11,7 @@
  */
 
 #define PLATFORM "platform: linux-aarch64"
-#define DATE "built on: Fri Sep 13 15:59:02 2019 UTC"
+#define DATE "built on: Wed Mar 18 21:05:58 2020 UTC"
 
 /*
  * Generate compiler_flags as an array of individual characters. This is a
diff --git a/deps/openssl/config/archs/linux-aarch64/asm_avx2/crypto/ec/ecp_nistz256-armv8.S b/deps/openssl/config/archs/linux-aarch64/asm_avx2/crypto/ec/ecp_nistz256-armv8.S
index 9b625b9560..7caa581608 100644
--- a/deps/openssl/config/archs/linux-aarch64/asm_avx2/crypto/ec/ecp_nistz256-armv8.S
+++ b/deps/openssl/config/archs/linux-aarch64/asm_avx2/crypto/ec/ecp_nistz256-armv8.S
@@ -3015,7 +3015,7 @@ __ecp_nistz256_div_by_2:
 .align	5
 ecp_nistz256_point_double:
 .inst	0xd503233f		// paciasp
-	stp	x29,x30,[sp,#-80]!
+	stp	x29,x30,[sp,#-96]!
 	add	x29,sp,#0
 	stp	x19,x20,[sp,#16]
 	stp	x21,x22,[sp,#32]
@@ -3148,7 +3148,7 @@ ecp_nistz256_point_double:
 	add	sp,x29,#0		// destroy frame
 	ldp	x19,x20,[x29,#16]
 	ldp	x21,x22,[x29,#32]
-	ldp	x29,x30,[sp],#80
+	ldp	x29,x30,[sp],#96
 .inst	0xd50323bf		// autiasp
 	ret
 .size	ecp_nistz256_point_double,.-ecp_nistz256_point_double
@@ -3157,12 +3157,13 @@ ecp_nistz256_point_double:
 .align	5
 ecp_nistz256_point_add:
 .inst	0xd503233f		// paciasp
-	stp	x29,x30,[sp,#-80]!
+	stp	x29,x30,[sp,#-96]!
 	add	x29,sp,#0
 	stp	x19,x20,[sp,#16]
 	stp	x21,x22,[sp,#32]
 	stp	x23,x24,[sp,#48]
 	stp	x25,x26,[sp,#64]
+	stp	x27,x28,[sp,#80]
 	sub	sp,sp,#32*12
 
 	ldp	x4,x5,[x2,#64]	// in2_z
@@ -3176,7 +3177,7 @@ ecp_nistz256_point_add:
 	orr	x10,x6,x7
 	orr	x25,x8,x10
 	cmp	x25,#0
-	csetm	x25,ne		// !in2infty
+	csetm	x25,ne		// ~in2infty
 	add	x0,sp,#192
 	bl	__ecp_nistz256_sqr_mont	// p256_sqr_mont(Z2sqr, in2_z);
 
@@ -3186,7 +3187,7 @@ ecp_nistz256_point_add:
 	orr	x10,x6,x7
 	orr	x24,x8,x10
 	cmp	x24,#0
-	csetm	x24,ne		// !in1infty
+	csetm	x24,ne		// ~in1infty
 	add	x0,sp,#128
 	bl	__ecp_nistz256_sqr_mont	// p256_sqr_mont(Z1sqr, in1_z);
 
@@ -3227,7 +3228,7 @@ ecp_nistz256_point_add:
 
 	orr	x14,x14,x15	// see if result is zero
 	orr	x16,x16,x17
-	orr	x26,x14,x16
+	orr	x26,x14,x16	// ~is_equal(S1,S2)
 
 	add	x2,sp,#192
 	add	x0,sp,#256
@@ -3248,32 +3249,21 @@ ecp_nistz256_point_add:
 
 	orr	x14,x14,x15	// see if result is zero
 	orr	x16,x16,x17
-	orr	x14,x14,x16
-	tst	x14,x14
-	b.ne	.Ladd_proceed		// is_equal(U1,U2)?
+	orr	x14,x14,x16	// ~is_equal(U1,U2)
 
-	tst	x24,x25
-	b.eq	.Ladd_proceed		// (in1infty || in2infty)?
+	mvn	x27,x24	// -1/0 -> 0/-1
+	mvn	x28,x25	// -1/0 -> 0/-1
+	orr	x14,x14,x27
+	orr	x14,x14,x28
+	orr	x14,x14,x26
+	cbnz	x14,.Ladd_proceed	// if(~is_equal(U1,U2) | in1infty | in2infty | ~is_equal(S1,S2))
 
-	tst	x26,x26
-	b.eq	.Ladd_double		// is_equal(S1,S2)?
-
-	eor	x4,x4,x4
-	eor	x5,x5,x5
-	stp	x4,x5,[x21]
-	stp	x4,x5,[x21,#16]
-	stp	x4,x5,[x21,#32]
-	stp	x4,x5,[x21,#48]
-	stp	x4,x5,[x21,#64]
-	stp	x4,x5,[x21,#80]
-	b	.Ladd_done
-
-.align	4
 .Ladd_double:
 	mov	x1,x22
 	mov	x0,x21
 	ldp	x23,x24,[x29,#48]
 	ldp	x25,x26,[x29,#64]
+	ldp	x27,x28,[x29,#80]
 	add	sp,sp,#32*(12-4)	// difference in stack frames
 	b	.Ldouble_shortcut
 
@@ -3355,14 +3345,14 @@ ecp_nistz256_point_add:
 	ldp	x8,x9,[x23]		// in2
 	ldp	x10,x11,[x23,#16]
 	ldp	x14,x15,[x22,#0]	// in1
-	cmp	x24,#0			// !, remember?
+	cmp	x24,#0			// ~, remember?
 	ldp	x16,x17,[x22,#0+16]
 	csel	x8,x4,x8,ne
 	csel	x9,x5,x9,ne
 	ldp	x4,x5,[sp,#0+0+32]	// res
 	csel	x10,x6,x10,ne
 	csel	x11,x7,x11,ne
-	cmp	x25,#0			// !, remember?
+	cmp	x25,#0			// ~, remember?
 	ldp	x6,x7,[sp,#0+0+48]
 	csel	x14,x8,x14,ne
 	csel	x15,x9,x15,ne
@@ -3373,14 +3363,14 @@ ecp_nistz256_point_add:
 	stp	x14,x15,[x21,#0]
 	stp	x16,x17,[x21,#0+16]
 	ldp	x14,x15,[x22,#32]	// in1
-	cmp	x24,#0			// !, remember?
+	cmp	x24,#0			// ~, remember?
 	ldp	x16,x17,[x22,#32+16]
 	csel	x8,x4,x8,ne
 	csel	x9,x5,x9,ne
 	ldp	x4,x5,[sp,#0+32+32]	// res
 	csel	x10,x6,x10,ne
 	csel	x11,x7,x11,ne
-	cmp	x25,#0			// !, remember?
+	cmp	x25,#0			// ~, remember?
 	ldp	x6,x7,[sp,#0+32+48]
 	csel	x14,x8,x14,ne
 	csel	x15,x9,x15,ne
@@ -3391,13 +3381,13 @@ ecp_nistz256_point_add:
 	stp	x14,x15,[x21,#32]
 	stp	x16,x17,[x21,#32+16]
 	ldp	x14,x15,[x22,#64]	// in1
-	cmp	x24,#0			// !, remember?
+	cmp	x24,#0			// ~, remember?
 	ldp	x16,x17,[x22,#64+16]
 	csel	x8,x4,x8,ne
 	csel	x9,x5,x9,ne
 	csel	x10,x6,x10,ne
 	csel	x11,x7,x11,ne
-	cmp	x25,#0			// !, remember?
+	cmp	x25,#0			// ~, remember?
 	csel	x14,x8,x14,ne
 	csel	x15,x9,x15,ne
 	csel	x16,x10,x16,ne
@@ -3411,7 +3401,8 @@ ecp_nistz256_point_add:
 	ldp	x21,x22,[x29,#32]
 	ldp	x23,x24,[x29,#48]
 	ldp	x25,x26,[x29,#64]
-	ldp	x29,x30,[sp],#80
+	ldp	x27,x28,[x29,#80]
+	ldp	x29,x30,[sp],#96
 .inst	0xd50323bf		// autiasp
 	ret
 .size	ecp_nistz256_point_add,.-ecp_nistz256_point_add
@@ -3440,7 +3431,7 @@ ecp_nistz256_point_add_affine:
 	orr	x10,x6,x7
 	orr	x24,x8,x10
 	cmp	x24,#0
-	csetm	x24,ne		// !in1infty
+	csetm	x24,ne		// ~in1infty
 
 	ldp	x14,x15,[x2]	// in2_x
 	ldp	x16,x17,[x2,#16]
@@ -3454,7 +3445,7 @@ ecp_nistz256_point_add_affine:
 	orr	x8,x8,x10
 	orr	x25,x14,x8
 	cmp	x25,#0
-	csetm	x25,ne		// !in2infty
+	csetm	x25,ne		// ~in2infty
 
 	add	x0,sp,#128
 	bl	__ecp_nistz256_sqr_mont	// p256_sqr_mont(Z1sqr, in1_z);
@@ -3561,14 +3552,14 @@ ecp_nistz256_point_add_affine:
 	ldp	x8,x9,[x23]		// in2
 	ldp	x10,x11,[x23,#16]
 	ldp	x14,x15,[x22,#0]	// in1
-	cmp	x24,#0			// !, remember?
+	cmp	x24,#0			// ~, remember?
 	ldp	x16,x17,[x22,#0+16]
 	csel	x8,x4,x8,ne
 	csel	x9,x5,x9,ne
 	ldp	x4,x5,[sp,#0+0+32]	// res
 	csel	x10,x6,x10,ne
 	csel	x11,x7,x11,ne
-	cmp	x25,#0			// !, remember?
+	cmp	x25,#0			// ~, remember?
 	ldp	x6,x7,[sp,#0+0+48]
 	csel	x14,x8,x14,ne
 	csel	x15,x9,x15,ne
@@ -3580,14 +3571,14 @@ ecp_nistz256_point_add_affine:
 	stp	x16,x17,[x21,#0+16]
 	adr	x23,.Lone_mont-64
 	ldp	x14,x15,[x22,#32]	// in1
-	cmp	x24,#0			// !, remember?
+	cmp	x24,#0			// ~, remember?
 	ldp	x16,x17,[x22,#32+16]
 	csel	x8,x4,x8,ne
 	csel	x9,x5,x9,ne
 	ldp	x4,x5,[sp,#0+32+32]	// res
 	csel	x10,x6,x10,ne
 	csel	x11,x7,x11,ne
-	cmp	x25,#0			// !, remember?
+	cmp	x25,#0			// ~, remember?
 	ldp	x6,x7,[sp,#0+32+48]
 	csel	x14,x8,x14,ne
 	csel	x15,x9,x15,ne
@@ -3598,13 +3589,13 @@ ecp_nistz256_point_add_affine:
 	stp	x14,x15,[x21,#32]
 	stp	x16,x17,[x21,#32+16]
 	ldp	x14,x15,[x22,#64]	// in1
-	cmp	x24,#0			// !, remember?
+	cmp	x24,#0			// ~, remember?
 	ldp	x16,x17,[x22,#64+16]
 	csel	x8,x4,x8,ne
 	csel	x9,x5,x9,ne
 	csel	x10,x6,x10,ne
 	csel	x11,x7,x11,ne
-	cmp	x25,#0			// !, remember?
+	cmp	x25,#0			// ~, remember?
 	csel	x14,x8,x14,ne
 	csel	x15,x9,x15,ne
 	csel	x16,x10,x16,ne
diff --git a/deps/openssl/config/archs/linux-aarch64/asm_avx2/crypto/include/internal/bn_conf.h b/deps/openssl/config/archs/linux-aarch64/asm_avx2/crypto/include/internal/bn_conf.h
index 34bd8b78b4..5312ef5a7a 100644
--- a/deps/openssl/config/archs/linux-aarch64/asm_avx2/crypto/include/internal/bn_conf.h
+++ b/deps/openssl/config/archs/linux-aarch64/asm_avx2/crypto/include/internal/bn_conf.h
@@ -1,5 +1,5 @@
 /* WARNING: do not edit! */
-/* Generated by Makefile from crypto/include/internal/bn_conf.h.in */
+/* Generated by Makefile from include/crypto/bn_conf.h.in */
 /*
  * Copyright 2016 The OpenSSL Project Authors. All Rights Reserved.
  *
@@ -9,8 +9,8 @@
  * https://www.openssl.org/source/license.html
  */
 
-#ifndef HEADER_BN_CONF_H
-# define HEADER_BN_CONF_H
+#ifndef OSSL_CRYPTO_BN_CONF_H
+# define OSSL_CRYPTO_BN_CONF_H
 
 /*
  * The contents of this file are not used in the UEFI build, as
diff --git a/deps/openssl/config/archs/linux-aarch64/asm_avx2/crypto/include/internal/dso_conf.h b/deps/openssl/config/archs/linux-aarch64/asm_avx2/crypto/include/internal/dso_conf.h
index 252266ec2a..4b1167c3d8 100644
--- a/deps/openssl/config/archs/linux-aarch64/asm_avx2/crypto/include/internal/dso_conf.h
+++ b/deps/openssl/config/archs/linux-aarch64/asm_avx2/crypto/include/internal/dso_conf.h
@@ -1,5 +1,5 @@
 /* WARNING: do not edit! */
-/* Generated by Makefile from crypto/include/internal/dso_conf.h.in */
+/* Generated by Makefile from include/crypto/dso_conf.h.in */
 /*
  * Copyright 2016-2019 The OpenSSL Project Authors. All Rights Reserved.
  *
@@ -9,8 +9,8 @@
  * https://www.openssl.org/source/license.html
  */
 
-#ifndef HEADER_DSO_CONF_H
-# define HEADER_DSO_CONF_H
+#ifndef OSSL_CRYPTO_DSO_CONF_H
+# define OSSL_CRYPTO_DSO_CONF_H
 # define DSO_DLFCN
 # define HAVE_DLFCN_H
 # define DSO_EXTENSION ".so"
diff --git a/deps/openssl/config/archs/linux-aarch64/asm_avx2/crypto/sha/sha256-armv8.S b/deps/openssl/config/archs/linux-aarch64/asm_avx2/crypto/sha/sha256-armv8.S
index 7dcc98ea95..a8843c87d1 100644
--- a/deps/openssl/config/archs/linux-aarch64/asm_avx2/crypto/sha/sha256-armv8.S
+++ b/deps/openssl/config/archs/linux-aarch64/asm_avx2/crypto/sha/sha256-armv8.S
@@ -1,4 +1,4 @@
-// Copyright 2014-2019 The OpenSSL Project Authors. All Rights Reserved.
+// Copyright 2014-2020 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
diff --git a/deps/openssl/config/archs/linux-aarch64/asm_avx2/crypto/sha/sha512-armv8.S b/deps/openssl/config/archs/linux-aarch64/asm_avx2/crypto/sha/sha512-armv8.S
index d341c63a28..e86b69f011 100644
--- a/deps/openssl/config/archs/linux-aarch64/asm_avx2/crypto/sha/sha512-armv8.S
+++ b/deps/openssl/config/archs/linux-aarch64/asm_avx2/crypto/sha/sha512-armv8.S
@@ -1,4 +1,4 @@
-// Copyright 2014-2019 The OpenSSL Project Authors. All Rights Reserved.
+// Copyright 2014-2020 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
diff --git a/deps/openssl/config/archs/linux-aarch64/asm_avx2/include/openssl/opensslconf.h b/deps/openssl/config/archs/linux-aarch64/asm_avx2/include/openssl/opensslconf.h
index 30820b6051..937531fe9f 100644
--- a/deps/openssl/config/archs/linux-aarch64/asm_avx2/include/openssl/opensslconf.h
+++ b/deps/openssl/config/archs/linux-aarch64/asm_avx2/include/openssl/opensslconf.h
@@ -96,9 +96,6 @@ extern "C" {
 #ifndef OPENSSL_NO_DYNAMIC_ENGINE
 # define OPENSSL_NO_DYNAMIC_ENGINE
 #endif
-#ifndef OPENSSL_NO_AFALGENG
-# define OPENSSL_NO_AFALGENG
-#endif
 
 
 /*
diff --git a/deps/openssl/config/archs/linux-aarch64/asm_avx2/include/progs.h b/deps/openssl/config/archs/linux-aarch64/asm_avx2/include/progs.h
index 9b3d270e20..308c65601b 100644
--- a/deps/openssl/config/archs/linux-aarch64/asm_avx2/include/progs.h
+++ b/deps/openssl/config/archs/linux-aarch64/asm_avx2/include/progs.h
@@ -2,7 +2,7 @@
  * WARNING: do not edit!
  * Generated by apps/progs.pl
  *
- * Copyright 1995-2019 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 1995-2020 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
diff --git a/deps/openssl/config/archs/linux-aarch64/no-asm/configdata.pm b/deps/openssl/config/archs/linux-aarch64/no-asm/configdata.pm
index 320833b902..a36f3889d4 100644
--- a/deps/openssl/config/archs/linux-aarch64/no-asm/configdata.pm
+++ b/deps/openssl/config/archs/linux-aarch64/no-asm/configdata.pm
@@ -55,7 +55,7 @@ our %config = (
   minor => "1.1",
   openssl_algorithm_defines => [ "OPENSSL_NO_COMP", "OPENSSL_NO_MD2", "OPENSSL_NO_RC5" ],
   openssl_api_defines => [  ],
-  openssl_other_defines => [ "OPENSSL_RAND_SEED_OS", "OPENSSL_NO_AFALGENG", "OPENSSL_NO_ASAN", "OPENSSL_NO_ASM", "OPENSSL_NO_CRYPTO_MDEBUG", "OPENSSL_NO_CRYPTO_MDEBUG_BACKTRACE", "OPENSSL_NO_DEVCRYPTOENG", "OPENSSL_NO_EC_NISTP_64_GCC_128", "OPENSSL_NO_EGD", "OPENSSL_NO_EXTERNAL_TESTS", "OPENSSL_NO_FUZZ_AFL", "OPENSSL_NO_FUZZ_LIBFUZZER", "OPENSSL_NO_HEARTBEATS", "OPENSSL_NO_MSAN", "OPENSSL_NO_SCTP", "OPENSSL_NO_SSL3", "OPENSSL_NO_SSL3_METHOD", "OPENSSL_NO_UBSAN", "OPENSSL_NO_UNIT_TEST", "OPENSSL_NO_WEAK_SSL_CIPHERS", "OPENSSL_NO_DYNAMIC_ENGINE", "OPENSSL_NO_AFALGENG" ],
+  openssl_other_defines => [ "OPENSSL_RAND_SEED_OS", "OPENSSL_NO_AFALGENG", "OPENSSL_NO_ASAN", "OPENSSL_NO_ASM", "OPENSSL_NO_CRYPTO_MDEBUG", "OPENSSL_NO_CRYPTO_MDEBUG_BACKTRACE", "OPENSSL_NO_DEVCRYPTOENG", "OPENSSL_NO_EC_NISTP_64_GCC_128", "OPENSSL_NO_EGD", "OPENSSL_NO_EXTERNAL_TESTS", "OPENSSL_NO_FUZZ_AFL", "OPENSSL_NO_FUZZ_LIBFUZZER", "OPENSSL_NO_HEARTBEATS", "OPENSSL_NO_MSAN", "OPENSSL_NO_SCTP", "OPENSSL_NO_SSL3", "OPENSSL_NO_SSL3_METHOD", "OPENSSL_NO_UBSAN", "OPENSSL_NO_UNIT_TEST", "OPENSSL_NO_WEAK_SSL_CIPHERS", "OPENSSL_NO_DYNAMIC_ENGINE" ],
   openssl_sys_defines => [  ],
   openssl_thread_defines => [ "OPENSSL_THREADS" ],
   openssldir => "",
@@ -111,8 +111,8 @@ our %config = (
   sourcedir => ".",
   target => "linux-aarch64",
   tdirs => [ "ossl_shim" ],
-  version => "1.1.1d",
-  version_num => "0x1010104fL",
+  version => "1.1.1e",
+  version_num => "0x1010105fL",
 );
 
 our %target = (
@@ -237,6 +237,7 @@ our @disablables = (
   "dgram",
   "dh",
   "dsa",
+  "dso",
   "dtls",
   "dynamic-engine",
   "ec",
@@ -355,8 +356,8 @@ our %unified_info = (
         {
             "" =>
                 [
-                    "crypto/include/internal/bn_conf.h",
-                    "crypto/include/internal/dso_conf.h",
+                    "include/crypto/bn_conf.h",
+                    "include/crypto/dso_conf.h",
                     "include/openssl/opensslconf.h",
                 ],
             "apps/asn1pars.o" =>
@@ -624,14 +625,6 @@ our %unified_info = (
                     "crypto/perlasm/cbc.pl",
                     "crypto/perlasm/x86asm.pl",
                 ],
-            "crypto/include/internal/bn_conf.h" =>
-                [
-                    "configdata.pm",
-                ],
-            "crypto/include/internal/dso_conf.h" =>
-                [
-                    "configdata.pm",
-                ],
             "crypto/rc4/rc4-586.s" =>
                 [
                     "crypto/perlasm/x86asm.pl",
@@ -707,6 +700,14 @@ our %unified_info = (
                 [
                     "libcrypto",
                 ],
+            "include/crypto/bn_conf.h" =>
+                [
+                    "configdata.pm",
+                ],
+            "include/crypto/dso_conf.h" =>
+                [
+                    "configdata.pm",
+                ],
             "include/openssl/opensslconf.h" =>
                 [
                     "configdata.pm",
@@ -1504,6 +1505,12 @@ our %unified_info = (
                     "libcrypto",
                     "test/libtestutil.a",
                 ],
+            "test/ssl_ctx_test" =>
+                [
+                    "libcrypto",
+                    "libssl",
+                    "test/libtestutil.a",
+                ],
             "test/ssl_test" =>
                 [
                     "libcrypto",
@@ -3222,7 +3229,6 @@ our %unified_info = (
                             "test/testutil/cb.o",
                             "test/testutil/driver.o",
                             "test/testutil/format_output.o",
-                            "test/testutil/init.o",
                             "test/testutil/main.o",
                             "test/testutil/output_helpers.o",
                             "test/testutil/random.o",
@@ -3230,6 +3236,7 @@ our %unified_info = (
                             "test/testutil/tap_bio.o",
                             "test/testutil/test_cleanup.o",
                             "test/testutil/tests.o",
+                            "test/testutil/testutil_init.o",
                         ],
                     "products" =>
                         {
@@ -3728,14 +3735,6 @@ our %unified_info = (
                 [
                     "crypto/ia64cpuid.S",
                 ],
-            "crypto/include/internal/bn_conf.h" =>
-                [
-                    "crypto/include/internal/bn_conf.h.in",
-                ],
-            "crypto/include/internal/dso_conf.h" =>
-                [
-                    "crypto/include/internal/dso_conf.h.in",
-                ],
             "crypto/md5/md5-586.s" =>
                 [
                     "crypto/md5/asm/md5-586.pl",
@@ -4176,6 +4175,14 @@ our %unified_info = (
                     "engines/asm/e_padlock-x86_64.pl",
                     "\$(PERLASM_SCHEME)",
                 ],
+            "include/crypto/bn_conf.h" =>
+                [
+                    "include/crypto/bn_conf.h.in",
+                ],
+            "include/crypto/dso_conf.h" =>
+                [
+                    "include/crypto/dso_conf.h.in",
+                ],
             "include/openssl/opensslconf.h" =>
                 [
                     "include/openssl/opensslconf.h.in",
@@ -4870,49 +4877,41 @@ our %unified_info = (
             "crypto/aes/aes_cbc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/aes/aes_cfb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/aes/aes_core.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/aes/aes_ecb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/aes/aes_ige.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/aes/aes_misc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/aes/aes_ofb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/aes/aes_wrap.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/aes/aesfx-sparcv9.o" =>
@@ -4934,7 +4933,6 @@ our %unified_info = (
             "crypto/aria/aria.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/arm64cpuid.o" =>
@@ -4948,613 +4946,511 @@ our %unified_info = (
             "crypto/asn1/a_bitstr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_d2i_fp.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_digest.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_dup.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_gentm.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_i2d_fp.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_int.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_mbstr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_object.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_octet.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_print.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_sign.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_strex.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_strnid.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_time.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_type.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_utctm.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_utf8.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_verify.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/ameth_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/asn1_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/asn1_gen.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/asn1_item_list.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/asn1_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/asn1_par.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/asn_mime.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/asn_moid.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/asn_mstbl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/asn_pack.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/bio_asn1.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/bio_ndef.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/d2i_pr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/d2i_pu.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/evp_asn1.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/f_int.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/f_string.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/i2d_pr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/i2d_pu.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/n_pkey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/nsseq.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/p5_pbe.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/p5_pbev2.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/p5_scrypt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/p8_pkey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/t_bitst.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/t_pkey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/t_spki.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/tasn_dec.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/tasn_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/tasn_fre.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/tasn_new.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/tasn_prn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/tasn_scn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/tasn_typ.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/tasn_utl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/x_algor.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/x_bignum.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/x_info.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/x_int64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/x_long.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/x_pkey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/x_sig.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/x_spki.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/x_val.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/async/arch/async_null.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/async/arch/async_posix.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/async/arch/async_win.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/async/async.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/async/async_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/async/async_wait.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bf/bf_cfb64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bf/bf_ecb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bf/bf_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bf/bf_ofb64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bf/bf_skey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/b_addr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/b_dump.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/b_print.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/b_sock.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/b_sock2.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bf_buff.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bf_lbuf.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bf_nbio.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bf_null.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bio_cb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bio_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bio_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bio_meth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bss_acpt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bss_bio.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bss_conn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bss_dgram.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bss_fd.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bss_file.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bss_log.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bss_mem.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bss_null.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bss_sock.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/blake2/blake2b.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/blake2/blake2s.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/blake2/m_blake2b.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/blake2/m_blake2s.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/armv4-gf2m.o" =>
@@ -5572,188 +5468,157 @@ our %unified_info = (
             "crypto/bn/bn_add.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_asm.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_blind.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_const.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_ctx.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_depr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_dh.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_div.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_exp.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto",
                 ],
             "crypto/bn/bn_exp2.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_gcd.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_gf2m.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_intern.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_kron.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_mod.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_mont.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_mpi.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_mul.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_nist.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_prime.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_print.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_rand.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_recp.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_shift.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_sqr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_sqrt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_srp.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_word.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_x931p.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/mips-mont.o" =>
@@ -5783,13 +5648,11 @@ our %unified_info = (
             "crypto/buffer/buf_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/buffer/buffer.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/buildinf.h" =>
@@ -5799,43 +5662,36 @@ our %unified_info = (
             "crypto/camellia/camellia.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/camellia/cmll_cbc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/camellia/cmll_cfb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/camellia/cmll_ctr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/camellia/cmll_ecb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/camellia/cmll_misc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/camellia/cmll_ofb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/camellia/cmllt4-sparcv9.o" =>
@@ -5845,31 +5701,26 @@ our %unified_info = (
             "crypto/cast/c_cfb64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cast/c_ecb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cast/c_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cast/c_ofb64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cast/c_skey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/chacha/chacha-armv4.o" =>
@@ -5887,278 +5738,232 @@ our %unified_info = (
             "crypto/chacha/chacha_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cmac/cm_ameth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cmac/cm_pmeth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cmac/cmac.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_asn1.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_att.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_cd.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_dd.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_env.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_ess.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_io.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_kari.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_pwri.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_sd.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_smime.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/conf/conf_api.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/conf/conf_def.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/conf/conf_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/conf/conf_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/conf/conf_mall.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/conf/conf_mod.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/conf/conf_sap.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/conf/conf_ssl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cpt_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cryptlib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ct/ct_b64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ct/ct_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ct/ct_log.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ct/ct_oct.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ct/ct_policy.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ct/ct_prn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ct/ct_sct.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ct/ct_sct_ctx.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ct/ct_vfy.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ct/ct_x509v3.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ctype.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cversion.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto",
                 ],
             "crypto/des/cbc_cksm.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/cbc_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/cfb64ede.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/cfb64enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/cfb_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/des_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/dest4-sparcv9.o" =>
@@ -6168,301 +5973,251 @@ our %unified_info = (
             "crypto/des/ecb3_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/ecb_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/fcrypt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/fcrypt_b.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/ofb64ede.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/ofb64enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/ofb_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/pcbc_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/qud_cksm.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/rand_key.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/set_key.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/str2key.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/xcbc_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_ameth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_asn1.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_check.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_depr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_gen.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_kdf.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_key.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_meth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_pmeth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_prn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_rfc5114.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_rfc7919.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dsa/dsa_ameth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dsa/dsa_asn1.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dsa/dsa_depr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dsa/dsa_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dsa/dsa_gen.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dsa/dsa_key.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dsa/dsa_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dsa/dsa_meth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dsa/dsa_ossl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dsa/dsa_pmeth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dsa/dsa_prn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dsa/dsa_sign.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dsa/dsa_vrf.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dso/dso_dl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dso/dso_dlfcn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dso/dso_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dso/dso_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dso/dso_openssl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dso/dso_vms.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dso/dso_win32.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ebcdic.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/curve25519.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/curve448/arch_32/f_impl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto/ec/curve448/arch_32",
                     "crypto/ec/curve448",
@@ -6470,7 +6225,6 @@ our %unified_info = (
             "crypto/ec/curve448/curve448.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto/ec/curve448/arch_32",
                     "crypto/ec/curve448",
@@ -6478,7 +6232,6 @@ our %unified_info = (
             "crypto/ec/curve448/curve448_tables.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto/ec/curve448/arch_32",
                     "crypto/ec/curve448",
@@ -6486,7 +6239,6 @@ our %unified_info = (
             "crypto/ec/curve448/eddsa.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto/ec/curve448/arch_32",
                     "crypto/ec/curve448",
@@ -6494,7 +6246,6 @@ our %unified_info = (
             "crypto/ec/curve448/f_generic.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto/ec/curve448/arch_32",
                     "crypto/ec/curve448",
@@ -6502,7 +6253,6 @@ our %unified_info = (
             "crypto/ec/curve448/scalar.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto/ec/curve448/arch_32",
                     "crypto/ec/curve448",
@@ -6510,163 +6260,136 @@ our %unified_info = (
             "crypto/ec/ec2_oct.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec2_smpl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec_ameth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec_asn1.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec_check.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec_curve.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec_cvt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec_key.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec_kmeth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec_mult.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec_oct.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec_pmeth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec_print.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecdh_kdf.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecdh_ossl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecdsa_ossl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecdsa_sign.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecdsa_vrf.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/eck_prn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecp_mont.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecp_nist.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecp_nistp224.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecp_nistp256.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecp_nistp521.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecp_nistputil.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecp_nistz256-armv4.o" =>
@@ -6684,223 +6407,186 @@ our %unified_info = (
             "crypto/ec/ecp_oct.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecp_smpl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecx_meth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/eng_all.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/eng_cnf.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/eng_ctrl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/eng_dyn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/eng_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/eng_fat.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/eng_init.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/eng_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/eng_list.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/eng_openssl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/eng_pkey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/eng_rdrand.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/eng_table.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/tb_asnmth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/tb_cipher.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/tb_dh.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/tb_digest.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/tb_dsa.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/tb_eckey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/tb_pkmeth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/tb_rand.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/tb_rsa.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/err/err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/err/err_all.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/err/err_prn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/bio_b64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/bio_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/bio_md.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/bio_ok.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/c_allc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/c_alld.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/cmeth_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/digest.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/e_aes.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto",
                     "crypto/modes",
@@ -6908,21 +6594,18 @@ our %unified_info = (
             "crypto/evp/e_aes_cbc_hmac_sha1.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto/modes",
                 ],
             "crypto/evp/e_aes_cbc_hmac_sha256.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto/modes",
                 ],
             "crypto/evp/e_aria.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto",
                     "crypto/modes",
@@ -6930,13 +6613,11 @@ our %unified_info = (
             "crypto/evp/e_bf.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/e_camellia.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto",
                     "crypto/modes",
@@ -6944,81 +6625,68 @@ our %unified_info = (
             "crypto/evp/e_cast.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/e_chacha20_poly1305.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/e_des.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto",
                 ],
             "crypto/evp/e_des3.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto",
                 ],
             "crypto/evp/e_idea.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/e_null.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/e_old.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/e_rc2.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/e_rc4.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/e_rc4_hmac_md5.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/e_rc5.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/e_seed.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/e_sm4.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto",
                     "crypto/modes",
@@ -7026,328 +6694,267 @@ our %unified_info = (
             "crypto/evp/e_xcbc_d.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/encode.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/evp_cnf.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/evp_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/evp_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/evp_key.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/evp_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/evp_pbe.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/evp_pkey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/m_md2.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/m_md4.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/m_md5.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/m_md5_sha1.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/m_mdc2.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/m_null.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/m_ripemd.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/m_sha1.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/m_sha3.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto",
                 ],
             "crypto/evp/m_sigver.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/m_wp.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/names.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/p5_crpt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/p5_crpt2.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/p_dec.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/p_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/p_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/p_open.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/p_seal.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/p_sign.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/p_verify.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/pbe_scrypt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/pmeth_fn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/pmeth_gn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/pmeth_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ex_data.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/getenv.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/hmac/hm_ameth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/hmac/hm_pmeth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/hmac/hmac.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/idea/i_cbc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/idea/i_cfb64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/idea/i_ecb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/idea/i_ofb64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/idea/i_skey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
-            "crypto/include/internal/bn_conf.h" =>
-                [
-                    ".",
-                ],
-            "crypto/include/internal/dso_conf.h" =>
-                [
-                    ".",
-                ],
             "crypto/init.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/kdf/hkdf.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/kdf/kdf_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/kdf/scrypt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/kdf/tls1_prf.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/lhash/lh_stats.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/lhash/lhash.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/md4/md4_dgst.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/md4/md4_one.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/md5/md5-sparcv9.o" =>
@@ -7357,85 +6964,71 @@ our %unified_info = (
             "crypto/md5/md5_dgst.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/md5/md5_one.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/mdc2/mdc2_one.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/mdc2/mdc2dgst.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/mem.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/mem_clr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/mem_dbg.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/mem_sec.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/modes/cbc128.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/modes/ccm128.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/modes/cfb128.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/modes/ctr128.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/modes/cts128.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/modes/gcm128.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto",
                 ],
@@ -7458,361 +7051,301 @@ our %unified_info = (
             "crypto/modes/ocb128.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/modes/ofb128.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/modes/wrap128.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/modes/xts128.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/o_dir.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/o_fips.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/o_fopen.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/o_init.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/o_str.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/o_time.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/objects/o_names.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/objects/obj_dat.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/objects/obj_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/objects/obj_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/objects/obj_xref.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ocsp/ocsp_asn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ocsp/ocsp_cl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ocsp/ocsp_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ocsp/ocsp_ext.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ocsp/ocsp_ht.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ocsp/ocsp_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ocsp/ocsp_prn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ocsp/ocsp_srv.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ocsp/ocsp_vfy.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ocsp/v3_ocsp.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pem/pem_all.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pem/pem_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pem/pem_info.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pem/pem_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pem/pem_oth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pem/pem_pk8.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pem/pem_pkey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pem/pem_sign.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pem/pem_x509.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pem/pem_xaux.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pem/pvkfmt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_add.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_asn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_attr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_crpt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_crt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_decr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_init.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_key.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_kiss.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_mutl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_npas.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_p8d.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_p8e.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_sbag.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_utl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/pk12err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs7/bio_pk7.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs7/pk7_asn1.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs7/pk7_attr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs7/pk7_doit.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs7/pk7_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs7/pk7_mime.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs7/pk7_smime.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs7/pkcs7err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/poly1305/poly1305-armv4.o" =>
@@ -7834,259 +7367,216 @@ our %unified_info = (
             "crypto/poly1305/poly1305.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/poly1305/poly1305_ameth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/poly1305/poly1305_pmeth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rand/drbg_ctr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rand/drbg_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rand/rand_egd.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rand/rand_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rand/rand_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rand/rand_unix.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rand/rand_vms.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rand/rand_win.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rand/randfile.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rc2/rc2_cbc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rc2/rc2_ecb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rc2/rc2_skey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rc2/rc2cfb64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rc2/rc2ofb64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rc4/rc4_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rc4/rc4_skey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ripemd/rmd_dgst.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ripemd/rmd_one.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_ameth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_asn1.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_chk.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_crpt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_depr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_gen.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_meth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_mp.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_none.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_oaep.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_ossl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_pk1.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_pmeth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_prn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_pss.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_saos.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_sign.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_ssl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_x931.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_x931g.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/s390xcpuid.o" =>
@@ -8096,31 +7586,26 @@ our %unified_info = (
             "crypto/seed/seed.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/seed/seed_cbc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/seed/seed_cfb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/seed/seed_ecb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/seed/seed_ofb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sha/keccak1600-armv4.o" =>
@@ -8130,7 +7615,6 @@ our %unified_info = (
             "crypto/sha/keccak1600.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sha/sha1-armv4-large.o" =>
@@ -8156,13 +7640,11 @@ our %unified_info = (
             "crypto/sha/sha1_one.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sha/sha1dgst.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sha/sha256-armv4.o" =>
@@ -8188,7 +7670,6 @@ our %unified_info = (
             "crypto/sha/sha256.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sha/sha512-armv4.o" =>
@@ -8214,709 +7695,591 @@ our %unified_info = (
             "crypto/sha/sha512.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/siphash/siphash.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/siphash/siphash_ameth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/siphash/siphash_pmeth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sm2/sm2_crypt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sm2/sm2_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sm2/sm2_pmeth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sm2/sm2_sign.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sm3/m_sm3.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sm3/sm3.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sm4/sm4.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/srp/srp_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/srp/srp_vfy.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/stack/stack.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/store/loader_file.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/store/store_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/store/store_init.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/store/store_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/store/store_register.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/store/store_strings.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/threads_none.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/threads_pthread.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/threads_win.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ts/ts_asn1.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ts/ts_conf.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ts/ts_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ts/ts_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ts/ts_req_print.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ts/ts_req_utils.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ts/ts_rsp_print.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ts/ts_rsp_sign.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ts/ts_rsp_utils.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ts/ts_rsp_verify.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ts/ts_verify_ctx.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/txt_db/txt_db.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ui/ui_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ui/ui_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ui/ui_null.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ui/ui_openssl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ui/ui_util.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/uid.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/whrlpool/wp_block.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/whrlpool/wp_dgst.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/by_dir.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/by_file.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/t_crl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/t_req.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/t_x509.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_att.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_cmp.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_d2.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_def.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_ext.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_lu.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_meth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_obj.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_r2x.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_req.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_set.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_trs.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_txt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_v3.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_vfy.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_vpm.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509cset.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509name.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509rset.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509spki.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509type.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x_all.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x_attrib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x_crl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x_exten.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x_name.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x_pubkey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x_req.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x_x509.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x_x509a.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/pcy_cache.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/pcy_data.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/pcy_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/pcy_map.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/pcy_node.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/pcy_tree.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_addr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_admis.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_akey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_akeya.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_alt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_asid.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_bcons.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_bitst.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_conf.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_cpols.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_crld.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_enum.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_extku.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_genn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_ia5.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_info.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_int.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_ncons.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_pci.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_pcia.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_pcons.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_pku.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_pmaps.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_prn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_purp.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_skey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_sxnet.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_tlsf.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_utl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "engines/e_capi.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "engines/e_padlock.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "fuzz/asn1.o" =>
@@ -8967,6 +8330,14 @@ our %unified_info = (
                 [
                     "include",
                 ],
+            "include/crypto/bn_conf.h" =>
+                [
+                    ".",
+                ],
+            "include/crypto/dso_conf.h" =>
+                [
+                    ".",
+                ],
             "include/openssl/opensslconf.h" =>
                 [
                     ".",
@@ -9211,7 +8582,6 @@ our %unified_info = (
                 [
                     ".",
                     "include",
-                    "crypto/include",
                 ],
             "test/asn1_string_table_test.o" =>
                 [
@@ -9537,7 +8907,6 @@ our %unified_info = (
                 [
                     ".",
                     "include",
-                    "crypto/include",
                 ],
             "test/cipher_overhead_test.o" =>
                 [
@@ -9583,7 +8952,6 @@ our %unified_info = (
             "test/ctype_internal_test.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "test/curve448_internal_test.o" =>
@@ -9649,7 +9017,6 @@ our %unified_info = (
                 [
                     "include",
                     "crypto/ec",
-                    "crypto/include",
                 ],
             "test/ecdsatest.o" =>
                 [
@@ -9674,7 +9041,6 @@ our %unified_info = (
             "test/evp_extra_test.o" =>
                 [
                     "include",
-                    "crypto/include",
                 ],
             "test/evp_test.o" =>
                 [
@@ -9772,7 +9138,6 @@ our %unified_info = (
                 [
                     ".",
                     "include",
-                    "crypto/include",
                 ],
             "test/rc2test.o" =>
                 [
@@ -9822,18 +9187,15 @@ our %unified_info = (
                 [
                     ".",
                     "include",
-                    "crypto/include",
                 ],
             "test/sm2_internal_test.o" =>
                 [
                     "include",
-                    "crypto/include",
                 ],
             "test/sm4_internal_test.o" =>
                 [
                     ".",
                     "include",
-                    "crypto/include",
                 ],
             "test/srptest.o" =>
                 [
@@ -9844,6 +9206,10 @@ our %unified_info = (
                     ".",
                     "include",
                 ],
+            "test/ssl_ctx_test.o" =>
+                [
+                    "include",
+                ],
             "test/ssl_test.o" =>
                 [
                     "include",
@@ -9907,10 +9273,6 @@ our %unified_info = (
                 [
                     "include",
                 ],
-            "test/testutil/init.o" =>
-                [
-                    "include",
-                ],
             "test/testutil/main.o" =>
                 [
                     "include",
@@ -9939,6 +9301,10 @@ our %unified_info = (
                 [
                     "include",
                 ],
+            "test/testutil/testutil_init.o" =>
+                [
+                    "include",
+                ],
             "test/threadstest.o" =>
                 [
                     "include",
@@ -10203,6 +9569,7 @@ our %unified_info = (
             "test/sm4_internal_test",
             "test/srptest",
             "test/ssl_cert_table_internal_test",
+            "test/ssl_ctx_test",
             "test/ssl_test",
             "test/ssl_test_ctx_test",
             "test/sslapitest",
@@ -15093,7 +14460,6 @@ our %unified_info = (
                     "test/testutil/cb.o",
                     "test/testutil/driver.o",
                     "test/testutil/format_output.o",
-                    "test/testutil/init.o",
                     "test/testutil/main.o",
                     "test/testutil/output_helpers.o",
                     "test/testutil/random.o",
@@ -15101,6 +14467,7 @@ our %unified_info = (
                     "test/testutil/tap_bio.o",
                     "test/testutil/test_cleanup.o",
                     "test/testutil/tests.o",
+                    "test/testutil/testutil_init.o",
                 ],
             "test/md2test" =>
                 [
@@ -15328,6 +14695,14 @@ our %unified_info = (
                 [
                     "test/ssl_cert_table_internal_test.c",
                 ],
+            "test/ssl_ctx_test" =>
+                [
+                    "test/ssl_ctx_test.o",
+                ],
+            "test/ssl_ctx_test.o" =>
+                [
+                    "test/ssl_ctx_test.c",
+                ],
             "test/ssl_test" =>
                 [
                     "test/handshake_helper.o",
@@ -15430,10 +14805,6 @@ our %unified_info = (
                 [
                     "test/testutil/format_output.c",
                 ],
-            "test/testutil/init.o" =>
-                [
-                    "test/testutil/init.c",
-                ],
             "test/testutil/main.o" =>
                 [
                     "test/testutil/main.c",
@@ -15462,6 +14833,10 @@ our %unified_info = (
                 [
                     "test/testutil/tests.c",
                 ],
+            "test/testutil/testutil_init.o" =>
+                [
+                    "test/testutil/testutil_init.c",
+                ],
             "test/threadstest" =>
                 [
                     "test/threadstest.o",
diff --git a/deps/openssl/config/archs/linux-aarch64/no-asm/crypto/buildinf.h b/deps/openssl/config/archs/linux-aarch64/no-asm/crypto/buildinf.h
index ed237c3102..4f6ff84c28 100644
--- a/deps/openssl/config/archs/linux-aarch64/no-asm/crypto/buildinf.h
+++ b/deps/openssl/config/archs/linux-aarch64/no-asm/crypto/buildinf.h
@@ -11,7 +11,7 @@
  */
 
 #define PLATFORM "platform: linux-aarch64"
-#define DATE "built on: Fri Sep 13 15:59:08 2019 UTC"
+#define DATE "built on: Wed Mar 18 21:06:04 2020 UTC"
 
 /*
  * Generate compiler_flags as an array of individual characters. This is a
diff --git a/deps/openssl/config/archs/linux-aarch64/no-asm/crypto/include/internal/bn_conf.h b/deps/openssl/config/archs/linux-aarch64/no-asm/crypto/include/internal/bn_conf.h
index 34bd8b78b4..5312ef5a7a 100644
--- a/deps/openssl/config/archs/linux-aarch64/no-asm/crypto/include/internal/bn_conf.h
+++ b/deps/openssl/config/archs/linux-aarch64/no-asm/crypto/include/internal/bn_conf.h
@@ -1,5 +1,5 @@
 /* WARNING: do not edit! */
-/* Generated by Makefile from crypto/include/internal/bn_conf.h.in */
+/* Generated by Makefile from include/crypto/bn_conf.h.in */
 /*
  * Copyright 2016 The OpenSSL Project Authors. All Rights Reserved.
  *
@@ -9,8 +9,8 @@
  * https://www.openssl.org/source/license.html
  */
 
-#ifndef HEADER_BN_CONF_H
-# define HEADER_BN_CONF_H
+#ifndef OSSL_CRYPTO_BN_CONF_H
+# define OSSL_CRYPTO_BN_CONF_H
 
 /*
  * The contents of this file are not used in the UEFI build, as
diff --git a/deps/openssl/config/archs/linux-aarch64/no-asm/crypto/include/internal/dso_conf.h b/deps/openssl/config/archs/linux-aarch64/no-asm/crypto/include/internal/dso_conf.h
index 252266ec2a..4b1167c3d8 100644
--- a/deps/openssl/config/archs/linux-aarch64/no-asm/crypto/include/internal/dso_conf.h
+++ b/deps/openssl/config/archs/linux-aarch64/no-asm/crypto/include/internal/dso_conf.h
@@ -1,5 +1,5 @@
 /* WARNING: do not edit! */
-/* Generated by Makefile from crypto/include/internal/dso_conf.h.in */
+/* Generated by Makefile from include/crypto/dso_conf.h.in */
 /*
  * Copyright 2016-2019 The OpenSSL Project Authors. All Rights Reserved.
  *
@@ -9,8 +9,8 @@
  * https://www.openssl.org/source/license.html
  */
 
-#ifndef HEADER_DSO_CONF_H
-# define HEADER_DSO_CONF_H
+#ifndef OSSL_CRYPTO_DSO_CONF_H
+# define OSSL_CRYPTO_DSO_CONF_H
 # define DSO_DLFCN
 # define HAVE_DLFCN_H
 # define DSO_EXTENSION ".so"
diff --git a/deps/openssl/config/archs/linux-aarch64/no-asm/include/openssl/opensslconf.h b/deps/openssl/config/archs/linux-aarch64/no-asm/include/openssl/opensslconf.h
index 212e3f67d8..781ef739dc 100644
--- a/deps/openssl/config/archs/linux-aarch64/no-asm/include/openssl/opensslconf.h
+++ b/deps/openssl/config/archs/linux-aarch64/no-asm/include/openssl/opensslconf.h
@@ -99,9 +99,6 @@ extern "C" {
 #ifndef OPENSSL_NO_DYNAMIC_ENGINE
 # define OPENSSL_NO_DYNAMIC_ENGINE
 #endif
-#ifndef OPENSSL_NO_AFALGENG
-# define OPENSSL_NO_AFALGENG
-#endif
 
 
 /*
diff --git a/deps/openssl/config/archs/linux-aarch64/no-asm/include/progs.h b/deps/openssl/config/archs/linux-aarch64/no-asm/include/progs.h
index 9b3d270e20..308c65601b 100644
--- a/deps/openssl/config/archs/linux-aarch64/no-asm/include/progs.h
+++ b/deps/openssl/config/archs/linux-aarch64/no-asm/include/progs.h
@@ -2,7 +2,7 @@
  * WARNING: do not edit!
  * Generated by apps/progs.pl
  *
- * Copyright 1995-2019 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 1995-2020 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
diff --git a/deps/openssl/config/archs/linux-armv4/asm/configdata.pm b/deps/openssl/config/archs/linux-armv4/asm/configdata.pm
index c62115205b..42746324ce 100644
--- a/deps/openssl/config/archs/linux-armv4/asm/configdata.pm
+++ b/deps/openssl/config/archs/linux-armv4/asm/configdata.pm
@@ -55,7 +55,7 @@ our %config = (
   minor => "1.1",
   openssl_algorithm_defines => [ "OPENSSL_NO_COMP", "OPENSSL_NO_MD2", "OPENSSL_NO_RC5" ],
   openssl_api_defines => [  ],
-  openssl_other_defines => [ "OPENSSL_RAND_SEED_OS", "OPENSSL_NO_AFALGENG", "OPENSSL_NO_ASAN", "OPENSSL_NO_CRYPTO_MDEBUG", "OPENSSL_NO_CRYPTO_MDEBUG_BACKTRACE", "OPENSSL_NO_DEVCRYPTOENG", "OPENSSL_NO_EC_NISTP_64_GCC_128", "OPENSSL_NO_EGD", "OPENSSL_NO_EXTERNAL_TESTS", "OPENSSL_NO_FUZZ_AFL", "OPENSSL_NO_FUZZ_LIBFUZZER", "OPENSSL_NO_HEARTBEATS", "OPENSSL_NO_MSAN", "OPENSSL_NO_SCTP", "OPENSSL_NO_SSL3", "OPENSSL_NO_SSL3_METHOD", "OPENSSL_NO_UBSAN", "OPENSSL_NO_UNIT_TEST", "OPENSSL_NO_WEAK_SSL_CIPHERS", "OPENSSL_NO_DYNAMIC_ENGINE", "OPENSSL_NO_AFALGENG" ],
+  openssl_other_defines => [ "OPENSSL_RAND_SEED_OS", "OPENSSL_NO_AFALGENG", "OPENSSL_NO_ASAN", "OPENSSL_NO_CRYPTO_MDEBUG", "OPENSSL_NO_CRYPTO_MDEBUG_BACKTRACE", "OPENSSL_NO_DEVCRYPTOENG", "OPENSSL_NO_EC_NISTP_64_GCC_128", "OPENSSL_NO_EGD", "OPENSSL_NO_EXTERNAL_TESTS", "OPENSSL_NO_FUZZ_AFL", "OPENSSL_NO_FUZZ_LIBFUZZER", "OPENSSL_NO_HEARTBEATS", "OPENSSL_NO_MSAN", "OPENSSL_NO_SCTP", "OPENSSL_NO_SSL3", "OPENSSL_NO_SSL3_METHOD", "OPENSSL_NO_UBSAN", "OPENSSL_NO_UNIT_TEST", "OPENSSL_NO_WEAK_SSL_CIPHERS", "OPENSSL_NO_DYNAMIC_ENGINE" ],
   openssl_sys_defines => [  ],
   openssl_thread_defines => [ "OPENSSL_THREADS" ],
   openssldir => "",
@@ -111,8 +111,8 @@ our %config = (
   sourcedir => ".",
   target => "linux-armv4",
   tdirs => [ "ossl_shim" ],
-  version => "1.1.1d",
-  version_num => "0x1010104fL",
+  version => "1.1.1e",
+  version_num => "0x1010105fL",
 );
 
 our %target = (
@@ -239,6 +239,7 @@ our @disablables = (
   "dgram",
   "dh",
   "dsa",
+  "dso",
   "dtls",
   "dynamic-engine",
   "ec",
@@ -356,8 +357,8 @@ our %unified_info = (
         {
             "" =>
                 [
-                    "crypto/include/internal/bn_conf.h",
-                    "crypto/include/internal/dso_conf.h",
+                    "include/crypto/bn_conf.h",
+                    "include/crypto/dso_conf.h",
                     "include/openssl/opensslconf.h",
                 ],
             "apps/asn1pars.o" =>
@@ -625,14 +626,6 @@ our %unified_info = (
                     "crypto/perlasm/cbc.pl",
                     "crypto/perlasm/x86asm.pl",
                 ],
-            "crypto/include/internal/bn_conf.h" =>
-                [
-                    "configdata.pm",
-                ],
-            "crypto/include/internal/dso_conf.h" =>
-                [
-                    "configdata.pm",
-                ],
             "crypto/rc4/rc4-586.s" =>
                 [
                     "crypto/perlasm/x86asm.pl",
@@ -708,6 +701,14 @@ our %unified_info = (
                 [
                     "libcrypto",
                 ],
+            "include/crypto/bn_conf.h" =>
+                [
+                    "configdata.pm",
+                ],
+            "include/crypto/dso_conf.h" =>
+                [
+                    "configdata.pm",
+                ],
             "include/openssl/opensslconf.h" =>
                 [
                     "configdata.pm",
@@ -1505,6 +1506,12 @@ our %unified_info = (
                     "libcrypto",
                     "test/libtestutil.a",
                 ],
+            "test/ssl_ctx_test" =>
+                [
+                    "libcrypto",
+                    "libssl",
+                    "test/libtestutil.a",
+                ],
             "test/ssl_test" =>
                 [
                     "libcrypto",
@@ -3236,7 +3243,6 @@ our %unified_info = (
                             "test/testutil/cb.o",
                             "test/testutil/driver.o",
                             "test/testutil/format_output.o",
-                            "test/testutil/init.o",
                             "test/testutil/main.o",
                             "test/testutil/output_helpers.o",
                             "test/testutil/random.o",
@@ -3244,6 +3250,7 @@ our %unified_info = (
                             "test/testutil/tap_bio.o",
                             "test/testutil/test_cleanup.o",
                             "test/testutil/tests.o",
+                            "test/testutil/testutil_init.o",
                         ],
                     "products" =>
                         {
@@ -3742,14 +3749,6 @@ our %unified_info = (
                 [
                     "crypto/ia64cpuid.S",
                 ],
-            "crypto/include/internal/bn_conf.h" =>
-                [
-                    "crypto/include/internal/bn_conf.h.in",
-                ],
-            "crypto/include/internal/dso_conf.h" =>
-                [
-                    "crypto/include/internal/dso_conf.h.in",
-                ],
             "crypto/md5/md5-586.s" =>
                 [
                     "crypto/md5/asm/md5-586.pl",
@@ -4190,6 +4189,14 @@ our %unified_info = (
                     "engines/asm/e_padlock-x86_64.pl",
                     "\$(PERLASM_SCHEME)",
                 ],
+            "include/crypto/bn_conf.h" =>
+                [
+                    "include/crypto/bn_conf.h.in",
+                ],
+            "include/crypto/dso_conf.h" =>
+                [
+                    "include/crypto/dso_conf.h.in",
+                ],
             "include/openssl/opensslconf.h" =>
                 [
                     "include/openssl/opensslconf.h.in",
@@ -4868,7 +4875,6 @@ our %unified_info = (
             "crypto/aes/aes-armv4.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto",
                 ],
@@ -4887,43 +4893,36 @@ our %unified_info = (
             "crypto/aes/aes_cbc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/aes/aes_cfb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/aes/aes_ecb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/aes/aes_ige.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/aes/aes_misc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/aes/aes_ofb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/aes/aes_wrap.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/aes/aesfx-sparcv9.o" =>
@@ -4937,21 +4936,18 @@ our %unified_info = (
             "crypto/aes/aesv8-armx.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto",
                 ],
             "crypto/aes/bsaes-armv7.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto",
                 ],
             "crypto/aria/aria.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/arm64cpuid.o" =>
@@ -4961,639 +4957,533 @@ our %unified_info = (
             "crypto/armcap.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/armv4cpuid.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto",
                 ],
             "crypto/asn1/a_bitstr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_d2i_fp.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_digest.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_dup.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_gentm.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_i2d_fp.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_int.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_mbstr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_object.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_octet.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_print.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_sign.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_strex.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_strnid.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_time.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_type.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_utctm.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_utf8.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_verify.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/ameth_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/asn1_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/asn1_gen.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/asn1_item_list.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/asn1_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/asn1_par.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/asn_mime.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/asn_moid.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/asn_mstbl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/asn_pack.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/bio_asn1.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/bio_ndef.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/d2i_pr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/d2i_pu.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/evp_asn1.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/f_int.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/f_string.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/i2d_pr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/i2d_pu.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/n_pkey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/nsseq.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/p5_pbe.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/p5_pbev2.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/p5_scrypt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/p8_pkey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/t_bitst.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/t_pkey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/t_spki.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/tasn_dec.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/tasn_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/tasn_fre.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/tasn_new.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/tasn_prn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/tasn_scn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/tasn_typ.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/tasn_utl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/x_algor.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/x_bignum.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/x_info.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/x_int64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/x_long.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/x_pkey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/x_sig.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/x_spki.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/x_val.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/async/arch/async_null.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/async/arch/async_posix.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/async/arch/async_win.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/async/async.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/async/async_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/async/async_wait.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bf/bf_cfb64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bf/bf_ecb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bf/bf_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bf/bf_ofb64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bf/bf_skey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/b_addr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/b_dump.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/b_print.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/b_sock.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/b_sock2.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bf_buff.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bf_lbuf.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bf_nbio.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bf_null.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bio_cb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bio_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bio_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bio_meth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bss_acpt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bss_bio.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bss_conn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bss_dgram.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bss_fd.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bss_file.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bss_log.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bss_mem.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bss_null.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bss_sock.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/blake2/blake2b.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/blake2/blake2s.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/blake2/m_blake2b.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/blake2/m_blake2s.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/armv4-gf2m.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto",
                 ],
             "crypto/bn/armv4-mont.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto",
                 ],
@@ -5604,188 +5494,157 @@ our %unified_info = (
             "crypto/bn/bn_add.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_asm.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_blind.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_const.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_ctx.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_depr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_dh.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_div.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_exp.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto",
                 ],
             "crypto/bn/bn_exp2.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_gcd.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_gf2m.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_intern.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_kron.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_mod.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_mont.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_mpi.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_mul.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_nist.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_prime.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_print.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_rand.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_recp.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_shift.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_sqr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_sqrt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_srp.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_word.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_x931p.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/mips-mont.o" =>
@@ -5815,13 +5674,11 @@ our %unified_info = (
             "crypto/buffer/buf_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/buffer/buffer.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/buildinf.h" =>
@@ -5831,43 +5688,36 @@ our %unified_info = (
             "crypto/camellia/camellia.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/camellia/cmll_cbc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/camellia/cmll_cfb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/camellia/cmll_ctr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/camellia/cmll_ecb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/camellia/cmll_misc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/camellia/cmll_ofb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/camellia/cmllt4-sparcv9.o" =>
@@ -5877,37 +5727,31 @@ our %unified_info = (
             "crypto/cast/c_cfb64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cast/c_ecb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cast/c_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cast/c_ofb64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cast/c_skey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/chacha/chacha-armv4.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto",
                 ],
@@ -5922,272 +5766,227 @@ our %unified_info = (
             "crypto/cmac/cm_ameth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cmac/cm_pmeth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cmac/cmac.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_asn1.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_att.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_cd.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_dd.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_env.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_ess.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_io.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_kari.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_pwri.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_sd.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_smime.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/conf/conf_api.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/conf/conf_def.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/conf/conf_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/conf/conf_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/conf/conf_mall.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/conf/conf_mod.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/conf/conf_sap.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/conf/conf_ssl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cpt_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cryptlib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ct/ct_b64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ct/ct_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ct/ct_log.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ct/ct_oct.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ct/ct_policy.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ct/ct_prn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ct/ct_sct.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ct/ct_sct_ctx.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ct/ct_vfy.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ct/ct_x509v3.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ctype.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cversion.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto",
                 ],
             "crypto/des/cbc_cksm.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/cbc_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/cfb64ede.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/cfb64enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/cfb_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/des_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/dest4-sparcv9.o" =>
@@ -6197,301 +5996,251 @@ our %unified_info = (
             "crypto/des/ecb3_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/ecb_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/fcrypt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/fcrypt_b.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/ofb64ede.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/ofb64enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/ofb_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/pcbc_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/qud_cksm.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/rand_key.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/set_key.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/str2key.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/xcbc_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_ameth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_asn1.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_check.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_depr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_gen.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_kdf.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_key.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_meth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_pmeth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_prn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_rfc5114.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_rfc7919.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dsa/dsa_ameth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dsa/dsa_asn1.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dsa/dsa_depr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dsa/dsa_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dsa/dsa_gen.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dsa/dsa_key.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dsa/dsa_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dsa/dsa_meth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dsa/dsa_ossl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dsa/dsa_pmeth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dsa/dsa_prn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dsa/dsa_sign.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dsa/dsa_vrf.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dso/dso_dl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dso/dso_dlfcn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dso/dso_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dso/dso_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dso/dso_openssl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dso/dso_vms.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dso/dso_win32.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ebcdic.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/curve25519.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/curve448/arch_32/f_impl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto/ec/curve448/arch_32",
                     "crypto/ec/curve448",
@@ -6499,7 +6248,6 @@ our %unified_info = (
             "crypto/ec/curve448/curve448.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto/ec/curve448/arch_32",
                     "crypto/ec/curve448",
@@ -6507,7 +6255,6 @@ our %unified_info = (
             "crypto/ec/curve448/curve448_tables.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto/ec/curve448/arch_32",
                     "crypto/ec/curve448",
@@ -6515,7 +6262,6 @@ our %unified_info = (
             "crypto/ec/curve448/eddsa.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto/ec/curve448/arch_32",
                     "crypto/ec/curve448",
@@ -6523,7 +6269,6 @@ our %unified_info = (
             "crypto/ec/curve448/f_generic.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto/ec/curve448/arch_32",
                     "crypto/ec/curve448",
@@ -6531,7 +6276,6 @@ our %unified_info = (
             "crypto/ec/curve448/scalar.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto/ec/curve448/arch_32",
                     "crypto/ec/curve448",
@@ -6539,169 +6283,141 @@ our %unified_info = (
             "crypto/ec/ec2_oct.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec2_smpl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec_ameth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec_asn1.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec_check.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec_curve.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec_cvt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec_key.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec_kmeth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec_mult.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec_oct.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec_pmeth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec_print.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecdh_kdf.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecdh_ossl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecdsa_ossl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecdsa_sign.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecdsa_vrf.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/eck_prn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecp_mont.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecp_nist.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecp_nistp224.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecp_nistp256.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecp_nistp521.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecp_nistputil.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecp_nistz256-armv4.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto",
                 ],
@@ -6716,229 +6432,191 @@ our %unified_info = (
             "crypto/ec/ecp_nistz256.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecp_oct.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecp_smpl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecx_meth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/eng_all.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/eng_cnf.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/eng_ctrl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/eng_dyn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/eng_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/eng_fat.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/eng_init.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/eng_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/eng_list.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/eng_openssl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/eng_pkey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/eng_rdrand.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/eng_table.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/tb_asnmth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/tb_cipher.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/tb_dh.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/tb_digest.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/tb_dsa.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/tb_eckey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/tb_pkmeth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/tb_rand.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/tb_rsa.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/err/err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/err/err_all.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/err/err_prn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/bio_b64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/bio_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/bio_md.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/bio_ok.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/c_allc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/c_alld.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/cmeth_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/digest.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/e_aes.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto",
                     "crypto/modes",
@@ -6946,21 +6624,18 @@ our %unified_info = (
             "crypto/evp/e_aes_cbc_hmac_sha1.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto/modes",
                 ],
             "crypto/evp/e_aes_cbc_hmac_sha256.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto/modes",
                 ],
             "crypto/evp/e_aria.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto",
                     "crypto/modes",
@@ -6968,13 +6643,11 @@ our %unified_info = (
             "crypto/evp/e_bf.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/e_camellia.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto",
                     "crypto/modes",
@@ -6982,81 +6655,68 @@ our %unified_info = (
             "crypto/evp/e_cast.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/e_chacha20_poly1305.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/e_des.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto",
                 ],
             "crypto/evp/e_des3.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto",
                 ],
             "crypto/evp/e_idea.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/e_null.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/e_old.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/e_rc2.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/e_rc4.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/e_rc4_hmac_md5.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/e_rc5.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/e_seed.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/e_sm4.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto",
                     "crypto/modes",
@@ -7064,328 +6724,267 @@ our %unified_info = (
             "crypto/evp/e_xcbc_d.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/encode.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/evp_cnf.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/evp_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/evp_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/evp_key.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/evp_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/evp_pbe.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/evp_pkey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/m_md2.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/m_md4.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/m_md5.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/m_md5_sha1.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/m_mdc2.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/m_null.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/m_ripemd.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/m_sha1.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/m_sha3.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto",
                 ],
             "crypto/evp/m_sigver.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/m_wp.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/names.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/p5_crpt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/p5_crpt2.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/p_dec.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/p_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/p_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/p_open.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/p_seal.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/p_sign.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/p_verify.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/pbe_scrypt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/pmeth_fn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/pmeth_gn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/pmeth_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ex_data.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/getenv.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/hmac/hm_ameth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/hmac/hm_pmeth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/hmac/hmac.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/idea/i_cbc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/idea/i_cfb64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/idea/i_ecb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/idea/i_ofb64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/idea/i_skey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
-            "crypto/include/internal/bn_conf.h" =>
-                [
-                    ".",
-                ],
-            "crypto/include/internal/dso_conf.h" =>
-                [
-                    ".",
-                ],
             "crypto/init.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/kdf/hkdf.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/kdf/kdf_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/kdf/scrypt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/kdf/tls1_prf.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/lhash/lh_stats.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/lhash/lhash.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/md4/md4_dgst.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/md4/md4_one.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/md5/md5-sparcv9.o" =>
@@ -7395,86 +6994,72 @@ our %unified_info = (
             "crypto/md5/md5_dgst.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/md5/md5_one.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/mdc2/mdc2_one.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/mdc2/mdc2dgst.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/mem.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/mem_dbg.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/mem_sec.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/modes/cbc128.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/modes/ccm128.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/modes/cfb128.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/modes/ctr128.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/modes/cts128.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/modes/gcm128.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto",
                 ],
             "crypto/modes/ghash-armv4.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto",
                 ],
@@ -7489,374 +7074,312 @@ our %unified_info = (
             "crypto/modes/ghashv8-armx.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto",
                 ],
             "crypto/modes/ocb128.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/modes/ofb128.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/modes/wrap128.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/modes/xts128.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/o_dir.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/o_fips.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/o_fopen.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/o_init.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/o_str.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/o_time.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/objects/o_names.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/objects/obj_dat.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/objects/obj_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/objects/obj_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/objects/obj_xref.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ocsp/ocsp_asn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ocsp/ocsp_cl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ocsp/ocsp_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ocsp/ocsp_ext.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ocsp/ocsp_ht.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ocsp/ocsp_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ocsp/ocsp_prn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ocsp/ocsp_srv.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ocsp/ocsp_vfy.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ocsp/v3_ocsp.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pem/pem_all.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pem/pem_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pem/pem_info.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pem/pem_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pem/pem_oth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pem/pem_pk8.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pem/pem_pkey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pem/pem_sign.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pem/pem_x509.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pem/pem_xaux.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pem/pvkfmt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_add.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_asn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_attr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_crpt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_crt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_decr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_init.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_key.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_kiss.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_mutl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_npas.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_p8d.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_p8e.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_sbag.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_utl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/pk12err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs7/bio_pk7.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs7/pk7_asn1.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs7/pk7_attr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs7/pk7_doit.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs7/pk7_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs7/pk7_mime.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs7/pk7_smime.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs7/pkcs7err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/poly1305/poly1305-armv4.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto",
                 ],
@@ -7875,259 +7398,216 @@ our %unified_info = (
             "crypto/poly1305/poly1305.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/poly1305/poly1305_ameth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/poly1305/poly1305_pmeth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rand/drbg_ctr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rand/drbg_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rand/rand_egd.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rand/rand_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rand/rand_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rand/rand_unix.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rand/rand_vms.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rand/rand_win.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rand/randfile.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rc2/rc2_cbc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rc2/rc2_ecb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rc2/rc2_skey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rc2/rc2cfb64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rc2/rc2ofb64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rc4/rc4_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rc4/rc4_skey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ripemd/rmd_dgst.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ripemd/rmd_one.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_ameth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_asn1.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_chk.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_crpt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_depr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_gen.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_meth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_mp.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_none.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_oaep.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_ossl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_pk1.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_pmeth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_prn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_pss.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_saos.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_sign.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_ssl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_x931.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_x931g.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/s390xcpuid.o" =>
@@ -8137,44 +7617,37 @@ our %unified_info = (
             "crypto/seed/seed.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/seed/seed_cbc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/seed/seed_cfb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/seed/seed_ecb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/seed/seed_ofb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sha/keccak1600-armv4.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto",
                 ],
             "crypto/sha/sha1-armv4-large.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto",
                 ],
@@ -8197,19 +7670,16 @@ our %unified_info = (
             "crypto/sha/sha1_one.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sha/sha1dgst.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sha/sha256-armv4.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto",
                 ],
@@ -8232,13 +7702,11 @@ our %unified_info = (
             "crypto/sha/sha256.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sha/sha512-armv4.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto",
                 ],
@@ -8261,709 +7729,591 @@ our %unified_info = (
             "crypto/sha/sha512.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/siphash/siphash.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/siphash/siphash_ameth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/siphash/siphash_pmeth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sm2/sm2_crypt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sm2/sm2_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sm2/sm2_pmeth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sm2/sm2_sign.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sm3/m_sm3.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sm3/sm3.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sm4/sm4.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/srp/srp_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/srp/srp_vfy.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/stack/stack.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/store/loader_file.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/store/store_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/store/store_init.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/store/store_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/store/store_register.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/store/store_strings.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/threads_none.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/threads_pthread.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/threads_win.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ts/ts_asn1.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ts/ts_conf.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ts/ts_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ts/ts_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ts/ts_req_print.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ts/ts_req_utils.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ts/ts_rsp_print.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ts/ts_rsp_sign.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ts/ts_rsp_utils.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ts/ts_rsp_verify.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ts/ts_verify_ctx.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/txt_db/txt_db.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ui/ui_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ui/ui_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ui/ui_null.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ui/ui_openssl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ui/ui_util.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/uid.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/whrlpool/wp_block.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/whrlpool/wp_dgst.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/by_dir.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/by_file.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/t_crl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/t_req.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/t_x509.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_att.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_cmp.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_d2.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_def.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_ext.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_lu.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_meth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_obj.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_r2x.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_req.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_set.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_trs.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_txt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_v3.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_vfy.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_vpm.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509cset.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509name.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509rset.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509spki.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509type.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x_all.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x_attrib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x_crl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x_exten.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x_name.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x_pubkey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x_req.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x_x509.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x_x509a.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/pcy_cache.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/pcy_data.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/pcy_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/pcy_map.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/pcy_node.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/pcy_tree.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_addr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_admis.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_akey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_akeya.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_alt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_asid.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_bcons.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_bitst.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_conf.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_cpols.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_crld.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_enum.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_extku.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_genn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_ia5.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_info.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_int.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_ncons.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_pci.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_pcia.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_pcons.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_pku.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_pmaps.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_prn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_purp.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_skey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_sxnet.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_tlsf.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_utl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "engines/e_capi.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "engines/e_padlock.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "fuzz/asn1.o" =>
@@ -9014,6 +8364,14 @@ our %unified_info = (
                 [
                     "include",
                 ],
+            "include/crypto/bn_conf.h" =>
+                [
+                    ".",
+                ],
+            "include/crypto/dso_conf.h" =>
+                [
+                    ".",
+                ],
             "include/openssl/opensslconf.h" =>
                 [
                     ".",
@@ -9258,7 +8616,6 @@ our %unified_info = (
                 [
                     ".",
                     "include",
-                    "crypto/include",
                 ],
             "test/asn1_string_table_test.o" =>
                 [
@@ -9584,7 +8941,6 @@ our %unified_info = (
                 [
                     ".",
                     "include",
-                    "crypto/include",
                 ],
             "test/cipher_overhead_test.o" =>
                 [
@@ -9630,7 +8986,6 @@ our %unified_info = (
             "test/ctype_internal_test.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "test/curve448_internal_test.o" =>
@@ -9696,7 +9051,6 @@ our %unified_info = (
                 [
                     "include",
                     "crypto/ec",
-                    "crypto/include",
                 ],
             "test/ecdsatest.o" =>
                 [
@@ -9721,7 +9075,6 @@ our %unified_info = (
             "test/evp_extra_test.o" =>
                 [
                     "include",
-                    "crypto/include",
                 ],
             "test/evp_test.o" =>
                 [
@@ -9819,7 +9172,6 @@ our %unified_info = (
                 [
                     ".",
                     "include",
-                    "crypto/include",
                 ],
             "test/rc2test.o" =>
                 [
@@ -9869,18 +9221,15 @@ our %unified_info = (
                 [
                     ".",
                     "include",
-                    "crypto/include",
                 ],
             "test/sm2_internal_test.o" =>
                 [
                     "include",
-                    "crypto/include",
                 ],
             "test/sm4_internal_test.o" =>
                 [
                     ".",
                     "include",
-                    "crypto/include",
                 ],
             "test/srptest.o" =>
                 [
@@ -9891,6 +9240,10 @@ our %unified_info = (
                     ".",
                     "include",
                 ],
+            "test/ssl_ctx_test.o" =>
+                [
+                    "include",
+                ],
             "test/ssl_test.o" =>
                 [
                     "include",
@@ -9954,10 +9307,6 @@ our %unified_info = (
                 [
                     "include",
                 ],
-            "test/testutil/init.o" =>
-                [
-                    "include",
-                ],
             "test/testutil/main.o" =>
                 [
                     "include",
@@ -9986,6 +9335,10 @@ our %unified_info = (
                 [
                     "include",
                 ],
+            "test/testutil/testutil_init.o" =>
+                [
+                    "include",
+                ],
             "test/threadstest.o" =>
                 [
                     "include",
@@ -10250,6 +9603,7 @@ our %unified_info = (
             "test/sm4_internal_test",
             "test/srptest",
             "test/ssl_cert_table_internal_test",
+            "test/ssl_ctx_test",
             "test/ssl_test",
             "test/ssl_test_ctx_test",
             "test/sslapitest",
@@ -15205,7 +14559,6 @@ our %unified_info = (
                     "test/testutil/cb.o",
                     "test/testutil/driver.o",
                     "test/testutil/format_output.o",
-                    "test/testutil/init.o",
                     "test/testutil/main.o",
                     "test/testutil/output_helpers.o",
                     "test/testutil/random.o",
@@ -15213,6 +14566,7 @@ our %unified_info = (
                     "test/testutil/tap_bio.o",
                     "test/testutil/test_cleanup.o",
                     "test/testutil/tests.o",
+                    "test/testutil/testutil_init.o",
                 ],
             "test/md2test" =>
                 [
@@ -15440,6 +14794,14 @@ our %unified_info = (
                 [
                     "test/ssl_cert_table_internal_test.c",
                 ],
+            "test/ssl_ctx_test" =>
+                [
+                    "test/ssl_ctx_test.o",
+                ],
+            "test/ssl_ctx_test.o" =>
+                [
+                    "test/ssl_ctx_test.c",
+                ],
             "test/ssl_test" =>
                 [
                     "test/handshake_helper.o",
@@ -15542,10 +14904,6 @@ our %unified_info = (
                 [
                     "test/testutil/format_output.c",
                 ],
-            "test/testutil/init.o" =>
-                [
-                    "test/testutil/init.c",
-                ],
             "test/testutil/main.o" =>
                 [
                     "test/testutil/main.c",
@@ -15574,6 +14932,10 @@ our %unified_info = (
                 [
                     "test/testutil/tests.c",
                 ],
+            "test/testutil/testutil_init.o" =>
+                [
+                    "test/testutil/testutil_init.c",
+                ],
             "test/threadstest" =>
                 [
                     "test/threadstest.o",
diff --git a/deps/openssl/config/archs/linux-armv4/asm/crypto/aes/aes-armv4.S b/deps/openssl/config/archs/linux-armv4/asm/crypto/aes/aes-armv4.S
index 4746b714ca..839663c841 100644
--- a/deps/openssl/config/archs/linux-armv4/asm/crypto/aes/aes-armv4.S
+++ b/deps/openssl/config/archs/linux-armv4/asm/crypto/aes/aes-armv4.S
@@ -1,4 +1,4 @@
-@ Copyright 2007-2018 The OpenSSL Project Authors. All Rights Reserved.
+@ Copyright 2007-2020 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
diff --git a/deps/openssl/config/archs/linux-armv4/asm/crypto/aes/bsaes-armv7.S b/deps/openssl/config/archs/linux-armv4/asm/crypto/aes/bsaes-armv7.S
index e05feb2cee..ef3992c9aa 100644
--- a/deps/openssl/config/archs/linux-armv4/asm/crypto/aes/bsaes-armv7.S
+++ b/deps/openssl/config/archs/linux-armv4/asm/crypto/aes/bsaes-armv7.S
@@ -1,4 +1,4 @@
-@ Copyright 2012-2018 The OpenSSL Project Authors. All Rights Reserved.
+@ Copyright 2012-2020 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
diff --git a/deps/openssl/config/archs/linux-armv4/asm/crypto/buildinf.h b/deps/openssl/config/archs/linux-armv4/asm/crypto/buildinf.h
index ef86bdcf89..69027a7fb8 100644
--- a/deps/openssl/config/archs/linux-armv4/asm/crypto/buildinf.h
+++ b/deps/openssl/config/archs/linux-armv4/asm/crypto/buildinf.h
@@ -11,7 +11,7 @@
  */
 
 #define PLATFORM "platform: linux-armv4"
-#define DATE "built on: Fri Sep 13 15:59:11 2019 UTC"
+#define DATE "built on: Wed Mar 18 21:06:07 2020 UTC"
 
 /*
  * Generate compiler_flags as an array of individual characters. This is a
diff --git a/deps/openssl/config/archs/linux-armv4/asm/crypto/ec/ecp_nistz256-armv4.S b/deps/openssl/config/archs/linux-armv4/asm/crypto/ec/ecp_nistz256-armv4.S
index d96f1c3399..63f850e6b9 100644
--- a/deps/openssl/config/archs/linux-armv4/asm/crypto/ec/ecp_nistz256-armv4.S
+++ b/deps/openssl/config/archs/linux-armv4/asm/crypto/ec/ecp_nistz256-armv4.S
@@ -3757,7 +3757,7 @@ ecp_nistz256_point_add:
 #endif
 	movne	r12,#-1
 	stmia	r3,{r4,r5,r6,r7,r8,r9,r10,r11}
-	str	r12,[sp,#32*18+8]	@ !in2infty
+	str	r12,[sp,#32*18+8]	@ ~in2infty
 
 	ldmia	r1!,{r4,r5,r6,r7,r8,r9,r10,r11}	@ copy in1_x
 	add	r3,sp,#96
@@ -3778,7 +3778,7 @@ ecp_nistz256_point_add:
 #endif
 	movne	r12,#-1
 	stmia	r3,{r4,r5,r6,r7,r8,r9,r10,r11}
-	str	r12,[sp,#32*18+4]	@ !in1infty
+	str	r12,[sp,#32*18+4]	@ ~in1infty
 
 	add	r1,sp,#256
 	add	r2,sp,#256
@@ -3843,33 +3843,20 @@ ecp_nistz256_point_add:
 	orr	r11,r11,r4
 	orr	r6,r6,r8
 	orr	r11,r11,r9
-	orrs	r11,r11,r6
+	orr	r11,r11,r6		@ ~is_equal(U1,U2)
 
-	bne	.Ladd_proceed		@ is_equal(U1,U2)?
+	ldr	r10,[sp,#32*18+4]	@ ~in1infty
+	ldr	r12,[sp,#32*18+8]	@ ~in2infty
+	ldr	r14,[sp,#32*18+12]	@ ~is_equal(S1,S2)
+	mvn	r10,r10			@ -1/0 -> 0/-1
+	mvn	r12,r12			@ -1/0 -> 0/-1
+	orr	r11,r10
+	orr	r11,r12
+	orrs	r11,r14			@ set flags
 
-	ldr	r10,[sp,#32*18+4]
-	ldr	r12,[sp,#32*18+8]
-	ldr	r14,[sp,#32*18+12]
-	tst	r10,r12
-	beq	.Ladd_proceed		@ (in1infty || in2infty)?
-	tst	r14,r14
-	beq	.Ladd_double		@ is_equal(S1,S2)?
+	@ if(~is_equal(U1,U2) | in1infty | in2infty | ~is_equal(S1,S2))
+	bne	.Ladd_proceed
 
-	ldr	r0,[sp,#32*18+16]
-	eor	r4,r4,r4
-	eor	r5,r5,r5
-	eor	r6,r6,r6
-	eor	r7,r7,r7
-	eor	r8,r8,r8
-	eor	r9,r9,r9
-	eor	r10,r10,r10
-	eor	r11,r11,r11
-	stmia	r0!,{r4,r5,r6,r7,r8,r9,r10,r11}
-	stmia	r0!,{r4,r5,r6,r7,r8,r9,r10,r11}
-	stmia	r0!,{r4,r5,r6,r7,r8,r9,r10,r11}
-	b	.Ladd_done
-
-.align	4
 .Ladd_double:
 	ldr	r1,[sp,#32*18+20]
 	add	sp,sp,#32*(18-5)+16	@ difference in frame sizes
@@ -3934,24 +3921,24 @@ ecp_nistz256_point_add:
 	add	r2,sp,#544
 	bl	__ecp_nistz256_sub_from	@ p256_sub(res_y, res_y, S2);
 
-	ldr	r11,[sp,#32*18+4]	@ !in1intfy
-	ldr	r12,[sp,#32*18+8]	@ !in2intfy
+	ldr	r11,[sp,#32*18+4]	@ ~in1infty
+	ldr	r12,[sp,#32*18+8]	@ ~in2infty
 	add	r1,sp,#0
 	add	r2,sp,#192
-	and	r10,r11,r12
+	and	r10,r11,r12		@ ~in1infty & ~in2infty
 	mvn	r11,r11
 	add	r3,sp,#96
-	and	r11,r11,r12
-	mvn	r12,r12
+	and	r11,r11,r12		@ in1infty & ~in2infty
+	mvn	r12,r12			@ in2infty
 	ldr	r0,[sp,#32*18+16]
 	ldmia	r1!,{r4,r5}		@ res_x
 	ldmia	r2!,{r6,r7}		@ in2_x
 	ldmia	r3!,{r8,r9}		@ in1_x
-	and	r4,r4,r10
+	and	r4,r4,r10		@ ~in1infty & ~in2infty
 	and	r5,r5,r10
-	and	r6,r6,r11
+	and	r6,r6,r11		@ in1infty & ~in2infty
 	and	r7,r7,r11
-	and	r8,r8,r12
+	and	r8,r8,r12		@ in2infty
 	and	r9,r9,r12
 	orr	r4,r4,r6
 	orr	r5,r5,r7
@@ -3961,11 +3948,11 @@ ecp_nistz256_point_add:
 	ldmia	r1!,{r4,r5}		@ res_x
 	ldmia	r2!,{r6,r7}		@ in2_x
 	ldmia	r3!,{r8,r9}		@ in1_x
-	and	r4,r4,r10
+	and	r4,r4,r10		@ ~in1infty & ~in2infty
 	and	r5,r5,r10
-	and	r6,r6,r11
+	and	r6,r6,r11		@ in1infty & ~in2infty
 	and	r7,r7,r11
-	and	r8,r8,r12
+	and	r8,r8,r12		@ in2infty
 	and	r9,r9,r12
 	orr	r4,r4,r6
 	orr	r5,r5,r7
@@ -3975,11 +3962,11 @@ ecp_nistz256_point_add:
 	ldmia	r1!,{r4,r5}		@ res_x
 	ldmia	r2!,{r6,r7}		@ in2_x
 	ldmia	r3!,{r8,r9}		@ in1_x
-	and	r4,r4,r10
+	and	r4,r4,r10		@ ~in1infty & ~in2infty
 	and	r5,r5,r10
-	and	r6,r6,r11
+	and	r6,r6,r11		@ in1infty & ~in2infty
 	and	r7,r7,r11
-	and	r8,r8,r12
+	and	r8,r8,r12		@ in2infty
 	and	r9,r9,r12
 	orr	r4,r4,r6
 	orr	r5,r5,r7
@@ -3989,11 +3976,11 @@ ecp_nistz256_point_add:
 	ldmia	r1!,{r4,r5}		@ res_x
 	ldmia	r2!,{r6,r7}		@ in2_x
 	ldmia	r3!,{r8,r9}		@ in1_x
-	and	r4,r4,r10
+	and	r4,r4,r10		@ ~in1infty & ~in2infty
 	and	r5,r5,r10
-	and	r6,r6,r11
+	and	r6,r6,r11		@ in1infty & ~in2infty
 	and	r7,r7,r11
-	and	r8,r8,r12
+	and	r8,r8,r12		@ in2infty
 	and	r9,r9,r12
 	orr	r4,r4,r6
 	orr	r5,r5,r7
@@ -4003,11 +3990,11 @@ ecp_nistz256_point_add:
 	ldmia	r1!,{r4,r5}		@ res_x
 	ldmia	r2!,{r6,r7}		@ in2_x
 	ldmia	r3!,{r8,r9}		@ in1_x
-	and	r4,r4,r10
+	and	r4,r4,r10		@ ~in1infty & ~in2infty
 	and	r5,r5,r10
-	and	r6,r6,r11
+	and	r6,r6,r11		@ in1infty & ~in2infty
 	and	r7,r7,r11
-	and	r8,r8,r12
+	and	r8,r8,r12		@ in2infty
 	and	r9,r9,r12
 	orr	r4,r4,r6
 	orr	r5,r5,r7
@@ -4017,11 +4004,11 @@ ecp_nistz256_point_add:
 	ldmia	r1!,{r4,r5}		@ res_x
 	ldmia	r2!,{r6,r7}		@ in2_x
 	ldmia	r3!,{r8,r9}		@ in1_x
-	and	r4,r4,r10
+	and	r4,r4,r10		@ ~in1infty & ~in2infty
 	and	r5,r5,r10
-	and	r6,r6,r11
+	and	r6,r6,r11		@ in1infty & ~in2infty
 	and	r7,r7,r11
-	and	r8,r8,r12
+	and	r8,r8,r12		@ in2infty
 	and	r9,r9,r12
 	orr	r4,r4,r6
 	orr	r5,r5,r7
@@ -4031,11 +4018,11 @@ ecp_nistz256_point_add:
 	ldmia	r1!,{r4,r5}		@ res_x
 	ldmia	r2!,{r6,r7}		@ in2_x
 	ldmia	r3!,{r8,r9}		@ in1_x
-	and	r4,r4,r10
+	and	r4,r4,r10		@ ~in1infty & ~in2infty
 	and	r5,r5,r10
-	and	r6,r6,r11
+	and	r6,r6,r11		@ in1infty & ~in2infty
 	and	r7,r7,r11
-	and	r8,r8,r12
+	and	r8,r8,r12		@ in2infty
 	and	r9,r9,r12
 	orr	r4,r4,r6
 	orr	r5,r5,r7
@@ -4045,11 +4032,11 @@ ecp_nistz256_point_add:
 	ldmia	r1!,{r4,r5}		@ res_x
 	ldmia	r2!,{r6,r7}		@ in2_x
 	ldmia	r3!,{r8,r9}		@ in1_x
-	and	r4,r4,r10
+	and	r4,r4,r10		@ ~in1infty & ~in2infty
 	and	r5,r5,r10
-	and	r6,r6,r11
+	and	r6,r6,r11		@ in1infty & ~in2infty
 	and	r7,r7,r11
-	and	r8,r8,r12
+	and	r8,r8,r12		@ in2infty
 	and	r9,r9,r12
 	orr	r4,r4,r6
 	orr	r5,r5,r7
@@ -4059,11 +4046,11 @@ ecp_nistz256_point_add:
 	ldmia	r1!,{r4,r5}		@ res_x
 	ldmia	r2!,{r6,r7}		@ in2_x
 	ldmia	r3!,{r8,r9}		@ in1_x
-	and	r4,r4,r10
+	and	r4,r4,r10		@ ~in1infty & ~in2infty
 	and	r5,r5,r10
-	and	r6,r6,r11
+	and	r6,r6,r11		@ in1infty & ~in2infty
 	and	r7,r7,r11
-	and	r8,r8,r12
+	and	r8,r8,r12		@ in2infty
 	and	r9,r9,r12
 	orr	r4,r4,r6
 	orr	r5,r5,r7
@@ -4073,11 +4060,11 @@ ecp_nistz256_point_add:
 	ldmia	r1!,{r4,r5}		@ res_x
 	ldmia	r2!,{r6,r7}		@ in2_x
 	ldmia	r3!,{r8,r9}		@ in1_x
-	and	r4,r4,r10
+	and	r4,r4,r10		@ ~in1infty & ~in2infty
 	and	r5,r5,r10
-	and	r6,r6,r11
+	and	r6,r6,r11		@ in1infty & ~in2infty
 	and	r7,r7,r11
-	and	r8,r8,r12
+	and	r8,r8,r12		@ in2infty
 	and	r9,r9,r12
 	orr	r4,r4,r6
 	orr	r5,r5,r7
@@ -4087,11 +4074,11 @@ ecp_nistz256_point_add:
 	ldmia	r1!,{r4,r5}		@ res_x
 	ldmia	r2!,{r6,r7}		@ in2_x
 	ldmia	r3!,{r8,r9}		@ in1_x
-	and	r4,r4,r10
+	and	r4,r4,r10		@ ~in1infty & ~in2infty
 	and	r5,r5,r10
-	and	r6,r6,r11
+	and	r6,r6,r11		@ in1infty & ~in2infty
 	and	r7,r7,r11
-	and	r8,r8,r12
+	and	r8,r8,r12		@ in2infty
 	and	r9,r9,r12
 	orr	r4,r4,r6
 	orr	r5,r5,r7
@@ -4101,11 +4088,11 @@ ecp_nistz256_point_add:
 	ldmia	r1!,{r4,r5}		@ res_x
 	ldmia	r2!,{r6,r7}		@ in2_x
 	ldmia	r3!,{r8,r9}		@ in1_x
-	and	r4,r4,r10
+	and	r4,r4,r10		@ ~in1infty & ~in2infty
 	and	r5,r5,r10
-	and	r6,r6,r11
+	and	r6,r6,r11		@ in1infty & ~in2infty
 	and	r7,r7,r11
-	and	r8,r8,r12
+	and	r8,r8,r12		@ in2infty
 	and	r9,r9,r12
 	orr	r4,r4,r6
 	orr	r5,r5,r7
@@ -4147,7 +4134,7 @@ ecp_nistz256_point_add_affine:
 #endif
 	movne	r12,#-1
 	stmia	r3,{r4,r5,r6,r7,r8,r9,r10,r11}
-	str	r12,[sp,#32*15+4]	@ !in1infty
+	str	r12,[sp,#32*15+4]	@ ~in1infty
 
 	ldmia	r2!,{r4,r5,r6,r7,r8,r9,r10,r11}	@ copy in2_x
 	add	r3,sp,#192
@@ -4174,7 +4161,7 @@ ecp_nistz256_point_add_affine:
 	it	ne
 #endif
 	movne	r12,#-1
-	str	r12,[sp,#32*15+8]	@ !in2infty
+	str	r12,[sp,#32*15+8]	@ ~in2infty
 
 	add	r1,sp,#160
 	add	r2,sp,#160
@@ -4256,24 +4243,24 @@ ecp_nistz256_point_add_affine:
 	add	r2,sp,#288
 	bl	__ecp_nistz256_sub_from	@ p256_sub(res_y, res_y, S2);
 
-	ldr	r11,[sp,#32*15+4]	@ !in1intfy
-	ldr	r12,[sp,#32*15+8]	@ !in2intfy
+	ldr	r11,[sp,#32*15+4]	@ ~in1infty
+	ldr	r12,[sp,#32*15+8]	@ ~in2infty
 	add	r1,sp,#0
 	add	r2,sp,#192
-	and	r10,r11,r12
+	and	r10,r11,r12		@ ~in1infty & ~in2infty
 	mvn	r11,r11
 	add	r3,sp,#96
-	and	r11,r11,r12
-	mvn	r12,r12
+	and	r11,r11,r12		@ in1infty & ~in2infty
+	mvn	r12,r12			@ in2infty
 	ldr	r0,[sp,#32*15]
 	ldmia	r1!,{r4,r5}		@ res_x
 	ldmia	r2!,{r6,r7}		@ in2_x
 	ldmia	r3!,{r8,r9}		@ in1_x
-	and	r4,r4,r10
+	and	r4,r4,r10		@ ~in1infty & ~in2infty
 	and	r5,r5,r10
-	and	r6,r6,r11
+	and	r6,r6,r11		@ in1infty & ~in2infty
 	and	r7,r7,r11
-	and	r8,r8,r12
+	and	r8,r8,r12		@ in2infty
 	and	r9,r9,r12
 	orr	r4,r4,r6
 	orr	r5,r5,r7
@@ -4283,11 +4270,11 @@ ecp_nistz256_point_add_affine:
 	ldmia	r1!,{r4,r5}		@ res_x
 	ldmia	r2!,{r6,r7}		@ in2_x
 	ldmia	r3!,{r8,r9}		@ in1_x
-	and	r4,r4,r10
+	and	r4,r4,r10		@ ~in1infty & ~in2infty
 	and	r5,r5,r10
-	and	r6,r6,r11
+	and	r6,r6,r11		@ in1infty & ~in2infty
 	and	r7,r7,r11
-	and	r8,r8,r12
+	and	r8,r8,r12		@ in2infty
 	and	r9,r9,r12
 	orr	r4,r4,r6
 	orr	r5,r5,r7
@@ -4297,11 +4284,11 @@ ecp_nistz256_point_add_affine:
 	ldmia	r1!,{r4,r5}		@ res_x
 	ldmia	r2!,{r6,r7}		@ in2_x
 	ldmia	r3!,{r8,r9}		@ in1_x
-	and	r4,r4,r10
+	and	r4,r4,r10		@ ~in1infty & ~in2infty
 	and	r5,r5,r10
-	and	r6,r6,r11
+	and	r6,r6,r11		@ in1infty & ~in2infty
 	and	r7,r7,r11
-	and	r8,r8,r12
+	and	r8,r8,r12		@ in2infty
 	and	r9,r9,r12
 	orr	r4,r4,r6
 	orr	r5,r5,r7
@@ -4311,11 +4298,11 @@ ecp_nistz256_point_add_affine:
 	ldmia	r1!,{r4,r5}		@ res_x
 	ldmia	r2!,{r6,r7}		@ in2_x
 	ldmia	r3!,{r8,r9}		@ in1_x
-	and	r4,r4,r10
+	and	r4,r4,r10		@ ~in1infty & ~in2infty
 	and	r5,r5,r10
-	and	r6,r6,r11
+	and	r6,r6,r11		@ in1infty & ~in2infty
 	and	r7,r7,r11
-	and	r8,r8,r12
+	and	r8,r8,r12		@ in2infty
 	and	r9,r9,r12
 	orr	r4,r4,r6
 	orr	r5,r5,r7
@@ -4325,11 +4312,11 @@ ecp_nistz256_point_add_affine:
 	ldmia	r1!,{r4,r5}		@ res_x
 	ldmia	r2!,{r6,r7}		@ in2_x
 	ldmia	r3!,{r8,r9}		@ in1_x
-	and	r4,r4,r10
+	and	r4,r4,r10		@ ~in1infty & ~in2infty
 	and	r5,r5,r10
-	and	r6,r6,r11
+	and	r6,r6,r11		@ in1infty & ~in2infty
 	and	r7,r7,r11
-	and	r8,r8,r12
+	and	r8,r8,r12		@ in2infty
 	and	r9,r9,r12
 	orr	r4,r4,r6
 	orr	r5,r5,r7
@@ -4339,11 +4326,11 @@ ecp_nistz256_point_add_affine:
 	ldmia	r1!,{r4,r5}		@ res_x
 	ldmia	r2!,{r6,r7}		@ in2_x
 	ldmia	r3!,{r8,r9}		@ in1_x
-	and	r4,r4,r10
+	and	r4,r4,r10		@ ~in1infty & ~in2infty
 	and	r5,r5,r10
-	and	r6,r6,r11
+	and	r6,r6,r11		@ in1infty & ~in2infty
 	and	r7,r7,r11
-	and	r8,r8,r12
+	and	r8,r8,r12		@ in2infty
 	and	r9,r9,r12
 	orr	r4,r4,r6
 	orr	r5,r5,r7
@@ -4353,11 +4340,11 @@ ecp_nistz256_point_add_affine:
 	ldmia	r1!,{r4,r5}		@ res_x
 	ldmia	r2!,{r6,r7}		@ in2_x
 	ldmia	r3!,{r8,r9}		@ in1_x
-	and	r4,r4,r10
+	and	r4,r4,r10		@ ~in1infty & ~in2infty
 	and	r5,r5,r10
-	and	r6,r6,r11
+	and	r6,r6,r11		@ in1infty & ~in2infty
 	and	r7,r7,r11
-	and	r8,r8,r12
+	and	r8,r8,r12		@ in2infty
 	and	r9,r9,r12
 	orr	r4,r4,r6
 	orr	r5,r5,r7
@@ -4367,11 +4354,11 @@ ecp_nistz256_point_add_affine:
 	ldmia	r1!,{r4,r5}		@ res_x
 	ldmia	r2!,{r6,r7}		@ in2_x
 	ldmia	r3!,{r8,r9}		@ in1_x
-	and	r4,r4,r10
+	and	r4,r4,r10		@ ~in1infty & ~in2infty
 	and	r5,r5,r10
-	and	r6,r6,r11
+	and	r6,r6,r11		@ in1infty & ~in2infty
 	and	r7,r7,r11
-	and	r8,r8,r12
+	and	r8,r8,r12		@ in2infty
 	and	r9,r9,r12
 	orr	r4,r4,r6
 	orr	r5,r5,r7
diff --git a/deps/openssl/config/archs/linux-armv4/asm/crypto/include/internal/bn_conf.h b/deps/openssl/config/archs/linux-armv4/asm/crypto/include/internal/bn_conf.h
index fb52156bd0..459055c96f 100644
--- a/deps/openssl/config/archs/linux-armv4/asm/crypto/include/internal/bn_conf.h
+++ b/deps/openssl/config/archs/linux-armv4/asm/crypto/include/internal/bn_conf.h
@@ -1,5 +1,5 @@
 /* WARNING: do not edit! */
-/* Generated by Makefile from crypto/include/internal/bn_conf.h.in */
+/* Generated by Makefile from include/crypto/bn_conf.h.in */
 /*
  * Copyright 2016 The OpenSSL Project Authors. All Rights Reserved.
  *
@@ -9,8 +9,8 @@
  * https://www.openssl.org/source/license.html
  */
 
-#ifndef HEADER_BN_CONF_H
-# define HEADER_BN_CONF_H
+#ifndef OSSL_CRYPTO_BN_CONF_H
+# define OSSL_CRYPTO_BN_CONF_H
 
 /*
  * The contents of this file are not used in the UEFI build, as
diff --git a/deps/openssl/config/archs/linux-armv4/asm/crypto/include/internal/dso_conf.h b/deps/openssl/config/archs/linux-armv4/asm/crypto/include/internal/dso_conf.h
index 252266ec2a..4b1167c3d8 100644
--- a/deps/openssl/config/archs/linux-armv4/asm/crypto/include/internal/dso_conf.h
+++ b/deps/openssl/config/archs/linux-armv4/asm/crypto/include/internal/dso_conf.h
@@ -1,5 +1,5 @@
 /* WARNING: do not edit! */
-/* Generated by Makefile from crypto/include/internal/dso_conf.h.in */
+/* Generated by Makefile from include/crypto/dso_conf.h.in */
 /*
  * Copyright 2016-2019 The OpenSSL Project Authors. All Rights Reserved.
  *
@@ -9,8 +9,8 @@
  * https://www.openssl.org/source/license.html
  */
 
-#ifndef HEADER_DSO_CONF_H
-# define HEADER_DSO_CONF_H
+#ifndef OSSL_CRYPTO_DSO_CONF_H
+# define OSSL_CRYPTO_DSO_CONF_H
 # define DSO_DLFCN
 # define HAVE_DLFCN_H
 # define DSO_EXTENSION ".so"
diff --git a/deps/openssl/config/archs/linux-armv4/asm/crypto/sha/sha256-armv4.S b/deps/openssl/config/archs/linux-armv4/asm/crypto/sha/sha256-armv4.S
index 3efcde6b6e..12c44793de 100644
--- a/deps/openssl/config/archs/linux-armv4/asm/crypto/sha/sha256-armv4.S
+++ b/deps/openssl/config/archs/linux-armv4/asm/crypto/sha/sha256-armv4.S
@@ -1,4 +1,4 @@
-@ Copyright 2007-2018 The OpenSSL Project Authors. All Rights Reserved.
+@ Copyright 2007-2020 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
diff --git a/deps/openssl/config/archs/linux-armv4/asm/crypto/sha/sha512-armv4.S b/deps/openssl/config/archs/linux-armv4/asm/crypto/sha/sha512-armv4.S
index 1e2fbf6350..7c28e37a6f 100644
--- a/deps/openssl/config/archs/linux-armv4/asm/crypto/sha/sha512-armv4.S
+++ b/deps/openssl/config/archs/linux-armv4/asm/crypto/sha/sha512-armv4.S
@@ -1,4 +1,4 @@
-@ Copyright 2007-2018 The OpenSSL Project Authors. All Rights Reserved.
+@ Copyright 2007-2020 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
diff --git a/deps/openssl/config/archs/linux-armv4/asm/include/openssl/opensslconf.h b/deps/openssl/config/archs/linux-armv4/asm/include/openssl/opensslconf.h
index 1a2b31bdc7..71c4fecc40 100644
--- a/deps/openssl/config/archs/linux-armv4/asm/include/openssl/opensslconf.h
+++ b/deps/openssl/config/archs/linux-armv4/asm/include/openssl/opensslconf.h
@@ -96,9 +96,6 @@ extern "C" {
 #ifndef OPENSSL_NO_DYNAMIC_ENGINE
 # define OPENSSL_NO_DYNAMIC_ENGINE
 #endif
-#ifndef OPENSSL_NO_AFALGENG
-# define OPENSSL_NO_AFALGENG
-#endif
 
 
 /*
diff --git a/deps/openssl/config/archs/linux-armv4/asm/include/progs.h b/deps/openssl/config/archs/linux-armv4/asm/include/progs.h
index 9b3d270e20..308c65601b 100644
--- a/deps/openssl/config/archs/linux-armv4/asm/include/progs.h
+++ b/deps/openssl/config/archs/linux-armv4/asm/include/progs.h
@@ -2,7 +2,7 @@
  * WARNING: do not edit!
  * Generated by apps/progs.pl
  *
- * Copyright 1995-2019 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 1995-2020 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
diff --git a/deps/openssl/config/archs/linux-armv4/asm_avx2/configdata.pm b/deps/openssl/config/archs/linux-armv4/asm_avx2/configdata.pm
index 41e52a0bd5..ad3c832efe 100644
--- a/deps/openssl/config/archs/linux-armv4/asm_avx2/configdata.pm
+++ b/deps/openssl/config/archs/linux-armv4/asm_avx2/configdata.pm
@@ -55,7 +55,7 @@ our %config = (
   minor => "1.1",
   openssl_algorithm_defines => [ "OPENSSL_NO_COMP", "OPENSSL_NO_MD2", "OPENSSL_NO_RC5" ],
   openssl_api_defines => [  ],
-  openssl_other_defines => [ "OPENSSL_RAND_SEED_OS", "OPENSSL_NO_AFALGENG", "OPENSSL_NO_ASAN", "OPENSSL_NO_CRYPTO_MDEBUG", "OPENSSL_NO_CRYPTO_MDEBUG_BACKTRACE", "OPENSSL_NO_DEVCRYPTOENG", "OPENSSL_NO_EC_NISTP_64_GCC_128", "OPENSSL_NO_EGD", "OPENSSL_NO_EXTERNAL_TESTS", "OPENSSL_NO_FUZZ_AFL", "OPENSSL_NO_FUZZ_LIBFUZZER", "OPENSSL_NO_HEARTBEATS", "OPENSSL_NO_MSAN", "OPENSSL_NO_SCTP", "OPENSSL_NO_SSL3", "OPENSSL_NO_SSL3_METHOD", "OPENSSL_NO_UBSAN", "OPENSSL_NO_UNIT_TEST", "OPENSSL_NO_WEAK_SSL_CIPHERS", "OPENSSL_NO_DYNAMIC_ENGINE", "OPENSSL_NO_AFALGENG" ],
+  openssl_other_defines => [ "OPENSSL_RAND_SEED_OS", "OPENSSL_NO_AFALGENG", "OPENSSL_NO_ASAN", "OPENSSL_NO_CRYPTO_MDEBUG", "OPENSSL_NO_CRYPTO_MDEBUG_BACKTRACE", "OPENSSL_NO_DEVCRYPTOENG", "OPENSSL_NO_EC_NISTP_64_GCC_128", "OPENSSL_NO_EGD", "OPENSSL_NO_EXTERNAL_TESTS", "OPENSSL_NO_FUZZ_AFL", "OPENSSL_NO_FUZZ_LIBFUZZER", "OPENSSL_NO_HEARTBEATS", "OPENSSL_NO_MSAN", "OPENSSL_NO_SCTP", "OPENSSL_NO_SSL3", "OPENSSL_NO_SSL3_METHOD", "OPENSSL_NO_UBSAN", "OPENSSL_NO_UNIT_TEST", "OPENSSL_NO_WEAK_SSL_CIPHERS", "OPENSSL_NO_DYNAMIC_ENGINE" ],
   openssl_sys_defines => [  ],
   openssl_thread_defines => [ "OPENSSL_THREADS" ],
   openssldir => "",
@@ -111,8 +111,8 @@ our %config = (
   sourcedir => ".",
   target => "linux-armv4",
   tdirs => [ "ossl_shim" ],
-  version => "1.1.1d",
-  version_num => "0x1010104fL",
+  version => "1.1.1e",
+  version_num => "0x1010105fL",
 );
 
 our %target = (
@@ -239,6 +239,7 @@ our @disablables = (
   "dgram",
   "dh",
   "dsa",
+  "dso",
   "dtls",
   "dynamic-engine",
   "ec",
@@ -356,8 +357,8 @@ our %unified_info = (
         {
             "" =>
                 [
-                    "crypto/include/internal/bn_conf.h",
-                    "crypto/include/internal/dso_conf.h",
+                    "include/crypto/bn_conf.h",
+                    "include/crypto/dso_conf.h",
                     "include/openssl/opensslconf.h",
                 ],
             "apps/asn1pars.o" =>
@@ -625,14 +626,6 @@ our %unified_info = (
                     "crypto/perlasm/cbc.pl",
                     "crypto/perlasm/x86asm.pl",
                 ],
-            "crypto/include/internal/bn_conf.h" =>
-                [
-                    "configdata.pm",
-                ],
-            "crypto/include/internal/dso_conf.h" =>
-                [
-                    "configdata.pm",
-                ],
             "crypto/rc4/rc4-586.s" =>
                 [
                     "crypto/perlasm/x86asm.pl",
@@ -708,6 +701,14 @@ our %unified_info = (
                 [
                     "libcrypto",
                 ],
+            "include/crypto/bn_conf.h" =>
+                [
+                    "configdata.pm",
+                ],
+            "include/crypto/dso_conf.h" =>
+                [
+                    "configdata.pm",
+                ],
             "include/openssl/opensslconf.h" =>
                 [
                     "configdata.pm",
@@ -1505,6 +1506,12 @@ our %unified_info = (
                     "libcrypto",
                     "test/libtestutil.a",
                 ],
+            "test/ssl_ctx_test" =>
+                [
+                    "libcrypto",
+                    "libssl",
+                    "test/libtestutil.a",
+                ],
             "test/ssl_test" =>
                 [
                     "libcrypto",
@@ -3236,7 +3243,6 @@ our %unified_info = (
                             "test/testutil/cb.o",
                             "test/testutil/driver.o",
                             "test/testutil/format_output.o",
-                            "test/testutil/init.o",
                             "test/testutil/main.o",
                             "test/testutil/output_helpers.o",
                             "test/testutil/random.o",
@@ -3244,6 +3250,7 @@ our %unified_info = (
                             "test/testutil/tap_bio.o",
                             "test/testutil/test_cleanup.o",
                             "test/testutil/tests.o",
+                            "test/testutil/testutil_init.o",
                         ],
                     "products" =>
                         {
@@ -3742,14 +3749,6 @@ our %unified_info = (
                 [
                     "crypto/ia64cpuid.S",
                 ],
-            "crypto/include/internal/bn_conf.h" =>
-                [
-                    "crypto/include/internal/bn_conf.h.in",
-                ],
-            "crypto/include/internal/dso_conf.h" =>
-                [
-                    "crypto/include/internal/dso_conf.h.in",
-                ],
             "crypto/md5/md5-586.s" =>
                 [
                     "crypto/md5/asm/md5-586.pl",
@@ -4190,6 +4189,14 @@ our %unified_info = (
                     "engines/asm/e_padlock-x86_64.pl",
                     "\$(PERLASM_SCHEME)",
                 ],
+            "include/crypto/bn_conf.h" =>
+                [
+                    "include/crypto/bn_conf.h.in",
+                ],
+            "include/crypto/dso_conf.h" =>
+                [
+                    "include/crypto/dso_conf.h.in",
+                ],
             "include/openssl/opensslconf.h" =>
                 [
                     "include/openssl/opensslconf.h.in",
@@ -4868,7 +4875,6 @@ our %unified_info = (
             "crypto/aes/aes-armv4.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto",
                 ],
@@ -4887,43 +4893,36 @@ our %unified_info = (
             "crypto/aes/aes_cbc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/aes/aes_cfb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/aes/aes_ecb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/aes/aes_ige.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/aes/aes_misc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/aes/aes_ofb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/aes/aes_wrap.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/aes/aesfx-sparcv9.o" =>
@@ -4937,21 +4936,18 @@ our %unified_info = (
             "crypto/aes/aesv8-armx.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto",
                 ],
             "crypto/aes/bsaes-armv7.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto",
                 ],
             "crypto/aria/aria.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/arm64cpuid.o" =>
@@ -4961,639 +4957,533 @@ our %unified_info = (
             "crypto/armcap.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/armv4cpuid.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto",
                 ],
             "crypto/asn1/a_bitstr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_d2i_fp.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_digest.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_dup.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_gentm.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_i2d_fp.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_int.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_mbstr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_object.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_octet.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_print.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_sign.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_strex.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_strnid.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_time.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_type.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_utctm.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_utf8.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_verify.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/ameth_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/asn1_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/asn1_gen.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/asn1_item_list.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/asn1_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/asn1_par.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/asn_mime.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/asn_moid.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/asn_mstbl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/asn_pack.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/bio_asn1.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/bio_ndef.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/d2i_pr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/d2i_pu.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/evp_asn1.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/f_int.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/f_string.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/i2d_pr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/i2d_pu.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/n_pkey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/nsseq.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/p5_pbe.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/p5_pbev2.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/p5_scrypt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/p8_pkey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/t_bitst.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/t_pkey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/t_spki.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/tasn_dec.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/tasn_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/tasn_fre.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/tasn_new.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/tasn_prn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/tasn_scn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/tasn_typ.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/tasn_utl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/x_algor.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/x_bignum.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/x_info.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/x_int64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/x_long.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/x_pkey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/x_sig.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/x_spki.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/x_val.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/async/arch/async_null.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/async/arch/async_posix.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/async/arch/async_win.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/async/async.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/async/async_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/async/async_wait.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bf/bf_cfb64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bf/bf_ecb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bf/bf_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bf/bf_ofb64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bf/bf_skey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/b_addr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/b_dump.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/b_print.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/b_sock.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/b_sock2.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bf_buff.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bf_lbuf.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bf_nbio.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bf_null.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bio_cb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bio_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bio_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bio_meth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bss_acpt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bss_bio.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bss_conn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bss_dgram.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bss_fd.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bss_file.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bss_log.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bss_mem.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bss_null.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bss_sock.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/blake2/blake2b.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/blake2/blake2s.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/blake2/m_blake2b.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/blake2/m_blake2s.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/armv4-gf2m.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto",
                 ],
             "crypto/bn/armv4-mont.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto",
                 ],
@@ -5604,188 +5494,157 @@ our %unified_info = (
             "crypto/bn/bn_add.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_asm.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_blind.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_const.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_ctx.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_depr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_dh.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_div.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_exp.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto",
                 ],
             "crypto/bn/bn_exp2.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_gcd.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_gf2m.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_intern.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_kron.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_mod.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_mont.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_mpi.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_mul.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_nist.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_prime.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_print.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_rand.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_recp.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_shift.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_sqr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_sqrt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_srp.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_word.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_x931p.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/mips-mont.o" =>
@@ -5815,13 +5674,11 @@ our %unified_info = (
             "crypto/buffer/buf_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/buffer/buffer.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/buildinf.h" =>
@@ -5831,43 +5688,36 @@ our %unified_info = (
             "crypto/camellia/camellia.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/camellia/cmll_cbc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/camellia/cmll_cfb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/camellia/cmll_ctr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/camellia/cmll_ecb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/camellia/cmll_misc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/camellia/cmll_ofb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/camellia/cmllt4-sparcv9.o" =>
@@ -5877,37 +5727,31 @@ our %unified_info = (
             "crypto/cast/c_cfb64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cast/c_ecb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cast/c_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cast/c_ofb64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cast/c_skey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/chacha/chacha-armv4.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto",
                 ],
@@ -5922,272 +5766,227 @@ our %unified_info = (
             "crypto/cmac/cm_ameth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cmac/cm_pmeth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cmac/cmac.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_asn1.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_att.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_cd.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_dd.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_env.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_ess.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_io.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_kari.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_pwri.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_sd.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_smime.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/conf/conf_api.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/conf/conf_def.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/conf/conf_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/conf/conf_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/conf/conf_mall.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/conf/conf_mod.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/conf/conf_sap.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/conf/conf_ssl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cpt_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cryptlib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ct/ct_b64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ct/ct_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ct/ct_log.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ct/ct_oct.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ct/ct_policy.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ct/ct_prn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ct/ct_sct.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ct/ct_sct_ctx.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ct/ct_vfy.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ct/ct_x509v3.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ctype.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cversion.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto",
                 ],
             "crypto/des/cbc_cksm.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/cbc_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/cfb64ede.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/cfb64enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/cfb_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/des_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/dest4-sparcv9.o" =>
@@ -6197,301 +5996,251 @@ our %unified_info = (
             "crypto/des/ecb3_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/ecb_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/fcrypt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/fcrypt_b.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/ofb64ede.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/ofb64enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/ofb_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/pcbc_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/qud_cksm.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/rand_key.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/set_key.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/str2key.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/xcbc_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_ameth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_asn1.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_check.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_depr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_gen.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_kdf.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_key.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_meth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_pmeth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_prn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_rfc5114.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_rfc7919.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dsa/dsa_ameth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dsa/dsa_asn1.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dsa/dsa_depr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dsa/dsa_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dsa/dsa_gen.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dsa/dsa_key.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dsa/dsa_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dsa/dsa_meth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dsa/dsa_ossl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dsa/dsa_pmeth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dsa/dsa_prn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dsa/dsa_sign.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dsa/dsa_vrf.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dso/dso_dl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dso/dso_dlfcn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dso/dso_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dso/dso_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dso/dso_openssl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dso/dso_vms.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dso/dso_win32.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ebcdic.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/curve25519.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/curve448/arch_32/f_impl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto/ec/curve448/arch_32",
                     "crypto/ec/curve448",
@@ -6499,7 +6248,6 @@ our %unified_info = (
             "crypto/ec/curve448/curve448.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto/ec/curve448/arch_32",
                     "crypto/ec/curve448",
@@ -6507,7 +6255,6 @@ our %unified_info = (
             "crypto/ec/curve448/curve448_tables.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto/ec/curve448/arch_32",
                     "crypto/ec/curve448",
@@ -6515,7 +6262,6 @@ our %unified_info = (
             "crypto/ec/curve448/eddsa.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto/ec/curve448/arch_32",
                     "crypto/ec/curve448",
@@ -6523,7 +6269,6 @@ our %unified_info = (
             "crypto/ec/curve448/f_generic.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto/ec/curve448/arch_32",
                     "crypto/ec/curve448",
@@ -6531,7 +6276,6 @@ our %unified_info = (
             "crypto/ec/curve448/scalar.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto/ec/curve448/arch_32",
                     "crypto/ec/curve448",
@@ -6539,169 +6283,141 @@ our %unified_info = (
             "crypto/ec/ec2_oct.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec2_smpl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec_ameth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec_asn1.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec_check.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec_curve.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec_cvt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec_key.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec_kmeth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec_mult.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec_oct.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec_pmeth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec_print.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecdh_kdf.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecdh_ossl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecdsa_ossl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecdsa_sign.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecdsa_vrf.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/eck_prn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecp_mont.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecp_nist.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecp_nistp224.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecp_nistp256.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecp_nistp521.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecp_nistputil.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecp_nistz256-armv4.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto",
                 ],
@@ -6716,229 +6432,191 @@ our %unified_info = (
             "crypto/ec/ecp_nistz256.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecp_oct.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecp_smpl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecx_meth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/eng_all.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/eng_cnf.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/eng_ctrl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/eng_dyn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/eng_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/eng_fat.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/eng_init.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/eng_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/eng_list.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/eng_openssl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/eng_pkey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/eng_rdrand.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/eng_table.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/tb_asnmth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/tb_cipher.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/tb_dh.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/tb_digest.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/tb_dsa.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/tb_eckey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/tb_pkmeth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/tb_rand.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/tb_rsa.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/err/err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/err/err_all.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/err/err_prn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/bio_b64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/bio_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/bio_md.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/bio_ok.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/c_allc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/c_alld.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/cmeth_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/digest.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/e_aes.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto",
                     "crypto/modes",
@@ -6946,21 +6624,18 @@ our %unified_info = (
             "crypto/evp/e_aes_cbc_hmac_sha1.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto/modes",
                 ],
             "crypto/evp/e_aes_cbc_hmac_sha256.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto/modes",
                 ],
             "crypto/evp/e_aria.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto",
                     "crypto/modes",
@@ -6968,13 +6643,11 @@ our %unified_info = (
             "crypto/evp/e_bf.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/e_camellia.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto",
                     "crypto/modes",
@@ -6982,81 +6655,68 @@ our %unified_info = (
             "crypto/evp/e_cast.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/e_chacha20_poly1305.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/e_des.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto",
                 ],
             "crypto/evp/e_des3.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto",
                 ],
             "crypto/evp/e_idea.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/e_null.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/e_old.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/e_rc2.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/e_rc4.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/e_rc4_hmac_md5.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/e_rc5.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/e_seed.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/e_sm4.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto",
                     "crypto/modes",
@@ -7064,328 +6724,267 @@ our %unified_info = (
             "crypto/evp/e_xcbc_d.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/encode.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/evp_cnf.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/evp_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/evp_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/evp_key.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/evp_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/evp_pbe.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/evp_pkey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/m_md2.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/m_md4.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/m_md5.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/m_md5_sha1.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/m_mdc2.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/m_null.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/m_ripemd.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/m_sha1.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/m_sha3.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto",
                 ],
             "crypto/evp/m_sigver.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/m_wp.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/names.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/p5_crpt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/p5_crpt2.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/p_dec.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/p_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/p_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/p_open.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/p_seal.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/p_sign.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/p_verify.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/pbe_scrypt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/pmeth_fn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/pmeth_gn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/pmeth_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ex_data.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/getenv.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/hmac/hm_ameth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/hmac/hm_pmeth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/hmac/hmac.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/idea/i_cbc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/idea/i_cfb64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/idea/i_ecb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/idea/i_ofb64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/idea/i_skey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
-            "crypto/include/internal/bn_conf.h" =>
-                [
-                    ".",
-                ],
-            "crypto/include/internal/dso_conf.h" =>
-                [
-                    ".",
-                ],
             "crypto/init.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/kdf/hkdf.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/kdf/kdf_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/kdf/scrypt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/kdf/tls1_prf.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/lhash/lh_stats.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/lhash/lhash.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/md4/md4_dgst.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/md4/md4_one.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/md5/md5-sparcv9.o" =>
@@ -7395,86 +6994,72 @@ our %unified_info = (
             "crypto/md5/md5_dgst.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/md5/md5_one.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/mdc2/mdc2_one.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/mdc2/mdc2dgst.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/mem.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/mem_dbg.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/mem_sec.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/modes/cbc128.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/modes/ccm128.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/modes/cfb128.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/modes/ctr128.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/modes/cts128.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/modes/gcm128.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto",
                 ],
             "crypto/modes/ghash-armv4.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto",
                 ],
@@ -7489,374 +7074,312 @@ our %unified_info = (
             "crypto/modes/ghashv8-armx.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto",
                 ],
             "crypto/modes/ocb128.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/modes/ofb128.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/modes/wrap128.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/modes/xts128.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/o_dir.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/o_fips.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/o_fopen.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/o_init.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/o_str.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/o_time.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/objects/o_names.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/objects/obj_dat.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/objects/obj_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/objects/obj_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/objects/obj_xref.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ocsp/ocsp_asn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ocsp/ocsp_cl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ocsp/ocsp_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ocsp/ocsp_ext.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ocsp/ocsp_ht.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ocsp/ocsp_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ocsp/ocsp_prn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ocsp/ocsp_srv.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ocsp/ocsp_vfy.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ocsp/v3_ocsp.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pem/pem_all.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pem/pem_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pem/pem_info.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pem/pem_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pem/pem_oth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pem/pem_pk8.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pem/pem_pkey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pem/pem_sign.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pem/pem_x509.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pem/pem_xaux.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pem/pvkfmt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_add.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_asn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_attr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_crpt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_crt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_decr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_init.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_key.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_kiss.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_mutl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_npas.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_p8d.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_p8e.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_sbag.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_utl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/pk12err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs7/bio_pk7.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs7/pk7_asn1.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs7/pk7_attr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs7/pk7_doit.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs7/pk7_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs7/pk7_mime.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs7/pk7_smime.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs7/pkcs7err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/poly1305/poly1305-armv4.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto",
                 ],
@@ -7875,259 +7398,216 @@ our %unified_info = (
             "crypto/poly1305/poly1305.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/poly1305/poly1305_ameth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/poly1305/poly1305_pmeth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rand/drbg_ctr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rand/drbg_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rand/rand_egd.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rand/rand_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rand/rand_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rand/rand_unix.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rand/rand_vms.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rand/rand_win.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rand/randfile.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rc2/rc2_cbc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rc2/rc2_ecb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rc2/rc2_skey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rc2/rc2cfb64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rc2/rc2ofb64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rc4/rc4_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rc4/rc4_skey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ripemd/rmd_dgst.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ripemd/rmd_one.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_ameth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_asn1.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_chk.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_crpt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_depr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_gen.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_meth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_mp.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_none.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_oaep.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_ossl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_pk1.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_pmeth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_prn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_pss.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_saos.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_sign.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_ssl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_x931.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_x931g.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/s390xcpuid.o" =>
@@ -8137,44 +7617,37 @@ our %unified_info = (
             "crypto/seed/seed.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/seed/seed_cbc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/seed/seed_cfb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/seed/seed_ecb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/seed/seed_ofb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sha/keccak1600-armv4.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto",
                 ],
             "crypto/sha/sha1-armv4-large.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto",
                 ],
@@ -8197,19 +7670,16 @@ our %unified_info = (
             "crypto/sha/sha1_one.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sha/sha1dgst.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sha/sha256-armv4.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto",
                 ],
@@ -8232,13 +7702,11 @@ our %unified_info = (
             "crypto/sha/sha256.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sha/sha512-armv4.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto",
                 ],
@@ -8261,709 +7729,591 @@ our %unified_info = (
             "crypto/sha/sha512.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/siphash/siphash.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/siphash/siphash_ameth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/siphash/siphash_pmeth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sm2/sm2_crypt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sm2/sm2_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sm2/sm2_pmeth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sm2/sm2_sign.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sm3/m_sm3.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sm3/sm3.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sm4/sm4.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/srp/srp_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/srp/srp_vfy.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/stack/stack.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/store/loader_file.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/store/store_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/store/store_init.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/store/store_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/store/store_register.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/store/store_strings.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/threads_none.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/threads_pthread.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/threads_win.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ts/ts_asn1.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ts/ts_conf.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ts/ts_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ts/ts_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ts/ts_req_print.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ts/ts_req_utils.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ts/ts_rsp_print.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ts/ts_rsp_sign.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ts/ts_rsp_utils.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ts/ts_rsp_verify.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ts/ts_verify_ctx.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/txt_db/txt_db.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ui/ui_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ui/ui_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ui/ui_null.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ui/ui_openssl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ui/ui_util.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/uid.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/whrlpool/wp_block.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/whrlpool/wp_dgst.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/by_dir.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/by_file.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/t_crl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/t_req.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/t_x509.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_att.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_cmp.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_d2.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_def.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_ext.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_lu.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_meth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_obj.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_r2x.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_req.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_set.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_trs.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_txt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_v3.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_vfy.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_vpm.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509cset.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509name.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509rset.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509spki.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509type.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x_all.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x_attrib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x_crl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x_exten.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x_name.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x_pubkey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x_req.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x_x509.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x_x509a.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/pcy_cache.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/pcy_data.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/pcy_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/pcy_map.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/pcy_node.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/pcy_tree.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_addr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_admis.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_akey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_akeya.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_alt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_asid.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_bcons.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_bitst.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_conf.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_cpols.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_crld.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_enum.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_extku.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_genn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_ia5.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_info.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_int.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_ncons.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_pci.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_pcia.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_pcons.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_pku.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_pmaps.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_prn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_purp.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_skey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_sxnet.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_tlsf.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_utl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "engines/e_capi.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "engines/e_padlock.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "fuzz/asn1.o" =>
@@ -9014,6 +8364,14 @@ our %unified_info = (
                 [
                     "include",
                 ],
+            "include/crypto/bn_conf.h" =>
+                [
+                    ".",
+                ],
+            "include/crypto/dso_conf.h" =>
+                [
+                    ".",
+                ],
             "include/openssl/opensslconf.h" =>
                 [
                     ".",
@@ -9258,7 +8616,6 @@ our %unified_info = (
                 [
                     ".",
                     "include",
-                    "crypto/include",
                 ],
             "test/asn1_string_table_test.o" =>
                 [
@@ -9584,7 +8941,6 @@ our %unified_info = (
                 [
                     ".",
                     "include",
-                    "crypto/include",
                 ],
             "test/cipher_overhead_test.o" =>
                 [
@@ -9630,7 +8986,6 @@ our %unified_info = (
             "test/ctype_internal_test.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "test/curve448_internal_test.o" =>
@@ -9696,7 +9051,6 @@ our %unified_info = (
                 [
                     "include",
                     "crypto/ec",
-                    "crypto/include",
                 ],
             "test/ecdsatest.o" =>
                 [
@@ -9721,7 +9075,6 @@ our %unified_info = (
             "test/evp_extra_test.o" =>
                 [
                     "include",
-                    "crypto/include",
                 ],
             "test/evp_test.o" =>
                 [
@@ -9819,7 +9172,6 @@ our %unified_info = (
                 [
                     ".",
                     "include",
-                    "crypto/include",
                 ],
             "test/rc2test.o" =>
                 [
@@ -9869,18 +9221,15 @@ our %unified_info = (
                 [
                     ".",
                     "include",
-                    "crypto/include",
                 ],
             "test/sm2_internal_test.o" =>
                 [
                     "include",
-                    "crypto/include",
                 ],
             "test/sm4_internal_test.o" =>
                 [
                     ".",
                     "include",
-                    "crypto/include",
                 ],
             "test/srptest.o" =>
                 [
@@ -9891,6 +9240,10 @@ our %unified_info = (
                     ".",
                     "include",
                 ],
+            "test/ssl_ctx_test.o" =>
+                [
+                    "include",
+                ],
             "test/ssl_test.o" =>
                 [
                     "include",
@@ -9954,10 +9307,6 @@ our %unified_info = (
                 [
                     "include",
                 ],
-            "test/testutil/init.o" =>
-                [
-                    "include",
-                ],
             "test/testutil/main.o" =>
                 [
                     "include",
@@ -9986,6 +9335,10 @@ our %unified_info = (
                 [
                     "include",
                 ],
+            "test/testutil/testutil_init.o" =>
+                [
+                    "include",
+                ],
             "test/threadstest.o" =>
                 [
                     "include",
@@ -10250,6 +9603,7 @@ our %unified_info = (
             "test/sm4_internal_test",
             "test/srptest",
             "test/ssl_cert_table_internal_test",
+            "test/ssl_ctx_test",
             "test/ssl_test",
             "test/ssl_test_ctx_test",
             "test/sslapitest",
@@ -15205,7 +14559,6 @@ our %unified_info = (
                     "test/testutil/cb.o",
                     "test/testutil/driver.o",
                     "test/testutil/format_output.o",
-                    "test/testutil/init.o",
                     "test/testutil/main.o",
                     "test/testutil/output_helpers.o",
                     "test/testutil/random.o",
@@ -15213,6 +14566,7 @@ our %unified_info = (
                     "test/testutil/tap_bio.o",
                     "test/testutil/test_cleanup.o",
                     "test/testutil/tests.o",
+                    "test/testutil/testutil_init.o",
                 ],
             "test/md2test" =>
                 [
@@ -15440,6 +14794,14 @@ our %unified_info = (
                 [
                     "test/ssl_cert_table_internal_test.c",
                 ],
+            "test/ssl_ctx_test" =>
+                [
+                    "test/ssl_ctx_test.o",
+                ],
+            "test/ssl_ctx_test.o" =>
+                [
+                    "test/ssl_ctx_test.c",
+                ],
             "test/ssl_test" =>
                 [
                     "test/handshake_helper.o",
@@ -15542,10 +14904,6 @@ our %unified_info = (
                 [
                     "test/testutil/format_output.c",
                 ],
-            "test/testutil/init.o" =>
-                [
-                    "test/testutil/init.c",
-                ],
             "test/testutil/main.o" =>
                 [
                     "test/testutil/main.c",
@@ -15574,6 +14932,10 @@ our %unified_info = (
                 [
                     "test/testutil/tests.c",
                 ],
+            "test/testutil/testutil_init.o" =>
+                [
+                    "test/testutil/testutil_init.c",
+                ],
             "test/threadstest" =>
                 [
                     "test/threadstest.o",
diff --git a/deps/openssl/config/archs/linux-armv4/asm_avx2/crypto/aes/aes-armv4.S b/deps/openssl/config/archs/linux-armv4/asm_avx2/crypto/aes/aes-armv4.S
index 4746b714ca..839663c841 100644
--- a/deps/openssl/config/archs/linux-armv4/asm_avx2/crypto/aes/aes-armv4.S
+++ b/deps/openssl/config/archs/linux-armv4/asm_avx2/crypto/aes/aes-armv4.S
@@ -1,4 +1,4 @@
-@ Copyright 2007-2018 The OpenSSL Project Authors. All Rights Reserved.
+@ Copyright 2007-2020 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
diff --git a/deps/openssl/config/archs/linux-armv4/asm_avx2/crypto/aes/bsaes-armv7.S b/deps/openssl/config/archs/linux-armv4/asm_avx2/crypto/aes/bsaes-armv7.S
index e05feb2cee..ef3992c9aa 100644
--- a/deps/openssl/config/archs/linux-armv4/asm_avx2/crypto/aes/bsaes-armv7.S
+++ b/deps/openssl/config/archs/linux-armv4/asm_avx2/crypto/aes/bsaes-armv7.S
@@ -1,4 +1,4 @@
-@ Copyright 2012-2018 The OpenSSL Project Authors. All Rights Reserved.
+@ Copyright 2012-2020 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
diff --git a/deps/openssl/config/archs/linux-armv4/asm_avx2/crypto/buildinf.h b/deps/openssl/config/archs/linux-armv4/asm_avx2/crypto/buildinf.h
index 3b9d482a1a..d1b2364759 100644
--- a/deps/openssl/config/archs/linux-armv4/asm_avx2/crypto/buildinf.h
+++ b/deps/openssl/config/archs/linux-armv4/asm_avx2/crypto/buildinf.h
@@ -11,7 +11,7 @@
  */
 
 #define PLATFORM "platform: linux-armv4"
-#define DATE "built on: Fri Sep 13 15:59:17 2019 UTC"
+#define DATE "built on: Wed Mar 18 21:06:14 2020 UTC"
 
 /*
  * Generate compiler_flags as an array of individual characters. This is a
diff --git a/deps/openssl/config/archs/linux-armv4/asm_avx2/crypto/ec/ecp_nistz256-armv4.S b/deps/openssl/config/archs/linux-armv4/asm_avx2/crypto/ec/ecp_nistz256-armv4.S
index d96f1c3399..63f850e6b9 100644
--- a/deps/openssl/config/archs/linux-armv4/asm_avx2/crypto/ec/ecp_nistz256-armv4.S
+++ b/deps/openssl/config/archs/linux-armv4/asm_avx2/crypto/ec/ecp_nistz256-armv4.S
@@ -3757,7 +3757,7 @@ ecp_nistz256_point_add:
 #endif
 	movne	r12,#-1
 	stmia	r3,{r4,r5,r6,r7,r8,r9,r10,r11}
-	str	r12,[sp,#32*18+8]	@ !in2infty
+	str	r12,[sp,#32*18+8]	@ ~in2infty
 
 	ldmia	r1!,{r4,r5,r6,r7,r8,r9,r10,r11}	@ copy in1_x
 	add	r3,sp,#96
@@ -3778,7 +3778,7 @@ ecp_nistz256_point_add:
 #endif
 	movne	r12,#-1
 	stmia	r3,{r4,r5,r6,r7,r8,r9,r10,r11}
-	str	r12,[sp,#32*18+4]	@ !in1infty
+	str	r12,[sp,#32*18+4]	@ ~in1infty
 
 	add	r1,sp,#256
 	add	r2,sp,#256
@@ -3843,33 +3843,20 @@ ecp_nistz256_point_add:
 	orr	r11,r11,r4
 	orr	r6,r6,r8
 	orr	r11,r11,r9
-	orrs	r11,r11,r6
+	orr	r11,r11,r6		@ ~is_equal(U1,U2)
 
-	bne	.Ladd_proceed		@ is_equal(U1,U2)?
+	ldr	r10,[sp,#32*18+4]	@ ~in1infty
+	ldr	r12,[sp,#32*18+8]	@ ~in2infty
+	ldr	r14,[sp,#32*18+12]	@ ~is_equal(S1,S2)
+	mvn	r10,r10			@ -1/0 -> 0/-1
+	mvn	r12,r12			@ -1/0 -> 0/-1
+	orr	r11,r10
+	orr	r11,r12
+	orrs	r11,r14			@ set flags
 
-	ldr	r10,[sp,#32*18+4]
-	ldr	r12,[sp,#32*18+8]
-	ldr	r14,[sp,#32*18+12]
-	tst	r10,r12
-	beq	.Ladd_proceed		@ (in1infty || in2infty)?
-	tst	r14,r14
-	beq	.Ladd_double		@ is_equal(S1,S2)?
+	@ if(~is_equal(U1,U2) | in1infty | in2infty | ~is_equal(S1,S2))
+	bne	.Ladd_proceed
 
-	ldr	r0,[sp,#32*18+16]
-	eor	r4,r4,r4
-	eor	r5,r5,r5
-	eor	r6,r6,r6
-	eor	r7,r7,r7
-	eor	r8,r8,r8
-	eor	r9,r9,r9
-	eor	r10,r10,r10
-	eor	r11,r11,r11
-	stmia	r0!,{r4,r5,r6,r7,r8,r9,r10,r11}
-	stmia	r0!,{r4,r5,r6,r7,r8,r9,r10,r11}
-	stmia	r0!,{r4,r5,r6,r7,r8,r9,r10,r11}
-	b	.Ladd_done
-
-.align	4
 .Ladd_double:
 	ldr	r1,[sp,#32*18+20]
 	add	sp,sp,#32*(18-5)+16	@ difference in frame sizes
@@ -3934,24 +3921,24 @@ ecp_nistz256_point_add:
 	add	r2,sp,#544
 	bl	__ecp_nistz256_sub_from	@ p256_sub(res_y, res_y, S2);
 
-	ldr	r11,[sp,#32*18+4]	@ !in1intfy
-	ldr	r12,[sp,#32*18+8]	@ !in2intfy
+	ldr	r11,[sp,#32*18+4]	@ ~in1infty
+	ldr	r12,[sp,#32*18+8]	@ ~in2infty
 	add	r1,sp,#0
 	add	r2,sp,#192
-	and	r10,r11,r12
+	and	r10,r11,r12		@ ~in1infty & ~in2infty
 	mvn	r11,r11
 	add	r3,sp,#96
-	and	r11,r11,r12
-	mvn	r12,r12
+	and	r11,r11,r12		@ in1infty & ~in2infty
+	mvn	r12,r12			@ in2infty
 	ldr	r0,[sp,#32*18+16]
 	ldmia	r1!,{r4,r5}		@ res_x
 	ldmia	r2!,{r6,r7}		@ in2_x
 	ldmia	r3!,{r8,r9}		@ in1_x
-	and	r4,r4,r10
+	and	r4,r4,r10		@ ~in1infty & ~in2infty
 	and	r5,r5,r10
-	and	r6,r6,r11
+	and	r6,r6,r11		@ in1infty & ~in2infty
 	and	r7,r7,r11
-	and	r8,r8,r12
+	and	r8,r8,r12		@ in2infty
 	and	r9,r9,r12
 	orr	r4,r4,r6
 	orr	r5,r5,r7
@@ -3961,11 +3948,11 @@ ecp_nistz256_point_add:
 	ldmia	r1!,{r4,r5}		@ res_x
 	ldmia	r2!,{r6,r7}		@ in2_x
 	ldmia	r3!,{r8,r9}		@ in1_x
-	and	r4,r4,r10
+	and	r4,r4,r10		@ ~in1infty & ~in2infty
 	and	r5,r5,r10
-	and	r6,r6,r11
+	and	r6,r6,r11		@ in1infty & ~in2infty
 	and	r7,r7,r11
-	and	r8,r8,r12
+	and	r8,r8,r12		@ in2infty
 	and	r9,r9,r12
 	orr	r4,r4,r6
 	orr	r5,r5,r7
@@ -3975,11 +3962,11 @@ ecp_nistz256_point_add:
 	ldmia	r1!,{r4,r5}		@ res_x
 	ldmia	r2!,{r6,r7}		@ in2_x
 	ldmia	r3!,{r8,r9}		@ in1_x
-	and	r4,r4,r10
+	and	r4,r4,r10		@ ~in1infty & ~in2infty
 	and	r5,r5,r10
-	and	r6,r6,r11
+	and	r6,r6,r11		@ in1infty & ~in2infty
 	and	r7,r7,r11
-	and	r8,r8,r12
+	and	r8,r8,r12		@ in2infty
 	and	r9,r9,r12
 	orr	r4,r4,r6
 	orr	r5,r5,r7
@@ -3989,11 +3976,11 @@ ecp_nistz256_point_add:
 	ldmia	r1!,{r4,r5}		@ res_x
 	ldmia	r2!,{r6,r7}		@ in2_x
 	ldmia	r3!,{r8,r9}		@ in1_x
-	and	r4,r4,r10
+	and	r4,r4,r10		@ ~in1infty & ~in2infty
 	and	r5,r5,r10
-	and	r6,r6,r11
+	and	r6,r6,r11		@ in1infty & ~in2infty
 	and	r7,r7,r11
-	and	r8,r8,r12
+	and	r8,r8,r12		@ in2infty
 	and	r9,r9,r12
 	orr	r4,r4,r6
 	orr	r5,r5,r7
@@ -4003,11 +3990,11 @@ ecp_nistz256_point_add:
 	ldmia	r1!,{r4,r5}		@ res_x
 	ldmia	r2!,{r6,r7}		@ in2_x
 	ldmia	r3!,{r8,r9}		@ in1_x
-	and	r4,r4,r10
+	and	r4,r4,r10		@ ~in1infty & ~in2infty
 	and	r5,r5,r10
-	and	r6,r6,r11
+	and	r6,r6,r11		@ in1infty & ~in2infty
 	and	r7,r7,r11
-	and	r8,r8,r12
+	and	r8,r8,r12		@ in2infty
 	and	r9,r9,r12
 	orr	r4,r4,r6
 	orr	r5,r5,r7
@@ -4017,11 +4004,11 @@ ecp_nistz256_point_add:
 	ldmia	r1!,{r4,r5}		@ res_x
 	ldmia	r2!,{r6,r7}		@ in2_x
 	ldmia	r3!,{r8,r9}		@ in1_x
-	and	r4,r4,r10
+	and	r4,r4,r10		@ ~in1infty & ~in2infty
 	and	r5,r5,r10
-	and	r6,r6,r11
+	and	r6,r6,r11		@ in1infty & ~in2infty
 	and	r7,r7,r11
-	and	r8,r8,r12
+	and	r8,r8,r12		@ in2infty
 	and	r9,r9,r12
 	orr	r4,r4,r6
 	orr	r5,r5,r7
@@ -4031,11 +4018,11 @@ ecp_nistz256_point_add:
 	ldmia	r1!,{r4,r5}		@ res_x
 	ldmia	r2!,{r6,r7}		@ in2_x
 	ldmia	r3!,{r8,r9}		@ in1_x
-	and	r4,r4,r10
+	and	r4,r4,r10		@ ~in1infty & ~in2infty
 	and	r5,r5,r10
-	and	r6,r6,r11
+	and	r6,r6,r11		@ in1infty & ~in2infty
 	and	r7,r7,r11
-	and	r8,r8,r12
+	and	r8,r8,r12		@ in2infty
 	and	r9,r9,r12
 	orr	r4,r4,r6
 	orr	r5,r5,r7
@@ -4045,11 +4032,11 @@ ecp_nistz256_point_add:
 	ldmia	r1!,{r4,r5}		@ res_x
 	ldmia	r2!,{r6,r7}		@ in2_x
 	ldmia	r3!,{r8,r9}		@ in1_x
-	and	r4,r4,r10
+	and	r4,r4,r10		@ ~in1infty & ~in2infty
 	and	r5,r5,r10
-	and	r6,r6,r11
+	and	r6,r6,r11		@ in1infty & ~in2infty
 	and	r7,r7,r11
-	and	r8,r8,r12
+	and	r8,r8,r12		@ in2infty
 	and	r9,r9,r12
 	orr	r4,r4,r6
 	orr	r5,r5,r7
@@ -4059,11 +4046,11 @@ ecp_nistz256_point_add:
 	ldmia	r1!,{r4,r5}		@ res_x
 	ldmia	r2!,{r6,r7}		@ in2_x
 	ldmia	r3!,{r8,r9}		@ in1_x
-	and	r4,r4,r10
+	and	r4,r4,r10		@ ~in1infty & ~in2infty
 	and	r5,r5,r10
-	and	r6,r6,r11
+	and	r6,r6,r11		@ in1infty & ~in2infty
 	and	r7,r7,r11
-	and	r8,r8,r12
+	and	r8,r8,r12		@ in2infty
 	and	r9,r9,r12
 	orr	r4,r4,r6
 	orr	r5,r5,r7
@@ -4073,11 +4060,11 @@ ecp_nistz256_point_add:
 	ldmia	r1!,{r4,r5}		@ res_x
 	ldmia	r2!,{r6,r7}		@ in2_x
 	ldmia	r3!,{r8,r9}		@ in1_x
-	and	r4,r4,r10
+	and	r4,r4,r10		@ ~in1infty & ~in2infty
 	and	r5,r5,r10
-	and	r6,r6,r11
+	and	r6,r6,r11		@ in1infty & ~in2infty
 	and	r7,r7,r11
-	and	r8,r8,r12
+	and	r8,r8,r12		@ in2infty
 	and	r9,r9,r12
 	orr	r4,r4,r6
 	orr	r5,r5,r7
@@ -4087,11 +4074,11 @@ ecp_nistz256_point_add:
 	ldmia	r1!,{r4,r5}		@ res_x
 	ldmia	r2!,{r6,r7}		@ in2_x
 	ldmia	r3!,{r8,r9}		@ in1_x
-	and	r4,r4,r10
+	and	r4,r4,r10		@ ~in1infty & ~in2infty
 	and	r5,r5,r10
-	and	r6,r6,r11
+	and	r6,r6,r11		@ in1infty & ~in2infty
 	and	r7,r7,r11
-	and	r8,r8,r12
+	and	r8,r8,r12		@ in2infty
 	and	r9,r9,r12
 	orr	r4,r4,r6
 	orr	r5,r5,r7
@@ -4101,11 +4088,11 @@ ecp_nistz256_point_add:
 	ldmia	r1!,{r4,r5}		@ res_x
 	ldmia	r2!,{r6,r7}		@ in2_x
 	ldmia	r3!,{r8,r9}		@ in1_x
-	and	r4,r4,r10
+	and	r4,r4,r10		@ ~in1infty & ~in2infty
 	and	r5,r5,r10
-	and	r6,r6,r11
+	and	r6,r6,r11		@ in1infty & ~in2infty
 	and	r7,r7,r11
-	and	r8,r8,r12
+	and	r8,r8,r12		@ in2infty
 	and	r9,r9,r12
 	orr	r4,r4,r6
 	orr	r5,r5,r7
@@ -4147,7 +4134,7 @@ ecp_nistz256_point_add_affine:
 #endif
 	movne	r12,#-1
 	stmia	r3,{r4,r5,r6,r7,r8,r9,r10,r11}
-	str	r12,[sp,#32*15+4]	@ !in1infty
+	str	r12,[sp,#32*15+4]	@ ~in1infty
 
 	ldmia	r2!,{r4,r5,r6,r7,r8,r9,r10,r11}	@ copy in2_x
 	add	r3,sp,#192
@@ -4174,7 +4161,7 @@ ecp_nistz256_point_add_affine:
 	it	ne
 #endif
 	movne	r12,#-1
-	str	r12,[sp,#32*15+8]	@ !in2infty
+	str	r12,[sp,#32*15+8]	@ ~in2infty
 
 	add	r1,sp,#160
 	add	r2,sp,#160
@@ -4256,24 +4243,24 @@ ecp_nistz256_point_add_affine:
 	add	r2,sp,#288
 	bl	__ecp_nistz256_sub_from	@ p256_sub(res_y, res_y, S2);
 
-	ldr	r11,[sp,#32*15+4]	@ !in1intfy
-	ldr	r12,[sp,#32*15+8]	@ !in2intfy
+	ldr	r11,[sp,#32*15+4]	@ ~in1infty
+	ldr	r12,[sp,#32*15+8]	@ ~in2infty
 	add	r1,sp,#0
 	add	r2,sp,#192
-	and	r10,r11,r12
+	and	r10,r11,r12		@ ~in1infty & ~in2infty
 	mvn	r11,r11
 	add	r3,sp,#96
-	and	r11,r11,r12
-	mvn	r12,r12
+	and	r11,r11,r12		@ in1infty & ~in2infty
+	mvn	r12,r12			@ in2infty
 	ldr	r0,[sp,#32*15]
 	ldmia	r1!,{r4,r5}		@ res_x
 	ldmia	r2!,{r6,r7}		@ in2_x
 	ldmia	r3!,{r8,r9}		@ in1_x
-	and	r4,r4,r10
+	and	r4,r4,r10		@ ~in1infty & ~in2infty
 	and	r5,r5,r10
-	and	r6,r6,r11
+	and	r6,r6,r11		@ in1infty & ~in2infty
 	and	r7,r7,r11
-	and	r8,r8,r12
+	and	r8,r8,r12		@ in2infty
 	and	r9,r9,r12
 	orr	r4,r4,r6
 	orr	r5,r5,r7
@@ -4283,11 +4270,11 @@ ecp_nistz256_point_add_affine:
 	ldmia	r1!,{r4,r5}		@ res_x
 	ldmia	r2!,{r6,r7}		@ in2_x
 	ldmia	r3!,{r8,r9}		@ in1_x
-	and	r4,r4,r10
+	and	r4,r4,r10		@ ~in1infty & ~in2infty
 	and	r5,r5,r10
-	and	r6,r6,r11
+	and	r6,r6,r11		@ in1infty & ~in2infty
 	and	r7,r7,r11
-	and	r8,r8,r12
+	and	r8,r8,r12		@ in2infty
 	and	r9,r9,r12
 	orr	r4,r4,r6
 	orr	r5,r5,r7
@@ -4297,11 +4284,11 @@ ecp_nistz256_point_add_affine:
 	ldmia	r1!,{r4,r5}		@ res_x
 	ldmia	r2!,{r6,r7}		@ in2_x
 	ldmia	r3!,{r8,r9}		@ in1_x
-	and	r4,r4,r10
+	and	r4,r4,r10		@ ~in1infty & ~in2infty
 	and	r5,r5,r10
-	and	r6,r6,r11
+	and	r6,r6,r11		@ in1infty & ~in2infty
 	and	r7,r7,r11
-	and	r8,r8,r12
+	and	r8,r8,r12		@ in2infty
 	and	r9,r9,r12
 	orr	r4,r4,r6
 	orr	r5,r5,r7
@@ -4311,11 +4298,11 @@ ecp_nistz256_point_add_affine:
 	ldmia	r1!,{r4,r5}		@ res_x
 	ldmia	r2!,{r6,r7}		@ in2_x
 	ldmia	r3!,{r8,r9}		@ in1_x
-	and	r4,r4,r10
+	and	r4,r4,r10		@ ~in1infty & ~in2infty
 	and	r5,r5,r10
-	and	r6,r6,r11
+	and	r6,r6,r11		@ in1infty & ~in2infty
 	and	r7,r7,r11
-	and	r8,r8,r12
+	and	r8,r8,r12		@ in2infty
 	and	r9,r9,r12
 	orr	r4,r4,r6
 	orr	r5,r5,r7
@@ -4325,11 +4312,11 @@ ecp_nistz256_point_add_affine:
 	ldmia	r1!,{r4,r5}		@ res_x
 	ldmia	r2!,{r6,r7}		@ in2_x
 	ldmia	r3!,{r8,r9}		@ in1_x
-	and	r4,r4,r10
+	and	r4,r4,r10		@ ~in1infty & ~in2infty
 	and	r5,r5,r10
-	and	r6,r6,r11
+	and	r6,r6,r11		@ in1infty & ~in2infty
 	and	r7,r7,r11
-	and	r8,r8,r12
+	and	r8,r8,r12		@ in2infty
 	and	r9,r9,r12
 	orr	r4,r4,r6
 	orr	r5,r5,r7
@@ -4339,11 +4326,11 @@ ecp_nistz256_point_add_affine:
 	ldmia	r1!,{r4,r5}		@ res_x
 	ldmia	r2!,{r6,r7}		@ in2_x
 	ldmia	r3!,{r8,r9}		@ in1_x
-	and	r4,r4,r10
+	and	r4,r4,r10		@ ~in1infty & ~in2infty
 	and	r5,r5,r10
-	and	r6,r6,r11
+	and	r6,r6,r11		@ in1infty & ~in2infty
 	and	r7,r7,r11
-	and	r8,r8,r12
+	and	r8,r8,r12		@ in2infty
 	and	r9,r9,r12
 	orr	r4,r4,r6
 	orr	r5,r5,r7
@@ -4353,11 +4340,11 @@ ecp_nistz256_point_add_affine:
 	ldmia	r1!,{r4,r5}		@ res_x
 	ldmia	r2!,{r6,r7}		@ in2_x
 	ldmia	r3!,{r8,r9}		@ in1_x
-	and	r4,r4,r10
+	and	r4,r4,r10		@ ~in1infty & ~in2infty
 	and	r5,r5,r10
-	and	r6,r6,r11
+	and	r6,r6,r11		@ in1infty & ~in2infty
 	and	r7,r7,r11
-	and	r8,r8,r12
+	and	r8,r8,r12		@ in2infty
 	and	r9,r9,r12
 	orr	r4,r4,r6
 	orr	r5,r5,r7
@@ -4367,11 +4354,11 @@ ecp_nistz256_point_add_affine:
 	ldmia	r1!,{r4,r5}		@ res_x
 	ldmia	r2!,{r6,r7}		@ in2_x
 	ldmia	r3!,{r8,r9}		@ in1_x
-	and	r4,r4,r10
+	and	r4,r4,r10		@ ~in1infty & ~in2infty
 	and	r5,r5,r10
-	and	r6,r6,r11
+	and	r6,r6,r11		@ in1infty & ~in2infty
 	and	r7,r7,r11
-	and	r8,r8,r12
+	and	r8,r8,r12		@ in2infty
 	and	r9,r9,r12
 	orr	r4,r4,r6
 	orr	r5,r5,r7
diff --git a/deps/openssl/config/archs/linux-armv4/asm_avx2/crypto/include/internal/bn_conf.h b/deps/openssl/config/archs/linux-armv4/asm_avx2/crypto/include/internal/bn_conf.h
index fb52156bd0..459055c96f 100644
--- a/deps/openssl/config/archs/linux-armv4/asm_avx2/crypto/include/internal/bn_conf.h
+++ b/deps/openssl/config/archs/linux-armv4/asm_avx2/crypto/include/internal/bn_conf.h
@@ -1,5 +1,5 @@
 /* WARNING: do not edit! */
-/* Generated by Makefile from crypto/include/internal/bn_conf.h.in */
+/* Generated by Makefile from include/crypto/bn_conf.h.in */
 /*
  * Copyright 2016 The OpenSSL Project Authors. All Rights Reserved.
  *
@@ -9,8 +9,8 @@
  * https://www.openssl.org/source/license.html
  */
 
-#ifndef HEADER_BN_CONF_H
-# define HEADER_BN_CONF_H
+#ifndef OSSL_CRYPTO_BN_CONF_H
+# define OSSL_CRYPTO_BN_CONF_H
 
 /*
  * The contents of this file are not used in the UEFI build, as
diff --git a/deps/openssl/config/archs/linux-armv4/asm_avx2/crypto/include/internal/dso_conf.h b/deps/openssl/config/archs/linux-armv4/asm_avx2/crypto/include/internal/dso_conf.h
index 252266ec2a..4b1167c3d8 100644
--- a/deps/openssl/config/archs/linux-armv4/asm_avx2/crypto/include/internal/dso_conf.h
+++ b/deps/openssl/config/archs/linux-armv4/asm_avx2/crypto/include/internal/dso_conf.h
@@ -1,5 +1,5 @@
 /* WARNING: do not edit! */
-/* Generated by Makefile from crypto/include/internal/dso_conf.h.in */
+/* Generated by Makefile from include/crypto/dso_conf.h.in */
 /*
  * Copyright 2016-2019 The OpenSSL Project Authors. All Rights Reserved.
  *
@@ -9,8 +9,8 @@
  * https://www.openssl.org/source/license.html
  */
 
-#ifndef HEADER_DSO_CONF_H
-# define HEADER_DSO_CONF_H
+#ifndef OSSL_CRYPTO_DSO_CONF_H
+# define OSSL_CRYPTO_DSO_CONF_H
 # define DSO_DLFCN
 # define HAVE_DLFCN_H
 # define DSO_EXTENSION ".so"
diff --git a/deps/openssl/config/archs/linux-armv4/asm_avx2/crypto/sha/sha256-armv4.S b/deps/openssl/config/archs/linux-armv4/asm_avx2/crypto/sha/sha256-armv4.S
index 3efcde6b6e..12c44793de 100644
--- a/deps/openssl/config/archs/linux-armv4/asm_avx2/crypto/sha/sha256-armv4.S
+++ b/deps/openssl/config/archs/linux-armv4/asm_avx2/crypto/sha/sha256-armv4.S
@@ -1,4 +1,4 @@
-@ Copyright 2007-2018 The OpenSSL Project Authors. All Rights Reserved.
+@ Copyright 2007-2020 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
diff --git a/deps/openssl/config/archs/linux-armv4/asm_avx2/crypto/sha/sha512-armv4.S b/deps/openssl/config/archs/linux-armv4/asm_avx2/crypto/sha/sha512-armv4.S
index 1e2fbf6350..7c28e37a6f 100644
--- a/deps/openssl/config/archs/linux-armv4/asm_avx2/crypto/sha/sha512-armv4.S
+++ b/deps/openssl/config/archs/linux-armv4/asm_avx2/crypto/sha/sha512-armv4.S
@@ -1,4 +1,4 @@
-@ Copyright 2007-2018 The OpenSSL Project Authors. All Rights Reserved.
+@ Copyright 2007-2020 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
diff --git a/deps/openssl/config/archs/linux-armv4/asm_avx2/include/openssl/opensslconf.h b/deps/openssl/config/archs/linux-armv4/asm_avx2/include/openssl/opensslconf.h
index 1a2b31bdc7..71c4fecc40 100644
--- a/deps/openssl/config/archs/linux-armv4/asm_avx2/include/openssl/opensslconf.h
+++ b/deps/openssl/config/archs/linux-armv4/asm_avx2/include/openssl/opensslconf.h
@@ -96,9 +96,6 @@ extern "C" {
 #ifndef OPENSSL_NO_DYNAMIC_ENGINE
 # define OPENSSL_NO_DYNAMIC_ENGINE
 #endif
-#ifndef OPENSSL_NO_AFALGENG
-# define OPENSSL_NO_AFALGENG
-#endif
 
 
 /*
diff --git a/deps/openssl/config/archs/linux-armv4/asm_avx2/include/progs.h b/deps/openssl/config/archs/linux-armv4/asm_avx2/include/progs.h
index 9b3d270e20..308c65601b 100644
--- a/deps/openssl/config/archs/linux-armv4/asm_avx2/include/progs.h
+++ b/deps/openssl/config/archs/linux-armv4/asm_avx2/include/progs.h
@@ -2,7 +2,7 @@
  * WARNING: do not edit!
  * Generated by apps/progs.pl
  *
- * Copyright 1995-2019 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 1995-2020 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
diff --git a/deps/openssl/config/archs/linux-armv4/no-asm/configdata.pm b/deps/openssl/config/archs/linux-armv4/no-asm/configdata.pm
index 9603f342e7..c1fb4d9a7e 100644
--- a/deps/openssl/config/archs/linux-armv4/no-asm/configdata.pm
+++ b/deps/openssl/config/archs/linux-armv4/no-asm/configdata.pm
@@ -55,7 +55,7 @@ our %config = (
   minor => "1.1",
   openssl_algorithm_defines => [ "OPENSSL_NO_COMP", "OPENSSL_NO_MD2", "OPENSSL_NO_RC5" ],
   openssl_api_defines => [  ],
-  openssl_other_defines => [ "OPENSSL_RAND_SEED_OS", "OPENSSL_NO_AFALGENG", "OPENSSL_NO_ASAN", "OPENSSL_NO_ASM", "OPENSSL_NO_CRYPTO_MDEBUG", "OPENSSL_NO_CRYPTO_MDEBUG_BACKTRACE", "OPENSSL_NO_DEVCRYPTOENG", "OPENSSL_NO_EC_NISTP_64_GCC_128", "OPENSSL_NO_EGD", "OPENSSL_NO_EXTERNAL_TESTS", "OPENSSL_NO_FUZZ_AFL", "OPENSSL_NO_FUZZ_LIBFUZZER", "OPENSSL_NO_HEARTBEATS", "OPENSSL_NO_MSAN", "OPENSSL_NO_SCTP", "OPENSSL_NO_SSL3", "OPENSSL_NO_SSL3_METHOD", "OPENSSL_NO_UBSAN", "OPENSSL_NO_UNIT_TEST", "OPENSSL_NO_WEAK_SSL_CIPHERS", "OPENSSL_NO_DYNAMIC_ENGINE", "OPENSSL_NO_AFALGENG" ],
+  openssl_other_defines => [ "OPENSSL_RAND_SEED_OS", "OPENSSL_NO_AFALGENG", "OPENSSL_NO_ASAN", "OPENSSL_NO_ASM", "OPENSSL_NO_CRYPTO_MDEBUG", "OPENSSL_NO_CRYPTO_MDEBUG_BACKTRACE", "OPENSSL_NO_DEVCRYPTOENG", "OPENSSL_NO_EC_NISTP_64_GCC_128", "OPENSSL_NO_EGD", "OPENSSL_NO_EXTERNAL_TESTS", "OPENSSL_NO_FUZZ_AFL", "OPENSSL_NO_FUZZ_LIBFUZZER", "OPENSSL_NO_HEARTBEATS", "OPENSSL_NO_MSAN", "OPENSSL_NO_SCTP", "OPENSSL_NO_SSL3", "OPENSSL_NO_SSL3_METHOD", "OPENSSL_NO_UBSAN", "OPENSSL_NO_UNIT_TEST", "OPENSSL_NO_WEAK_SSL_CIPHERS", "OPENSSL_NO_DYNAMIC_ENGINE" ],
   openssl_sys_defines => [  ],
   openssl_thread_defines => [ "OPENSSL_THREADS" ],
   openssldir => "",
@@ -111,8 +111,8 @@ our %config = (
   sourcedir => ".",
   target => "linux-armv4",
   tdirs => [ "ossl_shim" ],
-  version => "1.1.1d",
-  version_num => "0x1010104fL",
+  version => "1.1.1e",
+  version_num => "0x1010105fL",
 );
 
 our %target = (
@@ -237,6 +237,7 @@ our @disablables = (
   "dgram",
   "dh",
   "dsa",
+  "dso",
   "dtls",
   "dynamic-engine",
   "ec",
@@ -355,8 +356,8 @@ our %unified_info = (
         {
             "" =>
                 [
-                    "crypto/include/internal/bn_conf.h",
-                    "crypto/include/internal/dso_conf.h",
+                    "include/crypto/bn_conf.h",
+                    "include/crypto/dso_conf.h",
                     "include/openssl/opensslconf.h",
                 ],
             "apps/asn1pars.o" =>
@@ -624,14 +625,6 @@ our %unified_info = (
                     "crypto/perlasm/cbc.pl",
                     "crypto/perlasm/x86asm.pl",
                 ],
-            "crypto/include/internal/bn_conf.h" =>
-                [
-                    "configdata.pm",
-                ],
-            "crypto/include/internal/dso_conf.h" =>
-                [
-                    "configdata.pm",
-                ],
             "crypto/rc4/rc4-586.s" =>
                 [
                     "crypto/perlasm/x86asm.pl",
@@ -707,6 +700,14 @@ our %unified_info = (
                 [
                     "libcrypto",
                 ],
+            "include/crypto/bn_conf.h" =>
+                [
+                    "configdata.pm",
+                ],
+            "include/crypto/dso_conf.h" =>
+                [
+                    "configdata.pm",
+                ],
             "include/openssl/opensslconf.h" =>
                 [
                     "configdata.pm",
@@ -1504,6 +1505,12 @@ our %unified_info = (
                     "libcrypto",
                     "test/libtestutil.a",
                 ],
+            "test/ssl_ctx_test" =>
+                [
+                    "libcrypto",
+                    "libssl",
+                    "test/libtestutil.a",
+                ],
             "test/ssl_test" =>
                 [
                     "libcrypto",
@@ -3222,7 +3229,6 @@ our %unified_info = (
                             "test/testutil/cb.o",
                             "test/testutil/driver.o",
                             "test/testutil/format_output.o",
-                            "test/testutil/init.o",
                             "test/testutil/main.o",
                             "test/testutil/output_helpers.o",
                             "test/testutil/random.o",
@@ -3230,6 +3236,7 @@ our %unified_info = (
                             "test/testutil/tap_bio.o",
                             "test/testutil/test_cleanup.o",
                             "test/testutil/tests.o",
+                            "test/testutil/testutil_init.o",
                         ],
                     "products" =>
                         {
@@ -3728,14 +3735,6 @@ our %unified_info = (
                 [
                     "crypto/ia64cpuid.S",
                 ],
-            "crypto/include/internal/bn_conf.h" =>
-                [
-                    "crypto/include/internal/bn_conf.h.in",
-                ],
-            "crypto/include/internal/dso_conf.h" =>
-                [
-                    "crypto/include/internal/dso_conf.h.in",
-                ],
             "crypto/md5/md5-586.s" =>
                 [
                     "crypto/md5/asm/md5-586.pl",
@@ -4176,6 +4175,14 @@ our %unified_info = (
                     "engines/asm/e_padlock-x86_64.pl",
                     "\$(PERLASM_SCHEME)",
                 ],
+            "include/crypto/bn_conf.h" =>
+                [
+                    "include/crypto/bn_conf.h.in",
+                ],
+            "include/crypto/dso_conf.h" =>
+                [
+                    "include/crypto/dso_conf.h.in",
+                ],
             "include/openssl/opensslconf.h" =>
                 [
                     "include/openssl/opensslconf.h.in",
@@ -4870,49 +4877,41 @@ our %unified_info = (
             "crypto/aes/aes_cbc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/aes/aes_cfb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/aes/aes_core.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/aes/aes_ecb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/aes/aes_ige.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/aes/aes_misc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/aes/aes_ofb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/aes/aes_wrap.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/aes/aesfx-sparcv9.o" =>
@@ -4934,7 +4933,6 @@ our %unified_info = (
             "crypto/aria/aria.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/arm64cpuid.o" =>
@@ -4948,613 +4946,511 @@ our %unified_info = (
             "crypto/asn1/a_bitstr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_d2i_fp.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_digest.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_dup.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_gentm.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_i2d_fp.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_int.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_mbstr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_object.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_octet.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_print.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_sign.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_strex.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_strnid.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_time.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_type.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_utctm.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_utf8.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_verify.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/ameth_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/asn1_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/asn1_gen.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/asn1_item_list.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/asn1_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/asn1_par.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/asn_mime.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/asn_moid.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/asn_mstbl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/asn_pack.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/bio_asn1.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/bio_ndef.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/d2i_pr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/d2i_pu.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/evp_asn1.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/f_int.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/f_string.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/i2d_pr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/i2d_pu.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/n_pkey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/nsseq.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/p5_pbe.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/p5_pbev2.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/p5_scrypt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/p8_pkey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/t_bitst.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/t_pkey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/t_spki.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/tasn_dec.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/tasn_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/tasn_fre.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/tasn_new.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/tasn_prn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/tasn_scn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/tasn_typ.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/tasn_utl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/x_algor.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/x_bignum.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/x_info.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/x_int64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/x_long.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/x_pkey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/x_sig.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/x_spki.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/x_val.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/async/arch/async_null.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/async/arch/async_posix.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/async/arch/async_win.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/async/async.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/async/async_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/async/async_wait.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bf/bf_cfb64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bf/bf_ecb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bf/bf_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bf/bf_ofb64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bf/bf_skey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/b_addr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/b_dump.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/b_print.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/b_sock.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/b_sock2.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bf_buff.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bf_lbuf.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bf_nbio.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bf_null.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bio_cb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bio_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bio_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bio_meth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bss_acpt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bss_bio.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bss_conn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bss_dgram.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bss_fd.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bss_file.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bss_log.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bss_mem.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bss_null.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bss_sock.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/blake2/blake2b.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/blake2/blake2s.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/blake2/m_blake2b.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/blake2/m_blake2s.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/armv4-gf2m.o" =>
@@ -5572,188 +5468,157 @@ our %unified_info = (
             "crypto/bn/bn_add.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_asm.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_blind.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_const.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_ctx.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_depr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_dh.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_div.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_exp.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto",
                 ],
             "crypto/bn/bn_exp2.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_gcd.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_gf2m.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_intern.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_kron.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_mod.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_mont.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_mpi.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_mul.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_nist.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_prime.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_print.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_rand.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_recp.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_shift.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_sqr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_sqrt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_srp.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_word.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_x931p.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/mips-mont.o" =>
@@ -5783,13 +5648,11 @@ our %unified_info = (
             "crypto/buffer/buf_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/buffer/buffer.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/buildinf.h" =>
@@ -5799,43 +5662,36 @@ our %unified_info = (
             "crypto/camellia/camellia.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/camellia/cmll_cbc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/camellia/cmll_cfb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/camellia/cmll_ctr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/camellia/cmll_ecb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/camellia/cmll_misc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/camellia/cmll_ofb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/camellia/cmllt4-sparcv9.o" =>
@@ -5845,31 +5701,26 @@ our %unified_info = (
             "crypto/cast/c_cfb64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cast/c_ecb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cast/c_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cast/c_ofb64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cast/c_skey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/chacha/chacha-armv4.o" =>
@@ -5887,278 +5738,232 @@ our %unified_info = (
             "crypto/chacha/chacha_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cmac/cm_ameth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cmac/cm_pmeth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cmac/cmac.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_asn1.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_att.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_cd.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_dd.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_env.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_ess.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_io.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_kari.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_pwri.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_sd.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_smime.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/conf/conf_api.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/conf/conf_def.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/conf/conf_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/conf/conf_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/conf/conf_mall.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/conf/conf_mod.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/conf/conf_sap.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/conf/conf_ssl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cpt_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cryptlib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ct/ct_b64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ct/ct_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ct/ct_log.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ct/ct_oct.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ct/ct_policy.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ct/ct_prn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ct/ct_sct.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ct/ct_sct_ctx.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ct/ct_vfy.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ct/ct_x509v3.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ctype.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cversion.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto",
                 ],
             "crypto/des/cbc_cksm.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/cbc_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/cfb64ede.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/cfb64enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/cfb_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/des_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/dest4-sparcv9.o" =>
@@ -6168,301 +5973,251 @@ our %unified_info = (
             "crypto/des/ecb3_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/ecb_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/fcrypt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/fcrypt_b.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/ofb64ede.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/ofb64enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/ofb_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/pcbc_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/qud_cksm.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/rand_key.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/set_key.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/str2key.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/xcbc_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_ameth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_asn1.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_check.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_depr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_gen.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_kdf.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_key.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_meth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_pmeth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_prn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_rfc5114.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_rfc7919.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dsa/dsa_ameth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dsa/dsa_asn1.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dsa/dsa_depr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dsa/dsa_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dsa/dsa_gen.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dsa/dsa_key.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dsa/dsa_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dsa/dsa_meth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dsa/dsa_ossl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dsa/dsa_pmeth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dsa/dsa_prn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dsa/dsa_sign.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dsa/dsa_vrf.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dso/dso_dl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dso/dso_dlfcn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dso/dso_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dso/dso_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dso/dso_openssl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dso/dso_vms.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dso/dso_win32.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ebcdic.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/curve25519.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/curve448/arch_32/f_impl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto/ec/curve448/arch_32",
                     "crypto/ec/curve448",
@@ -6470,7 +6225,6 @@ our %unified_info = (
             "crypto/ec/curve448/curve448.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto/ec/curve448/arch_32",
                     "crypto/ec/curve448",
@@ -6478,7 +6232,6 @@ our %unified_info = (
             "crypto/ec/curve448/curve448_tables.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto/ec/curve448/arch_32",
                     "crypto/ec/curve448",
@@ -6486,7 +6239,6 @@ our %unified_info = (
             "crypto/ec/curve448/eddsa.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto/ec/curve448/arch_32",
                     "crypto/ec/curve448",
@@ -6494,7 +6246,6 @@ our %unified_info = (
             "crypto/ec/curve448/f_generic.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto/ec/curve448/arch_32",
                     "crypto/ec/curve448",
@@ -6502,7 +6253,6 @@ our %unified_info = (
             "crypto/ec/curve448/scalar.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto/ec/curve448/arch_32",
                     "crypto/ec/curve448",
@@ -6510,163 +6260,136 @@ our %unified_info = (
             "crypto/ec/ec2_oct.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec2_smpl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec_ameth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec_asn1.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec_check.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec_curve.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec_cvt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec_key.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec_kmeth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec_mult.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec_oct.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec_pmeth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec_print.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecdh_kdf.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecdh_ossl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecdsa_ossl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecdsa_sign.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecdsa_vrf.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/eck_prn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecp_mont.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecp_nist.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecp_nistp224.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecp_nistp256.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecp_nistp521.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecp_nistputil.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecp_nistz256-armv4.o" =>
@@ -6684,223 +6407,186 @@ our %unified_info = (
             "crypto/ec/ecp_oct.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecp_smpl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecx_meth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/eng_all.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/eng_cnf.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/eng_ctrl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/eng_dyn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/eng_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/eng_fat.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/eng_init.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/eng_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/eng_list.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/eng_openssl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/eng_pkey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/eng_rdrand.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/eng_table.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/tb_asnmth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/tb_cipher.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/tb_dh.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/tb_digest.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/tb_dsa.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/tb_eckey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/tb_pkmeth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/tb_rand.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/tb_rsa.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/err/err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/err/err_all.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/err/err_prn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/bio_b64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/bio_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/bio_md.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/bio_ok.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/c_allc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/c_alld.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/cmeth_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/digest.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/e_aes.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto",
                     "crypto/modes",
@@ -6908,21 +6594,18 @@ our %unified_info = (
             "crypto/evp/e_aes_cbc_hmac_sha1.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto/modes",
                 ],
             "crypto/evp/e_aes_cbc_hmac_sha256.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto/modes",
                 ],
             "crypto/evp/e_aria.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto",
                     "crypto/modes",
@@ -6930,13 +6613,11 @@ our %unified_info = (
             "crypto/evp/e_bf.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/e_camellia.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto",
                     "crypto/modes",
@@ -6944,81 +6625,68 @@ our %unified_info = (
             "crypto/evp/e_cast.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/e_chacha20_poly1305.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/e_des.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto",
                 ],
             "crypto/evp/e_des3.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto",
                 ],
             "crypto/evp/e_idea.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/e_null.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/e_old.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/e_rc2.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/e_rc4.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/e_rc4_hmac_md5.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/e_rc5.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/e_seed.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/e_sm4.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto",
                     "crypto/modes",
@@ -7026,328 +6694,267 @@ our %unified_info = (
             "crypto/evp/e_xcbc_d.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/encode.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/evp_cnf.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/evp_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/evp_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/evp_key.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/evp_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/evp_pbe.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/evp_pkey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/m_md2.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/m_md4.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/m_md5.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/m_md5_sha1.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/m_mdc2.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/m_null.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/m_ripemd.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/m_sha1.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/m_sha3.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto",
                 ],
             "crypto/evp/m_sigver.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/m_wp.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/names.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/p5_crpt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/p5_crpt2.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/p_dec.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/p_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/p_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/p_open.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/p_seal.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/p_sign.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/p_verify.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/pbe_scrypt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/pmeth_fn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/pmeth_gn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/pmeth_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ex_data.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/getenv.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/hmac/hm_ameth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/hmac/hm_pmeth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/hmac/hmac.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/idea/i_cbc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/idea/i_cfb64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/idea/i_ecb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/idea/i_ofb64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/idea/i_skey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
-            "crypto/include/internal/bn_conf.h" =>
-                [
-                    ".",
-                ],
-            "crypto/include/internal/dso_conf.h" =>
-                [
-                    ".",
-                ],
             "crypto/init.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/kdf/hkdf.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/kdf/kdf_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/kdf/scrypt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/kdf/tls1_prf.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/lhash/lh_stats.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/lhash/lhash.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/md4/md4_dgst.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/md4/md4_one.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/md5/md5-sparcv9.o" =>
@@ -7357,85 +6964,71 @@ our %unified_info = (
             "crypto/md5/md5_dgst.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/md5/md5_one.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/mdc2/mdc2_one.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/mdc2/mdc2dgst.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/mem.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/mem_clr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/mem_dbg.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/mem_sec.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/modes/cbc128.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/modes/ccm128.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/modes/cfb128.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/modes/ctr128.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/modes/cts128.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/modes/gcm128.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto",
                 ],
@@ -7458,361 +7051,301 @@ our %unified_info = (
             "crypto/modes/ocb128.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/modes/ofb128.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/modes/wrap128.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/modes/xts128.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/o_dir.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/o_fips.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/o_fopen.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/o_init.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/o_str.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/o_time.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/objects/o_names.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/objects/obj_dat.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/objects/obj_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/objects/obj_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/objects/obj_xref.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ocsp/ocsp_asn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ocsp/ocsp_cl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ocsp/ocsp_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ocsp/ocsp_ext.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ocsp/ocsp_ht.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ocsp/ocsp_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ocsp/ocsp_prn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ocsp/ocsp_srv.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ocsp/ocsp_vfy.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ocsp/v3_ocsp.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pem/pem_all.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pem/pem_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pem/pem_info.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pem/pem_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pem/pem_oth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pem/pem_pk8.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pem/pem_pkey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pem/pem_sign.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pem/pem_x509.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pem/pem_xaux.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pem/pvkfmt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_add.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_asn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_attr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_crpt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_crt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_decr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_init.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_key.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_kiss.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_mutl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_npas.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_p8d.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_p8e.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_sbag.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_utl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/pk12err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs7/bio_pk7.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs7/pk7_asn1.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs7/pk7_attr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs7/pk7_doit.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs7/pk7_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs7/pk7_mime.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs7/pk7_smime.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs7/pkcs7err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/poly1305/poly1305-armv4.o" =>
@@ -7834,259 +7367,216 @@ our %unified_info = (
             "crypto/poly1305/poly1305.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/poly1305/poly1305_ameth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/poly1305/poly1305_pmeth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rand/drbg_ctr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rand/drbg_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rand/rand_egd.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rand/rand_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rand/rand_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rand/rand_unix.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rand/rand_vms.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rand/rand_win.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rand/randfile.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rc2/rc2_cbc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rc2/rc2_ecb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rc2/rc2_skey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rc2/rc2cfb64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rc2/rc2ofb64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rc4/rc4_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rc4/rc4_skey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ripemd/rmd_dgst.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ripemd/rmd_one.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_ameth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_asn1.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_chk.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_crpt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_depr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_gen.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_meth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_mp.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_none.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_oaep.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_ossl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_pk1.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_pmeth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_prn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_pss.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_saos.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_sign.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_ssl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_x931.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_x931g.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/s390xcpuid.o" =>
@@ -8096,31 +7586,26 @@ our %unified_info = (
             "crypto/seed/seed.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/seed/seed_cbc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/seed/seed_cfb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/seed/seed_ecb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/seed/seed_ofb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sha/keccak1600-armv4.o" =>
@@ -8130,7 +7615,6 @@ our %unified_info = (
             "crypto/sha/keccak1600.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sha/sha1-armv4-large.o" =>
@@ -8156,13 +7640,11 @@ our %unified_info = (
             "crypto/sha/sha1_one.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sha/sha1dgst.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sha/sha256-armv4.o" =>
@@ -8188,7 +7670,6 @@ our %unified_info = (
             "crypto/sha/sha256.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sha/sha512-armv4.o" =>
@@ -8214,709 +7695,591 @@ our %unified_info = (
             "crypto/sha/sha512.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/siphash/siphash.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/siphash/siphash_ameth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/siphash/siphash_pmeth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sm2/sm2_crypt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sm2/sm2_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sm2/sm2_pmeth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sm2/sm2_sign.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sm3/m_sm3.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sm3/sm3.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sm4/sm4.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/srp/srp_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/srp/srp_vfy.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/stack/stack.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/store/loader_file.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/store/store_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/store/store_init.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/store/store_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/store/store_register.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/store/store_strings.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/threads_none.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/threads_pthread.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/threads_win.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ts/ts_asn1.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ts/ts_conf.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ts/ts_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ts/ts_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ts/ts_req_print.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ts/ts_req_utils.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ts/ts_rsp_print.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ts/ts_rsp_sign.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ts/ts_rsp_utils.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ts/ts_rsp_verify.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ts/ts_verify_ctx.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/txt_db/txt_db.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ui/ui_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ui/ui_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ui/ui_null.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ui/ui_openssl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ui/ui_util.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/uid.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/whrlpool/wp_block.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/whrlpool/wp_dgst.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/by_dir.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/by_file.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/t_crl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/t_req.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/t_x509.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_att.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_cmp.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_d2.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_def.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_ext.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_lu.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_meth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_obj.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_r2x.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_req.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_set.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_trs.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_txt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_v3.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_vfy.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_vpm.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509cset.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509name.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509rset.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509spki.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509type.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x_all.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x_attrib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x_crl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x_exten.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x_name.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x_pubkey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x_req.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x_x509.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x_x509a.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/pcy_cache.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/pcy_data.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/pcy_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/pcy_map.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/pcy_node.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/pcy_tree.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_addr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_admis.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_akey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_akeya.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_alt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_asid.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_bcons.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_bitst.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_conf.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_cpols.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_crld.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_enum.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_extku.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_genn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_ia5.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_info.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_int.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_ncons.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_pci.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_pcia.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_pcons.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_pku.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_pmaps.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_prn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_purp.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_skey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_sxnet.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_tlsf.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_utl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "engines/e_capi.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "engines/e_padlock.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "fuzz/asn1.o" =>
@@ -8967,6 +8330,14 @@ our %unified_info = (
                 [
                     "include",
                 ],
+            "include/crypto/bn_conf.h" =>
+                [
+                    ".",
+                ],
+            "include/crypto/dso_conf.h" =>
+                [
+                    ".",
+                ],
             "include/openssl/opensslconf.h" =>
                 [
                     ".",
@@ -9211,7 +8582,6 @@ our %unified_info = (
                 [
                     ".",
                     "include",
-                    "crypto/include",
                 ],
             "test/asn1_string_table_test.o" =>
                 [
@@ -9537,7 +8907,6 @@ our %unified_info = (
                 [
                     ".",
                     "include",
-                    "crypto/include",
                 ],
             "test/cipher_overhead_test.o" =>
                 [
@@ -9583,7 +8952,6 @@ our %unified_info = (
             "test/ctype_internal_test.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "test/curve448_internal_test.o" =>
@@ -9649,7 +9017,6 @@ our %unified_info = (
                 [
                     "include",
                     "crypto/ec",
-                    "crypto/include",
                 ],
             "test/ecdsatest.o" =>
                 [
@@ -9674,7 +9041,6 @@ our %unified_info = (
             "test/evp_extra_test.o" =>
                 [
                     "include",
-                    "crypto/include",
                 ],
             "test/evp_test.o" =>
                 [
@@ -9772,7 +9138,6 @@ our %unified_info = (
                 [
                     ".",
                     "include",
-                    "crypto/include",
                 ],
             "test/rc2test.o" =>
                 [
@@ -9822,18 +9187,15 @@ our %unified_info = (
                 [
                     ".",
                     "include",
-                    "crypto/include",
                 ],
             "test/sm2_internal_test.o" =>
                 [
                     "include",
-                    "crypto/include",
                 ],
             "test/sm4_internal_test.o" =>
                 [
                     ".",
                     "include",
-                    "crypto/include",
                 ],
             "test/srptest.o" =>
                 [
@@ -9844,6 +9206,10 @@ our %unified_info = (
                     ".",
                     "include",
                 ],
+            "test/ssl_ctx_test.o" =>
+                [
+                    "include",
+                ],
             "test/ssl_test.o" =>
                 [
                     "include",
@@ -9907,10 +9273,6 @@ our %unified_info = (
                 [
                     "include",
                 ],
-            "test/testutil/init.o" =>
-                [
-                    "include",
-                ],
             "test/testutil/main.o" =>
                 [
                     "include",
@@ -9939,6 +9301,10 @@ our %unified_info = (
                 [
                     "include",
                 ],
+            "test/testutil/testutil_init.o" =>
+                [
+                    "include",
+                ],
             "test/threadstest.o" =>
                 [
                     "include",
@@ -10203,6 +9569,7 @@ our %unified_info = (
             "test/sm4_internal_test",
             "test/srptest",
             "test/ssl_cert_table_internal_test",
+            "test/ssl_ctx_test",
             "test/ssl_test",
             "test/ssl_test_ctx_test",
             "test/sslapitest",
@@ -15093,7 +14460,6 @@ our %unified_info = (
                     "test/testutil/cb.o",
                     "test/testutil/driver.o",
                     "test/testutil/format_output.o",
-                    "test/testutil/init.o",
                     "test/testutil/main.o",
                     "test/testutil/output_helpers.o",
                     "test/testutil/random.o",
@@ -15101,6 +14467,7 @@ our %unified_info = (
                     "test/testutil/tap_bio.o",
                     "test/testutil/test_cleanup.o",
                     "test/testutil/tests.o",
+                    "test/testutil/testutil_init.o",
                 ],
             "test/md2test" =>
                 [
@@ -15328,6 +14695,14 @@ our %unified_info = (
                 [
                     "test/ssl_cert_table_internal_test.c",
                 ],
+            "test/ssl_ctx_test" =>
+                [
+                    "test/ssl_ctx_test.o",
+                ],
+            "test/ssl_ctx_test.o" =>
+                [
+                    "test/ssl_ctx_test.c",
+                ],
             "test/ssl_test" =>
                 [
                     "test/handshake_helper.o",
@@ -15430,10 +14805,6 @@ our %unified_info = (
                 [
                     "test/testutil/format_output.c",
                 ],
-            "test/testutil/init.o" =>
-                [
-                    "test/testutil/init.c",
-                ],
             "test/testutil/main.o" =>
                 [
                     "test/testutil/main.c",
@@ -15462,6 +14833,10 @@ our %unified_info = (
                 [
                     "test/testutil/tests.c",
                 ],
+            "test/testutil/testutil_init.o" =>
+                [
+                    "test/testutil/testutil_init.c",
+                ],
             "test/threadstest" =>
                 [
                     "test/threadstest.o",
diff --git a/deps/openssl/config/archs/linux-armv4/no-asm/crypto/buildinf.h b/deps/openssl/config/archs/linux-armv4/no-asm/crypto/buildinf.h
index 7cf872d12e..b5e738fe28 100644
--- a/deps/openssl/config/archs/linux-armv4/no-asm/crypto/buildinf.h
+++ b/deps/openssl/config/archs/linux-armv4/no-asm/crypto/buildinf.h
@@ -11,7 +11,7 @@
  */
 
 #define PLATFORM "platform: linux-armv4"
-#define DATE "built on: Fri Sep 13 15:59:23 2019 UTC"
+#define DATE "built on: Wed Mar 18 21:06:19 2020 UTC"
 
 /*
  * Generate compiler_flags as an array of individual characters. This is a
diff --git a/deps/openssl/config/archs/linux-armv4/no-asm/crypto/include/internal/bn_conf.h b/deps/openssl/config/archs/linux-armv4/no-asm/crypto/include/internal/bn_conf.h
index fb52156bd0..459055c96f 100644
--- a/deps/openssl/config/archs/linux-armv4/no-asm/crypto/include/internal/bn_conf.h
+++ b/deps/openssl/config/archs/linux-armv4/no-asm/crypto/include/internal/bn_conf.h
@@ -1,5 +1,5 @@
 /* WARNING: do not edit! */
-/* Generated by Makefile from crypto/include/internal/bn_conf.h.in */
+/* Generated by Makefile from include/crypto/bn_conf.h.in */
 /*
  * Copyright 2016 The OpenSSL Project Authors. All Rights Reserved.
  *
@@ -9,8 +9,8 @@
  * https://www.openssl.org/source/license.html
  */
 
-#ifndef HEADER_BN_CONF_H
-# define HEADER_BN_CONF_H
+#ifndef OSSL_CRYPTO_BN_CONF_H
+# define OSSL_CRYPTO_BN_CONF_H
 
 /*
  * The contents of this file are not used in the UEFI build, as
diff --git a/deps/openssl/config/archs/linux-armv4/no-asm/crypto/include/internal/dso_conf.h b/deps/openssl/config/archs/linux-armv4/no-asm/crypto/include/internal/dso_conf.h
index 252266ec2a..4b1167c3d8 100644
--- a/deps/openssl/config/archs/linux-armv4/no-asm/crypto/include/internal/dso_conf.h
+++ b/deps/openssl/config/archs/linux-armv4/no-asm/crypto/include/internal/dso_conf.h
@@ -1,5 +1,5 @@
 /* WARNING: do not edit! */
-/* Generated by Makefile from crypto/include/internal/dso_conf.h.in */
+/* Generated by Makefile from include/crypto/dso_conf.h.in */
 /*
  * Copyright 2016-2019 The OpenSSL Project Authors. All Rights Reserved.
  *
@@ -9,8 +9,8 @@
  * https://www.openssl.org/source/license.html
  */
 
-#ifndef HEADER_DSO_CONF_H
-# define HEADER_DSO_CONF_H
+#ifndef OSSL_CRYPTO_DSO_CONF_H
+# define OSSL_CRYPTO_DSO_CONF_H
 # define DSO_DLFCN
 # define HAVE_DLFCN_H
 # define DSO_EXTENSION ".so"
diff --git a/deps/openssl/config/archs/linux-armv4/no-asm/include/openssl/opensslconf.h b/deps/openssl/config/archs/linux-armv4/no-asm/include/openssl/opensslconf.h
index 6419ec21a2..4cbafb777f 100644
--- a/deps/openssl/config/archs/linux-armv4/no-asm/include/openssl/opensslconf.h
+++ b/deps/openssl/config/archs/linux-armv4/no-asm/include/openssl/opensslconf.h
@@ -99,9 +99,6 @@ extern "C" {
 #ifndef OPENSSL_NO_DYNAMIC_ENGINE
 # define OPENSSL_NO_DYNAMIC_ENGINE
 #endif
-#ifndef OPENSSL_NO_AFALGENG
-# define OPENSSL_NO_AFALGENG
-#endif
 
 
 /*
diff --git a/deps/openssl/config/archs/linux-armv4/no-asm/include/progs.h b/deps/openssl/config/archs/linux-armv4/no-asm/include/progs.h
index 9b3d270e20..308c65601b 100644
--- a/deps/openssl/config/archs/linux-armv4/no-asm/include/progs.h
+++ b/deps/openssl/config/archs/linux-armv4/no-asm/include/progs.h
@@ -2,7 +2,7 @@
  * WARNING: do not edit!
  * Generated by apps/progs.pl
  *
- * Copyright 1995-2019 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 1995-2020 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
diff --git a/deps/openssl/config/archs/linux-elf/asm/configdata.pm b/deps/openssl/config/archs/linux-elf/asm/configdata.pm
index 2e07e0f655..8a4cc46d2b 100644
--- a/deps/openssl/config/archs/linux-elf/asm/configdata.pm
+++ b/deps/openssl/config/archs/linux-elf/asm/configdata.pm
@@ -49,14 +49,14 @@ our %config = (
   export_var_as_fn => "0",
   includes => [  ],
   lflags => [  ],
-  lib_defines => [ "OPENSSL_PIC", "OPENSSL_CPUID_OBJ", "OPENSSL_BN_ASM_PART_WORDS", "OPENSSL_IA32_SSE2", "OPENSSL_BN_ASM_MONT", "OPENSSL_BN_ASM_GF2m", "SHA1_ASM", "SHA256_ASM", "SHA512_ASM", "RC4_ASM", "MD5_ASM", "RMD160_ASM", "VPAES_ASM", "WHIRLPOOL_ASM", "GHASH_ASM", "ECP_NISTZ256_ASM", "POLY1305_ASM" ],
+  lib_defines => [ "OPENSSL_PIC", "OPENSSL_CPUID_OBJ", "OPENSSL_BN_ASM_PART_WORDS", "OPENSSL_IA32_SSE2", "OPENSSL_BN_ASM_MONT", "OPENSSL_BN_ASM_GF2m", "SHA1_ASM", "SHA256_ASM", "SHA512_ASM", "RC4_ASM", "MD5_ASM", "RMD160_ASM", "AESNI_ASM", "VPAES_ASM", "WHIRLPOOL_ASM", "GHASH_ASM", "ECP_NISTZ256_ASM", "POLY1305_ASM" ],
   libdir => "",
   major => "1",
   makedepprog => "\$(CROSS_COMPILE)gcc",
   minor => "1.1",
   openssl_algorithm_defines => [ "OPENSSL_NO_COMP", "OPENSSL_NO_MD2", "OPENSSL_NO_RC5" ],
   openssl_api_defines => [  ],
-  openssl_other_defines => [ "OPENSSL_RAND_SEED_OS", "OPENSSL_NO_AFALGENG", "OPENSSL_NO_ASAN", "OPENSSL_NO_CRYPTO_MDEBUG", "OPENSSL_NO_CRYPTO_MDEBUG_BACKTRACE", "OPENSSL_NO_DEVCRYPTOENG", "OPENSSL_NO_EC_NISTP_64_GCC_128", "OPENSSL_NO_EGD", "OPENSSL_NO_EXTERNAL_TESTS", "OPENSSL_NO_FUZZ_AFL", "OPENSSL_NO_FUZZ_LIBFUZZER", "OPENSSL_NO_HEARTBEATS", "OPENSSL_NO_MSAN", "OPENSSL_NO_SCTP", "OPENSSL_NO_SSL3", "OPENSSL_NO_SSL3_METHOD", "OPENSSL_NO_UBSAN", "OPENSSL_NO_UNIT_TEST", "OPENSSL_NO_WEAK_SSL_CIPHERS", "OPENSSL_NO_DYNAMIC_ENGINE", "OPENSSL_NO_AFALGENG" ],
+  openssl_other_defines => [ "OPENSSL_RAND_SEED_OS", "OPENSSL_NO_AFALGENG", "OPENSSL_NO_ASAN", "OPENSSL_NO_CRYPTO_MDEBUG", "OPENSSL_NO_CRYPTO_MDEBUG_BACKTRACE", "OPENSSL_NO_DEVCRYPTOENG", "OPENSSL_NO_EC_NISTP_64_GCC_128", "OPENSSL_NO_EGD", "OPENSSL_NO_EXTERNAL_TESTS", "OPENSSL_NO_FUZZ_AFL", "OPENSSL_NO_FUZZ_LIBFUZZER", "OPENSSL_NO_HEARTBEATS", "OPENSSL_NO_MSAN", "OPENSSL_NO_SCTP", "OPENSSL_NO_SSL3", "OPENSSL_NO_SSL3_METHOD", "OPENSSL_NO_UBSAN", "OPENSSL_NO_UNIT_TEST", "OPENSSL_NO_WEAK_SSL_CIPHERS", "OPENSSL_NO_DYNAMIC_ENGINE" ],
   openssl_sys_defines => [  ],
   openssl_thread_defines => [ "OPENSSL_THREADS" ],
   openssldir => "",
@@ -112,8 +112,8 @@ our %config = (
   sourcedir => ".",
   target => "linux-elf",
   tdirs => [ "ossl_shim" ],
-  version => "1.1.1d",
-  version_num => "0x1010104fL",
+  version => "1.1.1e",
+  version_num => "0x1010105fL",
 );
 
 our %target = (
@@ -240,6 +240,7 @@ our @disablables = (
   "dgram",
   "dh",
   "dsa",
+  "dso",
   "dtls",
   "dynamic-engine",
   "ec",
@@ -357,8 +358,8 @@ our %unified_info = (
         {
             "" =>
                 [
-                    "crypto/include/internal/bn_conf.h",
-                    "crypto/include/internal/dso_conf.h",
+                    "include/crypto/bn_conf.h",
+                    "include/crypto/dso_conf.h",
                     "include/openssl/opensslconf.h",
                 ],
             "apps/asn1pars.o" =>
@@ -626,14 +627,6 @@ our %unified_info = (
                     "crypto/perlasm/cbc.pl",
                     "crypto/perlasm/x86asm.pl",
                 ],
-            "crypto/include/internal/bn_conf.h" =>
-                [
-                    "configdata.pm",
-                ],
-            "crypto/include/internal/dso_conf.h" =>
-                [
-                    "configdata.pm",
-                ],
             "crypto/rc4/rc4-586.s" =>
                 [
                     "crypto/perlasm/x86asm.pl",
@@ -709,6 +702,14 @@ our %unified_info = (
                 [
                     "libcrypto",
                 ],
+            "include/crypto/bn_conf.h" =>
+                [
+                    "configdata.pm",
+                ],
+            "include/crypto/dso_conf.h" =>
+                [
+                    "configdata.pm",
+                ],
             "include/openssl/opensslconf.h" =>
                 [
                     "configdata.pm",
@@ -1506,6 +1507,12 @@ our %unified_info = (
                     "libcrypto",
                     "test/libtestutil.a",
                 ],
+            "test/ssl_ctx_test" =>
+                [
+                    "libcrypto",
+                    "libssl",
+                    "test/libtestutil.a",
+                ],
             "test/ssl_test" =>
                 [
                     "libcrypto",
@@ -3237,7 +3244,6 @@ our %unified_info = (
                             "test/testutil/cb.o",
                             "test/testutil/driver.o",
                             "test/testutil/format_output.o",
-                            "test/testutil/init.o",
                             "test/testutil/main.o",
                             "test/testutil/output_helpers.o",
                             "test/testutil/random.o",
@@ -3245,6 +3251,7 @@ our %unified_info = (
                             "test/testutil/tap_bio.o",
                             "test/testutil/test_cleanup.o",
                             "test/testutil/tests.o",
+                            "test/testutil/testutil_init.o",
                         ],
                     "products" =>
                         {
@@ -3743,14 +3750,6 @@ our %unified_info = (
                 [
                     "crypto/ia64cpuid.S",
                 ],
-            "crypto/include/internal/bn_conf.h" =>
-                [
-                    "crypto/include/internal/bn_conf.h.in",
-                ],
-            "crypto/include/internal/dso_conf.h" =>
-                [
-                    "crypto/include/internal/dso_conf.h.in",
-                ],
             "crypto/md5/md5-586.s" =>
                 [
                     "crypto/md5/asm/md5-586.pl",
@@ -4191,6 +4190,14 @@ our %unified_info = (
                     "engines/asm/e_padlock-x86_64.pl",
                     "\$(PERLASM_SCHEME)",
                 ],
+            "include/crypto/bn_conf.h" =>
+                [
+                    "include/crypto/bn_conf.h.in",
+                ],
+            "include/crypto/dso_conf.h" =>
+                [
+                    "include/crypto/dso_conf.h.in",
+                ],
             "include/openssl/opensslconf.h" =>
                 [
                     "include/openssl/opensslconf.h.in",
@@ -4885,49 +4892,41 @@ our %unified_info = (
             "crypto/aes/aes_cbc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/aes/aes_cfb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/aes/aes_core.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/aes/aes_ecb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/aes/aes_ige.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/aes/aes_misc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/aes/aes_ofb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/aes/aes_wrap.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/aes/aesfx-sparcv9.o" =>
@@ -4937,7 +4936,6 @@ our %unified_info = (
             "crypto/aes/aesni-x86.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/aes/aest4-sparcv9.o" =>
@@ -4955,13 +4953,11 @@ our %unified_info = (
             "crypto/aes/vpaes-x86.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/aria/aria.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/arm64cpuid.o" =>
@@ -4975,613 +4971,511 @@ our %unified_info = (
             "crypto/asn1/a_bitstr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_d2i_fp.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_digest.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_dup.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_gentm.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_i2d_fp.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_int.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_mbstr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_object.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_octet.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_print.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_sign.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_strex.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_strnid.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_time.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_type.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_utctm.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_utf8.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_verify.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/ameth_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/asn1_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/asn1_gen.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/asn1_item_list.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/asn1_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/asn1_par.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/asn_mime.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/asn_moid.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/asn_mstbl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/asn_pack.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/bio_asn1.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/bio_ndef.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/d2i_pr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/d2i_pu.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/evp_asn1.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/f_int.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/f_string.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/i2d_pr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/i2d_pu.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/n_pkey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/nsseq.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/p5_pbe.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/p5_pbev2.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/p5_scrypt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/p8_pkey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/t_bitst.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/t_pkey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/t_spki.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/tasn_dec.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/tasn_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/tasn_fre.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/tasn_new.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/tasn_prn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/tasn_scn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/tasn_typ.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/tasn_utl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/x_algor.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/x_bignum.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/x_info.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/x_int64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/x_long.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/x_pkey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/x_sig.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/x_spki.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/x_val.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/async/arch/async_null.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/async/arch/async_posix.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/async/arch/async_win.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/async/async.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/async/async_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/async/async_wait.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bf/bf-586.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bf/bf_cfb64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bf/bf_ecb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bf/bf_ofb64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bf/bf_skey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/b_addr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/b_dump.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/b_print.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/b_sock.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/b_sock2.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bf_buff.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bf_lbuf.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bf_nbio.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bf_null.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bio_cb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bio_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bio_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bio_meth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bss_acpt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bss_bio.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bss_conn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bss_dgram.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bss_fd.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bss_file.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bss_log.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bss_mem.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bss_null.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bss_sock.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/blake2/blake2b.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/blake2/blake2s.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/blake2/m_blake2b.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/blake2/m_blake2s.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/armv4-gf2m.o" =>
@@ -5595,7 +5489,6 @@ our %unified_info = (
             "crypto/bn/bn-586.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn-mips.o" =>
@@ -5605,188 +5498,157 @@ our %unified_info = (
             "crypto/bn/bn_add.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_blind.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_const.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_ctx.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_depr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_dh.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_div.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_exp.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto",
                 ],
             "crypto/bn/bn_exp2.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_gcd.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_gf2m.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_intern.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_kron.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_mod.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_mont.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_mpi.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_mul.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_nist.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_prime.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_print.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_rand.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_recp.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_shift.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_sqr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_sqrt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_srp.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_word.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_x931p.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/co-586.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/mips-mont.o" =>
@@ -5816,25 +5678,21 @@ our %unified_info = (
             "crypto/bn/x86-gf2m.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/x86-mont.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/buffer/buf_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/buffer/buffer.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/buildinf.h" =>
@@ -5844,31 +5702,26 @@ our %unified_info = (
             "crypto/camellia/cmll-x86.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/camellia/cmll_cfb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/camellia/cmll_ctr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/camellia/cmll_ecb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/camellia/cmll_ofb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/camellia/cmllt4-sparcv9.o" =>
@@ -5878,31 +5731,26 @@ our %unified_info = (
             "crypto/cast/c_cfb64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cast/c_ecb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cast/c_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cast/c_ofb64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cast/c_skey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/chacha/chacha-armv4.o" =>
@@ -5920,284 +5768,237 @@ our %unified_info = (
             "crypto/chacha/chacha-x86.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cmac/cm_ameth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cmac/cm_pmeth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cmac/cmac.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_asn1.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_att.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_cd.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_dd.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_env.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_ess.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_io.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_kari.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_pwri.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_sd.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_smime.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/conf/conf_api.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/conf/conf_def.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/conf/conf_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/conf/conf_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/conf/conf_mall.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/conf/conf_mod.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/conf/conf_sap.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/conf/conf_ssl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cpt_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cryptlib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ct/ct_b64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ct/ct_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ct/ct_log.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ct/ct_oct.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ct/ct_policy.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ct/ct_prn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ct/ct_sct.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ct/ct_sct_ctx.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ct/ct_vfy.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ct/ct_x509v3.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ctype.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cversion.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto",
                 ],
             "crypto/des/cbc_cksm.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/cbc_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/cfb64ede.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/cfb64enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/cfb_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/crypt586.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/des-586.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/dest4-sparcv9.o" =>
@@ -6207,295 +6008,246 @@ our %unified_info = (
             "crypto/des/ecb3_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/ecb_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/fcrypt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/ofb64ede.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/ofb64enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/ofb_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/pcbc_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/qud_cksm.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/rand_key.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/set_key.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/str2key.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/xcbc_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_ameth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_asn1.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_check.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_depr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_gen.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_kdf.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_key.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_meth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_pmeth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_prn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_rfc5114.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_rfc7919.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dsa/dsa_ameth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dsa/dsa_asn1.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dsa/dsa_depr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dsa/dsa_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dsa/dsa_gen.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dsa/dsa_key.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dsa/dsa_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dsa/dsa_meth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dsa/dsa_ossl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dsa/dsa_pmeth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dsa/dsa_prn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dsa/dsa_sign.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dsa/dsa_vrf.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dso/dso_dl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dso/dso_dlfcn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dso/dso_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dso/dso_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dso/dso_openssl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dso/dso_vms.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dso/dso_win32.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ebcdic.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/curve25519.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/curve448/arch_32/f_impl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto/ec/curve448/arch_32",
                     "crypto/ec/curve448",
@@ -6503,7 +6255,6 @@ our %unified_info = (
             "crypto/ec/curve448/curve448.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto/ec/curve448/arch_32",
                     "crypto/ec/curve448",
@@ -6511,7 +6262,6 @@ our %unified_info = (
             "crypto/ec/curve448/curve448_tables.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto/ec/curve448/arch_32",
                     "crypto/ec/curve448",
@@ -6519,7 +6269,6 @@ our %unified_info = (
             "crypto/ec/curve448/eddsa.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto/ec/curve448/arch_32",
                     "crypto/ec/curve448",
@@ -6527,7 +6276,6 @@ our %unified_info = (
             "crypto/ec/curve448/f_generic.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto/ec/curve448/arch_32",
                     "crypto/ec/curve448",
@@ -6535,7 +6283,6 @@ our %unified_info = (
             "crypto/ec/curve448/scalar.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto/ec/curve448/arch_32",
                     "crypto/ec/curve448",
@@ -6543,163 +6290,136 @@ our %unified_info = (
             "crypto/ec/ec2_oct.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec2_smpl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec_ameth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec_asn1.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec_check.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec_curve.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec_cvt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec_key.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec_kmeth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec_mult.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec_oct.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec_pmeth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec_print.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecdh_kdf.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecdh_ossl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecdsa_ossl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecdsa_sign.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecdsa_vrf.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/eck_prn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecp_mont.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecp_nist.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecp_nistp224.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecp_nistp256.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecp_nistp521.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecp_nistputil.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecp_nistz256-armv4.o" =>
@@ -6717,235 +6437,196 @@ our %unified_info = (
             "crypto/ec/ecp_nistz256-x86.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecp_nistz256.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecp_oct.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecp_smpl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecx_meth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/eng_all.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/eng_cnf.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/eng_ctrl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/eng_dyn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/eng_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/eng_fat.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/eng_init.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/eng_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/eng_list.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/eng_openssl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/eng_pkey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/eng_rdrand.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/eng_table.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/tb_asnmth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/tb_cipher.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/tb_dh.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/tb_digest.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/tb_dsa.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/tb_eckey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/tb_pkmeth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/tb_rand.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/tb_rsa.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/err/err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/err/err_all.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/err/err_prn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/bio_b64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/bio_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/bio_md.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/bio_ok.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/c_allc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/c_alld.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/cmeth_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/digest.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/e_aes.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto",
                     "crypto/modes",
@@ -6953,21 +6634,18 @@ our %unified_info = (
             "crypto/evp/e_aes_cbc_hmac_sha1.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto/modes",
                 ],
             "crypto/evp/e_aes_cbc_hmac_sha256.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto/modes",
                 ],
             "crypto/evp/e_aria.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto",
                     "crypto/modes",
@@ -6975,13 +6653,11 @@ our %unified_info = (
             "crypto/evp/e_bf.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/e_camellia.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto",
                     "crypto/modes",
@@ -6989,81 +6665,68 @@ our %unified_info = (
             "crypto/evp/e_cast.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/e_chacha20_poly1305.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/e_des.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto",
                 ],
             "crypto/evp/e_des3.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto",
                 ],
             "crypto/evp/e_idea.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/e_null.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/e_old.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/e_rc2.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/e_rc4.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/e_rc4_hmac_md5.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/e_rc5.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/e_seed.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/e_sm4.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto",
                     "crypto/modes",
@@ -7071,334 +6734,272 @@ our %unified_info = (
             "crypto/evp/e_xcbc_d.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/encode.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/evp_cnf.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/evp_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/evp_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/evp_key.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/evp_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/evp_pbe.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/evp_pkey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/m_md2.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/m_md4.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/m_md5.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/m_md5_sha1.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/m_mdc2.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/m_null.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/m_ripemd.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/m_sha1.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/m_sha3.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto",
                 ],
             "crypto/evp/m_sigver.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/m_wp.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/names.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/p5_crpt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/p5_crpt2.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/p_dec.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/p_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/p_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/p_open.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/p_seal.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/p_sign.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/p_verify.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/pbe_scrypt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/pmeth_fn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/pmeth_gn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/pmeth_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ex_data.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/getenv.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/hmac/hm_ameth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/hmac/hm_pmeth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/hmac/hmac.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/idea/i_cbc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/idea/i_cfb64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/idea/i_ecb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/idea/i_ofb64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/idea/i_skey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
-            "crypto/include/internal/bn_conf.h" =>
-                [
-                    ".",
-                ],
-            "crypto/include/internal/dso_conf.h" =>
-                [
-                    ".",
-                ],
             "crypto/init.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/kdf/hkdf.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/kdf/kdf_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/kdf/scrypt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/kdf/tls1_prf.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/lhash/lh_stats.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/lhash/lhash.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/md4/md4_dgst.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/md4/md4_one.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/md5/md5-586.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/md5/md5-sparcv9.o" =>
@@ -7408,79 +7009,66 @@ our %unified_info = (
             "crypto/md5/md5_dgst.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/md5/md5_one.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/mdc2/mdc2_one.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/mdc2/mdc2dgst.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/mem.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/mem_dbg.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/mem_sec.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/modes/cbc128.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/modes/ccm128.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/modes/cfb128.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/modes/ctr128.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/modes/cts128.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/modes/gcm128.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto",
                 ],
@@ -7499,7 +7087,6 @@ our %unified_info = (
             "crypto/modes/ghash-x86.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/modes/ghashv8-armx.o" =>
@@ -7509,361 +7096,301 @@ our %unified_info = (
             "crypto/modes/ocb128.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/modes/ofb128.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/modes/wrap128.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/modes/xts128.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/o_dir.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/o_fips.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/o_fopen.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/o_init.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/o_str.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/o_time.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/objects/o_names.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/objects/obj_dat.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/objects/obj_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/objects/obj_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/objects/obj_xref.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ocsp/ocsp_asn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ocsp/ocsp_cl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ocsp/ocsp_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ocsp/ocsp_ext.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ocsp/ocsp_ht.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ocsp/ocsp_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ocsp/ocsp_prn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ocsp/ocsp_srv.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ocsp/ocsp_vfy.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ocsp/v3_ocsp.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pem/pem_all.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pem/pem_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pem/pem_info.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pem/pem_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pem/pem_oth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pem/pem_pk8.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pem/pem_pkey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pem/pem_sign.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pem/pem_x509.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pem/pem_xaux.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pem/pvkfmt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_add.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_asn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_attr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_crpt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_crt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_decr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_init.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_key.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_kiss.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_mutl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_npas.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_p8d.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_p8e.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_sbag.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_utl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/pk12err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs7/bio_pk7.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs7/pk7_asn1.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs7/pk7_attr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs7/pk7_doit.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs7/pk7_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs7/pk7_mime.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs7/pk7_smime.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs7/pkcs7err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/poly1305/poly1305-armv4.o" =>
@@ -7885,265 +7412,221 @@ our %unified_info = (
             "crypto/poly1305/poly1305-x86.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/poly1305/poly1305.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/poly1305/poly1305_ameth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/poly1305/poly1305_pmeth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rand/drbg_ctr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rand/drbg_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rand/rand_egd.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rand/rand_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rand/rand_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rand/rand_unix.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rand/rand_vms.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rand/rand_win.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rand/randfile.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rc2/rc2_cbc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rc2/rc2_ecb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rc2/rc2_skey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rc2/rc2cfb64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rc2/rc2ofb64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rc4/rc4-586.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ripemd/rmd-586.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ripemd/rmd_dgst.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ripemd/rmd_one.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_ameth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_asn1.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_chk.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_crpt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_depr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_gen.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_meth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_mp.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_none.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_oaep.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_ossl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_pk1.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_pmeth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_prn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_pss.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_saos.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_sign.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_ssl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_x931.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_x931g.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/s390xcpuid.o" =>
@@ -8153,31 +7636,26 @@ our %unified_info = (
             "crypto/seed/seed.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/seed/seed_cbc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/seed/seed_cfb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/seed/seed_ecb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/seed/seed_ofb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sha/keccak1600-armv4.o" =>
@@ -8187,13 +7665,11 @@ our %unified_info = (
             "crypto/sha/keccak1600.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sha/sha1-586.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sha/sha1-armv4-large.o" =>
@@ -8219,19 +7695,16 @@ our %unified_info = (
             "crypto/sha/sha1_one.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sha/sha1dgst.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sha/sha256-586.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sha/sha256-armv4.o" =>
@@ -8257,13 +7730,11 @@ our %unified_info = (
             "crypto/sha/sha256.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sha/sha512-586.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sha/sha512-armv4.o" =>
@@ -8289,727 +7760,606 @@ our %unified_info = (
             "crypto/sha/sha512.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/siphash/siphash.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/siphash/siphash_ameth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/siphash/siphash_pmeth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sm2/sm2_crypt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sm2/sm2_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sm2/sm2_pmeth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sm2/sm2_sign.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sm3/m_sm3.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sm3/sm3.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sm4/sm4.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/srp/srp_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/srp/srp_vfy.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/stack/stack.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/store/loader_file.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/store/store_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/store/store_init.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/store/store_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/store/store_register.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/store/store_strings.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/threads_none.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/threads_pthread.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/threads_win.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ts/ts_asn1.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ts/ts_conf.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ts/ts_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ts/ts_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ts/ts_req_print.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ts/ts_req_utils.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ts/ts_rsp_print.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ts/ts_rsp_sign.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ts/ts_rsp_utils.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ts/ts_rsp_verify.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ts/ts_verify_ctx.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/txt_db/txt_db.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ui/ui_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ui/ui_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ui/ui_null.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ui/ui_openssl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ui/ui_util.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/uid.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/whrlpool/wp-mmx.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/whrlpool/wp_block.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/whrlpool/wp_dgst.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/by_dir.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/by_file.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/t_crl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/t_req.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/t_x509.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_att.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_cmp.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_d2.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_def.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_ext.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_lu.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_meth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_obj.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_r2x.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_req.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_set.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_trs.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_txt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_v3.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_vfy.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_vpm.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509cset.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509name.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509rset.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509spki.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509type.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x_all.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x_attrib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x_crl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x_exten.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x_name.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x_pubkey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x_req.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x_x509.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x_x509a.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/pcy_cache.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/pcy_data.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/pcy_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/pcy_map.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/pcy_node.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/pcy_tree.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_addr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_admis.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_akey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_akeya.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_alt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_asid.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_bcons.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_bitst.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_conf.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_cpols.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_crld.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_enum.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_extku.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_genn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_ia5.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_info.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_int.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_ncons.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_pci.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_pcia.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_pcons.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_pku.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_pmaps.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_prn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_purp.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_skey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_sxnet.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_tlsf.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_utl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x86cpuid.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "engines/e_capi.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "engines/e_padlock-x86.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "engines/e_padlock.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "fuzz/asn1.o" =>
@@ -9060,6 +8410,14 @@ our %unified_info = (
                 [
                     "include",
                 ],
+            "include/crypto/bn_conf.h" =>
+                [
+                    ".",
+                ],
+            "include/crypto/dso_conf.h" =>
+                [
+                    ".",
+                ],
             "include/openssl/opensslconf.h" =>
                 [
                     ".",
@@ -9304,7 +8662,6 @@ our %unified_info = (
                 [
                     ".",
                     "include",
-                    "crypto/include",
                 ],
             "test/asn1_string_table_test.o" =>
                 [
@@ -9630,7 +8987,6 @@ our %unified_info = (
                 [
                     ".",
                     "include",
-                    "crypto/include",
                 ],
             "test/cipher_overhead_test.o" =>
                 [
@@ -9676,7 +9032,6 @@ our %unified_info = (
             "test/ctype_internal_test.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "test/curve448_internal_test.o" =>
@@ -9742,7 +9097,6 @@ our %unified_info = (
                 [
                     "include",
                     "crypto/ec",
-                    "crypto/include",
                 ],
             "test/ecdsatest.o" =>
                 [
@@ -9767,7 +9121,6 @@ our %unified_info = (
             "test/evp_extra_test.o" =>
                 [
                     "include",
-                    "crypto/include",
                 ],
             "test/evp_test.o" =>
                 [
@@ -9865,7 +9218,6 @@ our %unified_info = (
                 [
                     ".",
                     "include",
-                    "crypto/include",
                 ],
             "test/rc2test.o" =>
                 [
@@ -9915,18 +9267,15 @@ our %unified_info = (
                 [
                     ".",
                     "include",
-                    "crypto/include",
                 ],
             "test/sm2_internal_test.o" =>
                 [
                     "include",
-                    "crypto/include",
                 ],
             "test/sm4_internal_test.o" =>
                 [
                     ".",
                     "include",
-                    "crypto/include",
                 ],
             "test/srptest.o" =>
                 [
@@ -9937,6 +9286,10 @@ our %unified_info = (
                     ".",
                     "include",
                 ],
+            "test/ssl_ctx_test.o" =>
+                [
+                    "include",
+                ],
             "test/ssl_test.o" =>
                 [
                     "include",
@@ -10000,10 +9353,6 @@ our %unified_info = (
                 [
                     "include",
                 ],
-            "test/testutil/init.o" =>
-                [
-                    "include",
-                ],
             "test/testutil/main.o" =>
                 [
                     "include",
@@ -10032,6 +9381,10 @@ our %unified_info = (
                 [
                     "include",
                 ],
+            "test/testutil/testutil_init.o" =>
+                [
+                    "include",
+                ],
             "test/threadstest.o" =>
                 [
                     "include",
@@ -10296,6 +9649,7 @@ our %unified_info = (
             "test/sm4_internal_test",
             "test/srptest",
             "test/ssl_cert_table_internal_test",
+            "test/ssl_ctx_test",
             "test/ssl_test",
             "test/ssl_test_ctx_test",
             "test/sslapitest",
@@ -15251,7 +14605,6 @@ our %unified_info = (
                     "test/testutil/cb.o",
                     "test/testutil/driver.o",
                     "test/testutil/format_output.o",
-                    "test/testutil/init.o",
                     "test/testutil/main.o",
                     "test/testutil/output_helpers.o",
                     "test/testutil/random.o",
@@ -15259,6 +14612,7 @@ our %unified_info = (
                     "test/testutil/tap_bio.o",
                     "test/testutil/test_cleanup.o",
                     "test/testutil/tests.o",
+                    "test/testutil/testutil_init.o",
                 ],
             "test/md2test" =>
                 [
@@ -15486,6 +14840,14 @@ our %unified_info = (
                 [
                     "test/ssl_cert_table_internal_test.c",
                 ],
+            "test/ssl_ctx_test" =>
+                [
+                    "test/ssl_ctx_test.o",
+                ],
+            "test/ssl_ctx_test.o" =>
+                [
+                    "test/ssl_ctx_test.c",
+                ],
             "test/ssl_test" =>
                 [
                     "test/handshake_helper.o",
@@ -15588,10 +14950,6 @@ our %unified_info = (
                 [
                     "test/testutil/format_output.c",
                 ],
-            "test/testutil/init.o" =>
-                [
-                    "test/testutil/init.c",
-                ],
             "test/testutil/main.o" =>
                 [
                     "test/testutil/main.c",
@@ -15620,6 +14978,10 @@ our %unified_info = (
                 [
                     "test/testutil/tests.c",
                 ],
+            "test/testutil/testutil_init.o" =>
+                [
+                    "test/testutil/testutil_init.c",
+                ],
             "test/threadstest" =>
                 [
                     "test/threadstest.o",
diff --git a/deps/openssl/config/archs/linux-elf/asm/crypto/aes/aes-586.s b/deps/openssl/config/archs/linux-elf/asm/crypto/aes/aes-586.s
deleted file mode 100644
index 53cd2909ac..0000000000
--- a/deps/openssl/config/archs/linux-elf/asm/crypto/aes/aes-586.s
+++ /dev/null
@@ -1,3243 +0,0 @@
-.text
-.type	_x86_AES_encrypt_compact,@function
-.align	16
-_x86_AES_encrypt_compact:
-	movl	%edi,20(%esp)
-	xorl	(%edi),%eax
-	xorl	4(%edi),%ebx
-	xorl	8(%edi),%ecx
-	xorl	12(%edi),%edx
-	movl	240(%edi),%esi
-	leal	-2(%esi,%esi,1),%esi
-	leal	(%edi,%esi,8),%esi
-	movl	%esi,24(%esp)
-	movl	-128(%ebp),%edi
-	movl	-96(%ebp),%esi
-	movl	-64(%ebp),%edi
-	movl	-32(%ebp),%esi
-	movl	(%ebp),%edi
-	movl	32(%ebp),%esi
-	movl	64(%ebp),%edi
-	movl	96(%ebp),%esi
-.align	16
-.L000loop:
-	movl	%eax,%esi
-	andl	$255,%esi
-	movzbl	-128(%ebp,%esi,1),%esi
-	movzbl	%bh,%edi
-	movzbl	-128(%ebp,%edi,1),%edi
-	shll	$8,%edi
-	xorl	%edi,%esi
-	movl	%ecx,%edi
-	shrl	$16,%edi
-	andl	$255,%edi
-	movzbl	-128(%ebp,%edi,1),%edi
-	shll	$16,%edi
-	xorl	%edi,%esi
-	movl	%edx,%edi
-	shrl	$24,%edi
-	movzbl	-128(%ebp,%edi,1),%edi
-	shll	$24,%edi
-	xorl	%edi,%esi
-	movl	%esi,4(%esp)
-
-	movl	%ebx,%esi
-	andl	$255,%esi
-	shrl	$16,%ebx
-	movzbl	-128(%ebp,%esi,1),%esi
-	movzbl	%ch,%edi
-	movzbl	-128(%ebp,%edi,1),%edi
-	shll	$8,%edi
-	xorl	%edi,%esi
-	movl	%edx,%edi
-	shrl	$16,%edi
-	andl	$255,%edi
-	movzbl	-128(%ebp,%edi,1),%edi
-	shll	$16,%edi
-	xorl	%edi,%esi
-	movl	%eax,%edi
-	shrl	$24,%edi
-	movzbl	-128(%ebp,%edi,1),%edi
-	shll	$24,%edi
-	xorl	%edi,%esi
-	movl	%esi,8(%esp)
-
-	movl	%ecx,%esi
-	andl	$255,%esi
-	shrl	$24,%ecx
-	movzbl	-128(%ebp,%esi,1),%esi
-	movzbl	%dh,%edi
-	movzbl	-128(%ebp,%edi,1),%edi
-	shll	$8,%edi
-	xorl	%edi,%esi
-	movl	%eax,%edi
-	shrl	$16,%edi
-	andl	$255,%edx
-	andl	$255,%edi
-	movzbl	-128(%ebp,%edi,1),%edi
-	shll	$16,%edi
-	xorl	%edi,%esi
-	movzbl	%bh,%edi
-	movzbl	-128(%ebp,%edi,1),%edi
-	shll	$24,%edi
-	xorl	%edi,%esi
-
-	andl	$255,%edx
-	movzbl	-128(%ebp,%edx,1),%edx
-	movzbl	%ah,%eax
-	movzbl	-128(%ebp,%eax,1),%eax
-	shll	$8,%eax
-	xorl	%eax,%edx
-	movl	4(%esp),%eax
-	andl	$255,%ebx
-	movzbl	-128(%ebp,%ebx,1),%ebx
-	shll	$16,%ebx
-	xorl	%ebx,%edx
-	movl	8(%esp),%ebx
-	movzbl	-128(%ebp,%ecx,1),%ecx
-	shll	$24,%ecx
-	xorl	%ecx,%edx
-	movl	%esi,%ecx
-
-	movl	$2155905152,%ebp
-	andl	%ecx,%ebp
-	leal	(%ecx,%ecx,1),%edi
-	movl	%ebp,%esi
-	shrl	$7,%ebp
-	andl	$4278124286,%edi
-	subl	%ebp,%esi
-	movl	%ecx,%ebp
-	andl	$454761243,%esi
-	rorl	$16,%ebp
-	xorl	%edi,%esi
-	movl	%ecx,%edi
-	xorl	%esi,%ecx
-	rorl	$24,%edi
-	xorl	%ebp,%esi
-	roll	$24,%ecx
-	xorl	%edi,%esi
-	movl	$2155905152,%ebp
-	xorl	%esi,%ecx
-	andl	%edx,%ebp
-	leal	(%edx,%edx,1),%edi
-	movl	%ebp,%esi
-	shrl	$7,%ebp
-	andl	$4278124286,%edi
-	subl	%ebp,%esi
-	movl	%edx,%ebp
-	andl	$454761243,%esi
-	rorl	$16,%ebp
-	xorl	%edi,%esi
-	movl	%edx,%edi
-	xorl	%esi,%edx
-	rorl	$24,%edi
-	xorl	%ebp,%esi
-	roll	$24,%edx
-	xorl	%edi,%esi
-	movl	$2155905152,%ebp
-	xorl	%esi,%edx
-	andl	%eax,%ebp
-	leal	(%eax,%eax,1),%edi
-	movl	%ebp,%esi
-	shrl	$7,%ebp
-	andl	$4278124286,%edi
-	subl	%ebp,%esi
-	movl	%eax,%ebp
-	andl	$454761243,%esi
-	rorl	$16,%ebp
-	xorl	%edi,%esi
-	movl	%eax,%edi
-	xorl	%esi,%eax
-	rorl	$24,%edi
-	xorl	%ebp,%esi
-	roll	$24,%eax
-	xorl	%edi,%esi
-	movl	$2155905152,%ebp
-	xorl	%esi,%eax
-	andl	%ebx,%ebp
-	leal	(%ebx,%ebx,1),%edi
-	movl	%ebp,%esi
-	shrl	$7,%ebp
-	andl	$4278124286,%edi
-	subl	%ebp,%esi
-	movl	%ebx,%ebp
-	andl	$454761243,%esi
-	rorl	$16,%ebp
-	xorl	%edi,%esi
-	movl	%ebx,%edi
-	xorl	%esi,%ebx
-	rorl	$24,%edi
-	xorl	%ebp,%esi
-	roll	$24,%ebx
-	xorl	%edi,%esi
-	xorl	%esi,%ebx
-	movl	20(%esp),%edi
-	movl	28(%esp),%ebp
-	addl	$16,%edi
-	xorl	(%edi),%eax
-	xorl	4(%edi),%ebx
-	xorl	8(%edi),%ecx
-	xorl	12(%edi),%edx
-	cmpl	24(%esp),%edi
-	movl	%edi,20(%esp)
-	jb	.L000loop
-	movl	%eax,%esi
-	andl	$255,%esi
-	movzbl	-128(%ebp,%esi,1),%esi
-	movzbl	%bh,%edi
-	movzbl	-128(%ebp,%edi,1),%edi
-	shll	$8,%edi
-	xorl	%edi,%esi
-	movl	%ecx,%edi
-	shrl	$16,%edi
-	andl	$255,%edi
-	movzbl	-128(%ebp,%edi,1),%edi
-	shll	$16,%edi
-	xorl	%edi,%esi
-	movl	%edx,%edi
-	shrl	$24,%edi
-	movzbl	-128(%ebp,%edi,1),%edi
-	shll	$24,%edi
-	xorl	%edi,%esi
-	movl	%esi,4(%esp)
-
-	movl	%ebx,%esi
-	andl	$255,%esi
-	shrl	$16,%ebx
-	movzbl	-128(%ebp,%esi,1),%esi
-	movzbl	%ch,%edi
-	movzbl	-128(%ebp,%edi,1),%edi
-	shll	$8,%edi
-	xorl	%edi,%esi
-	movl	%edx,%edi
-	shrl	$16,%edi
-	andl	$255,%edi
-	movzbl	-128(%ebp,%edi,1),%edi
-	shll	$16,%edi
-	xorl	%edi,%esi
-	movl	%eax,%edi
-	shrl	$24,%edi
-	movzbl	-128(%ebp,%edi,1),%edi
-	shll	$24,%edi
-	xorl	%edi,%esi
-	movl	%esi,8(%esp)
-
-	movl	%ecx,%esi
-	andl	$255,%esi
-	shrl	$24,%ecx
-	movzbl	-128(%ebp,%esi,1),%esi
-	movzbl	%dh,%edi
-	movzbl	-128(%ebp,%edi,1),%edi
-	shll	$8,%edi
-	xorl	%edi,%esi
-	movl	%eax,%edi
-	shrl	$16,%edi
-	andl	$255,%edx
-	andl	$255,%edi
-	movzbl	-128(%ebp,%edi,1),%edi
-	shll	$16,%edi
-	xorl	%edi,%esi
-	movzbl	%bh,%edi
-	movzbl	-128(%ebp,%edi,1),%edi
-	shll	$24,%edi
-	xorl	%edi,%esi
-
-	movl	20(%esp),%edi
-	andl	$255,%edx
-	movzbl	-128(%ebp,%edx,1),%edx
-	movzbl	%ah,%eax
-	movzbl	-128(%ebp,%eax,1),%eax
-	shll	$8,%eax
-	xorl	%eax,%edx
-	movl	4(%esp),%eax
-	andl	$255,%ebx
-	movzbl	-128(%ebp,%ebx,1),%ebx
-	shll	$16,%ebx
-	xorl	%ebx,%edx
-	movl	8(%esp),%ebx
-	movzbl	-128(%ebp,%ecx,1),%ecx
-	shll	$24,%ecx
-	xorl	%ecx,%edx
-	movl	%esi,%ecx
-
-	xorl	16(%edi),%eax
-	xorl	20(%edi),%ebx
-	xorl	24(%edi),%ecx
-	xorl	28(%edi),%edx
-	ret
-.size	_x86_AES_encrypt_compact,.-_x86_AES_encrypt_compact
-.type	_sse_AES_encrypt_compact,@function
-.align	16
-_sse_AES_encrypt_compact:
-	pxor	(%edi),%mm0
-	pxor	8(%edi),%mm4
-	movl	240(%edi),%esi
-	leal	-2(%esi,%esi,1),%esi
-	leal	(%edi,%esi,8),%esi
-	movl	%esi,24(%esp)
-	movl	$454761243,%eax
-	movl	%eax,8(%esp)
-	movl	%eax,12(%esp)
-	movl	-128(%ebp),%eax
-	movl	-96(%ebp),%ebx
-	movl	-64(%ebp),%ecx
-	movl	-32(%ebp),%edx
-	movl	(%ebp),%eax
-	movl	32(%ebp),%ebx
-	movl	64(%ebp),%ecx
-	movl	96(%ebp),%edx
-.align	16
-.L001loop:
-	pshufw	$8,%mm0,%mm1
-	pshufw	$13,%mm4,%mm5
-	movd	%mm1,%eax
-	movd	%mm5,%ebx
-	movl	%edi,20(%esp)
-	movzbl	%al,%esi
-	movzbl	%ah,%edx
-	pshufw	$13,%mm0,%mm2
-	movzbl	-128(%ebp,%esi,1),%ecx
-	movzbl	%bl,%edi
-	movzbl	-128(%ebp,%edx,1),%edx
-	shrl	$16,%eax
-	shll	$8,%edx
-	movzbl	-128(%ebp,%edi,1),%esi
-	movzbl	%bh,%edi
-	shll	$16,%esi
-	pshufw	$8,%mm4,%mm6
-	orl	%esi,%ecx
-	movzbl	-128(%ebp,%edi,1),%esi
-	movzbl	%ah,%edi
-	shll	$24,%esi
-	shrl	$16,%ebx
-	orl	%esi,%edx
-	movzbl	-128(%ebp,%edi,1),%esi
-	movzbl	%bh,%edi
-	shll	$8,%esi
-	orl	%esi,%ecx
-	movzbl	-128(%ebp,%edi,1),%esi
-	movzbl	%al,%edi
-	shll	$24,%esi
-	orl	%esi,%ecx
-	movzbl	-128(%ebp,%edi,1),%esi
-	movzbl	%bl,%edi
-	movd	%mm2,%eax
-	movd	%ecx,%mm0
-	movzbl	-128(%ebp,%edi,1),%ecx
-	movzbl	%ah,%edi
-	shll	$16,%ecx
-	movd	%mm6,%ebx
-	orl	%esi,%ecx
-	movzbl	-128(%ebp,%edi,1),%esi
-	movzbl	%bh,%edi
-	shll	$24,%esi
-	orl	%esi,%ecx
-	movzbl	-128(%ebp,%edi,1),%esi
-	movzbl	%bl,%edi
-	shll	$8,%esi
-	shrl	$16,%ebx
-	orl	%esi,%ecx
-	movzbl	-128(%ebp,%edi,1),%esi
-	movzbl	%al,%edi
-	shrl	$16,%eax
-	movd	%ecx,%mm1
-	movzbl	-128(%ebp,%edi,1),%ecx
-	movzbl	%ah,%edi
-	shll	$16,%ecx
-	andl	$255,%eax
-	orl	%esi,%ecx
-	punpckldq	%mm1,%mm0
-	movzbl	-128(%ebp,%edi,1),%esi
-	movzbl	%bh,%edi
-	shll	$24,%esi
-	andl	$255,%ebx
-	movzbl	-128(%ebp,%eax,1),%eax
-	orl	%esi,%ecx
-	shll	$16,%eax
-	movzbl	-128(%ebp,%edi,1),%esi
-	orl	%eax,%edx
-	shll	$8,%esi
-	movzbl	-128(%ebp,%ebx,1),%ebx
-	orl	%esi,%ecx
-	orl	%ebx,%edx
-	movl	20(%esp),%edi
-	movd	%ecx,%mm4
-	movd	%edx,%mm5
-	punpckldq	%mm5,%mm4
-	addl	$16,%edi
-	cmpl	24(%esp),%edi
-	ja	.L002out
-	movq	8(%esp),%mm2
-	pxor	%mm3,%mm3
-	pxor	%mm7,%mm7
-	movq	%mm0,%mm1
-	movq	%mm4,%mm5
-	pcmpgtb	%mm0,%mm3
-	pcmpgtb	%mm4,%mm7
-	pand	%mm2,%mm3
-	pand	%mm2,%mm7
-	pshufw	$177,%mm0,%mm2
-	pshufw	$177,%mm4,%mm6
-	paddb	%mm0,%mm0
-	paddb	%mm4,%mm4
-	pxor	%mm3,%mm0
-	pxor	%mm7,%mm4
-	pshufw	$177,%mm2,%mm3
-	pshufw	$177,%mm6,%mm7
-	pxor	%mm0,%mm1
-	pxor	%mm4,%mm5
-	pxor	%mm2,%mm0
-	pxor	%mm6,%mm4
-	movq	%mm3,%mm2
-	movq	%mm7,%mm6
-	pslld	$8,%mm3
-	pslld	$8,%mm7
-	psrld	$24,%mm2
-	psrld	$24,%mm6
-	pxor	%mm3,%mm0
-	pxor	%mm7,%mm4
-	pxor	%mm2,%mm0
-	pxor	%mm6,%mm4
-	movq	%mm1,%mm3
-	movq	%mm5,%mm7
-	movq	(%edi),%mm2
-	movq	8(%edi),%mm6
-	psrld	$8,%mm1
-	psrld	$8,%mm5
-	movl	-128(%ebp),%eax
-	pslld	$24,%mm3
-	pslld	$24,%mm7
-	movl	-64(%ebp),%ebx
-	pxor	%mm1,%mm0
-	pxor	%mm5,%mm4
-	movl	(%ebp),%ecx
-	pxor	%mm3,%mm0
-	pxor	%mm7,%mm4
-	movl	64(%ebp),%edx
-	pxor	%mm2,%mm0
-	pxor	%mm6,%mm4
-	jmp	.L001loop
-.align	16
-.L002out:
-	pxor	(%edi),%mm0
-	pxor	8(%edi),%mm4
-	ret
-.size	_sse_AES_encrypt_compact,.-_sse_AES_encrypt_compact
-.type	_x86_AES_encrypt,@function
-.align	16
-_x86_AES_encrypt:
-	movl	%edi,20(%esp)
-	xorl	(%edi),%eax
-	xorl	4(%edi),%ebx
-	xorl	8(%edi),%ecx
-	xorl	12(%edi),%edx
-	movl	240(%edi),%esi
-	leal	-2(%esi,%esi,1),%esi
-	leal	(%edi,%esi,8),%esi
-	movl	%esi,24(%esp)
-.align	16
-.L003loop:
-	movl	%eax,%esi
-	andl	$255,%esi
-	movl	(%ebp,%esi,8),%esi
-	movzbl	%bh,%edi
-	xorl	3(%ebp,%edi,8),%esi
-	movl	%ecx,%edi
-	shrl	$16,%edi
-	andl	$255,%edi
-	xorl	2(%ebp,%edi,8),%esi
-	movl	%edx,%edi
-	shrl	$24,%edi
-	xorl	1(%ebp,%edi,8),%esi
-	movl	%esi,4(%esp)
-
-	movl	%ebx,%esi
-	andl	$255,%esi
-	shrl	$16,%ebx
-	movl	(%ebp,%esi,8),%esi
-	movzbl	%ch,%edi
-	xorl	3(%ebp,%edi,8),%esi
-	movl	%edx,%edi
-	shrl	$16,%edi
-	andl	$255,%edi
-	xorl	2(%ebp,%edi,8),%esi
-	movl	%eax,%edi
-	shrl	$24,%edi
-	xorl	1(%ebp,%edi,8),%esi
-	movl	%esi,8(%esp)
-
-	movl	%ecx,%esi
-	andl	$255,%esi
-	shrl	$24,%ecx
-	movl	(%ebp,%esi,8),%esi
-	movzbl	%dh,%edi
-	xorl	3(%ebp,%edi,8),%esi
-	movl	%eax,%edi
-	shrl	$16,%edi
-	andl	$255,%edx
-	andl	$255,%edi
-	xorl	2(%ebp,%edi,8),%esi
-	movzbl	%bh,%edi
-	xorl	1(%ebp,%edi,8),%esi
-
-	movl	20(%esp),%edi
-	movl	(%ebp,%edx,8),%edx
-	movzbl	%ah,%eax
-	xorl	3(%ebp,%eax,8),%edx
-	movl	4(%esp),%eax
-	andl	$255,%ebx
-	xorl	2(%ebp,%ebx,8),%edx
-	movl	8(%esp),%ebx
-	xorl	1(%ebp,%ecx,8),%edx
-	movl	%esi,%ecx
-
-	addl	$16,%edi
-	xorl	(%edi),%eax
-	xorl	4(%edi),%ebx
-	xorl	8(%edi),%ecx
-	xorl	12(%edi),%edx
-	cmpl	24(%esp),%edi
-	movl	%edi,20(%esp)
-	jb	.L003loop
-	movl	%eax,%esi
-	andl	$255,%esi
-	movl	2(%ebp,%esi,8),%esi
-	andl	$255,%esi
-	movzbl	%bh,%edi
-	movl	(%ebp,%edi,8),%edi
-	andl	$65280,%edi
-	xorl	%edi,%esi
-	movl	%ecx,%edi
-	shrl	$16,%edi
-	andl	$255,%edi
-	movl	(%ebp,%edi,8),%edi
-	andl	$16711680,%edi
-	xorl	%edi,%esi
-	movl	%edx,%edi
-	shrl	$24,%edi
-	movl	2(%ebp,%edi,8),%edi
-	andl	$4278190080,%edi
-	xorl	%edi,%esi
-	movl	%esi,4(%esp)
-	movl	%ebx,%esi
-	andl	$255,%esi
-	shrl	$16,%ebx
-	movl	2(%ebp,%esi,8),%esi
-	andl	$255,%esi
-	movzbl	%ch,%edi
-	movl	(%ebp,%edi,8),%edi
-	andl	$65280,%edi
-	xorl	%edi,%esi
-	movl	%edx,%edi
-	shrl	$16,%edi
-	andl	$255,%edi
-	movl	(%ebp,%edi,8),%edi
-	andl	$16711680,%edi
-	xorl	%edi,%esi
-	movl	%eax,%edi
-	shrl	$24,%edi
-	movl	2(%ebp,%edi,8),%edi
-	andl	$4278190080,%edi
-	xorl	%edi,%esi
-	movl	%esi,8(%esp)
-	movl	%ecx,%esi
-	andl	$255,%esi
-	shrl	$24,%ecx
-	movl	2(%ebp,%esi,8),%esi
-	andl	$255,%esi
-	movzbl	%dh,%edi
-	movl	(%ebp,%edi,8),%edi
-	andl	$65280,%edi
-	xorl	%edi,%esi
-	movl	%eax,%edi
-	shrl	$16,%edi
-	andl	$255,%edx
-	andl	$255,%edi
-	movl	(%ebp,%edi,8),%edi
-	andl	$16711680,%edi
-	xorl	%edi,%esi
-	movzbl	%bh,%edi
-	movl	2(%ebp,%edi,8),%edi
-	andl	$4278190080,%edi
-	xorl	%edi,%esi
-	movl	20(%esp),%edi
-	andl	$255,%edx
-	movl	2(%ebp,%edx,8),%edx
-	andl	$255,%edx
-	movzbl	%ah,%eax
-	movl	(%ebp,%eax,8),%eax
-	andl	$65280,%eax
-	xorl	%eax,%edx
-	movl	4(%esp),%eax
-	andl	$255,%ebx
-	movl	(%ebp,%ebx,8),%ebx
-	andl	$16711680,%ebx
-	xorl	%ebx,%edx
-	movl	8(%esp),%ebx
-	movl	2(%ebp,%ecx,8),%ecx
-	andl	$4278190080,%ecx
-	xorl	%ecx,%edx
-	movl	%esi,%ecx
-	addl	$16,%edi
-	xorl	(%edi),%eax
-	xorl	4(%edi),%ebx
-	xorl	8(%edi),%ecx
-	xorl	12(%edi),%edx
-	ret
-.align	64
-.LAES_Te:
-.long	2774754246,2774754246
-.long	2222750968,2222750968
-.long	2574743534,2574743534
-.long	2373680118,2373680118
-.long	234025727,234025727
-.long	3177933782,3177933782
-.long	2976870366,2976870366
-.long	1422247313,1422247313
-.long	1345335392,1345335392
-.long	50397442,50397442
-.long	2842126286,2842126286
-.long	2099981142,2099981142
-.long	436141799,436141799
-.long	1658312629,1658312629
-.long	3870010189,3870010189
-.long	2591454956,2591454956
-.long	1170918031,1170918031
-.long	2642575903,2642575903
-.long	1086966153,1086966153
-.long	2273148410,2273148410
-.long	368769775,368769775
-.long	3948501426,3948501426
-.long	3376891790,3376891790
-.long	200339707,200339707
-.long	3970805057,3970805057
-.long	1742001331,1742001331
-.long	4255294047,4255294047
-.long	3937382213,3937382213
-.long	3214711843,3214711843
-.long	4154762323,4154762323
-.long	2524082916,2524082916
-.long	1539358875,1539358875
-.long	3266819957,3266819957
-.long	486407649,486407649
-.long	2928907069,2928907069
-.long	1780885068,1780885068
-.long	1513502316,1513502316
-.long	1094664062,1094664062
-.long	49805301,49805301
-.long	1338821763,1338821763
-.long	1546925160,1546925160
-.long	4104496465,4104496465
-.long	887481809,887481809
-.long	150073849,150073849
-.long	2473685474,2473685474
-.long	1943591083,1943591083
-.long	1395732834,1395732834
-.long	1058346282,1058346282
-.long	201589768,201589768
-.long	1388824469,1388824469
-.long	1696801606,1696801606
-.long	1589887901,1589887901
-.long	672667696,672667696
-.long	2711000631,2711000631
-.long	251987210,251987210
-.long	3046808111,3046808111
-.long	151455502,151455502
-.long	907153956,907153956
-.long	2608889883,2608889883
-.long	1038279391,1038279391
-.long	652995533,652995533
-.long	1764173646,1764173646
-.long	3451040383,3451040383
-.long	2675275242,2675275242
-.long	453576978,453576978
-.long	2659418909,2659418909
-.long	1949051992,1949051992
-.long	773462580,773462580
-.long	756751158,756751158
-.long	2993581788,2993581788
-.long	3998898868,3998898868
-.long	4221608027,4221608027
-.long	4132590244,4132590244
-.long	1295727478,1295727478
-.long	1641469623,1641469623
-.long	3467883389,3467883389
-.long	2066295122,2066295122
-.long	1055122397,1055122397
-.long	1898917726,1898917726
-.long	2542044179,2542044179
-.long	4115878822,4115878822
-.long	1758581177,1758581177
-.long	0,0
-.long	753790401,753790401
-.long	1612718144,1612718144
-.long	536673507,536673507
-.long	3367088505,3367088505
-.long	3982187446,3982187446
-.long	3194645204,3194645204
-.long	1187761037,1187761037
-.long	3653156455,3653156455
-.long	1262041458,1262041458
-.long	3729410708,3729410708
-.long	3561770136,3561770136
-.long	3898103984,3898103984
-.long	1255133061,1255133061
-.long	1808847035,1808847035
-.long	720367557,720367557
-.long	3853167183,3853167183
-.long	385612781,385612781
-.long	3309519750,3309519750
-.long	3612167578,3612167578
-.long	1429418854,1429418854
-.long	2491778321,2491778321
-.long	3477423498,3477423498
-.long	284817897,284817897
-.long	100794884,100794884
-.long	2172616702,2172616702
-.long	4031795360,4031795360
-.long	1144798328,1144798328
-.long	3131023141,3131023141
-.long	3819481163,3819481163
-.long	4082192802,4082192802
-.long	4272137053,4272137053
-.long	3225436288,3225436288
-.long	2324664069,2324664069
-.long	2912064063,2912064063
-.long	3164445985,3164445985
-.long	1211644016,1211644016
-.long	83228145,83228145
-.long	3753688163,3753688163
-.long	3249976951,3249976951
-.long	1977277103,1977277103
-.long	1663115586,1663115586
-.long	806359072,806359072
-.long	452984805,452984805
-.long	250868733,250868733
-.long	1842533055,1842533055
-.long	1288555905,1288555905
-.long	336333848,336333848
-.long	890442534,890442534
-.long	804056259,804056259
-.long	3781124030,3781124030
-.long	2727843637,2727843637
-.long	3427026056,3427026056
-.long	957814574,957814574
-.long	1472513171,1472513171
-.long	4071073621,4071073621
-.long	2189328124,2189328124
-.long	1195195770,1195195770
-.long	2892260552,2892260552
-.long	3881655738,3881655738
-.long	723065138,723065138
-.long	2507371494,2507371494
-.long	2690670784,2690670784
-.long	2558624025,2558624025
-.long	3511635870,3511635870
-.long	2145180835,2145180835
-.long	1713513028,1713513028
-.long	2116692564,2116692564
-.long	2878378043,2878378043
-.long	2206763019,2206763019
-.long	3393603212,3393603212
-.long	703524551,703524551
-.long	3552098411,3552098411
-.long	1007948840,1007948840
-.long	2044649127,2044649127
-.long	3797835452,3797835452
-.long	487262998,487262998
-.long	1994120109,1994120109
-.long	1004593371,1004593371
-.long	1446130276,1446130276
-.long	1312438900,1312438900
-.long	503974420,503974420
-.long	3679013266,3679013266
-.long	168166924,168166924
-.long	1814307912,1814307912
-.long	3831258296,3831258296
-.long	1573044895,1573044895
-.long	1859376061,1859376061
-.long	4021070915,4021070915
-.long	2791465668,2791465668
-.long	2828112185,2828112185
-.long	2761266481,2761266481
-.long	937747667,937747667
-.long	2339994098,2339994098
-.long	854058965,854058965
-.long	1137232011,1137232011
-.long	1496790894,1496790894
-.long	3077402074,3077402074
-.long	2358086913,2358086913
-.long	1691735473,1691735473
-.long	3528347292,3528347292
-.long	3769215305,3769215305
-.long	3027004632,3027004632
-.long	4199962284,4199962284
-.long	133494003,133494003
-.long	636152527,636152527
-.long	2942657994,2942657994
-.long	2390391540,2390391540
-.long	3920539207,3920539207
-.long	403179536,403179536
-.long	3585784431,3585784431
-.long	2289596656,2289596656
-.long	1864705354,1864705354
-.long	1915629148,1915629148
-.long	605822008,605822008
-.long	4054230615,4054230615
-.long	3350508659,3350508659
-.long	1371981463,1371981463
-.long	602466507,602466507
-.long	2094914977,2094914977
-.long	2624877800,2624877800
-.long	555687742,555687742
-.long	3712699286,3712699286
-.long	3703422305,3703422305
-.long	2257292045,2257292045
-.long	2240449039,2240449039
-.long	2423288032,2423288032
-.long	1111375484,1111375484
-.long	3300242801,3300242801
-.long	2858837708,2858837708
-.long	3628615824,3628615824
-.long	84083462,84083462
-.long	32962295,32962295
-.long	302911004,302911004
-.long	2741068226,2741068226
-.long	1597322602,1597322602
-.long	4183250862,4183250862
-.long	3501832553,3501832553
-.long	2441512471,2441512471
-.long	1489093017,1489093017
-.long	656219450,656219450
-.long	3114180135,3114180135
-.long	954327513,954327513
-.long	335083755,335083755
-.long	3013122091,3013122091
-.long	856756514,856756514
-.long	3144247762,3144247762
-.long	1893325225,1893325225
-.long	2307821063,2307821063
-.long	2811532339,2811532339
-.long	3063651117,3063651117
-.long	572399164,572399164
-.long	2458355477,2458355477
-.long	552200649,552200649
-.long	1238290055,1238290055
-.long	4283782570,4283782570
-.long	2015897680,2015897680
-.long	2061492133,2061492133
-.long	2408352771,2408352771
-.long	4171342169,4171342169
-.long	2156497161,2156497161
-.long	386731290,386731290
-.long	3669999461,3669999461
-.long	837215959,837215959
-.long	3326231172,3326231172
-.long	3093850320,3093850320
-.long	3275833730,3275833730
-.long	2962856233,2962856233
-.long	1999449434,1999449434
-.long	286199582,286199582
-.long	3417354363,3417354363
-.long	4233385128,4233385128
-.long	3602627437,3602627437
-.long	974525996,974525996
-.byte	99,124,119,123,242,107,111,197
-.byte	48,1,103,43,254,215,171,118
-.byte	202,130,201,125,250,89,71,240
-.byte	173,212,162,175,156,164,114,192
-.byte	183,253,147,38,54,63,247,204
-.byte	52,165,229,241,113,216,49,21
-.byte	4,199,35,195,24,150,5,154
-.byte	7,18,128,226,235,39,178,117
-.byte	9,131,44,26,27,110,90,160
-.byte	82,59,214,179,41,227,47,132
-.byte	83,209,0,237,32,252,177,91
-.byte	106,203,190,57,74,76,88,207
-.byte	208,239,170,251,67,77,51,133
-.byte	69,249,2,127,80,60,159,168
-.byte	81,163,64,143,146,157,56,245
-.byte	188,182,218,33,16,255,243,210
-.byte	205,12,19,236,95,151,68,23
-.byte	196,167,126,61,100,93,25,115
-.byte	96,129,79,220,34,42,144,136
-.byte	70,238,184,20,222,94,11,219
-.byte	224,50,58,10,73,6,36,92
-.byte	194,211,172,98,145,149,228,121
-.byte	231,200,55,109,141,213,78,169
-.byte	108,86,244,234,101,122,174,8
-.byte	186,120,37,46,28,166,180,198
-.byte	232,221,116,31,75,189,139,138
-.byte	112,62,181,102,72,3,246,14
-.byte	97,53,87,185,134,193,29,158
-.byte	225,248,152,17,105,217,142,148
-.byte	155,30,135,233,206,85,40,223
-.byte	140,161,137,13,191,230,66,104
-.byte	65,153,45,15,176,84,187,22
-.byte	99,124,119,123,242,107,111,197
-.byte	48,1,103,43,254,215,171,118
-.byte	202,130,201,125,250,89,71,240
-.byte	173,212,162,175,156,164,114,192
-.byte	183,253,147,38,54,63,247,204
-.byte	52,165,229,241,113,216,49,21
-.byte	4,199,35,195,24,150,5,154
-.byte	7,18,128,226,235,39,178,117
-.byte	9,131,44,26,27,110,90,160
-.byte	82,59,214,179,41,227,47,132
-.byte	83,209,0,237,32,252,177,91
-.byte	106,203,190,57,74,76,88,207
-.byte	208,239,170,251,67,77,51,133
-.byte	69,249,2,127,80,60,159,168
-.byte	81,163,64,143,146,157,56,245
-.byte	188,182,218,33,16,255,243,210
-.byte	205,12,19,236,95,151,68,23
-.byte	196,167,126,61,100,93,25,115
-.byte	96,129,79,220,34,42,144,136
-.byte	70,238,184,20,222,94,11,219
-.byte	224,50,58,10,73,6,36,92
-.byte	194,211,172,98,145,149,228,121
-.byte	231,200,55,109,141,213,78,169
-.byte	108,86,244,234,101,122,174,8
-.byte	186,120,37,46,28,166,180,198
-.byte	232,221,116,31,75,189,139,138
-.byte	112,62,181,102,72,3,246,14
-.byte	97,53,87,185,134,193,29,158
-.byte	225,248,152,17,105,217,142,148
-.byte	155,30,135,233,206,85,40,223
-.byte	140,161,137,13,191,230,66,104
-.byte	65,153,45,15,176,84,187,22
-.byte	99,124,119,123,242,107,111,197
-.byte	48,1,103,43,254,215,171,118
-.byte	202,130,201,125,250,89,71,240
-.byte	173,212,162,175,156,164,114,192
-.byte	183,253,147,38,54,63,247,204
-.byte	52,165,229,241,113,216,49,21
-.byte	4,199,35,195,24,150,5,154
-.byte	7,18,128,226,235,39,178,117
-.byte	9,131,44,26,27,110,90,160
-.byte	82,59,214,179,41,227,47,132
-.byte	83,209,0,237,32,252,177,91
-.byte	106,203,190,57,74,76,88,207
-.byte	208,239,170,251,67,77,51,133
-.byte	69,249,2,127,80,60,159,168
-.byte	81,163,64,143,146,157,56,245
-.byte	188,182,218,33,16,255,243,210
-.byte	205,12,19,236,95,151,68,23
-.byte	196,167,126,61,100,93,25,115
-.byte	96,129,79,220,34,42,144,136
-.byte	70,238,184,20,222,94,11,219
-.byte	224,50,58,10,73,6,36,92
-.byte	194,211,172,98,145,149,228,121
-.byte	231,200,55,109,141,213,78,169
-.byte	108,86,244,234,101,122,174,8
-.byte	186,120,37,46,28,166,180,198
-.byte	232,221,116,31,75,189,139,138
-.byte	112,62,181,102,72,3,246,14
-.byte	97,53,87,185,134,193,29,158
-.byte	225,248,152,17,105,217,142,148
-.byte	155,30,135,233,206,85,40,223
-.byte	140,161,137,13,191,230,66,104
-.byte	65,153,45,15,176,84,187,22
-.byte	99,124,119,123,242,107,111,197
-.byte	48,1,103,43,254,215,171,118
-.byte	202,130,201,125,250,89,71,240
-.byte	173,212,162,175,156,164,114,192
-.byte	183,253,147,38,54,63,247,204
-.byte	52,165,229,241,113,216,49,21
-.byte	4,199,35,195,24,150,5,154
-.byte	7,18,128,226,235,39,178,117
-.byte	9,131,44,26,27,110,90,160
-.byte	82,59,214,179,41,227,47,132
-.byte	83,209,0,237,32,252,177,91
-.byte	106,203,190,57,74,76,88,207
-.byte	208,239,170,251,67,77,51,133
-.byte	69,249,2,127,80,60,159,168
-.byte	81,163,64,143,146,157,56,245
-.byte	188,182,218,33,16,255,243,210
-.byte	205,12,19,236,95,151,68,23
-.byte	196,167,126,61,100,93,25,115
-.byte	96,129,79,220,34,42,144,136
-.byte	70,238,184,20,222,94,11,219
-.byte	224,50,58,10,73,6,36,92
-.byte	194,211,172,98,145,149,228,121
-.byte	231,200,55,109,141,213,78,169
-.byte	108,86,244,234,101,122,174,8
-.byte	186,120,37,46,28,166,180,198
-.byte	232,221,116,31,75,189,139,138
-.byte	112,62,181,102,72,3,246,14
-.byte	97,53,87,185,134,193,29,158
-.byte	225,248,152,17,105,217,142,148
-.byte	155,30,135,233,206,85,40,223
-.byte	140,161,137,13,191,230,66,104
-.byte	65,153,45,15,176,84,187,22
-.long	1,2,4,8
-.long	16,32,64,128
-.long	27,54,0,0
-.long	0,0,0,0
-.size	_x86_AES_encrypt,.-_x86_AES_encrypt
-.globl	AES_encrypt
-.type	AES_encrypt,@function
-.align	16
-AES_encrypt:
-.L_AES_encrypt_begin:
-	pushl	%ebp
-	pushl	%ebx
-	pushl	%esi
-	pushl	%edi
-	movl	20(%esp),%esi
-	movl	28(%esp),%edi
-	movl	%esp,%eax
-	subl	$36,%esp
-	andl	$-64,%esp
-	leal	-127(%edi),%ebx
-	subl	%esp,%ebx
-	negl	%ebx
-	andl	$960,%ebx
-	subl	%ebx,%esp
-	addl	$4,%esp
-	movl	%eax,28(%esp)
-	call	.L004pic_point
-.L004pic_point:
-	popl	%ebp
-	leal	OPENSSL_ia32cap_P-.L004pic_point(%ebp),%eax
-	leal	.LAES_Te-.L004pic_point(%ebp),%ebp
-	leal	764(%esp),%ebx
-	subl	%ebp,%ebx
-	andl	$768,%ebx
-	leal	2176(%ebp,%ebx,1),%ebp
-	btl	$25,(%eax)
-	jnc	.L005x86
-	movq	(%esi),%mm0
-	movq	8(%esi),%mm4
-	call	_sse_AES_encrypt_compact
-	movl	28(%esp),%esp
-	movl	24(%esp),%esi
-	movq	%mm0,(%esi)
-	movq	%mm4,8(%esi)
-	emms
-	popl	%edi
-	popl	%esi
-	popl	%ebx
-	popl	%ebp
-	ret
-.align	16
-.L005x86:
-	movl	%ebp,24(%esp)
-	movl	(%esi),%eax
-	movl	4(%esi),%ebx
-	movl	8(%esi),%ecx
-	movl	12(%esi),%edx
-	call	_x86_AES_encrypt_compact
-	movl	28(%esp),%esp
-	movl	24(%esp),%esi
-	movl	%eax,(%esi)
-	movl	%ebx,4(%esi)
-	movl	%ecx,8(%esi)
-	movl	%edx,12(%esi)
-	popl	%edi
-	popl	%esi
-	popl	%ebx
-	popl	%ebp
-	ret
-.size	AES_encrypt,.-.L_AES_encrypt_begin
-.type	_x86_AES_decrypt_compact,@function
-.align	16
-_x86_AES_decrypt_compact:
-	movl	%edi,20(%esp)
-	xorl	(%edi),%eax
-	xorl	4(%edi),%ebx
-	xorl	8(%edi),%ecx
-	xorl	12(%edi),%edx
-	movl	240(%edi),%esi
-	leal	-2(%esi,%esi,1),%esi
-	leal	(%edi,%esi,8),%esi
-	movl	%esi,24(%esp)
-	movl	-128(%ebp),%edi
-	movl	-96(%ebp),%esi
-	movl	-64(%ebp),%edi
-	movl	-32(%ebp),%esi
-	movl	(%ebp),%edi
-	movl	32(%ebp),%esi
-	movl	64(%ebp),%edi
-	movl	96(%ebp),%esi
-.align	16
-.L006loop:
-	movl	%eax,%esi
-	andl	$255,%esi
-	movzbl	-128(%ebp,%esi,1),%esi
-	movzbl	%dh,%edi
-	movzbl	-128(%ebp,%edi,1),%edi
-	shll	$8,%edi
-	xorl	%edi,%esi
-	movl	%ecx,%edi
-	shrl	$16,%edi
-	andl	$255,%edi
-	movzbl	-128(%ebp,%edi,1),%edi
-	shll	$16,%edi
-	xorl	%edi,%esi
-	movl	%ebx,%edi
-	shrl	$24,%edi
-	movzbl	-128(%ebp,%edi,1),%edi
-	shll	$24,%edi
-	xorl	%edi,%esi
-	movl	%esi,4(%esp)
-	movl	%ebx,%esi
-	andl	$255,%esi
-	movzbl	-128(%ebp,%esi,1),%esi
-	movzbl	%ah,%edi
-	movzbl	-128(%ebp,%edi,1),%edi
-	shll	$8,%edi
-	xorl	%edi,%esi
-	movl	%edx,%edi
-	shrl	$16,%edi
-	andl	$255,%edi
-	movzbl	-128(%ebp,%edi,1),%edi
-	shll	$16,%edi
-	xorl	%edi,%esi
-	movl	%ecx,%edi
-	shrl	$24,%edi
-	movzbl	-128(%ebp,%edi,1),%edi
-	shll	$24,%edi
-	xorl	%edi,%esi
-	movl	%esi,8(%esp)
-	movl	%ecx,%esi
-	andl	$255,%esi
-	movzbl	-128(%ebp,%esi,1),%esi
-	movzbl	%bh,%edi
-	movzbl	-128(%ebp,%edi,1),%edi
-	shll	$8,%edi
-	xorl	%edi,%esi
-	movl	%eax,%edi
-	shrl	$16,%edi
-	andl	$255,%edi
-	movzbl	-128(%ebp,%edi,1),%edi
-	shll	$16,%edi
-	xorl	%edi,%esi
-	movl	%edx,%edi
-	shrl	$24,%edi
-	movzbl	-128(%ebp,%edi,1),%edi
-	shll	$24,%edi
-	xorl	%edi,%esi
-	andl	$255,%edx
-	movzbl	-128(%ebp,%edx,1),%edx
-	movzbl	%ch,%ecx
-	movzbl	-128(%ebp,%ecx,1),%ecx
-	shll	$8,%ecx
-	xorl	%ecx,%edx
-	movl	%esi,%ecx
-	shrl	$16,%ebx
-	andl	$255,%ebx
-	movzbl	-128(%ebp,%ebx,1),%ebx
-	shll	$16,%ebx
-	xorl	%ebx,%edx
-	shrl	$24,%eax
-	movzbl	-128(%ebp,%eax,1),%eax
-	shll	$24,%eax
-	xorl	%eax,%edx
-	movl	$2155905152,%edi
-	andl	%ecx,%edi
-	movl	%edi,%esi
-	shrl	$7,%edi
-	leal	(%ecx,%ecx,1),%eax
-	subl	%edi,%esi
-	andl	$4278124286,%eax
-	andl	$454761243,%esi
-	xorl	%esi,%eax
-	movl	$2155905152,%edi
-	andl	%eax,%edi
-	movl	%edi,%esi
-	shrl	$7,%edi
-	leal	(%eax,%eax,1),%ebx
-	subl	%edi,%esi
-	andl	$4278124286,%ebx
-	andl	$454761243,%esi
-	xorl	%ecx,%eax
-	xorl	%esi,%ebx
-	movl	$2155905152,%edi
-	andl	%ebx,%edi
-	movl	%edi,%esi
-	shrl	$7,%edi
-	leal	(%ebx,%ebx,1),%ebp
-	subl	%edi,%esi
-	andl	$4278124286,%ebp
-	andl	$454761243,%esi
-	xorl	%ecx,%ebx
-	roll	$8,%ecx
-	xorl	%esi,%ebp
-	xorl	%eax,%ecx
-	xorl	%ebp,%eax
-	xorl	%ebx,%ecx
-	xorl	%ebp,%ebx
-	roll	$24,%eax
-	xorl	%ebp,%ecx
-	roll	$16,%ebx
-	xorl	%eax,%ecx
-	roll	$8,%ebp
-	xorl	%ebx,%ecx
-	movl	4(%esp),%eax
-	xorl	%ebp,%ecx
-	movl	%ecx,12(%esp)
-	movl	$2155905152,%edi
-	andl	%edx,%edi
-	movl	%edi,%esi
-	shrl	$7,%edi
-	leal	(%edx,%edx,1),%ebx
-	subl	%edi,%esi
-	andl	$4278124286,%ebx
-	andl	$454761243,%esi
-	xorl	%esi,%ebx
-	movl	$2155905152,%edi
-	andl	%ebx,%edi
-	movl	%edi,%esi
-	shrl	$7,%edi
-	leal	(%ebx,%ebx,1),%ecx
-	subl	%edi,%esi
-	andl	$4278124286,%ecx
-	andl	$454761243,%esi
-	xorl	%edx,%ebx
-	xorl	%esi,%ecx
-	movl	$2155905152,%edi
-	andl	%ecx,%edi
-	movl	%edi,%esi
-	shrl	$7,%edi
-	leal	(%ecx,%ecx,1),%ebp
-	subl	%edi,%esi
-	andl	$4278124286,%ebp
-	andl	$454761243,%esi
-	xorl	%edx,%ecx
-	roll	$8,%edx
-	xorl	%esi,%ebp
-	xorl	%ebx,%edx
-	xorl	%ebp,%ebx
-	xorl	%ecx,%edx
-	xorl	%ebp,%ecx
-	roll	$24,%ebx
-	xorl	%ebp,%edx
-	roll	$16,%ecx
-	xorl	%ebx,%edx
-	roll	$8,%ebp
-	xorl	%ecx,%edx
-	movl	8(%esp),%ebx
-	xorl	%ebp,%edx
-	movl	%edx,16(%esp)
-	movl	$2155905152,%edi
-	andl	%eax,%edi
-	movl	%edi,%esi
-	shrl	$7,%edi
-	leal	(%eax,%eax,1),%ecx
-	subl	%edi,%esi
-	andl	$4278124286,%ecx
-	andl	$454761243,%esi
-	xorl	%esi,%ecx
-	movl	$2155905152,%edi
-	andl	%ecx,%edi
-	movl	%edi,%esi
-	shrl	$7,%edi
-	leal	(%ecx,%ecx,1),%edx
-	subl	%edi,%esi
-	andl	$4278124286,%edx
-	andl	$454761243,%esi
-	xorl	%eax,%ecx
-	xorl	%esi,%edx
-	movl	$2155905152,%edi
-	andl	%edx,%edi
-	movl	%edi,%esi
-	shrl	$7,%edi
-	leal	(%edx,%edx,1),%ebp
-	subl	%edi,%esi
-	andl	$4278124286,%ebp
-	andl	$454761243,%esi
-	xorl	%eax,%edx
-	roll	$8,%eax
-	xorl	%esi,%ebp
-	xorl	%ecx,%eax
-	xorl	%ebp,%ecx
-	xorl	%edx,%eax
-	xorl	%ebp,%edx
-	roll	$24,%ecx
-	xorl	%ebp,%eax
-	roll	$16,%edx
-	xorl	%ecx,%eax
-	roll	$8,%ebp
-	xorl	%edx,%eax
-	xorl	%ebp,%eax
-	movl	$2155905152,%edi
-	andl	%ebx,%edi
-	movl	%edi,%esi
-	shrl	$7,%edi
-	leal	(%ebx,%ebx,1),%ecx
-	subl	%edi,%esi
-	andl	$4278124286,%ecx
-	andl	$454761243,%esi
-	xorl	%esi,%ecx
-	movl	$2155905152,%edi
-	andl	%ecx,%edi
-	movl	%edi,%esi
-	shrl	$7,%edi
-	leal	(%ecx,%ecx,1),%edx
-	subl	%edi,%esi
-	andl	$4278124286,%edx
-	andl	$454761243,%esi
-	xorl	%ebx,%ecx
-	xorl	%esi,%edx
-	movl	$2155905152,%edi
-	andl	%edx,%edi
-	movl	%edi,%esi
-	shrl	$7,%edi
-	leal	(%edx,%edx,1),%ebp
-	subl	%edi,%esi
-	andl	$4278124286,%ebp
-	andl	$454761243,%esi
-	xorl	%ebx,%edx
-	roll	$8,%ebx
-	xorl	%esi,%ebp
-	xorl	%ecx,%ebx
-	xorl	%ebp,%ecx
-	xorl	%edx,%ebx
-	xorl	%ebp,%edx
-	roll	$24,%ecx
-	xorl	%ebp,%ebx
-	roll	$16,%edx
-	xorl	%ecx,%ebx
-	roll	$8,%ebp
-	xorl	%edx,%ebx
-	movl	12(%esp),%ecx
-	xorl	%ebp,%ebx
-	movl	16(%esp),%edx
-	movl	20(%esp),%edi
-	movl	28(%esp),%ebp
-	addl	$16,%edi
-	xorl	(%edi),%eax
-	xorl	4(%edi),%ebx
-	xorl	8(%edi),%ecx
-	xorl	12(%edi),%edx
-	cmpl	24(%esp),%edi
-	movl	%edi,20(%esp)
-	jb	.L006loop
-	movl	%eax,%esi
-	andl	$255,%esi
-	movzbl	-128(%ebp,%esi,1),%esi
-	movzbl	%dh,%edi
-	movzbl	-128(%ebp,%edi,1),%edi
-	shll	$8,%edi
-	xorl	%edi,%esi
-	movl	%ecx,%edi
-	shrl	$16,%edi
-	andl	$255,%edi
-	movzbl	-128(%ebp,%edi,1),%edi
-	shll	$16,%edi
-	xorl	%edi,%esi
-	movl	%ebx,%edi
-	shrl	$24,%edi
-	movzbl	-128(%ebp,%edi,1),%edi
-	shll	$24,%edi
-	xorl	%edi,%esi
-	movl	%esi,4(%esp)
-	movl	%ebx,%esi
-	andl	$255,%esi
-	movzbl	-128(%ebp,%esi,1),%esi
-	movzbl	%ah,%edi
-	movzbl	-128(%ebp,%edi,1),%edi
-	shll	$8,%edi
-	xorl	%edi,%esi
-	movl	%edx,%edi
-	shrl	$16,%edi
-	andl	$255,%edi
-	movzbl	-128(%ebp,%edi,1),%edi
-	shll	$16,%edi
-	xorl	%edi,%esi
-	movl	%ecx,%edi
-	shrl	$24,%edi
-	movzbl	-128(%ebp,%edi,1),%edi
-	shll	$24,%edi
-	xorl	%edi,%esi
-	movl	%esi,8(%esp)
-	movl	%ecx,%esi
-	andl	$255,%esi
-	movzbl	-128(%ebp,%esi,1),%esi
-	movzbl	%bh,%edi
-	movzbl	-128(%ebp,%edi,1),%edi
-	shll	$8,%edi
-	xorl	%edi,%esi
-	movl	%eax,%edi
-	shrl	$16,%edi
-	andl	$255,%edi
-	movzbl	-128(%ebp,%edi,1),%edi
-	shll	$16,%edi
-	xorl	%edi,%esi
-	movl	%edx,%edi
-	shrl	$24,%edi
-	movzbl	-128(%ebp,%edi,1),%edi
-	shll	$24,%edi
-	xorl	%edi,%esi
-	movl	20(%esp),%edi
-	andl	$255,%edx
-	movzbl	-128(%ebp,%edx,1),%edx
-	movzbl	%ch,%ecx
-	movzbl	-128(%ebp,%ecx,1),%ecx
-	shll	$8,%ecx
-	xorl	%ecx,%edx
-	movl	%esi,%ecx
-	shrl	$16,%ebx
-	andl	$255,%ebx
-	movzbl	-128(%ebp,%ebx,1),%ebx
-	shll	$16,%ebx
-	xorl	%ebx,%edx
-	movl	8(%esp),%ebx
-	shrl	$24,%eax
-	movzbl	-128(%ebp,%eax,1),%eax
-	shll	$24,%eax
-	xorl	%eax,%edx
-	movl	4(%esp),%eax
-	xorl	16(%edi),%eax
-	xorl	20(%edi),%ebx
-	xorl	24(%edi),%ecx
-	xorl	28(%edi),%edx
-	ret
-.size	_x86_AES_decrypt_compact,.-_x86_AES_decrypt_compact
-.type	_sse_AES_decrypt_compact,@function
-.align	16
-_sse_AES_decrypt_compact:
-	pxor	(%edi),%mm0
-	pxor	8(%edi),%mm4
-	movl	240(%edi),%esi
-	leal	-2(%esi,%esi,1),%esi
-	leal	(%edi,%esi,8),%esi
-	movl	%esi,24(%esp)
-	movl	$454761243,%eax
-	movl	%eax,8(%esp)
-	movl	%eax,12(%esp)
-	movl	-128(%ebp),%eax
-	movl	-96(%ebp),%ebx
-	movl	-64(%ebp),%ecx
-	movl	-32(%ebp),%edx
-	movl	(%ebp),%eax
-	movl	32(%ebp),%ebx
-	movl	64(%ebp),%ecx
-	movl	96(%ebp),%edx
-.align	16
-.L007loop:
-	pshufw	$12,%mm0,%mm1
-	pshufw	$9,%mm4,%mm5
-	movd	%mm1,%eax
-	movd	%mm5,%ebx
-	movl	%edi,20(%esp)
-	movzbl	%al,%esi
-	movzbl	%ah,%edx
-	pshufw	$6,%mm0,%mm2
-	movzbl	-128(%ebp,%esi,1),%ecx
-	movzbl	%bl,%edi
-	movzbl	-128(%ebp,%edx,1),%edx
-	shrl	$16,%eax
-	shll	$8,%edx
-	movzbl	-128(%ebp,%edi,1),%esi
-	movzbl	%bh,%edi
-	shll	$16,%esi
-	pshufw	$3,%mm4,%mm6
-	orl	%esi,%ecx
-	movzbl	-128(%ebp,%edi,1),%esi
-	movzbl	%ah,%edi
-	shll	$24,%esi
-	shrl	$16,%ebx
-	orl	%esi,%edx
-	movzbl	-128(%ebp,%edi,1),%esi
-	movzbl	%bh,%edi
-	shll	$24,%esi
-	orl	%esi,%ecx
-	movzbl	-128(%ebp,%edi,1),%esi
-	movzbl	%al,%edi
-	shll	$8,%esi
-	movd	%mm2,%eax
-	orl	%esi,%ecx
-	movzbl	-128(%ebp,%edi,1),%esi
-	movzbl	%bl,%edi
-	shll	$16,%esi
-	movd	%mm6,%ebx
-	movd	%ecx,%mm0
-	movzbl	-128(%ebp,%edi,1),%ecx
-	movzbl	%al,%edi
-	orl	%esi,%ecx
-	movzbl	-128(%ebp,%edi,1),%esi
-	movzbl	%bl,%edi
-	orl	%esi,%edx
-	movzbl	-128(%ebp,%edi,1),%esi
-	movzbl	%ah,%edi
-	shll	$16,%esi
-	shrl	$16,%eax
-	orl	%esi,%edx
-	movzbl	-128(%ebp,%edi,1),%esi
-	movzbl	%bh,%edi
-	shrl	$16,%ebx
-	shll	$8,%esi
-	movd	%edx,%mm1
-	movzbl	-128(%ebp,%edi,1),%edx
-	movzbl	%bh,%edi
-	shll	$24,%edx
-	andl	$255,%ebx
-	orl	%esi,%edx
-	punpckldq	%mm1,%mm0
-	movzbl	-128(%ebp,%edi,1),%esi
-	movzbl	%al,%edi
-	shll	$8,%esi
-	movzbl	%ah,%eax
-	movzbl	-128(%ebp,%ebx,1),%ebx
-	orl	%esi,%ecx
-	movzbl	-128(%ebp,%edi,1),%esi
-	orl	%ebx,%edx
-	shll	$16,%esi
-	movzbl	-128(%ebp,%eax,1),%eax
-	orl	%esi,%edx
-	shll	$24,%eax
-	orl	%eax,%ecx
-	movl	20(%esp),%edi
-	movd	%edx,%mm4
-	movd	%ecx,%mm5
-	punpckldq	%mm5,%mm4
-	addl	$16,%edi
-	cmpl	24(%esp),%edi
-	ja	.L008out
-	movq	%mm0,%mm3
-	movq	%mm4,%mm7
-	pshufw	$228,%mm0,%mm2
-	pshufw	$228,%mm4,%mm6
-	movq	%mm0,%mm1
-	movq	%mm4,%mm5
-	pshufw	$177,%mm0,%mm0
-	pshufw	$177,%mm4,%mm4
-	pslld	$8,%mm2
-	pslld	$8,%mm6
-	psrld	$8,%mm3
-	psrld	$8,%mm7
-	pxor	%mm2,%mm0
-	pxor	%mm6,%mm4
-	pxor	%mm3,%mm0
-	pxor	%mm7,%mm4
-	pslld	$16,%mm2
-	pslld	$16,%mm6
-	psrld	$16,%mm3
-	psrld	$16,%mm7
-	pxor	%mm2,%mm0
-	pxor	%mm6,%mm4
-	pxor	%mm3,%mm0
-	pxor	%mm7,%mm4
-	movq	8(%esp),%mm3
-	pxor	%mm2,%mm2
-	pxor	%mm6,%mm6
-	pcmpgtb	%mm1,%mm2
-	pcmpgtb	%mm5,%mm6
-	pand	%mm3,%mm2
-	pand	%mm3,%mm6
-	paddb	%mm1,%mm1
-	paddb	%mm5,%mm5
-	pxor	%mm2,%mm1
-	pxor	%mm6,%mm5
-	movq	%mm1,%mm3
-	movq	%mm5,%mm7
-	movq	%mm1,%mm2
-	movq	%mm5,%mm6
-	pxor	%mm1,%mm0
-	pxor	%mm5,%mm4
-	pslld	$24,%mm3
-	pslld	$24,%mm7
-	psrld	$8,%mm2
-	psrld	$8,%mm6
-	pxor	%mm3,%mm0
-	pxor	%mm7,%mm4
-	pxor	%mm2,%mm0
-	pxor	%mm6,%mm4
-	movq	8(%esp),%mm2
-	pxor	%mm3,%mm3
-	pxor	%mm7,%mm7
-	pcmpgtb	%mm1,%mm3
-	pcmpgtb	%mm5,%mm7
-	pand	%mm2,%mm3
-	pand	%mm2,%mm7
-	paddb	%mm1,%mm1
-	paddb	%mm5,%mm5
-	pxor	%mm3,%mm1
-	pxor	%mm7,%mm5
-	pshufw	$177,%mm1,%mm3
-	pshufw	$177,%mm5,%mm7
-	pxor	%mm1,%mm0
-	pxor	%mm5,%mm4
-	pxor	%mm3,%mm0
-	pxor	%mm7,%mm4
-	pxor	%mm3,%mm3
-	pxor	%mm7,%mm7
-	pcmpgtb	%mm1,%mm3
-	pcmpgtb	%mm5,%mm7
-	pand	%mm2,%mm3
-	pand	%mm2,%mm7
-	paddb	%mm1,%mm1
-	paddb	%mm5,%mm5
-	pxor	%mm3,%mm1
-	pxor	%mm7,%mm5
-	pxor	%mm1,%mm0
-	pxor	%mm5,%mm4
-	movq	%mm1,%mm3
-	movq	%mm5,%mm7
-	pshufw	$177,%mm1,%mm2
-	pshufw	$177,%mm5,%mm6
-	pxor	%mm2,%mm0
-	pxor	%mm6,%mm4
-	pslld	$8,%mm1
-	pslld	$8,%mm5
-	psrld	$8,%mm3
-	psrld	$8,%mm7
-	movq	(%edi),%mm2
-	movq	8(%edi),%mm6
-	pxor	%mm1,%mm0
-	pxor	%mm5,%mm4
-	pxor	%mm3,%mm0
-	pxor	%mm7,%mm4
-	movl	-128(%ebp),%eax
-	pslld	$16,%mm1
-	pslld	$16,%mm5
-	movl	-64(%ebp),%ebx
-	psrld	$16,%mm3
-	psrld	$16,%mm7
-	movl	(%ebp),%ecx
-	pxor	%mm1,%mm0
-	pxor	%mm5,%mm4
-	movl	64(%ebp),%edx
-	pxor	%mm3,%mm0
-	pxor	%mm7,%mm4
-	pxor	%mm2,%mm0
-	pxor	%mm6,%mm4
-	jmp	.L007loop
-.align	16
-.L008out:
-	pxor	(%edi),%mm0
-	pxor	8(%edi),%mm4
-	ret
-.size	_sse_AES_decrypt_compact,.-_sse_AES_decrypt_compact
-.type	_x86_AES_decrypt,@function
-.align	16
-_x86_AES_decrypt:
-	movl	%edi,20(%esp)
-	xorl	(%edi),%eax
-	xorl	4(%edi),%ebx
-	xorl	8(%edi),%ecx
-	xorl	12(%edi),%edx
-	movl	240(%edi),%esi
-	leal	-2(%esi,%esi,1),%esi
-	leal	(%edi,%esi,8),%esi
-	movl	%esi,24(%esp)
-.align	16
-.L009loop:
-	movl	%eax,%esi
-	andl	$255,%esi
-	movl	(%ebp,%esi,8),%esi
-	movzbl	%dh,%edi
-	xorl	3(%ebp,%edi,8),%esi
-	movl	%ecx,%edi
-	shrl	$16,%edi
-	andl	$255,%edi
-	xorl	2(%ebp,%edi,8),%esi
-	movl	%ebx,%edi
-	shrl	$24,%edi
-	xorl	1(%ebp,%edi,8),%esi
-	movl	%esi,4(%esp)
-
-	movl	%ebx,%esi
-	andl	$255,%esi
-	movl	(%ebp,%esi,8),%esi
-	movzbl	%ah,%edi
-	xorl	3(%ebp,%edi,8),%esi
-	movl	%edx,%edi
-	shrl	$16,%edi
-	andl	$255,%edi
-	xorl	2(%ebp,%edi,8),%esi
-	movl	%ecx,%edi
-	shrl	$24,%edi
-	xorl	1(%ebp,%edi,8),%esi
-	movl	%esi,8(%esp)
-
-	movl	%ecx,%esi
-	andl	$255,%esi
-	movl	(%ebp,%esi,8),%esi
-	movzbl	%bh,%edi
-	xorl	3(%ebp,%edi,8),%esi
-	movl	%eax,%edi
-	shrl	$16,%edi
-	andl	$255,%edi
-	xorl	2(%ebp,%edi,8),%esi
-	movl	%edx,%edi
-	shrl	$24,%edi
-	xorl	1(%ebp,%edi,8),%esi
-
-	movl	20(%esp),%edi
-	andl	$255,%edx
-	movl	(%ebp,%edx,8),%edx
-	movzbl	%ch,%ecx
-	xorl	3(%ebp,%ecx,8),%edx
-	movl	%esi,%ecx
-	shrl	$16,%ebx
-	andl	$255,%ebx
-	xorl	2(%ebp,%ebx,8),%edx
-	movl	8(%esp),%ebx
-	shrl	$24,%eax
-	xorl	1(%ebp,%eax,8),%edx
-	movl	4(%esp),%eax
-
-	addl	$16,%edi
-	xorl	(%edi),%eax
-	xorl	4(%edi),%ebx
-	xorl	8(%edi),%ecx
-	xorl	12(%edi),%edx
-	cmpl	24(%esp),%edi
-	movl	%edi,20(%esp)
-	jb	.L009loop
-	leal	2176(%ebp),%ebp
-	movl	-128(%ebp),%edi
-	movl	-96(%ebp),%esi
-	movl	-64(%ebp),%edi
-	movl	-32(%ebp),%esi
-	movl	(%ebp),%edi
-	movl	32(%ebp),%esi
-	movl	64(%ebp),%edi
-	movl	96(%ebp),%esi
-	leal	-128(%ebp),%ebp
-	movl	%eax,%esi
-	andl	$255,%esi
-	movzbl	(%ebp,%esi,1),%esi
-	movzbl	%dh,%edi
-	movzbl	(%ebp,%edi,1),%edi
-	shll	$8,%edi
-	xorl	%edi,%esi
-	movl	%ecx,%edi
-	shrl	$16,%edi
-	andl	$255,%edi
-	movzbl	(%ebp,%edi,1),%edi
-	shll	$16,%edi
-	xorl	%edi,%esi
-	movl	%ebx,%edi
-	shrl	$24,%edi
-	movzbl	(%ebp,%edi,1),%edi
-	shll	$24,%edi
-	xorl	%edi,%esi
-	movl	%esi,4(%esp)
-	movl	%ebx,%esi
-	andl	$255,%esi
-	movzbl	(%ebp,%esi,1),%esi
-	movzbl	%ah,%edi
-	movzbl	(%ebp,%edi,1),%edi
-	shll	$8,%edi
-	xorl	%edi,%esi
-	movl	%edx,%edi
-	shrl	$16,%edi
-	andl	$255,%edi
-	movzbl	(%ebp,%edi,1),%edi
-	shll	$16,%edi
-	xorl	%edi,%esi
-	movl	%ecx,%edi
-	shrl	$24,%edi
-	movzbl	(%ebp,%edi,1),%edi
-	shll	$24,%edi
-	xorl	%edi,%esi
-	movl	%esi,8(%esp)
-	movl	%ecx,%esi
-	andl	$255,%esi
-	movzbl	(%ebp,%esi,1),%esi
-	movzbl	%bh,%edi
-	movzbl	(%ebp,%edi,1),%edi
-	shll	$8,%edi
-	xorl	%edi,%esi
-	movl	%eax,%edi
-	shrl	$16,%edi
-	andl	$255,%edi
-	movzbl	(%ebp,%edi,1),%edi
-	shll	$16,%edi
-	xorl	%edi,%esi
-	movl	%edx,%edi
-	shrl	$24,%edi
-	movzbl	(%ebp,%edi,1),%edi
-	shll	$24,%edi
-	xorl	%edi,%esi
-	movl	20(%esp),%edi
-	andl	$255,%edx
-	movzbl	(%ebp,%edx,1),%edx
-	movzbl	%ch,%ecx
-	movzbl	(%ebp,%ecx,1),%ecx
-	shll	$8,%ecx
-	xorl	%ecx,%edx
-	movl	%esi,%ecx
-	shrl	$16,%ebx
-	andl	$255,%ebx
-	movzbl	(%ebp,%ebx,1),%ebx
-	shll	$16,%ebx
-	xorl	%ebx,%edx
-	movl	8(%esp),%ebx
-	shrl	$24,%eax
-	movzbl	(%ebp,%eax,1),%eax
-	shll	$24,%eax
-	xorl	%eax,%edx
-	movl	4(%esp),%eax
-	leal	-2048(%ebp),%ebp
-	addl	$16,%edi
-	xorl	(%edi),%eax
-	xorl	4(%edi),%ebx
-	xorl	8(%edi),%ecx
-	xorl	12(%edi),%edx
-	ret
-.align	64
-.LAES_Td:
-.long	1353184337,1353184337
-.long	1399144830,1399144830
-.long	3282310938,3282310938
-.long	2522752826,2522752826
-.long	3412831035,3412831035
-.long	4047871263,4047871263
-.long	2874735276,2874735276
-.long	2466505547,2466505547
-.long	1442459680,1442459680
-.long	4134368941,4134368941
-.long	2440481928,2440481928
-.long	625738485,625738485
-.long	4242007375,4242007375
-.long	3620416197,3620416197
-.long	2151953702,2151953702
-.long	2409849525,2409849525
-.long	1230680542,1230680542
-.long	1729870373,1729870373
-.long	2551114309,2551114309
-.long	3787521629,3787521629
-.long	41234371,41234371
-.long	317738113,317738113
-.long	2744600205,2744600205
-.long	3338261355,3338261355
-.long	3881799427,3881799427
-.long	2510066197,2510066197
-.long	3950669247,3950669247
-.long	3663286933,3663286933
-.long	763608788,763608788
-.long	3542185048,3542185048
-.long	694804553,694804553
-.long	1154009486,1154009486
-.long	1787413109,1787413109
-.long	2021232372,2021232372
-.long	1799248025,1799248025
-.long	3715217703,3715217703
-.long	3058688446,3058688446
-.long	397248752,397248752
-.long	1722556617,1722556617
-.long	3023752829,3023752829
-.long	407560035,407560035
-.long	2184256229,2184256229
-.long	1613975959,1613975959
-.long	1165972322,1165972322
-.long	3765920945,3765920945
-.long	2226023355,2226023355
-.long	480281086,480281086
-.long	2485848313,2485848313
-.long	1483229296,1483229296
-.long	436028815,436028815
-.long	2272059028,2272059028
-.long	3086515026,3086515026
-.long	601060267,601060267
-.long	3791801202,3791801202
-.long	1468997603,1468997603
-.long	715871590,715871590
-.long	120122290,120122290
-.long	63092015,63092015
-.long	2591802758,2591802758
-.long	2768779219,2768779219
-.long	4068943920,4068943920
-.long	2997206819,2997206819
-.long	3127509762,3127509762
-.long	1552029421,1552029421
-.long	723308426,723308426
-.long	2461301159,2461301159
-.long	4042393587,4042393587
-.long	2715969870,2715969870
-.long	3455375973,3455375973
-.long	3586000134,3586000134
-.long	526529745,526529745
-.long	2331944644,2331944644
-.long	2639474228,2639474228
-.long	2689987490,2689987490
-.long	853641733,853641733
-.long	1978398372,1978398372
-.long	971801355,971801355
-.long	2867814464,2867814464
-.long	111112542,111112542
-.long	1360031421,1360031421
-.long	4186579262,4186579262
-.long	1023860118,1023860118
-.long	2919579357,2919579357
-.long	1186850381,1186850381
-.long	3045938321,3045938321
-.long	90031217,90031217
-.long	1876166148,1876166148
-.long	4279586912,4279586912
-.long	620468249,620468249
-.long	2548678102,2548678102
-.long	3426959497,3426959497
-.long	2006899047,2006899047
-.long	3175278768,3175278768
-.long	2290845959,2290845959
-.long	945494503,945494503
-.long	3689859193,3689859193
-.long	1191869601,1191869601
-.long	3910091388,3910091388
-.long	3374220536,3374220536
-.long	0,0
-.long	2206629897,2206629897
-.long	1223502642,1223502642
-.long	2893025566,2893025566
-.long	1316117100,1316117100
-.long	4227796733,4227796733
-.long	1446544655,1446544655
-.long	517320253,517320253
-.long	658058550,658058550
-.long	1691946762,1691946762
-.long	564550760,564550760
-.long	3511966619,3511966619
-.long	976107044,976107044
-.long	2976320012,2976320012
-.long	266819475,266819475
-.long	3533106868,3533106868
-.long	2660342555,2660342555
-.long	1338359936,1338359936
-.long	2720062561,2720062561
-.long	1766553434,1766553434
-.long	370807324,370807324
-.long	179999714,179999714
-.long	3844776128,3844776128
-.long	1138762300,1138762300
-.long	488053522,488053522
-.long	185403662,185403662
-.long	2915535858,2915535858
-.long	3114841645,3114841645
-.long	3366526484,3366526484
-.long	2233069911,2233069911
-.long	1275557295,1275557295
-.long	3151862254,3151862254
-.long	4250959779,4250959779
-.long	2670068215,2670068215
-.long	3170202204,3170202204
-.long	3309004356,3309004356
-.long	880737115,880737115
-.long	1982415755,1982415755
-.long	3703972811,3703972811
-.long	1761406390,1761406390
-.long	1676797112,1676797112
-.long	3403428311,3403428311
-.long	277177154,277177154
-.long	1076008723,1076008723
-.long	538035844,538035844
-.long	2099530373,2099530373
-.long	4164795346,4164795346
-.long	288553390,288553390
-.long	1839278535,1839278535
-.long	1261411869,1261411869
-.long	4080055004,4080055004
-.long	3964831245,3964831245
-.long	3504587127,3504587127
-.long	1813426987,1813426987
-.long	2579067049,2579067049
-.long	4199060497,4199060497
-.long	577038663,577038663
-.long	3297574056,3297574056
-.long	440397984,440397984
-.long	3626794326,3626794326
-.long	4019204898,4019204898
-.long	3343796615,3343796615
-.long	3251714265,3251714265
-.long	4272081548,4272081548
-.long	906744984,906744984
-.long	3481400742,3481400742
-.long	685669029,685669029
-.long	646887386,646887386
-.long	2764025151,2764025151
-.long	3835509292,3835509292
-.long	227702864,227702864
-.long	2613862250,2613862250
-.long	1648787028,1648787028
-.long	3256061430,3256061430
-.long	3904428176,3904428176
-.long	1593260334,1593260334
-.long	4121936770,4121936770
-.long	3196083615,3196083615
-.long	2090061929,2090061929
-.long	2838353263,2838353263
-.long	3004310991,3004310991
-.long	999926984,999926984
-.long	2809993232,2809993232
-.long	1852021992,1852021992
-.long	2075868123,2075868123
-.long	158869197,158869197
-.long	4095236462,4095236462
-.long	28809964,28809964
-.long	2828685187,2828685187
-.long	1701746150,1701746150
-.long	2129067946,2129067946
-.long	147831841,147831841
-.long	3873969647,3873969647
-.long	3650873274,3650873274
-.long	3459673930,3459673930
-.long	3557400554,3557400554
-.long	3598495785,3598495785
-.long	2947720241,2947720241
-.long	824393514,824393514
-.long	815048134,815048134
-.long	3227951669,3227951669
-.long	935087732,935087732
-.long	2798289660,2798289660
-.long	2966458592,2966458592
-.long	366520115,366520115
-.long	1251476721,1251476721
-.long	4158319681,4158319681
-.long	240176511,240176511
-.long	804688151,804688151
-.long	2379631990,2379631990
-.long	1303441219,1303441219
-.long	1414376140,1414376140
-.long	3741619940,3741619940
-.long	3820343710,3820343710
-.long	461924940,461924940
-.long	3089050817,3089050817
-.long	2136040774,2136040774
-.long	82468509,82468509
-.long	1563790337,1563790337
-.long	1937016826,1937016826
-.long	776014843,776014843
-.long	1511876531,1511876531
-.long	1389550482,1389550482
-.long	861278441,861278441
-.long	323475053,323475053
-.long	2355222426,2355222426
-.long	2047648055,2047648055
-.long	2383738969,2383738969
-.long	2302415851,2302415851
-.long	3995576782,3995576782
-.long	902390199,902390199
-.long	3991215329,3991215329
-.long	1018251130,1018251130
-.long	1507840668,1507840668
-.long	1064563285,1064563285
-.long	2043548696,2043548696
-.long	3208103795,3208103795
-.long	3939366739,3939366739
-.long	1537932639,1537932639
-.long	342834655,342834655
-.long	2262516856,2262516856
-.long	2180231114,2180231114
-.long	1053059257,1053059257
-.long	741614648,741614648
-.long	1598071746,1598071746
-.long	1925389590,1925389590
-.long	203809468,203809468
-.long	2336832552,2336832552
-.long	1100287487,1100287487
-.long	1895934009,1895934009
-.long	3736275976,3736275976
-.long	2632234200,2632234200
-.long	2428589668,2428589668
-.long	1636092795,1636092795
-.long	1890988757,1890988757
-.long	1952214088,1952214088
-.long	1113045200,1113045200
-.byte	82,9,106,213,48,54,165,56
-.byte	191,64,163,158,129,243,215,251
-.byte	124,227,57,130,155,47,255,135
-.byte	52,142,67,68,196,222,233,203
-.byte	84,123,148,50,166,194,35,61
-.byte	238,76,149,11,66,250,195,78
-.byte	8,46,161,102,40,217,36,178
-.byte	118,91,162,73,109,139,209,37
-.byte	114,248,246,100,134,104,152,22
-.byte	212,164,92,204,93,101,182,146
-.byte	108,112,72,80,253,237,185,218
-.byte	94,21,70,87,167,141,157,132
-.byte	144,216,171,0,140,188,211,10
-.byte	247,228,88,5,184,179,69,6
-.byte	208,44,30,143,202,63,15,2
-.byte	193,175,189,3,1,19,138,107
-.byte	58,145,17,65,79,103,220,234
-.byte	151,242,207,206,240,180,230,115
-.byte	150,172,116,34,231,173,53,133
-.byte	226,249,55,232,28,117,223,110
-.byte	71,241,26,113,29,41,197,137
-.byte	111,183,98,14,170,24,190,27
-.byte	252,86,62,75,198,210,121,32
-.byte	154,219,192,254,120,205,90,244
-.byte	31,221,168,51,136,7,199,49
-.byte	177,18,16,89,39,128,236,95
-.byte	96,81,127,169,25,181,74,13
-.byte	45,229,122,159,147,201,156,239
-.byte	160,224,59,77,174,42,245,176
-.byte	200,235,187,60,131,83,153,97
-.byte	23,43,4,126,186,119,214,38
-.byte	225,105,20,99,85,33,12,125
-.byte	82,9,106,213,48,54,165,56
-.byte	191,64,163,158,129,243,215,251
-.byte	124,227,57,130,155,47,255,135
-.byte	52,142,67,68,196,222,233,203
-.byte	84,123,148,50,166,194,35,61
-.byte	238,76,149,11,66,250,195,78
-.byte	8,46,161,102,40,217,36,178
-.byte	118,91,162,73,109,139,209,37
-.byte	114,248,246,100,134,104,152,22
-.byte	212,164,92,204,93,101,182,146
-.byte	108,112,72,80,253,237,185,218
-.byte	94,21,70,87,167,141,157,132
-.byte	144,216,171,0,140,188,211,10
-.byte	247,228,88,5,184,179,69,6
-.byte	208,44,30,143,202,63,15,2
-.byte	193,175,189,3,1,19,138,107
-.byte	58,145,17,65,79,103,220,234
-.byte	151,242,207,206,240,180,230,115
-.byte	150,172,116,34,231,173,53,133
-.byte	226,249,55,232,28,117,223,110
-.byte	71,241,26,113,29,41,197,137
-.byte	111,183,98,14,170,24,190,27
-.byte	252,86,62,75,198,210,121,32
-.byte	154,219,192,254,120,205,90,244
-.byte	31,221,168,51,136,7,199,49
-.byte	177,18,16,89,39,128,236,95
-.byte	96,81,127,169,25,181,74,13
-.byte	45,229,122,159,147,201,156,239
-.byte	160,224,59,77,174,42,245,176
-.byte	200,235,187,60,131,83,153,97
-.byte	23,43,4,126,186,119,214,38
-.byte	225,105,20,99,85,33,12,125
-.byte	82,9,106,213,48,54,165,56
-.byte	191,64,163,158,129,243,215,251
-.byte	124,227,57,130,155,47,255,135
-.byte	52,142,67,68,196,222,233,203
-.byte	84,123,148,50,166,194,35,61
-.byte	238,76,149,11,66,250,195,78
-.byte	8,46,161,102,40,217,36,178
-.byte	118,91,162,73,109,139,209,37
-.byte	114,248,246,100,134,104,152,22
-.byte	212,164,92,204,93,101,182,146
-.byte	108,112,72,80,253,237,185,218
-.byte	94,21,70,87,167,141,157,132
-.byte	144,216,171,0,140,188,211,10
-.byte	247,228,88,5,184,179,69,6
-.byte	208,44,30,143,202,63,15,2
-.byte	193,175,189,3,1,19,138,107
-.byte	58,145,17,65,79,103,220,234
-.byte	151,242,207,206,240,180,230,115
-.byte	150,172,116,34,231,173,53,133
-.byte	226,249,55,232,28,117,223,110
-.byte	71,241,26,113,29,41,197,137
-.byte	111,183,98,14,170,24,190,27
-.byte	252,86,62,75,198,210,121,32
-.byte	154,219,192,254,120,205,90,244
-.byte	31,221,168,51,136,7,199,49
-.byte	177,18,16,89,39,128,236,95
-.byte	96,81,127,169,25,181,74,13
-.byte	45,229,122,159,147,201,156,239
-.byte	160,224,59,77,174,42,245,176
-.byte	200,235,187,60,131,83,153,97
-.byte	23,43,4,126,186,119,214,38
-.byte	225,105,20,99,85,33,12,125
-.byte	82,9,106,213,48,54,165,56
-.byte	191,64,163,158,129,243,215,251
-.byte	124,227,57,130,155,47,255,135
-.byte	52,142,67,68,196,222,233,203
-.byte	84,123,148,50,166,194,35,61
-.byte	238,76,149,11,66,250,195,78
-.byte	8,46,161,102,40,217,36,178
-.byte	118,91,162,73,109,139,209,37
-.byte	114,248,246,100,134,104,152,22
-.byte	212,164,92,204,93,101,182,146
-.byte	108,112,72,80,253,237,185,218
-.byte	94,21,70,87,167,141,157,132
-.byte	144,216,171,0,140,188,211,10
-.byte	247,228,88,5,184,179,69,6
-.byte	208,44,30,143,202,63,15,2
-.byte	193,175,189,3,1,19,138,107
-.byte	58,145,17,65,79,103,220,234
-.byte	151,242,207,206,240,180,230,115
-.byte	150,172,116,34,231,173,53,133
-.byte	226,249,55,232,28,117,223,110
-.byte	71,241,26,113,29,41,197,137
-.byte	111,183,98,14,170,24,190,27
-.byte	252,86,62,75,198,210,121,32
-.byte	154,219,192,254,120,205,90,244
-.byte	31,221,168,51,136,7,199,49
-.byte	177,18,16,89,39,128,236,95
-.byte	96,81,127,169,25,181,74,13
-.byte	45,229,122,159,147,201,156,239
-.byte	160,224,59,77,174,42,245,176
-.byte	200,235,187,60,131,83,153,97
-.byte	23,43,4,126,186,119,214,38
-.byte	225,105,20,99,85,33,12,125
-.size	_x86_AES_decrypt,.-_x86_AES_decrypt
-.globl	AES_decrypt
-.type	AES_decrypt,@function
-.align	16
-AES_decrypt:
-.L_AES_decrypt_begin:
-	pushl	%ebp
-	pushl	%ebx
-	pushl	%esi
-	pushl	%edi
-	movl	20(%esp),%esi
-	movl	28(%esp),%edi
-	movl	%esp,%eax
-	subl	$36,%esp
-	andl	$-64,%esp
-	leal	-127(%edi),%ebx
-	subl	%esp,%ebx
-	negl	%ebx
-	andl	$960,%ebx
-	subl	%ebx,%esp
-	addl	$4,%esp
-	movl	%eax,28(%esp)
-	call	.L010pic_point
-.L010pic_point:
-	popl	%ebp
-	leal	OPENSSL_ia32cap_P-.L010pic_point(%ebp),%eax
-	leal	.LAES_Td-.L010pic_point(%ebp),%ebp
-	leal	764(%esp),%ebx
-	subl	%ebp,%ebx
-	andl	$768,%ebx
-	leal	2176(%ebp,%ebx,1),%ebp
-	btl	$25,(%eax)
-	jnc	.L011x86
-	movq	(%esi),%mm0
-	movq	8(%esi),%mm4
-	call	_sse_AES_decrypt_compact
-	movl	28(%esp),%esp
-	movl	24(%esp),%esi
-	movq	%mm0,(%esi)
-	movq	%mm4,8(%esi)
-	emms
-	popl	%edi
-	popl	%esi
-	popl	%ebx
-	popl	%ebp
-	ret
-.align	16
-.L011x86:
-	movl	%ebp,24(%esp)
-	movl	(%esi),%eax
-	movl	4(%esi),%ebx
-	movl	8(%esi),%ecx
-	movl	12(%esi),%edx
-	call	_x86_AES_decrypt_compact
-	movl	28(%esp),%esp
-	movl	24(%esp),%esi
-	movl	%eax,(%esi)
-	movl	%ebx,4(%esi)
-	movl	%ecx,8(%esi)
-	movl	%edx,12(%esi)
-	popl	%edi
-	popl	%esi
-	popl	%ebx
-	popl	%ebp
-	ret
-.size	AES_decrypt,.-.L_AES_decrypt_begin
-.globl	AES_cbc_encrypt
-.type	AES_cbc_encrypt,@function
-.align	16
-AES_cbc_encrypt:
-.L_AES_cbc_encrypt_begin:
-	pushl	%ebp
-	pushl	%ebx
-	pushl	%esi
-	pushl	%edi
-	movl	28(%esp),%ecx
-	cmpl	$0,%ecx
-	je	.L012drop_out
-	call	.L013pic_point
-.L013pic_point:
-	popl	%ebp
-	leal	OPENSSL_ia32cap_P-.L013pic_point(%ebp),%eax
-	cmpl	$0,40(%esp)
-	leal	.LAES_Te-.L013pic_point(%ebp),%ebp
-	jne	.L014picked_te
-	leal	.LAES_Td-.LAES_Te(%ebp),%ebp
-.L014picked_te:
-	pushfl
-	cld
-	cmpl	$512,%ecx
-	jb	.L015slow_way
-	testl	$15,%ecx
-	jnz	.L015slow_way
-	btl	$28,(%eax)
-	jc	.L015slow_way
-	leal	-324(%esp),%esi
-	andl	$-64,%esi
-	movl	%ebp,%eax
-	leal	2304(%ebp),%ebx
-	movl	%esi,%edx
-	andl	$4095,%eax
-	andl	$4095,%ebx
-	andl	$4095,%edx
-	cmpl	%ebx,%edx
-	jb	.L016tbl_break_out
-	subl	%ebx,%edx
-	subl	%edx,%esi
-	jmp	.L017tbl_ok
-.align	4
-.L016tbl_break_out:
-	subl	%eax,%edx
-	andl	$4095,%edx
-	addl	$384,%edx
-	subl	%edx,%esi
-.align	4
-.L017tbl_ok:
-	leal	24(%esp),%edx
-	xchgl	%esi,%esp
-	addl	$4,%esp
-	movl	%ebp,24(%esp)
-	movl	%esi,28(%esp)
-	movl	(%edx),%eax
-	movl	4(%edx),%ebx
-	movl	12(%edx),%edi
-	movl	16(%edx),%esi
-	movl	20(%edx),%edx
-	movl	%eax,32(%esp)
-	movl	%ebx,36(%esp)
-	movl	%ecx,40(%esp)
-	movl	%edi,44(%esp)
-	movl	%esi,48(%esp)
-	movl	$0,316(%esp)
-	movl	%edi,%ebx
-	movl	$61,%ecx
-	subl	%ebp,%ebx
-	movl	%edi,%esi
-	andl	$4095,%ebx
-	leal	76(%esp),%edi
-	cmpl	$2304,%ebx
-	jb	.L018do_copy
-	cmpl	$3852,%ebx
-	jb	.L019skip_copy
-.align	4
-.L018do_copy:
-	movl	%edi,44(%esp)
-.long	2784229001
-.L019skip_copy:
-	movl	$16,%edi
-.align	4
-.L020prefetch_tbl:
-	movl	(%ebp),%eax
-	movl	32(%ebp),%ebx
-	movl	64(%ebp),%ecx
-	movl	96(%ebp),%esi
-	leal	128(%ebp),%ebp
-	subl	$1,%edi
-	jnz	.L020prefetch_tbl
-	subl	$2048,%ebp
-	movl	32(%esp),%esi
-	movl	48(%esp),%edi
-	cmpl	$0,%edx
-	je	.L021fast_decrypt
-	movl	(%edi),%eax
-	movl	4(%edi),%ebx
-.align	16
-.L022fast_enc_loop:
-	movl	8(%edi),%ecx
-	movl	12(%edi),%edx
-	xorl	(%esi),%eax
-	xorl	4(%esi),%ebx
-	xorl	8(%esi),%ecx
-	xorl	12(%esi),%edx
-	movl	44(%esp),%edi
-	call	_x86_AES_encrypt
-	movl	32(%esp),%esi
-	movl	36(%esp),%edi
-	movl	%eax,(%edi)
-	movl	%ebx,4(%edi)
-	movl	%ecx,8(%edi)
-	movl	%edx,12(%edi)
-	leal	16(%esi),%esi
-	movl	40(%esp),%ecx
-	movl	%esi,32(%esp)
-	leal	16(%edi),%edx
-	movl	%edx,36(%esp)
-	subl	$16,%ecx
-	movl	%ecx,40(%esp)
-	jnz	.L022fast_enc_loop
-	movl	48(%esp),%esi
-	movl	8(%edi),%ecx
-	movl	12(%edi),%edx
-	movl	%eax,(%esi)
-	movl	%ebx,4(%esi)
-	movl	%ecx,8(%esi)
-	movl	%edx,12(%esi)
-	cmpl	$0,316(%esp)
-	movl	44(%esp),%edi
-	je	.L023skip_ezero
-	movl	$60,%ecx
-	xorl	%eax,%eax
-.align	4
-.long	2884892297
-.L023skip_ezero:
-	movl	28(%esp),%esp
-	popfl
-.L012drop_out:
-	popl	%edi
-	popl	%esi
-	popl	%ebx
-	popl	%ebp
-	ret
-	pushfl
-.align	16
-.L021fast_decrypt:
-	cmpl	36(%esp),%esi
-	je	.L024fast_dec_in_place
-	movl	%edi,52(%esp)
-.align	4
-.align	16
-.L025fast_dec_loop:
-	movl	(%esi),%eax
-	movl	4(%esi),%ebx
-	movl	8(%esi),%ecx
-	movl	12(%esi),%edx
-	movl	44(%esp),%edi
-	call	_x86_AES_decrypt
-	movl	52(%esp),%edi
-	movl	40(%esp),%esi
-	xorl	(%edi),%eax
-	xorl	4(%edi),%ebx
-	xorl	8(%edi),%ecx
-	xorl	12(%edi),%edx
-	movl	36(%esp),%edi
-	movl	32(%esp),%esi
-	movl	%eax,(%edi)
-	movl	%ebx,4(%edi)
-	movl	%ecx,8(%edi)
-	movl	%edx,12(%edi)
-	movl	40(%esp),%ecx
-	movl	%esi,52(%esp)
-	leal	16(%esi),%esi
-	movl	%esi,32(%esp)
-	leal	16(%edi),%edi
-	movl	%edi,36(%esp)
-	subl	$16,%ecx
-	movl	%ecx,40(%esp)
-	jnz	.L025fast_dec_loop
-	movl	52(%esp),%edi
-	movl	48(%esp),%esi
-	movl	(%edi),%eax
-	movl	4(%edi),%ebx
-	movl	8(%edi),%ecx
-	movl	12(%edi),%edx
-	movl	%eax,(%esi)
-	movl	%ebx,4(%esi)
-	movl	%ecx,8(%esi)
-	movl	%edx,12(%esi)
-	jmp	.L026fast_dec_out
-.align	16
-.L024fast_dec_in_place:
-.L027fast_dec_in_place_loop:
-	movl	(%esi),%eax
-	movl	4(%esi),%ebx
-	movl	8(%esi),%ecx
-	movl	12(%esi),%edx
-	leal	60(%esp),%edi
-	movl	%eax,(%edi)
-	movl	%ebx,4(%edi)
-	movl	%ecx,8(%edi)
-	movl	%edx,12(%edi)
-	movl	44(%esp),%edi
-	call	_x86_AES_decrypt
-	movl	48(%esp),%edi
-	movl	36(%esp),%esi
-	xorl	(%edi),%eax
-	xorl	4(%edi),%ebx
-	xorl	8(%edi),%ecx
-	xorl	12(%edi),%edx
-	movl	%eax,(%esi)
-	movl	%ebx,4(%esi)
-	movl	%ecx,8(%esi)
-	movl	%edx,12(%esi)
-	leal	16(%esi),%esi
-	movl	%esi,36(%esp)
-	leal	60(%esp),%esi
-	movl	(%esi),%eax
-	movl	4(%esi),%ebx
-	movl	8(%esi),%ecx
-	movl	12(%esi),%edx
-	movl	%eax,(%edi)
-	movl	%ebx,4(%edi)
-	movl	%ecx,8(%edi)
-	movl	%edx,12(%edi)
-	movl	32(%esp),%esi
-	movl	40(%esp),%ecx
-	leal	16(%esi),%esi
-	movl	%esi,32(%esp)
-	subl	$16,%ecx
-	movl	%ecx,40(%esp)
-	jnz	.L027fast_dec_in_place_loop
-.align	4
-.L026fast_dec_out:
-	cmpl	$0,316(%esp)
-	movl	44(%esp),%edi
-	je	.L028skip_dzero
-	movl	$60,%ecx
-	xorl	%eax,%eax
-.align	4
-.long	2884892297
-.L028skip_dzero:
-	movl	28(%esp),%esp
-	popfl
-	popl	%edi
-	popl	%esi
-	popl	%ebx
-	popl	%ebp
-	ret
-	pushfl
-.align	16
-.L015slow_way:
-	movl	(%eax),%eax
-	movl	36(%esp),%edi
-	leal	-80(%esp),%esi
-	andl	$-64,%esi
-	leal	-143(%edi),%ebx
-	subl	%esi,%ebx
-	negl	%ebx
-	andl	$960,%ebx
-	subl	%ebx,%esi
-	leal	768(%esi),%ebx
-	subl	%ebp,%ebx
-	andl	$768,%ebx
-	leal	2176(%ebp,%ebx,1),%ebp
-	leal	24(%esp),%edx
-	xchgl	%esi,%esp
-	addl	$4,%esp
-	movl	%ebp,24(%esp)
-	movl	%esi,28(%esp)
-	movl	%eax,52(%esp)
-	movl	(%edx),%eax
-	movl	4(%edx),%ebx
-	movl	16(%edx),%esi
-	movl	20(%edx),%edx
-	movl	%eax,32(%esp)
-	movl	%ebx,36(%esp)
-	movl	%ecx,40(%esp)
-	movl	%edi,44(%esp)
-	movl	%esi,48(%esp)
-	movl	%esi,%edi
-	movl	%eax,%esi
-	cmpl	$0,%edx
-	je	.L029slow_decrypt
-	cmpl	$16,%ecx
-	movl	%ebx,%edx
-	jb	.L030slow_enc_tail
-	btl	$25,52(%esp)
-	jnc	.L031slow_enc_x86
-	movq	(%edi),%mm0
-	movq	8(%edi),%mm4
-.align	16
-.L032slow_enc_loop_sse:
-	pxor	(%esi),%mm0
-	pxor	8(%esi),%mm4
-	movl	44(%esp),%edi
-	call	_sse_AES_encrypt_compact
-	movl	32(%esp),%esi
-	movl	36(%esp),%edi
-	movl	40(%esp),%ecx
-	movq	%mm0,(%edi)
-	movq	%mm4,8(%edi)
-	leal	16(%esi),%esi
-	movl	%esi,32(%esp)
-	leal	16(%edi),%edx
-	movl	%edx,36(%esp)
-	subl	$16,%ecx
-	cmpl	$16,%ecx
-	movl	%ecx,40(%esp)
-	jae	.L032slow_enc_loop_sse
-	testl	$15,%ecx
-	jnz	.L030slow_enc_tail
-	movl	48(%esp),%esi
-	movq	%mm0,(%esi)
-	movq	%mm4,8(%esi)
-	emms
-	movl	28(%esp),%esp
-	popfl
-	popl	%edi
-	popl	%esi
-	popl	%ebx
-	popl	%ebp
-	ret
-	pushfl
-.align	16
-.L031slow_enc_x86:
-	movl	(%edi),%eax
-	movl	4(%edi),%ebx
-.align	4
-.L033slow_enc_loop_x86:
-	movl	8(%edi),%ecx
-	movl	12(%edi),%edx
-	xorl	(%esi),%eax
-	xorl	4(%esi),%ebx
-	xorl	8(%esi),%ecx
-	xorl	12(%esi),%edx
-	movl	44(%esp),%edi
-	call	_x86_AES_encrypt_compact
-	movl	32(%esp),%esi
-	movl	36(%esp),%edi
-	movl	%eax,(%edi)
-	movl	%ebx,4(%edi)
-	movl	%ecx,8(%edi)
-	movl	%edx,12(%edi)
-	movl	40(%esp),%ecx
-	leal	16(%esi),%esi
-	movl	%esi,32(%esp)
-	leal	16(%edi),%edx
-	movl	%edx,36(%esp)
-	subl	$16,%ecx
-	cmpl	$16,%ecx
-	movl	%ecx,40(%esp)
-	jae	.L033slow_enc_loop_x86
-	testl	$15,%ecx
-	jnz	.L030slow_enc_tail
-	movl	48(%esp),%esi
-	movl	8(%edi),%ecx
-	movl	12(%edi),%edx
-	movl	%eax,(%esi)
-	movl	%ebx,4(%esi)
-	movl	%ecx,8(%esi)
-	movl	%edx,12(%esi)
-	movl	28(%esp),%esp
-	popfl
-	popl	%edi
-	popl	%esi
-	popl	%ebx
-	popl	%ebp
-	ret
-	pushfl
-.align	16
-.L030slow_enc_tail:
-	emms
-	movl	%edx,%edi
-	movl	$16,%ebx
-	subl	%ecx,%ebx
-	cmpl	%esi,%edi
-	je	.L034enc_in_place
-.align	4
-.long	2767451785
-	jmp	.L035enc_skip_in_place
-.L034enc_in_place:
-	leal	(%edi,%ecx,1),%edi
-.L035enc_skip_in_place:
-	movl	%ebx,%ecx
-	xorl	%eax,%eax
-.align	4
-.long	2868115081
-	movl	48(%esp),%edi
-	movl	%edx,%esi
-	movl	(%edi),%eax
-	movl	4(%edi),%ebx
-	movl	$16,40(%esp)
-	jmp	.L033slow_enc_loop_x86
-.align	16
-.L029slow_decrypt:
-	btl	$25,52(%esp)
-	jnc	.L036slow_dec_loop_x86
-.align	4
-.L037slow_dec_loop_sse:
-	movq	(%esi),%mm0
-	movq	8(%esi),%mm4
-	movl	44(%esp),%edi
-	call	_sse_AES_decrypt_compact
-	movl	32(%esp),%esi
-	leal	60(%esp),%eax
-	movl	36(%esp),%ebx
-	movl	40(%esp),%ecx
-	movl	48(%esp),%edi
-	movq	(%esi),%mm1
-	movq	8(%esi),%mm5
-	pxor	(%edi),%mm0
-	pxor	8(%edi),%mm4
-	movq	%mm1,(%edi)
-	movq	%mm5,8(%edi)
-	subl	$16,%ecx
-	jc	.L038slow_dec_partial_sse
-	movq	%mm0,(%ebx)
-	movq	%mm4,8(%ebx)
-	leal	16(%ebx),%ebx
-	movl	%ebx,36(%esp)
-	leal	16(%esi),%esi
-	movl	%esi,32(%esp)
-	movl	%ecx,40(%esp)
-	jnz	.L037slow_dec_loop_sse
-	emms
-	movl	28(%esp),%esp
-	popfl
-	popl	%edi
-	popl	%esi
-	popl	%ebx
-	popl	%ebp
-	ret
-	pushfl
-.align	16
-.L038slow_dec_partial_sse:
-	movq	%mm0,(%eax)
-	movq	%mm4,8(%eax)
-	emms
-	addl	$16,%ecx
-	movl	%ebx,%edi
-	movl	%eax,%esi
-.align	4
-.long	2767451785
-	movl	28(%esp),%esp
-	popfl
-	popl	%edi
-	popl	%esi
-	popl	%ebx
-	popl	%ebp
-	ret
-	pushfl
-.align	16
-.L036slow_dec_loop_x86:
-	movl	(%esi),%eax
-	movl	4(%esi),%ebx
-	movl	8(%esi),%ecx
-	movl	12(%esi),%edx
-	leal	60(%esp),%edi
-	movl	%eax,(%edi)
-	movl	%ebx,4(%edi)
-	movl	%ecx,8(%edi)
-	movl	%edx,12(%edi)
-	movl	44(%esp),%edi
-	call	_x86_AES_decrypt_compact
-	movl	48(%esp),%edi
-	movl	40(%esp),%esi
-	xorl	(%edi),%eax
-	xorl	4(%edi),%ebx
-	xorl	8(%edi),%ecx
-	xorl	12(%edi),%edx
-	subl	$16,%esi
-	jc	.L039slow_dec_partial_x86
-	movl	%esi,40(%esp)
-	movl	36(%esp),%esi
-	movl	%eax,(%esi)
-	movl	%ebx,4(%esi)
-	movl	%ecx,8(%esi)
-	movl	%edx,12(%esi)
-	leal	16(%esi),%esi
-	movl	%esi,36(%esp)
-	leal	60(%esp),%esi
-	movl	(%esi),%eax
-	movl	4(%esi),%ebx
-	movl	8(%esi),%ecx
-	movl	12(%esi),%edx
-	movl	%eax,(%edi)
-	movl	%ebx,4(%edi)
-	movl	%ecx,8(%edi)
-	movl	%edx,12(%edi)
-	movl	32(%esp),%esi
-	leal	16(%esi),%esi
-	movl	%esi,32(%esp)
-	jnz	.L036slow_dec_loop_x86
-	movl	28(%esp),%esp
-	popfl
-	popl	%edi
-	popl	%esi
-	popl	%ebx
-	popl	%ebp
-	ret
-	pushfl
-.align	16
-.L039slow_dec_partial_x86:
-	leal	60(%esp),%esi
-	movl	%eax,(%esi)
-	movl	%ebx,4(%esi)
-	movl	%ecx,8(%esi)
-	movl	%edx,12(%esi)
-	movl	32(%esp),%esi
-	movl	(%esi),%eax
-	movl	4(%esi),%ebx
-	movl	8(%esi),%ecx
-	movl	12(%esi),%edx
-	movl	%eax,(%edi)
-	movl	%ebx,4(%edi)
-	movl	%ecx,8(%edi)
-	movl	%edx,12(%edi)
-	movl	40(%esp),%ecx
-	movl	36(%esp),%edi
-	leal	60(%esp),%esi
-.align	4
-.long	2767451785
-	movl	28(%esp),%esp
-	popfl
-	popl	%edi
-	popl	%esi
-	popl	%ebx
-	popl	%ebp
-	ret
-.size	AES_cbc_encrypt,.-.L_AES_cbc_encrypt_begin
-.type	_x86_AES_set_encrypt_key,@function
-.align	16
-_x86_AES_set_encrypt_key:
-	pushl	%ebp
-	pushl	%ebx
-	pushl	%esi
-	pushl	%edi
-	movl	24(%esp),%esi
-	movl	32(%esp),%edi
-	testl	$-1,%esi
-	jz	.L040badpointer
-	testl	$-1,%edi
-	jz	.L040badpointer
-	call	.L041pic_point
-.L041pic_point:
-	popl	%ebp
-	leal	.LAES_Te-.L041pic_point(%ebp),%ebp
-	leal	2176(%ebp),%ebp
-	movl	-128(%ebp),%eax
-	movl	-96(%ebp),%ebx
-	movl	-64(%ebp),%ecx
-	movl	-32(%ebp),%edx
-	movl	(%ebp),%eax
-	movl	32(%ebp),%ebx
-	movl	64(%ebp),%ecx
-	movl	96(%ebp),%edx
-	movl	28(%esp),%ecx
-	cmpl	$128,%ecx
-	je	.L04210rounds
-	cmpl	$192,%ecx
-	je	.L04312rounds
-	cmpl	$256,%ecx
-	je	.L04414rounds
-	movl	$-2,%eax
-	jmp	.L045exit
-.L04210rounds:
-	movl	(%esi),%eax
-	movl	4(%esi),%ebx
-	movl	8(%esi),%ecx
-	movl	12(%esi),%edx
-	movl	%eax,(%edi)
-	movl	%ebx,4(%edi)
-	movl	%ecx,8(%edi)
-	movl	%edx,12(%edi)
-	xorl	%ecx,%ecx
-	jmp	.L04610shortcut
-.align	4
-.L04710loop:
-	movl	(%edi),%eax
-	movl	12(%edi),%edx
-.L04610shortcut:
-	movzbl	%dl,%esi
-	movzbl	-128(%ebp,%esi,1),%ebx
-	movzbl	%dh,%esi
-	shll	$24,%ebx
-	xorl	%ebx,%eax
-	movzbl	-128(%ebp,%esi,1),%ebx
-	shrl	$16,%edx
-	movzbl	%dl,%esi
-	xorl	%ebx,%eax
-	movzbl	-128(%ebp,%esi,1),%ebx
-	movzbl	%dh,%esi
-	shll	$8,%ebx
-	xorl	%ebx,%eax
-	movzbl	-128(%ebp,%esi,1),%ebx
-	shll	$16,%ebx
-	xorl	%ebx,%eax
-	xorl	896(%ebp,%ecx,4),%eax
-	movl	%eax,16(%edi)
-	xorl	4(%edi),%eax
-	movl	%eax,20(%edi)
-	xorl	8(%edi),%eax
-	movl	%eax,24(%edi)
-	xorl	12(%edi),%eax
-	movl	%eax,28(%edi)
-	incl	%ecx
-	addl	$16,%edi
-	cmpl	$10,%ecx
-	jl	.L04710loop
-	movl	$10,80(%edi)
-	xorl	%eax,%eax
-	jmp	.L045exit
-.L04312rounds:
-	movl	(%esi),%eax
-	movl	4(%esi),%ebx
-	movl	8(%esi),%ecx
-	movl	12(%esi),%edx
-	movl	%eax,(%edi)
-	movl	%ebx,4(%edi)
-	movl	%ecx,8(%edi)
-	movl	%edx,12(%edi)
-	movl	16(%esi),%ecx
-	movl	20(%esi),%edx
-	movl	%ecx,16(%edi)
-	movl	%edx,20(%edi)
-	xorl	%ecx,%ecx
-	jmp	.L04812shortcut
-.align	4
-.L04912loop:
-	movl	(%edi),%eax
-	movl	20(%edi),%edx
-.L04812shortcut:
-	movzbl	%dl,%esi
-	movzbl	-128(%ebp,%esi,1),%ebx
-	movzbl	%dh,%esi
-	shll	$24,%ebx
-	xorl	%ebx,%eax
-	movzbl	-128(%ebp,%esi,1),%ebx
-	shrl	$16,%edx
-	movzbl	%dl,%esi
-	xorl	%ebx,%eax
-	movzbl	-128(%ebp,%esi,1),%ebx
-	movzbl	%dh,%esi
-	shll	$8,%ebx
-	xorl	%ebx,%eax
-	movzbl	-128(%ebp,%esi,1),%ebx
-	shll	$16,%ebx
-	xorl	%ebx,%eax
-	xorl	896(%ebp,%ecx,4),%eax
-	movl	%eax,24(%edi)
-	xorl	4(%edi),%eax
-	movl	%eax,28(%edi)
-	xorl	8(%edi),%eax
-	movl	%eax,32(%edi)
-	xorl	12(%edi),%eax
-	movl	%eax,36(%edi)
-	cmpl	$7,%ecx
-	je	.L05012break
-	incl	%ecx
-	xorl	16(%edi),%eax
-	movl	%eax,40(%edi)
-	xorl	20(%edi),%eax
-	movl	%eax,44(%edi)
-	addl	$24,%edi
-	jmp	.L04912loop
-.L05012break:
-	movl	$12,72(%edi)
-	xorl	%eax,%eax
-	jmp	.L045exit
-.L04414rounds:
-	movl	(%esi),%eax
-	movl	4(%esi),%ebx
-	movl	8(%esi),%ecx
-	movl	12(%esi),%edx
-	movl	%eax,(%edi)
-	movl	%ebx,4(%edi)
-	movl	%ecx,8(%edi)
-	movl	%edx,12(%edi)
-	movl	16(%esi),%eax
-	movl	20(%esi),%ebx
-	movl	24(%esi),%ecx
-	movl	28(%esi),%edx
-	movl	%eax,16(%edi)
-	movl	%ebx,20(%edi)
-	movl	%ecx,24(%edi)
-	movl	%edx,28(%edi)
-	xorl	%ecx,%ecx
-	jmp	.L05114shortcut
-.align	4
-.L05214loop:
-	movl	28(%edi),%edx
-.L05114shortcut:
-	movl	(%edi),%eax
-	movzbl	%dl,%esi
-	movzbl	-128(%ebp,%esi,1),%ebx
-	movzbl	%dh,%esi
-	shll	$24,%ebx
-	xorl	%ebx,%eax
-	movzbl	-128(%ebp,%esi,1),%ebx
-	shrl	$16,%edx
-	movzbl	%dl,%esi
-	xorl	%ebx,%eax
-	movzbl	-128(%ebp,%esi,1),%ebx
-	movzbl	%dh,%esi
-	shll	$8,%ebx
-	xorl	%ebx,%eax
-	movzbl	-128(%ebp,%esi,1),%ebx
-	shll	$16,%ebx
-	xorl	%ebx,%eax
-	xorl	896(%ebp,%ecx,4),%eax
-	movl	%eax,32(%edi)
-	xorl	4(%edi),%eax
-	movl	%eax,36(%edi)
-	xorl	8(%edi),%eax
-	movl	%eax,40(%edi)
-	xorl	12(%edi),%eax
-	movl	%eax,44(%edi)
-	cmpl	$6,%ecx
-	je	.L05314break
-	incl	%ecx
-	movl	%eax,%edx
-	movl	16(%edi),%eax
-	movzbl	%dl,%esi
-	movzbl	-128(%ebp,%esi,1),%ebx
-	movzbl	%dh,%esi
-	xorl	%ebx,%eax
-	movzbl	-128(%ebp,%esi,1),%ebx
-	shrl	$16,%edx
-	shll	$8,%ebx
-	movzbl	%dl,%esi
-	xorl	%ebx,%eax
-	movzbl	-128(%ebp,%esi,1),%ebx
-	movzbl	%dh,%esi
-	shll	$16,%ebx
-	xorl	%ebx,%eax
-	movzbl	-128(%ebp,%esi,1),%ebx
-	shll	$24,%ebx
-	xorl	%ebx,%eax
-	movl	%eax,48(%edi)
-	xorl	20(%edi),%eax
-	movl	%eax,52(%edi)
-	xorl	24(%edi),%eax
-	movl	%eax,56(%edi)
-	xorl	28(%edi),%eax
-	movl	%eax,60(%edi)
-	addl	$32,%edi
-	jmp	.L05214loop
-.L05314break:
-	movl	$14,48(%edi)
-	xorl	%eax,%eax
-	jmp	.L045exit
-.L040badpointer:
-	movl	$-1,%eax
-.L045exit:
-	popl	%edi
-	popl	%esi
-	popl	%ebx
-	popl	%ebp
-	ret
-.size	_x86_AES_set_encrypt_key,.-_x86_AES_set_encrypt_key
-.globl	AES_set_encrypt_key
-.type	AES_set_encrypt_key,@function
-.align	16
-AES_set_encrypt_key:
-.L_AES_set_encrypt_key_begin:
-	call	_x86_AES_set_encrypt_key
-	ret
-.size	AES_set_encrypt_key,.-.L_AES_set_encrypt_key_begin
-.globl	AES_set_decrypt_key
-.type	AES_set_decrypt_key,@function
-.align	16
-AES_set_decrypt_key:
-.L_AES_set_decrypt_key_begin:
-	call	_x86_AES_set_encrypt_key
-	cmpl	$0,%eax
-	je	.L054proceed
-	ret
-.L054proceed:
-	pushl	%ebp
-	pushl	%ebx
-	pushl	%esi
-	pushl	%edi
-	movl	28(%esp),%esi
-	movl	240(%esi),%ecx
-	leal	(,%ecx,4),%ecx
-	leal	(%esi,%ecx,4),%edi
-.align	4
-.L055invert:
-	movl	(%esi),%eax
-	movl	4(%esi),%ebx
-	movl	(%edi),%ecx
-	movl	4(%edi),%edx
-	movl	%eax,(%edi)
-	movl	%ebx,4(%edi)
-	movl	%ecx,(%esi)
-	movl	%edx,4(%esi)
-	movl	8(%esi),%eax
-	movl	12(%esi),%ebx
-	movl	8(%edi),%ecx
-	movl	12(%edi),%edx
-	movl	%eax,8(%edi)
-	movl	%ebx,12(%edi)
-	movl	%ecx,8(%esi)
-	movl	%edx,12(%esi)
-	addl	$16,%esi
-	subl	$16,%edi
-	cmpl	%edi,%esi
-	jne	.L055invert
-	movl	28(%esp),%edi
-	movl	240(%edi),%esi
-	leal	-2(%esi,%esi,1),%esi
-	leal	(%edi,%esi,8),%esi
-	movl	%esi,28(%esp)
-	movl	16(%edi),%eax
-.align	4
-.L056permute:
-	addl	$16,%edi
-	movl	$2155905152,%ebp
-	andl	%eax,%ebp
-	leal	(%eax,%eax,1),%ebx
-	movl	%ebp,%esi
-	shrl	$7,%ebp
-	subl	%ebp,%esi
-	andl	$4278124286,%ebx
-	andl	$454761243,%esi
-	xorl	%esi,%ebx
-	movl	$2155905152,%ebp
-	andl	%ebx,%ebp
-	leal	(%ebx,%ebx,1),%ecx
-	movl	%ebp,%esi
-	shrl	$7,%ebp
-	subl	%ebp,%esi
-	andl	$4278124286,%ecx
-	andl	$454761243,%esi
-	xorl	%eax,%ebx
-	xorl	%esi,%ecx
-	movl	$2155905152,%ebp
-	andl	%ecx,%ebp
-	leal	(%ecx,%ecx,1),%edx
-	movl	%ebp,%esi
-	shrl	$7,%ebp
-	xorl	%eax,%ecx
-	subl	%ebp,%esi
-	andl	$4278124286,%edx
-	andl	$454761243,%esi
-	roll	$8,%eax
-	xorl	%esi,%edx
-	movl	4(%edi),%ebp
-	xorl	%ebx,%eax
-	xorl	%edx,%ebx
-	xorl	%ecx,%eax
-	roll	$24,%ebx
-	xorl	%edx,%ecx
-	xorl	%edx,%eax
-	roll	$16,%ecx
-	xorl	%ebx,%eax
-	roll	$8,%edx
-	xorl	%ecx,%eax
-	movl	%ebp,%ebx
-	xorl	%edx,%eax
-	movl	%eax,(%edi)
-	movl	$2155905152,%ebp
-	andl	%ebx,%ebp
-	leal	(%ebx,%ebx,1),%ecx
-	movl	%ebp,%esi
-	shrl	$7,%ebp
-	subl	%ebp,%esi
-	andl	$4278124286,%ecx
-	andl	$454761243,%esi
-	xorl	%esi,%ecx
-	movl	$2155905152,%ebp
-	andl	%ecx,%ebp
-	leal	(%ecx,%ecx,1),%edx
-	movl	%ebp,%esi
-	shrl	$7,%ebp
-	subl	%ebp,%esi
-	andl	$4278124286,%edx
-	andl	$454761243,%esi
-	xorl	%ebx,%ecx
-	xorl	%esi,%edx
-	movl	$2155905152,%ebp
-	andl	%edx,%ebp
-	leal	(%edx,%edx,1),%eax
-	movl	%ebp,%esi
-	shrl	$7,%ebp
-	xorl	%ebx,%edx
-	subl	%ebp,%esi
-	andl	$4278124286,%eax
-	andl	$454761243,%esi
-	roll	$8,%ebx
-	xorl	%esi,%eax
-	movl	8(%edi),%ebp
-	xorl	%ecx,%ebx
-	xorl	%eax,%ecx
-	xorl	%edx,%ebx
-	roll	$24,%ecx
-	xorl	%eax,%edx
-	xorl	%eax,%ebx
-	roll	$16,%edx
-	xorl	%ecx,%ebx
-	roll	$8,%eax
-	xorl	%edx,%ebx
-	movl	%ebp,%ecx
-	xorl	%eax,%ebx
-	movl	%ebx,4(%edi)
-	movl	$2155905152,%ebp
-	andl	%ecx,%ebp
-	leal	(%ecx,%ecx,1),%edx
-	movl	%ebp,%esi
-	shrl	$7,%ebp
-	subl	%ebp,%esi
-	andl	$4278124286,%edx
-	andl	$454761243,%esi
-	xorl	%esi,%edx
-	movl	$2155905152,%ebp
-	andl	%edx,%ebp
-	leal	(%edx,%edx,1),%eax
-	movl	%ebp,%esi
-	shrl	$7,%ebp
-	subl	%ebp,%esi
-	andl	$4278124286,%eax
-	andl	$454761243,%esi
-	xorl	%ecx,%edx
-	xorl	%esi,%eax
-	movl	$2155905152,%ebp
-	andl	%eax,%ebp
-	leal	(%eax,%eax,1),%ebx
-	movl	%ebp,%esi
-	shrl	$7,%ebp
-	xorl	%ecx,%eax
-	subl	%ebp,%esi
-	andl	$4278124286,%ebx
-	andl	$454761243,%esi
-	roll	$8,%ecx
-	xorl	%esi,%ebx
-	movl	12(%edi),%ebp
-	xorl	%edx,%ecx
-	xorl	%ebx,%edx
-	xorl	%eax,%ecx
-	roll	$24,%edx
-	xorl	%ebx,%eax
-	xorl	%ebx,%ecx
-	roll	$16,%eax
-	xorl	%edx,%ecx
-	roll	$8,%ebx
-	xorl	%eax,%ecx
-	movl	%ebp,%edx
-	xorl	%ebx,%ecx
-	movl	%ecx,8(%edi)
-	movl	$2155905152,%ebp
-	andl	%edx,%ebp
-	leal	(%edx,%edx,1),%eax
-	movl	%ebp,%esi
-	shrl	$7,%ebp
-	subl	%ebp,%esi
-	andl	$4278124286,%eax
-	andl	$454761243,%esi
-	xorl	%esi,%eax
-	movl	$2155905152,%ebp
-	andl	%eax,%ebp
-	leal	(%eax,%eax,1),%ebx
-	movl	%ebp,%esi
-	shrl	$7,%ebp
-	subl	%ebp,%esi
-	andl	$4278124286,%ebx
-	andl	$454761243,%esi
-	xorl	%edx,%eax
-	xorl	%esi,%ebx
-	movl	$2155905152,%ebp
-	andl	%ebx,%ebp
-	leal	(%ebx,%ebx,1),%ecx
-	movl	%ebp,%esi
-	shrl	$7,%ebp
-	xorl	%edx,%ebx
-	subl	%ebp,%esi
-	andl	$4278124286,%ecx
-	andl	$454761243,%esi
-	roll	$8,%edx
-	xorl	%esi,%ecx
-	movl	16(%edi),%ebp
-	xorl	%eax,%edx
-	xorl	%ecx,%eax
-	xorl	%ebx,%edx
-	roll	$24,%eax
-	xorl	%ecx,%ebx
-	xorl	%ecx,%edx
-	roll	$16,%ebx
-	xorl	%eax,%edx
-	roll	$8,%ecx
-	xorl	%ebx,%edx
-	movl	%ebp,%eax
-	xorl	%ecx,%edx
-	movl	%edx,12(%edi)
-	cmpl	28(%esp),%edi
-	jb	.L056permute
-	xorl	%eax,%eax
-	popl	%edi
-	popl	%esi
-	popl	%ebx
-	popl	%ebp
-	ret
-.size	AES_set_decrypt_key,.-.L_AES_set_decrypt_key_begin
-.byte	65,69,83,32,102,111,114,32,120,56,54,44,32,67,82,89
-.byte	80,84,79,71,65,77,83,32,98,121,32,60,97,112,112,114
-.byte	111,64,111,112,101,110,115,115,108,46,111,114,103,62,0
-.comm	OPENSSL_ia32cap_P,16,4
diff --git a/deps/openssl/config/archs/linux-elf/asm/crypto/buildinf.h b/deps/openssl/config/archs/linux-elf/asm/crypto/buildinf.h
index d35d80a968..bd6dc58174 100644
--- a/deps/openssl/config/archs/linux-elf/asm/crypto/buildinf.h
+++ b/deps/openssl/config/archs/linux-elf/asm/crypto/buildinf.h
@@ -11,7 +11,7 @@
  */
 
 #define PLATFORM "platform: linux-elf"
-#define DATE "built on: Fri Sep 13 15:59:27 2019 UTC"
+#define DATE "built on: Wed Mar 18 21:06:23 2020 UTC"
 
 /*
  * Generate compiler_flags as an array of individual characters. This is a
@@ -38,10 +38,11 @@ static const char compiler_flags[] = {
     '6','_','A','S','M',' ','-','D','S','H','A','5','1','2','_','A',
     'S','M',' ','-','D','R','C','4','_','A','S','M',' ','-','D','M',
     'D','5','_','A','S','M',' ','-','D','R','M','D','1','6','0','_',
-    'A','S','M',' ','-','D','V','P','A','E','S','_','A','S','M',' ',
-    '-','D','W','H','I','R','L','P','O','O','L','_','A','S','M',' ',
-    '-','D','G','H','A','S','H','_','A','S','M',' ','-','D','E','C',
-    'P','_','N','I','S','T','Z','2','5','6','_','A','S','M',' ','-',
-    'D','P','O','L','Y','1','3','0','5','_','A','S','M',' ','-','D',
-    'N','D','E','B','U','G','\0'
+    'A','S','M',' ','-','D','A','E','S','N','I','_','A','S','M',' ',
+    '-','D','V','P','A','E','S','_','A','S','M',' ','-','D','W','H',
+    'I','R','L','P','O','O','L','_','A','S','M',' ','-','D','G','H',
+    'A','S','H','_','A','S','M',' ','-','D','E','C','P','_','N','I',
+    'S','T','Z','2','5','6','_','A','S','M',' ','-','D','P','O','L',
+    'Y','1','3','0','5','_','A','S','M',' ','-','D','N','D','E','B',
+    'U','G','\0'
 };
diff --git a/deps/openssl/config/archs/linux-elf/asm/crypto/ec/ecp_nistz256-x86.s b/deps/openssl/config/archs/linux-elf/asm/crypto/ec/ecp_nistz256-x86.s
index da9b3a7ee1..4cec24f4e2 100644
--- a/deps/openssl/config/archs/linux-elf/asm/crypto/ec/ecp_nistz256-x86.s
+++ b/deps/openssl/config/archs/linux-elf/asm/crypto/ec/ecp_nistz256-x86.s
@@ -4419,19 +4419,15 @@ ecp_nistz256_point_add:
 	orl	4(%edi),%eax
 	orl	8(%edi),%eax
 	orl	12(%edi),%eax
+	movl	576(%esp),%ebx
+	notl	%ebx
+	orl	%ebx,%eax
+	movl	580(%esp),%ebx
+	notl	%ebx
+	orl	%ebx,%eax
+	orl	584(%esp),%eax
 .byte	62
 	jnz	.L010add_proceed
-	movl	576(%esp),%eax
-	andl	580(%esp),%eax
-	movl	584(%esp),%ebx
-	jz	.L010add_proceed
-	testl	%ebx,%ebx
-	jz	.L011add_double
-	movl	616(%esp),%edi
-	xorl	%eax,%eax
-	movl	$24,%ecx
-.byte	252,243,171
-	jmp	.L012add_done
 .align	16
 .L011add_double:
 	movl	620(%esp),%esi
diff --git a/deps/openssl/config/archs/linux-elf/asm/crypto/include/internal/bn_conf.h b/deps/openssl/config/archs/linux-elf/asm/crypto/include/internal/bn_conf.h
index fb52156bd0..459055c96f 100644
--- a/deps/openssl/config/archs/linux-elf/asm/crypto/include/internal/bn_conf.h
+++ b/deps/openssl/config/archs/linux-elf/asm/crypto/include/internal/bn_conf.h
@@ -1,5 +1,5 @@
 /* WARNING: do not edit! */
-/* Generated by Makefile from crypto/include/internal/bn_conf.h.in */
+/* Generated by Makefile from include/crypto/bn_conf.h.in */
 /*
  * Copyright 2016 The OpenSSL Project Authors. All Rights Reserved.
  *
@@ -9,8 +9,8 @@
  * https://www.openssl.org/source/license.html
  */
 
-#ifndef HEADER_BN_CONF_H
-# define HEADER_BN_CONF_H
+#ifndef OSSL_CRYPTO_BN_CONF_H
+# define OSSL_CRYPTO_BN_CONF_H
 
 /*
  * The contents of this file are not used in the UEFI build, as
diff --git a/deps/openssl/config/archs/linux-elf/asm/crypto/include/internal/dso_conf.h b/deps/openssl/config/archs/linux-elf/asm/crypto/include/internal/dso_conf.h
index 252266ec2a..4b1167c3d8 100644
--- a/deps/openssl/config/archs/linux-elf/asm/crypto/include/internal/dso_conf.h
+++ b/deps/openssl/config/archs/linux-elf/asm/crypto/include/internal/dso_conf.h
@@ -1,5 +1,5 @@
 /* WARNING: do not edit! */
-/* Generated by Makefile from crypto/include/internal/dso_conf.h.in */
+/* Generated by Makefile from include/crypto/dso_conf.h.in */
 /*
  * Copyright 2016-2019 The OpenSSL Project Authors. All Rights Reserved.
  *
@@ -9,8 +9,8 @@
  * https://www.openssl.org/source/license.html
  */
 
-#ifndef HEADER_DSO_CONF_H
-# define HEADER_DSO_CONF_H
+#ifndef OSSL_CRYPTO_DSO_CONF_H
+# define OSSL_CRYPTO_DSO_CONF_H
 # define DSO_DLFCN
 # define HAVE_DLFCN_H
 # define DSO_EXTENSION ".so"
diff --git a/deps/openssl/config/archs/linux-elf/asm/include/openssl/opensslconf.h b/deps/openssl/config/archs/linux-elf/asm/include/openssl/opensslconf.h
index c43f227296..da0b080ce0 100644
--- a/deps/openssl/config/archs/linux-elf/asm/include/openssl/opensslconf.h
+++ b/deps/openssl/config/archs/linux-elf/asm/include/openssl/opensslconf.h
@@ -96,9 +96,6 @@ extern "C" {
 #ifndef OPENSSL_NO_DYNAMIC_ENGINE
 # define OPENSSL_NO_DYNAMIC_ENGINE
 #endif
-#ifndef OPENSSL_NO_AFALGENG
-# define OPENSSL_NO_AFALGENG
-#endif
 
 
 /*
diff --git a/deps/openssl/config/archs/linux-elf/asm/include/progs.h b/deps/openssl/config/archs/linux-elf/asm/include/progs.h
index 9b3d270e20..308c65601b 100644
--- a/deps/openssl/config/archs/linux-elf/asm/include/progs.h
+++ b/deps/openssl/config/archs/linux-elf/asm/include/progs.h
@@ -2,7 +2,7 @@
  * WARNING: do not edit!
  * Generated by apps/progs.pl
  *
- * Copyright 1995-2019 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 1995-2020 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
diff --git a/deps/openssl/config/archs/linux-elf/asm/openssl-cl.gypi b/deps/openssl/config/archs/linux-elf/asm/openssl-cl.gypi
index e2fe28d73a..37aa910e1d 100644
--- a/deps/openssl/config/archs/linux-elf/asm/openssl-cl.gypi
+++ b/deps/openssl/config/archs/linux-elf/asm/openssl-cl.gypi
@@ -16,6 +16,7 @@
       'RC4_ASM',
       'MD5_ASM',
       'RMD160_ASM',
+      'AESNI_ASM',
       'VPAES_ASM',
       'WHIRLPOOL_ASM',
       'GHASH_ASM',
diff --git a/deps/openssl/config/archs/linux-elf/asm/openssl.gypi b/deps/openssl/config/archs/linux-elf/asm/openssl.gypi
index 19fe9eac77..25646b678c 100644
--- a/deps/openssl/config/archs/linux-elf/asm/openssl.gypi
+++ b/deps/openssl/config/archs/linux-elf/asm/openssl.gypi
@@ -713,6 +713,7 @@
       'RC4_ASM',
       'MD5_ASM',
       'RMD160_ASM',
+      'AESNI_ASM',
       'VPAES_ASM',
       'WHIRLPOOL_ASM',
       'GHASH_ASM',
diff --git a/deps/openssl/config/archs/linux-elf/asm_avx2/configdata.pm b/deps/openssl/config/archs/linux-elf/asm_avx2/configdata.pm
index 9ddf36af0f..214775155c 100644
--- a/deps/openssl/config/archs/linux-elf/asm_avx2/configdata.pm
+++ b/deps/openssl/config/archs/linux-elf/asm_avx2/configdata.pm
@@ -49,14 +49,14 @@ our %config = (
   export_var_as_fn => "0",
   includes => [  ],
   lflags => [  ],
-  lib_defines => [ "OPENSSL_PIC", "OPENSSL_CPUID_OBJ", "OPENSSL_BN_ASM_PART_WORDS", "OPENSSL_IA32_SSE2", "OPENSSL_BN_ASM_MONT", "OPENSSL_BN_ASM_GF2m", "SHA1_ASM", "SHA256_ASM", "SHA512_ASM", "RC4_ASM", "MD5_ASM", "RMD160_ASM", "VPAES_ASM", "WHIRLPOOL_ASM", "GHASH_ASM", "ECP_NISTZ256_ASM", "POLY1305_ASM" ],
+  lib_defines => [ "OPENSSL_PIC", "OPENSSL_CPUID_OBJ", "OPENSSL_BN_ASM_PART_WORDS", "OPENSSL_IA32_SSE2", "OPENSSL_BN_ASM_MONT", "OPENSSL_BN_ASM_GF2m", "SHA1_ASM", "SHA256_ASM", "SHA512_ASM", "RC4_ASM", "MD5_ASM", "RMD160_ASM", "AESNI_ASM", "VPAES_ASM", "WHIRLPOOL_ASM", "GHASH_ASM", "ECP_NISTZ256_ASM", "POLY1305_ASM" ],
   libdir => "",
   major => "1",
   makedepprog => "\$(CROSS_COMPILE)../config/fake_gcc.pl",
   minor => "1.1",
   openssl_algorithm_defines => [ "OPENSSL_NO_COMP", "OPENSSL_NO_MD2", "OPENSSL_NO_RC5" ],
   openssl_api_defines => [  ],
-  openssl_other_defines => [ "OPENSSL_RAND_SEED_OS", "OPENSSL_NO_AFALGENG", "OPENSSL_NO_ASAN", "OPENSSL_NO_CRYPTO_MDEBUG", "OPENSSL_NO_CRYPTO_MDEBUG_BACKTRACE", "OPENSSL_NO_DEVCRYPTOENG", "OPENSSL_NO_EC_NISTP_64_GCC_128", "OPENSSL_NO_EGD", "OPENSSL_NO_EXTERNAL_TESTS", "OPENSSL_NO_FUZZ_AFL", "OPENSSL_NO_FUZZ_LIBFUZZER", "OPENSSL_NO_HEARTBEATS", "OPENSSL_NO_MSAN", "OPENSSL_NO_SCTP", "OPENSSL_NO_SSL3", "OPENSSL_NO_SSL3_METHOD", "OPENSSL_NO_UBSAN", "OPENSSL_NO_UNIT_TEST", "OPENSSL_NO_WEAK_SSL_CIPHERS", "OPENSSL_NO_DYNAMIC_ENGINE", "OPENSSL_NO_AFALGENG" ],
+  openssl_other_defines => [ "OPENSSL_RAND_SEED_OS", "OPENSSL_NO_AFALGENG", "OPENSSL_NO_ASAN", "OPENSSL_NO_CRYPTO_MDEBUG", "OPENSSL_NO_CRYPTO_MDEBUG_BACKTRACE", "OPENSSL_NO_DEVCRYPTOENG", "OPENSSL_NO_EC_NISTP_64_GCC_128", "OPENSSL_NO_EGD", "OPENSSL_NO_EXTERNAL_TESTS", "OPENSSL_NO_FUZZ_AFL", "OPENSSL_NO_FUZZ_LIBFUZZER", "OPENSSL_NO_HEARTBEATS", "OPENSSL_NO_MSAN", "OPENSSL_NO_SCTP", "OPENSSL_NO_SSL3", "OPENSSL_NO_SSL3_METHOD", "OPENSSL_NO_UBSAN", "OPENSSL_NO_UNIT_TEST", "OPENSSL_NO_WEAK_SSL_CIPHERS", "OPENSSL_NO_DYNAMIC_ENGINE" ],
   openssl_sys_defines => [  ],
   openssl_thread_defines => [ "OPENSSL_THREADS" ],
   openssldir => "",
@@ -112,8 +112,8 @@ our %config = (
   sourcedir => ".",
   target => "linux-elf",
   tdirs => [ "ossl_shim" ],
-  version => "1.1.1d",
-  version_num => "0x1010104fL",
+  version => "1.1.1e",
+  version_num => "0x1010105fL",
 );
 
 our %target = (
@@ -240,6 +240,7 @@ our @disablables = (
   "dgram",
   "dh",
   "dsa",
+  "dso",
   "dtls",
   "dynamic-engine",
   "ec",
@@ -357,8 +358,8 @@ our %unified_info = (
         {
             "" =>
                 [
-                    "crypto/include/internal/bn_conf.h",
-                    "crypto/include/internal/dso_conf.h",
+                    "include/crypto/bn_conf.h",
+                    "include/crypto/dso_conf.h",
                     "include/openssl/opensslconf.h",
                 ],
             "apps/asn1pars.o" =>
@@ -626,14 +627,6 @@ our %unified_info = (
                     "crypto/perlasm/cbc.pl",
                     "crypto/perlasm/x86asm.pl",
                 ],
-            "crypto/include/internal/bn_conf.h" =>
-                [
-                    "configdata.pm",
-                ],
-            "crypto/include/internal/dso_conf.h" =>
-                [
-                    "configdata.pm",
-                ],
             "crypto/rc4/rc4-586.s" =>
                 [
                     "crypto/perlasm/x86asm.pl",
@@ -709,6 +702,14 @@ our %unified_info = (
                 [
                     "libcrypto",
                 ],
+            "include/crypto/bn_conf.h" =>
+                [
+                    "configdata.pm",
+                ],
+            "include/crypto/dso_conf.h" =>
+                [
+                    "configdata.pm",
+                ],
             "include/openssl/opensslconf.h" =>
                 [
                     "configdata.pm",
@@ -1506,6 +1507,12 @@ our %unified_info = (
                     "libcrypto",
                     "test/libtestutil.a",
                 ],
+            "test/ssl_ctx_test" =>
+                [
+                    "libcrypto",
+                    "libssl",
+                    "test/libtestutil.a",
+                ],
             "test/ssl_test" =>
                 [
                     "libcrypto",
@@ -3237,7 +3244,6 @@ our %unified_info = (
                             "test/testutil/cb.o",
                             "test/testutil/driver.o",
                             "test/testutil/format_output.o",
-                            "test/testutil/init.o",
                             "test/testutil/main.o",
                             "test/testutil/output_helpers.o",
                             "test/testutil/random.o",
@@ -3245,6 +3251,7 @@ our %unified_info = (
                             "test/testutil/tap_bio.o",
                             "test/testutil/test_cleanup.o",
                             "test/testutil/tests.o",
+                            "test/testutil/testutil_init.o",
                         ],
                     "products" =>
                         {
@@ -3743,14 +3750,6 @@ our %unified_info = (
                 [
                     "crypto/ia64cpuid.S",
                 ],
-            "crypto/include/internal/bn_conf.h" =>
-                [
-                    "crypto/include/internal/bn_conf.h.in",
-                ],
-            "crypto/include/internal/dso_conf.h" =>
-                [
-                    "crypto/include/internal/dso_conf.h.in",
-                ],
             "crypto/md5/md5-586.s" =>
                 [
                     "crypto/md5/asm/md5-586.pl",
@@ -4191,6 +4190,14 @@ our %unified_info = (
                     "engines/asm/e_padlock-x86_64.pl",
                     "\$(PERLASM_SCHEME)",
                 ],
+            "include/crypto/bn_conf.h" =>
+                [
+                    "include/crypto/bn_conf.h.in",
+                ],
+            "include/crypto/dso_conf.h" =>
+                [
+                    "include/crypto/dso_conf.h.in",
+                ],
             "include/openssl/opensslconf.h" =>
                 [
                     "include/openssl/opensslconf.h.in",
@@ -4885,49 +4892,41 @@ our %unified_info = (
             "crypto/aes/aes_cbc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/aes/aes_cfb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/aes/aes_core.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/aes/aes_ecb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/aes/aes_ige.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/aes/aes_misc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/aes/aes_ofb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/aes/aes_wrap.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/aes/aesfx-sparcv9.o" =>
@@ -4937,7 +4936,6 @@ our %unified_info = (
             "crypto/aes/aesni-x86.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/aes/aest4-sparcv9.o" =>
@@ -4955,13 +4953,11 @@ our %unified_info = (
             "crypto/aes/vpaes-x86.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/aria/aria.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/arm64cpuid.o" =>
@@ -4975,613 +4971,511 @@ our %unified_info = (
             "crypto/asn1/a_bitstr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_d2i_fp.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_digest.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_dup.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_gentm.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_i2d_fp.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_int.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_mbstr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_object.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_octet.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_print.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_sign.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_strex.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_strnid.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_time.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_type.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_utctm.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_utf8.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_verify.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/ameth_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/asn1_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/asn1_gen.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/asn1_item_list.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/asn1_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/asn1_par.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/asn_mime.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/asn_moid.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/asn_mstbl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/asn_pack.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/bio_asn1.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/bio_ndef.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/d2i_pr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/d2i_pu.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/evp_asn1.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/f_int.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/f_string.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/i2d_pr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/i2d_pu.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/n_pkey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/nsseq.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/p5_pbe.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/p5_pbev2.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/p5_scrypt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/p8_pkey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/t_bitst.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/t_pkey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/t_spki.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/tasn_dec.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/tasn_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/tasn_fre.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/tasn_new.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/tasn_prn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/tasn_scn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/tasn_typ.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/tasn_utl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/x_algor.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/x_bignum.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/x_info.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/x_int64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/x_long.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/x_pkey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/x_sig.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/x_spki.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/x_val.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/async/arch/async_null.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/async/arch/async_posix.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/async/arch/async_win.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/async/async.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/async/async_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/async/async_wait.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bf/bf-586.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bf/bf_cfb64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bf/bf_ecb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bf/bf_ofb64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bf/bf_skey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/b_addr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/b_dump.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/b_print.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/b_sock.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/b_sock2.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bf_buff.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bf_lbuf.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bf_nbio.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bf_null.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bio_cb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bio_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bio_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bio_meth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bss_acpt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bss_bio.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bss_conn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bss_dgram.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bss_fd.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bss_file.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bss_log.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bss_mem.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bss_null.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bss_sock.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/blake2/blake2b.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/blake2/blake2s.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/blake2/m_blake2b.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/blake2/m_blake2s.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/armv4-gf2m.o" =>
@@ -5595,7 +5489,6 @@ our %unified_info = (
             "crypto/bn/bn-586.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn-mips.o" =>
@@ -5605,188 +5498,157 @@ our %unified_info = (
             "crypto/bn/bn_add.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_blind.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_const.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_ctx.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_depr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_dh.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_div.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_exp.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto",
                 ],
             "crypto/bn/bn_exp2.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_gcd.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_gf2m.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_intern.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_kron.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_mod.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_mont.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_mpi.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_mul.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_nist.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_prime.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_print.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_rand.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_recp.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_shift.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_sqr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_sqrt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_srp.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_word.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_x931p.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/co-586.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/mips-mont.o" =>
@@ -5816,25 +5678,21 @@ our %unified_info = (
             "crypto/bn/x86-gf2m.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/x86-mont.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/buffer/buf_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/buffer/buffer.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/buildinf.h" =>
@@ -5844,31 +5702,26 @@ our %unified_info = (
             "crypto/camellia/cmll-x86.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/camellia/cmll_cfb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/camellia/cmll_ctr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/camellia/cmll_ecb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/camellia/cmll_ofb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/camellia/cmllt4-sparcv9.o" =>
@@ -5878,31 +5731,26 @@ our %unified_info = (
             "crypto/cast/c_cfb64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cast/c_ecb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cast/c_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cast/c_ofb64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cast/c_skey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/chacha/chacha-armv4.o" =>
@@ -5920,284 +5768,237 @@ our %unified_info = (
             "crypto/chacha/chacha-x86.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cmac/cm_ameth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cmac/cm_pmeth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cmac/cmac.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_asn1.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_att.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_cd.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_dd.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_env.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_ess.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_io.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_kari.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_pwri.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_sd.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_smime.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/conf/conf_api.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/conf/conf_def.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/conf/conf_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/conf/conf_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/conf/conf_mall.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/conf/conf_mod.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/conf/conf_sap.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/conf/conf_ssl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cpt_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cryptlib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ct/ct_b64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ct/ct_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ct/ct_log.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ct/ct_oct.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ct/ct_policy.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ct/ct_prn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ct/ct_sct.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ct/ct_sct_ctx.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ct/ct_vfy.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ct/ct_x509v3.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ctype.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cversion.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto",
                 ],
             "crypto/des/cbc_cksm.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/cbc_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/cfb64ede.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/cfb64enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/cfb_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/crypt586.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/des-586.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/dest4-sparcv9.o" =>
@@ -6207,295 +6008,246 @@ our %unified_info = (
             "crypto/des/ecb3_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/ecb_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/fcrypt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/ofb64ede.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/ofb64enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/ofb_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/pcbc_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/qud_cksm.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/rand_key.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/set_key.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/str2key.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/xcbc_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_ameth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_asn1.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_check.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_depr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_gen.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_kdf.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_key.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_meth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_pmeth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_prn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_rfc5114.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_rfc7919.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dsa/dsa_ameth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dsa/dsa_asn1.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dsa/dsa_depr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dsa/dsa_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dsa/dsa_gen.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dsa/dsa_key.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dsa/dsa_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dsa/dsa_meth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dsa/dsa_ossl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dsa/dsa_pmeth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dsa/dsa_prn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dsa/dsa_sign.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dsa/dsa_vrf.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dso/dso_dl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dso/dso_dlfcn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dso/dso_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dso/dso_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dso/dso_openssl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dso/dso_vms.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dso/dso_win32.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ebcdic.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/curve25519.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/curve448/arch_32/f_impl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto/ec/curve448/arch_32",
                     "crypto/ec/curve448",
@@ -6503,7 +6255,6 @@ our %unified_info = (
             "crypto/ec/curve448/curve448.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto/ec/curve448/arch_32",
                     "crypto/ec/curve448",
@@ -6511,7 +6262,6 @@ our %unified_info = (
             "crypto/ec/curve448/curve448_tables.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto/ec/curve448/arch_32",
                     "crypto/ec/curve448",
@@ -6519,7 +6269,6 @@ our %unified_info = (
             "crypto/ec/curve448/eddsa.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto/ec/curve448/arch_32",
                     "crypto/ec/curve448",
@@ -6527,7 +6276,6 @@ our %unified_info = (
             "crypto/ec/curve448/f_generic.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto/ec/curve448/arch_32",
                     "crypto/ec/curve448",
@@ -6535,7 +6283,6 @@ our %unified_info = (
             "crypto/ec/curve448/scalar.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto/ec/curve448/arch_32",
                     "crypto/ec/curve448",
@@ -6543,163 +6290,136 @@ our %unified_info = (
             "crypto/ec/ec2_oct.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec2_smpl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec_ameth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec_asn1.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec_check.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec_curve.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec_cvt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec_key.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec_kmeth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec_mult.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec_oct.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec_pmeth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec_print.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecdh_kdf.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecdh_ossl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecdsa_ossl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecdsa_sign.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecdsa_vrf.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/eck_prn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecp_mont.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecp_nist.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecp_nistp224.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecp_nistp256.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecp_nistp521.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecp_nistputil.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecp_nistz256-armv4.o" =>
@@ -6717,235 +6437,196 @@ our %unified_info = (
             "crypto/ec/ecp_nistz256-x86.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecp_nistz256.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecp_oct.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecp_smpl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecx_meth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/eng_all.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/eng_cnf.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/eng_ctrl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/eng_dyn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/eng_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/eng_fat.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/eng_init.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/eng_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/eng_list.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/eng_openssl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/eng_pkey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/eng_rdrand.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/eng_table.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/tb_asnmth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/tb_cipher.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/tb_dh.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/tb_digest.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/tb_dsa.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/tb_eckey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/tb_pkmeth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/tb_rand.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/tb_rsa.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/err/err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/err/err_all.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/err/err_prn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/bio_b64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/bio_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/bio_md.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/bio_ok.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/c_allc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/c_alld.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/cmeth_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/digest.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/e_aes.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto",
                     "crypto/modes",
@@ -6953,21 +6634,18 @@ our %unified_info = (
             "crypto/evp/e_aes_cbc_hmac_sha1.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto/modes",
                 ],
             "crypto/evp/e_aes_cbc_hmac_sha256.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto/modes",
                 ],
             "crypto/evp/e_aria.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto",
                     "crypto/modes",
@@ -6975,13 +6653,11 @@ our %unified_info = (
             "crypto/evp/e_bf.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/e_camellia.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto",
                     "crypto/modes",
@@ -6989,81 +6665,68 @@ our %unified_info = (
             "crypto/evp/e_cast.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/e_chacha20_poly1305.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/e_des.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto",
                 ],
             "crypto/evp/e_des3.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto",
                 ],
             "crypto/evp/e_idea.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/e_null.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/e_old.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/e_rc2.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/e_rc4.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/e_rc4_hmac_md5.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/e_rc5.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/e_seed.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/e_sm4.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto",
                     "crypto/modes",
@@ -7071,334 +6734,272 @@ our %unified_info = (
             "crypto/evp/e_xcbc_d.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/encode.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/evp_cnf.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/evp_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/evp_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/evp_key.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/evp_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/evp_pbe.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/evp_pkey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/m_md2.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/m_md4.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/m_md5.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/m_md5_sha1.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/m_mdc2.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/m_null.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/m_ripemd.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/m_sha1.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/m_sha3.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto",
                 ],
             "crypto/evp/m_sigver.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/m_wp.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/names.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/p5_crpt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/p5_crpt2.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/p_dec.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/p_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/p_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/p_open.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/p_seal.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/p_sign.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/p_verify.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/pbe_scrypt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/pmeth_fn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/pmeth_gn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/pmeth_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ex_data.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/getenv.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/hmac/hm_ameth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/hmac/hm_pmeth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/hmac/hmac.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/idea/i_cbc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/idea/i_cfb64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/idea/i_ecb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/idea/i_ofb64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/idea/i_skey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
-            "crypto/include/internal/bn_conf.h" =>
-                [
-                    ".",
-                ],
-            "crypto/include/internal/dso_conf.h" =>
-                [
-                    ".",
-                ],
             "crypto/init.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/kdf/hkdf.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/kdf/kdf_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/kdf/scrypt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/kdf/tls1_prf.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/lhash/lh_stats.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/lhash/lhash.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/md4/md4_dgst.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/md4/md4_one.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/md5/md5-586.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/md5/md5-sparcv9.o" =>
@@ -7408,79 +7009,66 @@ our %unified_info = (
             "crypto/md5/md5_dgst.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/md5/md5_one.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/mdc2/mdc2_one.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/mdc2/mdc2dgst.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/mem.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/mem_dbg.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/mem_sec.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/modes/cbc128.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/modes/ccm128.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/modes/cfb128.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/modes/ctr128.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/modes/cts128.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/modes/gcm128.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto",
                 ],
@@ -7499,7 +7087,6 @@ our %unified_info = (
             "crypto/modes/ghash-x86.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/modes/ghashv8-armx.o" =>
@@ -7509,361 +7096,301 @@ our %unified_info = (
             "crypto/modes/ocb128.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/modes/ofb128.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/modes/wrap128.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/modes/xts128.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/o_dir.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/o_fips.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/o_fopen.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/o_init.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/o_str.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/o_time.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/objects/o_names.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/objects/obj_dat.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/objects/obj_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/objects/obj_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/objects/obj_xref.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ocsp/ocsp_asn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ocsp/ocsp_cl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ocsp/ocsp_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ocsp/ocsp_ext.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ocsp/ocsp_ht.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ocsp/ocsp_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ocsp/ocsp_prn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ocsp/ocsp_srv.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ocsp/ocsp_vfy.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ocsp/v3_ocsp.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pem/pem_all.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pem/pem_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pem/pem_info.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pem/pem_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pem/pem_oth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pem/pem_pk8.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pem/pem_pkey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pem/pem_sign.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pem/pem_x509.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pem/pem_xaux.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pem/pvkfmt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_add.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_asn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_attr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_crpt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_crt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_decr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_init.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_key.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_kiss.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_mutl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_npas.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_p8d.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_p8e.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_sbag.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_utl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/pk12err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs7/bio_pk7.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs7/pk7_asn1.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs7/pk7_attr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs7/pk7_doit.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs7/pk7_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs7/pk7_mime.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs7/pk7_smime.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs7/pkcs7err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/poly1305/poly1305-armv4.o" =>
@@ -7885,265 +7412,221 @@ our %unified_info = (
             "crypto/poly1305/poly1305-x86.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/poly1305/poly1305.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/poly1305/poly1305_ameth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/poly1305/poly1305_pmeth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rand/drbg_ctr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rand/drbg_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rand/rand_egd.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rand/rand_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rand/rand_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rand/rand_unix.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rand/rand_vms.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rand/rand_win.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rand/randfile.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rc2/rc2_cbc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rc2/rc2_ecb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rc2/rc2_skey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rc2/rc2cfb64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rc2/rc2ofb64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rc4/rc4-586.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ripemd/rmd-586.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ripemd/rmd_dgst.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ripemd/rmd_one.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_ameth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_asn1.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_chk.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_crpt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_depr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_gen.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_meth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_mp.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_none.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_oaep.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_ossl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_pk1.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_pmeth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_prn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_pss.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_saos.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_sign.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_ssl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_x931.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_x931g.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/s390xcpuid.o" =>
@@ -8153,31 +7636,26 @@ our %unified_info = (
             "crypto/seed/seed.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/seed/seed_cbc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/seed/seed_cfb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/seed/seed_ecb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/seed/seed_ofb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sha/keccak1600-armv4.o" =>
@@ -8187,13 +7665,11 @@ our %unified_info = (
             "crypto/sha/keccak1600.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sha/sha1-586.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sha/sha1-armv4-large.o" =>
@@ -8219,19 +7695,16 @@ our %unified_info = (
             "crypto/sha/sha1_one.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sha/sha1dgst.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sha/sha256-586.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sha/sha256-armv4.o" =>
@@ -8257,13 +7730,11 @@ our %unified_info = (
             "crypto/sha/sha256.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sha/sha512-586.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sha/sha512-armv4.o" =>
@@ -8289,727 +7760,606 @@ our %unified_info = (
             "crypto/sha/sha512.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/siphash/siphash.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/siphash/siphash_ameth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/siphash/siphash_pmeth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sm2/sm2_crypt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sm2/sm2_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sm2/sm2_pmeth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sm2/sm2_sign.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sm3/m_sm3.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sm3/sm3.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sm4/sm4.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/srp/srp_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/srp/srp_vfy.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/stack/stack.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/store/loader_file.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/store/store_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/store/store_init.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/store/store_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/store/store_register.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/store/store_strings.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/threads_none.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/threads_pthread.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/threads_win.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ts/ts_asn1.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ts/ts_conf.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ts/ts_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ts/ts_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ts/ts_req_print.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ts/ts_req_utils.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ts/ts_rsp_print.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ts/ts_rsp_sign.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ts/ts_rsp_utils.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ts/ts_rsp_verify.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ts/ts_verify_ctx.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/txt_db/txt_db.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ui/ui_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ui/ui_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ui/ui_null.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ui/ui_openssl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ui/ui_util.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/uid.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/whrlpool/wp-mmx.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/whrlpool/wp_block.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/whrlpool/wp_dgst.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/by_dir.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/by_file.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/t_crl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/t_req.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/t_x509.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_att.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_cmp.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_d2.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_def.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_ext.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_lu.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_meth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_obj.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_r2x.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_req.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_set.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_trs.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_txt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_v3.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_vfy.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_vpm.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509cset.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509name.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509rset.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509spki.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509type.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x_all.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x_attrib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x_crl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x_exten.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x_name.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x_pubkey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x_req.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x_x509.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x_x509a.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/pcy_cache.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/pcy_data.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/pcy_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/pcy_map.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/pcy_node.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/pcy_tree.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_addr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_admis.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_akey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_akeya.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_alt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_asid.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_bcons.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_bitst.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_conf.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_cpols.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_crld.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_enum.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_extku.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_genn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_ia5.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_info.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_int.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_ncons.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_pci.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_pcia.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_pcons.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_pku.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_pmaps.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_prn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_purp.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_skey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_sxnet.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_tlsf.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_utl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x86cpuid.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "engines/e_capi.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "engines/e_padlock-x86.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "engines/e_padlock.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "fuzz/asn1.o" =>
@@ -9060,6 +8410,14 @@ our %unified_info = (
                 [
                     "include",
                 ],
+            "include/crypto/bn_conf.h" =>
+                [
+                    ".",
+                ],
+            "include/crypto/dso_conf.h" =>
+                [
+                    ".",
+                ],
             "include/openssl/opensslconf.h" =>
                 [
                     ".",
@@ -9304,7 +8662,6 @@ our %unified_info = (
                 [
                     ".",
                     "include",
-                    "crypto/include",
                 ],
             "test/asn1_string_table_test.o" =>
                 [
@@ -9630,7 +8987,6 @@ our %unified_info = (
                 [
                     ".",
                     "include",
-                    "crypto/include",
                 ],
             "test/cipher_overhead_test.o" =>
                 [
@@ -9676,7 +9032,6 @@ our %unified_info = (
             "test/ctype_internal_test.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "test/curve448_internal_test.o" =>
@@ -9742,7 +9097,6 @@ our %unified_info = (
                 [
                     "include",
                     "crypto/ec",
-                    "crypto/include",
                 ],
             "test/ecdsatest.o" =>
                 [
@@ -9767,7 +9121,6 @@ our %unified_info = (
             "test/evp_extra_test.o" =>
                 [
                     "include",
-                    "crypto/include",
                 ],
             "test/evp_test.o" =>
                 [
@@ -9865,7 +9218,6 @@ our %unified_info = (
                 [
                     ".",
                     "include",
-                    "crypto/include",
                 ],
             "test/rc2test.o" =>
                 [
@@ -9915,18 +9267,15 @@ our %unified_info = (
                 [
                     ".",
                     "include",
-                    "crypto/include",
                 ],
             "test/sm2_internal_test.o" =>
                 [
                     "include",
-                    "crypto/include",
                 ],
             "test/sm4_internal_test.o" =>
                 [
                     ".",
                     "include",
-                    "crypto/include",
                 ],
             "test/srptest.o" =>
                 [
@@ -9937,6 +9286,10 @@ our %unified_info = (
                     ".",
                     "include",
                 ],
+            "test/ssl_ctx_test.o" =>
+                [
+                    "include",
+                ],
             "test/ssl_test.o" =>
                 [
                     "include",
@@ -10000,10 +9353,6 @@ our %unified_info = (
                 [
                     "include",
                 ],
-            "test/testutil/init.o" =>
-                [
-                    "include",
-                ],
             "test/testutil/main.o" =>
                 [
                     "include",
@@ -10032,6 +9381,10 @@ our %unified_info = (
                 [
                     "include",
                 ],
+            "test/testutil/testutil_init.o" =>
+                [
+                    "include",
+                ],
             "test/threadstest.o" =>
                 [
                     "include",
@@ -10296,6 +9649,7 @@ our %unified_info = (
             "test/sm4_internal_test",
             "test/srptest",
             "test/ssl_cert_table_internal_test",
+            "test/ssl_ctx_test",
             "test/ssl_test",
             "test/ssl_test_ctx_test",
             "test/sslapitest",
@@ -15251,7 +14605,6 @@ our %unified_info = (
                     "test/testutil/cb.o",
                     "test/testutil/driver.o",
                     "test/testutil/format_output.o",
-                    "test/testutil/init.o",
                     "test/testutil/main.o",
                     "test/testutil/output_helpers.o",
                     "test/testutil/random.o",
@@ -15259,6 +14612,7 @@ our %unified_info = (
                     "test/testutil/tap_bio.o",
                     "test/testutil/test_cleanup.o",
                     "test/testutil/tests.o",
+                    "test/testutil/testutil_init.o",
                 ],
             "test/md2test" =>
                 [
@@ -15486,6 +14840,14 @@ our %unified_info = (
                 [
                     "test/ssl_cert_table_internal_test.c",
                 ],
+            "test/ssl_ctx_test" =>
+                [
+                    "test/ssl_ctx_test.o",
+                ],
+            "test/ssl_ctx_test.o" =>
+                [
+                    "test/ssl_ctx_test.c",
+                ],
             "test/ssl_test" =>
                 [
                     "test/handshake_helper.o",
@@ -15588,10 +14950,6 @@ our %unified_info = (
                 [
                     "test/testutil/format_output.c",
                 ],
-            "test/testutil/init.o" =>
-                [
-                    "test/testutil/init.c",
-                ],
             "test/testutil/main.o" =>
                 [
                     "test/testutil/main.c",
@@ -15620,6 +14978,10 @@ our %unified_info = (
                 [
                     "test/testutil/tests.c",
                 ],
+            "test/testutil/testutil_init.o" =>
+                [
+                    "test/testutil/testutil_init.c",
+                ],
             "test/threadstest" =>
                 [
                     "test/threadstest.o",
diff --git a/deps/openssl/config/archs/linux-elf/asm_avx2/crypto/aes/aes-586.s b/deps/openssl/config/archs/linux-elf/asm_avx2/crypto/aes/aes-586.s
deleted file mode 100644
index 53cd2909ac..0000000000
--- a/deps/openssl/config/archs/linux-elf/asm_avx2/crypto/aes/aes-586.s
+++ /dev/null
@@ -1,3243 +0,0 @@
-.text
-.type	_x86_AES_encrypt_compact,@function
-.align	16
-_x86_AES_encrypt_compact:
-	movl	%edi,20(%esp)
-	xorl	(%edi),%eax
-	xorl	4(%edi),%ebx
-	xorl	8(%edi),%ecx
-	xorl	12(%edi),%edx
-	movl	240(%edi),%esi
-	leal	-2(%esi,%esi,1),%esi
-	leal	(%edi,%esi,8),%esi
-	movl	%esi,24(%esp)
-	movl	-128(%ebp),%edi
-	movl	-96(%ebp),%esi
-	movl	-64(%ebp),%edi
-	movl	-32(%ebp),%esi
-	movl	(%ebp),%edi
-	movl	32(%ebp),%esi
-	movl	64(%ebp),%edi
-	movl	96(%ebp),%esi
-.align	16
-.L000loop:
-	movl	%eax,%esi
-	andl	$255,%esi
-	movzbl	-128(%ebp,%esi,1),%esi
-	movzbl	%bh,%edi
-	movzbl	-128(%ebp,%edi,1),%edi
-	shll	$8,%edi
-	xorl	%edi,%esi
-	movl	%ecx,%edi
-	shrl	$16,%edi
-	andl	$255,%edi
-	movzbl	-128(%ebp,%edi,1),%edi
-	shll	$16,%edi
-	xorl	%edi,%esi
-	movl	%edx,%edi
-	shrl	$24,%edi
-	movzbl	-128(%ebp,%edi,1),%edi
-	shll	$24,%edi
-	xorl	%edi,%esi
-	movl	%esi,4(%esp)
-
-	movl	%ebx,%esi
-	andl	$255,%esi
-	shrl	$16,%ebx
-	movzbl	-128(%ebp,%esi,1),%esi
-	movzbl	%ch,%edi
-	movzbl	-128(%ebp,%edi,1),%edi
-	shll	$8,%edi
-	xorl	%edi,%esi
-	movl	%edx,%edi
-	shrl	$16,%edi
-	andl	$255,%edi
-	movzbl	-128(%ebp,%edi,1),%edi
-	shll	$16,%edi
-	xorl	%edi,%esi
-	movl	%eax,%edi
-	shrl	$24,%edi
-	movzbl	-128(%ebp,%edi,1),%edi
-	shll	$24,%edi
-	xorl	%edi,%esi
-	movl	%esi,8(%esp)
-
-	movl	%ecx,%esi
-	andl	$255,%esi
-	shrl	$24,%ecx
-	movzbl	-128(%ebp,%esi,1),%esi
-	movzbl	%dh,%edi
-	movzbl	-128(%ebp,%edi,1),%edi
-	shll	$8,%edi
-	xorl	%edi,%esi
-	movl	%eax,%edi
-	shrl	$16,%edi
-	andl	$255,%edx
-	andl	$255,%edi
-	movzbl	-128(%ebp,%edi,1),%edi
-	shll	$16,%edi
-	xorl	%edi,%esi
-	movzbl	%bh,%edi
-	movzbl	-128(%ebp,%edi,1),%edi
-	shll	$24,%edi
-	xorl	%edi,%esi
-
-	andl	$255,%edx
-	movzbl	-128(%ebp,%edx,1),%edx
-	movzbl	%ah,%eax
-	movzbl	-128(%ebp,%eax,1),%eax
-	shll	$8,%eax
-	xorl	%eax,%edx
-	movl	4(%esp),%eax
-	andl	$255,%ebx
-	movzbl	-128(%ebp,%ebx,1),%ebx
-	shll	$16,%ebx
-	xorl	%ebx,%edx
-	movl	8(%esp),%ebx
-	movzbl	-128(%ebp,%ecx,1),%ecx
-	shll	$24,%ecx
-	xorl	%ecx,%edx
-	movl	%esi,%ecx
-
-	movl	$2155905152,%ebp
-	andl	%ecx,%ebp
-	leal	(%ecx,%ecx,1),%edi
-	movl	%ebp,%esi
-	shrl	$7,%ebp
-	andl	$4278124286,%edi
-	subl	%ebp,%esi
-	movl	%ecx,%ebp
-	andl	$454761243,%esi
-	rorl	$16,%ebp
-	xorl	%edi,%esi
-	movl	%ecx,%edi
-	xorl	%esi,%ecx
-	rorl	$24,%edi
-	xorl	%ebp,%esi
-	roll	$24,%ecx
-	xorl	%edi,%esi
-	movl	$2155905152,%ebp
-	xorl	%esi,%ecx
-	andl	%edx,%ebp
-	leal	(%edx,%edx,1),%edi
-	movl	%ebp,%esi
-	shrl	$7,%ebp
-	andl	$4278124286,%edi
-	subl	%ebp,%esi
-	movl	%edx,%ebp
-	andl	$454761243,%esi
-	rorl	$16,%ebp
-	xorl	%edi,%esi
-	movl	%edx,%edi
-	xorl	%esi,%edx
-	rorl	$24,%edi
-	xorl	%ebp,%esi
-	roll	$24,%edx
-	xorl	%edi,%esi
-	movl	$2155905152,%ebp
-	xorl	%esi,%edx
-	andl	%eax,%ebp
-	leal	(%eax,%eax,1),%edi
-	movl	%ebp,%esi
-	shrl	$7,%ebp
-	andl	$4278124286,%edi
-	subl	%ebp,%esi
-	movl	%eax,%ebp
-	andl	$454761243,%esi
-	rorl	$16,%ebp
-	xorl	%edi,%esi
-	movl	%eax,%edi
-	xorl	%esi,%eax
-	rorl	$24,%edi
-	xorl	%ebp,%esi
-	roll	$24,%eax
-	xorl	%edi,%esi
-	movl	$2155905152,%ebp
-	xorl	%esi,%eax
-	andl	%ebx,%ebp
-	leal	(%ebx,%ebx,1),%edi
-	movl	%ebp,%esi
-	shrl	$7,%ebp
-	andl	$4278124286,%edi
-	subl	%ebp,%esi
-	movl	%ebx,%ebp
-	andl	$454761243,%esi
-	rorl	$16,%ebp
-	xorl	%edi,%esi
-	movl	%ebx,%edi
-	xorl	%esi,%ebx
-	rorl	$24,%edi
-	xorl	%ebp,%esi
-	roll	$24,%ebx
-	xorl	%edi,%esi
-	xorl	%esi,%ebx
-	movl	20(%esp),%edi
-	movl	28(%esp),%ebp
-	addl	$16,%edi
-	xorl	(%edi),%eax
-	xorl	4(%edi),%ebx
-	xorl	8(%edi),%ecx
-	xorl	12(%edi),%edx
-	cmpl	24(%esp),%edi
-	movl	%edi,20(%esp)
-	jb	.L000loop
-	movl	%eax,%esi
-	andl	$255,%esi
-	movzbl	-128(%ebp,%esi,1),%esi
-	movzbl	%bh,%edi
-	movzbl	-128(%ebp,%edi,1),%edi
-	shll	$8,%edi
-	xorl	%edi,%esi
-	movl	%ecx,%edi
-	shrl	$16,%edi
-	andl	$255,%edi
-	movzbl	-128(%ebp,%edi,1),%edi
-	shll	$16,%edi
-	xorl	%edi,%esi
-	movl	%edx,%edi
-	shrl	$24,%edi
-	movzbl	-128(%ebp,%edi,1),%edi
-	shll	$24,%edi
-	xorl	%edi,%esi
-	movl	%esi,4(%esp)
-
-	movl	%ebx,%esi
-	andl	$255,%esi
-	shrl	$16,%ebx
-	movzbl	-128(%ebp,%esi,1),%esi
-	movzbl	%ch,%edi
-	movzbl	-128(%ebp,%edi,1),%edi
-	shll	$8,%edi
-	xorl	%edi,%esi
-	movl	%edx,%edi
-	shrl	$16,%edi
-	andl	$255,%edi
-	movzbl	-128(%ebp,%edi,1),%edi
-	shll	$16,%edi
-	xorl	%edi,%esi
-	movl	%eax,%edi
-	shrl	$24,%edi
-	movzbl	-128(%ebp,%edi,1),%edi
-	shll	$24,%edi
-	xorl	%edi,%esi
-	movl	%esi,8(%esp)
-
-	movl	%ecx,%esi
-	andl	$255,%esi
-	shrl	$24,%ecx
-	movzbl	-128(%ebp,%esi,1),%esi
-	movzbl	%dh,%edi
-	movzbl	-128(%ebp,%edi,1),%edi
-	shll	$8,%edi
-	xorl	%edi,%esi
-	movl	%eax,%edi
-	shrl	$16,%edi
-	andl	$255,%edx
-	andl	$255,%edi
-	movzbl	-128(%ebp,%edi,1),%edi
-	shll	$16,%edi
-	xorl	%edi,%esi
-	movzbl	%bh,%edi
-	movzbl	-128(%ebp,%edi,1),%edi
-	shll	$24,%edi
-	xorl	%edi,%esi
-
-	movl	20(%esp),%edi
-	andl	$255,%edx
-	movzbl	-128(%ebp,%edx,1),%edx
-	movzbl	%ah,%eax
-	movzbl	-128(%ebp,%eax,1),%eax
-	shll	$8,%eax
-	xorl	%eax,%edx
-	movl	4(%esp),%eax
-	andl	$255,%ebx
-	movzbl	-128(%ebp,%ebx,1),%ebx
-	shll	$16,%ebx
-	xorl	%ebx,%edx
-	movl	8(%esp),%ebx
-	movzbl	-128(%ebp,%ecx,1),%ecx
-	shll	$24,%ecx
-	xorl	%ecx,%edx
-	movl	%esi,%ecx
-
-	xorl	16(%edi),%eax
-	xorl	20(%edi),%ebx
-	xorl	24(%edi),%ecx
-	xorl	28(%edi),%edx
-	ret
-.size	_x86_AES_encrypt_compact,.-_x86_AES_encrypt_compact
-.type	_sse_AES_encrypt_compact,@function
-.align	16
-_sse_AES_encrypt_compact:
-	pxor	(%edi),%mm0
-	pxor	8(%edi),%mm4
-	movl	240(%edi),%esi
-	leal	-2(%esi,%esi,1),%esi
-	leal	(%edi,%esi,8),%esi
-	movl	%esi,24(%esp)
-	movl	$454761243,%eax
-	movl	%eax,8(%esp)
-	movl	%eax,12(%esp)
-	movl	-128(%ebp),%eax
-	movl	-96(%ebp),%ebx
-	movl	-64(%ebp),%ecx
-	movl	-32(%ebp),%edx
-	movl	(%ebp),%eax
-	movl	32(%ebp),%ebx
-	movl	64(%ebp),%ecx
-	movl	96(%ebp),%edx
-.align	16
-.L001loop:
-	pshufw	$8,%mm0,%mm1
-	pshufw	$13,%mm4,%mm5
-	movd	%mm1,%eax
-	movd	%mm5,%ebx
-	movl	%edi,20(%esp)
-	movzbl	%al,%esi
-	movzbl	%ah,%edx
-	pshufw	$13,%mm0,%mm2
-	movzbl	-128(%ebp,%esi,1),%ecx
-	movzbl	%bl,%edi
-	movzbl	-128(%ebp,%edx,1),%edx
-	shrl	$16,%eax
-	shll	$8,%edx
-	movzbl	-128(%ebp,%edi,1),%esi
-	movzbl	%bh,%edi
-	shll	$16,%esi
-	pshufw	$8,%mm4,%mm6
-	orl	%esi,%ecx
-	movzbl	-128(%ebp,%edi,1),%esi
-	movzbl	%ah,%edi
-	shll	$24,%esi
-	shrl	$16,%ebx
-	orl	%esi,%edx
-	movzbl	-128(%ebp,%edi,1),%esi
-	movzbl	%bh,%edi
-	shll	$8,%esi
-	orl	%esi,%ecx
-	movzbl	-128(%ebp,%edi,1),%esi
-	movzbl	%al,%edi
-	shll	$24,%esi
-	orl	%esi,%ecx
-	movzbl	-128(%ebp,%edi,1),%esi
-	movzbl	%bl,%edi
-	movd	%mm2,%eax
-	movd	%ecx,%mm0
-	movzbl	-128(%ebp,%edi,1),%ecx
-	movzbl	%ah,%edi
-	shll	$16,%ecx
-	movd	%mm6,%ebx
-	orl	%esi,%ecx
-	movzbl	-128(%ebp,%edi,1),%esi
-	movzbl	%bh,%edi
-	shll	$24,%esi
-	orl	%esi,%ecx
-	movzbl	-128(%ebp,%edi,1),%esi
-	movzbl	%bl,%edi
-	shll	$8,%esi
-	shrl	$16,%ebx
-	orl	%esi,%ecx
-	movzbl	-128(%ebp,%edi,1),%esi
-	movzbl	%al,%edi
-	shrl	$16,%eax
-	movd	%ecx,%mm1
-	movzbl	-128(%ebp,%edi,1),%ecx
-	movzbl	%ah,%edi
-	shll	$16,%ecx
-	andl	$255,%eax
-	orl	%esi,%ecx
-	punpckldq	%mm1,%mm0
-	movzbl	-128(%ebp,%edi,1),%esi
-	movzbl	%bh,%edi
-	shll	$24,%esi
-	andl	$255,%ebx
-	movzbl	-128(%ebp,%eax,1),%eax
-	orl	%esi,%ecx
-	shll	$16,%eax
-	movzbl	-128(%ebp,%edi,1),%esi
-	orl	%eax,%edx
-	shll	$8,%esi
-	movzbl	-128(%ebp,%ebx,1),%ebx
-	orl	%esi,%ecx
-	orl	%ebx,%edx
-	movl	20(%esp),%edi
-	movd	%ecx,%mm4
-	movd	%edx,%mm5
-	punpckldq	%mm5,%mm4
-	addl	$16,%edi
-	cmpl	24(%esp),%edi
-	ja	.L002out
-	movq	8(%esp),%mm2
-	pxor	%mm3,%mm3
-	pxor	%mm7,%mm7
-	movq	%mm0,%mm1
-	movq	%mm4,%mm5
-	pcmpgtb	%mm0,%mm3
-	pcmpgtb	%mm4,%mm7
-	pand	%mm2,%mm3
-	pand	%mm2,%mm7
-	pshufw	$177,%mm0,%mm2
-	pshufw	$177,%mm4,%mm6
-	paddb	%mm0,%mm0
-	paddb	%mm4,%mm4
-	pxor	%mm3,%mm0
-	pxor	%mm7,%mm4
-	pshufw	$177,%mm2,%mm3
-	pshufw	$177,%mm6,%mm7
-	pxor	%mm0,%mm1
-	pxor	%mm4,%mm5
-	pxor	%mm2,%mm0
-	pxor	%mm6,%mm4
-	movq	%mm3,%mm2
-	movq	%mm7,%mm6
-	pslld	$8,%mm3
-	pslld	$8,%mm7
-	psrld	$24,%mm2
-	psrld	$24,%mm6
-	pxor	%mm3,%mm0
-	pxor	%mm7,%mm4
-	pxor	%mm2,%mm0
-	pxor	%mm6,%mm4
-	movq	%mm1,%mm3
-	movq	%mm5,%mm7
-	movq	(%edi),%mm2
-	movq	8(%edi),%mm6
-	psrld	$8,%mm1
-	psrld	$8,%mm5
-	movl	-128(%ebp),%eax
-	pslld	$24,%mm3
-	pslld	$24,%mm7
-	movl	-64(%ebp),%ebx
-	pxor	%mm1,%mm0
-	pxor	%mm5,%mm4
-	movl	(%ebp),%ecx
-	pxor	%mm3,%mm0
-	pxor	%mm7,%mm4
-	movl	64(%ebp),%edx
-	pxor	%mm2,%mm0
-	pxor	%mm6,%mm4
-	jmp	.L001loop
-.align	16
-.L002out:
-	pxor	(%edi),%mm0
-	pxor	8(%edi),%mm4
-	ret
-.size	_sse_AES_encrypt_compact,.-_sse_AES_encrypt_compact
-.type	_x86_AES_encrypt,@function
-.align	16
-_x86_AES_encrypt:
-	movl	%edi,20(%esp)
-	xorl	(%edi),%eax
-	xorl	4(%edi),%ebx
-	xorl	8(%edi),%ecx
-	xorl	12(%edi),%edx
-	movl	240(%edi),%esi
-	leal	-2(%esi,%esi,1),%esi
-	leal	(%edi,%esi,8),%esi
-	movl	%esi,24(%esp)
-.align	16
-.L003loop:
-	movl	%eax,%esi
-	andl	$255,%esi
-	movl	(%ebp,%esi,8),%esi
-	movzbl	%bh,%edi
-	xorl	3(%ebp,%edi,8),%esi
-	movl	%ecx,%edi
-	shrl	$16,%edi
-	andl	$255,%edi
-	xorl	2(%ebp,%edi,8),%esi
-	movl	%edx,%edi
-	shrl	$24,%edi
-	xorl	1(%ebp,%edi,8),%esi
-	movl	%esi,4(%esp)
-
-	movl	%ebx,%esi
-	andl	$255,%esi
-	shrl	$16,%ebx
-	movl	(%ebp,%esi,8),%esi
-	movzbl	%ch,%edi
-	xorl	3(%ebp,%edi,8),%esi
-	movl	%edx,%edi
-	shrl	$16,%edi
-	andl	$255,%edi
-	xorl	2(%ebp,%edi,8),%esi
-	movl	%eax,%edi
-	shrl	$24,%edi
-	xorl	1(%ebp,%edi,8),%esi
-	movl	%esi,8(%esp)
-
-	movl	%ecx,%esi
-	andl	$255,%esi
-	shrl	$24,%ecx
-	movl	(%ebp,%esi,8),%esi
-	movzbl	%dh,%edi
-	xorl	3(%ebp,%edi,8),%esi
-	movl	%eax,%edi
-	shrl	$16,%edi
-	andl	$255,%edx
-	andl	$255,%edi
-	xorl	2(%ebp,%edi,8),%esi
-	movzbl	%bh,%edi
-	xorl	1(%ebp,%edi,8),%esi
-
-	movl	20(%esp),%edi
-	movl	(%ebp,%edx,8),%edx
-	movzbl	%ah,%eax
-	xorl	3(%ebp,%eax,8),%edx
-	movl	4(%esp),%eax
-	andl	$255,%ebx
-	xorl	2(%ebp,%ebx,8),%edx
-	movl	8(%esp),%ebx
-	xorl	1(%ebp,%ecx,8),%edx
-	movl	%esi,%ecx
-
-	addl	$16,%edi
-	xorl	(%edi),%eax
-	xorl	4(%edi),%ebx
-	xorl	8(%edi),%ecx
-	xorl	12(%edi),%edx
-	cmpl	24(%esp),%edi
-	movl	%edi,20(%esp)
-	jb	.L003loop
-	movl	%eax,%esi
-	andl	$255,%esi
-	movl	2(%ebp,%esi,8),%esi
-	andl	$255,%esi
-	movzbl	%bh,%edi
-	movl	(%ebp,%edi,8),%edi
-	andl	$65280,%edi
-	xorl	%edi,%esi
-	movl	%ecx,%edi
-	shrl	$16,%edi
-	andl	$255,%edi
-	movl	(%ebp,%edi,8),%edi
-	andl	$16711680,%edi
-	xorl	%edi,%esi
-	movl	%edx,%edi
-	shrl	$24,%edi
-	movl	2(%ebp,%edi,8),%edi
-	andl	$4278190080,%edi
-	xorl	%edi,%esi
-	movl	%esi,4(%esp)
-	movl	%ebx,%esi
-	andl	$255,%esi
-	shrl	$16,%ebx
-	movl	2(%ebp,%esi,8),%esi
-	andl	$255,%esi
-	movzbl	%ch,%edi
-	movl	(%ebp,%edi,8),%edi
-	andl	$65280,%edi
-	xorl	%edi,%esi
-	movl	%edx,%edi
-	shrl	$16,%edi
-	andl	$255,%edi
-	movl	(%ebp,%edi,8),%edi
-	andl	$16711680,%edi
-	xorl	%edi,%esi
-	movl	%eax,%edi
-	shrl	$24,%edi
-	movl	2(%ebp,%edi,8),%edi
-	andl	$4278190080,%edi
-	xorl	%edi,%esi
-	movl	%esi,8(%esp)
-	movl	%ecx,%esi
-	andl	$255,%esi
-	shrl	$24,%ecx
-	movl	2(%ebp,%esi,8),%esi
-	andl	$255,%esi
-	movzbl	%dh,%edi
-	movl	(%ebp,%edi,8),%edi
-	andl	$65280,%edi
-	xorl	%edi,%esi
-	movl	%eax,%edi
-	shrl	$16,%edi
-	andl	$255,%edx
-	andl	$255,%edi
-	movl	(%ebp,%edi,8),%edi
-	andl	$16711680,%edi
-	xorl	%edi,%esi
-	movzbl	%bh,%edi
-	movl	2(%ebp,%edi,8),%edi
-	andl	$4278190080,%edi
-	xorl	%edi,%esi
-	movl	20(%esp),%edi
-	andl	$255,%edx
-	movl	2(%ebp,%edx,8),%edx
-	andl	$255,%edx
-	movzbl	%ah,%eax
-	movl	(%ebp,%eax,8),%eax
-	andl	$65280,%eax
-	xorl	%eax,%edx
-	movl	4(%esp),%eax
-	andl	$255,%ebx
-	movl	(%ebp,%ebx,8),%ebx
-	andl	$16711680,%ebx
-	xorl	%ebx,%edx
-	movl	8(%esp),%ebx
-	movl	2(%ebp,%ecx,8),%ecx
-	andl	$4278190080,%ecx
-	xorl	%ecx,%edx
-	movl	%esi,%ecx
-	addl	$16,%edi
-	xorl	(%edi),%eax
-	xorl	4(%edi),%ebx
-	xorl	8(%edi),%ecx
-	xorl	12(%edi),%edx
-	ret
-.align	64
-.LAES_Te:
-.long	2774754246,2774754246
-.long	2222750968,2222750968
-.long	2574743534,2574743534
-.long	2373680118,2373680118
-.long	234025727,234025727
-.long	3177933782,3177933782
-.long	2976870366,2976870366
-.long	1422247313,1422247313
-.long	1345335392,1345335392
-.long	50397442,50397442
-.long	2842126286,2842126286
-.long	2099981142,2099981142
-.long	436141799,436141799
-.long	1658312629,1658312629
-.long	3870010189,3870010189
-.long	2591454956,2591454956
-.long	1170918031,1170918031
-.long	2642575903,2642575903
-.long	1086966153,1086966153
-.long	2273148410,2273148410
-.long	368769775,368769775
-.long	3948501426,3948501426
-.long	3376891790,3376891790
-.long	200339707,200339707
-.long	3970805057,3970805057
-.long	1742001331,1742001331
-.long	4255294047,4255294047
-.long	3937382213,3937382213
-.long	3214711843,3214711843
-.long	4154762323,4154762323
-.long	2524082916,2524082916
-.long	1539358875,1539358875
-.long	3266819957,3266819957
-.long	486407649,486407649
-.long	2928907069,2928907069
-.long	1780885068,1780885068
-.long	1513502316,1513502316
-.long	1094664062,1094664062
-.long	49805301,49805301
-.long	1338821763,1338821763
-.long	1546925160,1546925160
-.long	4104496465,4104496465
-.long	887481809,887481809
-.long	150073849,150073849
-.long	2473685474,2473685474
-.long	1943591083,1943591083
-.long	1395732834,1395732834
-.long	1058346282,1058346282
-.long	201589768,201589768
-.long	1388824469,1388824469
-.long	1696801606,1696801606
-.long	1589887901,1589887901
-.long	672667696,672667696
-.long	2711000631,2711000631
-.long	251987210,251987210
-.long	3046808111,3046808111
-.long	151455502,151455502
-.long	907153956,907153956
-.long	2608889883,2608889883
-.long	1038279391,1038279391
-.long	652995533,652995533
-.long	1764173646,1764173646
-.long	3451040383,3451040383
-.long	2675275242,2675275242
-.long	453576978,453576978
-.long	2659418909,2659418909
-.long	1949051992,1949051992
-.long	773462580,773462580
-.long	756751158,756751158
-.long	2993581788,2993581788
-.long	3998898868,3998898868
-.long	4221608027,4221608027
-.long	4132590244,4132590244
-.long	1295727478,1295727478
-.long	1641469623,1641469623
-.long	3467883389,3467883389
-.long	2066295122,2066295122
-.long	1055122397,1055122397
-.long	1898917726,1898917726
-.long	2542044179,2542044179
-.long	4115878822,4115878822
-.long	1758581177,1758581177
-.long	0,0
-.long	753790401,753790401
-.long	1612718144,1612718144
-.long	536673507,536673507
-.long	3367088505,3367088505
-.long	3982187446,3982187446
-.long	3194645204,3194645204
-.long	1187761037,1187761037
-.long	3653156455,3653156455
-.long	1262041458,1262041458
-.long	3729410708,3729410708
-.long	3561770136,3561770136
-.long	3898103984,3898103984
-.long	1255133061,1255133061
-.long	1808847035,1808847035
-.long	720367557,720367557
-.long	3853167183,3853167183
-.long	385612781,385612781
-.long	3309519750,3309519750
-.long	3612167578,3612167578
-.long	1429418854,1429418854
-.long	2491778321,2491778321
-.long	3477423498,3477423498
-.long	284817897,284817897
-.long	100794884,100794884
-.long	2172616702,2172616702
-.long	4031795360,4031795360
-.long	1144798328,1144798328
-.long	3131023141,3131023141
-.long	3819481163,3819481163
-.long	4082192802,4082192802
-.long	4272137053,4272137053
-.long	3225436288,3225436288
-.long	2324664069,2324664069
-.long	2912064063,2912064063
-.long	3164445985,3164445985
-.long	1211644016,1211644016
-.long	83228145,83228145
-.long	3753688163,3753688163
-.long	3249976951,3249976951
-.long	1977277103,1977277103
-.long	1663115586,1663115586
-.long	806359072,806359072
-.long	452984805,452984805
-.long	250868733,250868733
-.long	1842533055,1842533055
-.long	1288555905,1288555905
-.long	336333848,336333848
-.long	890442534,890442534
-.long	804056259,804056259
-.long	3781124030,3781124030
-.long	2727843637,2727843637
-.long	3427026056,3427026056
-.long	957814574,957814574
-.long	1472513171,1472513171
-.long	4071073621,4071073621
-.long	2189328124,2189328124
-.long	1195195770,1195195770
-.long	2892260552,2892260552
-.long	3881655738,3881655738
-.long	723065138,723065138
-.long	2507371494,2507371494
-.long	2690670784,2690670784
-.long	2558624025,2558624025
-.long	3511635870,3511635870
-.long	2145180835,2145180835
-.long	1713513028,1713513028
-.long	2116692564,2116692564
-.long	2878378043,2878378043
-.long	2206763019,2206763019
-.long	3393603212,3393603212
-.long	703524551,703524551
-.long	3552098411,3552098411
-.long	1007948840,1007948840
-.long	2044649127,2044649127
-.long	3797835452,3797835452
-.long	487262998,487262998
-.long	1994120109,1994120109
-.long	1004593371,1004593371
-.long	1446130276,1446130276
-.long	1312438900,1312438900
-.long	503974420,503974420
-.long	3679013266,3679013266
-.long	168166924,168166924
-.long	1814307912,1814307912
-.long	3831258296,3831258296
-.long	1573044895,1573044895
-.long	1859376061,1859376061
-.long	4021070915,4021070915
-.long	2791465668,2791465668
-.long	2828112185,2828112185
-.long	2761266481,2761266481
-.long	937747667,937747667
-.long	2339994098,2339994098
-.long	854058965,854058965
-.long	1137232011,1137232011
-.long	1496790894,1496790894
-.long	3077402074,3077402074
-.long	2358086913,2358086913
-.long	1691735473,1691735473
-.long	3528347292,3528347292
-.long	3769215305,3769215305
-.long	3027004632,3027004632
-.long	4199962284,4199962284
-.long	133494003,133494003
-.long	636152527,636152527
-.long	2942657994,2942657994
-.long	2390391540,2390391540
-.long	3920539207,3920539207
-.long	403179536,403179536
-.long	3585784431,3585784431
-.long	2289596656,2289596656
-.long	1864705354,1864705354
-.long	1915629148,1915629148
-.long	605822008,605822008
-.long	4054230615,4054230615
-.long	3350508659,3350508659
-.long	1371981463,1371981463
-.long	602466507,602466507
-.long	2094914977,2094914977
-.long	2624877800,2624877800
-.long	555687742,555687742
-.long	3712699286,3712699286
-.long	3703422305,3703422305
-.long	2257292045,2257292045
-.long	2240449039,2240449039
-.long	2423288032,2423288032
-.long	1111375484,1111375484
-.long	3300242801,3300242801
-.long	2858837708,2858837708
-.long	3628615824,3628615824
-.long	84083462,84083462
-.long	32962295,32962295
-.long	302911004,302911004
-.long	2741068226,2741068226
-.long	1597322602,1597322602
-.long	4183250862,4183250862
-.long	3501832553,3501832553
-.long	2441512471,2441512471
-.long	1489093017,1489093017
-.long	656219450,656219450
-.long	3114180135,3114180135
-.long	954327513,954327513
-.long	335083755,335083755
-.long	3013122091,3013122091
-.long	856756514,856756514
-.long	3144247762,3144247762
-.long	1893325225,1893325225
-.long	2307821063,2307821063
-.long	2811532339,2811532339
-.long	3063651117,3063651117
-.long	572399164,572399164
-.long	2458355477,2458355477
-.long	552200649,552200649
-.long	1238290055,1238290055
-.long	4283782570,4283782570
-.long	2015897680,2015897680
-.long	2061492133,2061492133
-.long	2408352771,2408352771
-.long	4171342169,4171342169
-.long	2156497161,2156497161
-.long	386731290,386731290
-.long	3669999461,3669999461
-.long	837215959,837215959
-.long	3326231172,3326231172
-.long	3093850320,3093850320
-.long	3275833730,3275833730
-.long	2962856233,2962856233
-.long	1999449434,1999449434
-.long	286199582,286199582
-.long	3417354363,3417354363
-.long	4233385128,4233385128
-.long	3602627437,3602627437
-.long	974525996,974525996
-.byte	99,124,119,123,242,107,111,197
-.byte	48,1,103,43,254,215,171,118
-.byte	202,130,201,125,250,89,71,240
-.byte	173,212,162,175,156,164,114,192
-.byte	183,253,147,38,54,63,247,204
-.byte	52,165,229,241,113,216,49,21
-.byte	4,199,35,195,24,150,5,154
-.byte	7,18,128,226,235,39,178,117
-.byte	9,131,44,26,27,110,90,160
-.byte	82,59,214,179,41,227,47,132
-.byte	83,209,0,237,32,252,177,91
-.byte	106,203,190,57,74,76,88,207
-.byte	208,239,170,251,67,77,51,133
-.byte	69,249,2,127,80,60,159,168
-.byte	81,163,64,143,146,157,56,245
-.byte	188,182,218,33,16,255,243,210
-.byte	205,12,19,236,95,151,68,23
-.byte	196,167,126,61,100,93,25,115
-.byte	96,129,79,220,34,42,144,136
-.byte	70,238,184,20,222,94,11,219
-.byte	224,50,58,10,73,6,36,92
-.byte	194,211,172,98,145,149,228,121
-.byte	231,200,55,109,141,213,78,169
-.byte	108,86,244,234,101,122,174,8
-.byte	186,120,37,46,28,166,180,198
-.byte	232,221,116,31,75,189,139,138
-.byte	112,62,181,102,72,3,246,14
-.byte	97,53,87,185,134,193,29,158
-.byte	225,248,152,17,105,217,142,148
-.byte	155,30,135,233,206,85,40,223
-.byte	140,161,137,13,191,230,66,104
-.byte	65,153,45,15,176,84,187,22
-.byte	99,124,119,123,242,107,111,197
-.byte	48,1,103,43,254,215,171,118
-.byte	202,130,201,125,250,89,71,240
-.byte	173,212,162,175,156,164,114,192
-.byte	183,253,147,38,54,63,247,204
-.byte	52,165,229,241,113,216,49,21
-.byte	4,199,35,195,24,150,5,154
-.byte	7,18,128,226,235,39,178,117
-.byte	9,131,44,26,27,110,90,160
-.byte	82,59,214,179,41,227,47,132
-.byte	83,209,0,237,32,252,177,91
-.byte	106,203,190,57,74,76,88,207
-.byte	208,239,170,251,67,77,51,133
-.byte	69,249,2,127,80,60,159,168
-.byte	81,163,64,143,146,157,56,245
-.byte	188,182,218,33,16,255,243,210
-.byte	205,12,19,236,95,151,68,23
-.byte	196,167,126,61,100,93,25,115
-.byte	96,129,79,220,34,42,144,136
-.byte	70,238,184,20,222,94,11,219
-.byte	224,50,58,10,73,6,36,92
-.byte	194,211,172,98,145,149,228,121
-.byte	231,200,55,109,141,213,78,169
-.byte	108,86,244,234,101,122,174,8
-.byte	186,120,37,46,28,166,180,198
-.byte	232,221,116,31,75,189,139,138
-.byte	112,62,181,102,72,3,246,14
-.byte	97,53,87,185,134,193,29,158
-.byte	225,248,152,17,105,217,142,148
-.byte	155,30,135,233,206,85,40,223
-.byte	140,161,137,13,191,230,66,104
-.byte	65,153,45,15,176,84,187,22
-.byte	99,124,119,123,242,107,111,197
-.byte	48,1,103,43,254,215,171,118
-.byte	202,130,201,125,250,89,71,240
-.byte	173,212,162,175,156,164,114,192
-.byte	183,253,147,38,54,63,247,204
-.byte	52,165,229,241,113,216,49,21
-.byte	4,199,35,195,24,150,5,154
-.byte	7,18,128,226,235,39,178,117
-.byte	9,131,44,26,27,110,90,160
-.byte	82,59,214,179,41,227,47,132
-.byte	83,209,0,237,32,252,177,91
-.byte	106,203,190,57,74,76,88,207
-.byte	208,239,170,251,67,77,51,133
-.byte	69,249,2,127,80,60,159,168
-.byte	81,163,64,143,146,157,56,245
-.byte	188,182,218,33,16,255,243,210
-.byte	205,12,19,236,95,151,68,23
-.byte	196,167,126,61,100,93,25,115
-.byte	96,129,79,220,34,42,144,136
-.byte	70,238,184,20,222,94,11,219
-.byte	224,50,58,10,73,6,36,92
-.byte	194,211,172,98,145,149,228,121
-.byte	231,200,55,109,141,213,78,169
-.byte	108,86,244,234,101,122,174,8
-.byte	186,120,37,46,28,166,180,198
-.byte	232,221,116,31,75,189,139,138
-.byte	112,62,181,102,72,3,246,14
-.byte	97,53,87,185,134,193,29,158
-.byte	225,248,152,17,105,217,142,148
-.byte	155,30,135,233,206,85,40,223
-.byte	140,161,137,13,191,230,66,104
-.byte	65,153,45,15,176,84,187,22
-.byte	99,124,119,123,242,107,111,197
-.byte	48,1,103,43,254,215,171,118
-.byte	202,130,201,125,250,89,71,240
-.byte	173,212,162,175,156,164,114,192
-.byte	183,253,147,38,54,63,247,204
-.byte	52,165,229,241,113,216,49,21
-.byte	4,199,35,195,24,150,5,154
-.byte	7,18,128,226,235,39,178,117
-.byte	9,131,44,26,27,110,90,160
-.byte	82,59,214,179,41,227,47,132
-.byte	83,209,0,237,32,252,177,91
-.byte	106,203,190,57,74,76,88,207
-.byte	208,239,170,251,67,77,51,133
-.byte	69,249,2,127,80,60,159,168
-.byte	81,163,64,143,146,157,56,245
-.byte	188,182,218,33,16,255,243,210
-.byte	205,12,19,236,95,151,68,23
-.byte	196,167,126,61,100,93,25,115
-.byte	96,129,79,220,34,42,144,136
-.byte	70,238,184,20,222,94,11,219
-.byte	224,50,58,10,73,6,36,92
-.byte	194,211,172,98,145,149,228,121
-.byte	231,200,55,109,141,213,78,169
-.byte	108,86,244,234,101,122,174,8
-.byte	186,120,37,46,28,166,180,198
-.byte	232,221,116,31,75,189,139,138
-.byte	112,62,181,102,72,3,246,14
-.byte	97,53,87,185,134,193,29,158
-.byte	225,248,152,17,105,217,142,148
-.byte	155,30,135,233,206,85,40,223
-.byte	140,161,137,13,191,230,66,104
-.byte	65,153,45,15,176,84,187,22
-.long	1,2,4,8
-.long	16,32,64,128
-.long	27,54,0,0
-.long	0,0,0,0
-.size	_x86_AES_encrypt,.-_x86_AES_encrypt
-.globl	AES_encrypt
-.type	AES_encrypt,@function
-.align	16
-AES_encrypt:
-.L_AES_encrypt_begin:
-	pushl	%ebp
-	pushl	%ebx
-	pushl	%esi
-	pushl	%edi
-	movl	20(%esp),%esi
-	movl	28(%esp),%edi
-	movl	%esp,%eax
-	subl	$36,%esp
-	andl	$-64,%esp
-	leal	-127(%edi),%ebx
-	subl	%esp,%ebx
-	negl	%ebx
-	andl	$960,%ebx
-	subl	%ebx,%esp
-	addl	$4,%esp
-	movl	%eax,28(%esp)
-	call	.L004pic_point
-.L004pic_point:
-	popl	%ebp
-	leal	OPENSSL_ia32cap_P-.L004pic_point(%ebp),%eax
-	leal	.LAES_Te-.L004pic_point(%ebp),%ebp
-	leal	764(%esp),%ebx
-	subl	%ebp,%ebx
-	andl	$768,%ebx
-	leal	2176(%ebp,%ebx,1),%ebp
-	btl	$25,(%eax)
-	jnc	.L005x86
-	movq	(%esi),%mm0
-	movq	8(%esi),%mm4
-	call	_sse_AES_encrypt_compact
-	movl	28(%esp),%esp
-	movl	24(%esp),%esi
-	movq	%mm0,(%esi)
-	movq	%mm4,8(%esi)
-	emms
-	popl	%edi
-	popl	%esi
-	popl	%ebx
-	popl	%ebp
-	ret
-.align	16
-.L005x86:
-	movl	%ebp,24(%esp)
-	movl	(%esi),%eax
-	movl	4(%esi),%ebx
-	movl	8(%esi),%ecx
-	movl	12(%esi),%edx
-	call	_x86_AES_encrypt_compact
-	movl	28(%esp),%esp
-	movl	24(%esp),%esi
-	movl	%eax,(%esi)
-	movl	%ebx,4(%esi)
-	movl	%ecx,8(%esi)
-	movl	%edx,12(%esi)
-	popl	%edi
-	popl	%esi
-	popl	%ebx
-	popl	%ebp
-	ret
-.size	AES_encrypt,.-.L_AES_encrypt_begin
-.type	_x86_AES_decrypt_compact,@function
-.align	16
-_x86_AES_decrypt_compact:
-	movl	%edi,20(%esp)
-	xorl	(%edi),%eax
-	xorl	4(%edi),%ebx
-	xorl	8(%edi),%ecx
-	xorl	12(%edi),%edx
-	movl	240(%edi),%esi
-	leal	-2(%esi,%esi,1),%esi
-	leal	(%edi,%esi,8),%esi
-	movl	%esi,24(%esp)
-	movl	-128(%ebp),%edi
-	movl	-96(%ebp),%esi
-	movl	-64(%ebp),%edi
-	movl	-32(%ebp),%esi
-	movl	(%ebp),%edi
-	movl	32(%ebp),%esi
-	movl	64(%ebp),%edi
-	movl	96(%ebp),%esi
-.align	16
-.L006loop:
-	movl	%eax,%esi
-	andl	$255,%esi
-	movzbl	-128(%ebp,%esi,1),%esi
-	movzbl	%dh,%edi
-	movzbl	-128(%ebp,%edi,1),%edi
-	shll	$8,%edi
-	xorl	%edi,%esi
-	movl	%ecx,%edi
-	shrl	$16,%edi
-	andl	$255,%edi
-	movzbl	-128(%ebp,%edi,1),%edi
-	shll	$16,%edi
-	xorl	%edi,%esi
-	movl	%ebx,%edi
-	shrl	$24,%edi
-	movzbl	-128(%ebp,%edi,1),%edi
-	shll	$24,%edi
-	xorl	%edi,%esi
-	movl	%esi,4(%esp)
-	movl	%ebx,%esi
-	andl	$255,%esi
-	movzbl	-128(%ebp,%esi,1),%esi
-	movzbl	%ah,%edi
-	movzbl	-128(%ebp,%edi,1),%edi
-	shll	$8,%edi
-	xorl	%edi,%esi
-	movl	%edx,%edi
-	shrl	$16,%edi
-	andl	$255,%edi
-	movzbl	-128(%ebp,%edi,1),%edi
-	shll	$16,%edi
-	xorl	%edi,%esi
-	movl	%ecx,%edi
-	shrl	$24,%edi
-	movzbl	-128(%ebp,%edi,1),%edi
-	shll	$24,%edi
-	xorl	%edi,%esi
-	movl	%esi,8(%esp)
-	movl	%ecx,%esi
-	andl	$255,%esi
-	movzbl	-128(%ebp,%esi,1),%esi
-	movzbl	%bh,%edi
-	movzbl	-128(%ebp,%edi,1),%edi
-	shll	$8,%edi
-	xorl	%edi,%esi
-	movl	%eax,%edi
-	shrl	$16,%edi
-	andl	$255,%edi
-	movzbl	-128(%ebp,%edi,1),%edi
-	shll	$16,%edi
-	xorl	%edi,%esi
-	movl	%edx,%edi
-	shrl	$24,%edi
-	movzbl	-128(%ebp,%edi,1),%edi
-	shll	$24,%edi
-	xorl	%edi,%esi
-	andl	$255,%edx
-	movzbl	-128(%ebp,%edx,1),%edx
-	movzbl	%ch,%ecx
-	movzbl	-128(%ebp,%ecx,1),%ecx
-	shll	$8,%ecx
-	xorl	%ecx,%edx
-	movl	%esi,%ecx
-	shrl	$16,%ebx
-	andl	$255,%ebx
-	movzbl	-128(%ebp,%ebx,1),%ebx
-	shll	$16,%ebx
-	xorl	%ebx,%edx
-	shrl	$24,%eax
-	movzbl	-128(%ebp,%eax,1),%eax
-	shll	$24,%eax
-	xorl	%eax,%edx
-	movl	$2155905152,%edi
-	andl	%ecx,%edi
-	movl	%edi,%esi
-	shrl	$7,%edi
-	leal	(%ecx,%ecx,1),%eax
-	subl	%edi,%esi
-	andl	$4278124286,%eax
-	andl	$454761243,%esi
-	xorl	%esi,%eax
-	movl	$2155905152,%edi
-	andl	%eax,%edi
-	movl	%edi,%esi
-	shrl	$7,%edi
-	leal	(%eax,%eax,1),%ebx
-	subl	%edi,%esi
-	andl	$4278124286,%ebx
-	andl	$454761243,%esi
-	xorl	%ecx,%eax
-	xorl	%esi,%ebx
-	movl	$2155905152,%edi
-	andl	%ebx,%edi
-	movl	%edi,%esi
-	shrl	$7,%edi
-	leal	(%ebx,%ebx,1),%ebp
-	subl	%edi,%esi
-	andl	$4278124286,%ebp
-	andl	$454761243,%esi
-	xorl	%ecx,%ebx
-	roll	$8,%ecx
-	xorl	%esi,%ebp
-	xorl	%eax,%ecx
-	xorl	%ebp,%eax
-	xorl	%ebx,%ecx
-	xorl	%ebp,%ebx
-	roll	$24,%eax
-	xorl	%ebp,%ecx
-	roll	$16,%ebx
-	xorl	%eax,%ecx
-	roll	$8,%ebp
-	xorl	%ebx,%ecx
-	movl	4(%esp),%eax
-	xorl	%ebp,%ecx
-	movl	%ecx,12(%esp)
-	movl	$2155905152,%edi
-	andl	%edx,%edi
-	movl	%edi,%esi
-	shrl	$7,%edi
-	leal	(%edx,%edx,1),%ebx
-	subl	%edi,%esi
-	andl	$4278124286,%ebx
-	andl	$454761243,%esi
-	xorl	%esi,%ebx
-	movl	$2155905152,%edi
-	andl	%ebx,%edi
-	movl	%edi,%esi
-	shrl	$7,%edi
-	leal	(%ebx,%ebx,1),%ecx
-	subl	%edi,%esi
-	andl	$4278124286,%ecx
-	andl	$454761243,%esi
-	xorl	%edx,%ebx
-	xorl	%esi,%ecx
-	movl	$2155905152,%edi
-	andl	%ecx,%edi
-	movl	%edi,%esi
-	shrl	$7,%edi
-	leal	(%ecx,%ecx,1),%ebp
-	subl	%edi,%esi
-	andl	$4278124286,%ebp
-	andl	$454761243,%esi
-	xorl	%edx,%ecx
-	roll	$8,%edx
-	xorl	%esi,%ebp
-	xorl	%ebx,%edx
-	xorl	%ebp,%ebx
-	xorl	%ecx,%edx
-	xorl	%ebp,%ecx
-	roll	$24,%ebx
-	xorl	%ebp,%edx
-	roll	$16,%ecx
-	xorl	%ebx,%edx
-	roll	$8,%ebp
-	xorl	%ecx,%edx
-	movl	8(%esp),%ebx
-	xorl	%ebp,%edx
-	movl	%edx,16(%esp)
-	movl	$2155905152,%edi
-	andl	%eax,%edi
-	movl	%edi,%esi
-	shrl	$7,%edi
-	leal	(%eax,%eax,1),%ecx
-	subl	%edi,%esi
-	andl	$4278124286,%ecx
-	andl	$454761243,%esi
-	xorl	%esi,%ecx
-	movl	$2155905152,%edi
-	andl	%ecx,%edi
-	movl	%edi,%esi
-	shrl	$7,%edi
-	leal	(%ecx,%ecx,1),%edx
-	subl	%edi,%esi
-	andl	$4278124286,%edx
-	andl	$454761243,%esi
-	xorl	%eax,%ecx
-	xorl	%esi,%edx
-	movl	$2155905152,%edi
-	andl	%edx,%edi
-	movl	%edi,%esi
-	shrl	$7,%edi
-	leal	(%edx,%edx,1),%ebp
-	subl	%edi,%esi
-	andl	$4278124286,%ebp
-	andl	$454761243,%esi
-	xorl	%eax,%edx
-	roll	$8,%eax
-	xorl	%esi,%ebp
-	xorl	%ecx,%eax
-	xorl	%ebp,%ecx
-	xorl	%edx,%eax
-	xorl	%ebp,%edx
-	roll	$24,%ecx
-	xorl	%ebp,%eax
-	roll	$16,%edx
-	xorl	%ecx,%eax
-	roll	$8,%ebp
-	xorl	%edx,%eax
-	xorl	%ebp,%eax
-	movl	$2155905152,%edi
-	andl	%ebx,%edi
-	movl	%edi,%esi
-	shrl	$7,%edi
-	leal	(%ebx,%ebx,1),%ecx
-	subl	%edi,%esi
-	andl	$4278124286,%ecx
-	andl	$454761243,%esi
-	xorl	%esi,%ecx
-	movl	$2155905152,%edi
-	andl	%ecx,%edi
-	movl	%edi,%esi
-	shrl	$7,%edi
-	leal	(%ecx,%ecx,1),%edx
-	subl	%edi,%esi
-	andl	$4278124286,%edx
-	andl	$454761243,%esi
-	xorl	%ebx,%ecx
-	xorl	%esi,%edx
-	movl	$2155905152,%edi
-	andl	%edx,%edi
-	movl	%edi,%esi
-	shrl	$7,%edi
-	leal	(%edx,%edx,1),%ebp
-	subl	%edi,%esi
-	andl	$4278124286,%ebp
-	andl	$454761243,%esi
-	xorl	%ebx,%edx
-	roll	$8,%ebx
-	xorl	%esi,%ebp
-	xorl	%ecx,%ebx
-	xorl	%ebp,%ecx
-	xorl	%edx,%ebx
-	xorl	%ebp,%edx
-	roll	$24,%ecx
-	xorl	%ebp,%ebx
-	roll	$16,%edx
-	xorl	%ecx,%ebx
-	roll	$8,%ebp
-	xorl	%edx,%ebx
-	movl	12(%esp),%ecx
-	xorl	%ebp,%ebx
-	movl	16(%esp),%edx
-	movl	20(%esp),%edi
-	movl	28(%esp),%ebp
-	addl	$16,%edi
-	xorl	(%edi),%eax
-	xorl	4(%edi),%ebx
-	xorl	8(%edi),%ecx
-	xorl	12(%edi),%edx
-	cmpl	24(%esp),%edi
-	movl	%edi,20(%esp)
-	jb	.L006loop
-	movl	%eax,%esi
-	andl	$255,%esi
-	movzbl	-128(%ebp,%esi,1),%esi
-	movzbl	%dh,%edi
-	movzbl	-128(%ebp,%edi,1),%edi
-	shll	$8,%edi
-	xorl	%edi,%esi
-	movl	%ecx,%edi
-	shrl	$16,%edi
-	andl	$255,%edi
-	movzbl	-128(%ebp,%edi,1),%edi
-	shll	$16,%edi
-	xorl	%edi,%esi
-	movl	%ebx,%edi
-	shrl	$24,%edi
-	movzbl	-128(%ebp,%edi,1),%edi
-	shll	$24,%edi
-	xorl	%edi,%esi
-	movl	%esi,4(%esp)
-	movl	%ebx,%esi
-	andl	$255,%esi
-	movzbl	-128(%ebp,%esi,1),%esi
-	movzbl	%ah,%edi
-	movzbl	-128(%ebp,%edi,1),%edi
-	shll	$8,%edi
-	xorl	%edi,%esi
-	movl	%edx,%edi
-	shrl	$16,%edi
-	andl	$255,%edi
-	movzbl	-128(%ebp,%edi,1),%edi
-	shll	$16,%edi
-	xorl	%edi,%esi
-	movl	%ecx,%edi
-	shrl	$24,%edi
-	movzbl	-128(%ebp,%edi,1),%edi
-	shll	$24,%edi
-	xorl	%edi,%esi
-	movl	%esi,8(%esp)
-	movl	%ecx,%esi
-	andl	$255,%esi
-	movzbl	-128(%ebp,%esi,1),%esi
-	movzbl	%bh,%edi
-	movzbl	-128(%ebp,%edi,1),%edi
-	shll	$8,%edi
-	xorl	%edi,%esi
-	movl	%eax,%edi
-	shrl	$16,%edi
-	andl	$255,%edi
-	movzbl	-128(%ebp,%edi,1),%edi
-	shll	$16,%edi
-	xorl	%edi,%esi
-	movl	%edx,%edi
-	shrl	$24,%edi
-	movzbl	-128(%ebp,%edi,1),%edi
-	shll	$24,%edi
-	xorl	%edi,%esi
-	movl	20(%esp),%edi
-	andl	$255,%edx
-	movzbl	-128(%ebp,%edx,1),%edx
-	movzbl	%ch,%ecx
-	movzbl	-128(%ebp,%ecx,1),%ecx
-	shll	$8,%ecx
-	xorl	%ecx,%edx
-	movl	%esi,%ecx
-	shrl	$16,%ebx
-	andl	$255,%ebx
-	movzbl	-128(%ebp,%ebx,1),%ebx
-	shll	$16,%ebx
-	xorl	%ebx,%edx
-	movl	8(%esp),%ebx
-	shrl	$24,%eax
-	movzbl	-128(%ebp,%eax,1),%eax
-	shll	$24,%eax
-	xorl	%eax,%edx
-	movl	4(%esp),%eax
-	xorl	16(%edi),%eax
-	xorl	20(%edi),%ebx
-	xorl	24(%edi),%ecx
-	xorl	28(%edi),%edx
-	ret
-.size	_x86_AES_decrypt_compact,.-_x86_AES_decrypt_compact
-.type	_sse_AES_decrypt_compact,@function
-.align	16
-_sse_AES_decrypt_compact:
-	pxor	(%edi),%mm0
-	pxor	8(%edi),%mm4
-	movl	240(%edi),%esi
-	leal	-2(%esi,%esi,1),%esi
-	leal	(%edi,%esi,8),%esi
-	movl	%esi,24(%esp)
-	movl	$454761243,%eax
-	movl	%eax,8(%esp)
-	movl	%eax,12(%esp)
-	movl	-128(%ebp),%eax
-	movl	-96(%ebp),%ebx
-	movl	-64(%ebp),%ecx
-	movl	-32(%ebp),%edx
-	movl	(%ebp),%eax
-	movl	32(%ebp),%ebx
-	movl	64(%ebp),%ecx
-	movl	96(%ebp),%edx
-.align	16
-.L007loop:
-	pshufw	$12,%mm0,%mm1
-	pshufw	$9,%mm4,%mm5
-	movd	%mm1,%eax
-	movd	%mm5,%ebx
-	movl	%edi,20(%esp)
-	movzbl	%al,%esi
-	movzbl	%ah,%edx
-	pshufw	$6,%mm0,%mm2
-	movzbl	-128(%ebp,%esi,1),%ecx
-	movzbl	%bl,%edi
-	movzbl	-128(%ebp,%edx,1),%edx
-	shrl	$16,%eax
-	shll	$8,%edx
-	movzbl	-128(%ebp,%edi,1),%esi
-	movzbl	%bh,%edi
-	shll	$16,%esi
-	pshufw	$3,%mm4,%mm6
-	orl	%esi,%ecx
-	movzbl	-128(%ebp,%edi,1),%esi
-	movzbl	%ah,%edi
-	shll	$24,%esi
-	shrl	$16,%ebx
-	orl	%esi,%edx
-	movzbl	-128(%ebp,%edi,1),%esi
-	movzbl	%bh,%edi
-	shll	$24,%esi
-	orl	%esi,%ecx
-	movzbl	-128(%ebp,%edi,1),%esi
-	movzbl	%al,%edi
-	shll	$8,%esi
-	movd	%mm2,%eax
-	orl	%esi,%ecx
-	movzbl	-128(%ebp,%edi,1),%esi
-	movzbl	%bl,%edi
-	shll	$16,%esi
-	movd	%mm6,%ebx
-	movd	%ecx,%mm0
-	movzbl	-128(%ebp,%edi,1),%ecx
-	movzbl	%al,%edi
-	orl	%esi,%ecx
-	movzbl	-128(%ebp,%edi,1),%esi
-	movzbl	%bl,%edi
-	orl	%esi,%edx
-	movzbl	-128(%ebp,%edi,1),%esi
-	movzbl	%ah,%edi
-	shll	$16,%esi
-	shrl	$16,%eax
-	orl	%esi,%edx
-	movzbl	-128(%ebp,%edi,1),%esi
-	movzbl	%bh,%edi
-	shrl	$16,%ebx
-	shll	$8,%esi
-	movd	%edx,%mm1
-	movzbl	-128(%ebp,%edi,1),%edx
-	movzbl	%bh,%edi
-	shll	$24,%edx
-	andl	$255,%ebx
-	orl	%esi,%edx
-	punpckldq	%mm1,%mm0
-	movzbl	-128(%ebp,%edi,1),%esi
-	movzbl	%al,%edi
-	shll	$8,%esi
-	movzbl	%ah,%eax
-	movzbl	-128(%ebp,%ebx,1),%ebx
-	orl	%esi,%ecx
-	movzbl	-128(%ebp,%edi,1),%esi
-	orl	%ebx,%edx
-	shll	$16,%esi
-	movzbl	-128(%ebp,%eax,1),%eax
-	orl	%esi,%edx
-	shll	$24,%eax
-	orl	%eax,%ecx
-	movl	20(%esp),%edi
-	movd	%edx,%mm4
-	movd	%ecx,%mm5
-	punpckldq	%mm5,%mm4
-	addl	$16,%edi
-	cmpl	24(%esp),%edi
-	ja	.L008out
-	movq	%mm0,%mm3
-	movq	%mm4,%mm7
-	pshufw	$228,%mm0,%mm2
-	pshufw	$228,%mm4,%mm6
-	movq	%mm0,%mm1
-	movq	%mm4,%mm5
-	pshufw	$177,%mm0,%mm0
-	pshufw	$177,%mm4,%mm4
-	pslld	$8,%mm2
-	pslld	$8,%mm6
-	psrld	$8,%mm3
-	psrld	$8,%mm7
-	pxor	%mm2,%mm0
-	pxor	%mm6,%mm4
-	pxor	%mm3,%mm0
-	pxor	%mm7,%mm4
-	pslld	$16,%mm2
-	pslld	$16,%mm6
-	psrld	$16,%mm3
-	psrld	$16,%mm7
-	pxor	%mm2,%mm0
-	pxor	%mm6,%mm4
-	pxor	%mm3,%mm0
-	pxor	%mm7,%mm4
-	movq	8(%esp),%mm3
-	pxor	%mm2,%mm2
-	pxor	%mm6,%mm6
-	pcmpgtb	%mm1,%mm2
-	pcmpgtb	%mm5,%mm6
-	pand	%mm3,%mm2
-	pand	%mm3,%mm6
-	paddb	%mm1,%mm1
-	paddb	%mm5,%mm5
-	pxor	%mm2,%mm1
-	pxor	%mm6,%mm5
-	movq	%mm1,%mm3
-	movq	%mm5,%mm7
-	movq	%mm1,%mm2
-	movq	%mm5,%mm6
-	pxor	%mm1,%mm0
-	pxor	%mm5,%mm4
-	pslld	$24,%mm3
-	pslld	$24,%mm7
-	psrld	$8,%mm2
-	psrld	$8,%mm6
-	pxor	%mm3,%mm0
-	pxor	%mm7,%mm4
-	pxor	%mm2,%mm0
-	pxor	%mm6,%mm4
-	movq	8(%esp),%mm2
-	pxor	%mm3,%mm3
-	pxor	%mm7,%mm7
-	pcmpgtb	%mm1,%mm3
-	pcmpgtb	%mm5,%mm7
-	pand	%mm2,%mm3
-	pand	%mm2,%mm7
-	paddb	%mm1,%mm1
-	paddb	%mm5,%mm5
-	pxor	%mm3,%mm1
-	pxor	%mm7,%mm5
-	pshufw	$177,%mm1,%mm3
-	pshufw	$177,%mm5,%mm7
-	pxor	%mm1,%mm0
-	pxor	%mm5,%mm4
-	pxor	%mm3,%mm0
-	pxor	%mm7,%mm4
-	pxor	%mm3,%mm3
-	pxor	%mm7,%mm7
-	pcmpgtb	%mm1,%mm3
-	pcmpgtb	%mm5,%mm7
-	pand	%mm2,%mm3
-	pand	%mm2,%mm7
-	paddb	%mm1,%mm1
-	paddb	%mm5,%mm5
-	pxor	%mm3,%mm1
-	pxor	%mm7,%mm5
-	pxor	%mm1,%mm0
-	pxor	%mm5,%mm4
-	movq	%mm1,%mm3
-	movq	%mm5,%mm7
-	pshufw	$177,%mm1,%mm2
-	pshufw	$177,%mm5,%mm6
-	pxor	%mm2,%mm0
-	pxor	%mm6,%mm4
-	pslld	$8,%mm1
-	pslld	$8,%mm5
-	psrld	$8,%mm3
-	psrld	$8,%mm7
-	movq	(%edi),%mm2
-	movq	8(%edi),%mm6
-	pxor	%mm1,%mm0
-	pxor	%mm5,%mm4
-	pxor	%mm3,%mm0
-	pxor	%mm7,%mm4
-	movl	-128(%ebp),%eax
-	pslld	$16,%mm1
-	pslld	$16,%mm5
-	movl	-64(%ebp),%ebx
-	psrld	$16,%mm3
-	psrld	$16,%mm7
-	movl	(%ebp),%ecx
-	pxor	%mm1,%mm0
-	pxor	%mm5,%mm4
-	movl	64(%ebp),%edx
-	pxor	%mm3,%mm0
-	pxor	%mm7,%mm4
-	pxor	%mm2,%mm0
-	pxor	%mm6,%mm4
-	jmp	.L007loop
-.align	16
-.L008out:
-	pxor	(%edi),%mm0
-	pxor	8(%edi),%mm4
-	ret
-.size	_sse_AES_decrypt_compact,.-_sse_AES_decrypt_compact
-.type	_x86_AES_decrypt,@function
-.align	16
-_x86_AES_decrypt:
-	movl	%edi,20(%esp)
-	xorl	(%edi),%eax
-	xorl	4(%edi),%ebx
-	xorl	8(%edi),%ecx
-	xorl	12(%edi),%edx
-	movl	240(%edi),%esi
-	leal	-2(%esi,%esi,1),%esi
-	leal	(%edi,%esi,8),%esi
-	movl	%esi,24(%esp)
-.align	16
-.L009loop:
-	movl	%eax,%esi
-	andl	$255,%esi
-	movl	(%ebp,%esi,8),%esi
-	movzbl	%dh,%edi
-	xorl	3(%ebp,%edi,8),%esi
-	movl	%ecx,%edi
-	shrl	$16,%edi
-	andl	$255,%edi
-	xorl	2(%ebp,%edi,8),%esi
-	movl	%ebx,%edi
-	shrl	$24,%edi
-	xorl	1(%ebp,%edi,8),%esi
-	movl	%esi,4(%esp)
-
-	movl	%ebx,%esi
-	andl	$255,%esi
-	movl	(%ebp,%esi,8),%esi
-	movzbl	%ah,%edi
-	xorl	3(%ebp,%edi,8),%esi
-	movl	%edx,%edi
-	shrl	$16,%edi
-	andl	$255,%edi
-	xorl	2(%ebp,%edi,8),%esi
-	movl	%ecx,%edi
-	shrl	$24,%edi
-	xorl	1(%ebp,%edi,8),%esi
-	movl	%esi,8(%esp)
-
-	movl	%ecx,%esi
-	andl	$255,%esi
-	movl	(%ebp,%esi,8),%esi
-	movzbl	%bh,%edi
-	xorl	3(%ebp,%edi,8),%esi
-	movl	%eax,%edi
-	shrl	$16,%edi
-	andl	$255,%edi
-	xorl	2(%ebp,%edi,8),%esi
-	movl	%edx,%edi
-	shrl	$24,%edi
-	xorl	1(%ebp,%edi,8),%esi
-
-	movl	20(%esp),%edi
-	andl	$255,%edx
-	movl	(%ebp,%edx,8),%edx
-	movzbl	%ch,%ecx
-	xorl	3(%ebp,%ecx,8),%edx
-	movl	%esi,%ecx
-	shrl	$16,%ebx
-	andl	$255,%ebx
-	xorl	2(%ebp,%ebx,8),%edx
-	movl	8(%esp),%ebx
-	shrl	$24,%eax
-	xorl	1(%ebp,%eax,8),%edx
-	movl	4(%esp),%eax
-
-	addl	$16,%edi
-	xorl	(%edi),%eax
-	xorl	4(%edi),%ebx
-	xorl	8(%edi),%ecx
-	xorl	12(%edi),%edx
-	cmpl	24(%esp),%edi
-	movl	%edi,20(%esp)
-	jb	.L009loop
-	leal	2176(%ebp),%ebp
-	movl	-128(%ebp),%edi
-	movl	-96(%ebp),%esi
-	movl	-64(%ebp),%edi
-	movl	-32(%ebp),%esi
-	movl	(%ebp),%edi
-	movl	32(%ebp),%esi
-	movl	64(%ebp),%edi
-	movl	96(%ebp),%esi
-	leal	-128(%ebp),%ebp
-	movl	%eax,%esi
-	andl	$255,%esi
-	movzbl	(%ebp,%esi,1),%esi
-	movzbl	%dh,%edi
-	movzbl	(%ebp,%edi,1),%edi
-	shll	$8,%edi
-	xorl	%edi,%esi
-	movl	%ecx,%edi
-	shrl	$16,%edi
-	andl	$255,%edi
-	movzbl	(%ebp,%edi,1),%edi
-	shll	$16,%edi
-	xorl	%edi,%esi
-	movl	%ebx,%edi
-	shrl	$24,%edi
-	movzbl	(%ebp,%edi,1),%edi
-	shll	$24,%edi
-	xorl	%edi,%esi
-	movl	%esi,4(%esp)
-	movl	%ebx,%esi
-	andl	$255,%esi
-	movzbl	(%ebp,%esi,1),%esi
-	movzbl	%ah,%edi
-	movzbl	(%ebp,%edi,1),%edi
-	shll	$8,%edi
-	xorl	%edi,%esi
-	movl	%edx,%edi
-	shrl	$16,%edi
-	andl	$255,%edi
-	movzbl	(%ebp,%edi,1),%edi
-	shll	$16,%edi
-	xorl	%edi,%esi
-	movl	%ecx,%edi
-	shrl	$24,%edi
-	movzbl	(%ebp,%edi,1),%edi
-	shll	$24,%edi
-	xorl	%edi,%esi
-	movl	%esi,8(%esp)
-	movl	%ecx,%esi
-	andl	$255,%esi
-	movzbl	(%ebp,%esi,1),%esi
-	movzbl	%bh,%edi
-	movzbl	(%ebp,%edi,1),%edi
-	shll	$8,%edi
-	xorl	%edi,%esi
-	movl	%eax,%edi
-	shrl	$16,%edi
-	andl	$255,%edi
-	movzbl	(%ebp,%edi,1),%edi
-	shll	$16,%edi
-	xorl	%edi,%esi
-	movl	%edx,%edi
-	shrl	$24,%edi
-	movzbl	(%ebp,%edi,1),%edi
-	shll	$24,%edi
-	xorl	%edi,%esi
-	movl	20(%esp),%edi
-	andl	$255,%edx
-	movzbl	(%ebp,%edx,1),%edx
-	movzbl	%ch,%ecx
-	movzbl	(%ebp,%ecx,1),%ecx
-	shll	$8,%ecx
-	xorl	%ecx,%edx
-	movl	%esi,%ecx
-	shrl	$16,%ebx
-	andl	$255,%ebx
-	movzbl	(%ebp,%ebx,1),%ebx
-	shll	$16,%ebx
-	xorl	%ebx,%edx
-	movl	8(%esp),%ebx
-	shrl	$24,%eax
-	movzbl	(%ebp,%eax,1),%eax
-	shll	$24,%eax
-	xorl	%eax,%edx
-	movl	4(%esp),%eax
-	leal	-2048(%ebp),%ebp
-	addl	$16,%edi
-	xorl	(%edi),%eax
-	xorl	4(%edi),%ebx
-	xorl	8(%edi),%ecx
-	xorl	12(%edi),%edx
-	ret
-.align	64
-.LAES_Td:
-.long	1353184337,1353184337
-.long	1399144830,1399144830
-.long	3282310938,3282310938
-.long	2522752826,2522752826
-.long	3412831035,3412831035
-.long	4047871263,4047871263
-.long	2874735276,2874735276
-.long	2466505547,2466505547
-.long	1442459680,1442459680
-.long	4134368941,4134368941
-.long	2440481928,2440481928
-.long	625738485,625738485
-.long	4242007375,4242007375
-.long	3620416197,3620416197
-.long	2151953702,2151953702
-.long	2409849525,2409849525
-.long	1230680542,1230680542
-.long	1729870373,1729870373
-.long	2551114309,2551114309
-.long	3787521629,3787521629
-.long	41234371,41234371
-.long	317738113,317738113
-.long	2744600205,2744600205
-.long	3338261355,3338261355
-.long	3881799427,3881799427
-.long	2510066197,2510066197
-.long	3950669247,3950669247
-.long	3663286933,3663286933
-.long	763608788,763608788
-.long	3542185048,3542185048
-.long	694804553,694804553
-.long	1154009486,1154009486
-.long	1787413109,1787413109
-.long	2021232372,2021232372
-.long	1799248025,1799248025
-.long	3715217703,3715217703
-.long	3058688446,3058688446
-.long	397248752,397248752
-.long	1722556617,1722556617
-.long	3023752829,3023752829
-.long	407560035,407560035
-.long	2184256229,2184256229
-.long	1613975959,1613975959
-.long	1165972322,1165972322
-.long	3765920945,3765920945
-.long	2226023355,2226023355
-.long	480281086,480281086
-.long	2485848313,2485848313
-.long	1483229296,1483229296
-.long	436028815,436028815
-.long	2272059028,2272059028
-.long	3086515026,3086515026
-.long	601060267,601060267
-.long	3791801202,3791801202
-.long	1468997603,1468997603
-.long	715871590,715871590
-.long	120122290,120122290
-.long	63092015,63092015
-.long	2591802758,2591802758
-.long	2768779219,2768779219
-.long	4068943920,4068943920
-.long	2997206819,2997206819
-.long	3127509762,3127509762
-.long	1552029421,1552029421
-.long	723308426,723308426
-.long	2461301159,2461301159
-.long	4042393587,4042393587
-.long	2715969870,2715969870
-.long	3455375973,3455375973
-.long	3586000134,3586000134
-.long	526529745,526529745
-.long	2331944644,2331944644
-.long	2639474228,2639474228
-.long	2689987490,2689987490
-.long	853641733,853641733
-.long	1978398372,1978398372
-.long	971801355,971801355
-.long	2867814464,2867814464
-.long	111112542,111112542
-.long	1360031421,1360031421
-.long	4186579262,4186579262
-.long	1023860118,1023860118
-.long	2919579357,2919579357
-.long	1186850381,1186850381
-.long	3045938321,3045938321
-.long	90031217,90031217
-.long	1876166148,1876166148
-.long	4279586912,4279586912
-.long	620468249,620468249
-.long	2548678102,2548678102
-.long	3426959497,3426959497
-.long	2006899047,2006899047
-.long	3175278768,3175278768
-.long	2290845959,2290845959
-.long	945494503,945494503
-.long	3689859193,3689859193
-.long	1191869601,1191869601
-.long	3910091388,3910091388
-.long	3374220536,3374220536
-.long	0,0
-.long	2206629897,2206629897
-.long	1223502642,1223502642
-.long	2893025566,2893025566
-.long	1316117100,1316117100
-.long	4227796733,4227796733
-.long	1446544655,1446544655
-.long	517320253,517320253
-.long	658058550,658058550
-.long	1691946762,1691946762
-.long	564550760,564550760
-.long	3511966619,3511966619
-.long	976107044,976107044
-.long	2976320012,2976320012
-.long	266819475,266819475
-.long	3533106868,3533106868
-.long	2660342555,2660342555
-.long	1338359936,1338359936
-.long	2720062561,2720062561
-.long	1766553434,1766553434
-.long	370807324,370807324
-.long	179999714,179999714
-.long	3844776128,3844776128
-.long	1138762300,1138762300
-.long	488053522,488053522
-.long	185403662,185403662
-.long	2915535858,2915535858
-.long	3114841645,3114841645
-.long	3366526484,3366526484
-.long	2233069911,2233069911
-.long	1275557295,1275557295
-.long	3151862254,3151862254
-.long	4250959779,4250959779
-.long	2670068215,2670068215
-.long	3170202204,3170202204
-.long	3309004356,3309004356
-.long	880737115,880737115
-.long	1982415755,1982415755
-.long	3703972811,3703972811
-.long	1761406390,1761406390
-.long	1676797112,1676797112
-.long	3403428311,3403428311
-.long	277177154,277177154
-.long	1076008723,1076008723
-.long	538035844,538035844
-.long	2099530373,2099530373
-.long	4164795346,4164795346
-.long	288553390,288553390
-.long	1839278535,1839278535
-.long	1261411869,1261411869
-.long	4080055004,4080055004
-.long	3964831245,3964831245
-.long	3504587127,3504587127
-.long	1813426987,1813426987
-.long	2579067049,2579067049
-.long	4199060497,4199060497
-.long	577038663,577038663
-.long	3297574056,3297574056
-.long	440397984,440397984
-.long	3626794326,3626794326
-.long	4019204898,4019204898
-.long	3343796615,3343796615
-.long	3251714265,3251714265
-.long	4272081548,4272081548
-.long	906744984,906744984
-.long	3481400742,3481400742
-.long	685669029,685669029
-.long	646887386,646887386
-.long	2764025151,2764025151
-.long	3835509292,3835509292
-.long	227702864,227702864
-.long	2613862250,2613862250
-.long	1648787028,1648787028
-.long	3256061430,3256061430
-.long	3904428176,3904428176
-.long	1593260334,1593260334
-.long	4121936770,4121936770
-.long	3196083615,3196083615
-.long	2090061929,2090061929
-.long	2838353263,2838353263
-.long	3004310991,3004310991
-.long	999926984,999926984
-.long	2809993232,2809993232
-.long	1852021992,1852021992
-.long	2075868123,2075868123
-.long	158869197,158869197
-.long	4095236462,4095236462
-.long	28809964,28809964
-.long	2828685187,2828685187
-.long	1701746150,1701746150
-.long	2129067946,2129067946
-.long	147831841,147831841
-.long	3873969647,3873969647
-.long	3650873274,3650873274
-.long	3459673930,3459673930
-.long	3557400554,3557400554
-.long	3598495785,3598495785
-.long	2947720241,2947720241
-.long	824393514,824393514
-.long	815048134,815048134
-.long	3227951669,3227951669
-.long	935087732,935087732
-.long	2798289660,2798289660
-.long	2966458592,2966458592
-.long	366520115,366520115
-.long	1251476721,1251476721
-.long	4158319681,4158319681
-.long	240176511,240176511
-.long	804688151,804688151
-.long	2379631990,2379631990
-.long	1303441219,1303441219
-.long	1414376140,1414376140
-.long	3741619940,3741619940
-.long	3820343710,3820343710
-.long	461924940,461924940
-.long	3089050817,3089050817
-.long	2136040774,2136040774
-.long	82468509,82468509
-.long	1563790337,1563790337
-.long	1937016826,1937016826
-.long	776014843,776014843
-.long	1511876531,1511876531
-.long	1389550482,1389550482
-.long	861278441,861278441
-.long	323475053,323475053
-.long	2355222426,2355222426
-.long	2047648055,2047648055
-.long	2383738969,2383738969
-.long	2302415851,2302415851
-.long	3995576782,3995576782
-.long	902390199,902390199
-.long	3991215329,3991215329
-.long	1018251130,1018251130
-.long	1507840668,1507840668
-.long	1064563285,1064563285
-.long	2043548696,2043548696
-.long	3208103795,3208103795
-.long	3939366739,3939366739
-.long	1537932639,1537932639
-.long	342834655,342834655
-.long	2262516856,2262516856
-.long	2180231114,2180231114
-.long	1053059257,1053059257
-.long	741614648,741614648
-.long	1598071746,1598071746
-.long	1925389590,1925389590
-.long	203809468,203809468
-.long	2336832552,2336832552
-.long	1100287487,1100287487
-.long	1895934009,1895934009
-.long	3736275976,3736275976
-.long	2632234200,2632234200
-.long	2428589668,2428589668
-.long	1636092795,1636092795
-.long	1890988757,1890988757
-.long	1952214088,1952214088
-.long	1113045200,1113045200
-.byte	82,9,106,213,48,54,165,56
-.byte	191,64,163,158,129,243,215,251
-.byte	124,227,57,130,155,47,255,135
-.byte	52,142,67,68,196,222,233,203
-.byte	84,123,148,50,166,194,35,61
-.byte	238,76,149,11,66,250,195,78
-.byte	8,46,161,102,40,217,36,178
-.byte	118,91,162,73,109,139,209,37
-.byte	114,248,246,100,134,104,152,22
-.byte	212,164,92,204,93,101,182,146
-.byte	108,112,72,80,253,237,185,218
-.byte	94,21,70,87,167,141,157,132
-.byte	144,216,171,0,140,188,211,10
-.byte	247,228,88,5,184,179,69,6
-.byte	208,44,30,143,202,63,15,2
-.byte	193,175,189,3,1,19,138,107
-.byte	58,145,17,65,79,103,220,234
-.byte	151,242,207,206,240,180,230,115
-.byte	150,172,116,34,231,173,53,133
-.byte	226,249,55,232,28,117,223,110
-.byte	71,241,26,113,29,41,197,137
-.byte	111,183,98,14,170,24,190,27
-.byte	252,86,62,75,198,210,121,32
-.byte	154,219,192,254,120,205,90,244
-.byte	31,221,168,51,136,7,199,49
-.byte	177,18,16,89,39,128,236,95
-.byte	96,81,127,169,25,181,74,13
-.byte	45,229,122,159,147,201,156,239
-.byte	160,224,59,77,174,42,245,176
-.byte	200,235,187,60,131,83,153,97
-.byte	23,43,4,126,186,119,214,38
-.byte	225,105,20,99,85,33,12,125
-.byte	82,9,106,213,48,54,165,56
-.byte	191,64,163,158,129,243,215,251
-.byte	124,227,57,130,155,47,255,135
-.byte	52,142,67,68,196,222,233,203
-.byte	84,123,148,50,166,194,35,61
-.byte	238,76,149,11,66,250,195,78
-.byte	8,46,161,102,40,217,36,178
-.byte	118,91,162,73,109,139,209,37
-.byte	114,248,246,100,134,104,152,22
-.byte	212,164,92,204,93,101,182,146
-.byte	108,112,72,80,253,237,185,218
-.byte	94,21,70,87,167,141,157,132
-.byte	144,216,171,0,140,188,211,10
-.byte	247,228,88,5,184,179,69,6
-.byte	208,44,30,143,202,63,15,2
-.byte	193,175,189,3,1,19,138,107
-.byte	58,145,17,65,79,103,220,234
-.byte	151,242,207,206,240,180,230,115
-.byte	150,172,116,34,231,173,53,133
-.byte	226,249,55,232,28,117,223,110
-.byte	71,241,26,113,29,41,197,137
-.byte	111,183,98,14,170,24,190,27
-.byte	252,86,62,75,198,210,121,32
-.byte	154,219,192,254,120,205,90,244
-.byte	31,221,168,51,136,7,199,49
-.byte	177,18,16,89,39,128,236,95
-.byte	96,81,127,169,25,181,74,13
-.byte	45,229,122,159,147,201,156,239
-.byte	160,224,59,77,174,42,245,176
-.byte	200,235,187,60,131,83,153,97
-.byte	23,43,4,126,186,119,214,38
-.byte	225,105,20,99,85,33,12,125
-.byte	82,9,106,213,48,54,165,56
-.byte	191,64,163,158,129,243,215,251
-.byte	124,227,57,130,155,47,255,135
-.byte	52,142,67,68,196,222,233,203
-.byte	84,123,148,50,166,194,35,61
-.byte	238,76,149,11,66,250,195,78
-.byte	8,46,161,102,40,217,36,178
-.byte	118,91,162,73,109,139,209,37
-.byte	114,248,246,100,134,104,152,22
-.byte	212,164,92,204,93,101,182,146
-.byte	108,112,72,80,253,237,185,218
-.byte	94,21,70,87,167,141,157,132
-.byte	144,216,171,0,140,188,211,10
-.byte	247,228,88,5,184,179,69,6
-.byte	208,44,30,143,202,63,15,2
-.byte	193,175,189,3,1,19,138,107
-.byte	58,145,17,65,79,103,220,234
-.byte	151,242,207,206,240,180,230,115
-.byte	150,172,116,34,231,173,53,133
-.byte	226,249,55,232,28,117,223,110
-.byte	71,241,26,113,29,41,197,137
-.byte	111,183,98,14,170,24,190,27
-.byte	252,86,62,75,198,210,121,32
-.byte	154,219,192,254,120,205,90,244
-.byte	31,221,168,51,136,7,199,49
-.byte	177,18,16,89,39,128,236,95
-.byte	96,81,127,169,25,181,74,13
-.byte	45,229,122,159,147,201,156,239
-.byte	160,224,59,77,174,42,245,176
-.byte	200,235,187,60,131,83,153,97
-.byte	23,43,4,126,186,119,214,38
-.byte	225,105,20,99,85,33,12,125
-.byte	82,9,106,213,48,54,165,56
-.byte	191,64,163,158,129,243,215,251
-.byte	124,227,57,130,155,47,255,135
-.byte	52,142,67,68,196,222,233,203
-.byte	84,123,148,50,166,194,35,61
-.byte	238,76,149,11,66,250,195,78
-.byte	8,46,161,102,40,217,36,178
-.byte	118,91,162,73,109,139,209,37
-.byte	114,248,246,100,134,104,152,22
-.byte	212,164,92,204,93,101,182,146
-.byte	108,112,72,80,253,237,185,218
-.byte	94,21,70,87,167,141,157,132
-.byte	144,216,171,0,140,188,211,10
-.byte	247,228,88,5,184,179,69,6
-.byte	208,44,30,143,202,63,15,2
-.byte	193,175,189,3,1,19,138,107
-.byte	58,145,17,65,79,103,220,234
-.byte	151,242,207,206,240,180,230,115
-.byte	150,172,116,34,231,173,53,133
-.byte	226,249,55,232,28,117,223,110
-.byte	71,241,26,113,29,41,197,137
-.byte	111,183,98,14,170,24,190,27
-.byte	252,86,62,75,198,210,121,32
-.byte	154,219,192,254,120,205,90,244
-.byte	31,221,168,51,136,7,199,49
-.byte	177,18,16,89,39,128,236,95
-.byte	96,81,127,169,25,181,74,13
-.byte	45,229,122,159,147,201,156,239
-.byte	160,224,59,77,174,42,245,176
-.byte	200,235,187,60,131,83,153,97
-.byte	23,43,4,126,186,119,214,38
-.byte	225,105,20,99,85,33,12,125
-.size	_x86_AES_decrypt,.-_x86_AES_decrypt
-.globl	AES_decrypt
-.type	AES_decrypt,@function
-.align	16
-AES_decrypt:
-.L_AES_decrypt_begin:
-	pushl	%ebp
-	pushl	%ebx
-	pushl	%esi
-	pushl	%edi
-	movl	20(%esp),%esi
-	movl	28(%esp),%edi
-	movl	%esp,%eax
-	subl	$36,%esp
-	andl	$-64,%esp
-	leal	-127(%edi),%ebx
-	subl	%esp,%ebx
-	negl	%ebx
-	andl	$960,%ebx
-	subl	%ebx,%esp
-	addl	$4,%esp
-	movl	%eax,28(%esp)
-	call	.L010pic_point
-.L010pic_point:
-	popl	%ebp
-	leal	OPENSSL_ia32cap_P-.L010pic_point(%ebp),%eax
-	leal	.LAES_Td-.L010pic_point(%ebp),%ebp
-	leal	764(%esp),%ebx
-	subl	%ebp,%ebx
-	andl	$768,%ebx
-	leal	2176(%ebp,%ebx,1),%ebp
-	btl	$25,(%eax)
-	jnc	.L011x86
-	movq	(%esi),%mm0
-	movq	8(%esi),%mm4
-	call	_sse_AES_decrypt_compact
-	movl	28(%esp),%esp
-	movl	24(%esp),%esi
-	movq	%mm0,(%esi)
-	movq	%mm4,8(%esi)
-	emms
-	popl	%edi
-	popl	%esi
-	popl	%ebx
-	popl	%ebp
-	ret
-.align	16
-.L011x86:
-	movl	%ebp,24(%esp)
-	movl	(%esi),%eax
-	movl	4(%esi),%ebx
-	movl	8(%esi),%ecx
-	movl	12(%esi),%edx
-	call	_x86_AES_decrypt_compact
-	movl	28(%esp),%esp
-	movl	24(%esp),%esi
-	movl	%eax,(%esi)
-	movl	%ebx,4(%esi)
-	movl	%ecx,8(%esi)
-	movl	%edx,12(%esi)
-	popl	%edi
-	popl	%esi
-	popl	%ebx
-	popl	%ebp
-	ret
-.size	AES_decrypt,.-.L_AES_decrypt_begin
-.globl	AES_cbc_encrypt
-.type	AES_cbc_encrypt,@function
-.align	16
-AES_cbc_encrypt:
-.L_AES_cbc_encrypt_begin:
-	pushl	%ebp
-	pushl	%ebx
-	pushl	%esi
-	pushl	%edi
-	movl	28(%esp),%ecx
-	cmpl	$0,%ecx
-	je	.L012drop_out
-	call	.L013pic_point
-.L013pic_point:
-	popl	%ebp
-	leal	OPENSSL_ia32cap_P-.L013pic_point(%ebp),%eax
-	cmpl	$0,40(%esp)
-	leal	.LAES_Te-.L013pic_point(%ebp),%ebp
-	jne	.L014picked_te
-	leal	.LAES_Td-.LAES_Te(%ebp),%ebp
-.L014picked_te:
-	pushfl
-	cld
-	cmpl	$512,%ecx
-	jb	.L015slow_way
-	testl	$15,%ecx
-	jnz	.L015slow_way
-	btl	$28,(%eax)
-	jc	.L015slow_way
-	leal	-324(%esp),%esi
-	andl	$-64,%esi
-	movl	%ebp,%eax
-	leal	2304(%ebp),%ebx
-	movl	%esi,%edx
-	andl	$4095,%eax
-	andl	$4095,%ebx
-	andl	$4095,%edx
-	cmpl	%ebx,%edx
-	jb	.L016tbl_break_out
-	subl	%ebx,%edx
-	subl	%edx,%esi
-	jmp	.L017tbl_ok
-.align	4
-.L016tbl_break_out:
-	subl	%eax,%edx
-	andl	$4095,%edx
-	addl	$384,%edx
-	subl	%edx,%esi
-.align	4
-.L017tbl_ok:
-	leal	24(%esp),%edx
-	xchgl	%esi,%esp
-	addl	$4,%esp
-	movl	%ebp,24(%esp)
-	movl	%esi,28(%esp)
-	movl	(%edx),%eax
-	movl	4(%edx),%ebx
-	movl	12(%edx),%edi
-	movl	16(%edx),%esi
-	movl	20(%edx),%edx
-	movl	%eax,32(%esp)
-	movl	%ebx,36(%esp)
-	movl	%ecx,40(%esp)
-	movl	%edi,44(%esp)
-	movl	%esi,48(%esp)
-	movl	$0,316(%esp)
-	movl	%edi,%ebx
-	movl	$61,%ecx
-	subl	%ebp,%ebx
-	movl	%edi,%esi
-	andl	$4095,%ebx
-	leal	76(%esp),%edi
-	cmpl	$2304,%ebx
-	jb	.L018do_copy
-	cmpl	$3852,%ebx
-	jb	.L019skip_copy
-.align	4
-.L018do_copy:
-	movl	%edi,44(%esp)
-.long	2784229001
-.L019skip_copy:
-	movl	$16,%edi
-.align	4
-.L020prefetch_tbl:
-	movl	(%ebp),%eax
-	movl	32(%ebp),%ebx
-	movl	64(%ebp),%ecx
-	movl	96(%ebp),%esi
-	leal	128(%ebp),%ebp
-	subl	$1,%edi
-	jnz	.L020prefetch_tbl
-	subl	$2048,%ebp
-	movl	32(%esp),%esi
-	movl	48(%esp),%edi
-	cmpl	$0,%edx
-	je	.L021fast_decrypt
-	movl	(%edi),%eax
-	movl	4(%edi),%ebx
-.align	16
-.L022fast_enc_loop:
-	movl	8(%edi),%ecx
-	movl	12(%edi),%edx
-	xorl	(%esi),%eax
-	xorl	4(%esi),%ebx
-	xorl	8(%esi),%ecx
-	xorl	12(%esi),%edx
-	movl	44(%esp),%edi
-	call	_x86_AES_encrypt
-	movl	32(%esp),%esi
-	movl	36(%esp),%edi
-	movl	%eax,(%edi)
-	movl	%ebx,4(%edi)
-	movl	%ecx,8(%edi)
-	movl	%edx,12(%edi)
-	leal	16(%esi),%esi
-	movl	40(%esp),%ecx
-	movl	%esi,32(%esp)
-	leal	16(%edi),%edx
-	movl	%edx,36(%esp)
-	subl	$16,%ecx
-	movl	%ecx,40(%esp)
-	jnz	.L022fast_enc_loop
-	movl	48(%esp),%esi
-	movl	8(%edi),%ecx
-	movl	12(%edi),%edx
-	movl	%eax,(%esi)
-	movl	%ebx,4(%esi)
-	movl	%ecx,8(%esi)
-	movl	%edx,12(%esi)
-	cmpl	$0,316(%esp)
-	movl	44(%esp),%edi
-	je	.L023skip_ezero
-	movl	$60,%ecx
-	xorl	%eax,%eax
-.align	4
-.long	2884892297
-.L023skip_ezero:
-	movl	28(%esp),%esp
-	popfl
-.L012drop_out:
-	popl	%edi
-	popl	%esi
-	popl	%ebx
-	popl	%ebp
-	ret
-	pushfl
-.align	16
-.L021fast_decrypt:
-	cmpl	36(%esp),%esi
-	je	.L024fast_dec_in_place
-	movl	%edi,52(%esp)
-.align	4
-.align	16
-.L025fast_dec_loop:
-	movl	(%esi),%eax
-	movl	4(%esi),%ebx
-	movl	8(%esi),%ecx
-	movl	12(%esi),%edx
-	movl	44(%esp),%edi
-	call	_x86_AES_decrypt
-	movl	52(%esp),%edi
-	movl	40(%esp),%esi
-	xorl	(%edi),%eax
-	xorl	4(%edi),%ebx
-	xorl	8(%edi),%ecx
-	xorl	12(%edi),%edx
-	movl	36(%esp),%edi
-	movl	32(%esp),%esi
-	movl	%eax,(%edi)
-	movl	%ebx,4(%edi)
-	movl	%ecx,8(%edi)
-	movl	%edx,12(%edi)
-	movl	40(%esp),%ecx
-	movl	%esi,52(%esp)
-	leal	16(%esi),%esi
-	movl	%esi,32(%esp)
-	leal	16(%edi),%edi
-	movl	%edi,36(%esp)
-	subl	$16,%ecx
-	movl	%ecx,40(%esp)
-	jnz	.L025fast_dec_loop
-	movl	52(%esp),%edi
-	movl	48(%esp),%esi
-	movl	(%edi),%eax
-	movl	4(%edi),%ebx
-	movl	8(%edi),%ecx
-	movl	12(%edi),%edx
-	movl	%eax,(%esi)
-	movl	%ebx,4(%esi)
-	movl	%ecx,8(%esi)
-	movl	%edx,12(%esi)
-	jmp	.L026fast_dec_out
-.align	16
-.L024fast_dec_in_place:
-.L027fast_dec_in_place_loop:
-	movl	(%esi),%eax
-	movl	4(%esi),%ebx
-	movl	8(%esi),%ecx
-	movl	12(%esi),%edx
-	leal	60(%esp),%edi
-	movl	%eax,(%edi)
-	movl	%ebx,4(%edi)
-	movl	%ecx,8(%edi)
-	movl	%edx,12(%edi)
-	movl	44(%esp),%edi
-	call	_x86_AES_decrypt
-	movl	48(%esp),%edi
-	movl	36(%esp),%esi
-	xorl	(%edi),%eax
-	xorl	4(%edi),%ebx
-	xorl	8(%edi),%ecx
-	xorl	12(%edi),%edx
-	movl	%eax,(%esi)
-	movl	%ebx,4(%esi)
-	movl	%ecx,8(%esi)
-	movl	%edx,12(%esi)
-	leal	16(%esi),%esi
-	movl	%esi,36(%esp)
-	leal	60(%esp),%esi
-	movl	(%esi),%eax
-	movl	4(%esi),%ebx
-	movl	8(%esi),%ecx
-	movl	12(%esi),%edx
-	movl	%eax,(%edi)
-	movl	%ebx,4(%edi)
-	movl	%ecx,8(%edi)
-	movl	%edx,12(%edi)
-	movl	32(%esp),%esi
-	movl	40(%esp),%ecx
-	leal	16(%esi),%esi
-	movl	%esi,32(%esp)
-	subl	$16,%ecx
-	movl	%ecx,40(%esp)
-	jnz	.L027fast_dec_in_place_loop
-.align	4
-.L026fast_dec_out:
-	cmpl	$0,316(%esp)
-	movl	44(%esp),%edi
-	je	.L028skip_dzero
-	movl	$60,%ecx
-	xorl	%eax,%eax
-.align	4
-.long	2884892297
-.L028skip_dzero:
-	movl	28(%esp),%esp
-	popfl
-	popl	%edi
-	popl	%esi
-	popl	%ebx
-	popl	%ebp
-	ret
-	pushfl
-.align	16
-.L015slow_way:
-	movl	(%eax),%eax
-	movl	36(%esp),%edi
-	leal	-80(%esp),%esi
-	andl	$-64,%esi
-	leal	-143(%edi),%ebx
-	subl	%esi,%ebx
-	negl	%ebx
-	andl	$960,%ebx
-	subl	%ebx,%esi
-	leal	768(%esi),%ebx
-	subl	%ebp,%ebx
-	andl	$768,%ebx
-	leal	2176(%ebp,%ebx,1),%ebp
-	leal	24(%esp),%edx
-	xchgl	%esi,%esp
-	addl	$4,%esp
-	movl	%ebp,24(%esp)
-	movl	%esi,28(%esp)
-	movl	%eax,52(%esp)
-	movl	(%edx),%eax
-	movl	4(%edx),%ebx
-	movl	16(%edx),%esi
-	movl	20(%edx),%edx
-	movl	%eax,32(%esp)
-	movl	%ebx,36(%esp)
-	movl	%ecx,40(%esp)
-	movl	%edi,44(%esp)
-	movl	%esi,48(%esp)
-	movl	%esi,%edi
-	movl	%eax,%esi
-	cmpl	$0,%edx
-	je	.L029slow_decrypt
-	cmpl	$16,%ecx
-	movl	%ebx,%edx
-	jb	.L030slow_enc_tail
-	btl	$25,52(%esp)
-	jnc	.L031slow_enc_x86
-	movq	(%edi),%mm0
-	movq	8(%edi),%mm4
-.align	16
-.L032slow_enc_loop_sse:
-	pxor	(%esi),%mm0
-	pxor	8(%esi),%mm4
-	movl	44(%esp),%edi
-	call	_sse_AES_encrypt_compact
-	movl	32(%esp),%esi
-	movl	36(%esp),%edi
-	movl	40(%esp),%ecx
-	movq	%mm0,(%edi)
-	movq	%mm4,8(%edi)
-	leal	16(%esi),%esi
-	movl	%esi,32(%esp)
-	leal	16(%edi),%edx
-	movl	%edx,36(%esp)
-	subl	$16,%ecx
-	cmpl	$16,%ecx
-	movl	%ecx,40(%esp)
-	jae	.L032slow_enc_loop_sse
-	testl	$15,%ecx
-	jnz	.L030slow_enc_tail
-	movl	48(%esp),%esi
-	movq	%mm0,(%esi)
-	movq	%mm4,8(%esi)
-	emms
-	movl	28(%esp),%esp
-	popfl
-	popl	%edi
-	popl	%esi
-	popl	%ebx
-	popl	%ebp
-	ret
-	pushfl
-.align	16
-.L031slow_enc_x86:
-	movl	(%edi),%eax
-	movl	4(%edi),%ebx
-.align	4
-.L033slow_enc_loop_x86:
-	movl	8(%edi),%ecx
-	movl	12(%edi),%edx
-	xorl	(%esi),%eax
-	xorl	4(%esi),%ebx
-	xorl	8(%esi),%ecx
-	xorl	12(%esi),%edx
-	movl	44(%esp),%edi
-	call	_x86_AES_encrypt_compact
-	movl	32(%esp),%esi
-	movl	36(%esp),%edi
-	movl	%eax,(%edi)
-	movl	%ebx,4(%edi)
-	movl	%ecx,8(%edi)
-	movl	%edx,12(%edi)
-	movl	40(%esp),%ecx
-	leal	16(%esi),%esi
-	movl	%esi,32(%esp)
-	leal	16(%edi),%edx
-	movl	%edx,36(%esp)
-	subl	$16,%ecx
-	cmpl	$16,%ecx
-	movl	%ecx,40(%esp)
-	jae	.L033slow_enc_loop_x86
-	testl	$15,%ecx
-	jnz	.L030slow_enc_tail
-	movl	48(%esp),%esi
-	movl	8(%edi),%ecx
-	movl	12(%edi),%edx
-	movl	%eax,(%esi)
-	movl	%ebx,4(%esi)
-	movl	%ecx,8(%esi)
-	movl	%edx,12(%esi)
-	movl	28(%esp),%esp
-	popfl
-	popl	%edi
-	popl	%esi
-	popl	%ebx
-	popl	%ebp
-	ret
-	pushfl
-.align	16
-.L030slow_enc_tail:
-	emms
-	movl	%edx,%edi
-	movl	$16,%ebx
-	subl	%ecx,%ebx
-	cmpl	%esi,%edi
-	je	.L034enc_in_place
-.align	4
-.long	2767451785
-	jmp	.L035enc_skip_in_place
-.L034enc_in_place:
-	leal	(%edi,%ecx,1),%edi
-.L035enc_skip_in_place:
-	movl	%ebx,%ecx
-	xorl	%eax,%eax
-.align	4
-.long	2868115081
-	movl	48(%esp),%edi
-	movl	%edx,%esi
-	movl	(%edi),%eax
-	movl	4(%edi),%ebx
-	movl	$16,40(%esp)
-	jmp	.L033slow_enc_loop_x86
-.align	16
-.L029slow_decrypt:
-	btl	$25,52(%esp)
-	jnc	.L036slow_dec_loop_x86
-.align	4
-.L037slow_dec_loop_sse:
-	movq	(%esi),%mm0
-	movq	8(%esi),%mm4
-	movl	44(%esp),%edi
-	call	_sse_AES_decrypt_compact
-	movl	32(%esp),%esi
-	leal	60(%esp),%eax
-	movl	36(%esp),%ebx
-	movl	40(%esp),%ecx
-	movl	48(%esp),%edi
-	movq	(%esi),%mm1
-	movq	8(%esi),%mm5
-	pxor	(%edi),%mm0
-	pxor	8(%edi),%mm4
-	movq	%mm1,(%edi)
-	movq	%mm5,8(%edi)
-	subl	$16,%ecx
-	jc	.L038slow_dec_partial_sse
-	movq	%mm0,(%ebx)
-	movq	%mm4,8(%ebx)
-	leal	16(%ebx),%ebx
-	movl	%ebx,36(%esp)
-	leal	16(%esi),%esi
-	movl	%esi,32(%esp)
-	movl	%ecx,40(%esp)
-	jnz	.L037slow_dec_loop_sse
-	emms
-	movl	28(%esp),%esp
-	popfl
-	popl	%edi
-	popl	%esi
-	popl	%ebx
-	popl	%ebp
-	ret
-	pushfl
-.align	16
-.L038slow_dec_partial_sse:
-	movq	%mm0,(%eax)
-	movq	%mm4,8(%eax)
-	emms
-	addl	$16,%ecx
-	movl	%ebx,%edi
-	movl	%eax,%esi
-.align	4
-.long	2767451785
-	movl	28(%esp),%esp
-	popfl
-	popl	%edi
-	popl	%esi
-	popl	%ebx
-	popl	%ebp
-	ret
-	pushfl
-.align	16
-.L036slow_dec_loop_x86:
-	movl	(%esi),%eax
-	movl	4(%esi),%ebx
-	movl	8(%esi),%ecx
-	movl	12(%esi),%edx
-	leal	60(%esp),%edi
-	movl	%eax,(%edi)
-	movl	%ebx,4(%edi)
-	movl	%ecx,8(%edi)
-	movl	%edx,12(%edi)
-	movl	44(%esp),%edi
-	call	_x86_AES_decrypt_compact
-	movl	48(%esp),%edi
-	movl	40(%esp),%esi
-	xorl	(%edi),%eax
-	xorl	4(%edi),%ebx
-	xorl	8(%edi),%ecx
-	xorl	12(%edi),%edx
-	subl	$16,%esi
-	jc	.L039slow_dec_partial_x86
-	movl	%esi,40(%esp)
-	movl	36(%esp),%esi
-	movl	%eax,(%esi)
-	movl	%ebx,4(%esi)
-	movl	%ecx,8(%esi)
-	movl	%edx,12(%esi)
-	leal	16(%esi),%esi
-	movl	%esi,36(%esp)
-	leal	60(%esp),%esi
-	movl	(%esi),%eax
-	movl	4(%esi),%ebx
-	movl	8(%esi),%ecx
-	movl	12(%esi),%edx
-	movl	%eax,(%edi)
-	movl	%ebx,4(%edi)
-	movl	%ecx,8(%edi)
-	movl	%edx,12(%edi)
-	movl	32(%esp),%esi
-	leal	16(%esi),%esi
-	movl	%esi,32(%esp)
-	jnz	.L036slow_dec_loop_x86
-	movl	28(%esp),%esp
-	popfl
-	popl	%edi
-	popl	%esi
-	popl	%ebx
-	popl	%ebp
-	ret
-	pushfl
-.align	16
-.L039slow_dec_partial_x86:
-	leal	60(%esp),%esi
-	movl	%eax,(%esi)
-	movl	%ebx,4(%esi)
-	movl	%ecx,8(%esi)
-	movl	%edx,12(%esi)
-	movl	32(%esp),%esi
-	movl	(%esi),%eax
-	movl	4(%esi),%ebx
-	movl	8(%esi),%ecx
-	movl	12(%esi),%edx
-	movl	%eax,(%edi)
-	movl	%ebx,4(%edi)
-	movl	%ecx,8(%edi)
-	movl	%edx,12(%edi)
-	movl	40(%esp),%ecx
-	movl	36(%esp),%edi
-	leal	60(%esp),%esi
-.align	4
-.long	2767451785
-	movl	28(%esp),%esp
-	popfl
-	popl	%edi
-	popl	%esi
-	popl	%ebx
-	popl	%ebp
-	ret
-.size	AES_cbc_encrypt,.-.L_AES_cbc_encrypt_begin
-.type	_x86_AES_set_encrypt_key,@function
-.align	16
-_x86_AES_set_encrypt_key:
-	pushl	%ebp
-	pushl	%ebx
-	pushl	%esi
-	pushl	%edi
-	movl	24(%esp),%esi
-	movl	32(%esp),%edi
-	testl	$-1,%esi
-	jz	.L040badpointer
-	testl	$-1,%edi
-	jz	.L040badpointer
-	call	.L041pic_point
-.L041pic_point:
-	popl	%ebp
-	leal	.LAES_Te-.L041pic_point(%ebp),%ebp
-	leal	2176(%ebp),%ebp
-	movl	-128(%ebp),%eax
-	movl	-96(%ebp),%ebx
-	movl	-64(%ebp),%ecx
-	movl	-32(%ebp),%edx
-	movl	(%ebp),%eax
-	movl	32(%ebp),%ebx
-	movl	64(%ebp),%ecx
-	movl	96(%ebp),%edx
-	movl	28(%esp),%ecx
-	cmpl	$128,%ecx
-	je	.L04210rounds
-	cmpl	$192,%ecx
-	je	.L04312rounds
-	cmpl	$256,%ecx
-	je	.L04414rounds
-	movl	$-2,%eax
-	jmp	.L045exit
-.L04210rounds:
-	movl	(%esi),%eax
-	movl	4(%esi),%ebx
-	movl	8(%esi),%ecx
-	movl	12(%esi),%edx
-	movl	%eax,(%edi)
-	movl	%ebx,4(%edi)
-	movl	%ecx,8(%edi)
-	movl	%edx,12(%edi)
-	xorl	%ecx,%ecx
-	jmp	.L04610shortcut
-.align	4
-.L04710loop:
-	movl	(%edi),%eax
-	movl	12(%edi),%edx
-.L04610shortcut:
-	movzbl	%dl,%esi
-	movzbl	-128(%ebp,%esi,1),%ebx
-	movzbl	%dh,%esi
-	shll	$24,%ebx
-	xorl	%ebx,%eax
-	movzbl	-128(%ebp,%esi,1),%ebx
-	shrl	$16,%edx
-	movzbl	%dl,%esi
-	xorl	%ebx,%eax
-	movzbl	-128(%ebp,%esi,1),%ebx
-	movzbl	%dh,%esi
-	shll	$8,%ebx
-	xorl	%ebx,%eax
-	movzbl	-128(%ebp,%esi,1),%ebx
-	shll	$16,%ebx
-	xorl	%ebx,%eax
-	xorl	896(%ebp,%ecx,4),%eax
-	movl	%eax,16(%edi)
-	xorl	4(%edi),%eax
-	movl	%eax,20(%edi)
-	xorl	8(%edi),%eax
-	movl	%eax,24(%edi)
-	xorl	12(%edi),%eax
-	movl	%eax,28(%edi)
-	incl	%ecx
-	addl	$16,%edi
-	cmpl	$10,%ecx
-	jl	.L04710loop
-	movl	$10,80(%edi)
-	xorl	%eax,%eax
-	jmp	.L045exit
-.L04312rounds:
-	movl	(%esi),%eax
-	movl	4(%esi),%ebx
-	movl	8(%esi),%ecx
-	movl	12(%esi),%edx
-	movl	%eax,(%edi)
-	movl	%ebx,4(%edi)
-	movl	%ecx,8(%edi)
-	movl	%edx,12(%edi)
-	movl	16(%esi),%ecx
-	movl	20(%esi),%edx
-	movl	%ecx,16(%edi)
-	movl	%edx,20(%edi)
-	xorl	%ecx,%ecx
-	jmp	.L04812shortcut
-.align	4
-.L04912loop:
-	movl	(%edi),%eax
-	movl	20(%edi),%edx
-.L04812shortcut:
-	movzbl	%dl,%esi
-	movzbl	-128(%ebp,%esi,1),%ebx
-	movzbl	%dh,%esi
-	shll	$24,%ebx
-	xorl	%ebx,%eax
-	movzbl	-128(%ebp,%esi,1),%ebx
-	shrl	$16,%edx
-	movzbl	%dl,%esi
-	xorl	%ebx,%eax
-	movzbl	-128(%ebp,%esi,1),%ebx
-	movzbl	%dh,%esi
-	shll	$8,%ebx
-	xorl	%ebx,%eax
-	movzbl	-128(%ebp,%esi,1),%ebx
-	shll	$16,%ebx
-	xorl	%ebx,%eax
-	xorl	896(%ebp,%ecx,4),%eax
-	movl	%eax,24(%edi)
-	xorl	4(%edi),%eax
-	movl	%eax,28(%edi)
-	xorl	8(%edi),%eax
-	movl	%eax,32(%edi)
-	xorl	12(%edi),%eax
-	movl	%eax,36(%edi)
-	cmpl	$7,%ecx
-	je	.L05012break
-	incl	%ecx
-	xorl	16(%edi),%eax
-	movl	%eax,40(%edi)
-	xorl	20(%edi),%eax
-	movl	%eax,44(%edi)
-	addl	$24,%edi
-	jmp	.L04912loop
-.L05012break:
-	movl	$12,72(%edi)
-	xorl	%eax,%eax
-	jmp	.L045exit
-.L04414rounds:
-	movl	(%esi),%eax
-	movl	4(%esi),%ebx
-	movl	8(%esi),%ecx
-	movl	12(%esi),%edx
-	movl	%eax,(%edi)
-	movl	%ebx,4(%edi)
-	movl	%ecx,8(%edi)
-	movl	%edx,12(%edi)
-	movl	16(%esi),%eax
-	movl	20(%esi),%ebx
-	movl	24(%esi),%ecx
-	movl	28(%esi),%edx
-	movl	%eax,16(%edi)
-	movl	%ebx,20(%edi)
-	movl	%ecx,24(%edi)
-	movl	%edx,28(%edi)
-	xorl	%ecx,%ecx
-	jmp	.L05114shortcut
-.align	4
-.L05214loop:
-	movl	28(%edi),%edx
-.L05114shortcut:
-	movl	(%edi),%eax
-	movzbl	%dl,%esi
-	movzbl	-128(%ebp,%esi,1),%ebx
-	movzbl	%dh,%esi
-	shll	$24,%ebx
-	xorl	%ebx,%eax
-	movzbl	-128(%ebp,%esi,1),%ebx
-	shrl	$16,%edx
-	movzbl	%dl,%esi
-	xorl	%ebx,%eax
-	movzbl	-128(%ebp,%esi,1),%ebx
-	movzbl	%dh,%esi
-	shll	$8,%ebx
-	xorl	%ebx,%eax
-	movzbl	-128(%ebp,%esi,1),%ebx
-	shll	$16,%ebx
-	xorl	%ebx,%eax
-	xorl	896(%ebp,%ecx,4),%eax
-	movl	%eax,32(%edi)
-	xorl	4(%edi),%eax
-	movl	%eax,36(%edi)
-	xorl	8(%edi),%eax
-	movl	%eax,40(%edi)
-	xorl	12(%edi),%eax
-	movl	%eax,44(%edi)
-	cmpl	$6,%ecx
-	je	.L05314break
-	incl	%ecx
-	movl	%eax,%edx
-	movl	16(%edi),%eax
-	movzbl	%dl,%esi
-	movzbl	-128(%ebp,%esi,1),%ebx
-	movzbl	%dh,%esi
-	xorl	%ebx,%eax
-	movzbl	-128(%ebp,%esi,1),%ebx
-	shrl	$16,%edx
-	shll	$8,%ebx
-	movzbl	%dl,%esi
-	xorl	%ebx,%eax
-	movzbl	-128(%ebp,%esi,1),%ebx
-	movzbl	%dh,%esi
-	shll	$16,%ebx
-	xorl	%ebx,%eax
-	movzbl	-128(%ebp,%esi,1),%ebx
-	shll	$24,%ebx
-	xorl	%ebx,%eax
-	movl	%eax,48(%edi)
-	xorl	20(%edi),%eax
-	movl	%eax,52(%edi)
-	xorl	24(%edi),%eax
-	movl	%eax,56(%edi)
-	xorl	28(%edi),%eax
-	movl	%eax,60(%edi)
-	addl	$32,%edi
-	jmp	.L05214loop
-.L05314break:
-	movl	$14,48(%edi)
-	xorl	%eax,%eax
-	jmp	.L045exit
-.L040badpointer:
-	movl	$-1,%eax
-.L045exit:
-	popl	%edi
-	popl	%esi
-	popl	%ebx
-	popl	%ebp
-	ret
-.size	_x86_AES_set_encrypt_key,.-_x86_AES_set_encrypt_key
-.globl	AES_set_encrypt_key
-.type	AES_set_encrypt_key,@function
-.align	16
-AES_set_encrypt_key:
-.L_AES_set_encrypt_key_begin:
-	call	_x86_AES_set_encrypt_key
-	ret
-.size	AES_set_encrypt_key,.-.L_AES_set_encrypt_key_begin
-.globl	AES_set_decrypt_key
-.type	AES_set_decrypt_key,@function
-.align	16
-AES_set_decrypt_key:
-.L_AES_set_decrypt_key_begin:
-	call	_x86_AES_set_encrypt_key
-	cmpl	$0,%eax
-	je	.L054proceed
-	ret
-.L054proceed:
-	pushl	%ebp
-	pushl	%ebx
-	pushl	%esi
-	pushl	%edi
-	movl	28(%esp),%esi
-	movl	240(%esi),%ecx
-	leal	(,%ecx,4),%ecx
-	leal	(%esi,%ecx,4),%edi
-.align	4
-.L055invert:
-	movl	(%esi),%eax
-	movl	4(%esi),%ebx
-	movl	(%edi),%ecx
-	movl	4(%edi),%edx
-	movl	%eax,(%edi)
-	movl	%ebx,4(%edi)
-	movl	%ecx,(%esi)
-	movl	%edx,4(%esi)
-	movl	8(%esi),%eax
-	movl	12(%esi),%ebx
-	movl	8(%edi),%ecx
-	movl	12(%edi),%edx
-	movl	%eax,8(%edi)
-	movl	%ebx,12(%edi)
-	movl	%ecx,8(%esi)
-	movl	%edx,12(%esi)
-	addl	$16,%esi
-	subl	$16,%edi
-	cmpl	%edi,%esi
-	jne	.L055invert
-	movl	28(%esp),%edi
-	movl	240(%edi),%esi
-	leal	-2(%esi,%esi,1),%esi
-	leal	(%edi,%esi,8),%esi
-	movl	%esi,28(%esp)
-	movl	16(%edi),%eax
-.align	4
-.L056permute:
-	addl	$16,%edi
-	movl	$2155905152,%ebp
-	andl	%eax,%ebp
-	leal	(%eax,%eax,1),%ebx
-	movl	%ebp,%esi
-	shrl	$7,%ebp
-	subl	%ebp,%esi
-	andl	$4278124286,%ebx
-	andl	$454761243,%esi
-	xorl	%esi,%ebx
-	movl	$2155905152,%ebp
-	andl	%ebx,%ebp
-	leal	(%ebx,%ebx,1),%ecx
-	movl	%ebp,%esi
-	shrl	$7,%ebp
-	subl	%ebp,%esi
-	andl	$4278124286,%ecx
-	andl	$454761243,%esi
-	xorl	%eax,%ebx
-	xorl	%esi,%ecx
-	movl	$2155905152,%ebp
-	andl	%ecx,%ebp
-	leal	(%ecx,%ecx,1),%edx
-	movl	%ebp,%esi
-	shrl	$7,%ebp
-	xorl	%eax,%ecx
-	subl	%ebp,%esi
-	andl	$4278124286,%edx
-	andl	$454761243,%esi
-	roll	$8,%eax
-	xorl	%esi,%edx
-	movl	4(%edi),%ebp
-	xorl	%ebx,%eax
-	xorl	%edx,%ebx
-	xorl	%ecx,%eax
-	roll	$24,%ebx
-	xorl	%edx,%ecx
-	xorl	%edx,%eax
-	roll	$16,%ecx
-	xorl	%ebx,%eax
-	roll	$8,%edx
-	xorl	%ecx,%eax
-	movl	%ebp,%ebx
-	xorl	%edx,%eax
-	movl	%eax,(%edi)
-	movl	$2155905152,%ebp
-	andl	%ebx,%ebp
-	leal	(%ebx,%ebx,1),%ecx
-	movl	%ebp,%esi
-	shrl	$7,%ebp
-	subl	%ebp,%esi
-	andl	$4278124286,%ecx
-	andl	$454761243,%esi
-	xorl	%esi,%ecx
-	movl	$2155905152,%ebp
-	andl	%ecx,%ebp
-	leal	(%ecx,%ecx,1),%edx
-	movl	%ebp,%esi
-	shrl	$7,%ebp
-	subl	%ebp,%esi
-	andl	$4278124286,%edx
-	andl	$454761243,%esi
-	xorl	%ebx,%ecx
-	xorl	%esi,%edx
-	movl	$2155905152,%ebp
-	andl	%edx,%ebp
-	leal	(%edx,%edx,1),%eax
-	movl	%ebp,%esi
-	shrl	$7,%ebp
-	xorl	%ebx,%edx
-	subl	%ebp,%esi
-	andl	$4278124286,%eax
-	andl	$454761243,%esi
-	roll	$8,%ebx
-	xorl	%esi,%eax
-	movl	8(%edi),%ebp
-	xorl	%ecx,%ebx
-	xorl	%eax,%ecx
-	xorl	%edx,%ebx
-	roll	$24,%ecx
-	xorl	%eax,%edx
-	xorl	%eax,%ebx
-	roll	$16,%edx
-	xorl	%ecx,%ebx
-	roll	$8,%eax
-	xorl	%edx,%ebx
-	movl	%ebp,%ecx
-	xorl	%eax,%ebx
-	movl	%ebx,4(%edi)
-	movl	$2155905152,%ebp
-	andl	%ecx,%ebp
-	leal	(%ecx,%ecx,1),%edx
-	movl	%ebp,%esi
-	shrl	$7,%ebp
-	subl	%ebp,%esi
-	andl	$4278124286,%edx
-	andl	$454761243,%esi
-	xorl	%esi,%edx
-	movl	$2155905152,%ebp
-	andl	%edx,%ebp
-	leal	(%edx,%edx,1),%eax
-	movl	%ebp,%esi
-	shrl	$7,%ebp
-	subl	%ebp,%esi
-	andl	$4278124286,%eax
-	andl	$454761243,%esi
-	xorl	%ecx,%edx
-	xorl	%esi,%eax
-	movl	$2155905152,%ebp
-	andl	%eax,%ebp
-	leal	(%eax,%eax,1),%ebx
-	movl	%ebp,%esi
-	shrl	$7,%ebp
-	xorl	%ecx,%eax
-	subl	%ebp,%esi
-	andl	$4278124286,%ebx
-	andl	$454761243,%esi
-	roll	$8,%ecx
-	xorl	%esi,%ebx
-	movl	12(%edi),%ebp
-	xorl	%edx,%ecx
-	xorl	%ebx,%edx
-	xorl	%eax,%ecx
-	roll	$24,%edx
-	xorl	%ebx,%eax
-	xorl	%ebx,%ecx
-	roll	$16,%eax
-	xorl	%edx,%ecx
-	roll	$8,%ebx
-	xorl	%eax,%ecx
-	movl	%ebp,%edx
-	xorl	%ebx,%ecx
-	movl	%ecx,8(%edi)
-	movl	$2155905152,%ebp
-	andl	%edx,%ebp
-	leal	(%edx,%edx,1),%eax
-	movl	%ebp,%esi
-	shrl	$7,%ebp
-	subl	%ebp,%esi
-	andl	$4278124286,%eax
-	andl	$454761243,%esi
-	xorl	%esi,%eax
-	movl	$2155905152,%ebp
-	andl	%eax,%ebp
-	leal	(%eax,%eax,1),%ebx
-	movl	%ebp,%esi
-	shrl	$7,%ebp
-	subl	%ebp,%esi
-	andl	$4278124286,%ebx
-	andl	$454761243,%esi
-	xorl	%edx,%eax
-	xorl	%esi,%ebx
-	movl	$2155905152,%ebp
-	andl	%ebx,%ebp
-	leal	(%ebx,%ebx,1),%ecx
-	movl	%ebp,%esi
-	shrl	$7,%ebp
-	xorl	%edx,%ebx
-	subl	%ebp,%esi
-	andl	$4278124286,%ecx
-	andl	$454761243,%esi
-	roll	$8,%edx
-	xorl	%esi,%ecx
-	movl	16(%edi),%ebp
-	xorl	%eax,%edx
-	xorl	%ecx,%eax
-	xorl	%ebx,%edx
-	roll	$24,%eax
-	xorl	%ecx,%ebx
-	xorl	%ecx,%edx
-	roll	$16,%ebx
-	xorl	%eax,%edx
-	roll	$8,%ecx
-	xorl	%ebx,%edx
-	movl	%ebp,%eax
-	xorl	%ecx,%edx
-	movl	%edx,12(%edi)
-	cmpl	28(%esp),%edi
-	jb	.L056permute
-	xorl	%eax,%eax
-	popl	%edi
-	popl	%esi
-	popl	%ebx
-	popl	%ebp
-	ret
-.size	AES_set_decrypt_key,.-.L_AES_set_decrypt_key_begin
-.byte	65,69,83,32,102,111,114,32,120,56,54,44,32,67,82,89
-.byte	80,84,79,71,65,77,83,32,98,121,32,60,97,112,112,114
-.byte	111,64,111,112,101,110,115,115,108,46,111,114,103,62,0
-.comm	OPENSSL_ia32cap_P,16,4
diff --git a/deps/openssl/config/archs/linux-elf/asm_avx2/crypto/buildinf.h b/deps/openssl/config/archs/linux-elf/asm_avx2/crypto/buildinf.h
index 153225532e..c7df3525a0 100644
--- a/deps/openssl/config/archs/linux-elf/asm_avx2/crypto/buildinf.h
+++ b/deps/openssl/config/archs/linux-elf/asm_avx2/crypto/buildinf.h
@@ -11,7 +11,7 @@
  */
 
 #define PLATFORM "platform: linux-elf"
-#define DATE "built on: Fri Sep 13 15:59:33 2019 UTC"
+#define DATE "built on: Wed Mar 18 21:06:30 2020 UTC"
 
 /*
  * Generate compiler_flags as an array of individual characters. This is a
@@ -39,10 +39,11 @@ static const char compiler_flags[] = {
     '2','5','6','_','A','S','M',' ','-','D','S','H','A','5','1','2',
     '_','A','S','M',' ','-','D','R','C','4','_','A','S','M',' ','-',
     'D','M','D','5','_','A','S','M',' ','-','D','R','M','D','1','6',
-    '0','_','A','S','M',' ','-','D','V','P','A','E','S','_','A','S',
-    'M',' ','-','D','W','H','I','R','L','P','O','O','L','_','A','S',
-    'M',' ','-','D','G','H','A','S','H','_','A','S','M',' ','-','D',
-    'E','C','P','_','N','I','S','T','Z','2','5','6','_','A','S','M',
-    ' ','-','D','P','O','L','Y','1','3','0','5','_','A','S','M',' ',
-    '-','D','N','D','E','B','U','G','\0'
+    '0','_','A','S','M',' ','-','D','A','E','S','N','I','_','A','S',
+    'M',' ','-','D','V','P','A','E','S','_','A','S','M',' ','-','D',
+    'W','H','I','R','L','P','O','O','L','_','A','S','M',' ','-','D',
+    'G','H','A','S','H','_','A','S','M',' ','-','D','E','C','P','_',
+    'N','I','S','T','Z','2','5','6','_','A','S','M',' ','-','D','P',
+    'O','L','Y','1','3','0','5','_','A','S','M',' ','-','D','N','D',
+    'E','B','U','G','\0'
 };
diff --git a/deps/openssl/config/archs/linux-elf/asm_avx2/crypto/ec/ecp_nistz256-x86.s b/deps/openssl/config/archs/linux-elf/asm_avx2/crypto/ec/ecp_nistz256-x86.s
index da9b3a7ee1..4cec24f4e2 100644
--- a/deps/openssl/config/archs/linux-elf/asm_avx2/crypto/ec/ecp_nistz256-x86.s
+++ b/deps/openssl/config/archs/linux-elf/asm_avx2/crypto/ec/ecp_nistz256-x86.s
@@ -4419,19 +4419,15 @@ ecp_nistz256_point_add:
 	orl	4(%edi),%eax
 	orl	8(%edi),%eax
 	orl	12(%edi),%eax
+	movl	576(%esp),%ebx
+	notl	%ebx
+	orl	%ebx,%eax
+	movl	580(%esp),%ebx
+	notl	%ebx
+	orl	%ebx,%eax
+	orl	584(%esp),%eax
 .byte	62
 	jnz	.L010add_proceed
-	movl	576(%esp),%eax
-	andl	580(%esp),%eax
-	movl	584(%esp),%ebx
-	jz	.L010add_proceed
-	testl	%ebx,%ebx
-	jz	.L011add_double
-	movl	616(%esp),%edi
-	xorl	%eax,%eax
-	movl	$24,%ecx
-.byte	252,243,171
-	jmp	.L012add_done
 .align	16
 .L011add_double:
 	movl	620(%esp),%esi
diff --git a/deps/openssl/config/archs/linux-elf/asm_avx2/crypto/include/internal/bn_conf.h b/deps/openssl/config/archs/linux-elf/asm_avx2/crypto/include/internal/bn_conf.h
index fb52156bd0..459055c96f 100644
--- a/deps/openssl/config/archs/linux-elf/asm_avx2/crypto/include/internal/bn_conf.h
+++ b/deps/openssl/config/archs/linux-elf/asm_avx2/crypto/include/internal/bn_conf.h
@@ -1,5 +1,5 @@
 /* WARNING: do not edit! */
-/* Generated by Makefile from crypto/include/internal/bn_conf.h.in */
+/* Generated by Makefile from include/crypto/bn_conf.h.in */
 /*
  * Copyright 2016 The OpenSSL Project Authors. All Rights Reserved.
  *
@@ -9,8 +9,8 @@
  * https://www.openssl.org/source/license.html
  */
 
-#ifndef HEADER_BN_CONF_H
-# define HEADER_BN_CONF_H
+#ifndef OSSL_CRYPTO_BN_CONF_H
+# define OSSL_CRYPTO_BN_CONF_H
 
 /*
  * The contents of this file are not used in the UEFI build, as
diff --git a/deps/openssl/config/archs/linux-elf/asm_avx2/crypto/include/internal/dso_conf.h b/deps/openssl/config/archs/linux-elf/asm_avx2/crypto/include/internal/dso_conf.h
index 252266ec2a..4b1167c3d8 100644
--- a/deps/openssl/config/archs/linux-elf/asm_avx2/crypto/include/internal/dso_conf.h
+++ b/deps/openssl/config/archs/linux-elf/asm_avx2/crypto/include/internal/dso_conf.h
@@ -1,5 +1,5 @@
 /* WARNING: do not edit! */
-/* Generated by Makefile from crypto/include/internal/dso_conf.h.in */
+/* Generated by Makefile from include/crypto/dso_conf.h.in */
 /*
  * Copyright 2016-2019 The OpenSSL Project Authors. All Rights Reserved.
  *
@@ -9,8 +9,8 @@
  * https://www.openssl.org/source/license.html
  */
 
-#ifndef HEADER_DSO_CONF_H
-# define HEADER_DSO_CONF_H
+#ifndef OSSL_CRYPTO_DSO_CONF_H
+# define OSSL_CRYPTO_DSO_CONF_H
 # define DSO_DLFCN
 # define HAVE_DLFCN_H
 # define DSO_EXTENSION ".so"
diff --git a/deps/openssl/config/archs/linux-elf/asm_avx2/include/openssl/opensslconf.h b/deps/openssl/config/archs/linux-elf/asm_avx2/include/openssl/opensslconf.h
index c43f227296..da0b080ce0 100644
--- a/deps/openssl/config/archs/linux-elf/asm_avx2/include/openssl/opensslconf.h
+++ b/deps/openssl/config/archs/linux-elf/asm_avx2/include/openssl/opensslconf.h
@@ -96,9 +96,6 @@ extern "C" {
 #ifndef OPENSSL_NO_DYNAMIC_ENGINE
 # define OPENSSL_NO_DYNAMIC_ENGINE
 #endif
-#ifndef OPENSSL_NO_AFALGENG
-# define OPENSSL_NO_AFALGENG
-#endif
 
 
 /*
diff --git a/deps/openssl/config/archs/linux-elf/asm_avx2/include/progs.h b/deps/openssl/config/archs/linux-elf/asm_avx2/include/progs.h
index 9b3d270e20..308c65601b 100644
--- a/deps/openssl/config/archs/linux-elf/asm_avx2/include/progs.h
+++ b/deps/openssl/config/archs/linux-elf/asm_avx2/include/progs.h
@@ -2,7 +2,7 @@
  * WARNING: do not edit!
  * Generated by apps/progs.pl
  *
- * Copyright 1995-2019 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 1995-2020 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
diff --git a/deps/openssl/config/archs/linux-elf/asm_avx2/openssl-cl.gypi b/deps/openssl/config/archs/linux-elf/asm_avx2/openssl-cl.gypi
index e2fe28d73a..37aa910e1d 100644
--- a/deps/openssl/config/archs/linux-elf/asm_avx2/openssl-cl.gypi
+++ b/deps/openssl/config/archs/linux-elf/asm_avx2/openssl-cl.gypi
@@ -16,6 +16,7 @@
       'RC4_ASM',
       'MD5_ASM',
       'RMD160_ASM',
+      'AESNI_ASM',
       'VPAES_ASM',
       'WHIRLPOOL_ASM',
       'GHASH_ASM',
diff --git a/deps/openssl/config/archs/linux-elf/asm_avx2/openssl.gypi b/deps/openssl/config/archs/linux-elf/asm_avx2/openssl.gypi
index 5cfdf4bbe6..dd0ac7456b 100644
--- a/deps/openssl/config/archs/linux-elf/asm_avx2/openssl.gypi
+++ b/deps/openssl/config/archs/linux-elf/asm_avx2/openssl.gypi
@@ -713,6 +713,7 @@
       'RC4_ASM',
       'MD5_ASM',
       'RMD160_ASM',
+      'AESNI_ASM',
       'VPAES_ASM',
       'WHIRLPOOL_ASM',
       'GHASH_ASM',
diff --git a/deps/openssl/config/archs/linux-elf/no-asm/configdata.pm b/deps/openssl/config/archs/linux-elf/no-asm/configdata.pm
index 0c657bee8b..cd93118c77 100644
--- a/deps/openssl/config/archs/linux-elf/no-asm/configdata.pm
+++ b/deps/openssl/config/archs/linux-elf/no-asm/configdata.pm
@@ -55,7 +55,7 @@ our %config = (
   minor => "1.1",
   openssl_algorithm_defines => [ "OPENSSL_NO_COMP", "OPENSSL_NO_MD2", "OPENSSL_NO_RC5" ],
   openssl_api_defines => [  ],
-  openssl_other_defines => [ "OPENSSL_RAND_SEED_OS", "OPENSSL_NO_AFALGENG", "OPENSSL_NO_ASAN", "OPENSSL_NO_ASM", "OPENSSL_NO_CRYPTO_MDEBUG", "OPENSSL_NO_CRYPTO_MDEBUG_BACKTRACE", "OPENSSL_NO_DEVCRYPTOENG", "OPENSSL_NO_EC_NISTP_64_GCC_128", "OPENSSL_NO_EGD", "OPENSSL_NO_EXTERNAL_TESTS", "OPENSSL_NO_FUZZ_AFL", "OPENSSL_NO_FUZZ_LIBFUZZER", "OPENSSL_NO_HEARTBEATS", "OPENSSL_NO_MSAN", "OPENSSL_NO_SCTP", "OPENSSL_NO_SSL3", "OPENSSL_NO_SSL3_METHOD", "OPENSSL_NO_UBSAN", "OPENSSL_NO_UNIT_TEST", "OPENSSL_NO_WEAK_SSL_CIPHERS", "OPENSSL_NO_DYNAMIC_ENGINE", "OPENSSL_NO_AFALGENG" ],
+  openssl_other_defines => [ "OPENSSL_RAND_SEED_OS", "OPENSSL_NO_AFALGENG", "OPENSSL_NO_ASAN", "OPENSSL_NO_ASM", "OPENSSL_NO_CRYPTO_MDEBUG", "OPENSSL_NO_CRYPTO_MDEBUG_BACKTRACE", "OPENSSL_NO_DEVCRYPTOENG", "OPENSSL_NO_EC_NISTP_64_GCC_128", "OPENSSL_NO_EGD", "OPENSSL_NO_EXTERNAL_TESTS", "OPENSSL_NO_FUZZ_AFL", "OPENSSL_NO_FUZZ_LIBFUZZER", "OPENSSL_NO_HEARTBEATS", "OPENSSL_NO_MSAN", "OPENSSL_NO_SCTP", "OPENSSL_NO_SSL3", "OPENSSL_NO_SSL3_METHOD", "OPENSSL_NO_UBSAN", "OPENSSL_NO_UNIT_TEST", "OPENSSL_NO_WEAK_SSL_CIPHERS", "OPENSSL_NO_DYNAMIC_ENGINE" ],
   openssl_sys_defines => [  ],
   openssl_thread_defines => [ "OPENSSL_THREADS" ],
   openssldir => "",
@@ -111,8 +111,8 @@ our %config = (
   sourcedir => ".",
   target => "linux-elf",
   tdirs => [ "ossl_shim" ],
-  version => "1.1.1d",
-  version_num => "0x1010104fL",
+  version => "1.1.1e",
+  version_num => "0x1010105fL",
 );
 
 our %target = (
@@ -236,6 +236,7 @@ our @disablables = (
   "dgram",
   "dh",
   "dsa",
+  "dso",
   "dtls",
   "dynamic-engine",
   "ec",
@@ -354,8 +355,8 @@ our %unified_info = (
         {
             "" =>
                 [
-                    "crypto/include/internal/bn_conf.h",
-                    "crypto/include/internal/dso_conf.h",
+                    "include/crypto/bn_conf.h",
+                    "include/crypto/dso_conf.h",
                     "include/openssl/opensslconf.h",
                 ],
             "apps/asn1pars.o" =>
@@ -623,14 +624,6 @@ our %unified_info = (
                     "crypto/perlasm/cbc.pl",
                     "crypto/perlasm/x86asm.pl",
                 ],
-            "crypto/include/internal/bn_conf.h" =>
-                [
-                    "configdata.pm",
-                ],
-            "crypto/include/internal/dso_conf.h" =>
-                [
-                    "configdata.pm",
-                ],
             "crypto/rc4/rc4-586.s" =>
                 [
                     "crypto/perlasm/x86asm.pl",
@@ -706,6 +699,14 @@ our %unified_info = (
                 [
                     "libcrypto",
                 ],
+            "include/crypto/bn_conf.h" =>
+                [
+                    "configdata.pm",
+                ],
+            "include/crypto/dso_conf.h" =>
+                [
+                    "configdata.pm",
+                ],
             "include/openssl/opensslconf.h" =>
                 [
                     "configdata.pm",
@@ -1503,6 +1504,12 @@ our %unified_info = (
                     "libcrypto",
                     "test/libtestutil.a",
                 ],
+            "test/ssl_ctx_test" =>
+                [
+                    "libcrypto",
+                    "libssl",
+                    "test/libtestutil.a",
+                ],
             "test/ssl_test" =>
                 [
                     "libcrypto",
@@ -3221,7 +3228,6 @@ our %unified_info = (
                             "test/testutil/cb.o",
                             "test/testutil/driver.o",
                             "test/testutil/format_output.o",
-                            "test/testutil/init.o",
                             "test/testutil/main.o",
                             "test/testutil/output_helpers.o",
                             "test/testutil/random.o",
@@ -3229,6 +3235,7 @@ our %unified_info = (
                             "test/testutil/tap_bio.o",
                             "test/testutil/test_cleanup.o",
                             "test/testutil/tests.o",
+                            "test/testutil/testutil_init.o",
                         ],
                     "products" =>
                         {
@@ -3727,14 +3734,6 @@ our %unified_info = (
                 [
                     "crypto/ia64cpuid.S",
                 ],
-            "crypto/include/internal/bn_conf.h" =>
-                [
-                    "crypto/include/internal/bn_conf.h.in",
-                ],
-            "crypto/include/internal/dso_conf.h" =>
-                [
-                    "crypto/include/internal/dso_conf.h.in",
-                ],
             "crypto/md5/md5-586.s" =>
                 [
                     "crypto/md5/asm/md5-586.pl",
@@ -4175,6 +4174,14 @@ our %unified_info = (
                     "engines/asm/e_padlock-x86_64.pl",
                     "\$(PERLASM_SCHEME)",
                 ],
+            "include/crypto/bn_conf.h" =>
+                [
+                    "include/crypto/bn_conf.h.in",
+                ],
+            "include/crypto/dso_conf.h" =>
+                [
+                    "include/crypto/dso_conf.h.in",
+                ],
             "include/openssl/opensslconf.h" =>
                 [
                     "include/openssl/opensslconf.h.in",
@@ -4869,49 +4876,41 @@ our %unified_info = (
             "crypto/aes/aes_cbc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/aes/aes_cfb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/aes/aes_core.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/aes/aes_ecb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/aes/aes_ige.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/aes/aes_misc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/aes/aes_ofb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/aes/aes_wrap.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/aes/aesfx-sparcv9.o" =>
@@ -4933,7 +4932,6 @@ our %unified_info = (
             "crypto/aria/aria.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/arm64cpuid.o" =>
@@ -4947,613 +4945,511 @@ our %unified_info = (
             "crypto/asn1/a_bitstr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_d2i_fp.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_digest.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_dup.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_gentm.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_i2d_fp.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_int.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_mbstr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_object.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_octet.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_print.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_sign.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_strex.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_strnid.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_time.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_type.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_utctm.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_utf8.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_verify.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/ameth_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/asn1_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/asn1_gen.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/asn1_item_list.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/asn1_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/asn1_par.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/asn_mime.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/asn_moid.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/asn_mstbl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/asn_pack.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/bio_asn1.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/bio_ndef.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/d2i_pr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/d2i_pu.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/evp_asn1.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/f_int.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/f_string.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/i2d_pr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/i2d_pu.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/n_pkey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/nsseq.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/p5_pbe.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/p5_pbev2.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/p5_scrypt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/p8_pkey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/t_bitst.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/t_pkey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/t_spki.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/tasn_dec.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/tasn_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/tasn_fre.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/tasn_new.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/tasn_prn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/tasn_scn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/tasn_typ.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/tasn_utl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/x_algor.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/x_bignum.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/x_info.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/x_int64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/x_long.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/x_pkey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/x_sig.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/x_spki.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/x_val.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/async/arch/async_null.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/async/arch/async_posix.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/async/arch/async_win.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/async/async.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/async/async_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/async/async_wait.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bf/bf_cfb64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bf/bf_ecb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bf/bf_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bf/bf_ofb64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bf/bf_skey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/b_addr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/b_dump.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/b_print.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/b_sock.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/b_sock2.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bf_buff.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bf_lbuf.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bf_nbio.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bf_null.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bio_cb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bio_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bio_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bio_meth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bss_acpt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bss_bio.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bss_conn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bss_dgram.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bss_fd.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bss_file.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bss_log.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bss_mem.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bss_null.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bss_sock.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/blake2/blake2b.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/blake2/blake2s.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/blake2/m_blake2b.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/blake2/m_blake2s.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/armv4-gf2m.o" =>
@@ -5571,188 +5467,157 @@ our %unified_info = (
             "crypto/bn/bn_add.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_asm.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_blind.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_const.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_ctx.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_depr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_dh.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_div.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_exp.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto",
                 ],
             "crypto/bn/bn_exp2.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_gcd.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_gf2m.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_intern.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_kron.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_mod.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_mont.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_mpi.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_mul.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_nist.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_prime.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_print.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_rand.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_recp.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_shift.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_sqr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_sqrt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_srp.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_word.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_x931p.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/mips-mont.o" =>
@@ -5782,13 +5647,11 @@ our %unified_info = (
             "crypto/buffer/buf_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/buffer/buffer.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/buildinf.h" =>
@@ -5798,43 +5661,36 @@ our %unified_info = (
             "crypto/camellia/camellia.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/camellia/cmll_cbc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/camellia/cmll_cfb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/camellia/cmll_ctr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/camellia/cmll_ecb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/camellia/cmll_misc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/camellia/cmll_ofb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/camellia/cmllt4-sparcv9.o" =>
@@ -5844,31 +5700,26 @@ our %unified_info = (
             "crypto/cast/c_cfb64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cast/c_ecb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cast/c_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cast/c_ofb64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cast/c_skey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/chacha/chacha-armv4.o" =>
@@ -5886,278 +5737,232 @@ our %unified_info = (
             "crypto/chacha/chacha_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cmac/cm_ameth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cmac/cm_pmeth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cmac/cmac.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_asn1.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_att.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_cd.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_dd.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_env.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_ess.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_io.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_kari.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_pwri.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_sd.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_smime.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/conf/conf_api.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/conf/conf_def.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/conf/conf_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/conf/conf_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/conf/conf_mall.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/conf/conf_mod.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/conf/conf_sap.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/conf/conf_ssl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cpt_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cryptlib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ct/ct_b64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ct/ct_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ct/ct_log.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ct/ct_oct.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ct/ct_policy.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ct/ct_prn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ct/ct_sct.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ct/ct_sct_ctx.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ct/ct_vfy.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ct/ct_x509v3.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ctype.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cversion.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto",
                 ],
             "crypto/des/cbc_cksm.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/cbc_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/cfb64ede.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/cfb64enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/cfb_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/des_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/dest4-sparcv9.o" =>
@@ -6167,301 +5972,251 @@ our %unified_info = (
             "crypto/des/ecb3_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/ecb_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/fcrypt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/fcrypt_b.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/ofb64ede.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/ofb64enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/ofb_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/pcbc_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/qud_cksm.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/rand_key.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/set_key.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/str2key.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/xcbc_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_ameth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_asn1.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_check.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_depr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_gen.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_kdf.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_key.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_meth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_pmeth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_prn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_rfc5114.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_rfc7919.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dsa/dsa_ameth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dsa/dsa_asn1.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dsa/dsa_depr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dsa/dsa_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dsa/dsa_gen.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dsa/dsa_key.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dsa/dsa_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dsa/dsa_meth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dsa/dsa_ossl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dsa/dsa_pmeth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dsa/dsa_prn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dsa/dsa_sign.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dsa/dsa_vrf.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dso/dso_dl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dso/dso_dlfcn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dso/dso_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dso/dso_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dso/dso_openssl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dso/dso_vms.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dso/dso_win32.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ebcdic.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/curve25519.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/curve448/arch_32/f_impl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto/ec/curve448/arch_32",
                     "crypto/ec/curve448",
@@ -6469,7 +6224,6 @@ our %unified_info = (
             "crypto/ec/curve448/curve448.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto/ec/curve448/arch_32",
                     "crypto/ec/curve448",
@@ -6477,7 +6231,6 @@ our %unified_info = (
             "crypto/ec/curve448/curve448_tables.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto/ec/curve448/arch_32",
                     "crypto/ec/curve448",
@@ -6485,7 +6238,6 @@ our %unified_info = (
             "crypto/ec/curve448/eddsa.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto/ec/curve448/arch_32",
                     "crypto/ec/curve448",
@@ -6493,7 +6245,6 @@ our %unified_info = (
             "crypto/ec/curve448/f_generic.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto/ec/curve448/arch_32",
                     "crypto/ec/curve448",
@@ -6501,7 +6252,6 @@ our %unified_info = (
             "crypto/ec/curve448/scalar.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto/ec/curve448/arch_32",
                     "crypto/ec/curve448",
@@ -6509,163 +6259,136 @@ our %unified_info = (
             "crypto/ec/ec2_oct.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec2_smpl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec_ameth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec_asn1.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec_check.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec_curve.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec_cvt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec_key.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec_kmeth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec_mult.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec_oct.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec_pmeth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec_print.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecdh_kdf.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecdh_ossl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecdsa_ossl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecdsa_sign.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecdsa_vrf.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/eck_prn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecp_mont.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecp_nist.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecp_nistp224.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecp_nistp256.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecp_nistp521.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecp_nistputil.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecp_nistz256-armv4.o" =>
@@ -6683,223 +6406,186 @@ our %unified_info = (
             "crypto/ec/ecp_oct.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecp_smpl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecx_meth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/eng_all.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/eng_cnf.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/eng_ctrl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/eng_dyn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/eng_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/eng_fat.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/eng_init.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/eng_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/eng_list.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/eng_openssl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/eng_pkey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/eng_rdrand.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/eng_table.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/tb_asnmth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/tb_cipher.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/tb_dh.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/tb_digest.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/tb_dsa.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/tb_eckey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/tb_pkmeth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/tb_rand.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/tb_rsa.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/err/err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/err/err_all.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/err/err_prn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/bio_b64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/bio_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/bio_md.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/bio_ok.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/c_allc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/c_alld.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/cmeth_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/digest.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/e_aes.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto",
                     "crypto/modes",
@@ -6907,21 +6593,18 @@ our %unified_info = (
             "crypto/evp/e_aes_cbc_hmac_sha1.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto/modes",
                 ],
             "crypto/evp/e_aes_cbc_hmac_sha256.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto/modes",
                 ],
             "crypto/evp/e_aria.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto",
                     "crypto/modes",
@@ -6929,13 +6612,11 @@ our %unified_info = (
             "crypto/evp/e_bf.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/e_camellia.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto",
                     "crypto/modes",
@@ -6943,81 +6624,68 @@ our %unified_info = (
             "crypto/evp/e_cast.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/e_chacha20_poly1305.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/e_des.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto",
                 ],
             "crypto/evp/e_des3.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto",
                 ],
             "crypto/evp/e_idea.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/e_null.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/e_old.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/e_rc2.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/e_rc4.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/e_rc4_hmac_md5.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/e_rc5.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/e_seed.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/e_sm4.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto",
                     "crypto/modes",
@@ -7025,328 +6693,267 @@ our %unified_info = (
             "crypto/evp/e_xcbc_d.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/encode.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/evp_cnf.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/evp_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/evp_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/evp_key.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/evp_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/evp_pbe.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/evp_pkey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/m_md2.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/m_md4.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/m_md5.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/m_md5_sha1.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/m_mdc2.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/m_null.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/m_ripemd.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/m_sha1.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/m_sha3.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto",
                 ],
             "crypto/evp/m_sigver.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/m_wp.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/names.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/p5_crpt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/p5_crpt2.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/p_dec.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/p_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/p_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/p_open.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/p_seal.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/p_sign.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/p_verify.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/pbe_scrypt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/pmeth_fn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/pmeth_gn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/pmeth_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ex_data.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/getenv.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/hmac/hm_ameth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/hmac/hm_pmeth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/hmac/hmac.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/idea/i_cbc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/idea/i_cfb64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/idea/i_ecb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/idea/i_ofb64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/idea/i_skey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
-            "crypto/include/internal/bn_conf.h" =>
-                [
-                    ".",
-                ],
-            "crypto/include/internal/dso_conf.h" =>
-                [
-                    ".",
-                ],
             "crypto/init.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/kdf/hkdf.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/kdf/kdf_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/kdf/scrypt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/kdf/tls1_prf.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/lhash/lh_stats.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/lhash/lhash.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/md4/md4_dgst.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/md4/md4_one.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/md5/md5-sparcv9.o" =>
@@ -7356,85 +6963,71 @@ our %unified_info = (
             "crypto/md5/md5_dgst.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/md5/md5_one.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/mdc2/mdc2_one.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/mdc2/mdc2dgst.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/mem.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/mem_clr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/mem_dbg.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/mem_sec.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/modes/cbc128.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/modes/ccm128.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/modes/cfb128.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/modes/ctr128.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/modes/cts128.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/modes/gcm128.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto",
                 ],
@@ -7457,361 +7050,301 @@ our %unified_info = (
             "crypto/modes/ocb128.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/modes/ofb128.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/modes/wrap128.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/modes/xts128.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/o_dir.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/o_fips.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/o_fopen.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/o_init.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/o_str.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/o_time.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/objects/o_names.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/objects/obj_dat.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/objects/obj_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/objects/obj_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/objects/obj_xref.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ocsp/ocsp_asn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ocsp/ocsp_cl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ocsp/ocsp_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ocsp/ocsp_ext.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ocsp/ocsp_ht.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ocsp/ocsp_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ocsp/ocsp_prn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ocsp/ocsp_srv.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ocsp/ocsp_vfy.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ocsp/v3_ocsp.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pem/pem_all.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pem/pem_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pem/pem_info.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pem/pem_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pem/pem_oth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pem/pem_pk8.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pem/pem_pkey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pem/pem_sign.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pem/pem_x509.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pem/pem_xaux.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pem/pvkfmt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_add.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_asn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_attr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_crpt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_crt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_decr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_init.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_key.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_kiss.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_mutl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_npas.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_p8d.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_p8e.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_sbag.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_utl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/pk12err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs7/bio_pk7.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs7/pk7_asn1.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs7/pk7_attr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs7/pk7_doit.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs7/pk7_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs7/pk7_mime.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs7/pk7_smime.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs7/pkcs7err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/poly1305/poly1305-armv4.o" =>
@@ -7833,259 +7366,216 @@ our %unified_info = (
             "crypto/poly1305/poly1305.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/poly1305/poly1305_ameth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/poly1305/poly1305_pmeth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rand/drbg_ctr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rand/drbg_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rand/rand_egd.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rand/rand_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rand/rand_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rand/rand_unix.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rand/rand_vms.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rand/rand_win.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rand/randfile.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rc2/rc2_cbc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rc2/rc2_ecb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rc2/rc2_skey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rc2/rc2cfb64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rc2/rc2ofb64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rc4/rc4_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rc4/rc4_skey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ripemd/rmd_dgst.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ripemd/rmd_one.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_ameth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_asn1.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_chk.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_crpt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_depr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_gen.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_meth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_mp.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_none.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_oaep.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_ossl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_pk1.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_pmeth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_prn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_pss.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_saos.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_sign.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_ssl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_x931.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_x931g.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/s390xcpuid.o" =>
@@ -8095,31 +7585,26 @@ our %unified_info = (
             "crypto/seed/seed.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/seed/seed_cbc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/seed/seed_cfb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/seed/seed_ecb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/seed/seed_ofb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sha/keccak1600-armv4.o" =>
@@ -8129,7 +7614,6 @@ our %unified_info = (
             "crypto/sha/keccak1600.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sha/sha1-armv4-large.o" =>
@@ -8155,13 +7639,11 @@ our %unified_info = (
             "crypto/sha/sha1_one.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sha/sha1dgst.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sha/sha256-armv4.o" =>
@@ -8187,7 +7669,6 @@ our %unified_info = (
             "crypto/sha/sha256.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sha/sha512-armv4.o" =>
@@ -8213,709 +7694,591 @@ our %unified_info = (
             "crypto/sha/sha512.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/siphash/siphash.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/siphash/siphash_ameth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/siphash/siphash_pmeth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sm2/sm2_crypt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sm2/sm2_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sm2/sm2_pmeth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sm2/sm2_sign.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sm3/m_sm3.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sm3/sm3.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sm4/sm4.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/srp/srp_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/srp/srp_vfy.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/stack/stack.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/store/loader_file.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/store/store_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/store/store_init.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/store/store_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/store/store_register.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/store/store_strings.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/threads_none.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/threads_pthread.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/threads_win.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ts/ts_asn1.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ts/ts_conf.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ts/ts_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ts/ts_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ts/ts_req_print.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ts/ts_req_utils.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ts/ts_rsp_print.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ts/ts_rsp_sign.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ts/ts_rsp_utils.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ts/ts_rsp_verify.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ts/ts_verify_ctx.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/txt_db/txt_db.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ui/ui_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ui/ui_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ui/ui_null.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ui/ui_openssl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ui/ui_util.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/uid.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/whrlpool/wp_block.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/whrlpool/wp_dgst.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/by_dir.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/by_file.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/t_crl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/t_req.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/t_x509.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_att.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_cmp.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_d2.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_def.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_ext.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_lu.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_meth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_obj.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_r2x.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_req.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_set.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_trs.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_txt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_v3.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_vfy.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_vpm.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509cset.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509name.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509rset.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509spki.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509type.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x_all.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x_attrib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x_crl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x_exten.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x_name.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x_pubkey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x_req.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x_x509.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x_x509a.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/pcy_cache.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/pcy_data.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/pcy_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/pcy_map.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/pcy_node.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/pcy_tree.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_addr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_admis.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_akey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_akeya.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_alt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_asid.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_bcons.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_bitst.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_conf.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_cpols.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_crld.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_enum.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_extku.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_genn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_ia5.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_info.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_int.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_ncons.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_pci.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_pcia.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_pcons.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_pku.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_pmaps.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_prn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_purp.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_skey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_sxnet.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_tlsf.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_utl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "engines/e_capi.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "engines/e_padlock.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "fuzz/asn1.o" =>
@@ -8966,6 +8329,14 @@ our %unified_info = (
                 [
                     "include",
                 ],
+            "include/crypto/bn_conf.h" =>
+                [
+                    ".",
+                ],
+            "include/crypto/dso_conf.h" =>
+                [
+                    ".",
+                ],
             "include/openssl/opensslconf.h" =>
                 [
                     ".",
@@ -9210,7 +8581,6 @@ our %unified_info = (
                 [
                     ".",
                     "include",
-                    "crypto/include",
                 ],
             "test/asn1_string_table_test.o" =>
                 [
@@ -9536,7 +8906,6 @@ our %unified_info = (
                 [
                     ".",
                     "include",
-                    "crypto/include",
                 ],
             "test/cipher_overhead_test.o" =>
                 [
@@ -9582,7 +8951,6 @@ our %unified_info = (
             "test/ctype_internal_test.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "test/curve448_internal_test.o" =>
@@ -9648,7 +9016,6 @@ our %unified_info = (
                 [
                     "include",
                     "crypto/ec",
-                    "crypto/include",
                 ],
             "test/ecdsatest.o" =>
                 [
@@ -9673,7 +9040,6 @@ our %unified_info = (
             "test/evp_extra_test.o" =>
                 [
                     "include",
-                    "crypto/include",
                 ],
             "test/evp_test.o" =>
                 [
@@ -9771,7 +9137,6 @@ our %unified_info = (
                 [
                     ".",
                     "include",
-                    "crypto/include",
                 ],
             "test/rc2test.o" =>
                 [
@@ -9821,18 +9186,15 @@ our %unified_info = (
                 [
                     ".",
                     "include",
-                    "crypto/include",
                 ],
             "test/sm2_internal_test.o" =>
                 [
                     "include",
-                    "crypto/include",
                 ],
             "test/sm4_internal_test.o" =>
                 [
                     ".",
                     "include",
-                    "crypto/include",
                 ],
             "test/srptest.o" =>
                 [
@@ -9843,6 +9205,10 @@ our %unified_info = (
                     ".",
                     "include",
                 ],
+            "test/ssl_ctx_test.o" =>
+                [
+                    "include",
+                ],
             "test/ssl_test.o" =>
                 [
                     "include",
@@ -9906,10 +9272,6 @@ our %unified_info = (
                 [
                     "include",
                 ],
-            "test/testutil/init.o" =>
-                [
-                    "include",
-                ],
             "test/testutil/main.o" =>
                 [
                     "include",
@@ -9938,6 +9300,10 @@ our %unified_info = (
                 [
                     "include",
                 ],
+            "test/testutil/testutil_init.o" =>
+                [
+                    "include",
+                ],
             "test/threadstest.o" =>
                 [
                     "include",
@@ -10202,6 +9568,7 @@ our %unified_info = (
             "test/sm4_internal_test",
             "test/srptest",
             "test/ssl_cert_table_internal_test",
+            "test/ssl_ctx_test",
             "test/ssl_test",
             "test/ssl_test_ctx_test",
             "test/sslapitest",
@@ -15092,7 +14459,6 @@ our %unified_info = (
                     "test/testutil/cb.o",
                     "test/testutil/driver.o",
                     "test/testutil/format_output.o",
-                    "test/testutil/init.o",
                     "test/testutil/main.o",
                     "test/testutil/output_helpers.o",
                     "test/testutil/random.o",
@@ -15100,6 +14466,7 @@ our %unified_info = (
                     "test/testutil/tap_bio.o",
                     "test/testutil/test_cleanup.o",
                     "test/testutil/tests.o",
+                    "test/testutil/testutil_init.o",
                 ],
             "test/md2test" =>
                 [
@@ -15327,6 +14694,14 @@ our %unified_info = (
                 [
                     "test/ssl_cert_table_internal_test.c",
                 ],
+            "test/ssl_ctx_test" =>
+                [
+                    "test/ssl_ctx_test.o",
+                ],
+            "test/ssl_ctx_test.o" =>
+                [
+                    "test/ssl_ctx_test.c",
+                ],
             "test/ssl_test" =>
                 [
                     "test/handshake_helper.o",
@@ -15429,10 +14804,6 @@ our %unified_info = (
                 [
                     "test/testutil/format_output.c",
                 ],
-            "test/testutil/init.o" =>
-                [
-                    "test/testutil/init.c",
-                ],
             "test/testutil/main.o" =>
                 [
                     "test/testutil/main.c",
@@ -15461,6 +14832,10 @@ our %unified_info = (
                 [
                     "test/testutil/tests.c",
                 ],
+            "test/testutil/testutil_init.o" =>
+                [
+                    "test/testutil/testutil_init.c",
+                ],
             "test/threadstest" =>
                 [
                     "test/threadstest.o",
diff --git a/deps/openssl/config/archs/linux-elf/no-asm/crypto/buildinf.h b/deps/openssl/config/archs/linux-elf/no-asm/crypto/buildinf.h
index 39469e8298..7dbb94e087 100644
--- a/deps/openssl/config/archs/linux-elf/no-asm/crypto/buildinf.h
+++ b/deps/openssl/config/archs/linux-elf/no-asm/crypto/buildinf.h
@@ -11,7 +11,7 @@
  */
 
 #define PLATFORM "platform: linux-elf"
-#define DATE "built on: Fri Sep 13 15:59:39 2019 UTC"
+#define DATE "built on: Wed Mar 18 21:06:37 2020 UTC"
 
 /*
  * Generate compiler_flags as an array of individual characters. This is a
diff --git a/deps/openssl/config/archs/linux-elf/no-asm/crypto/include/internal/bn_conf.h b/deps/openssl/config/archs/linux-elf/no-asm/crypto/include/internal/bn_conf.h
index fb52156bd0..459055c96f 100644
--- a/deps/openssl/config/archs/linux-elf/no-asm/crypto/include/internal/bn_conf.h
+++ b/deps/openssl/config/archs/linux-elf/no-asm/crypto/include/internal/bn_conf.h
@@ -1,5 +1,5 @@
 /* WARNING: do not edit! */
-/* Generated by Makefile from crypto/include/internal/bn_conf.h.in */
+/* Generated by Makefile from include/crypto/bn_conf.h.in */
 /*
  * Copyright 2016 The OpenSSL Project Authors. All Rights Reserved.
  *
@@ -9,8 +9,8 @@
  * https://www.openssl.org/source/license.html
  */
 
-#ifndef HEADER_BN_CONF_H
-# define HEADER_BN_CONF_H
+#ifndef OSSL_CRYPTO_BN_CONF_H
+# define OSSL_CRYPTO_BN_CONF_H
 
 /*
  * The contents of this file are not used in the UEFI build, as
diff --git a/deps/openssl/config/archs/linux-elf/no-asm/crypto/include/internal/dso_conf.h b/deps/openssl/config/archs/linux-elf/no-asm/crypto/include/internal/dso_conf.h
index 252266ec2a..4b1167c3d8 100644
--- a/deps/openssl/config/archs/linux-elf/no-asm/crypto/include/internal/dso_conf.h
+++ b/deps/openssl/config/archs/linux-elf/no-asm/crypto/include/internal/dso_conf.h
@@ -1,5 +1,5 @@
 /* WARNING: do not edit! */
-/* Generated by Makefile from crypto/include/internal/dso_conf.h.in */
+/* Generated by Makefile from include/crypto/dso_conf.h.in */
 /*
  * Copyright 2016-2019 The OpenSSL Project Authors. All Rights Reserved.
  *
@@ -9,8 +9,8 @@
  * https://www.openssl.org/source/license.html
  */
 
-#ifndef HEADER_DSO_CONF_H
-# define HEADER_DSO_CONF_H
+#ifndef OSSL_CRYPTO_DSO_CONF_H
+# define OSSL_CRYPTO_DSO_CONF_H
 # define DSO_DLFCN
 # define HAVE_DLFCN_H
 # define DSO_EXTENSION ".so"
diff --git a/deps/openssl/config/archs/linux-elf/no-asm/include/openssl/opensslconf.h b/deps/openssl/config/archs/linux-elf/no-asm/include/openssl/opensslconf.h
index f1f7572f38..6db191cd5c 100644
--- a/deps/openssl/config/archs/linux-elf/no-asm/include/openssl/opensslconf.h
+++ b/deps/openssl/config/archs/linux-elf/no-asm/include/openssl/opensslconf.h
@@ -99,9 +99,6 @@ extern "C" {
 #ifndef OPENSSL_NO_DYNAMIC_ENGINE
 # define OPENSSL_NO_DYNAMIC_ENGINE
 #endif
-#ifndef OPENSSL_NO_AFALGENG
-# define OPENSSL_NO_AFALGENG
-#endif
 
 
 /*
diff --git a/deps/openssl/config/archs/linux-elf/no-asm/include/progs.h b/deps/openssl/config/archs/linux-elf/no-asm/include/progs.h
index 9b3d270e20..308c65601b 100644
--- a/deps/openssl/config/archs/linux-elf/no-asm/include/progs.h
+++ b/deps/openssl/config/archs/linux-elf/no-asm/include/progs.h
@@ -2,7 +2,7 @@
  * WARNING: do not edit!
  * Generated by apps/progs.pl
  *
- * Copyright 1995-2019 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 1995-2020 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
diff --git a/deps/openssl/config/archs/linux-ppc/asm/configdata.pm b/deps/openssl/config/archs/linux-ppc/asm/configdata.pm
index 47234ab917..1afb56190c 100644
--- a/deps/openssl/config/archs/linux-ppc/asm/configdata.pm
+++ b/deps/openssl/config/archs/linux-ppc/asm/configdata.pm
@@ -55,7 +55,7 @@ our %config = (
   minor => "1.1",
   openssl_algorithm_defines => [ "OPENSSL_NO_COMP", "OPENSSL_NO_MD2", "OPENSSL_NO_RC5" ],
   openssl_api_defines => [  ],
-  openssl_other_defines => [ "OPENSSL_RAND_SEED_OS", "OPENSSL_NO_AFALGENG", "OPENSSL_NO_ASAN", "OPENSSL_NO_CRYPTO_MDEBUG", "OPENSSL_NO_CRYPTO_MDEBUG_BACKTRACE", "OPENSSL_NO_DEVCRYPTOENG", "OPENSSL_NO_EC_NISTP_64_GCC_128", "OPENSSL_NO_EGD", "OPENSSL_NO_EXTERNAL_TESTS", "OPENSSL_NO_FUZZ_AFL", "OPENSSL_NO_FUZZ_LIBFUZZER", "OPENSSL_NO_HEARTBEATS", "OPENSSL_NO_MSAN", "OPENSSL_NO_SCTP", "OPENSSL_NO_SSL3", "OPENSSL_NO_SSL3_METHOD", "OPENSSL_NO_UBSAN", "OPENSSL_NO_UNIT_TEST", "OPENSSL_NO_WEAK_SSL_CIPHERS", "OPENSSL_NO_DYNAMIC_ENGINE", "OPENSSL_NO_AFALGENG" ],
+  openssl_other_defines => [ "OPENSSL_RAND_SEED_OS", "OPENSSL_NO_AFALGENG", "OPENSSL_NO_ASAN", "OPENSSL_NO_CRYPTO_MDEBUG", "OPENSSL_NO_CRYPTO_MDEBUG_BACKTRACE", "OPENSSL_NO_DEVCRYPTOENG", "OPENSSL_NO_EC_NISTP_64_GCC_128", "OPENSSL_NO_EGD", "OPENSSL_NO_EXTERNAL_TESTS", "OPENSSL_NO_FUZZ_AFL", "OPENSSL_NO_FUZZ_LIBFUZZER", "OPENSSL_NO_HEARTBEATS", "OPENSSL_NO_MSAN", "OPENSSL_NO_SCTP", "OPENSSL_NO_SSL3", "OPENSSL_NO_SSL3_METHOD", "OPENSSL_NO_UBSAN", "OPENSSL_NO_UNIT_TEST", "OPENSSL_NO_WEAK_SSL_CIPHERS", "OPENSSL_NO_DYNAMIC_ENGINE" ],
   openssl_sys_defines => [  ],
   openssl_thread_defines => [ "OPENSSL_THREADS" ],
   openssldir => "",
@@ -111,8 +111,8 @@ our %config = (
   sourcedir => ".",
   target => "linux-ppc",
   tdirs => [ "ossl_shim" ],
-  version => "1.1.1d",
-  version_num => "0x1010104fL",
+  version => "1.1.1e",
+  version_num => "0x1010105fL",
 );
 
 our %target = (
@@ -239,6 +239,7 @@ our @disablables = (
   "dgram",
   "dh",
   "dsa",
+  "dso",
   "dtls",
   "dynamic-engine",
   "ec",
@@ -356,8 +357,8 @@ our %unified_info = (
         {
             "" =>
                 [
-                    "crypto/include/internal/bn_conf.h",
-                    "crypto/include/internal/dso_conf.h",
+                    "include/crypto/bn_conf.h",
+                    "include/crypto/dso_conf.h",
                     "include/openssl/opensslconf.h",
                 ],
             "apps/asn1pars.o" =>
@@ -625,14 +626,6 @@ our %unified_info = (
                     "crypto/perlasm/cbc.pl",
                     "crypto/perlasm/x86asm.pl",
                 ],
-            "crypto/include/internal/bn_conf.h" =>
-                [
-                    "configdata.pm",
-                ],
-            "crypto/include/internal/dso_conf.h" =>
-                [
-                    "configdata.pm",
-                ],
             "crypto/rc4/rc4-586.s" =>
                 [
                     "crypto/perlasm/x86asm.pl",
@@ -708,6 +701,14 @@ our %unified_info = (
                 [
                     "libcrypto",
                 ],
+            "include/crypto/bn_conf.h" =>
+                [
+                    "configdata.pm",
+                ],
+            "include/crypto/dso_conf.h" =>
+                [
+                    "configdata.pm",
+                ],
             "include/openssl/opensslconf.h" =>
                 [
                     "configdata.pm",
@@ -1505,6 +1506,12 @@ our %unified_info = (
                     "libcrypto",
                     "test/libtestutil.a",
                 ],
+            "test/ssl_ctx_test" =>
+                [
+                    "libcrypto",
+                    "libssl",
+                    "test/libtestutil.a",
+                ],
             "test/ssl_test" =>
                 [
                     "libcrypto",
@@ -3236,7 +3243,6 @@ our %unified_info = (
                             "test/testutil/cb.o",
                             "test/testutil/driver.o",
                             "test/testutil/format_output.o",
-                            "test/testutil/init.o",
                             "test/testutil/main.o",
                             "test/testutil/output_helpers.o",
                             "test/testutil/random.o",
@@ -3244,6 +3250,7 @@ our %unified_info = (
                             "test/testutil/tap_bio.o",
                             "test/testutil/test_cleanup.o",
                             "test/testutil/tests.o",
+                            "test/testutil/testutil_init.o",
                         ],
                     "products" =>
                         {
@@ -3742,14 +3749,6 @@ our %unified_info = (
                 [
                     "crypto/ia64cpuid.S",
                 ],
-            "crypto/include/internal/bn_conf.h" =>
-                [
-                    "crypto/include/internal/bn_conf.h.in",
-                ],
-            "crypto/include/internal/dso_conf.h" =>
-                [
-                    "crypto/include/internal/dso_conf.h.in",
-                ],
             "crypto/md5/md5-586.s" =>
                 [
                     "crypto/md5/asm/md5-586.pl",
@@ -4190,6 +4189,14 @@ our %unified_info = (
                     "engines/asm/e_padlock-x86_64.pl",
                     "\$(PERLASM_SCHEME)",
                 ],
+            "include/crypto/bn_conf.h" =>
+                [
+                    "include/crypto/bn_conf.h.in",
+                ],
+            "include/crypto/dso_conf.h" =>
+                [
+                    "include/crypto/dso_conf.h.in",
+                ],
             "include/openssl/opensslconf.h" =>
                 [
                     "include/openssl/opensslconf.h.in",
@@ -4876,7 +4883,6 @@ our %unified_info = (
             "crypto/aes/aes-ppc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/aes/aes-s390x.o" =>
@@ -4890,49 +4896,41 @@ our %unified_info = (
             "crypto/aes/aes_cbc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/aes/aes_cfb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/aes/aes_core.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/aes/aes_ecb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/aes/aes_ige.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/aes/aes_misc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/aes/aes_ofb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/aes/aes_wrap.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/aes/aesfx-sparcv9.o" =>
@@ -4942,7 +4940,6 @@ our %unified_info = (
             "crypto/aes/aesp8-ppc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/aes/aest4-sparcv9.o" =>
@@ -4960,13 +4957,11 @@ our %unified_info = (
             "crypto/aes/vpaes-ppc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/aria/aria.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/arm64cpuid.o" =>
@@ -4980,613 +4975,511 @@ our %unified_info = (
             "crypto/asn1/a_bitstr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_d2i_fp.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_digest.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_dup.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_gentm.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_i2d_fp.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_int.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_mbstr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_object.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_octet.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_print.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_sign.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_strex.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_strnid.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_time.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_type.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_utctm.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_utf8.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_verify.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/ameth_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/asn1_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/asn1_gen.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/asn1_item_list.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/asn1_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/asn1_par.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/asn_mime.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/asn_moid.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/asn_mstbl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/asn_pack.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/bio_asn1.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/bio_ndef.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/d2i_pr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/d2i_pu.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/evp_asn1.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/f_int.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/f_string.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/i2d_pr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/i2d_pu.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/n_pkey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/nsseq.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/p5_pbe.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/p5_pbev2.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/p5_scrypt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/p8_pkey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/t_bitst.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/t_pkey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/t_spki.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/tasn_dec.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/tasn_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/tasn_fre.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/tasn_new.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/tasn_prn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/tasn_scn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/tasn_typ.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/tasn_utl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/x_algor.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/x_bignum.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/x_info.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/x_int64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/x_long.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/x_pkey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/x_sig.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/x_spki.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/x_val.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/async/arch/async_null.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/async/arch/async_posix.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/async/arch/async_win.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/async/async.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/async/async_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/async/async_wait.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bf/bf_cfb64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bf/bf_ecb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bf/bf_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bf/bf_ofb64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bf/bf_skey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/b_addr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/b_dump.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/b_print.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/b_sock.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/b_sock2.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bf_buff.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bf_lbuf.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bf_nbio.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bf_null.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bio_cb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bio_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bio_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bio_meth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bss_acpt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bss_bio.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bss_conn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bss_dgram.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bss_fd.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bss_file.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bss_log.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bss_mem.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bss_null.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bss_sock.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/blake2/blake2b.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/blake2/blake2s.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/blake2/m_blake2b.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/blake2/m_blake2s.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/armv4-gf2m.o" =>
@@ -5604,188 +5497,157 @@ our %unified_info = (
             "crypto/bn/bn-ppc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_add.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_blind.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_const.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_ctx.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_depr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_dh.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_div.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_exp.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto",
                 ],
             "crypto/bn/bn_exp2.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_gcd.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_gf2m.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_intern.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_kron.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_mod.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_mont.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_mpi.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_mul.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_nist.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_prime.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_print.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_rand.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_recp.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_shift.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_sqr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_sqrt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_srp.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_word.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_x931p.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/mips-mont.o" =>
@@ -5795,7 +5657,6 @@ our %unified_info = (
             "crypto/bn/ppc-mont.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/sparct4-mont.o" =>
@@ -5821,13 +5682,11 @@ our %unified_info = (
             "crypto/buffer/buf_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/buffer/buffer.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/buildinf.h" =>
@@ -5837,43 +5696,36 @@ our %unified_info = (
             "crypto/camellia/camellia.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/camellia/cmll_cbc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/camellia/cmll_cfb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/camellia/cmll_ctr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/camellia/cmll_ecb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/camellia/cmll_misc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/camellia/cmll_ofb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/camellia/cmllt4-sparcv9.o" =>
@@ -5883,31 +5735,26 @@ our %unified_info = (
             "crypto/cast/c_cfb64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cast/c_ecb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cast/c_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cast/c_ofb64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cast/c_skey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/chacha/chacha-armv4.o" =>
@@ -5921,7 +5768,6 @@ our %unified_info = (
             "crypto/chacha/chacha-ppc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/chacha/chacha-s390x.o" =>
@@ -5931,272 +5777,227 @@ our %unified_info = (
             "crypto/cmac/cm_ameth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cmac/cm_pmeth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cmac/cmac.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_asn1.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_att.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_cd.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_dd.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_env.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_ess.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_io.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_kari.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_pwri.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_sd.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_smime.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/conf/conf_api.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/conf/conf_def.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/conf/conf_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/conf/conf_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/conf/conf_mall.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/conf/conf_mod.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/conf/conf_sap.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/conf/conf_ssl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cpt_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cryptlib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ct/ct_b64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ct/ct_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ct/ct_log.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ct/ct_oct.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ct/ct_policy.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ct/ct_prn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ct/ct_sct.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ct/ct_sct_ctx.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ct/ct_vfy.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ct/ct_x509v3.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ctype.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cversion.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto",
                 ],
             "crypto/des/cbc_cksm.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/cbc_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/cfb64ede.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/cfb64enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/cfb_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/des_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/dest4-sparcv9.o" =>
@@ -6206,301 +6007,251 @@ our %unified_info = (
             "crypto/des/ecb3_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/ecb_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/fcrypt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/fcrypt_b.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/ofb64ede.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/ofb64enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/ofb_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/pcbc_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/qud_cksm.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/rand_key.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/set_key.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/str2key.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/xcbc_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_ameth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_asn1.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_check.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_depr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_gen.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_kdf.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_key.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_meth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_pmeth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_prn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_rfc5114.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_rfc7919.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dsa/dsa_ameth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dsa/dsa_asn1.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dsa/dsa_depr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dsa/dsa_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dsa/dsa_gen.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dsa/dsa_key.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dsa/dsa_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dsa/dsa_meth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dsa/dsa_ossl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dsa/dsa_pmeth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dsa/dsa_prn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dsa/dsa_sign.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dsa/dsa_vrf.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dso/dso_dl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dso/dso_dlfcn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dso/dso_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dso/dso_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dso/dso_openssl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dso/dso_vms.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dso/dso_win32.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ebcdic.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/curve25519.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/curve448/arch_32/f_impl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto/ec/curve448/arch_32",
                     "crypto/ec/curve448",
@@ -6508,7 +6259,6 @@ our %unified_info = (
             "crypto/ec/curve448/curve448.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto/ec/curve448/arch_32",
                     "crypto/ec/curve448",
@@ -6516,7 +6266,6 @@ our %unified_info = (
             "crypto/ec/curve448/curve448_tables.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto/ec/curve448/arch_32",
                     "crypto/ec/curve448",
@@ -6524,7 +6273,6 @@ our %unified_info = (
             "crypto/ec/curve448/eddsa.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto/ec/curve448/arch_32",
                     "crypto/ec/curve448",
@@ -6532,7 +6280,6 @@ our %unified_info = (
             "crypto/ec/curve448/f_generic.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto/ec/curve448/arch_32",
                     "crypto/ec/curve448",
@@ -6540,7 +6287,6 @@ our %unified_info = (
             "crypto/ec/curve448/scalar.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto/ec/curve448/arch_32",
                     "crypto/ec/curve448",
@@ -6548,163 +6294,136 @@ our %unified_info = (
             "crypto/ec/ec2_oct.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec2_smpl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec_ameth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec_asn1.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec_check.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec_curve.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec_cvt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec_key.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec_kmeth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec_mult.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec_oct.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec_pmeth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec_print.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecdh_kdf.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecdh_ossl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecdsa_ossl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecdsa_sign.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecdsa_vrf.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/eck_prn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecp_mont.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecp_nist.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecp_nistp224.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecp_nistp256.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecp_nistp521.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecp_nistputil.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecp_nistz256-armv4.o" =>
@@ -6722,223 +6441,186 @@ our %unified_info = (
             "crypto/ec/ecp_oct.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecp_smpl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecx_meth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/eng_all.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/eng_cnf.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/eng_ctrl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/eng_dyn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/eng_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/eng_fat.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/eng_init.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/eng_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/eng_list.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/eng_openssl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/eng_pkey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/eng_rdrand.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/eng_table.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/tb_asnmth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/tb_cipher.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/tb_dh.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/tb_digest.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/tb_dsa.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/tb_eckey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/tb_pkmeth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/tb_rand.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/tb_rsa.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/err/err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/err/err_all.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/err/err_prn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/bio_b64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/bio_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/bio_md.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/bio_ok.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/c_allc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/c_alld.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/cmeth_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/digest.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/e_aes.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto",
                     "crypto/modes",
@@ -6946,21 +6628,18 @@ our %unified_info = (
             "crypto/evp/e_aes_cbc_hmac_sha1.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto/modes",
                 ],
             "crypto/evp/e_aes_cbc_hmac_sha256.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto/modes",
                 ],
             "crypto/evp/e_aria.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto",
                     "crypto/modes",
@@ -6968,13 +6647,11 @@ our %unified_info = (
             "crypto/evp/e_bf.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/e_camellia.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto",
                     "crypto/modes",
@@ -6982,81 +6659,68 @@ our %unified_info = (
             "crypto/evp/e_cast.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/e_chacha20_poly1305.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/e_des.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto",
                 ],
             "crypto/evp/e_des3.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto",
                 ],
             "crypto/evp/e_idea.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/e_null.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/e_old.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/e_rc2.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/e_rc4.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/e_rc4_hmac_md5.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/e_rc5.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/e_seed.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/e_sm4.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto",
                     "crypto/modes",
@@ -7064,328 +6728,267 @@ our %unified_info = (
             "crypto/evp/e_xcbc_d.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/encode.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/evp_cnf.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/evp_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/evp_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/evp_key.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/evp_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/evp_pbe.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/evp_pkey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/m_md2.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/m_md4.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/m_md5.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/m_md5_sha1.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/m_mdc2.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/m_null.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/m_ripemd.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/m_sha1.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/m_sha3.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto",
                 ],
             "crypto/evp/m_sigver.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/m_wp.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/names.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/p5_crpt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/p5_crpt2.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/p_dec.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/p_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/p_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/p_open.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/p_seal.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/p_sign.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/p_verify.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/pbe_scrypt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/pmeth_fn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/pmeth_gn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/pmeth_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ex_data.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/getenv.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/hmac/hm_ameth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/hmac/hm_pmeth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/hmac/hmac.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/idea/i_cbc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/idea/i_cfb64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/idea/i_ecb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/idea/i_ofb64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/idea/i_skey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
-            "crypto/include/internal/bn_conf.h" =>
-                [
-                    ".",
-                ],
-            "crypto/include/internal/dso_conf.h" =>
-                [
-                    ".",
-                ],
             "crypto/init.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/kdf/hkdf.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/kdf/kdf_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/kdf/scrypt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/kdf/tls1_prf.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/lhash/lh_stats.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/lhash/lhash.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/md4/md4_dgst.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/md4/md4_one.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/md5/md5-sparcv9.o" =>
@@ -7395,79 +6998,66 @@ our %unified_info = (
             "crypto/md5/md5_dgst.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/md5/md5_one.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/mdc2/mdc2_one.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/mdc2/mdc2dgst.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/mem.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/mem_dbg.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/mem_sec.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/modes/cbc128.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/modes/ccm128.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/modes/cfb128.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/modes/ctr128.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/modes/cts128.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/modes/gcm128.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto",
                 ],
@@ -7486,7 +7076,6 @@ our %unified_info = (
             "crypto/modes/ghashp8-ppc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/modes/ghashv8-armx.o" =>
@@ -7496,361 +7085,301 @@ our %unified_info = (
             "crypto/modes/ocb128.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/modes/ofb128.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/modes/wrap128.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/modes/xts128.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/o_dir.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/o_fips.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/o_fopen.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/o_init.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/o_str.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/o_time.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/objects/o_names.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/objects/obj_dat.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/objects/obj_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/objects/obj_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/objects/obj_xref.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ocsp/ocsp_asn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ocsp/ocsp_cl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ocsp/ocsp_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ocsp/ocsp_ext.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ocsp/ocsp_ht.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ocsp/ocsp_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ocsp/ocsp_prn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ocsp/ocsp_srv.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ocsp/ocsp_vfy.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ocsp/v3_ocsp.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pem/pem_all.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pem/pem_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pem/pem_info.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pem/pem_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pem/pem_oth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pem/pem_pk8.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pem/pem_pkey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pem/pem_sign.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pem/pem_x509.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pem/pem_xaux.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pem/pvkfmt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_add.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_asn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_attr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_crpt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_crt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_decr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_init.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_key.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_kiss.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_mutl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_npas.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_p8d.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_p8e.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_sbag.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_utl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/pk12err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs7/bio_pk7.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs7/pk7_asn1.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs7/pk7_attr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs7/pk7_doit.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs7/pk7_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs7/pk7_mime.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs7/pk7_smime.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs7/pkcs7err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/poly1305/poly1305-armv4.o" =>
@@ -7868,13 +7397,11 @@ our %unified_info = (
             "crypto/poly1305/poly1305-ppc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/poly1305/poly1305-ppcfp.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/poly1305/poly1305-sparcv9.o" =>
@@ -7884,271 +7411,226 @@ our %unified_info = (
             "crypto/poly1305/poly1305.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/poly1305/poly1305_ameth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/poly1305/poly1305_pmeth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ppccap.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ppccpuid.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rand/drbg_ctr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rand/drbg_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rand/rand_egd.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rand/rand_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rand/rand_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rand/rand_unix.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rand/rand_vms.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rand/rand_win.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rand/randfile.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rc2/rc2_cbc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rc2/rc2_ecb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rc2/rc2_skey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rc2/rc2cfb64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rc2/rc2ofb64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rc4/rc4_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rc4/rc4_skey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ripemd/rmd_dgst.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ripemd/rmd_one.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_ameth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_asn1.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_chk.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_crpt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_depr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_gen.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_meth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_mp.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_none.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_oaep.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_ossl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_pk1.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_pmeth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_prn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_pss.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_saos.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_sign.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_ssl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_x931.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_x931g.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/s390xcpuid.o" =>
@@ -8158,31 +7640,26 @@ our %unified_info = (
             "crypto/seed/seed.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/seed/seed_cbc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/seed/seed_cfb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/seed/seed_ecb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/seed/seed_ofb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sha/keccak1600-armv4.o" =>
@@ -8192,7 +7669,6 @@ our %unified_info = (
             "crypto/sha/keccak1600.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sha/sha1-armv4-large.o" =>
@@ -8210,7 +7686,6 @@ our %unified_info = (
             "crypto/sha/sha1-ppc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sha/sha1-s390x.o" =>
@@ -8224,13 +7699,11 @@ our %unified_info = (
             "crypto/sha/sha1_one.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sha/sha1dgst.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sha/sha256-armv4.o" =>
@@ -8248,7 +7721,6 @@ our %unified_info = (
             "crypto/sha/sha256-ppc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sha/sha256-s390x.o" =>
@@ -8262,13 +7734,11 @@ our %unified_info = (
             "crypto/sha/sha256.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sha/sha256p8-ppc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sha/sha512-armv4.o" =>
@@ -8286,7 +7756,6 @@ our %unified_info = (
             "crypto/sha/sha512-ppc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sha/sha512-s390x.o" =>
@@ -8300,715 +7769,596 @@ our %unified_info = (
             "crypto/sha/sha512.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sha/sha512p8-ppc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/siphash/siphash.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/siphash/siphash_ameth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/siphash/siphash_pmeth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sm2/sm2_crypt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sm2/sm2_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sm2/sm2_pmeth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sm2/sm2_sign.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sm3/m_sm3.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sm3/sm3.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sm4/sm4.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/srp/srp_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/srp/srp_vfy.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/stack/stack.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/store/loader_file.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/store/store_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/store/store_init.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/store/store_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/store/store_register.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/store/store_strings.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/threads_none.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/threads_pthread.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/threads_win.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ts/ts_asn1.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ts/ts_conf.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ts/ts_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ts/ts_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ts/ts_req_print.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ts/ts_req_utils.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ts/ts_rsp_print.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ts/ts_rsp_sign.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ts/ts_rsp_utils.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ts/ts_rsp_verify.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ts/ts_verify_ctx.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/txt_db/txt_db.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ui/ui_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ui/ui_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ui/ui_null.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ui/ui_openssl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ui/ui_util.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/uid.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/whrlpool/wp_block.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/whrlpool/wp_dgst.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/by_dir.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/by_file.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/t_crl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/t_req.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/t_x509.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_att.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_cmp.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_d2.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_def.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_ext.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_lu.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_meth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_obj.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_r2x.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_req.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_set.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_trs.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_txt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_v3.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_vfy.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_vpm.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509cset.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509name.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509rset.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509spki.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509type.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x_all.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x_attrib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x_crl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x_exten.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x_name.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x_pubkey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x_req.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x_x509.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x_x509a.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/pcy_cache.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/pcy_data.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/pcy_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/pcy_map.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/pcy_node.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/pcy_tree.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_addr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_admis.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_akey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_akeya.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_alt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_asid.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_bcons.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_bitst.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_conf.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_cpols.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_crld.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_enum.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_extku.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_genn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_ia5.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_info.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_int.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_ncons.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_pci.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_pcia.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_pcons.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_pku.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_pmaps.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_prn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_purp.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_skey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_sxnet.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_tlsf.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_utl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "engines/e_capi.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "engines/e_padlock.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "fuzz/asn1.o" =>
@@ -9059,6 +8409,14 @@ our %unified_info = (
                 [
                     "include",
                 ],
+            "include/crypto/bn_conf.h" =>
+                [
+                    ".",
+                ],
+            "include/crypto/dso_conf.h" =>
+                [
+                    ".",
+                ],
             "include/openssl/opensslconf.h" =>
                 [
                     ".",
@@ -9303,7 +8661,6 @@ our %unified_info = (
                 [
                     ".",
                     "include",
-                    "crypto/include",
                 ],
             "test/asn1_string_table_test.o" =>
                 [
@@ -9629,7 +8986,6 @@ our %unified_info = (
                 [
                     ".",
                     "include",
-                    "crypto/include",
                 ],
             "test/cipher_overhead_test.o" =>
                 [
@@ -9675,7 +9031,6 @@ our %unified_info = (
             "test/ctype_internal_test.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "test/curve448_internal_test.o" =>
@@ -9741,7 +9096,6 @@ our %unified_info = (
                 [
                     "include",
                     "crypto/ec",
-                    "crypto/include",
                 ],
             "test/ecdsatest.o" =>
                 [
@@ -9766,7 +9120,6 @@ our %unified_info = (
             "test/evp_extra_test.o" =>
                 [
                     "include",
-                    "crypto/include",
                 ],
             "test/evp_test.o" =>
                 [
@@ -9864,7 +9217,6 @@ our %unified_info = (
                 [
                     ".",
                     "include",
-                    "crypto/include",
                 ],
             "test/rc2test.o" =>
                 [
@@ -9914,18 +9266,15 @@ our %unified_info = (
                 [
                     ".",
                     "include",
-                    "crypto/include",
                 ],
             "test/sm2_internal_test.o" =>
                 [
                     "include",
-                    "crypto/include",
                 ],
             "test/sm4_internal_test.o" =>
                 [
                     ".",
                     "include",
-                    "crypto/include",
                 ],
             "test/srptest.o" =>
                 [
@@ -9936,6 +9285,10 @@ our %unified_info = (
                     ".",
                     "include",
                 ],
+            "test/ssl_ctx_test.o" =>
+                [
+                    "include",
+                ],
             "test/ssl_test.o" =>
                 [
                     "include",
@@ -9999,10 +9352,6 @@ our %unified_info = (
                 [
                     "include",
                 ],
-            "test/testutil/init.o" =>
-                [
-                    "include",
-                ],
             "test/testutil/main.o" =>
                 [
                     "include",
@@ -10031,6 +9380,10 @@ our %unified_info = (
                 [
                     "include",
                 ],
+            "test/testutil/testutil_init.o" =>
+                [
+                    "include",
+                ],
             "test/threadstest.o" =>
                 [
                     "include",
@@ -10295,6 +9648,7 @@ our %unified_info = (
             "test/sm4_internal_test",
             "test/srptest",
             "test/ssl_cert_table_internal_test",
+            "test/ssl_ctx_test",
             "test/ssl_test",
             "test/ssl_test_ctx_test",
             "test/sslapitest",
@@ -15250,7 +14604,6 @@ our %unified_info = (
                     "test/testutil/cb.o",
                     "test/testutil/driver.o",
                     "test/testutil/format_output.o",
-                    "test/testutil/init.o",
                     "test/testutil/main.o",
                     "test/testutil/output_helpers.o",
                     "test/testutil/random.o",
@@ -15258,6 +14611,7 @@ our %unified_info = (
                     "test/testutil/tap_bio.o",
                     "test/testutil/test_cleanup.o",
                     "test/testutil/tests.o",
+                    "test/testutil/testutil_init.o",
                 ],
             "test/md2test" =>
                 [
@@ -15485,6 +14839,14 @@ our %unified_info = (
                 [
                     "test/ssl_cert_table_internal_test.c",
                 ],
+            "test/ssl_ctx_test" =>
+                [
+                    "test/ssl_ctx_test.o",
+                ],
+            "test/ssl_ctx_test.o" =>
+                [
+                    "test/ssl_ctx_test.c",
+                ],
             "test/ssl_test" =>
                 [
                     "test/handshake_helper.o",
@@ -15587,10 +14949,6 @@ our %unified_info = (
                 [
                     "test/testutil/format_output.c",
                 ],
-            "test/testutil/init.o" =>
-                [
-                    "test/testutil/init.c",
-                ],
             "test/testutil/main.o" =>
                 [
                     "test/testutil/main.c",
@@ -15619,6 +14977,10 @@ our %unified_info = (
                 [
                     "test/testutil/tests.c",
                 ],
+            "test/testutil/testutil_init.o" =>
+                [
+                    "test/testutil/testutil_init.c",
+                ],
             "test/threadstest" =>
                 [
                     "test/threadstest.o",
diff --git a/deps/openssl/config/archs/linux-ppc/asm/crypto/bn/ppc64-mont.s b/deps/openssl/config/archs/linux-ppc/asm/crypto/bn/ppc64-mont.s
deleted file mode 100644
index 774b4c4dea..0000000000
--- a/deps/openssl/config/archs/linux-ppc/asm/crypto/bn/ppc64-mont.s
+++ /dev/null
@@ -1,969 +0,0 @@
-.machine	"any"
-.text
-
-.globl	bn_mul_mont_fpu64
-.type	bn_mul_mont_fpu64,@function
-.align	5
-bn_mul_mont_fpu64:
-	cmpwi	8,6
-	mr	9,3
-	li	3,0
-	.long	0x4dc00020
-	andi.	0,8,3
-	.long	0x4cc20020
-
-	slwi	8,8,2
-	li	12,-4096
-	slwi	10,8,2
-	add	10,10,8
-	addi	10,10,488
-	subf	10,10,1
-	and	10,10,12
-	subf	10,1,10
-	mr	12,1
-	stwux	1,1,10
-
-	stw	19,-148(12)
-	stw	20,-144(12)
-	stw	21,-140(12)
-	stw	22,-136(12)
-	stw	23,-132(12)
-	stw	24,-128(12)
-	stw	25,-124(12)
-	stw	26,-120(12)
-	stw	27,-116(12)
-	stw	28,-112(12)
-	stw	29,-108(12)
-	stw	30,-104(12)
-	stw	31,-100(12)
-	stfd	20,-96(12)
-	stfd	21,-88(12)
-	stfd	22,-80(12)
-	stfd	23,-72(12)
-	stfd	24,-64(12)
-	stfd	25,-56(12)
-	stfd	26,-48(12)
-	stfd	27,-40(12)
-	stfd	28,-32(12)
-	stfd	29,-24(12)
-	stfd	30,-16(12)
-	stfd	31,-8(12)
-
-	addi	10,1,264
-	li	12,-64
-	add	22,10,8
-	and	22,22,12
-
-	addi	22,22,-8
-	srwi	11,8,4
-	addi	11,11,-1
-	addi	10,1,184
-	li	0,0
-	mtctr	11
-	lwz	23,0(4)
-	mr	20,7
-	lwz	21,4(4)
-	li	19,0
-	lwz	25,0(5)
-	lwz	27,4(5)
-	lwz	7,0(20)
-	lwz	20,4(20)
-
-	mullw	28,23,25
-	mulhwu	29,23,25
-	mullw	30,21,25
-	mullw	31,23,27
-	add	29,29,30
-	add	29,29,31
-
-	extrwi	24,25,16,16
-	extrwi	25,25,16,0
-	extrwi	26,27,16,16
-	extrwi	27,27,16,0
-	std	24,64(1)
-	std	25,72(1)
-	std	26,80(1)
-	std	27,88(1)
-
-	mullw	24,28,7
-	mulhwu	25,28,7
-	mullw	26,29,7
-	mullw	27,28,20
-	add	25,25,26
-	add	25,25,27
-
-	extrwi	28,24,16,16
-	extrwi	29,24,16,0
-	extrwi	30,25,16,16
-	extrwi	31,25,16,0
-	std	28,96(1)
-	std	29,104(1)
-	std	30,112(1)
-	std	31,120(1)
-
-	mr	24,23
-	mr	25,21
-	lwz	26,8(4)
-	lwz	27,12(4)
-	lwz	28,0(6)
-	lwz	29,4(6)
-	lwz	30,8(6)
-	lwz	31,12(6)
-	lfd	0,64(1)
-	lfd	1,72(1)
-	lfd	2,80(1)
-	lfd	3,88(1)
-	lfd	4,96(1)
-	lfd	5,104(1)
-	lfd	6,112(1)
-	lfd	7,120(1)
-	std	24,128(1)
-	std	25,136(1)
-	std	26,144(1)
-	std	27,152(1)
-	std	28,160(1)
-	std	29,168(1)
-	std	30,176(1)
-	std	31,184(1)
-	fcfid	0,0
-	fcfid	1,1
-	fcfid	2,2
-	fcfid	3,3
-	fcfid	4,4
-	fcfid	5,5
-	fcfid	6,6
-	fcfid	7,7
-
-	lfd	10,128(1)
-	lfd	11,136(1)
-	lfd	12,144(1)
-	lfd	13,152(1)
-	lfd	20,160(1)
-	lfd	21,168(1)
-	lfd	22,176(1)
-	lfd	23,184(1)
-	fcfid	10,10
-	fcfid	11,11
-	fcfid	12,12
-	fcfid	13,13
-	fcfid	20,20
-	fcfid	21,21
-	fcfid	22,22
-	fcfid	23,23
-	addi	4,4,16
-	addi	6,6,16
-
-	fmul	26,11,0
-	fmul	27,11,1
-	stfd	10,8(22)
-	stfd	11,16(22)
-	fmul	28,12,0
-	fmul	29,12,1
-	stfd	12,24(22)
-	stfd	13,32(22)
-	fmul	30,13,0
-	fmul	31,13,1
-	stfd	20,40(22)
-	stfd	21,48(22)
-	fmul	24,10,0
-	fmul	25,10,1
-	stfd	22,56(22)
-	stfdu	23,64(22)
-
-	fmadd	26,10,2,26
-	fmadd	27,10,3,27
-	fmadd	28,11,2,28
-	fmadd	29,11,3,29
-	fmadd	30,12,2,30
-	fmadd	31,12,3,31
-	fmul	8,13,2
-	fmul	9,13,3
-
-	fmadd	26,21,4,26
-	fmadd	27,21,5,27
-	fmadd	28,22,4,28
-	fmadd	29,22,5,29
-	fmadd	30,23,4,30
-	fmadd	31,23,5,31
-	fmadd	24,20,4,24
-	fmadd	25,20,5,25
-
-	fmadd	26,20,6,26
-	fmadd	27,20,7,27
-	fmadd	28,21,6,28
-	fmadd	29,21,7,29
-	fmadd	30,22,6,30
-	fmadd	31,22,7,31
-	fmadd	8,23,6,8
-	fmadd	9,23,7,9
-
-	fctid	24,24
-	fctid	25,25
-	fctid	26,26
-	fctid	27,27
-	fctid	28,28
-	fctid	29,29
-	fctid	30,30
-	fctid	31,31
-
-	stfd	24,64(1)
-	stfd	25,72(1)
-	stfd	26,80(1)
-	stfd	27,88(1)
-	stfd	28,96(1)
-	stfd	29,104(1)
-	stfd	30,112(1)
-	stfd	31,120(1)
-
-.align	5
-.L1st:
-	lwz	24,0(4)
-	lwz	25,4(4)
-	lwz	26,8(4)
-	lwz	27,12(4)
-	lwz	28,0(6)
-	lwz	29,4(6)
-	lwz	30,8(6)
-	lwz	31,12(6)
-	std	24,128(1)
-	std	25,136(1)
-	std	26,144(1)
-	std	27,152(1)
-	std	28,160(1)
-	std	29,168(1)
-	std	30,176(1)
-	std	31,184(1)
-	lwz	25,64(1)
-	lwz	24,68(1)
-	lwz	27,72(1)
-	lwz	26,76(1)
-	lwz	29,80(1)
-	lwz	28,84(1)
-	lwz	31,88(1)
-	lwz	30,92(1)
-	lfd	10,128(1)
-	lfd	11,136(1)
-	lfd	12,144(1)
-	lfd	13,152(1)
-	lfd	20,160(1)
-	lfd	21,168(1)
-	lfd	22,176(1)
-	lfd	23,184(1)
-	fcfid	10,10
-	fcfid	11,11
-	fcfid	12,12
-	fcfid	13,13
-	fcfid	20,20
-	fcfid	21,21
-	fcfid	22,22
-	fcfid	23,23
-	addi	4,4,16
-	addi	6,6,16
-
-	fmul	26,11,0
-	fmul	27,11,1
-	fmul	28,12,0
-	fmul	29,12,1
-	stfd	10,8(22)
-	stfd	11,16(22)
-	fmul	30,13,0
-	fmul	31,13,1
-	fmadd	24,10,0,8
-	fmadd	25,10,1,9
-	stfd	12,24(22)
-	stfd	13,32(22)
-	fmadd	26,10,2,26
-	fmadd	27,10,3,27
-	addc	24,24,0
-	adde	25,25,19
-	srwi	0,24,16
-	fmadd	28,11,2,28
-	fmadd	29,11,3,29
-	stfd	20,40(22)
-	stfd	21,48(22)
-	srwi	19,25,16
-	insrwi	0,25,16,0
-	fmadd	30,12,2,30
-	fmadd	31,12,3,31
-	addc	26,26,0
-	adde	27,27,19
-	srwi	0,26,16
-	fmul	8,13,2
-	fmul	9,13,3
-	stfd	22,56(22)
-	stfdu	23,64(22)
-	insrwi	24,26,16,0
-	srwi	19,27,16
-	insrwi	0,27,16,0
-
-	fmadd	26,21,4,26
-	fmadd	27,21,5,27
-	lwz	27,96(1)
-	lwz	26,100(1)
-	addc	28,28,0
-	adde	29,29,19
-	srwi	0,28,16
-	fmadd	28,22,4,28
-	fmadd	29,22,5,29
-	srwi	19,29,16
-	insrwi	0,29,16,0
-	fmadd	30,23,4,30
-	fmadd	31,23,5,31
-	addc	30,30,0
-	adde	31,31,19
-	srwi	0,30,16
-	fmadd	24,20,4,24
-	fmadd	25,20,5,25
-	insrwi	28,30,16,0
-	srwi	19,31,16
-	insrwi	0,31,16,0
-
-	fmadd	26,20,6,26
-	fmadd	27,20,7,27
-	lwz	31,104(1)
-	lwz	30,108(1)
-	addc	26,26,0
-	adde	27,27,19
-	srwi	0,26,16
-	fmadd	28,21,6,28
-	fmadd	29,21,7,29
-	stw	24,12(10)
-	stw	28,8(10)
-	srwi	19,27,16
-	insrwi	0,27,16,0
-	fmadd	30,22,6,30
-	fmadd	31,22,7,31
-	lwz	25,112(1)
-	lwz	24,116(1)
-	addc	30,30,0
-	adde	31,31,19
-	srwi	0,30,16
-	fmadd	8,23,6,8
-	fmadd	9,23,7,9
-	insrwi	26,30,16,0
-	srwi	19,31,16
-	insrwi	0,31,16,0
-
-	fctid	24,24
-	fctid	25,25
-	lwz	29,120(1)
-	lwz	28,124(1)
-	addc	24,24,0
-	adde	25,25,19
-	srwi	0,24,16
-	fctid	26,26
-	fctid	27,27
-	srwi	19,25,16
-	insrwi	0,25,16,0
-	fctid	28,28
-	fctid	29,29
-	addc	28,28,0
-	adde	29,29,19
-	srwi	0,28,16
-	fctid	30,30
-	fctid	31,31
-	insrwi	24,28,16,0
-	srwi	19,29,16
-	insrwi	0,29,16,0
-
-	stfd	24,64(1)
-	stfd	25,72(1)
-	stfd	26,80(1)
-	stfd	27,88(1)
-	stfd	28,96(1)
-	stfd	29,104(1)
-	stfd	30,112(1)
-	stfd	31,120(1)
-	stw	26,20(10)
-	stwu	24,16(10)
-	bdnz	.L1st
-
-	fctid	8,8
-	fctid	9,9
-	lwz	25,64(1)
-	lwz	24,68(1)
-	lwz	27,72(1)
-	lwz	26,76(1)
-	lwz	29,80(1)
-	lwz	28,84(1)
-	lwz	31,88(1)
-	lwz	30,92(1)
-	stfd	8,128(1)
-	stfd	9,136(1)
-
-	addc	24,24,0
-	adde	25,25,19
-	srwi	0,24,16
-	insrwi	0,25,16,0
-	srwi	19,25,16
-	addc	26,26,0
-	adde	27,27,19
-	srwi	0,26,16
-	insrwi	24,26,16,0
-	insrwi	0,27,16,0
-	srwi	19,27,16
-	addc	28,28,0
-	adde	29,29,19
-	srwi	0,28,16
-	insrwi	0,29,16,0
-	srwi	19,29,16
-	addc	30,30,0
-	adde	31,31,19
-	srwi	0,30,16
-	insrwi	28,30,16,0
-	insrwi	0,31,16,0
-	srwi	19,31,16
-	stw	24,12(10)
-	stw	28,8(10)
-
-	lwz	27,96(1)
-	lwz	26,100(1)
-	lwz	31,104(1)
-	lwz	30,108(1)
-	lwz	25,112(1)
-	lwz	24,116(1)
-	lwz	29,120(1)
-	lwz	28,124(1)
-
-	addc	26,26,0
-	adde	27,27,19
-	srwi	0,26,16
-	insrwi	0,27,16,0
-	srwi	19,27,16
-	addc	30,30,0
-	adde	31,31,19
-	srwi	0,30,16
-	insrwi	26,30,16,0
-	insrwi	0,31,16,0
-	srwi	19,31,16
-	addc	24,24,0
-	adde	25,25,19
-	srwi	0,24,16
-	insrwi	0,25,16,0
-	srwi	19,25,16
-	addc	28,28,0
-	adde	29,29,19
-	srwi	0,28,16
-	insrwi	24,28,16,0
-	insrwi	0,29,16,0
-	srwi	19,29,16
-	stw	26,20(10)
-	stwu	24,16(10)
-
-	lwz	31,128(1)
-	lwz	30,132(1)
-	lwz	29,136(1)
-	lwz	28,140(1)
-
-	addc	30,30,0
-	adde	31,31,19
-	srwi	0,30,16
-	insrwi	0,31,16,0
-	srwi	19,31,16
-	addc	28,28,0
-	adde	29,29,19
-
-	insrwi	30,28,16,0
-	srwi	28,28,16
-	insrwi	28,29,16,0
-	srwi	3,29,16
-	stw	30,12(10)
-	stw	28,8(10)
-	slwi	31,8,2
-	subf	22,31,22
-
-	li	12,8
-.align	5
-.Louter:
-	addi	10,1,192
-	li	0,0
-	mtctr	11
-	add	24,5,12
-	li	19,0
-	lwz	25,0(24)
-	lwz	27,4(24)
-
-	mullw	28,23,25
-	lwz	24,204(1)
-	mulhwu	29,23,25
-	lwz	26,200(1)
-	mullw	30,21,25
-	mullw	31,23,27
-	add	29,29,30
-	add	29,29,31
-	addc	28,28,24
-	adde	29,29,26
-
-	extrwi	24,25,16,16
-	extrwi	25,25,16,0
-	extrwi	26,27,16,16
-	extrwi	27,27,16,0
-	std	24,64(1)
-	std	25,72(1)
-	std	26,80(1)
-	std	27,88(1)
-
-	mullw	24,28,7
-	mulhwu	25,28,7
-	mullw	26,29,7
-	mullw	27,28,20
-	add	25,25,26
-	add	25,25,27
-
-	extrwi	28,24,16,16
-	extrwi	29,24,16,0
-	extrwi	30,25,16,16
-	extrwi	31,25,16,0
-	std	28,96(1)
-	std	29,104(1)
-	std	30,112(1)
-	std	31,120(1)
-	lfd	10,8(22)
-	lfd	11,16(22)
-	lfd	12,24(22)
-	lfd	13,32(22)
-	lfd	20,40(22)
-	lfd	21,48(22)
-	lfd	22,56(22)
-	lfdu	23,64(22)
-
-	lfd	0,64(1)
-	lfd	1,72(1)
-	lfd	2,80(1)
-	lfd	3,88(1)
-	lfd	4,96(1)
-	lfd	5,104(1)
-	lfd	6,112(1)
-	lfd	7,120(1)
-
-	fcfid	0,0
-	fcfid	1,1
-	fcfid	2,2
-	fcfid	3,3
-	fcfid	4,4
-	fcfid	5,5
-	fcfid	6,6
-	fcfid	7,7
-
-	fmul	26,11,0
-	fmul	27,11,1
-	fmul	28,12,0
-	fmul	29,12,1
-	fmul	30,13,0
-	fmul	31,13,1
-	fmul	24,10,0
-	fmul	25,10,1
-
-	fmadd	26,10,2,26
-	fmadd	27,10,3,27
-	fmadd	28,11,2,28
-	fmadd	29,11,3,29
-	fmadd	30,12,2,30
-	fmadd	31,12,3,31
-	fmul	8,13,2
-	fmul	9,13,3
-
-	fmadd	26,21,4,26
-	fmadd	27,21,5,27
-	lfd	10,8(22)
-	lfd	11,16(22)
-	fmadd	28,22,4,28
-	fmadd	29,22,5,29
-	lfd	12,24(22)
-	lfd	13,32(22)
-	fmadd	30,23,4,30
-	fmadd	31,23,5,31
-	fmadd	24,20,4,24
-	fmadd	25,20,5,25
-
-	fmadd	26,20,6,26
-	fmadd	27,20,7,27
-	fmadd	28,21,6,28
-	fmadd	29,21,7,29
-	fmadd	30,22,6,30
-	fmadd	31,22,7,31
-	fmadd	8,23,6,8
-	fmadd	9,23,7,9
-
-	fctid	24,24
-	fctid	25,25
-	fctid	26,26
-	fctid	27,27
-	fctid	28,28
-	fctid	29,29
-	fctid	30,30
-	fctid	31,31
-
-	stfd	24,64(1)
-	stfd	25,72(1)
-	stfd	26,80(1)
-	stfd	27,88(1)
-	stfd	28,96(1)
-	stfd	29,104(1)
-	stfd	30,112(1)
-	stfd	31,120(1)
-
-.align	5
-.Linner:
-	fmul	26,11,0
-	fmul	27,11,1
-	fmul	28,12,0
-	fmul	29,12,1
-	lfd	20,40(22)
-	lfd	21,48(22)
-	fmul	30,13,0
-	fmul	31,13,1
-	fmadd	24,10,0,8
-	fmadd	25,10,1,9
-	lfd	22,56(22)
-	lfdu	23,64(22)
-
-	fmadd	26,10,2,26
-	fmadd	27,10,3,27
-	fmadd	28,11,2,28
-	fmadd	29,11,3,29
-	lfd	10,8(22)
-	lfd	11,16(22)
-	fmadd	30,12,2,30
-	fmadd	31,12,3,31
-	fmul	8,13,2
-	fmul	9,13,3
-	lfd	12,24(22)
-	lfd	13,32(22)
-	fmadd	26,21,4,26
-	fmadd	27,21,5,27
-	lwz	25,64(1)
-	lwz	24,68(1)
-	fmadd	28,22,4,28
-	fmadd	29,22,5,29
-	lwz	27,72(1)
-	lwz	26,76(1)
-	fmadd	30,23,4,30
-	fmadd	31,23,5,31
-	lwz	29,80(1)
-	lwz	28,84(1)
-	addc	24,24,0
-	adde	25,25,19
-	srwi	0,24,16
-	fmadd	24,20,4,24
-	fmadd	25,20,5,25
-	lwz	31,88(1)
-	lwz	30,92(1)
-	srwi	19,25,16
-	insrwi	0,25,16,0
-
-	fmadd	26,20,6,26
-	fmadd	27,20,7,27
-	addc	26,26,0
-	adde	27,27,19
-	srwi	0,26,16
-	fmadd	28,21,6,28
-	fmadd	29,21,7,29
-	insrwi	24,26,16,0
-	srwi	19,27,16
-	insrwi	0,27,16,0
-	fmadd	30,22,6,30
-	fmadd	31,22,7,31
-	lwz	26,12(10)
-	lwz	27,8(10)
-	addc	28,28,0
-	adde	29,29,19
-	srwi	0,28,16
-	fmadd	8,23,6,8
-	fmadd	9,23,7,9
-	srwi	19,29,16
-	insrwi	0,29,16,0
-
-	fctid	24,24
-	addc	30,30,0
-	adde	31,31,19
-	srwi	0,30,16
-	fctid	25,25
-	insrwi	28,30,16,0
-	srwi	19,31,16
-	insrwi	0,31,16,0
-	fctid	26,26
-	addc	24,24,26
-	adde	28,28,27
-	lwz	27,96(1)
-	lwz	26,100(1)
-	fctid	27,27
-	addze	0,0
-	addze	19,19
-	stw	24,4(10)
-	stw	28,0(10)
-	fctid	28,28
-	addc	26,26,0
-	adde	27,27,19
-	srwi	0,26,16
-	lwz	31,104(1)
-	lwz	30,108(1)
-	fctid	29,29
-	srwi	19,27,16
-	insrwi	0,27,16,0
-	lwz	25,112(1)
-	lwz	24,116(1)
-	fctid	30,30
-	addc	30,30,0
-	adde	31,31,19
-	srwi	0,30,16
-	lwz	29,120(1)
-	lwz	28,124(1)
-	fctid	31,31
-
-	insrwi	26,30,16,0
-	insrwi	0,31,16,0
-	srwi	19,31,16
-	lwz	30,20(10)
-	lwzu	31,16(10)
-	addc	24,24,0
-	stfd	24,64(1)
-	adde	25,25,19
-	srwi	0,24,16
-	stfd	25,72(1)
-	insrwi	0,25,16,0
-	srwi	19,25,16
-	addc	28,28,0
-	stfd	26,80(1)
-	adde	29,29,19
-	srwi	0,28,16
-	insrwi	24,28,16,0
-	stfd	27,88(1)
-	insrwi	0,29,16,0
-	srwi	19,29,16
-
-	addc	26,26,30
-	stfd	28,96(1)
-	adde	24,24,31
-	stfd	29,104(1)
-	addze	0,0
-	stfd	30,112(1)
-	addze	19,19
-	stfd	31,120(1)
-	stw	26,-4(10)
-	stw	24,-8(10)
-	bdnz	.Linner
-
-	fctid	8,8
-	fctid	9,9
-	lwz	25,64(1)
-	lwz	24,68(1)
-	lwz	27,72(1)
-	lwz	26,76(1)
-	lwz	29,80(1)
-	lwz	28,84(1)
-	lwz	31,88(1)
-	lwz	30,92(1)
-	stfd	8,128(1)
-	stfd	9,136(1)
-
-	addc	24,24,0
-	adde	25,25,19
-	srwi	0,24,16
-	insrwi	0,25,16,0
-	srwi	19,25,16
-	addc	26,26,0
-	adde	27,27,19
-	srwi	0,26,16
-	insrwi	24,26,16,0
-	lwz	26,12(10)
-	insrwi	0,27,16,0
-	srwi	19,27,16
-	lwz	27,8(10)
-	addc	28,28,0
-	adde	29,29,19
-	srwi	0,28,16
-	insrwi	0,29,16,0
-	srwi	19,29,16
-	addc	30,30,0
-	adde	31,31,19
-	srwi	0,30,16
-	insrwi	28,30,16,0
-	insrwi	0,31,16,0
-	srwi	19,31,16
-
-	addc	24,24,26
-	adde	28,28,27
-	addze	0,0
-	addze	19,19
-	stw	24,4(10)
-	stw	28,0(10)
-
-	lwz	27,96(1)
-	lwz	26,100(1)
-	lwz	31,104(1)
-	lwz	30,108(1)
-	lwz	25,112(1)
-	lwz	24,116(1)
-	lwz	29,120(1)
-	lwz	28,124(1)
-
-	addc	26,26,0
-	adde	27,27,19
-	srwi	0,26,16
-	insrwi	0,27,16,0
-	srwi	19,27,16
-	addc	30,30,0
-	adde	31,31,19
-	srwi	0,30,16
-	insrwi	26,30,16,0
-	lwz	30,20(10)
-	insrwi	0,31,16,0
-	srwi	19,31,16
-	lwzu	31,16(10)
-	addc	24,24,0
-	adde	25,25,19
-	srwi	0,24,16
-	insrwi	0,25,16,0
-	srwi	19,25,16
-	addc	28,28,0
-	adde	29,29,19
-	srwi	0,28,16
-	insrwi	24,28,16,0
-	insrwi	0,29,16,0
-	srwi	19,29,16
-
-	addc	26,26,30
-	adde	24,24,31
-	lwz	31,128(1)
-	lwz	30,132(1)
-	addze	0,0
-	addze	19,19
-	lwz	29,136(1)
-	lwz	28,140(1)
-
-	addc	30,30,0
-	adde	31,31,19
-	stw	26,-4(10)
-	stw	24,-8(10)
-	addc	30,30,3
-	addze	31,31
-	srwi	0,30,16
-	insrwi	0,31,16,0
-	srwi	19,31,16
-	addc	28,28,0
-	adde	29,29,19
-
-	insrwi	30,28,16,0
-	srwi	28,28,16
-	insrwi	28,29,16,0
-	srwi	3,29,16
-	stw	30,4(10)
-	stw	28,0(10)
-	slwi	31,8,2
-	addi	12,12,8
-	subf	22,31,22
-	cmpw	12,8
-	blt-	.Louter
-	subf	6,8,6
-	addi	11,11,1
-	subfc	12,12,12
-	addi	10,1,192
-	addi	6,6,-4
-	addi	9,9,-4
-	addi	4,1,196
-	mtctr	11
-
-.align	4
-.Lsub:	lwz	24,12(10)
-	lwz	25,8(10)
-	lwz	26,20(10)
-	lwzu	27,16(10)
-	lwz	28,4(6)
-	lwz	29,8(6)
-	lwz	30,12(6)
-	lwzu	31,16(6)
-	subfe	28,28,24
-	stw	24,4(4)
-	subfe	29,29,25
-	stw	25,8(4)
-	subfe	30,30,26
-	stw	26,12(4)
-	subfe	31,31,27
-	stwu	27,16(4)
-	stw	28,4(9)
-	stw	29,8(9)
-	stw	30,12(9)
-	stwu	31,16(9)
-	bdnz	.Lsub
-
-	li	12,0
-	subfe	3,12,3
-	addi	4,1,196
-	subf	9,8,9
-	addi	10,1,192
-	mtctr	11
-
-.align	4
-.Lcopy:
-	lwz	24,4(4)
-	lwz	25,8(4)
-	lwz	26,12(4)
-	lwzu	27,16(4)
-	lwz	28,4(9)
-	lwz	29,8(9)
-	lwz	30,12(9)
-	lwz	31,16(9)
-	std	12,8(22)
-	std	12,16(22)
-	std	12,24(22)
-	std	12,32(22)
-	std	12,40(22)
-	std	12,48(22)
-	std	12,56(22)
-	stdu	12,64(22)
-	and	24,24,3
-	and	25,25,3
-	and	26,26,3
-	and	27,27,3
-	andc	28,28,3
-	andc	29,29,3
-	andc	30,30,3
-	andc	31,31,3
-	or	24,24,28
-	or	25,25,29
-	or	26,26,30
-	or	27,27,31
-	stw	24,4(9)
-	stw	25,8(9)
-	stw	26,12(9)
-	stwu	27,16(9)
-	std	12,8(10)
-	stdu	12,16(10)
-	bdnz	.Lcopy
-	lwz	12,0(1)
-	li	3,1
-	lwz	19,-148(12)
-	lwz	20,-144(12)
-	lwz	21,-140(12)
-	lwz	22,-136(12)
-	lwz	23,-132(12)
-	lwz	24,-128(12)
-	lwz	25,-124(12)
-	lwz	26,-120(12)
-	lwz	27,-116(12)
-	lwz	28,-112(12)
-	lwz	29,-108(12)
-	lwz	30,-104(12)
-	lwz	31,-100(12)
-	lfd	20,-96(12)
-	lfd	21,-88(12)
-	lfd	22,-80(12)
-	lfd	23,-72(12)
-	lfd	24,-64(12)
-	lfd	25,-56(12)
-	lfd	26,-48(12)
-	lfd	27,-40(12)
-	lfd	28,-32(12)
-	lfd	29,-24(12)
-	lfd	30,-16(12)
-	lfd	31,-8(12)
-	mr	1,12
-	blr	
-.long	0
-.byte	0,12,4,0,0x8c,13,6,0
-.long	0
-.size	bn_mul_mont_fpu64,.-bn_mul_mont_fpu64
-
-.byte	77,111,110,116,103,111,109,101,114,121,32,77,117,108,116,105,112,108,105,99,97,116,105,111,110,32,102,111,114,32,80,80,67,54,52,44,32,67,82,89,80,84,79,71,65,77,83,32,98,121,32,60,97,112,112,114,111,64,111,112,101,110,115,115,108,46,111,114,103,62,0
-.align	2
diff --git a/deps/openssl/config/archs/linux-ppc/asm/crypto/buildinf.h b/deps/openssl/config/archs/linux-ppc/asm/crypto/buildinf.h
index af759c6bda..1072f9d311 100644
--- a/deps/openssl/config/archs/linux-ppc/asm/crypto/buildinf.h
+++ b/deps/openssl/config/archs/linux-ppc/asm/crypto/buildinf.h
@@ -11,7 +11,7 @@
  */
 
 #define PLATFORM "platform: linux-ppc"
-#define DATE "built on: Fri Sep 13 16:00:48 2019 UTC"
+#define DATE "built on: Wed Mar 18 21:07:41 2020 UTC"
 
 /*
  * Generate compiler_flags as an array of individual characters. This is a
diff --git a/deps/openssl/config/archs/linux-ppc/asm/crypto/include/internal/bn_conf.h b/deps/openssl/config/archs/linux-ppc/asm/crypto/include/internal/bn_conf.h
index fb52156bd0..459055c96f 100644
--- a/deps/openssl/config/archs/linux-ppc/asm/crypto/include/internal/bn_conf.h
+++ b/deps/openssl/config/archs/linux-ppc/asm/crypto/include/internal/bn_conf.h
@@ -1,5 +1,5 @@
 /* WARNING: do not edit! */
-/* Generated by Makefile from crypto/include/internal/bn_conf.h.in */
+/* Generated by Makefile from include/crypto/bn_conf.h.in */
 /*
  * Copyright 2016 The OpenSSL Project Authors. All Rights Reserved.
  *
@@ -9,8 +9,8 @@
  * https://www.openssl.org/source/license.html
  */
 
-#ifndef HEADER_BN_CONF_H
-# define HEADER_BN_CONF_H
+#ifndef OSSL_CRYPTO_BN_CONF_H
+# define OSSL_CRYPTO_BN_CONF_H
 
 /*
  * The contents of this file are not used in the UEFI build, as
diff --git a/deps/openssl/config/archs/linux-ppc/asm/crypto/include/internal/dso_conf.h b/deps/openssl/config/archs/linux-ppc/asm/crypto/include/internal/dso_conf.h
index 252266ec2a..4b1167c3d8 100644
--- a/deps/openssl/config/archs/linux-ppc/asm/crypto/include/internal/dso_conf.h
+++ b/deps/openssl/config/archs/linux-ppc/asm/crypto/include/internal/dso_conf.h
@@ -1,5 +1,5 @@
 /* WARNING: do not edit! */
-/* Generated by Makefile from crypto/include/internal/dso_conf.h.in */
+/* Generated by Makefile from include/crypto/dso_conf.h.in */
 /*
  * Copyright 2016-2019 The OpenSSL Project Authors. All Rights Reserved.
  *
@@ -9,8 +9,8 @@
  * https://www.openssl.org/source/license.html
  */
 
-#ifndef HEADER_DSO_CONF_H
-# define HEADER_DSO_CONF_H
+#ifndef OSSL_CRYPTO_DSO_CONF_H
+# define OSSL_CRYPTO_DSO_CONF_H
 # define DSO_DLFCN
 # define HAVE_DLFCN_H
 # define DSO_EXTENSION ".so"
diff --git a/deps/openssl/config/archs/linux-ppc/asm/include/openssl/opensslconf.h b/deps/openssl/config/archs/linux-ppc/asm/include/openssl/opensslconf.h
index 1a2b31bdc7..71c4fecc40 100644
--- a/deps/openssl/config/archs/linux-ppc/asm/include/openssl/opensslconf.h
+++ b/deps/openssl/config/archs/linux-ppc/asm/include/openssl/opensslconf.h
@@ -96,9 +96,6 @@ extern "C" {
 #ifndef OPENSSL_NO_DYNAMIC_ENGINE
 # define OPENSSL_NO_DYNAMIC_ENGINE
 #endif
-#ifndef OPENSSL_NO_AFALGENG
-# define OPENSSL_NO_AFALGENG
-#endif
 
 
 /*
diff --git a/deps/openssl/config/archs/linux-ppc/asm/include/progs.h b/deps/openssl/config/archs/linux-ppc/asm/include/progs.h
index 9b3d270e20..308c65601b 100644
--- a/deps/openssl/config/archs/linux-ppc/asm/include/progs.h
+++ b/deps/openssl/config/archs/linux-ppc/asm/include/progs.h
@@ -2,7 +2,7 @@
  * WARNING: do not edit!
  * Generated by apps/progs.pl
  *
- * Copyright 1995-2019 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 1995-2020 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
diff --git a/deps/openssl/config/archs/linux-ppc/asm_avx2/configdata.pm b/deps/openssl/config/archs/linux-ppc/asm_avx2/configdata.pm
index 65b50577c3..ae2648d219 100644
--- a/deps/openssl/config/archs/linux-ppc/asm_avx2/configdata.pm
+++ b/deps/openssl/config/archs/linux-ppc/asm_avx2/configdata.pm
@@ -55,7 +55,7 @@ our %config = (
   minor => "1.1",
   openssl_algorithm_defines => [ "OPENSSL_NO_COMP", "OPENSSL_NO_MD2", "OPENSSL_NO_RC5" ],
   openssl_api_defines => [  ],
-  openssl_other_defines => [ "OPENSSL_RAND_SEED_OS", "OPENSSL_NO_AFALGENG", "OPENSSL_NO_ASAN", "OPENSSL_NO_CRYPTO_MDEBUG", "OPENSSL_NO_CRYPTO_MDEBUG_BACKTRACE", "OPENSSL_NO_DEVCRYPTOENG", "OPENSSL_NO_EC_NISTP_64_GCC_128", "OPENSSL_NO_EGD", "OPENSSL_NO_EXTERNAL_TESTS", "OPENSSL_NO_FUZZ_AFL", "OPENSSL_NO_FUZZ_LIBFUZZER", "OPENSSL_NO_HEARTBEATS", "OPENSSL_NO_MSAN", "OPENSSL_NO_SCTP", "OPENSSL_NO_SSL3", "OPENSSL_NO_SSL3_METHOD", "OPENSSL_NO_UBSAN", "OPENSSL_NO_UNIT_TEST", "OPENSSL_NO_WEAK_SSL_CIPHERS", "OPENSSL_NO_DYNAMIC_ENGINE", "OPENSSL_NO_AFALGENG" ],
+  openssl_other_defines => [ "OPENSSL_RAND_SEED_OS", "OPENSSL_NO_AFALGENG", "OPENSSL_NO_ASAN", "OPENSSL_NO_CRYPTO_MDEBUG", "OPENSSL_NO_CRYPTO_MDEBUG_BACKTRACE", "OPENSSL_NO_DEVCRYPTOENG", "OPENSSL_NO_EC_NISTP_64_GCC_128", "OPENSSL_NO_EGD", "OPENSSL_NO_EXTERNAL_TESTS", "OPENSSL_NO_FUZZ_AFL", "OPENSSL_NO_FUZZ_LIBFUZZER", "OPENSSL_NO_HEARTBEATS", "OPENSSL_NO_MSAN", "OPENSSL_NO_SCTP", "OPENSSL_NO_SSL3", "OPENSSL_NO_SSL3_METHOD", "OPENSSL_NO_UBSAN", "OPENSSL_NO_UNIT_TEST", "OPENSSL_NO_WEAK_SSL_CIPHERS", "OPENSSL_NO_DYNAMIC_ENGINE" ],
   openssl_sys_defines => [  ],
   openssl_thread_defines => [ "OPENSSL_THREADS" ],
   openssldir => "",
@@ -111,8 +111,8 @@ our %config = (
   sourcedir => ".",
   target => "linux-ppc",
   tdirs => [ "ossl_shim" ],
-  version => "1.1.1d",
-  version_num => "0x1010104fL",
+  version => "1.1.1e",
+  version_num => "0x1010105fL",
 );
 
 our %target = (
@@ -239,6 +239,7 @@ our @disablables = (
   "dgram",
   "dh",
   "dsa",
+  "dso",
   "dtls",
   "dynamic-engine",
   "ec",
@@ -356,8 +357,8 @@ our %unified_info = (
         {
             "" =>
                 [
-                    "crypto/include/internal/bn_conf.h",
-                    "crypto/include/internal/dso_conf.h",
+                    "include/crypto/bn_conf.h",
+                    "include/crypto/dso_conf.h",
                     "include/openssl/opensslconf.h",
                 ],
             "apps/asn1pars.o" =>
@@ -625,14 +626,6 @@ our %unified_info = (
                     "crypto/perlasm/cbc.pl",
                     "crypto/perlasm/x86asm.pl",
                 ],
-            "crypto/include/internal/bn_conf.h" =>
-                [
-                    "configdata.pm",
-                ],
-            "crypto/include/internal/dso_conf.h" =>
-                [
-                    "configdata.pm",
-                ],
             "crypto/rc4/rc4-586.s" =>
                 [
                     "crypto/perlasm/x86asm.pl",
@@ -708,6 +701,14 @@ our %unified_info = (
                 [
                     "libcrypto",
                 ],
+            "include/crypto/bn_conf.h" =>
+                [
+                    "configdata.pm",
+                ],
+            "include/crypto/dso_conf.h" =>
+                [
+                    "configdata.pm",
+                ],
             "include/openssl/opensslconf.h" =>
                 [
                     "configdata.pm",
@@ -1505,6 +1506,12 @@ our %unified_info = (
                     "libcrypto",
                     "test/libtestutil.a",
                 ],
+            "test/ssl_ctx_test" =>
+                [
+                    "libcrypto",
+                    "libssl",
+                    "test/libtestutil.a",
+                ],
             "test/ssl_test" =>
                 [
                     "libcrypto",
@@ -3236,7 +3243,6 @@ our %unified_info = (
                             "test/testutil/cb.o",
                             "test/testutil/driver.o",
                             "test/testutil/format_output.o",
-                            "test/testutil/init.o",
                             "test/testutil/main.o",
                             "test/testutil/output_helpers.o",
                             "test/testutil/random.o",
@@ -3244,6 +3250,7 @@ our %unified_info = (
                             "test/testutil/tap_bio.o",
                             "test/testutil/test_cleanup.o",
                             "test/testutil/tests.o",
+                            "test/testutil/testutil_init.o",
                         ],
                     "products" =>
                         {
@@ -3742,14 +3749,6 @@ our %unified_info = (
                 [
                     "crypto/ia64cpuid.S",
                 ],
-            "crypto/include/internal/bn_conf.h" =>
-                [
-                    "crypto/include/internal/bn_conf.h.in",
-                ],
-            "crypto/include/internal/dso_conf.h" =>
-                [
-                    "crypto/include/internal/dso_conf.h.in",
-                ],
             "crypto/md5/md5-586.s" =>
                 [
                     "crypto/md5/asm/md5-586.pl",
@@ -4190,6 +4189,14 @@ our %unified_info = (
                     "engines/asm/e_padlock-x86_64.pl",
                     "\$(PERLASM_SCHEME)",
                 ],
+            "include/crypto/bn_conf.h" =>
+                [
+                    "include/crypto/bn_conf.h.in",
+                ],
+            "include/crypto/dso_conf.h" =>
+                [
+                    "include/crypto/dso_conf.h.in",
+                ],
             "include/openssl/opensslconf.h" =>
                 [
                     "include/openssl/opensslconf.h.in",
@@ -4876,7 +4883,6 @@ our %unified_info = (
             "crypto/aes/aes-ppc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/aes/aes-s390x.o" =>
@@ -4890,49 +4896,41 @@ our %unified_info = (
             "crypto/aes/aes_cbc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/aes/aes_cfb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/aes/aes_core.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/aes/aes_ecb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/aes/aes_ige.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/aes/aes_misc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/aes/aes_ofb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/aes/aes_wrap.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/aes/aesfx-sparcv9.o" =>
@@ -4942,7 +4940,6 @@ our %unified_info = (
             "crypto/aes/aesp8-ppc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/aes/aest4-sparcv9.o" =>
@@ -4960,13 +4957,11 @@ our %unified_info = (
             "crypto/aes/vpaes-ppc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/aria/aria.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/arm64cpuid.o" =>
@@ -4980,613 +4975,511 @@ our %unified_info = (
             "crypto/asn1/a_bitstr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_d2i_fp.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_digest.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_dup.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_gentm.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_i2d_fp.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_int.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_mbstr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_object.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_octet.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_print.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_sign.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_strex.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_strnid.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_time.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_type.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_utctm.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_utf8.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_verify.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/ameth_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/asn1_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/asn1_gen.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/asn1_item_list.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/asn1_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/asn1_par.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/asn_mime.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/asn_moid.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/asn_mstbl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/asn_pack.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/bio_asn1.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/bio_ndef.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/d2i_pr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/d2i_pu.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/evp_asn1.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/f_int.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/f_string.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/i2d_pr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/i2d_pu.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/n_pkey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/nsseq.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/p5_pbe.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/p5_pbev2.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/p5_scrypt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/p8_pkey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/t_bitst.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/t_pkey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/t_spki.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/tasn_dec.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/tasn_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/tasn_fre.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/tasn_new.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/tasn_prn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/tasn_scn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/tasn_typ.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/tasn_utl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/x_algor.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/x_bignum.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/x_info.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/x_int64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/x_long.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/x_pkey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/x_sig.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/x_spki.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/x_val.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/async/arch/async_null.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/async/arch/async_posix.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/async/arch/async_win.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/async/async.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/async/async_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/async/async_wait.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bf/bf_cfb64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bf/bf_ecb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bf/bf_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bf/bf_ofb64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bf/bf_skey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/b_addr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/b_dump.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/b_print.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/b_sock.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/b_sock2.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bf_buff.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bf_lbuf.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bf_nbio.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bf_null.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bio_cb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bio_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bio_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bio_meth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bss_acpt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bss_bio.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bss_conn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bss_dgram.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bss_fd.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bss_file.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bss_log.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bss_mem.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bss_null.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bss_sock.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/blake2/blake2b.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/blake2/blake2s.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/blake2/m_blake2b.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/blake2/m_blake2s.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/armv4-gf2m.o" =>
@@ -5604,188 +5497,157 @@ our %unified_info = (
             "crypto/bn/bn-ppc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_add.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_blind.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_const.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_ctx.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_depr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_dh.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_div.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_exp.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto",
                 ],
             "crypto/bn/bn_exp2.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_gcd.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_gf2m.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_intern.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_kron.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_mod.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_mont.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_mpi.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_mul.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_nist.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_prime.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_print.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_rand.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_recp.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_shift.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_sqr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_sqrt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_srp.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_word.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_x931p.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/mips-mont.o" =>
@@ -5795,7 +5657,6 @@ our %unified_info = (
             "crypto/bn/ppc-mont.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/sparct4-mont.o" =>
@@ -5821,13 +5682,11 @@ our %unified_info = (
             "crypto/buffer/buf_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/buffer/buffer.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/buildinf.h" =>
@@ -5837,43 +5696,36 @@ our %unified_info = (
             "crypto/camellia/camellia.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/camellia/cmll_cbc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/camellia/cmll_cfb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/camellia/cmll_ctr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/camellia/cmll_ecb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/camellia/cmll_misc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/camellia/cmll_ofb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/camellia/cmllt4-sparcv9.o" =>
@@ -5883,31 +5735,26 @@ our %unified_info = (
             "crypto/cast/c_cfb64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cast/c_ecb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cast/c_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cast/c_ofb64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cast/c_skey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/chacha/chacha-armv4.o" =>
@@ -5921,7 +5768,6 @@ our %unified_info = (
             "crypto/chacha/chacha-ppc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/chacha/chacha-s390x.o" =>
@@ -5931,272 +5777,227 @@ our %unified_info = (
             "crypto/cmac/cm_ameth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cmac/cm_pmeth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cmac/cmac.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_asn1.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_att.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_cd.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_dd.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_env.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_ess.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_io.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_kari.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_pwri.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_sd.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_smime.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/conf/conf_api.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/conf/conf_def.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/conf/conf_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/conf/conf_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/conf/conf_mall.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/conf/conf_mod.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/conf/conf_sap.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/conf/conf_ssl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cpt_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cryptlib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ct/ct_b64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ct/ct_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ct/ct_log.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ct/ct_oct.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ct/ct_policy.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ct/ct_prn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ct/ct_sct.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ct/ct_sct_ctx.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ct/ct_vfy.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ct/ct_x509v3.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ctype.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cversion.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto",
                 ],
             "crypto/des/cbc_cksm.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/cbc_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/cfb64ede.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/cfb64enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/cfb_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/des_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/dest4-sparcv9.o" =>
@@ -6206,301 +6007,251 @@ our %unified_info = (
             "crypto/des/ecb3_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/ecb_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/fcrypt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/fcrypt_b.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/ofb64ede.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/ofb64enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/ofb_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/pcbc_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/qud_cksm.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/rand_key.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/set_key.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/str2key.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/xcbc_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_ameth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_asn1.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_check.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_depr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_gen.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_kdf.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_key.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_meth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_pmeth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_prn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_rfc5114.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_rfc7919.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dsa/dsa_ameth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dsa/dsa_asn1.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dsa/dsa_depr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dsa/dsa_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dsa/dsa_gen.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dsa/dsa_key.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dsa/dsa_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dsa/dsa_meth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dsa/dsa_ossl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dsa/dsa_pmeth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dsa/dsa_prn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dsa/dsa_sign.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dsa/dsa_vrf.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dso/dso_dl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dso/dso_dlfcn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dso/dso_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dso/dso_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dso/dso_openssl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dso/dso_vms.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dso/dso_win32.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ebcdic.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/curve25519.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/curve448/arch_32/f_impl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto/ec/curve448/arch_32",
                     "crypto/ec/curve448",
@@ -6508,7 +6259,6 @@ our %unified_info = (
             "crypto/ec/curve448/curve448.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto/ec/curve448/arch_32",
                     "crypto/ec/curve448",
@@ -6516,7 +6266,6 @@ our %unified_info = (
             "crypto/ec/curve448/curve448_tables.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto/ec/curve448/arch_32",
                     "crypto/ec/curve448",
@@ -6524,7 +6273,6 @@ our %unified_info = (
             "crypto/ec/curve448/eddsa.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto/ec/curve448/arch_32",
                     "crypto/ec/curve448",
@@ -6532,7 +6280,6 @@ our %unified_info = (
             "crypto/ec/curve448/f_generic.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto/ec/curve448/arch_32",
                     "crypto/ec/curve448",
@@ -6540,7 +6287,6 @@ our %unified_info = (
             "crypto/ec/curve448/scalar.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto/ec/curve448/arch_32",
                     "crypto/ec/curve448",
@@ -6548,163 +6294,136 @@ our %unified_info = (
             "crypto/ec/ec2_oct.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec2_smpl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec_ameth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec_asn1.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec_check.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec_curve.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec_cvt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec_key.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec_kmeth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec_mult.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec_oct.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec_pmeth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec_print.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecdh_kdf.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecdh_ossl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecdsa_ossl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecdsa_sign.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecdsa_vrf.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/eck_prn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecp_mont.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecp_nist.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecp_nistp224.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecp_nistp256.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecp_nistp521.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecp_nistputil.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecp_nistz256-armv4.o" =>
@@ -6722,223 +6441,186 @@ our %unified_info = (
             "crypto/ec/ecp_oct.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecp_smpl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecx_meth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/eng_all.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/eng_cnf.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/eng_ctrl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/eng_dyn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/eng_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/eng_fat.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/eng_init.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/eng_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/eng_list.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/eng_openssl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/eng_pkey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/eng_rdrand.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/eng_table.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/tb_asnmth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/tb_cipher.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/tb_dh.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/tb_digest.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/tb_dsa.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/tb_eckey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/tb_pkmeth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/tb_rand.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/tb_rsa.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/err/err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/err/err_all.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/err/err_prn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/bio_b64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/bio_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/bio_md.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/bio_ok.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/c_allc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/c_alld.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/cmeth_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/digest.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/e_aes.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto",
                     "crypto/modes",
@@ -6946,21 +6628,18 @@ our %unified_info = (
             "crypto/evp/e_aes_cbc_hmac_sha1.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto/modes",
                 ],
             "crypto/evp/e_aes_cbc_hmac_sha256.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto/modes",
                 ],
             "crypto/evp/e_aria.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto",
                     "crypto/modes",
@@ -6968,13 +6647,11 @@ our %unified_info = (
             "crypto/evp/e_bf.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/e_camellia.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto",
                     "crypto/modes",
@@ -6982,81 +6659,68 @@ our %unified_info = (
             "crypto/evp/e_cast.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/e_chacha20_poly1305.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/e_des.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto",
                 ],
             "crypto/evp/e_des3.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto",
                 ],
             "crypto/evp/e_idea.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/e_null.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/e_old.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/e_rc2.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/e_rc4.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/e_rc4_hmac_md5.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/e_rc5.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/e_seed.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/e_sm4.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto",
                     "crypto/modes",
@@ -7064,328 +6728,267 @@ our %unified_info = (
             "crypto/evp/e_xcbc_d.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/encode.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/evp_cnf.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/evp_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/evp_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/evp_key.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/evp_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/evp_pbe.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/evp_pkey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/m_md2.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/m_md4.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/m_md5.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/m_md5_sha1.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/m_mdc2.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/m_null.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/m_ripemd.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/m_sha1.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/m_sha3.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto",
                 ],
             "crypto/evp/m_sigver.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/m_wp.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/names.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/p5_crpt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/p5_crpt2.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/p_dec.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/p_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/p_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/p_open.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/p_seal.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/p_sign.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/p_verify.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/pbe_scrypt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/pmeth_fn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/pmeth_gn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/pmeth_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ex_data.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/getenv.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/hmac/hm_ameth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/hmac/hm_pmeth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/hmac/hmac.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/idea/i_cbc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/idea/i_cfb64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/idea/i_ecb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/idea/i_ofb64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/idea/i_skey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
-            "crypto/include/internal/bn_conf.h" =>
-                [
-                    ".",
-                ],
-            "crypto/include/internal/dso_conf.h" =>
-                [
-                    ".",
-                ],
             "crypto/init.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/kdf/hkdf.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/kdf/kdf_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/kdf/scrypt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/kdf/tls1_prf.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/lhash/lh_stats.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/lhash/lhash.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/md4/md4_dgst.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/md4/md4_one.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/md5/md5-sparcv9.o" =>
@@ -7395,79 +6998,66 @@ our %unified_info = (
             "crypto/md5/md5_dgst.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/md5/md5_one.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/mdc2/mdc2_one.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/mdc2/mdc2dgst.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/mem.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/mem_dbg.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/mem_sec.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/modes/cbc128.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/modes/ccm128.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/modes/cfb128.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/modes/ctr128.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/modes/cts128.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/modes/gcm128.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto",
                 ],
@@ -7486,7 +7076,6 @@ our %unified_info = (
             "crypto/modes/ghashp8-ppc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/modes/ghashv8-armx.o" =>
@@ -7496,361 +7085,301 @@ our %unified_info = (
             "crypto/modes/ocb128.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/modes/ofb128.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/modes/wrap128.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/modes/xts128.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/o_dir.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/o_fips.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/o_fopen.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/o_init.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/o_str.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/o_time.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/objects/o_names.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/objects/obj_dat.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/objects/obj_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/objects/obj_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/objects/obj_xref.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ocsp/ocsp_asn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ocsp/ocsp_cl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ocsp/ocsp_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ocsp/ocsp_ext.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ocsp/ocsp_ht.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ocsp/ocsp_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ocsp/ocsp_prn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ocsp/ocsp_srv.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ocsp/ocsp_vfy.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ocsp/v3_ocsp.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pem/pem_all.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pem/pem_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pem/pem_info.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pem/pem_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pem/pem_oth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pem/pem_pk8.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pem/pem_pkey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pem/pem_sign.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pem/pem_x509.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pem/pem_xaux.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pem/pvkfmt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_add.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_asn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_attr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_crpt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_crt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_decr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_init.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_key.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_kiss.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_mutl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_npas.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_p8d.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_p8e.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_sbag.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_utl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/pk12err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs7/bio_pk7.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs7/pk7_asn1.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs7/pk7_attr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs7/pk7_doit.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs7/pk7_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs7/pk7_mime.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs7/pk7_smime.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs7/pkcs7err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/poly1305/poly1305-armv4.o" =>
@@ -7868,13 +7397,11 @@ our %unified_info = (
             "crypto/poly1305/poly1305-ppc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/poly1305/poly1305-ppcfp.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/poly1305/poly1305-sparcv9.o" =>
@@ -7884,271 +7411,226 @@ our %unified_info = (
             "crypto/poly1305/poly1305.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/poly1305/poly1305_ameth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/poly1305/poly1305_pmeth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ppccap.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ppccpuid.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rand/drbg_ctr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rand/drbg_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rand/rand_egd.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rand/rand_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rand/rand_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rand/rand_unix.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rand/rand_vms.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rand/rand_win.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rand/randfile.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rc2/rc2_cbc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rc2/rc2_ecb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rc2/rc2_skey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rc2/rc2cfb64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rc2/rc2ofb64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rc4/rc4_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rc4/rc4_skey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ripemd/rmd_dgst.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ripemd/rmd_one.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_ameth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_asn1.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_chk.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_crpt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_depr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_gen.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_meth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_mp.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_none.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_oaep.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_ossl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_pk1.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_pmeth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_prn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_pss.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_saos.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_sign.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_ssl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_x931.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_x931g.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/s390xcpuid.o" =>
@@ -8158,31 +7640,26 @@ our %unified_info = (
             "crypto/seed/seed.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/seed/seed_cbc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/seed/seed_cfb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/seed/seed_ecb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/seed/seed_ofb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sha/keccak1600-armv4.o" =>
@@ -8192,7 +7669,6 @@ our %unified_info = (
             "crypto/sha/keccak1600.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sha/sha1-armv4-large.o" =>
@@ -8210,7 +7686,6 @@ our %unified_info = (
             "crypto/sha/sha1-ppc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sha/sha1-s390x.o" =>
@@ -8224,13 +7699,11 @@ our %unified_info = (
             "crypto/sha/sha1_one.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sha/sha1dgst.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sha/sha256-armv4.o" =>
@@ -8248,7 +7721,6 @@ our %unified_info = (
             "crypto/sha/sha256-ppc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sha/sha256-s390x.o" =>
@@ -8262,13 +7734,11 @@ our %unified_info = (
             "crypto/sha/sha256.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sha/sha256p8-ppc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sha/sha512-armv4.o" =>
@@ -8286,7 +7756,6 @@ our %unified_info = (
             "crypto/sha/sha512-ppc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sha/sha512-s390x.o" =>
@@ -8300,715 +7769,596 @@ our %unified_info = (
             "crypto/sha/sha512.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sha/sha512p8-ppc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/siphash/siphash.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/siphash/siphash_ameth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/siphash/siphash_pmeth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sm2/sm2_crypt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sm2/sm2_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sm2/sm2_pmeth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sm2/sm2_sign.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sm3/m_sm3.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sm3/sm3.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sm4/sm4.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/srp/srp_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/srp/srp_vfy.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/stack/stack.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/store/loader_file.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/store/store_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/store/store_init.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/store/store_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/store/store_register.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/store/store_strings.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/threads_none.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/threads_pthread.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/threads_win.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ts/ts_asn1.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ts/ts_conf.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ts/ts_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ts/ts_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ts/ts_req_print.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ts/ts_req_utils.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ts/ts_rsp_print.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ts/ts_rsp_sign.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ts/ts_rsp_utils.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ts/ts_rsp_verify.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ts/ts_verify_ctx.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/txt_db/txt_db.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ui/ui_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ui/ui_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ui/ui_null.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ui/ui_openssl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ui/ui_util.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/uid.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/whrlpool/wp_block.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/whrlpool/wp_dgst.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/by_dir.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/by_file.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/t_crl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/t_req.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/t_x509.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_att.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_cmp.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_d2.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_def.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_ext.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_lu.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_meth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_obj.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_r2x.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_req.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_set.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_trs.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_txt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_v3.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_vfy.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_vpm.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509cset.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509name.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509rset.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509spki.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509type.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x_all.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x_attrib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x_crl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x_exten.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x_name.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x_pubkey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x_req.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x_x509.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x_x509a.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/pcy_cache.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/pcy_data.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/pcy_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/pcy_map.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/pcy_node.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/pcy_tree.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_addr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_admis.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_akey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_akeya.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_alt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_asid.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_bcons.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_bitst.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_conf.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_cpols.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_crld.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_enum.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_extku.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_genn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_ia5.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_info.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_int.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_ncons.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_pci.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_pcia.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_pcons.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_pku.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_pmaps.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_prn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_purp.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_skey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_sxnet.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_tlsf.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_utl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "engines/e_capi.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "engines/e_padlock.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "fuzz/asn1.o" =>
@@ -9059,6 +8409,14 @@ our %unified_info = (
                 [
                     "include",
                 ],
+            "include/crypto/bn_conf.h" =>
+                [
+                    ".",
+                ],
+            "include/crypto/dso_conf.h" =>
+                [
+                    ".",
+                ],
             "include/openssl/opensslconf.h" =>
                 [
                     ".",
@@ -9303,7 +8661,6 @@ our %unified_info = (
                 [
                     ".",
                     "include",
-                    "crypto/include",
                 ],
             "test/asn1_string_table_test.o" =>
                 [
@@ -9629,7 +8986,6 @@ our %unified_info = (
                 [
                     ".",
                     "include",
-                    "crypto/include",
                 ],
             "test/cipher_overhead_test.o" =>
                 [
@@ -9675,7 +9031,6 @@ our %unified_info = (
             "test/ctype_internal_test.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "test/curve448_internal_test.o" =>
@@ -9741,7 +9096,6 @@ our %unified_info = (
                 [
                     "include",
                     "crypto/ec",
-                    "crypto/include",
                 ],
             "test/ecdsatest.o" =>
                 [
@@ -9766,7 +9120,6 @@ our %unified_info = (
             "test/evp_extra_test.o" =>
                 [
                     "include",
-                    "crypto/include",
                 ],
             "test/evp_test.o" =>
                 [
@@ -9864,7 +9217,6 @@ our %unified_info = (
                 [
                     ".",
                     "include",
-                    "crypto/include",
                 ],
             "test/rc2test.o" =>
                 [
@@ -9914,18 +9266,15 @@ our %unified_info = (
                 [
                     ".",
                     "include",
-                    "crypto/include",
                 ],
             "test/sm2_internal_test.o" =>
                 [
                     "include",
-                    "crypto/include",
                 ],
             "test/sm4_internal_test.o" =>
                 [
                     ".",
                     "include",
-                    "crypto/include",
                 ],
             "test/srptest.o" =>
                 [
@@ -9936,6 +9285,10 @@ our %unified_info = (
                     ".",
                     "include",
                 ],
+            "test/ssl_ctx_test.o" =>
+                [
+                    "include",
+                ],
             "test/ssl_test.o" =>
                 [
                     "include",
@@ -9999,10 +9352,6 @@ our %unified_info = (
                 [
                     "include",
                 ],
-            "test/testutil/init.o" =>
-                [
-                    "include",
-                ],
             "test/testutil/main.o" =>
                 [
                     "include",
@@ -10031,6 +9380,10 @@ our %unified_info = (
                 [
                     "include",
                 ],
+            "test/testutil/testutil_init.o" =>
+                [
+                    "include",
+                ],
             "test/threadstest.o" =>
                 [
                     "include",
@@ -10295,6 +9648,7 @@ our %unified_info = (
             "test/sm4_internal_test",
             "test/srptest",
             "test/ssl_cert_table_internal_test",
+            "test/ssl_ctx_test",
             "test/ssl_test",
             "test/ssl_test_ctx_test",
             "test/sslapitest",
@@ -15250,7 +14604,6 @@ our %unified_info = (
                     "test/testutil/cb.o",
                     "test/testutil/driver.o",
                     "test/testutil/format_output.o",
-                    "test/testutil/init.o",
                     "test/testutil/main.o",
                     "test/testutil/output_helpers.o",
                     "test/testutil/random.o",
@@ -15258,6 +14611,7 @@ our %unified_info = (
                     "test/testutil/tap_bio.o",
                     "test/testutil/test_cleanup.o",
                     "test/testutil/tests.o",
+                    "test/testutil/testutil_init.o",
                 ],
             "test/md2test" =>
                 [
@@ -15485,6 +14839,14 @@ our %unified_info = (
                 [
                     "test/ssl_cert_table_internal_test.c",
                 ],
+            "test/ssl_ctx_test" =>
+                [
+                    "test/ssl_ctx_test.o",
+                ],
+            "test/ssl_ctx_test.o" =>
+                [
+                    "test/ssl_ctx_test.c",
+                ],
             "test/ssl_test" =>
                 [
                     "test/handshake_helper.o",
@@ -15587,10 +14949,6 @@ our %unified_info = (
                 [
                     "test/testutil/format_output.c",
                 ],
-            "test/testutil/init.o" =>
-                [
-                    "test/testutil/init.c",
-                ],
             "test/testutil/main.o" =>
                 [
                     "test/testutil/main.c",
@@ -15619,6 +14977,10 @@ our %unified_info = (
                 [
                     "test/testutil/tests.c",
                 ],
+            "test/testutil/testutil_init.o" =>
+                [
+                    "test/testutil/testutil_init.c",
+                ],
             "test/threadstest" =>
                 [
                     "test/threadstest.o",
diff --git a/deps/openssl/config/archs/linux-ppc/asm_avx2/crypto/buildinf.h b/deps/openssl/config/archs/linux-ppc/asm_avx2/crypto/buildinf.h
index d91d124d0d..559beb8cb0 100644
--- a/deps/openssl/config/archs/linux-ppc/asm_avx2/crypto/buildinf.h
+++ b/deps/openssl/config/archs/linux-ppc/asm_avx2/crypto/buildinf.h
@@ -11,7 +11,7 @@
  */
 
 #define PLATFORM "platform: linux-ppc"
-#define DATE "built on: Fri Sep 13 16:00:53 2019 UTC"
+#define DATE "built on: Wed Mar 18 21:07:49 2020 UTC"
 
 /*
  * Generate compiler_flags as an array of individual characters. This is a
diff --git a/deps/openssl/config/archs/linux-ppc/asm_avx2/crypto/include/internal/bn_conf.h b/deps/openssl/config/archs/linux-ppc/asm_avx2/crypto/include/internal/bn_conf.h
index fb52156bd0..459055c96f 100644
--- a/deps/openssl/config/archs/linux-ppc/asm_avx2/crypto/include/internal/bn_conf.h
+++ b/deps/openssl/config/archs/linux-ppc/asm_avx2/crypto/include/internal/bn_conf.h
@@ -1,5 +1,5 @@
 /* WARNING: do not edit! */
-/* Generated by Makefile from crypto/include/internal/bn_conf.h.in */
+/* Generated by Makefile from include/crypto/bn_conf.h.in */
 /*
  * Copyright 2016 The OpenSSL Project Authors. All Rights Reserved.
  *
@@ -9,8 +9,8 @@
  * https://www.openssl.org/source/license.html
  */
 
-#ifndef HEADER_BN_CONF_H
-# define HEADER_BN_CONF_H
+#ifndef OSSL_CRYPTO_BN_CONF_H
+# define OSSL_CRYPTO_BN_CONF_H
 
 /*
  * The contents of this file are not used in the UEFI build, as
diff --git a/deps/openssl/config/archs/linux-ppc/asm_avx2/crypto/include/internal/dso_conf.h b/deps/openssl/config/archs/linux-ppc/asm_avx2/crypto/include/internal/dso_conf.h
index 252266ec2a..4b1167c3d8 100644
--- a/deps/openssl/config/archs/linux-ppc/asm_avx2/crypto/include/internal/dso_conf.h
+++ b/deps/openssl/config/archs/linux-ppc/asm_avx2/crypto/include/internal/dso_conf.h
@@ -1,5 +1,5 @@
 /* WARNING: do not edit! */
-/* Generated by Makefile from crypto/include/internal/dso_conf.h.in */
+/* Generated by Makefile from include/crypto/dso_conf.h.in */
 /*
  * Copyright 2016-2019 The OpenSSL Project Authors. All Rights Reserved.
  *
@@ -9,8 +9,8 @@
  * https://www.openssl.org/source/license.html
  */
 
-#ifndef HEADER_DSO_CONF_H
-# define HEADER_DSO_CONF_H
+#ifndef OSSL_CRYPTO_DSO_CONF_H
+# define OSSL_CRYPTO_DSO_CONF_H
 # define DSO_DLFCN
 # define HAVE_DLFCN_H
 # define DSO_EXTENSION ".so"
diff --git a/deps/openssl/config/archs/linux-ppc/asm_avx2/include/openssl/opensslconf.h b/deps/openssl/config/archs/linux-ppc/asm_avx2/include/openssl/opensslconf.h
index 1a2b31bdc7..71c4fecc40 100644
--- a/deps/openssl/config/archs/linux-ppc/asm_avx2/include/openssl/opensslconf.h
+++ b/deps/openssl/config/archs/linux-ppc/asm_avx2/include/openssl/opensslconf.h
@@ -96,9 +96,6 @@ extern "C" {
 #ifndef OPENSSL_NO_DYNAMIC_ENGINE
 # define OPENSSL_NO_DYNAMIC_ENGINE
 #endif
-#ifndef OPENSSL_NO_AFALGENG
-# define OPENSSL_NO_AFALGENG
-#endif
 
 
 /*
diff --git a/deps/openssl/config/archs/linux-ppc/asm_avx2/include/progs.h b/deps/openssl/config/archs/linux-ppc/asm_avx2/include/progs.h
index 9b3d270e20..308c65601b 100644
--- a/deps/openssl/config/archs/linux-ppc/asm_avx2/include/progs.h
+++ b/deps/openssl/config/archs/linux-ppc/asm_avx2/include/progs.h
@@ -2,7 +2,7 @@
  * WARNING: do not edit!
  * Generated by apps/progs.pl
  *
- * Copyright 1995-2019 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 1995-2020 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
diff --git a/deps/openssl/config/archs/linux-ppc/no-asm/configdata.pm b/deps/openssl/config/archs/linux-ppc/no-asm/configdata.pm
index 41afbcc444..30a5966002 100644
--- a/deps/openssl/config/archs/linux-ppc/no-asm/configdata.pm
+++ b/deps/openssl/config/archs/linux-ppc/no-asm/configdata.pm
@@ -55,7 +55,7 @@ our %config = (
   minor => "1.1",
   openssl_algorithm_defines => [ "OPENSSL_NO_COMP", "OPENSSL_NO_MD2", "OPENSSL_NO_RC5" ],
   openssl_api_defines => [  ],
-  openssl_other_defines => [ "OPENSSL_RAND_SEED_OS", "OPENSSL_NO_AFALGENG", "OPENSSL_NO_ASAN", "OPENSSL_NO_ASM", "OPENSSL_NO_CRYPTO_MDEBUG", "OPENSSL_NO_CRYPTO_MDEBUG_BACKTRACE", "OPENSSL_NO_DEVCRYPTOENG", "OPENSSL_NO_EC_NISTP_64_GCC_128", "OPENSSL_NO_EGD", "OPENSSL_NO_EXTERNAL_TESTS", "OPENSSL_NO_FUZZ_AFL", "OPENSSL_NO_FUZZ_LIBFUZZER", "OPENSSL_NO_HEARTBEATS", "OPENSSL_NO_MSAN", "OPENSSL_NO_SCTP", "OPENSSL_NO_SSL3", "OPENSSL_NO_SSL3_METHOD", "OPENSSL_NO_UBSAN", "OPENSSL_NO_UNIT_TEST", "OPENSSL_NO_WEAK_SSL_CIPHERS", "OPENSSL_NO_DYNAMIC_ENGINE", "OPENSSL_NO_AFALGENG" ],
+  openssl_other_defines => [ "OPENSSL_RAND_SEED_OS", "OPENSSL_NO_AFALGENG", "OPENSSL_NO_ASAN", "OPENSSL_NO_ASM", "OPENSSL_NO_CRYPTO_MDEBUG", "OPENSSL_NO_CRYPTO_MDEBUG_BACKTRACE", "OPENSSL_NO_DEVCRYPTOENG", "OPENSSL_NO_EC_NISTP_64_GCC_128", "OPENSSL_NO_EGD", "OPENSSL_NO_EXTERNAL_TESTS", "OPENSSL_NO_FUZZ_AFL", "OPENSSL_NO_FUZZ_LIBFUZZER", "OPENSSL_NO_HEARTBEATS", "OPENSSL_NO_MSAN", "OPENSSL_NO_SCTP", "OPENSSL_NO_SSL3", "OPENSSL_NO_SSL3_METHOD", "OPENSSL_NO_UBSAN", "OPENSSL_NO_UNIT_TEST", "OPENSSL_NO_WEAK_SSL_CIPHERS", "OPENSSL_NO_DYNAMIC_ENGINE" ],
   openssl_sys_defines => [  ],
   openssl_thread_defines => [ "OPENSSL_THREADS" ],
   openssldir => "",
@@ -111,8 +111,8 @@ our %config = (
   sourcedir => ".",
   target => "linux-ppc",
   tdirs => [ "ossl_shim" ],
-  version => "1.1.1d",
-  version_num => "0x1010104fL",
+  version => "1.1.1e",
+  version_num => "0x1010105fL",
 );
 
 our %target = (
@@ -237,6 +237,7 @@ our @disablables = (
   "dgram",
   "dh",
   "dsa",
+  "dso",
   "dtls",
   "dynamic-engine",
   "ec",
@@ -355,8 +356,8 @@ our %unified_info = (
         {
             "" =>
                 [
-                    "crypto/include/internal/bn_conf.h",
-                    "crypto/include/internal/dso_conf.h",
+                    "include/crypto/bn_conf.h",
+                    "include/crypto/dso_conf.h",
                     "include/openssl/opensslconf.h",
                 ],
             "apps/asn1pars.o" =>
@@ -624,14 +625,6 @@ our %unified_info = (
                     "crypto/perlasm/cbc.pl",
                     "crypto/perlasm/x86asm.pl",
                 ],
-            "crypto/include/internal/bn_conf.h" =>
-                [
-                    "configdata.pm",
-                ],
-            "crypto/include/internal/dso_conf.h" =>
-                [
-                    "configdata.pm",
-                ],
             "crypto/rc4/rc4-586.s" =>
                 [
                     "crypto/perlasm/x86asm.pl",
@@ -707,6 +700,14 @@ our %unified_info = (
                 [
                     "libcrypto",
                 ],
+            "include/crypto/bn_conf.h" =>
+                [
+                    "configdata.pm",
+                ],
+            "include/crypto/dso_conf.h" =>
+                [
+                    "configdata.pm",
+                ],
             "include/openssl/opensslconf.h" =>
                 [
                     "configdata.pm",
@@ -1504,6 +1505,12 @@ our %unified_info = (
                     "libcrypto",
                     "test/libtestutil.a",
                 ],
+            "test/ssl_ctx_test" =>
+                [
+                    "libcrypto",
+                    "libssl",
+                    "test/libtestutil.a",
+                ],
             "test/ssl_test" =>
                 [
                     "libcrypto",
@@ -3222,7 +3229,6 @@ our %unified_info = (
                             "test/testutil/cb.o",
                             "test/testutil/driver.o",
                             "test/testutil/format_output.o",
-                            "test/testutil/init.o",
                             "test/testutil/main.o",
                             "test/testutil/output_helpers.o",
                             "test/testutil/random.o",
@@ -3230,6 +3236,7 @@ our %unified_info = (
                             "test/testutil/tap_bio.o",
                             "test/testutil/test_cleanup.o",
                             "test/testutil/tests.o",
+                            "test/testutil/testutil_init.o",
                         ],
                     "products" =>
                         {
@@ -3728,14 +3735,6 @@ our %unified_info = (
                 [
                     "crypto/ia64cpuid.S",
                 ],
-            "crypto/include/internal/bn_conf.h" =>
-                [
-                    "crypto/include/internal/bn_conf.h.in",
-                ],
-            "crypto/include/internal/dso_conf.h" =>
-                [
-                    "crypto/include/internal/dso_conf.h.in",
-                ],
             "crypto/md5/md5-586.s" =>
                 [
                     "crypto/md5/asm/md5-586.pl",
@@ -4176,6 +4175,14 @@ our %unified_info = (
                     "engines/asm/e_padlock-x86_64.pl",
                     "\$(PERLASM_SCHEME)",
                 ],
+            "include/crypto/bn_conf.h" =>
+                [
+                    "include/crypto/bn_conf.h.in",
+                ],
+            "include/crypto/dso_conf.h" =>
+                [
+                    "include/crypto/dso_conf.h.in",
+                ],
             "include/openssl/opensslconf.h" =>
                 [
                     "include/openssl/opensslconf.h.in",
@@ -4870,49 +4877,41 @@ our %unified_info = (
             "crypto/aes/aes_cbc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/aes/aes_cfb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/aes/aes_core.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/aes/aes_ecb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/aes/aes_ige.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/aes/aes_misc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/aes/aes_ofb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/aes/aes_wrap.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/aes/aesfx-sparcv9.o" =>
@@ -4934,7 +4933,6 @@ our %unified_info = (
             "crypto/aria/aria.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/arm64cpuid.o" =>
@@ -4948,613 +4946,511 @@ our %unified_info = (
             "crypto/asn1/a_bitstr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_d2i_fp.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_digest.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_dup.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_gentm.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_i2d_fp.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_int.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_mbstr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_object.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_octet.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_print.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_sign.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_strex.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_strnid.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_time.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_type.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_utctm.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_utf8.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_verify.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/ameth_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/asn1_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/asn1_gen.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/asn1_item_list.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/asn1_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/asn1_par.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/asn_mime.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/asn_moid.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/asn_mstbl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/asn_pack.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/bio_asn1.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/bio_ndef.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/d2i_pr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/d2i_pu.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/evp_asn1.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/f_int.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/f_string.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/i2d_pr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/i2d_pu.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/n_pkey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/nsseq.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/p5_pbe.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/p5_pbev2.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/p5_scrypt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/p8_pkey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/t_bitst.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/t_pkey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/t_spki.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/tasn_dec.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/tasn_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/tasn_fre.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/tasn_new.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/tasn_prn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/tasn_scn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/tasn_typ.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/tasn_utl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/x_algor.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/x_bignum.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/x_info.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/x_int64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/x_long.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/x_pkey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/x_sig.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/x_spki.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/x_val.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/async/arch/async_null.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/async/arch/async_posix.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/async/arch/async_win.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/async/async.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/async/async_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/async/async_wait.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bf/bf_cfb64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bf/bf_ecb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bf/bf_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bf/bf_ofb64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bf/bf_skey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/b_addr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/b_dump.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/b_print.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/b_sock.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/b_sock2.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bf_buff.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bf_lbuf.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bf_nbio.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bf_null.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bio_cb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bio_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bio_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bio_meth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bss_acpt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bss_bio.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bss_conn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bss_dgram.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bss_fd.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bss_file.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bss_log.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bss_mem.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bss_null.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bss_sock.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/blake2/blake2b.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/blake2/blake2s.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/blake2/m_blake2b.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/blake2/m_blake2s.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/armv4-gf2m.o" =>
@@ -5572,188 +5468,157 @@ our %unified_info = (
             "crypto/bn/bn_add.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_asm.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_blind.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_const.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_ctx.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_depr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_dh.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_div.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_exp.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto",
                 ],
             "crypto/bn/bn_exp2.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_gcd.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_gf2m.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_intern.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_kron.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_mod.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_mont.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_mpi.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_mul.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_nist.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_prime.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_print.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_rand.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_recp.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_shift.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_sqr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_sqrt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_srp.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_word.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_x931p.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/mips-mont.o" =>
@@ -5783,13 +5648,11 @@ our %unified_info = (
             "crypto/buffer/buf_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/buffer/buffer.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/buildinf.h" =>
@@ -5799,43 +5662,36 @@ our %unified_info = (
             "crypto/camellia/camellia.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/camellia/cmll_cbc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/camellia/cmll_cfb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/camellia/cmll_ctr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/camellia/cmll_ecb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/camellia/cmll_misc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/camellia/cmll_ofb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/camellia/cmllt4-sparcv9.o" =>
@@ -5845,31 +5701,26 @@ our %unified_info = (
             "crypto/cast/c_cfb64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cast/c_ecb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cast/c_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cast/c_ofb64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cast/c_skey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/chacha/chacha-armv4.o" =>
@@ -5887,278 +5738,232 @@ our %unified_info = (
             "crypto/chacha/chacha_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cmac/cm_ameth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cmac/cm_pmeth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cmac/cmac.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_asn1.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_att.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_cd.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_dd.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_env.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_ess.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_io.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_kari.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_pwri.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_sd.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_smime.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/conf/conf_api.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/conf/conf_def.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/conf/conf_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/conf/conf_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/conf/conf_mall.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/conf/conf_mod.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/conf/conf_sap.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/conf/conf_ssl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cpt_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cryptlib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ct/ct_b64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ct/ct_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ct/ct_log.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ct/ct_oct.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ct/ct_policy.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ct/ct_prn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ct/ct_sct.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ct/ct_sct_ctx.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ct/ct_vfy.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ct/ct_x509v3.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ctype.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cversion.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto",
                 ],
             "crypto/des/cbc_cksm.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/cbc_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/cfb64ede.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/cfb64enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/cfb_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/des_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/dest4-sparcv9.o" =>
@@ -6168,301 +5973,251 @@ our %unified_info = (
             "crypto/des/ecb3_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/ecb_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/fcrypt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/fcrypt_b.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/ofb64ede.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/ofb64enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/ofb_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/pcbc_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/qud_cksm.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/rand_key.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/set_key.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/str2key.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/xcbc_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_ameth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_asn1.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_check.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_depr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_gen.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_kdf.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_key.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_meth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_pmeth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_prn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_rfc5114.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_rfc7919.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dsa/dsa_ameth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dsa/dsa_asn1.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dsa/dsa_depr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dsa/dsa_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dsa/dsa_gen.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dsa/dsa_key.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dsa/dsa_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dsa/dsa_meth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dsa/dsa_ossl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dsa/dsa_pmeth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dsa/dsa_prn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dsa/dsa_sign.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dsa/dsa_vrf.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dso/dso_dl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dso/dso_dlfcn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dso/dso_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dso/dso_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dso/dso_openssl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dso/dso_vms.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dso/dso_win32.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ebcdic.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/curve25519.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/curve448/arch_32/f_impl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto/ec/curve448/arch_32",
                     "crypto/ec/curve448",
@@ -6470,7 +6225,6 @@ our %unified_info = (
             "crypto/ec/curve448/curve448.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto/ec/curve448/arch_32",
                     "crypto/ec/curve448",
@@ -6478,7 +6232,6 @@ our %unified_info = (
             "crypto/ec/curve448/curve448_tables.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto/ec/curve448/arch_32",
                     "crypto/ec/curve448",
@@ -6486,7 +6239,6 @@ our %unified_info = (
             "crypto/ec/curve448/eddsa.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto/ec/curve448/arch_32",
                     "crypto/ec/curve448",
@@ -6494,7 +6246,6 @@ our %unified_info = (
             "crypto/ec/curve448/f_generic.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto/ec/curve448/arch_32",
                     "crypto/ec/curve448",
@@ -6502,7 +6253,6 @@ our %unified_info = (
             "crypto/ec/curve448/scalar.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto/ec/curve448/arch_32",
                     "crypto/ec/curve448",
@@ -6510,163 +6260,136 @@ our %unified_info = (
             "crypto/ec/ec2_oct.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec2_smpl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec_ameth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec_asn1.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec_check.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec_curve.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec_cvt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec_key.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec_kmeth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec_mult.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec_oct.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec_pmeth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec_print.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecdh_kdf.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecdh_ossl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecdsa_ossl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecdsa_sign.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecdsa_vrf.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/eck_prn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecp_mont.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecp_nist.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecp_nistp224.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecp_nistp256.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecp_nistp521.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecp_nistputil.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecp_nistz256-armv4.o" =>
@@ -6684,223 +6407,186 @@ our %unified_info = (
             "crypto/ec/ecp_oct.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecp_smpl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecx_meth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/eng_all.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/eng_cnf.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/eng_ctrl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/eng_dyn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/eng_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/eng_fat.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/eng_init.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/eng_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/eng_list.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/eng_openssl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/eng_pkey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/eng_rdrand.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/eng_table.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/tb_asnmth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/tb_cipher.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/tb_dh.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/tb_digest.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/tb_dsa.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/tb_eckey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/tb_pkmeth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/tb_rand.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/tb_rsa.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/err/err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/err/err_all.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/err/err_prn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/bio_b64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/bio_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/bio_md.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/bio_ok.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/c_allc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/c_alld.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/cmeth_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/digest.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/e_aes.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto",
                     "crypto/modes",
@@ -6908,21 +6594,18 @@ our %unified_info = (
             "crypto/evp/e_aes_cbc_hmac_sha1.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto/modes",
                 ],
             "crypto/evp/e_aes_cbc_hmac_sha256.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto/modes",
                 ],
             "crypto/evp/e_aria.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto",
                     "crypto/modes",
@@ -6930,13 +6613,11 @@ our %unified_info = (
             "crypto/evp/e_bf.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/e_camellia.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto",
                     "crypto/modes",
@@ -6944,81 +6625,68 @@ our %unified_info = (
             "crypto/evp/e_cast.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/e_chacha20_poly1305.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/e_des.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto",
                 ],
             "crypto/evp/e_des3.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto",
                 ],
             "crypto/evp/e_idea.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/e_null.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/e_old.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/e_rc2.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/e_rc4.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/e_rc4_hmac_md5.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/e_rc5.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/e_seed.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/e_sm4.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto",
                     "crypto/modes",
@@ -7026,328 +6694,267 @@ our %unified_info = (
             "crypto/evp/e_xcbc_d.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/encode.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/evp_cnf.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/evp_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/evp_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/evp_key.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/evp_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/evp_pbe.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/evp_pkey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/m_md2.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/m_md4.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/m_md5.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/m_md5_sha1.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/m_mdc2.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/m_null.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/m_ripemd.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/m_sha1.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/m_sha3.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto",
                 ],
             "crypto/evp/m_sigver.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/m_wp.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/names.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/p5_crpt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/p5_crpt2.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/p_dec.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/p_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/p_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/p_open.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/p_seal.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/p_sign.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/p_verify.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/pbe_scrypt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/pmeth_fn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/pmeth_gn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/pmeth_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ex_data.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/getenv.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/hmac/hm_ameth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/hmac/hm_pmeth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/hmac/hmac.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/idea/i_cbc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/idea/i_cfb64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/idea/i_ecb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/idea/i_ofb64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/idea/i_skey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
-            "crypto/include/internal/bn_conf.h" =>
-                [
-                    ".",
-                ],
-            "crypto/include/internal/dso_conf.h" =>
-                [
-                    ".",
-                ],
             "crypto/init.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/kdf/hkdf.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/kdf/kdf_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/kdf/scrypt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/kdf/tls1_prf.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/lhash/lh_stats.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/lhash/lhash.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/md4/md4_dgst.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/md4/md4_one.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/md5/md5-sparcv9.o" =>
@@ -7357,85 +6964,71 @@ our %unified_info = (
             "crypto/md5/md5_dgst.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/md5/md5_one.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/mdc2/mdc2_one.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/mdc2/mdc2dgst.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/mem.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/mem_clr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/mem_dbg.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/mem_sec.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/modes/cbc128.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/modes/ccm128.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/modes/cfb128.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/modes/ctr128.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/modes/cts128.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/modes/gcm128.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto",
                 ],
@@ -7458,361 +7051,301 @@ our %unified_info = (
             "crypto/modes/ocb128.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/modes/ofb128.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/modes/wrap128.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/modes/xts128.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/o_dir.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/o_fips.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/o_fopen.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/o_init.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/o_str.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/o_time.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/objects/o_names.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/objects/obj_dat.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/objects/obj_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/objects/obj_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/objects/obj_xref.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ocsp/ocsp_asn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ocsp/ocsp_cl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ocsp/ocsp_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ocsp/ocsp_ext.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ocsp/ocsp_ht.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ocsp/ocsp_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ocsp/ocsp_prn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ocsp/ocsp_srv.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ocsp/ocsp_vfy.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ocsp/v3_ocsp.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pem/pem_all.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pem/pem_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pem/pem_info.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pem/pem_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pem/pem_oth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pem/pem_pk8.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pem/pem_pkey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pem/pem_sign.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pem/pem_x509.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pem/pem_xaux.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pem/pvkfmt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_add.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_asn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_attr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_crpt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_crt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_decr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_init.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_key.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_kiss.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_mutl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_npas.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_p8d.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_p8e.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_sbag.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_utl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/pk12err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs7/bio_pk7.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs7/pk7_asn1.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs7/pk7_attr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs7/pk7_doit.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs7/pk7_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs7/pk7_mime.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs7/pk7_smime.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs7/pkcs7err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/poly1305/poly1305-armv4.o" =>
@@ -7834,259 +7367,216 @@ our %unified_info = (
             "crypto/poly1305/poly1305.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/poly1305/poly1305_ameth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/poly1305/poly1305_pmeth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rand/drbg_ctr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rand/drbg_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rand/rand_egd.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rand/rand_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rand/rand_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rand/rand_unix.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rand/rand_vms.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rand/rand_win.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rand/randfile.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rc2/rc2_cbc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rc2/rc2_ecb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rc2/rc2_skey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rc2/rc2cfb64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rc2/rc2ofb64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rc4/rc4_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rc4/rc4_skey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ripemd/rmd_dgst.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ripemd/rmd_one.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_ameth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_asn1.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_chk.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_crpt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_depr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_gen.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_meth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_mp.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_none.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_oaep.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_ossl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_pk1.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_pmeth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_prn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_pss.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_saos.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_sign.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_ssl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_x931.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_x931g.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/s390xcpuid.o" =>
@@ -8096,31 +7586,26 @@ our %unified_info = (
             "crypto/seed/seed.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/seed/seed_cbc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/seed/seed_cfb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/seed/seed_ecb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/seed/seed_ofb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sha/keccak1600-armv4.o" =>
@@ -8130,7 +7615,6 @@ our %unified_info = (
             "crypto/sha/keccak1600.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sha/sha1-armv4-large.o" =>
@@ -8156,13 +7640,11 @@ our %unified_info = (
             "crypto/sha/sha1_one.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sha/sha1dgst.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sha/sha256-armv4.o" =>
@@ -8188,7 +7670,6 @@ our %unified_info = (
             "crypto/sha/sha256.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sha/sha512-armv4.o" =>
@@ -8214,709 +7695,591 @@ our %unified_info = (
             "crypto/sha/sha512.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/siphash/siphash.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/siphash/siphash_ameth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/siphash/siphash_pmeth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sm2/sm2_crypt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sm2/sm2_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sm2/sm2_pmeth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sm2/sm2_sign.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sm3/m_sm3.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sm3/sm3.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sm4/sm4.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/srp/srp_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/srp/srp_vfy.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/stack/stack.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/store/loader_file.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/store/store_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/store/store_init.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/store/store_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/store/store_register.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/store/store_strings.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/threads_none.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/threads_pthread.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/threads_win.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ts/ts_asn1.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ts/ts_conf.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ts/ts_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ts/ts_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ts/ts_req_print.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ts/ts_req_utils.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ts/ts_rsp_print.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ts/ts_rsp_sign.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ts/ts_rsp_utils.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ts/ts_rsp_verify.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ts/ts_verify_ctx.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/txt_db/txt_db.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ui/ui_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ui/ui_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ui/ui_null.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ui/ui_openssl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ui/ui_util.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/uid.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/whrlpool/wp_block.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/whrlpool/wp_dgst.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/by_dir.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/by_file.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/t_crl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/t_req.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/t_x509.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_att.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_cmp.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_d2.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_def.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_ext.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_lu.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_meth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_obj.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_r2x.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_req.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_set.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_trs.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_txt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_v3.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_vfy.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_vpm.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509cset.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509name.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509rset.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509spki.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509type.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x_all.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x_attrib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x_crl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x_exten.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x_name.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x_pubkey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x_req.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x_x509.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x_x509a.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/pcy_cache.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/pcy_data.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/pcy_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/pcy_map.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/pcy_node.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/pcy_tree.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_addr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_admis.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_akey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_akeya.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_alt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_asid.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_bcons.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_bitst.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_conf.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_cpols.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_crld.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_enum.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_extku.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_genn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_ia5.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_info.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_int.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_ncons.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_pci.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_pcia.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_pcons.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_pku.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_pmaps.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_prn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_purp.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_skey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_sxnet.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_tlsf.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_utl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "engines/e_capi.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "engines/e_padlock.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "fuzz/asn1.o" =>
@@ -8967,6 +8330,14 @@ our %unified_info = (
                 [
                     "include",
                 ],
+            "include/crypto/bn_conf.h" =>
+                [
+                    ".",
+                ],
+            "include/crypto/dso_conf.h" =>
+                [
+                    ".",
+                ],
             "include/openssl/opensslconf.h" =>
                 [
                     ".",
@@ -9211,7 +8582,6 @@ our %unified_info = (
                 [
                     ".",
                     "include",
-                    "crypto/include",
                 ],
             "test/asn1_string_table_test.o" =>
                 [
@@ -9537,7 +8907,6 @@ our %unified_info = (
                 [
                     ".",
                     "include",
-                    "crypto/include",
                 ],
             "test/cipher_overhead_test.o" =>
                 [
@@ -9583,7 +8952,6 @@ our %unified_info = (
             "test/ctype_internal_test.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "test/curve448_internal_test.o" =>
@@ -9649,7 +9017,6 @@ our %unified_info = (
                 [
                     "include",
                     "crypto/ec",
-                    "crypto/include",
                 ],
             "test/ecdsatest.o" =>
                 [
@@ -9674,7 +9041,6 @@ our %unified_info = (
             "test/evp_extra_test.o" =>
                 [
                     "include",
-                    "crypto/include",
                 ],
             "test/evp_test.o" =>
                 [
@@ -9772,7 +9138,6 @@ our %unified_info = (
                 [
                     ".",
                     "include",
-                    "crypto/include",
                 ],
             "test/rc2test.o" =>
                 [
@@ -9822,18 +9187,15 @@ our %unified_info = (
                 [
                     ".",
                     "include",
-                    "crypto/include",
                 ],
             "test/sm2_internal_test.o" =>
                 [
                     "include",
-                    "crypto/include",
                 ],
             "test/sm4_internal_test.o" =>
                 [
                     ".",
                     "include",
-                    "crypto/include",
                 ],
             "test/srptest.o" =>
                 [
@@ -9844,6 +9206,10 @@ our %unified_info = (
                     ".",
                     "include",
                 ],
+            "test/ssl_ctx_test.o" =>
+                [
+                    "include",
+                ],
             "test/ssl_test.o" =>
                 [
                     "include",
@@ -9907,10 +9273,6 @@ our %unified_info = (
                 [
                     "include",
                 ],
-            "test/testutil/init.o" =>
-                [
-                    "include",
-                ],
             "test/testutil/main.o" =>
                 [
                     "include",
@@ -9939,6 +9301,10 @@ our %unified_info = (
                 [
                     "include",
                 ],
+            "test/testutil/testutil_init.o" =>
+                [
+                    "include",
+                ],
             "test/threadstest.o" =>
                 [
                     "include",
@@ -10203,6 +9569,7 @@ our %unified_info = (
             "test/sm4_internal_test",
             "test/srptest",
             "test/ssl_cert_table_internal_test",
+            "test/ssl_ctx_test",
             "test/ssl_test",
             "test/ssl_test_ctx_test",
             "test/sslapitest",
@@ -15093,7 +14460,6 @@ our %unified_info = (
                     "test/testutil/cb.o",
                     "test/testutil/driver.o",
                     "test/testutil/format_output.o",
-                    "test/testutil/init.o",
                     "test/testutil/main.o",
                     "test/testutil/output_helpers.o",
                     "test/testutil/random.o",
@@ -15101,6 +14467,7 @@ our %unified_info = (
                     "test/testutil/tap_bio.o",
                     "test/testutil/test_cleanup.o",
                     "test/testutil/tests.o",
+                    "test/testutil/testutil_init.o",
                 ],
             "test/md2test" =>
                 [
@@ -15328,6 +14695,14 @@ our %unified_info = (
                 [
                     "test/ssl_cert_table_internal_test.c",
                 ],
+            "test/ssl_ctx_test" =>
+                [
+                    "test/ssl_ctx_test.o",
+                ],
+            "test/ssl_ctx_test.o" =>
+                [
+                    "test/ssl_ctx_test.c",
+                ],
             "test/ssl_test" =>
                 [
                     "test/handshake_helper.o",
@@ -15430,10 +14805,6 @@ our %unified_info = (
                 [
                     "test/testutil/format_output.c",
                 ],
-            "test/testutil/init.o" =>
-                [
-                    "test/testutil/init.c",
-                ],
             "test/testutil/main.o" =>
                 [
                     "test/testutil/main.c",
@@ -15462,6 +14833,10 @@ our %unified_info = (
                 [
                     "test/testutil/tests.c",
                 ],
+            "test/testutil/testutil_init.o" =>
+                [
+                    "test/testutil/testutil_init.c",
+                ],
             "test/threadstest" =>
                 [
                     "test/threadstest.o",
diff --git a/deps/openssl/config/archs/linux-ppc/no-asm/crypto/buildinf.h b/deps/openssl/config/archs/linux-ppc/no-asm/crypto/buildinf.h
index feccd6e409..58a71fa717 100644
--- a/deps/openssl/config/archs/linux-ppc/no-asm/crypto/buildinf.h
+++ b/deps/openssl/config/archs/linux-ppc/no-asm/crypto/buildinf.h
@@ -11,7 +11,7 @@
  */
 
 #define PLATFORM "platform: linux-ppc"
-#define DATE "built on: Fri Sep 13 16:00:59 2019 UTC"
+#define DATE "built on: Wed Mar 18 21:07:59 2020 UTC"
 
 /*
  * Generate compiler_flags as an array of individual characters. This is a
diff --git a/deps/openssl/config/archs/linux-ppc/no-asm/crypto/include/internal/bn_conf.h b/deps/openssl/config/archs/linux-ppc/no-asm/crypto/include/internal/bn_conf.h
index fb52156bd0..459055c96f 100644
--- a/deps/openssl/config/archs/linux-ppc/no-asm/crypto/include/internal/bn_conf.h
+++ b/deps/openssl/config/archs/linux-ppc/no-asm/crypto/include/internal/bn_conf.h
@@ -1,5 +1,5 @@
 /* WARNING: do not edit! */
-/* Generated by Makefile from crypto/include/internal/bn_conf.h.in */
+/* Generated by Makefile from include/crypto/bn_conf.h.in */
 /*
  * Copyright 2016 The OpenSSL Project Authors. All Rights Reserved.
  *
@@ -9,8 +9,8 @@
  * https://www.openssl.org/source/license.html
  */
 
-#ifndef HEADER_BN_CONF_H
-# define HEADER_BN_CONF_H
+#ifndef OSSL_CRYPTO_BN_CONF_H
+# define OSSL_CRYPTO_BN_CONF_H
 
 /*
  * The contents of this file are not used in the UEFI build, as
diff --git a/deps/openssl/config/archs/linux-ppc/no-asm/crypto/include/internal/dso_conf.h b/deps/openssl/config/archs/linux-ppc/no-asm/crypto/include/internal/dso_conf.h
index 252266ec2a..4b1167c3d8 100644
--- a/deps/openssl/config/archs/linux-ppc/no-asm/crypto/include/internal/dso_conf.h
+++ b/deps/openssl/config/archs/linux-ppc/no-asm/crypto/include/internal/dso_conf.h
@@ -1,5 +1,5 @@
 /* WARNING: do not edit! */
-/* Generated by Makefile from crypto/include/internal/dso_conf.h.in */
+/* Generated by Makefile from include/crypto/dso_conf.h.in */
 /*
  * Copyright 2016-2019 The OpenSSL Project Authors. All Rights Reserved.
  *
@@ -9,8 +9,8 @@
  * https://www.openssl.org/source/license.html
  */
 
-#ifndef HEADER_DSO_CONF_H
-# define HEADER_DSO_CONF_H
+#ifndef OSSL_CRYPTO_DSO_CONF_H
+# define OSSL_CRYPTO_DSO_CONF_H
 # define DSO_DLFCN
 # define HAVE_DLFCN_H
 # define DSO_EXTENSION ".so"
diff --git a/deps/openssl/config/archs/linux-ppc/no-asm/include/openssl/opensslconf.h b/deps/openssl/config/archs/linux-ppc/no-asm/include/openssl/opensslconf.h
index 6419ec21a2..4cbafb777f 100644
--- a/deps/openssl/config/archs/linux-ppc/no-asm/include/openssl/opensslconf.h
+++ b/deps/openssl/config/archs/linux-ppc/no-asm/include/openssl/opensslconf.h
@@ -99,9 +99,6 @@ extern "C" {
 #ifndef OPENSSL_NO_DYNAMIC_ENGINE
 # define OPENSSL_NO_DYNAMIC_ENGINE
 #endif
-#ifndef OPENSSL_NO_AFALGENG
-# define OPENSSL_NO_AFALGENG
-#endif
 
 
 /*
diff --git a/deps/openssl/config/archs/linux-ppc/no-asm/include/progs.h b/deps/openssl/config/archs/linux-ppc/no-asm/include/progs.h
index 9b3d270e20..308c65601b 100644
--- a/deps/openssl/config/archs/linux-ppc/no-asm/include/progs.h
+++ b/deps/openssl/config/archs/linux-ppc/no-asm/include/progs.h
@@ -2,7 +2,7 @@
  * WARNING: do not edit!
  * Generated by apps/progs.pl
  *
- * Copyright 1995-2019 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 1995-2020 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
diff --git a/deps/openssl/config/archs/linux-ppc64/asm/configdata.pm b/deps/openssl/config/archs/linux-ppc64/asm/configdata.pm
index a8105b72ab..1f45e96930 100644
--- a/deps/openssl/config/archs/linux-ppc64/asm/configdata.pm
+++ b/deps/openssl/config/archs/linux-ppc64/asm/configdata.pm
@@ -55,7 +55,7 @@ our %config = (
   minor => "1.1",
   openssl_algorithm_defines => [ "OPENSSL_NO_COMP", "OPENSSL_NO_MD2", "OPENSSL_NO_RC5" ],
   openssl_api_defines => [  ],
-  openssl_other_defines => [ "OPENSSL_RAND_SEED_OS", "OPENSSL_NO_AFALGENG", "OPENSSL_NO_ASAN", "OPENSSL_NO_CRYPTO_MDEBUG", "OPENSSL_NO_CRYPTO_MDEBUG_BACKTRACE", "OPENSSL_NO_DEVCRYPTOENG", "OPENSSL_NO_EC_NISTP_64_GCC_128", "OPENSSL_NO_EGD", "OPENSSL_NO_EXTERNAL_TESTS", "OPENSSL_NO_FUZZ_AFL", "OPENSSL_NO_FUZZ_LIBFUZZER", "OPENSSL_NO_HEARTBEATS", "OPENSSL_NO_MSAN", "OPENSSL_NO_SCTP", "OPENSSL_NO_SSL3", "OPENSSL_NO_SSL3_METHOD", "OPENSSL_NO_UBSAN", "OPENSSL_NO_UNIT_TEST", "OPENSSL_NO_WEAK_SSL_CIPHERS", "OPENSSL_NO_DYNAMIC_ENGINE", "OPENSSL_NO_AFALGENG" ],
+  openssl_other_defines => [ "OPENSSL_RAND_SEED_OS", "OPENSSL_NO_AFALGENG", "OPENSSL_NO_ASAN", "OPENSSL_NO_CRYPTO_MDEBUG", "OPENSSL_NO_CRYPTO_MDEBUG_BACKTRACE", "OPENSSL_NO_DEVCRYPTOENG", "OPENSSL_NO_EC_NISTP_64_GCC_128", "OPENSSL_NO_EGD", "OPENSSL_NO_EXTERNAL_TESTS", "OPENSSL_NO_FUZZ_AFL", "OPENSSL_NO_FUZZ_LIBFUZZER", "OPENSSL_NO_HEARTBEATS", "OPENSSL_NO_MSAN", "OPENSSL_NO_SCTP", "OPENSSL_NO_SSL3", "OPENSSL_NO_SSL3_METHOD", "OPENSSL_NO_UBSAN", "OPENSSL_NO_UNIT_TEST", "OPENSSL_NO_WEAK_SSL_CIPHERS", "OPENSSL_NO_DYNAMIC_ENGINE" ],
   openssl_sys_defines => [  ],
   openssl_thread_defines => [ "OPENSSL_THREADS" ],
   openssldir => "",
@@ -111,8 +111,8 @@ our %config = (
   sourcedir => ".",
   target => "linux-ppc64",
   tdirs => [ "ossl_shim" ],
-  version => "1.1.1d",
-  version_num => "0x1010104fL",
+  version => "1.1.1e",
+  version_num => "0x1010105fL",
 );
 
 our %target = (
@@ -240,6 +240,7 @@ our @disablables = (
   "dgram",
   "dh",
   "dsa",
+  "dso",
   "dtls",
   "dynamic-engine",
   "ec",
@@ -357,8 +358,8 @@ our %unified_info = (
         {
             "" =>
                 [
-                    "crypto/include/internal/bn_conf.h",
-                    "crypto/include/internal/dso_conf.h",
+                    "include/crypto/bn_conf.h",
+                    "include/crypto/dso_conf.h",
                     "include/openssl/opensslconf.h",
                 ],
             "apps/asn1pars.o" =>
@@ -626,14 +627,6 @@ our %unified_info = (
                     "crypto/perlasm/cbc.pl",
                     "crypto/perlasm/x86asm.pl",
                 ],
-            "crypto/include/internal/bn_conf.h" =>
-                [
-                    "configdata.pm",
-                ],
-            "crypto/include/internal/dso_conf.h" =>
-                [
-                    "configdata.pm",
-                ],
             "crypto/rc4/rc4-586.s" =>
                 [
                     "crypto/perlasm/x86asm.pl",
@@ -709,6 +702,14 @@ our %unified_info = (
                 [
                     "libcrypto",
                 ],
+            "include/crypto/bn_conf.h" =>
+                [
+                    "configdata.pm",
+                ],
+            "include/crypto/dso_conf.h" =>
+                [
+                    "configdata.pm",
+                ],
             "include/openssl/opensslconf.h" =>
                 [
                     "configdata.pm",
@@ -1506,6 +1507,12 @@ our %unified_info = (
                     "libcrypto",
                     "test/libtestutil.a",
                 ],
+            "test/ssl_ctx_test" =>
+                [
+                    "libcrypto",
+                    "libssl",
+                    "test/libtestutil.a",
+                ],
             "test/ssl_test" =>
                 [
                     "libcrypto",
@@ -3240,7 +3247,6 @@ our %unified_info = (
                             "test/testutil/cb.o",
                             "test/testutil/driver.o",
                             "test/testutil/format_output.o",
-                            "test/testutil/init.o",
                             "test/testutil/main.o",
                             "test/testutil/output_helpers.o",
                             "test/testutil/random.o",
@@ -3248,6 +3254,7 @@ our %unified_info = (
                             "test/testutil/tap_bio.o",
                             "test/testutil/test_cleanup.o",
                             "test/testutil/tests.o",
+                            "test/testutil/testutil_init.o",
                         ],
                     "products" =>
                         {
@@ -3746,14 +3753,6 @@ our %unified_info = (
                 [
                     "crypto/ia64cpuid.S",
                 ],
-            "crypto/include/internal/bn_conf.h" =>
-                [
-                    "crypto/include/internal/bn_conf.h.in",
-                ],
-            "crypto/include/internal/dso_conf.h" =>
-                [
-                    "crypto/include/internal/dso_conf.h.in",
-                ],
             "crypto/md5/md5-586.s" =>
                 [
                     "crypto/md5/asm/md5-586.pl",
@@ -4194,6 +4193,14 @@ our %unified_info = (
                     "engines/asm/e_padlock-x86_64.pl",
                     "\$(PERLASM_SCHEME)",
                 ],
+            "include/crypto/bn_conf.h" =>
+                [
+                    "include/crypto/bn_conf.h.in",
+                ],
+            "include/crypto/dso_conf.h" =>
+                [
+                    "include/crypto/dso_conf.h.in",
+                ],
             "include/openssl/opensslconf.h" =>
                 [
                     "include/openssl/opensslconf.h.in",
@@ -4880,7 +4887,6 @@ our %unified_info = (
             "crypto/aes/aes-ppc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/aes/aes-s390x.o" =>
@@ -4894,49 +4900,41 @@ our %unified_info = (
             "crypto/aes/aes_cbc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/aes/aes_cfb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/aes/aes_core.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/aes/aes_ecb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/aes/aes_ige.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/aes/aes_misc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/aes/aes_ofb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/aes/aes_wrap.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/aes/aesfx-sparcv9.o" =>
@@ -4946,7 +4944,6 @@ our %unified_info = (
             "crypto/aes/aesp8-ppc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/aes/aest4-sparcv9.o" =>
@@ -4964,13 +4961,11 @@ our %unified_info = (
             "crypto/aes/vpaes-ppc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/aria/aria.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/arm64cpuid.o" =>
@@ -4984,613 +4979,511 @@ our %unified_info = (
             "crypto/asn1/a_bitstr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_d2i_fp.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_digest.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_dup.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_gentm.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_i2d_fp.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_int.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_mbstr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_object.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_octet.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_print.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_sign.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_strex.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_strnid.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_time.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_type.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_utctm.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_utf8.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_verify.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/ameth_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/asn1_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/asn1_gen.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/asn1_item_list.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/asn1_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/asn1_par.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/asn_mime.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/asn_moid.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/asn_mstbl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/asn_pack.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/bio_asn1.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/bio_ndef.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/d2i_pr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/d2i_pu.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/evp_asn1.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/f_int.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/f_string.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/i2d_pr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/i2d_pu.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/n_pkey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/nsseq.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/p5_pbe.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/p5_pbev2.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/p5_scrypt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/p8_pkey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/t_bitst.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/t_pkey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/t_spki.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/tasn_dec.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/tasn_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/tasn_fre.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/tasn_new.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/tasn_prn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/tasn_scn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/tasn_typ.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/tasn_utl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/x_algor.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/x_bignum.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/x_info.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/x_int64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/x_long.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/x_pkey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/x_sig.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/x_spki.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/x_val.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/async/arch/async_null.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/async/arch/async_posix.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/async/arch/async_win.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/async/async.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/async/async_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/async/async_wait.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bf/bf_cfb64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bf/bf_ecb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bf/bf_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bf/bf_ofb64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bf/bf_skey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/b_addr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/b_dump.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/b_print.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/b_sock.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/b_sock2.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bf_buff.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bf_lbuf.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bf_nbio.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bf_null.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bio_cb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bio_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bio_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bio_meth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bss_acpt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bss_bio.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bss_conn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bss_dgram.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bss_fd.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bss_file.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bss_log.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bss_mem.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bss_null.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bss_sock.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/blake2/blake2b.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/blake2/blake2s.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/blake2/m_blake2b.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/blake2/m_blake2s.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/armv4-gf2m.o" =>
@@ -5608,188 +5501,157 @@ our %unified_info = (
             "crypto/bn/bn-ppc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_add.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_blind.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_const.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_ctx.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_depr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_dh.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_div.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_exp.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto",
                 ],
             "crypto/bn/bn_exp2.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_gcd.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_gf2m.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_intern.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_kron.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_mod.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_mont.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_mpi.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_mul.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_nist.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_prime.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_print.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_rand.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_recp.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_shift.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_sqr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_sqrt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_srp.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_word.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_x931p.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/mips-mont.o" =>
@@ -5799,7 +5661,6 @@ our %unified_info = (
             "crypto/bn/ppc-mont.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/sparct4-mont.o" =>
@@ -5825,13 +5686,11 @@ our %unified_info = (
             "crypto/buffer/buf_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/buffer/buffer.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/buildinf.h" =>
@@ -5841,43 +5700,36 @@ our %unified_info = (
             "crypto/camellia/camellia.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/camellia/cmll_cbc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/camellia/cmll_cfb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/camellia/cmll_ctr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/camellia/cmll_ecb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/camellia/cmll_misc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/camellia/cmll_ofb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/camellia/cmllt4-sparcv9.o" =>
@@ -5887,31 +5739,26 @@ our %unified_info = (
             "crypto/cast/c_cfb64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cast/c_ecb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cast/c_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cast/c_ofb64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cast/c_skey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/chacha/chacha-armv4.o" =>
@@ -5925,7 +5772,6 @@ our %unified_info = (
             "crypto/chacha/chacha-ppc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/chacha/chacha-s390x.o" =>
@@ -5935,272 +5781,227 @@ our %unified_info = (
             "crypto/cmac/cm_ameth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cmac/cm_pmeth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cmac/cmac.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_asn1.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_att.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_cd.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_dd.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_env.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_ess.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_io.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_kari.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_pwri.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_sd.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_smime.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/conf/conf_api.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/conf/conf_def.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/conf/conf_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/conf/conf_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/conf/conf_mall.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/conf/conf_mod.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/conf/conf_sap.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/conf/conf_ssl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cpt_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cryptlib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ct/ct_b64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ct/ct_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ct/ct_log.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ct/ct_oct.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ct/ct_policy.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ct/ct_prn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ct/ct_sct.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ct/ct_sct_ctx.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ct/ct_vfy.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ct/ct_x509v3.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ctype.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cversion.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto",
                 ],
             "crypto/des/cbc_cksm.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/cbc_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/cfb64ede.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/cfb64enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/cfb_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/des_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/dest4-sparcv9.o" =>
@@ -6210,301 +6011,251 @@ our %unified_info = (
             "crypto/des/ecb3_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/ecb_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/fcrypt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/fcrypt_b.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/ofb64ede.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/ofb64enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/ofb_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/pcbc_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/qud_cksm.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/rand_key.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/set_key.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/str2key.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/xcbc_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_ameth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_asn1.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_check.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_depr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_gen.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_kdf.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_key.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_meth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_pmeth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_prn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_rfc5114.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_rfc7919.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dsa/dsa_ameth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dsa/dsa_asn1.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dsa/dsa_depr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dsa/dsa_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dsa/dsa_gen.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dsa/dsa_key.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dsa/dsa_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dsa/dsa_meth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dsa/dsa_ossl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dsa/dsa_pmeth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dsa/dsa_prn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dsa/dsa_sign.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dsa/dsa_vrf.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dso/dso_dl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dso/dso_dlfcn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dso/dso_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dso/dso_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dso/dso_openssl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dso/dso_vms.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dso/dso_win32.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ebcdic.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/curve25519.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/curve448/arch_32/f_impl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto/ec/curve448/arch_32",
                     "crypto/ec/curve448",
@@ -6512,7 +6263,6 @@ our %unified_info = (
             "crypto/ec/curve448/curve448.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto/ec/curve448/arch_32",
                     "crypto/ec/curve448",
@@ -6520,7 +6270,6 @@ our %unified_info = (
             "crypto/ec/curve448/curve448_tables.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto/ec/curve448/arch_32",
                     "crypto/ec/curve448",
@@ -6528,7 +6277,6 @@ our %unified_info = (
             "crypto/ec/curve448/eddsa.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto/ec/curve448/arch_32",
                     "crypto/ec/curve448",
@@ -6536,7 +6284,6 @@ our %unified_info = (
             "crypto/ec/curve448/f_generic.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto/ec/curve448/arch_32",
                     "crypto/ec/curve448",
@@ -6544,7 +6291,6 @@ our %unified_info = (
             "crypto/ec/curve448/scalar.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto/ec/curve448/arch_32",
                     "crypto/ec/curve448",
@@ -6552,163 +6298,136 @@ our %unified_info = (
             "crypto/ec/ec2_oct.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec2_smpl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec_ameth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec_asn1.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec_check.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec_curve.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec_cvt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec_key.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec_kmeth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec_mult.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec_oct.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec_pmeth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec_print.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecdh_kdf.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecdh_ossl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecdsa_ossl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecdsa_sign.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecdsa_vrf.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/eck_prn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecp_mont.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecp_nist.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecp_nistp224.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecp_nistp256.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecp_nistp521.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecp_nistputil.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecp_nistz256-armv4.o" =>
@@ -6722,7 +6441,6 @@ our %unified_info = (
             "crypto/ec/ecp_nistz256-ppc64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecp_nistz256-sparcv9.o" =>
@@ -6732,235 +6450,196 @@ our %unified_info = (
             "crypto/ec/ecp_nistz256.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecp_oct.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecp_smpl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecx_meth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/x25519-ppc64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/eng_all.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/eng_cnf.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/eng_ctrl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/eng_dyn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/eng_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/eng_fat.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/eng_init.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/eng_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/eng_list.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/eng_openssl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/eng_pkey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/eng_rdrand.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/eng_table.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/tb_asnmth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/tb_cipher.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/tb_dh.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/tb_digest.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/tb_dsa.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/tb_eckey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/tb_pkmeth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/tb_rand.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/tb_rsa.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/err/err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/err/err_all.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/err/err_prn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/bio_b64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/bio_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/bio_md.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/bio_ok.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/c_allc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/c_alld.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/cmeth_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/digest.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/e_aes.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto",
                     "crypto/modes",
@@ -6968,21 +6647,18 @@ our %unified_info = (
             "crypto/evp/e_aes_cbc_hmac_sha1.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto/modes",
                 ],
             "crypto/evp/e_aes_cbc_hmac_sha256.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto/modes",
                 ],
             "crypto/evp/e_aria.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto",
                     "crypto/modes",
@@ -6990,13 +6666,11 @@ our %unified_info = (
             "crypto/evp/e_bf.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/e_camellia.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto",
                     "crypto/modes",
@@ -7004,81 +6678,68 @@ our %unified_info = (
             "crypto/evp/e_cast.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/e_chacha20_poly1305.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/e_des.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto",
                 ],
             "crypto/evp/e_des3.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto",
                 ],
             "crypto/evp/e_idea.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/e_null.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/e_old.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/e_rc2.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/e_rc4.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/e_rc4_hmac_md5.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/e_rc5.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/e_seed.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/e_sm4.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto",
                     "crypto/modes",
@@ -7086,328 +6747,267 @@ our %unified_info = (
             "crypto/evp/e_xcbc_d.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/encode.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/evp_cnf.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/evp_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/evp_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/evp_key.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/evp_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/evp_pbe.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/evp_pkey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/m_md2.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/m_md4.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/m_md5.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/m_md5_sha1.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/m_mdc2.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/m_null.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/m_ripemd.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/m_sha1.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/m_sha3.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto",
                 ],
             "crypto/evp/m_sigver.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/m_wp.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/names.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/p5_crpt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/p5_crpt2.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/p_dec.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/p_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/p_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/p_open.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/p_seal.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/p_sign.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/p_verify.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/pbe_scrypt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/pmeth_fn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/pmeth_gn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/pmeth_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ex_data.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/getenv.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/hmac/hm_ameth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/hmac/hm_pmeth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/hmac/hmac.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/idea/i_cbc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/idea/i_cfb64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/idea/i_ecb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/idea/i_ofb64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/idea/i_skey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
-            "crypto/include/internal/bn_conf.h" =>
-                [
-                    ".",
-                ],
-            "crypto/include/internal/dso_conf.h" =>
-                [
-                    ".",
-                ],
             "crypto/init.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/kdf/hkdf.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/kdf/kdf_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/kdf/scrypt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/kdf/tls1_prf.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/lhash/lh_stats.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/lhash/lhash.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/md4/md4_dgst.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/md4/md4_one.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/md5/md5-sparcv9.o" =>
@@ -7417,79 +7017,66 @@ our %unified_info = (
             "crypto/md5/md5_dgst.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/md5/md5_one.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/mdc2/mdc2_one.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/mdc2/mdc2dgst.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/mem.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/mem_dbg.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/mem_sec.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/modes/cbc128.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/modes/ccm128.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/modes/cfb128.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/modes/ctr128.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/modes/cts128.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/modes/gcm128.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto",
                 ],
@@ -7508,7 +7095,6 @@ our %unified_info = (
             "crypto/modes/ghashp8-ppc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/modes/ghashv8-armx.o" =>
@@ -7518,361 +7104,301 @@ our %unified_info = (
             "crypto/modes/ocb128.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/modes/ofb128.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/modes/wrap128.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/modes/xts128.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/o_dir.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/o_fips.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/o_fopen.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/o_init.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/o_str.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/o_time.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/objects/o_names.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/objects/obj_dat.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/objects/obj_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/objects/obj_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/objects/obj_xref.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ocsp/ocsp_asn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ocsp/ocsp_cl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ocsp/ocsp_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ocsp/ocsp_ext.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ocsp/ocsp_ht.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ocsp/ocsp_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ocsp/ocsp_prn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ocsp/ocsp_srv.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ocsp/ocsp_vfy.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ocsp/v3_ocsp.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pem/pem_all.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pem/pem_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pem/pem_info.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pem/pem_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pem/pem_oth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pem/pem_pk8.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pem/pem_pkey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pem/pem_sign.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pem/pem_x509.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pem/pem_xaux.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pem/pvkfmt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_add.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_asn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_attr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_crpt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_crt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_decr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_init.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_key.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_kiss.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_mutl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_npas.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_p8d.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_p8e.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_sbag.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_utl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/pk12err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs7/bio_pk7.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs7/pk7_asn1.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs7/pk7_attr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs7/pk7_doit.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs7/pk7_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs7/pk7_mime.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs7/pk7_smime.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs7/pkcs7err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/poly1305/poly1305-armv4.o" =>
@@ -7890,13 +7416,11 @@ our %unified_info = (
             "crypto/poly1305/poly1305-ppc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/poly1305/poly1305-ppcfp.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/poly1305/poly1305-sparcv9.o" =>
@@ -7906,271 +7430,226 @@ our %unified_info = (
             "crypto/poly1305/poly1305.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/poly1305/poly1305_ameth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/poly1305/poly1305_pmeth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ppccap.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ppccpuid.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rand/drbg_ctr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rand/drbg_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rand/rand_egd.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rand/rand_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rand/rand_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rand/rand_unix.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rand/rand_vms.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rand/rand_win.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rand/randfile.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rc2/rc2_cbc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rc2/rc2_ecb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rc2/rc2_skey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rc2/rc2cfb64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rc2/rc2ofb64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rc4/rc4_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rc4/rc4_skey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ripemd/rmd_dgst.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ripemd/rmd_one.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_ameth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_asn1.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_chk.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_crpt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_depr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_gen.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_meth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_mp.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_none.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_oaep.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_ossl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_pk1.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_pmeth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_prn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_pss.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_saos.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_sign.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_ssl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_x931.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_x931g.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/s390xcpuid.o" =>
@@ -8180,31 +7659,26 @@ our %unified_info = (
             "crypto/seed/seed.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/seed/seed_cbc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/seed/seed_cfb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/seed/seed_ecb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/seed/seed_ofb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sha/keccak1600-armv4.o" =>
@@ -8214,7 +7688,6 @@ our %unified_info = (
             "crypto/sha/keccak1600-ppc64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sha/sha1-armv4-large.o" =>
@@ -8232,7 +7705,6 @@ our %unified_info = (
             "crypto/sha/sha1-ppc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sha/sha1-s390x.o" =>
@@ -8246,13 +7718,11 @@ our %unified_info = (
             "crypto/sha/sha1_one.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sha/sha1dgst.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sha/sha256-armv4.o" =>
@@ -8270,7 +7740,6 @@ our %unified_info = (
             "crypto/sha/sha256-ppc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sha/sha256-s390x.o" =>
@@ -8284,13 +7753,11 @@ our %unified_info = (
             "crypto/sha/sha256.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sha/sha256p8-ppc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sha/sha512-armv4.o" =>
@@ -8308,7 +7775,6 @@ our %unified_info = (
             "crypto/sha/sha512-ppc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sha/sha512-s390x.o" =>
@@ -8322,715 +7788,596 @@ our %unified_info = (
             "crypto/sha/sha512.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sha/sha512p8-ppc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/siphash/siphash.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/siphash/siphash_ameth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/siphash/siphash_pmeth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sm2/sm2_crypt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sm2/sm2_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sm2/sm2_pmeth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sm2/sm2_sign.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sm3/m_sm3.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sm3/sm3.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sm4/sm4.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/srp/srp_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/srp/srp_vfy.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/stack/stack.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/store/loader_file.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/store/store_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/store/store_init.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/store/store_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/store/store_register.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/store/store_strings.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/threads_none.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/threads_pthread.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/threads_win.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ts/ts_asn1.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ts/ts_conf.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ts/ts_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ts/ts_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ts/ts_req_print.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ts/ts_req_utils.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ts/ts_rsp_print.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ts/ts_rsp_sign.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ts/ts_rsp_utils.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ts/ts_rsp_verify.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ts/ts_verify_ctx.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/txt_db/txt_db.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ui/ui_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ui/ui_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ui/ui_null.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ui/ui_openssl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ui/ui_util.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/uid.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/whrlpool/wp_block.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/whrlpool/wp_dgst.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/by_dir.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/by_file.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/t_crl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/t_req.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/t_x509.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_att.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_cmp.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_d2.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_def.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_ext.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_lu.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_meth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_obj.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_r2x.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_req.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_set.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_trs.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_txt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_v3.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_vfy.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_vpm.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509cset.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509name.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509rset.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509spki.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509type.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x_all.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x_attrib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x_crl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x_exten.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x_name.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x_pubkey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x_req.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x_x509.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x_x509a.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/pcy_cache.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/pcy_data.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/pcy_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/pcy_map.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/pcy_node.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/pcy_tree.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_addr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_admis.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_akey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_akeya.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_alt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_asid.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_bcons.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_bitst.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_conf.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_cpols.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_crld.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_enum.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_extku.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_genn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_ia5.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_info.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_int.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_ncons.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_pci.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_pcia.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_pcons.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_pku.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_pmaps.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_prn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_purp.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_skey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_sxnet.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_tlsf.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_utl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "engines/e_capi.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "engines/e_padlock.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "fuzz/asn1.o" =>
@@ -9081,6 +8428,14 @@ our %unified_info = (
                 [
                     "include",
                 ],
+            "include/crypto/bn_conf.h" =>
+                [
+                    ".",
+                ],
+            "include/crypto/dso_conf.h" =>
+                [
+                    ".",
+                ],
             "include/openssl/opensslconf.h" =>
                 [
                     ".",
@@ -9325,7 +8680,6 @@ our %unified_info = (
                 [
                     ".",
                     "include",
-                    "crypto/include",
                 ],
             "test/asn1_string_table_test.o" =>
                 [
@@ -9651,7 +9005,6 @@ our %unified_info = (
                 [
                     ".",
                     "include",
-                    "crypto/include",
                 ],
             "test/cipher_overhead_test.o" =>
                 [
@@ -9697,7 +9050,6 @@ our %unified_info = (
             "test/ctype_internal_test.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "test/curve448_internal_test.o" =>
@@ -9763,7 +9115,6 @@ our %unified_info = (
                 [
                     "include",
                     "crypto/ec",
-                    "crypto/include",
                 ],
             "test/ecdsatest.o" =>
                 [
@@ -9788,7 +9139,6 @@ our %unified_info = (
             "test/evp_extra_test.o" =>
                 [
                     "include",
-                    "crypto/include",
                 ],
             "test/evp_test.o" =>
                 [
@@ -9886,7 +9236,6 @@ our %unified_info = (
                 [
                     ".",
                     "include",
-                    "crypto/include",
                 ],
             "test/rc2test.o" =>
                 [
@@ -9936,18 +9285,15 @@ our %unified_info = (
                 [
                     ".",
                     "include",
-                    "crypto/include",
                 ],
             "test/sm2_internal_test.o" =>
                 [
                     "include",
-                    "crypto/include",
                 ],
             "test/sm4_internal_test.o" =>
                 [
                     ".",
                     "include",
-                    "crypto/include",
                 ],
             "test/srptest.o" =>
                 [
@@ -9958,6 +9304,10 @@ our %unified_info = (
                     ".",
                     "include",
                 ],
+            "test/ssl_ctx_test.o" =>
+                [
+                    "include",
+                ],
             "test/ssl_test.o" =>
                 [
                     "include",
@@ -10021,10 +9371,6 @@ our %unified_info = (
                 [
                     "include",
                 ],
-            "test/testutil/init.o" =>
-                [
-                    "include",
-                ],
             "test/testutil/main.o" =>
                 [
                     "include",
@@ -10053,6 +9399,10 @@ our %unified_info = (
                 [
                     "include",
                 ],
+            "test/testutil/testutil_init.o" =>
+                [
+                    "include",
+                ],
             "test/threadstest.o" =>
                 [
                     "include",
@@ -10317,6 +9667,7 @@ our %unified_info = (
             "test/sm4_internal_test",
             "test/srptest",
             "test/ssl_cert_table_internal_test",
+            "test/ssl_ctx_test",
             "test/ssl_test",
             "test/ssl_test_ctx_test",
             "test/sslapitest",
@@ -15287,7 +14638,6 @@ our %unified_info = (
                     "test/testutil/cb.o",
                     "test/testutil/driver.o",
                     "test/testutil/format_output.o",
-                    "test/testutil/init.o",
                     "test/testutil/main.o",
                     "test/testutil/output_helpers.o",
                     "test/testutil/random.o",
@@ -15295,6 +14645,7 @@ our %unified_info = (
                     "test/testutil/tap_bio.o",
                     "test/testutil/test_cleanup.o",
                     "test/testutil/tests.o",
+                    "test/testutil/testutil_init.o",
                 ],
             "test/md2test" =>
                 [
@@ -15522,6 +14873,14 @@ our %unified_info = (
                 [
                     "test/ssl_cert_table_internal_test.c",
                 ],
+            "test/ssl_ctx_test" =>
+                [
+                    "test/ssl_ctx_test.o",
+                ],
+            "test/ssl_ctx_test.o" =>
+                [
+                    "test/ssl_ctx_test.c",
+                ],
             "test/ssl_test" =>
                 [
                     "test/handshake_helper.o",
@@ -15624,10 +14983,6 @@ our %unified_info = (
                 [
                     "test/testutil/format_output.c",
                 ],
-            "test/testutil/init.o" =>
-                [
-                    "test/testutil/init.c",
-                ],
             "test/testutil/main.o" =>
                 [
                     "test/testutil/main.c",
@@ -15656,6 +15011,10 @@ our %unified_info = (
                 [
                     "test/testutil/tests.c",
                 ],
+            "test/testutil/testutil_init.o" =>
+                [
+                    "test/testutil/testutil_init.c",
+                ],
             "test/threadstest" =>
                 [
                     "test/threadstest.o",
diff --git a/deps/openssl/config/archs/linux-ppc64/asm/crypto/bn/ppc64-mont.s b/deps/openssl/config/archs/linux-ppc64/asm/crypto/bn/ppc64-mont.s
deleted file mode 100644
index c8a045698b..0000000000
--- a/deps/openssl/config/archs/linux-ppc64/asm/crypto/bn/ppc64-mont.s
+++ /dev/null
@@ -1,753 +0,0 @@
-.machine	"any"
-.text
-
-.globl	bn_mul_mont_fpu64
-.type	bn_mul_mont_fpu64,@function
-.section	".opd","aw"
-.align	3
-bn_mul_mont_fpu64:
-.quad	.bn_mul_mont_fpu64,.TOC.@tocbase,0
-.previous
-
-.align	5
-.bn_mul_mont_fpu64:
-	cmpwi	8,3
-	mr	9,3
-	li	3,0
-	.long	0x4dc00020
-	andi.	0,8,1
-	.long	0x4cc20020
-
-	slwi	8,8,3
-	li	12,-4096
-	slwi	10,8,2
-	add	10,10,8
-	addi	10,10,552
-	subf	10,10,1
-	and	10,10,12
-	subf	10,1,10
-	mr	12,1
-	stdux	1,1,10
-
-	std	19,-200(12)
-	std	20,-192(12)
-	std	21,-184(12)
-	std	22,-176(12)
-	std	23,-168(12)
-	std	24,-160(12)
-	std	25,-152(12)
-	std	26,-144(12)
-	std	27,-136(12)
-	std	28,-128(12)
-	std	29,-120(12)
-	std	30,-112(12)
-	std	31,-104(12)
-	stfd	20,-96(12)
-	stfd	21,-88(12)
-	stfd	22,-80(12)
-	stfd	23,-72(12)
-	stfd	24,-64(12)
-	stfd	25,-56(12)
-	stfd	26,-48(12)
-	stfd	27,-40(12)
-	stfd	28,-32(12)
-	stfd	29,-24(12)
-	stfd	30,-16(12)
-	stfd	31,-8(12)
-
-	addi	10,1,264
-	li	12,-64
-	add	22,10,8
-	and	22,22,12
-
-	addi	22,22,-8
-	srwi	11,8,4
-	addi	11,11,-1
-	addi	10,1,184
-	li	0,0
-	mtctr	11
-	ld	23,0(4)
-	ld	27,0(5)
-	ld	7,0(7)
-
-	mulld	31,23,27
-
-	rldicl	24,27,0,48
-	rldicl	25,27,48,48
-	rldicl	26,27,32,48
-	rldicl	27,27,16,48
-	std	24,64(1)
-	std	25,72(1)
-	std	26,80(1)
-	std	27,88(1)
-
-	mulld	31,31,7
-
-	rldicl	28,31,0,48
-	rldicl	29,31,48,48
-	rldicl	30,31,32,48
-	rldicl	31,31,16,48
-	std	28,96(1)
-	std	29,104(1)
-	std	30,112(1)
-	std	31,120(1)
-
-	rldicl	24,23,0,32
-	rldicl	25,23,32,32
-	lwz	26,12(4)
-	lwz	27,8(4)
-	lwz	28,4(6)
-	lwz	29,0(6)
-	lwz	30,12(6)
-	lwz	31,8(6)
-	lfd	0,64(1)
-	lfd	1,72(1)
-	lfd	2,80(1)
-	lfd	3,88(1)
-	lfd	4,96(1)
-	lfd	5,104(1)
-	lfd	6,112(1)
-	lfd	7,120(1)
-	std	24,128(1)
-	std	25,136(1)
-	std	26,144(1)
-	std	27,152(1)
-	std	28,160(1)
-	std	29,168(1)
-	std	30,176(1)
-	std	31,184(1)
-	fcfid	0,0
-	fcfid	1,1
-	fcfid	2,2
-	fcfid	3,3
-	fcfid	4,4
-	fcfid	5,5
-	fcfid	6,6
-	fcfid	7,7
-
-	lfd	10,128(1)
-	lfd	11,136(1)
-	lfd	12,144(1)
-	lfd	13,152(1)
-	lfd	20,160(1)
-	lfd	21,168(1)
-	lfd	22,176(1)
-	lfd	23,184(1)
-	fcfid	10,10
-	fcfid	11,11
-	fcfid	12,12
-	fcfid	13,13
-	fcfid	20,20
-	fcfid	21,21
-	fcfid	22,22
-	fcfid	23,23
-	addi	4,4,16
-	addi	6,6,16
-
-	fmul	26,11,0
-	fmul	27,11,1
-	stfd	10,8(22)
-	stfd	11,16(22)
-	fmul	28,12,0
-	fmul	29,12,1
-	stfd	12,24(22)
-	stfd	13,32(22)
-	fmul	30,13,0
-	fmul	31,13,1
-	stfd	20,40(22)
-	stfd	21,48(22)
-	fmul	24,10,0
-	fmul	25,10,1
-	stfd	22,56(22)
-	stfdu	23,64(22)
-
-	fmadd	26,10,2,26
-	fmadd	27,10,3,27
-	fmadd	28,11,2,28
-	fmadd	29,11,3,29
-	fmadd	30,12,2,30
-	fmadd	31,12,3,31
-	fmul	8,13,2
-	fmul	9,13,3
-
-	fmadd	26,21,4,26
-	fmadd	27,21,5,27
-	fmadd	28,22,4,28
-	fmadd	29,22,5,29
-	fmadd	30,23,4,30
-	fmadd	31,23,5,31
-	fmadd	24,20,4,24
-	fmadd	25,20,5,25
-
-	fmadd	26,20,6,26
-	fmadd	27,20,7,27
-	fmadd	28,21,6,28
-	fmadd	29,21,7,29
-	fmadd	30,22,6,30
-	fmadd	31,22,7,31
-	fmadd	8,23,6,8
-	fmadd	9,23,7,9
-
-	fctid	24,24
-	fctid	25,25
-	fctid	26,26
-	fctid	27,27
-	fctid	28,28
-	fctid	29,29
-	fctid	30,30
-	fctid	31,31
-
-	stfd	24,64(1)
-	stfd	25,72(1)
-	stfd	26,80(1)
-	stfd	27,88(1)
-	stfd	28,96(1)
-	stfd	29,104(1)
-	stfd	30,112(1)
-	stfd	31,120(1)
-
-.align	5
-.L1st:
-	lwz	24,4(4)
-	lwz	25,0(4)
-	lwz	26,12(4)
-	lwz	27,8(4)
-	lwz	28,4(6)
-	lwz	29,0(6)
-	lwz	30,12(6)
-	lwz	31,8(6)
-	std	24,128(1)
-	std	25,136(1)
-	std	26,144(1)
-	std	27,152(1)
-	std	28,160(1)
-	std	29,168(1)
-	std	30,176(1)
-	std	31,184(1)
-	ld	24,64(1)
-	ld	25,72(1)
-	ld	26,80(1)
-	ld	27,88(1)
-	ld	28,96(1)
-	ld	29,104(1)
-	ld	30,112(1)
-	ld	31,120(1)
-	lfd	10,128(1)
-	lfd	11,136(1)
-	lfd	12,144(1)
-	lfd	13,152(1)
-	lfd	20,160(1)
-	lfd	21,168(1)
-	lfd	22,176(1)
-	lfd	23,184(1)
-	fcfid	10,10
-	fcfid	11,11
-	fcfid	12,12
-	fcfid	13,13
-	fcfid	20,20
-	fcfid	21,21
-	fcfid	22,22
-	fcfid	23,23
-	addi	4,4,16
-	addi	6,6,16
-
-	fmul	26,11,0
-	fmul	27,11,1
-	fmul	28,12,0
-	fmul	29,12,1
-	stfd	10,8(22)
-	stfd	11,16(22)
-	fmul	30,13,0
-	fmul	31,13,1
-	fmadd	24,10,0,8
-	fmadd	25,10,1,9
-	stfd	12,24(22)
-	stfd	13,32(22)
-	fmadd	26,10,2,26
-	fmadd	27,10,3,27
-	fmadd	28,11,2,28
-	fmadd	29,11,3,29
-	stfd	20,40(22)
-	stfd	21,48(22)
-	fmadd	30,12,2,30
-	fmadd	31,12,3,31
-	add	24,24,0
-	fmul	8,13,2
-	fmul	9,13,3
-	stfd	22,56(22)
-	stfdu	23,64(22)
-	srdi	0,24,16
-	add	25,25,0
-	srdi	0,25,16
-
-	fmadd	26,21,4,26
-	fmadd	27,21,5,27
-	insrdi	24,25,16,32
-	fmadd	28,22,4,28
-	fmadd	29,22,5,29
-	add	26,26,0
-	fmadd	30,23,4,30
-	fmadd	31,23,5,31
-	srdi	0,26,16
-	fmadd	24,20,4,24
-	fmadd	25,20,5,25
-	insrdi	24,26,16,16
-	add	27,27,0
-	srdi	0,27,16
-
-	fmadd	26,20,6,26
-	fmadd	27,20,7,27
-	insrdi	24,27,16,0
-	fmadd	28,21,6,28
-	fmadd	29,21,7,29
-	add	28,28,0
-	fmadd	30,22,6,30
-	fmadd	31,22,7,31
-	srdi	0,28,16
-	fmadd	8,23,6,8
-	fmadd	9,23,7,9
-	add	29,29,0
-	srdi	0,29,16
-	insrdi	28,29,16,32
-
-	fctid	24,24
-	fctid	25,25
-	add	30,30,0
-	fctid	26,26
-	fctid	27,27
-	srdi	0,30,16
-	fctid	28,28
-	fctid	29,29
-	insrdi	28,30,16,16
-	fctid	30,30
-	fctid	31,31
-	add	31,31,0
-	insrdi	28,31,16,0
-	srdi	0,31,16
-
-	stfd	24,64(1)
-	stfd	25,72(1)
-	stfd	26,80(1)
-	stfd	27,88(1)
-	stfd	28,96(1)
-	stfd	29,104(1)
-	stfd	30,112(1)
-	stfd	31,120(1)
-	std	24,8(10)
-	stdu	28,16(10)
-	bdnz	.L1st
-
-	fctid	8,8
-	fctid	9,9
-	ld	24,64(1)
-	ld	25,72(1)
-	ld	26,80(1)
-	ld	27,88(1)
-	ld	28,96(1)
-	ld	29,104(1)
-	ld	30,112(1)
-	ld	31,120(1)
-	stfd	8,128(1)
-	stfd	9,136(1)
-
-	add	24,24,0
-	srdi	0,24,16
-	add	25,25,0
-	srdi	0,25,16
-	insrdi	24,25,16,32
-	add	26,26,0
-	srdi	0,26,16
-	insrdi	24,26,16,16
-	add	27,27,0
-	srdi	0,27,16
-	insrdi	24,27,16,0
-	add	28,28,0
-	srdi	0,28,16
-	add	29,29,0
-	srdi	0,29,16
-	insrdi	28,29,16,32
-	add	30,30,0
-	srdi	0,30,16
-	insrdi	28,30,16,16
-	add	31,31,0
-	insrdi	28,31,16,0
-	srdi	0,31,16
-	ld	30,128(1)
-	ld	31,136(1)
-
-	std	24,8(10)
-	stdu	28,16(10)
-
-	add	30,30,0
-	srdi	0,30,16
-	add	31,31,0
-	insrdi	30,31,48,0
-	srdi	3,31,48
-	std	30,8(10)
-	slwi	31,8,2
-	subf	22,31,22
-
-	li	12,8
-.align	5
-.Louter:
-	addi	10,1,192
-	li	0,0
-	mtctr	11
-	ldx	27,5,12
-
-	ld	30,200(1)
-	mulld	31,23,27
-	add	31,31,30
-
-	rldicl	24,27,0,48
-	rldicl	25,27,48,48
-	rldicl	26,27,32,48
-	rldicl	27,27,16,48
-	std	24,64(1)
-	std	25,72(1)
-	std	26,80(1)
-	std	27,88(1)
-
-	mulld	31,31,7
-
-	rldicl	28,31,0,48
-	rldicl	29,31,48,48
-	rldicl	30,31,32,48
-	rldicl	31,31,16,48
-	std	28,96(1)
-	std	29,104(1)
-	std	30,112(1)
-	std	31,120(1)
-	lfd	10,8(22)
-	lfd	11,16(22)
-	lfd	12,24(22)
-	lfd	13,32(22)
-	lfd	20,40(22)
-	lfd	21,48(22)
-	lfd	22,56(22)
-	lfdu	23,64(22)
-
-	lfd	0,64(1)
-	lfd	1,72(1)
-	lfd	2,80(1)
-	lfd	3,88(1)
-	lfd	4,96(1)
-	lfd	5,104(1)
-	lfd	6,112(1)
-	lfd	7,120(1)
-
-	fcfid	0,0
-	fcfid	1,1
-	fcfid	2,2
-	fcfid	3,3
-	fcfid	4,4
-	fcfid	5,5
-	fcfid	6,6
-	fcfid	7,7
-
-	fmul	26,11,0
-	fmul	27,11,1
-	fmul	28,12,0
-	fmul	29,12,1
-	fmul	30,13,0
-	fmul	31,13,1
-	fmul	24,10,0
-	fmul	25,10,1
-
-	fmadd	26,10,2,26
-	fmadd	27,10,3,27
-	fmadd	28,11,2,28
-	fmadd	29,11,3,29
-	fmadd	30,12,2,30
-	fmadd	31,12,3,31
-	fmul	8,13,2
-	fmul	9,13,3
-
-	fmadd	26,21,4,26
-	fmadd	27,21,5,27
-	lfd	10,8(22)
-	lfd	11,16(22)
-	fmadd	28,22,4,28
-	fmadd	29,22,5,29
-	lfd	12,24(22)
-	lfd	13,32(22)
-	fmadd	30,23,4,30
-	fmadd	31,23,5,31
-	fmadd	24,20,4,24
-	fmadd	25,20,5,25
-
-	fmadd	26,20,6,26
-	fmadd	27,20,7,27
-	fmadd	28,21,6,28
-	fmadd	29,21,7,29
-	fmadd	30,22,6,30
-	fmadd	31,22,7,31
-	fmadd	8,23,6,8
-	fmadd	9,23,7,9
-
-	fctid	24,24
-	fctid	25,25
-	fctid	26,26
-	fctid	27,27
-	fctid	28,28
-	fctid	29,29
-	fctid	30,30
-	fctid	31,31
-
-	stfd	24,64(1)
-	stfd	25,72(1)
-	stfd	26,80(1)
-	stfd	27,88(1)
-	stfd	28,96(1)
-	stfd	29,104(1)
-	stfd	30,112(1)
-	stfd	31,120(1)
-
-.align	5
-.Linner:
-	fmul	26,11,0
-	fmul	27,11,1
-	fmul	28,12,0
-	fmul	29,12,1
-	lfd	20,40(22)
-	lfd	21,48(22)
-	fmul	30,13,0
-	fmul	31,13,1
-	fmadd	24,10,0,8
-	fmadd	25,10,1,9
-	lfd	22,56(22)
-	lfdu	23,64(22)
-
-	fmadd	26,10,2,26
-	fmadd	27,10,3,27
-	fmadd	28,11,2,28
-	fmadd	29,11,3,29
-	lfd	10,8(22)
-	lfd	11,16(22)
-	fmadd	30,12,2,30
-	fmadd	31,12,3,31
-	fmul	8,13,2
-	fmul	9,13,3
-	lfd	12,24(22)
-	lfd	13,32(22)
-	fmadd	26,21,4,26
-	fmadd	27,21,5,27
-	ld	24,64(1)
-	ld	25,72(1)
-	fmadd	28,22,4,28
-	fmadd	29,22,5,29
-	ld	26,80(1)
-	ld	27,88(1)
-	fmadd	30,23,4,30
-	fmadd	31,23,5,31
-	add	24,24,0
-	ld	28,96(1)
-	ld	29,104(1)
-	fmadd	24,20,4,24
-	fmadd	25,20,5,25
-	srdi	0,24,16
-	add	25,25,0
-	srdi	0,25,16
-	ld	30,112(1)
-	ld	31,120(1)
-
-	fmadd	26,20,6,26
-	fmadd	27,20,7,27
-	insrdi	24,25,16,32
-	ld	25,8(10)
-	fmadd	28,21,6,28
-	fmadd	29,21,7,29
-	add	26,26,0
-	fmadd	30,22,6,30
-	fmadd	31,22,7,31
-	srdi	0,26,16
-	insrdi	24,26,16,16
-	fmadd	8,23,6,8
-	fmadd	9,23,7,9
-	add	27,27,0
-	ldu	26,16(10)
-	srdi	0,27,16
-	insrdi	24,27,16,0
-	add	28,28,0
-
-	fctid	24,24
-	fctid	25,25
-	srdi	0,28,16
-	fctid	26,26
-	fctid	27,27
-	add	29,29,0
-	fctid	28,28
-	fctid	29,29
-	srdi	0,29,16
-	insrdi	28,29,16,32
-	fctid	30,30
-	fctid	31,31
-	add	30,30,0
-	srdi	0,30,16
-	insrdi	28,30,16,16
-
-	stfd	24,64(1)
-	stfd	25,72(1)
-	add	31,31,0
-	addc	27,24,25
-	stfd	26,80(1)
-	stfd	27,88(1)
-	insrdi	28,31,16,0
-	srdi	0,31,16
-	stfd	28,96(1)
-	stfd	29,104(1)
-	adde	29,28,26
-	stfd	30,112(1)
-	stfd	31,120(1)
-	addze	0,0
-	std	27,-16(10)
-	std	29,-8(10)
-	bdnz	.Linner
-
-	fctid	8,8
-	fctid	9,9
-	ld	24,64(1)
-	ld	25,72(1)
-	ld	26,80(1)
-	ld	27,88(1)
-	ld	28,96(1)
-	ld	29,104(1)
-	ld	30,112(1)
-	ld	31,120(1)
-	stfd	8,128(1)
-	stfd	9,136(1)
-
-	add	24,24,0
-	srdi	0,24,16
-	add	25,25,0
-	srdi	0,25,16
-	insrdi	24,25,16,32
-	add	26,26,0
-	ld	25,8(10)
-	srdi	0,26,16
-	insrdi	24,26,16,16
-	add	27,27,0
-	ldu	26,16(10)
-	srdi	0,27,16
-	insrdi	24,27,16,0
-	add	28,28,0
-	srdi	0,28,16
-	add	29,29,0
-	srdi	0,29,16
-	insrdi	28,29,16,32
-	add	30,30,0
-	srdi	0,30,16
-	insrdi	28,30,16,16
-	add	31,31,0
-	insrdi	28,31,16,0
-	srdi	0,31,16
-	ld	30,128(1)
-	ld	31,136(1)
-
-	addc	27,24,25
-	adde	29,28,26
-	addze	0,0
-
-	std	27,-16(10)
-	std	29,-8(10)
-
-	add	0,0,3
-	add	30,30,0
-	srdi	0,30,16
-	add	31,31,0
-	insrdi	30,31,48,0
-	srdi	3,31,48
-	std	30,0(10)
-	slwi	31,8,2
-	addi	12,12,8
-	subf	22,31,22
-	cmpw	12,8
-	blt-	.Louter
-	subf	6,8,6
-	addi	11,11,1
-	subfc	12,12,12
-	addi	10,1,200
-	addi	28,1,208
-	addi	29,6,8
-	addi	30,9,8
-	mtctr	11
-
-.align	4
-.Lsub:	ldx	24,10,12
-	ldx	25,6,12
-	ldx	26,28,12
-	ldx	27,29,12
-	subfe	24,25,24
-	subfe	26,27,26
-	stdx	24,9,12
-	stdx	26,30,12
-	addi	12,12,16
-	bdnz	.Lsub
-
-	li	12,0
-	subfe	3,12,3
-	mtctr	11
-
-.align	4
-.Lcopy:
-	ldx	24,10,12
-	ldx	25,28,12
-	ldx	26,9,12
-	ldx	27,30,12
-	std	12,8(22)
-	std	12,16(22)
-	std	12,24(22)
-	std	12,32(22)
-	std	12,40(22)
-	std	12,48(22)
-	std	12,56(22)
-	stdu	12,64(22)
-	and	24,24,3
-	and	25,25,3
-	andc	26,26,3
-	andc	27,27,3
-	or	24,24,26
-	or	25,25,27
-	stdx	24,9,12
-	stdx	25,30,12
-	stdx	12,10,12
-	stdx	12,28,12
-	addi	12,12,16
-	bdnz	.Lcopy
-	ld	12,0(1)
-	li	3,1
-	ld	19,-200(12)
-	ld	20,-192(12)
-	ld	21,-184(12)
-	ld	22,-176(12)
-	ld	23,-168(12)
-	ld	24,-160(12)
-	ld	25,-152(12)
-	ld	26,-144(12)
-	ld	27,-136(12)
-	ld	28,-128(12)
-	ld	29,-120(12)
-	ld	30,-112(12)
-	ld	31,-104(12)
-	lfd	20,-96(12)
-	lfd	21,-88(12)
-	lfd	22,-80(12)
-	lfd	23,-72(12)
-	lfd	24,-64(12)
-	lfd	25,-56(12)
-	lfd	26,-48(12)
-	lfd	27,-40(12)
-	lfd	28,-32(12)
-	lfd	29,-24(12)
-	lfd	30,-16(12)
-	lfd	31,-8(12)
-	mr	1,12
-	blr	
-.long	0
-.byte	0,12,4,0,0x8c,13,6,0
-.long	0
-.size	bn_mul_mont_fpu64,.-.bn_mul_mont_fpu64
-.size	.bn_mul_mont_fpu64,.-.bn_mul_mont_fpu64
-
-.byte	77,111,110,116,103,111,109,101,114,121,32,77,117,108,116,105,112,108,105,99,97,116,105,111,110,32,102,111,114,32,80,80,67,54,52,44,32,67,82,89,80,84,79,71,65,77,83,32,98,121,32,60,97,112,112,114,111,64,111,112,101,110,115,115,108,46,111,114,103,62,0
-.align	2
diff --git a/deps/openssl/config/archs/linux-ppc64/asm/crypto/buildinf.h b/deps/openssl/config/archs/linux-ppc64/asm/crypto/buildinf.h
index 2c9f24fdee..f367bbd342 100644
--- a/deps/openssl/config/archs/linux-ppc64/asm/crypto/buildinf.h
+++ b/deps/openssl/config/archs/linux-ppc64/asm/crypto/buildinf.h
@@ -11,7 +11,7 @@
  */
 
 #define PLATFORM "platform: linux-ppc64"
-#define DATE "built on: Fri Sep 13 16:01:02 2019 UTC"
+#define DATE "built on: Wed Mar 18 21:08:05 2020 UTC"
 
 /*
  * Generate compiler_flags as an array of individual characters. This is a
diff --git a/deps/openssl/config/archs/linux-ppc64/asm/crypto/include/internal/bn_conf.h b/deps/openssl/config/archs/linux-ppc64/asm/crypto/include/internal/bn_conf.h
index 34bd8b78b4..5312ef5a7a 100644
--- a/deps/openssl/config/archs/linux-ppc64/asm/crypto/include/internal/bn_conf.h
+++ b/deps/openssl/config/archs/linux-ppc64/asm/crypto/include/internal/bn_conf.h
@@ -1,5 +1,5 @@
 /* WARNING: do not edit! */
-/* Generated by Makefile from crypto/include/internal/bn_conf.h.in */
+/* Generated by Makefile from include/crypto/bn_conf.h.in */
 /*
  * Copyright 2016 The OpenSSL Project Authors. All Rights Reserved.
  *
@@ -9,8 +9,8 @@
  * https://www.openssl.org/source/license.html
  */
 
-#ifndef HEADER_BN_CONF_H
-# define HEADER_BN_CONF_H
+#ifndef OSSL_CRYPTO_BN_CONF_H
+# define OSSL_CRYPTO_BN_CONF_H
 
 /*
  * The contents of this file are not used in the UEFI build, as
diff --git a/deps/openssl/config/archs/linux-ppc64/asm/crypto/include/internal/dso_conf.h b/deps/openssl/config/archs/linux-ppc64/asm/crypto/include/internal/dso_conf.h
index 252266ec2a..4b1167c3d8 100644
--- a/deps/openssl/config/archs/linux-ppc64/asm/crypto/include/internal/dso_conf.h
+++ b/deps/openssl/config/archs/linux-ppc64/asm/crypto/include/internal/dso_conf.h
@@ -1,5 +1,5 @@
 /* WARNING: do not edit! */
-/* Generated by Makefile from crypto/include/internal/dso_conf.h.in */
+/* Generated by Makefile from include/crypto/dso_conf.h.in */
 /*
  * Copyright 2016-2019 The OpenSSL Project Authors. All Rights Reserved.
  *
@@ -9,8 +9,8 @@
  * https://www.openssl.org/source/license.html
  */
 
-#ifndef HEADER_DSO_CONF_H
-# define HEADER_DSO_CONF_H
+#ifndef OSSL_CRYPTO_DSO_CONF_H
+# define OSSL_CRYPTO_DSO_CONF_H
 # define DSO_DLFCN
 # define HAVE_DLFCN_H
 # define DSO_EXTENSION ".so"
diff --git a/deps/openssl/config/archs/linux-ppc64/asm/include/openssl/opensslconf.h b/deps/openssl/config/archs/linux-ppc64/asm/include/openssl/opensslconf.h
index 30820b6051..937531fe9f 100644
--- a/deps/openssl/config/archs/linux-ppc64/asm/include/openssl/opensslconf.h
+++ b/deps/openssl/config/archs/linux-ppc64/asm/include/openssl/opensslconf.h
@@ -96,9 +96,6 @@ extern "C" {
 #ifndef OPENSSL_NO_DYNAMIC_ENGINE
 # define OPENSSL_NO_DYNAMIC_ENGINE
 #endif
-#ifndef OPENSSL_NO_AFALGENG
-# define OPENSSL_NO_AFALGENG
-#endif
 
 
 /*
diff --git a/deps/openssl/config/archs/linux-ppc64/asm/include/progs.h b/deps/openssl/config/archs/linux-ppc64/asm/include/progs.h
index 9b3d270e20..308c65601b 100644
--- a/deps/openssl/config/archs/linux-ppc64/asm/include/progs.h
+++ b/deps/openssl/config/archs/linux-ppc64/asm/include/progs.h
@@ -2,7 +2,7 @@
  * WARNING: do not edit!
  * Generated by apps/progs.pl
  *
- * Copyright 1995-2019 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 1995-2020 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
diff --git a/deps/openssl/config/archs/linux-ppc64/asm_avx2/configdata.pm b/deps/openssl/config/archs/linux-ppc64/asm_avx2/configdata.pm
index fa53549253..d1cc20b09e 100644
--- a/deps/openssl/config/archs/linux-ppc64/asm_avx2/configdata.pm
+++ b/deps/openssl/config/archs/linux-ppc64/asm_avx2/configdata.pm
@@ -55,7 +55,7 @@ our %config = (
   minor => "1.1",
   openssl_algorithm_defines => [ "OPENSSL_NO_COMP", "OPENSSL_NO_MD2", "OPENSSL_NO_RC5" ],
   openssl_api_defines => [  ],
-  openssl_other_defines => [ "OPENSSL_RAND_SEED_OS", "OPENSSL_NO_AFALGENG", "OPENSSL_NO_ASAN", "OPENSSL_NO_CRYPTO_MDEBUG", "OPENSSL_NO_CRYPTO_MDEBUG_BACKTRACE", "OPENSSL_NO_DEVCRYPTOENG", "OPENSSL_NO_EC_NISTP_64_GCC_128", "OPENSSL_NO_EGD", "OPENSSL_NO_EXTERNAL_TESTS", "OPENSSL_NO_FUZZ_AFL", "OPENSSL_NO_FUZZ_LIBFUZZER", "OPENSSL_NO_HEARTBEATS", "OPENSSL_NO_MSAN", "OPENSSL_NO_SCTP", "OPENSSL_NO_SSL3", "OPENSSL_NO_SSL3_METHOD", "OPENSSL_NO_UBSAN", "OPENSSL_NO_UNIT_TEST", "OPENSSL_NO_WEAK_SSL_CIPHERS", "OPENSSL_NO_DYNAMIC_ENGINE", "OPENSSL_NO_AFALGENG" ],
+  openssl_other_defines => [ "OPENSSL_RAND_SEED_OS", "OPENSSL_NO_AFALGENG", "OPENSSL_NO_ASAN", "OPENSSL_NO_CRYPTO_MDEBUG", "OPENSSL_NO_CRYPTO_MDEBUG_BACKTRACE", "OPENSSL_NO_DEVCRYPTOENG", "OPENSSL_NO_EC_NISTP_64_GCC_128", "OPENSSL_NO_EGD", "OPENSSL_NO_EXTERNAL_TESTS", "OPENSSL_NO_FUZZ_AFL", "OPENSSL_NO_FUZZ_LIBFUZZER", "OPENSSL_NO_HEARTBEATS", "OPENSSL_NO_MSAN", "OPENSSL_NO_SCTP", "OPENSSL_NO_SSL3", "OPENSSL_NO_SSL3_METHOD", "OPENSSL_NO_UBSAN", "OPENSSL_NO_UNIT_TEST", "OPENSSL_NO_WEAK_SSL_CIPHERS", "OPENSSL_NO_DYNAMIC_ENGINE" ],
   openssl_sys_defines => [  ],
   openssl_thread_defines => [ "OPENSSL_THREADS" ],
   openssldir => "",
@@ -111,8 +111,8 @@ our %config = (
   sourcedir => ".",
   target => "linux-ppc64",
   tdirs => [ "ossl_shim" ],
-  version => "1.1.1d",
-  version_num => "0x1010104fL",
+  version => "1.1.1e",
+  version_num => "0x1010105fL",
 );
 
 our %target = (
@@ -240,6 +240,7 @@ our @disablables = (
   "dgram",
   "dh",
   "dsa",
+  "dso",
   "dtls",
   "dynamic-engine",
   "ec",
@@ -357,8 +358,8 @@ our %unified_info = (
         {
             "" =>
                 [
-                    "crypto/include/internal/bn_conf.h",
-                    "crypto/include/internal/dso_conf.h",
+                    "include/crypto/bn_conf.h",
+                    "include/crypto/dso_conf.h",
                     "include/openssl/opensslconf.h",
                 ],
             "apps/asn1pars.o" =>
@@ -626,14 +627,6 @@ our %unified_info = (
                     "crypto/perlasm/cbc.pl",
                     "crypto/perlasm/x86asm.pl",
                 ],
-            "crypto/include/internal/bn_conf.h" =>
-                [
-                    "configdata.pm",
-                ],
-            "crypto/include/internal/dso_conf.h" =>
-                [
-                    "configdata.pm",
-                ],
             "crypto/rc4/rc4-586.s" =>
                 [
                     "crypto/perlasm/x86asm.pl",
@@ -709,6 +702,14 @@ our %unified_info = (
                 [
                     "libcrypto",
                 ],
+            "include/crypto/bn_conf.h" =>
+                [
+                    "configdata.pm",
+                ],
+            "include/crypto/dso_conf.h" =>
+                [
+                    "configdata.pm",
+                ],
             "include/openssl/opensslconf.h" =>
                 [
                     "configdata.pm",
@@ -1506,6 +1507,12 @@ our %unified_info = (
                     "libcrypto",
                     "test/libtestutil.a",
                 ],
+            "test/ssl_ctx_test" =>
+                [
+                    "libcrypto",
+                    "libssl",
+                    "test/libtestutil.a",
+                ],
             "test/ssl_test" =>
                 [
                     "libcrypto",
@@ -3240,7 +3247,6 @@ our %unified_info = (
                             "test/testutil/cb.o",
                             "test/testutil/driver.o",
                             "test/testutil/format_output.o",
-                            "test/testutil/init.o",
                             "test/testutil/main.o",
                             "test/testutil/output_helpers.o",
                             "test/testutil/random.o",
@@ -3248,6 +3254,7 @@ our %unified_info = (
                             "test/testutil/tap_bio.o",
                             "test/testutil/test_cleanup.o",
                             "test/testutil/tests.o",
+                            "test/testutil/testutil_init.o",
                         ],
                     "products" =>
                         {
@@ -3746,14 +3753,6 @@ our %unified_info = (
                 [
                     "crypto/ia64cpuid.S",
                 ],
-            "crypto/include/internal/bn_conf.h" =>
-                [
-                    "crypto/include/internal/bn_conf.h.in",
-                ],
-            "crypto/include/internal/dso_conf.h" =>
-                [
-                    "crypto/include/internal/dso_conf.h.in",
-                ],
             "crypto/md5/md5-586.s" =>
                 [
                     "crypto/md5/asm/md5-586.pl",
@@ -4194,6 +4193,14 @@ our %unified_info = (
                     "engines/asm/e_padlock-x86_64.pl",
                     "\$(PERLASM_SCHEME)",
                 ],
+            "include/crypto/bn_conf.h" =>
+                [
+                    "include/crypto/bn_conf.h.in",
+                ],
+            "include/crypto/dso_conf.h" =>
+                [
+                    "include/crypto/dso_conf.h.in",
+                ],
             "include/openssl/opensslconf.h" =>
                 [
                     "include/openssl/opensslconf.h.in",
@@ -4880,7 +4887,6 @@ our %unified_info = (
             "crypto/aes/aes-ppc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/aes/aes-s390x.o" =>
@@ -4894,49 +4900,41 @@ our %unified_info = (
             "crypto/aes/aes_cbc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/aes/aes_cfb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/aes/aes_core.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/aes/aes_ecb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/aes/aes_ige.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/aes/aes_misc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/aes/aes_ofb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/aes/aes_wrap.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/aes/aesfx-sparcv9.o" =>
@@ -4946,7 +4944,6 @@ our %unified_info = (
             "crypto/aes/aesp8-ppc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/aes/aest4-sparcv9.o" =>
@@ -4964,13 +4961,11 @@ our %unified_info = (
             "crypto/aes/vpaes-ppc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/aria/aria.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/arm64cpuid.o" =>
@@ -4984,613 +4979,511 @@ our %unified_info = (
             "crypto/asn1/a_bitstr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_d2i_fp.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_digest.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_dup.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_gentm.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_i2d_fp.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_int.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_mbstr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_object.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_octet.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_print.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_sign.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_strex.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_strnid.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_time.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_type.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_utctm.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_utf8.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_verify.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/ameth_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/asn1_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/asn1_gen.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/asn1_item_list.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/asn1_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/asn1_par.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/asn_mime.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/asn_moid.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/asn_mstbl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/asn_pack.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/bio_asn1.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/bio_ndef.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/d2i_pr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/d2i_pu.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/evp_asn1.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/f_int.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/f_string.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/i2d_pr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/i2d_pu.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/n_pkey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/nsseq.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/p5_pbe.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/p5_pbev2.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/p5_scrypt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/p8_pkey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/t_bitst.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/t_pkey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/t_spki.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/tasn_dec.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/tasn_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/tasn_fre.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/tasn_new.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/tasn_prn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/tasn_scn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/tasn_typ.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/tasn_utl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/x_algor.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/x_bignum.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/x_info.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/x_int64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/x_long.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/x_pkey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/x_sig.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/x_spki.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/x_val.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/async/arch/async_null.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/async/arch/async_posix.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/async/arch/async_win.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/async/async.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/async/async_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/async/async_wait.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bf/bf_cfb64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bf/bf_ecb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bf/bf_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bf/bf_ofb64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bf/bf_skey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/b_addr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/b_dump.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/b_print.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/b_sock.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/b_sock2.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bf_buff.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bf_lbuf.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bf_nbio.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bf_null.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bio_cb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bio_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bio_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bio_meth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bss_acpt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bss_bio.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bss_conn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bss_dgram.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bss_fd.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bss_file.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bss_log.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bss_mem.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bss_null.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bss_sock.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/blake2/blake2b.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/blake2/blake2s.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/blake2/m_blake2b.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/blake2/m_blake2s.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/armv4-gf2m.o" =>
@@ -5608,188 +5501,157 @@ our %unified_info = (
             "crypto/bn/bn-ppc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_add.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_blind.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_const.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_ctx.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_depr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_dh.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_div.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_exp.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto",
                 ],
             "crypto/bn/bn_exp2.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_gcd.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_gf2m.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_intern.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_kron.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_mod.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_mont.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_mpi.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_mul.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_nist.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_prime.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_print.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_rand.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_recp.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_shift.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_sqr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_sqrt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_srp.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_word.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_x931p.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/mips-mont.o" =>
@@ -5799,7 +5661,6 @@ our %unified_info = (
             "crypto/bn/ppc-mont.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/sparct4-mont.o" =>
@@ -5825,13 +5686,11 @@ our %unified_info = (
             "crypto/buffer/buf_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/buffer/buffer.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/buildinf.h" =>
@@ -5841,43 +5700,36 @@ our %unified_info = (
             "crypto/camellia/camellia.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/camellia/cmll_cbc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/camellia/cmll_cfb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/camellia/cmll_ctr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/camellia/cmll_ecb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/camellia/cmll_misc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/camellia/cmll_ofb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/camellia/cmllt4-sparcv9.o" =>
@@ -5887,31 +5739,26 @@ our %unified_info = (
             "crypto/cast/c_cfb64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cast/c_ecb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cast/c_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cast/c_ofb64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cast/c_skey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/chacha/chacha-armv4.o" =>
@@ -5925,7 +5772,6 @@ our %unified_info = (
             "crypto/chacha/chacha-ppc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/chacha/chacha-s390x.o" =>
@@ -5935,272 +5781,227 @@ our %unified_info = (
             "crypto/cmac/cm_ameth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cmac/cm_pmeth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cmac/cmac.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_asn1.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_att.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_cd.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_dd.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_env.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_ess.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_io.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_kari.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_pwri.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_sd.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_smime.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/conf/conf_api.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/conf/conf_def.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/conf/conf_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/conf/conf_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/conf/conf_mall.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/conf/conf_mod.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/conf/conf_sap.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/conf/conf_ssl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cpt_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cryptlib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ct/ct_b64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ct/ct_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ct/ct_log.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ct/ct_oct.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ct/ct_policy.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ct/ct_prn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ct/ct_sct.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ct/ct_sct_ctx.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ct/ct_vfy.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ct/ct_x509v3.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ctype.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cversion.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto",
                 ],
             "crypto/des/cbc_cksm.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/cbc_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/cfb64ede.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/cfb64enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/cfb_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/des_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/dest4-sparcv9.o" =>
@@ -6210,301 +6011,251 @@ our %unified_info = (
             "crypto/des/ecb3_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/ecb_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/fcrypt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/fcrypt_b.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/ofb64ede.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/ofb64enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/ofb_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/pcbc_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/qud_cksm.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/rand_key.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/set_key.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/str2key.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/xcbc_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_ameth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_asn1.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_check.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_depr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_gen.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_kdf.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_key.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_meth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_pmeth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_prn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_rfc5114.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_rfc7919.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dsa/dsa_ameth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dsa/dsa_asn1.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dsa/dsa_depr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dsa/dsa_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dsa/dsa_gen.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dsa/dsa_key.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dsa/dsa_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dsa/dsa_meth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dsa/dsa_ossl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dsa/dsa_pmeth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dsa/dsa_prn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dsa/dsa_sign.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dsa/dsa_vrf.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dso/dso_dl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dso/dso_dlfcn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dso/dso_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dso/dso_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dso/dso_openssl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dso/dso_vms.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dso/dso_win32.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ebcdic.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/curve25519.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/curve448/arch_32/f_impl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto/ec/curve448/arch_32",
                     "crypto/ec/curve448",
@@ -6512,7 +6263,6 @@ our %unified_info = (
             "crypto/ec/curve448/curve448.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto/ec/curve448/arch_32",
                     "crypto/ec/curve448",
@@ -6520,7 +6270,6 @@ our %unified_info = (
             "crypto/ec/curve448/curve448_tables.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto/ec/curve448/arch_32",
                     "crypto/ec/curve448",
@@ -6528,7 +6277,6 @@ our %unified_info = (
             "crypto/ec/curve448/eddsa.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto/ec/curve448/arch_32",
                     "crypto/ec/curve448",
@@ -6536,7 +6284,6 @@ our %unified_info = (
             "crypto/ec/curve448/f_generic.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto/ec/curve448/arch_32",
                     "crypto/ec/curve448",
@@ -6544,7 +6291,6 @@ our %unified_info = (
             "crypto/ec/curve448/scalar.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto/ec/curve448/arch_32",
                     "crypto/ec/curve448",
@@ -6552,163 +6298,136 @@ our %unified_info = (
             "crypto/ec/ec2_oct.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec2_smpl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec_ameth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec_asn1.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec_check.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec_curve.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec_cvt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec_key.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec_kmeth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec_mult.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec_oct.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec_pmeth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec_print.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecdh_kdf.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecdh_ossl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecdsa_ossl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecdsa_sign.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecdsa_vrf.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/eck_prn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecp_mont.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecp_nist.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecp_nistp224.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecp_nistp256.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecp_nistp521.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecp_nistputil.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecp_nistz256-armv4.o" =>
@@ -6722,7 +6441,6 @@ our %unified_info = (
             "crypto/ec/ecp_nistz256-ppc64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecp_nistz256-sparcv9.o" =>
@@ -6732,235 +6450,196 @@ our %unified_info = (
             "crypto/ec/ecp_nistz256.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecp_oct.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecp_smpl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecx_meth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/x25519-ppc64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/eng_all.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/eng_cnf.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/eng_ctrl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/eng_dyn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/eng_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/eng_fat.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/eng_init.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/eng_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/eng_list.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/eng_openssl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/eng_pkey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/eng_rdrand.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/eng_table.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/tb_asnmth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/tb_cipher.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/tb_dh.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/tb_digest.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/tb_dsa.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/tb_eckey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/tb_pkmeth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/tb_rand.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/tb_rsa.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/err/err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/err/err_all.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/err/err_prn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/bio_b64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/bio_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/bio_md.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/bio_ok.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/c_allc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/c_alld.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/cmeth_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/digest.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/e_aes.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto",
                     "crypto/modes",
@@ -6968,21 +6647,18 @@ our %unified_info = (
             "crypto/evp/e_aes_cbc_hmac_sha1.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto/modes",
                 ],
             "crypto/evp/e_aes_cbc_hmac_sha256.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto/modes",
                 ],
             "crypto/evp/e_aria.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto",
                     "crypto/modes",
@@ -6990,13 +6666,11 @@ our %unified_info = (
             "crypto/evp/e_bf.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/e_camellia.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto",
                     "crypto/modes",
@@ -7004,81 +6678,68 @@ our %unified_info = (
             "crypto/evp/e_cast.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/e_chacha20_poly1305.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/e_des.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto",
                 ],
             "crypto/evp/e_des3.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto",
                 ],
             "crypto/evp/e_idea.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/e_null.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/e_old.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/e_rc2.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/e_rc4.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/e_rc4_hmac_md5.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/e_rc5.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/e_seed.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/e_sm4.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto",
                     "crypto/modes",
@@ -7086,328 +6747,267 @@ our %unified_info = (
             "crypto/evp/e_xcbc_d.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/encode.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/evp_cnf.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/evp_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/evp_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/evp_key.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/evp_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/evp_pbe.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/evp_pkey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/m_md2.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/m_md4.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/m_md5.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/m_md5_sha1.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/m_mdc2.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/m_null.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/m_ripemd.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/m_sha1.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/m_sha3.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto",
                 ],
             "crypto/evp/m_sigver.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/m_wp.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/names.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/p5_crpt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/p5_crpt2.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/p_dec.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/p_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/p_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/p_open.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/p_seal.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/p_sign.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/p_verify.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/pbe_scrypt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/pmeth_fn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/pmeth_gn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/pmeth_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ex_data.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/getenv.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/hmac/hm_ameth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/hmac/hm_pmeth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/hmac/hmac.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/idea/i_cbc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/idea/i_cfb64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/idea/i_ecb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/idea/i_ofb64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/idea/i_skey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
-            "crypto/include/internal/bn_conf.h" =>
-                [
-                    ".",
-                ],
-            "crypto/include/internal/dso_conf.h" =>
-                [
-                    ".",
-                ],
             "crypto/init.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/kdf/hkdf.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/kdf/kdf_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/kdf/scrypt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/kdf/tls1_prf.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/lhash/lh_stats.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/lhash/lhash.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/md4/md4_dgst.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/md4/md4_one.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/md5/md5-sparcv9.o" =>
@@ -7417,79 +7017,66 @@ our %unified_info = (
             "crypto/md5/md5_dgst.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/md5/md5_one.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/mdc2/mdc2_one.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/mdc2/mdc2dgst.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/mem.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/mem_dbg.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/mem_sec.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/modes/cbc128.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/modes/ccm128.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/modes/cfb128.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/modes/ctr128.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/modes/cts128.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/modes/gcm128.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto",
                 ],
@@ -7508,7 +7095,6 @@ our %unified_info = (
             "crypto/modes/ghashp8-ppc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/modes/ghashv8-armx.o" =>
@@ -7518,361 +7104,301 @@ our %unified_info = (
             "crypto/modes/ocb128.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/modes/ofb128.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/modes/wrap128.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/modes/xts128.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/o_dir.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/o_fips.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/o_fopen.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/o_init.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/o_str.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/o_time.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/objects/o_names.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/objects/obj_dat.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/objects/obj_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/objects/obj_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/objects/obj_xref.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ocsp/ocsp_asn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ocsp/ocsp_cl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ocsp/ocsp_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ocsp/ocsp_ext.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ocsp/ocsp_ht.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ocsp/ocsp_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ocsp/ocsp_prn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ocsp/ocsp_srv.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ocsp/ocsp_vfy.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ocsp/v3_ocsp.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pem/pem_all.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pem/pem_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pem/pem_info.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pem/pem_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pem/pem_oth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pem/pem_pk8.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pem/pem_pkey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pem/pem_sign.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pem/pem_x509.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pem/pem_xaux.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pem/pvkfmt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_add.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_asn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_attr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_crpt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_crt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_decr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_init.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_key.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_kiss.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_mutl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_npas.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_p8d.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_p8e.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_sbag.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_utl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/pk12err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs7/bio_pk7.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs7/pk7_asn1.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs7/pk7_attr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs7/pk7_doit.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs7/pk7_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs7/pk7_mime.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs7/pk7_smime.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs7/pkcs7err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/poly1305/poly1305-armv4.o" =>
@@ -7890,13 +7416,11 @@ our %unified_info = (
             "crypto/poly1305/poly1305-ppc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/poly1305/poly1305-ppcfp.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/poly1305/poly1305-sparcv9.o" =>
@@ -7906,271 +7430,226 @@ our %unified_info = (
             "crypto/poly1305/poly1305.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/poly1305/poly1305_ameth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/poly1305/poly1305_pmeth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ppccap.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ppccpuid.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rand/drbg_ctr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rand/drbg_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rand/rand_egd.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rand/rand_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rand/rand_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rand/rand_unix.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rand/rand_vms.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rand/rand_win.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rand/randfile.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rc2/rc2_cbc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rc2/rc2_ecb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rc2/rc2_skey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rc2/rc2cfb64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rc2/rc2ofb64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rc4/rc4_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rc4/rc4_skey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ripemd/rmd_dgst.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ripemd/rmd_one.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_ameth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_asn1.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_chk.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_crpt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_depr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_gen.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_meth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_mp.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_none.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_oaep.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_ossl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_pk1.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_pmeth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_prn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_pss.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_saos.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_sign.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_ssl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_x931.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_x931g.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/s390xcpuid.o" =>
@@ -8180,31 +7659,26 @@ our %unified_info = (
             "crypto/seed/seed.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/seed/seed_cbc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/seed/seed_cfb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/seed/seed_ecb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/seed/seed_ofb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sha/keccak1600-armv4.o" =>
@@ -8214,7 +7688,6 @@ our %unified_info = (
             "crypto/sha/keccak1600-ppc64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sha/sha1-armv4-large.o" =>
@@ -8232,7 +7705,6 @@ our %unified_info = (
             "crypto/sha/sha1-ppc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sha/sha1-s390x.o" =>
@@ -8246,13 +7718,11 @@ our %unified_info = (
             "crypto/sha/sha1_one.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sha/sha1dgst.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sha/sha256-armv4.o" =>
@@ -8270,7 +7740,6 @@ our %unified_info = (
             "crypto/sha/sha256-ppc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sha/sha256-s390x.o" =>
@@ -8284,13 +7753,11 @@ our %unified_info = (
             "crypto/sha/sha256.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sha/sha256p8-ppc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sha/sha512-armv4.o" =>
@@ -8308,7 +7775,6 @@ our %unified_info = (
             "crypto/sha/sha512-ppc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sha/sha512-s390x.o" =>
@@ -8322,715 +7788,596 @@ our %unified_info = (
             "crypto/sha/sha512.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sha/sha512p8-ppc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/siphash/siphash.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/siphash/siphash_ameth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/siphash/siphash_pmeth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sm2/sm2_crypt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sm2/sm2_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sm2/sm2_pmeth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sm2/sm2_sign.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sm3/m_sm3.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sm3/sm3.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sm4/sm4.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/srp/srp_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/srp/srp_vfy.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/stack/stack.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/store/loader_file.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/store/store_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/store/store_init.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/store/store_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/store/store_register.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/store/store_strings.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/threads_none.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/threads_pthread.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/threads_win.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ts/ts_asn1.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ts/ts_conf.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ts/ts_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ts/ts_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ts/ts_req_print.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ts/ts_req_utils.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ts/ts_rsp_print.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ts/ts_rsp_sign.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ts/ts_rsp_utils.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ts/ts_rsp_verify.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ts/ts_verify_ctx.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/txt_db/txt_db.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ui/ui_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ui/ui_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ui/ui_null.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ui/ui_openssl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ui/ui_util.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/uid.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/whrlpool/wp_block.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/whrlpool/wp_dgst.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/by_dir.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/by_file.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/t_crl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/t_req.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/t_x509.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_att.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_cmp.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_d2.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_def.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_ext.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_lu.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_meth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_obj.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_r2x.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_req.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_set.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_trs.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_txt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_v3.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_vfy.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_vpm.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509cset.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509name.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509rset.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509spki.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509type.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x_all.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x_attrib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x_crl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x_exten.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x_name.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x_pubkey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x_req.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x_x509.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x_x509a.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/pcy_cache.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/pcy_data.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/pcy_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/pcy_map.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/pcy_node.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/pcy_tree.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_addr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_admis.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_akey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_akeya.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_alt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_asid.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_bcons.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_bitst.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_conf.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_cpols.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_crld.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_enum.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_extku.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_genn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_ia5.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_info.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_int.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_ncons.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_pci.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_pcia.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_pcons.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_pku.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_pmaps.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_prn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_purp.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_skey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_sxnet.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_tlsf.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_utl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "engines/e_capi.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "engines/e_padlock.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "fuzz/asn1.o" =>
@@ -9081,6 +8428,14 @@ our %unified_info = (
                 [
                     "include",
                 ],
+            "include/crypto/bn_conf.h" =>
+                [
+                    ".",
+                ],
+            "include/crypto/dso_conf.h" =>
+                [
+                    ".",
+                ],
             "include/openssl/opensslconf.h" =>
                 [
                     ".",
@@ -9325,7 +8680,6 @@ our %unified_info = (
                 [
                     ".",
                     "include",
-                    "crypto/include",
                 ],
             "test/asn1_string_table_test.o" =>
                 [
@@ -9651,7 +9005,6 @@ our %unified_info = (
                 [
                     ".",
                     "include",
-                    "crypto/include",
                 ],
             "test/cipher_overhead_test.o" =>
                 [
@@ -9697,7 +9050,6 @@ our %unified_info = (
             "test/ctype_internal_test.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "test/curve448_internal_test.o" =>
@@ -9763,7 +9115,6 @@ our %unified_info = (
                 [
                     "include",
                     "crypto/ec",
-                    "crypto/include",
                 ],
             "test/ecdsatest.o" =>
                 [
@@ -9788,7 +9139,6 @@ our %unified_info = (
             "test/evp_extra_test.o" =>
                 [
                     "include",
-                    "crypto/include",
                 ],
             "test/evp_test.o" =>
                 [
@@ -9886,7 +9236,6 @@ our %unified_info = (
                 [
                     ".",
                     "include",
-                    "crypto/include",
                 ],
             "test/rc2test.o" =>
                 [
@@ -9936,18 +9285,15 @@ our %unified_info = (
                 [
                     ".",
                     "include",
-                    "crypto/include",
                 ],
             "test/sm2_internal_test.o" =>
                 [
                     "include",
-                    "crypto/include",
                 ],
             "test/sm4_internal_test.o" =>
                 [
                     ".",
                     "include",
-                    "crypto/include",
                 ],
             "test/srptest.o" =>
                 [
@@ -9958,6 +9304,10 @@ our %unified_info = (
                     ".",
                     "include",
                 ],
+            "test/ssl_ctx_test.o" =>
+                [
+                    "include",
+                ],
             "test/ssl_test.o" =>
                 [
                     "include",
@@ -10021,10 +9371,6 @@ our %unified_info = (
                 [
                     "include",
                 ],
-            "test/testutil/init.o" =>
-                [
-                    "include",
-                ],
             "test/testutil/main.o" =>
                 [
                     "include",
@@ -10053,6 +9399,10 @@ our %unified_info = (
                 [
                     "include",
                 ],
+            "test/testutil/testutil_init.o" =>
+                [
+                    "include",
+                ],
             "test/threadstest.o" =>
                 [
                     "include",
@@ -10317,6 +9667,7 @@ our %unified_info = (
             "test/sm4_internal_test",
             "test/srptest",
             "test/ssl_cert_table_internal_test",
+            "test/ssl_ctx_test",
             "test/ssl_test",
             "test/ssl_test_ctx_test",
             "test/sslapitest",
@@ -15287,7 +14638,6 @@ our %unified_info = (
                     "test/testutil/cb.o",
                     "test/testutil/driver.o",
                     "test/testutil/format_output.o",
-                    "test/testutil/init.o",
                     "test/testutil/main.o",
                     "test/testutil/output_helpers.o",
                     "test/testutil/random.o",
@@ -15295,6 +14645,7 @@ our %unified_info = (
                     "test/testutil/tap_bio.o",
                     "test/testutil/test_cleanup.o",
                     "test/testutil/tests.o",
+                    "test/testutil/testutil_init.o",
                 ],
             "test/md2test" =>
                 [
@@ -15522,6 +14873,14 @@ our %unified_info = (
                 [
                     "test/ssl_cert_table_internal_test.c",
                 ],
+            "test/ssl_ctx_test" =>
+                [
+                    "test/ssl_ctx_test.o",
+                ],
+            "test/ssl_ctx_test.o" =>
+                [
+                    "test/ssl_ctx_test.c",
+                ],
             "test/ssl_test" =>
                 [
                     "test/handshake_helper.o",
@@ -15624,10 +14983,6 @@ our %unified_info = (
                 [
                     "test/testutil/format_output.c",
                 ],
-            "test/testutil/init.o" =>
-                [
-                    "test/testutil/init.c",
-                ],
             "test/testutil/main.o" =>
                 [
                     "test/testutil/main.c",
@@ -15656,6 +15011,10 @@ our %unified_info = (
                 [
                     "test/testutil/tests.c",
                 ],
+            "test/testutil/testutil_init.o" =>
+                [
+                    "test/testutil/testutil_init.c",
+                ],
             "test/threadstest" =>
                 [
                     "test/threadstest.o",
diff --git a/deps/openssl/config/archs/linux-ppc64/asm_avx2/crypto/buildinf.h b/deps/openssl/config/archs/linux-ppc64/asm_avx2/crypto/buildinf.h
index 0e70ae1228..dc7442135a 100644
--- a/deps/openssl/config/archs/linux-ppc64/asm_avx2/crypto/buildinf.h
+++ b/deps/openssl/config/archs/linux-ppc64/asm_avx2/crypto/buildinf.h
@@ -11,7 +11,7 @@
  */
 
 #define PLATFORM "platform: linux-ppc64"
-#define DATE "built on: Fri Sep 13 16:01:08 2019 UTC"
+#define DATE "built on: Wed Mar 18 21:08:13 2020 UTC"
 
 /*
  * Generate compiler_flags as an array of individual characters. This is a
diff --git a/deps/openssl/config/archs/linux-ppc64/asm_avx2/crypto/include/internal/bn_conf.h b/deps/openssl/config/archs/linux-ppc64/asm_avx2/crypto/include/internal/bn_conf.h
index 34bd8b78b4..5312ef5a7a 100644
--- a/deps/openssl/config/archs/linux-ppc64/asm_avx2/crypto/include/internal/bn_conf.h
+++ b/deps/openssl/config/archs/linux-ppc64/asm_avx2/crypto/include/internal/bn_conf.h
@@ -1,5 +1,5 @@
 /* WARNING: do not edit! */
-/* Generated by Makefile from crypto/include/internal/bn_conf.h.in */
+/* Generated by Makefile from include/crypto/bn_conf.h.in */
 /*
  * Copyright 2016 The OpenSSL Project Authors. All Rights Reserved.
  *
@@ -9,8 +9,8 @@
  * https://www.openssl.org/source/license.html
  */
 
-#ifndef HEADER_BN_CONF_H
-# define HEADER_BN_CONF_H
+#ifndef OSSL_CRYPTO_BN_CONF_H
+# define OSSL_CRYPTO_BN_CONF_H
 
 /*
  * The contents of this file are not used in the UEFI build, as
diff --git a/deps/openssl/config/archs/linux-ppc64/asm_avx2/crypto/include/internal/dso_conf.h b/deps/openssl/config/archs/linux-ppc64/asm_avx2/crypto/include/internal/dso_conf.h
index 252266ec2a..4b1167c3d8 100644
--- a/deps/openssl/config/archs/linux-ppc64/asm_avx2/crypto/include/internal/dso_conf.h
+++ b/deps/openssl/config/archs/linux-ppc64/asm_avx2/crypto/include/internal/dso_conf.h
@@ -1,5 +1,5 @@
 /* WARNING: do not edit! */
-/* Generated by Makefile from crypto/include/internal/dso_conf.h.in */
+/* Generated by Makefile from include/crypto/dso_conf.h.in */
 /*
  * Copyright 2016-2019 The OpenSSL Project Authors. All Rights Reserved.
  *
@@ -9,8 +9,8 @@
  * https://www.openssl.org/source/license.html
  */
 
-#ifndef HEADER_DSO_CONF_H
-# define HEADER_DSO_CONF_H
+#ifndef OSSL_CRYPTO_DSO_CONF_H
+# define OSSL_CRYPTO_DSO_CONF_H
 # define DSO_DLFCN
 # define HAVE_DLFCN_H
 # define DSO_EXTENSION ".so"
diff --git a/deps/openssl/config/archs/linux-ppc64/asm_avx2/include/openssl/opensslconf.h b/deps/openssl/config/archs/linux-ppc64/asm_avx2/include/openssl/opensslconf.h
index 30820b6051..937531fe9f 100644
--- a/deps/openssl/config/archs/linux-ppc64/asm_avx2/include/openssl/opensslconf.h
+++ b/deps/openssl/config/archs/linux-ppc64/asm_avx2/include/openssl/opensslconf.h
@@ -96,9 +96,6 @@ extern "C" {
 #ifndef OPENSSL_NO_DYNAMIC_ENGINE
 # define OPENSSL_NO_DYNAMIC_ENGINE
 #endif
-#ifndef OPENSSL_NO_AFALGENG
-# define OPENSSL_NO_AFALGENG
-#endif
 
 
 /*
diff --git a/deps/openssl/config/archs/linux-ppc64/asm_avx2/include/progs.h b/deps/openssl/config/archs/linux-ppc64/asm_avx2/include/progs.h
index 9b3d270e20..308c65601b 100644
--- a/deps/openssl/config/archs/linux-ppc64/asm_avx2/include/progs.h
+++ b/deps/openssl/config/archs/linux-ppc64/asm_avx2/include/progs.h
@@ -2,7 +2,7 @@
  * WARNING: do not edit!
  * Generated by apps/progs.pl
  *
- * Copyright 1995-2019 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 1995-2020 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
diff --git a/deps/openssl/config/archs/linux-ppc64/no-asm/configdata.pm b/deps/openssl/config/archs/linux-ppc64/no-asm/configdata.pm
index 42b7f02251..4b7653af00 100644
--- a/deps/openssl/config/archs/linux-ppc64/no-asm/configdata.pm
+++ b/deps/openssl/config/archs/linux-ppc64/no-asm/configdata.pm
@@ -55,7 +55,7 @@ our %config = (
   minor => "1.1",
   openssl_algorithm_defines => [ "OPENSSL_NO_COMP", "OPENSSL_NO_MD2", "OPENSSL_NO_RC5" ],
   openssl_api_defines => [  ],
-  openssl_other_defines => [ "OPENSSL_RAND_SEED_OS", "OPENSSL_NO_AFALGENG", "OPENSSL_NO_ASAN", "OPENSSL_NO_ASM", "OPENSSL_NO_CRYPTO_MDEBUG", "OPENSSL_NO_CRYPTO_MDEBUG_BACKTRACE", "OPENSSL_NO_DEVCRYPTOENG", "OPENSSL_NO_EC_NISTP_64_GCC_128", "OPENSSL_NO_EGD", "OPENSSL_NO_EXTERNAL_TESTS", "OPENSSL_NO_FUZZ_AFL", "OPENSSL_NO_FUZZ_LIBFUZZER", "OPENSSL_NO_HEARTBEATS", "OPENSSL_NO_MSAN", "OPENSSL_NO_SCTP", "OPENSSL_NO_SSL3", "OPENSSL_NO_SSL3_METHOD", "OPENSSL_NO_UBSAN", "OPENSSL_NO_UNIT_TEST", "OPENSSL_NO_WEAK_SSL_CIPHERS", "OPENSSL_NO_DYNAMIC_ENGINE", "OPENSSL_NO_AFALGENG" ],
+  openssl_other_defines => [ "OPENSSL_RAND_SEED_OS", "OPENSSL_NO_AFALGENG", "OPENSSL_NO_ASAN", "OPENSSL_NO_ASM", "OPENSSL_NO_CRYPTO_MDEBUG", "OPENSSL_NO_CRYPTO_MDEBUG_BACKTRACE", "OPENSSL_NO_DEVCRYPTOENG", "OPENSSL_NO_EC_NISTP_64_GCC_128", "OPENSSL_NO_EGD", "OPENSSL_NO_EXTERNAL_TESTS", "OPENSSL_NO_FUZZ_AFL", "OPENSSL_NO_FUZZ_LIBFUZZER", "OPENSSL_NO_HEARTBEATS", "OPENSSL_NO_MSAN", "OPENSSL_NO_SCTP", "OPENSSL_NO_SSL3", "OPENSSL_NO_SSL3_METHOD", "OPENSSL_NO_UBSAN", "OPENSSL_NO_UNIT_TEST", "OPENSSL_NO_WEAK_SSL_CIPHERS", "OPENSSL_NO_DYNAMIC_ENGINE" ],
   openssl_sys_defines => [  ],
   openssl_thread_defines => [ "OPENSSL_THREADS" ],
   openssldir => "",
@@ -111,8 +111,8 @@ our %config = (
   sourcedir => ".",
   target => "linux-ppc64",
   tdirs => [ "ossl_shim" ],
-  version => "1.1.1d",
-  version_num => "0x1010104fL",
+  version => "1.1.1e",
+  version_num => "0x1010105fL",
 );
 
 our %target = (
@@ -238,6 +238,7 @@ our @disablables = (
   "dgram",
   "dh",
   "dsa",
+  "dso",
   "dtls",
   "dynamic-engine",
   "ec",
@@ -356,8 +357,8 @@ our %unified_info = (
         {
             "" =>
                 [
-                    "crypto/include/internal/bn_conf.h",
-                    "crypto/include/internal/dso_conf.h",
+                    "include/crypto/bn_conf.h",
+                    "include/crypto/dso_conf.h",
                     "include/openssl/opensslconf.h",
                 ],
             "apps/asn1pars.o" =>
@@ -625,14 +626,6 @@ our %unified_info = (
                     "crypto/perlasm/cbc.pl",
                     "crypto/perlasm/x86asm.pl",
                 ],
-            "crypto/include/internal/bn_conf.h" =>
-                [
-                    "configdata.pm",
-                ],
-            "crypto/include/internal/dso_conf.h" =>
-                [
-                    "configdata.pm",
-                ],
             "crypto/rc4/rc4-586.s" =>
                 [
                     "crypto/perlasm/x86asm.pl",
@@ -708,6 +701,14 @@ our %unified_info = (
                 [
                     "libcrypto",
                 ],
+            "include/crypto/bn_conf.h" =>
+                [
+                    "configdata.pm",
+                ],
+            "include/crypto/dso_conf.h" =>
+                [
+                    "configdata.pm",
+                ],
             "include/openssl/opensslconf.h" =>
                 [
                     "configdata.pm",
@@ -1505,6 +1506,12 @@ our %unified_info = (
                     "libcrypto",
                     "test/libtestutil.a",
                 ],
+            "test/ssl_ctx_test" =>
+                [
+                    "libcrypto",
+                    "libssl",
+                    "test/libtestutil.a",
+                ],
             "test/ssl_test" =>
                 [
                     "libcrypto",
@@ -3223,7 +3230,6 @@ our %unified_info = (
                             "test/testutil/cb.o",
                             "test/testutil/driver.o",
                             "test/testutil/format_output.o",
-                            "test/testutil/init.o",
                             "test/testutil/main.o",
                             "test/testutil/output_helpers.o",
                             "test/testutil/random.o",
@@ -3231,6 +3237,7 @@ our %unified_info = (
                             "test/testutil/tap_bio.o",
                             "test/testutil/test_cleanup.o",
                             "test/testutil/tests.o",
+                            "test/testutil/testutil_init.o",
                         ],
                     "products" =>
                         {
@@ -3729,14 +3736,6 @@ our %unified_info = (
                 [
                     "crypto/ia64cpuid.S",
                 ],
-            "crypto/include/internal/bn_conf.h" =>
-                [
-                    "crypto/include/internal/bn_conf.h.in",
-                ],
-            "crypto/include/internal/dso_conf.h" =>
-                [
-                    "crypto/include/internal/dso_conf.h.in",
-                ],
             "crypto/md5/md5-586.s" =>
                 [
                     "crypto/md5/asm/md5-586.pl",
@@ -4177,6 +4176,14 @@ our %unified_info = (
                     "engines/asm/e_padlock-x86_64.pl",
                     "\$(PERLASM_SCHEME)",
                 ],
+            "include/crypto/bn_conf.h" =>
+                [
+                    "include/crypto/bn_conf.h.in",
+                ],
+            "include/crypto/dso_conf.h" =>
+                [
+                    "include/crypto/dso_conf.h.in",
+                ],
             "include/openssl/opensslconf.h" =>
                 [
                     "include/openssl/opensslconf.h.in",
@@ -4871,49 +4878,41 @@ our %unified_info = (
             "crypto/aes/aes_cbc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/aes/aes_cfb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/aes/aes_core.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/aes/aes_ecb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/aes/aes_ige.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/aes/aes_misc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/aes/aes_ofb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/aes/aes_wrap.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/aes/aesfx-sparcv9.o" =>
@@ -4935,7 +4934,6 @@ our %unified_info = (
             "crypto/aria/aria.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/arm64cpuid.o" =>
@@ -4949,613 +4947,511 @@ our %unified_info = (
             "crypto/asn1/a_bitstr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_d2i_fp.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_digest.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_dup.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_gentm.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_i2d_fp.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_int.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_mbstr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_object.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_octet.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_print.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_sign.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_strex.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_strnid.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_time.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_type.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_utctm.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_utf8.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_verify.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/ameth_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/asn1_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/asn1_gen.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/asn1_item_list.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/asn1_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/asn1_par.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/asn_mime.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/asn_moid.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/asn_mstbl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/asn_pack.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/bio_asn1.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/bio_ndef.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/d2i_pr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/d2i_pu.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/evp_asn1.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/f_int.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/f_string.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/i2d_pr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/i2d_pu.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/n_pkey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/nsseq.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/p5_pbe.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/p5_pbev2.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/p5_scrypt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/p8_pkey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/t_bitst.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/t_pkey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/t_spki.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/tasn_dec.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/tasn_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/tasn_fre.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/tasn_new.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/tasn_prn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/tasn_scn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/tasn_typ.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/tasn_utl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/x_algor.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/x_bignum.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/x_info.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/x_int64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/x_long.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/x_pkey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/x_sig.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/x_spki.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/x_val.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/async/arch/async_null.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/async/arch/async_posix.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/async/arch/async_win.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/async/async.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/async/async_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/async/async_wait.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bf/bf_cfb64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bf/bf_ecb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bf/bf_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bf/bf_ofb64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bf/bf_skey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/b_addr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/b_dump.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/b_print.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/b_sock.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/b_sock2.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bf_buff.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bf_lbuf.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bf_nbio.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bf_null.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bio_cb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bio_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bio_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bio_meth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bss_acpt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bss_bio.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bss_conn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bss_dgram.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bss_fd.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bss_file.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bss_log.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bss_mem.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bss_null.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bss_sock.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/blake2/blake2b.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/blake2/blake2s.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/blake2/m_blake2b.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/blake2/m_blake2s.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/armv4-gf2m.o" =>
@@ -5573,188 +5469,157 @@ our %unified_info = (
             "crypto/bn/bn_add.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_asm.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_blind.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_const.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_ctx.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_depr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_dh.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_div.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_exp.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto",
                 ],
             "crypto/bn/bn_exp2.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_gcd.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_gf2m.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_intern.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_kron.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_mod.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_mont.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_mpi.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_mul.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_nist.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_prime.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_print.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_rand.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_recp.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_shift.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_sqr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_sqrt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_srp.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_word.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_x931p.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/mips-mont.o" =>
@@ -5784,13 +5649,11 @@ our %unified_info = (
             "crypto/buffer/buf_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/buffer/buffer.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/buildinf.h" =>
@@ -5800,43 +5663,36 @@ our %unified_info = (
             "crypto/camellia/camellia.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/camellia/cmll_cbc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/camellia/cmll_cfb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/camellia/cmll_ctr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/camellia/cmll_ecb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/camellia/cmll_misc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/camellia/cmll_ofb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/camellia/cmllt4-sparcv9.o" =>
@@ -5846,31 +5702,26 @@ our %unified_info = (
             "crypto/cast/c_cfb64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cast/c_ecb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cast/c_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cast/c_ofb64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cast/c_skey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/chacha/chacha-armv4.o" =>
@@ -5888,278 +5739,232 @@ our %unified_info = (
             "crypto/chacha/chacha_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cmac/cm_ameth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cmac/cm_pmeth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cmac/cmac.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_asn1.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_att.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_cd.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_dd.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_env.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_ess.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_io.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_kari.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_pwri.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_sd.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_smime.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/conf/conf_api.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/conf/conf_def.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/conf/conf_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/conf/conf_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/conf/conf_mall.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/conf/conf_mod.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/conf/conf_sap.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/conf/conf_ssl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cpt_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cryptlib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ct/ct_b64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ct/ct_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ct/ct_log.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ct/ct_oct.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ct/ct_policy.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ct/ct_prn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ct/ct_sct.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ct/ct_sct_ctx.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ct/ct_vfy.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ct/ct_x509v3.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ctype.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cversion.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto",
                 ],
             "crypto/des/cbc_cksm.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/cbc_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/cfb64ede.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/cfb64enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/cfb_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/des_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/dest4-sparcv9.o" =>
@@ -6169,301 +5974,251 @@ our %unified_info = (
             "crypto/des/ecb3_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/ecb_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/fcrypt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/fcrypt_b.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/ofb64ede.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/ofb64enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/ofb_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/pcbc_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/qud_cksm.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/rand_key.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/set_key.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/str2key.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/xcbc_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_ameth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_asn1.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_check.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_depr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_gen.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_kdf.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_key.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_meth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_pmeth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_prn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_rfc5114.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_rfc7919.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dsa/dsa_ameth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dsa/dsa_asn1.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dsa/dsa_depr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dsa/dsa_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dsa/dsa_gen.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dsa/dsa_key.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dsa/dsa_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dsa/dsa_meth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dsa/dsa_ossl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dsa/dsa_pmeth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dsa/dsa_prn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dsa/dsa_sign.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dsa/dsa_vrf.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dso/dso_dl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dso/dso_dlfcn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dso/dso_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dso/dso_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dso/dso_openssl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dso/dso_vms.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dso/dso_win32.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ebcdic.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/curve25519.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/curve448/arch_32/f_impl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto/ec/curve448/arch_32",
                     "crypto/ec/curve448",
@@ -6471,7 +6226,6 @@ our %unified_info = (
             "crypto/ec/curve448/curve448.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto/ec/curve448/arch_32",
                     "crypto/ec/curve448",
@@ -6479,7 +6233,6 @@ our %unified_info = (
             "crypto/ec/curve448/curve448_tables.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto/ec/curve448/arch_32",
                     "crypto/ec/curve448",
@@ -6487,7 +6240,6 @@ our %unified_info = (
             "crypto/ec/curve448/eddsa.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto/ec/curve448/arch_32",
                     "crypto/ec/curve448",
@@ -6495,7 +6247,6 @@ our %unified_info = (
             "crypto/ec/curve448/f_generic.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto/ec/curve448/arch_32",
                     "crypto/ec/curve448",
@@ -6503,7 +6254,6 @@ our %unified_info = (
             "crypto/ec/curve448/scalar.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto/ec/curve448/arch_32",
                     "crypto/ec/curve448",
@@ -6511,163 +6261,136 @@ our %unified_info = (
             "crypto/ec/ec2_oct.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec2_smpl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec_ameth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec_asn1.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec_check.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec_curve.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec_cvt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec_key.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec_kmeth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec_mult.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec_oct.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec_pmeth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec_print.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecdh_kdf.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecdh_ossl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecdsa_ossl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecdsa_sign.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecdsa_vrf.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/eck_prn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecp_mont.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecp_nist.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecp_nistp224.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecp_nistp256.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecp_nistp521.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecp_nistputil.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecp_nistz256-armv4.o" =>
@@ -6685,223 +6408,186 @@ our %unified_info = (
             "crypto/ec/ecp_oct.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecp_smpl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecx_meth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/eng_all.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/eng_cnf.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/eng_ctrl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/eng_dyn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/eng_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/eng_fat.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/eng_init.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/eng_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/eng_list.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/eng_openssl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/eng_pkey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/eng_rdrand.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/eng_table.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/tb_asnmth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/tb_cipher.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/tb_dh.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/tb_digest.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/tb_dsa.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/tb_eckey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/tb_pkmeth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/tb_rand.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/tb_rsa.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/err/err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/err/err_all.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/err/err_prn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/bio_b64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/bio_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/bio_md.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/bio_ok.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/c_allc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/c_alld.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/cmeth_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/digest.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/e_aes.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto",
                     "crypto/modes",
@@ -6909,21 +6595,18 @@ our %unified_info = (
             "crypto/evp/e_aes_cbc_hmac_sha1.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto/modes",
                 ],
             "crypto/evp/e_aes_cbc_hmac_sha256.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto/modes",
                 ],
             "crypto/evp/e_aria.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto",
                     "crypto/modes",
@@ -6931,13 +6614,11 @@ our %unified_info = (
             "crypto/evp/e_bf.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/e_camellia.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto",
                     "crypto/modes",
@@ -6945,81 +6626,68 @@ our %unified_info = (
             "crypto/evp/e_cast.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/e_chacha20_poly1305.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/e_des.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto",
                 ],
             "crypto/evp/e_des3.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto",
                 ],
             "crypto/evp/e_idea.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/e_null.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/e_old.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/e_rc2.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/e_rc4.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/e_rc4_hmac_md5.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/e_rc5.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/e_seed.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/e_sm4.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto",
                     "crypto/modes",
@@ -7027,328 +6695,267 @@ our %unified_info = (
             "crypto/evp/e_xcbc_d.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/encode.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/evp_cnf.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/evp_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/evp_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/evp_key.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/evp_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/evp_pbe.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/evp_pkey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/m_md2.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/m_md4.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/m_md5.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/m_md5_sha1.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/m_mdc2.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/m_null.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/m_ripemd.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/m_sha1.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/m_sha3.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto",
                 ],
             "crypto/evp/m_sigver.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/m_wp.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/names.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/p5_crpt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/p5_crpt2.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/p_dec.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/p_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/p_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/p_open.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/p_seal.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/p_sign.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/p_verify.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/pbe_scrypt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/pmeth_fn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/pmeth_gn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/pmeth_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ex_data.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/getenv.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/hmac/hm_ameth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/hmac/hm_pmeth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/hmac/hmac.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/idea/i_cbc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/idea/i_cfb64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/idea/i_ecb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/idea/i_ofb64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/idea/i_skey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
-            "crypto/include/internal/bn_conf.h" =>
-                [
-                    ".",
-                ],
-            "crypto/include/internal/dso_conf.h" =>
-                [
-                    ".",
-                ],
             "crypto/init.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/kdf/hkdf.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/kdf/kdf_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/kdf/scrypt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/kdf/tls1_prf.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/lhash/lh_stats.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/lhash/lhash.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/md4/md4_dgst.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/md4/md4_one.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/md5/md5-sparcv9.o" =>
@@ -7358,85 +6965,71 @@ our %unified_info = (
             "crypto/md5/md5_dgst.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/md5/md5_one.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/mdc2/mdc2_one.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/mdc2/mdc2dgst.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/mem.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/mem_clr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/mem_dbg.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/mem_sec.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/modes/cbc128.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/modes/ccm128.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/modes/cfb128.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/modes/ctr128.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/modes/cts128.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/modes/gcm128.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto",
                 ],
@@ -7459,361 +7052,301 @@ our %unified_info = (
             "crypto/modes/ocb128.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/modes/ofb128.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/modes/wrap128.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/modes/xts128.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/o_dir.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/o_fips.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/o_fopen.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/o_init.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/o_str.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/o_time.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/objects/o_names.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/objects/obj_dat.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/objects/obj_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/objects/obj_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/objects/obj_xref.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ocsp/ocsp_asn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ocsp/ocsp_cl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ocsp/ocsp_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ocsp/ocsp_ext.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ocsp/ocsp_ht.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ocsp/ocsp_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ocsp/ocsp_prn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ocsp/ocsp_srv.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ocsp/ocsp_vfy.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ocsp/v3_ocsp.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pem/pem_all.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pem/pem_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pem/pem_info.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pem/pem_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pem/pem_oth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pem/pem_pk8.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pem/pem_pkey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pem/pem_sign.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pem/pem_x509.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pem/pem_xaux.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pem/pvkfmt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_add.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_asn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_attr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_crpt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_crt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_decr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_init.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_key.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_kiss.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_mutl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_npas.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_p8d.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_p8e.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_sbag.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_utl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/pk12err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs7/bio_pk7.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs7/pk7_asn1.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs7/pk7_attr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs7/pk7_doit.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs7/pk7_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs7/pk7_mime.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs7/pk7_smime.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs7/pkcs7err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/poly1305/poly1305-armv4.o" =>
@@ -7835,259 +7368,216 @@ our %unified_info = (
             "crypto/poly1305/poly1305.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/poly1305/poly1305_ameth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/poly1305/poly1305_pmeth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rand/drbg_ctr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rand/drbg_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rand/rand_egd.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rand/rand_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rand/rand_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rand/rand_unix.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rand/rand_vms.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rand/rand_win.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rand/randfile.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rc2/rc2_cbc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rc2/rc2_ecb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rc2/rc2_skey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rc2/rc2cfb64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rc2/rc2ofb64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rc4/rc4_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rc4/rc4_skey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ripemd/rmd_dgst.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ripemd/rmd_one.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_ameth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_asn1.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_chk.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_crpt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_depr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_gen.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_meth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_mp.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_none.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_oaep.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_ossl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_pk1.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_pmeth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_prn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_pss.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_saos.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_sign.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_ssl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_x931.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_x931g.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/s390xcpuid.o" =>
@@ -8097,31 +7587,26 @@ our %unified_info = (
             "crypto/seed/seed.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/seed/seed_cbc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/seed/seed_cfb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/seed/seed_ecb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/seed/seed_ofb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sha/keccak1600-armv4.o" =>
@@ -8131,7 +7616,6 @@ our %unified_info = (
             "crypto/sha/keccak1600.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sha/sha1-armv4-large.o" =>
@@ -8157,13 +7641,11 @@ our %unified_info = (
             "crypto/sha/sha1_one.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sha/sha1dgst.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sha/sha256-armv4.o" =>
@@ -8189,7 +7671,6 @@ our %unified_info = (
             "crypto/sha/sha256.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sha/sha512-armv4.o" =>
@@ -8215,709 +7696,591 @@ our %unified_info = (
             "crypto/sha/sha512.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/siphash/siphash.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/siphash/siphash_ameth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/siphash/siphash_pmeth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sm2/sm2_crypt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sm2/sm2_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sm2/sm2_pmeth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sm2/sm2_sign.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sm3/m_sm3.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sm3/sm3.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sm4/sm4.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/srp/srp_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/srp/srp_vfy.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/stack/stack.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/store/loader_file.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/store/store_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/store/store_init.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/store/store_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/store/store_register.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/store/store_strings.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/threads_none.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/threads_pthread.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/threads_win.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ts/ts_asn1.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ts/ts_conf.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ts/ts_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ts/ts_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ts/ts_req_print.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ts/ts_req_utils.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ts/ts_rsp_print.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ts/ts_rsp_sign.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ts/ts_rsp_utils.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ts/ts_rsp_verify.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ts/ts_verify_ctx.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/txt_db/txt_db.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ui/ui_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ui/ui_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ui/ui_null.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ui/ui_openssl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ui/ui_util.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/uid.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/whrlpool/wp_block.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/whrlpool/wp_dgst.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/by_dir.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/by_file.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/t_crl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/t_req.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/t_x509.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_att.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_cmp.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_d2.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_def.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_ext.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_lu.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_meth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_obj.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_r2x.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_req.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_set.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_trs.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_txt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_v3.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_vfy.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_vpm.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509cset.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509name.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509rset.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509spki.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509type.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x_all.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x_attrib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x_crl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x_exten.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x_name.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x_pubkey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x_req.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x_x509.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x_x509a.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/pcy_cache.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/pcy_data.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/pcy_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/pcy_map.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/pcy_node.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/pcy_tree.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_addr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_admis.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_akey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_akeya.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_alt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_asid.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_bcons.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_bitst.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_conf.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_cpols.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_crld.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_enum.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_extku.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_genn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_ia5.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_info.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_int.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_ncons.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_pci.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_pcia.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_pcons.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_pku.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_pmaps.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_prn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_purp.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_skey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_sxnet.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_tlsf.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_utl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "engines/e_capi.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "engines/e_padlock.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "fuzz/asn1.o" =>
@@ -8968,6 +8331,14 @@ our %unified_info = (
                 [
                     "include",
                 ],
+            "include/crypto/bn_conf.h" =>
+                [
+                    ".",
+                ],
+            "include/crypto/dso_conf.h" =>
+                [
+                    ".",
+                ],
             "include/openssl/opensslconf.h" =>
                 [
                     ".",
@@ -9212,7 +8583,6 @@ our %unified_info = (
                 [
                     ".",
                     "include",
-                    "crypto/include",
                 ],
             "test/asn1_string_table_test.o" =>
                 [
@@ -9538,7 +8908,6 @@ our %unified_info = (
                 [
                     ".",
                     "include",
-                    "crypto/include",
                 ],
             "test/cipher_overhead_test.o" =>
                 [
@@ -9584,7 +8953,6 @@ our %unified_info = (
             "test/ctype_internal_test.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "test/curve448_internal_test.o" =>
@@ -9650,7 +9018,6 @@ our %unified_info = (
                 [
                     "include",
                     "crypto/ec",
-                    "crypto/include",
                 ],
             "test/ecdsatest.o" =>
                 [
@@ -9675,7 +9042,6 @@ our %unified_info = (
             "test/evp_extra_test.o" =>
                 [
                     "include",
-                    "crypto/include",
                 ],
             "test/evp_test.o" =>
                 [
@@ -9773,7 +9139,6 @@ our %unified_info = (
                 [
                     ".",
                     "include",
-                    "crypto/include",
                 ],
             "test/rc2test.o" =>
                 [
@@ -9823,18 +9188,15 @@ our %unified_info = (
                 [
                     ".",
                     "include",
-                    "crypto/include",
                 ],
             "test/sm2_internal_test.o" =>
                 [
                     "include",
-                    "crypto/include",
                 ],
             "test/sm4_internal_test.o" =>
                 [
                     ".",
                     "include",
-                    "crypto/include",
                 ],
             "test/srptest.o" =>
                 [
@@ -9845,6 +9207,10 @@ our %unified_info = (
                     ".",
                     "include",
                 ],
+            "test/ssl_ctx_test.o" =>
+                [
+                    "include",
+                ],
             "test/ssl_test.o" =>
                 [
                     "include",
@@ -9908,10 +9274,6 @@ our %unified_info = (
                 [
                     "include",
                 ],
-            "test/testutil/init.o" =>
-                [
-                    "include",
-                ],
             "test/testutil/main.o" =>
                 [
                     "include",
@@ -9940,6 +9302,10 @@ our %unified_info = (
                 [
                     "include",
                 ],
+            "test/testutil/testutil_init.o" =>
+                [
+                    "include",
+                ],
             "test/threadstest.o" =>
                 [
                     "include",
@@ -10204,6 +9570,7 @@ our %unified_info = (
             "test/sm4_internal_test",
             "test/srptest",
             "test/ssl_cert_table_internal_test",
+            "test/ssl_ctx_test",
             "test/ssl_test",
             "test/ssl_test_ctx_test",
             "test/sslapitest",
@@ -15094,7 +14461,6 @@ our %unified_info = (
                     "test/testutil/cb.o",
                     "test/testutil/driver.o",
                     "test/testutil/format_output.o",
-                    "test/testutil/init.o",
                     "test/testutil/main.o",
                     "test/testutil/output_helpers.o",
                     "test/testutil/random.o",
@@ -15102,6 +14468,7 @@ our %unified_info = (
                     "test/testutil/tap_bio.o",
                     "test/testutil/test_cleanup.o",
                     "test/testutil/tests.o",
+                    "test/testutil/testutil_init.o",
                 ],
             "test/md2test" =>
                 [
@@ -15329,6 +14696,14 @@ our %unified_info = (
                 [
                     "test/ssl_cert_table_internal_test.c",
                 ],
+            "test/ssl_ctx_test" =>
+                [
+                    "test/ssl_ctx_test.o",
+                ],
+            "test/ssl_ctx_test.o" =>
+                [
+                    "test/ssl_ctx_test.c",
+                ],
             "test/ssl_test" =>
                 [
                     "test/handshake_helper.o",
@@ -15431,10 +14806,6 @@ our %unified_info = (
                 [
                     "test/testutil/format_output.c",
                 ],
-            "test/testutil/init.o" =>
-                [
-                    "test/testutil/init.c",
-                ],
             "test/testutil/main.o" =>
                 [
                     "test/testutil/main.c",
@@ -15463,6 +14834,10 @@ our %unified_info = (
                 [
                     "test/testutil/tests.c",
                 ],
+            "test/testutil/testutil_init.o" =>
+                [
+                    "test/testutil/testutil_init.c",
+                ],
             "test/threadstest" =>
                 [
                     "test/threadstest.o",
diff --git a/deps/openssl/config/archs/linux-ppc64/no-asm/crypto/buildinf.h b/deps/openssl/config/archs/linux-ppc64/no-asm/crypto/buildinf.h
index 50c645ff13..ca91089788 100644
--- a/deps/openssl/config/archs/linux-ppc64/no-asm/crypto/buildinf.h
+++ b/deps/openssl/config/archs/linux-ppc64/no-asm/crypto/buildinf.h
@@ -11,7 +11,7 @@
  */
 
 #define PLATFORM "platform: linux-ppc64"
-#define DATE "built on: Fri Sep 13 16:01:14 2019 UTC"
+#define DATE "built on: Wed Mar 18 21:08:25 2020 UTC"
 
 /*
  * Generate compiler_flags as an array of individual characters. This is a
diff --git a/deps/openssl/config/archs/linux-ppc64/no-asm/crypto/include/internal/bn_conf.h b/deps/openssl/config/archs/linux-ppc64/no-asm/crypto/include/internal/bn_conf.h
index 34bd8b78b4..5312ef5a7a 100644
--- a/deps/openssl/config/archs/linux-ppc64/no-asm/crypto/include/internal/bn_conf.h
+++ b/deps/openssl/config/archs/linux-ppc64/no-asm/crypto/include/internal/bn_conf.h
@@ -1,5 +1,5 @@
 /* WARNING: do not edit! */
-/* Generated by Makefile from crypto/include/internal/bn_conf.h.in */
+/* Generated by Makefile from include/crypto/bn_conf.h.in */
 /*
  * Copyright 2016 The OpenSSL Project Authors. All Rights Reserved.
  *
@@ -9,8 +9,8 @@
  * https://www.openssl.org/source/license.html
  */
 
-#ifndef HEADER_BN_CONF_H
-# define HEADER_BN_CONF_H
+#ifndef OSSL_CRYPTO_BN_CONF_H
+# define OSSL_CRYPTO_BN_CONF_H
 
 /*
  * The contents of this file are not used in the UEFI build, as
diff --git a/deps/openssl/config/archs/linux-ppc64/no-asm/crypto/include/internal/dso_conf.h b/deps/openssl/config/archs/linux-ppc64/no-asm/crypto/include/internal/dso_conf.h
index 252266ec2a..4b1167c3d8 100644
--- a/deps/openssl/config/archs/linux-ppc64/no-asm/crypto/include/internal/dso_conf.h
+++ b/deps/openssl/config/archs/linux-ppc64/no-asm/crypto/include/internal/dso_conf.h
@@ -1,5 +1,5 @@
 /* WARNING: do not edit! */
-/* Generated by Makefile from crypto/include/internal/dso_conf.h.in */
+/* Generated by Makefile from include/crypto/dso_conf.h.in */
 /*
  * Copyright 2016-2019 The OpenSSL Project Authors. All Rights Reserved.
  *
@@ -9,8 +9,8 @@
  * https://www.openssl.org/source/license.html
  */
 
-#ifndef HEADER_DSO_CONF_H
-# define HEADER_DSO_CONF_H
+#ifndef OSSL_CRYPTO_DSO_CONF_H
+# define OSSL_CRYPTO_DSO_CONF_H
 # define DSO_DLFCN
 # define HAVE_DLFCN_H
 # define DSO_EXTENSION ".so"
diff --git a/deps/openssl/config/archs/linux-ppc64/no-asm/include/openssl/opensslconf.h b/deps/openssl/config/archs/linux-ppc64/no-asm/include/openssl/opensslconf.h
index 212e3f67d8..781ef739dc 100644
--- a/deps/openssl/config/archs/linux-ppc64/no-asm/include/openssl/opensslconf.h
+++ b/deps/openssl/config/archs/linux-ppc64/no-asm/include/openssl/opensslconf.h
@@ -99,9 +99,6 @@ extern "C" {
 #ifndef OPENSSL_NO_DYNAMIC_ENGINE
 # define OPENSSL_NO_DYNAMIC_ENGINE
 #endif
-#ifndef OPENSSL_NO_AFALGENG
-# define OPENSSL_NO_AFALGENG
-#endif
 
 
 /*
diff --git a/deps/openssl/config/archs/linux-ppc64/no-asm/include/progs.h b/deps/openssl/config/archs/linux-ppc64/no-asm/include/progs.h
index 9b3d270e20..308c65601b 100644
--- a/deps/openssl/config/archs/linux-ppc64/no-asm/include/progs.h
+++ b/deps/openssl/config/archs/linux-ppc64/no-asm/include/progs.h
@@ -2,7 +2,7 @@
  * WARNING: do not edit!
  * Generated by apps/progs.pl
  *
- * Copyright 1995-2019 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 1995-2020 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
diff --git a/deps/openssl/config/archs/linux-ppc64le/asm/configdata.pm b/deps/openssl/config/archs/linux-ppc64le/asm/configdata.pm
index aff8df2a58..be34b5bfb5 100644
--- a/deps/openssl/config/archs/linux-ppc64le/asm/configdata.pm
+++ b/deps/openssl/config/archs/linux-ppc64le/asm/configdata.pm
@@ -55,7 +55,7 @@ our %config = (
   minor => "1.1",
   openssl_algorithm_defines => [ "OPENSSL_NO_COMP", "OPENSSL_NO_MD2", "OPENSSL_NO_RC5" ],
   openssl_api_defines => [  ],
-  openssl_other_defines => [ "OPENSSL_RAND_SEED_OS", "OPENSSL_NO_AFALGENG", "OPENSSL_NO_ASAN", "OPENSSL_NO_CRYPTO_MDEBUG", "OPENSSL_NO_CRYPTO_MDEBUG_BACKTRACE", "OPENSSL_NO_DEVCRYPTOENG", "OPENSSL_NO_EC_NISTP_64_GCC_128", "OPENSSL_NO_EGD", "OPENSSL_NO_EXTERNAL_TESTS", "OPENSSL_NO_FUZZ_AFL", "OPENSSL_NO_FUZZ_LIBFUZZER", "OPENSSL_NO_HEARTBEATS", "OPENSSL_NO_MSAN", "OPENSSL_NO_SCTP", "OPENSSL_NO_SSL3", "OPENSSL_NO_SSL3_METHOD", "OPENSSL_NO_UBSAN", "OPENSSL_NO_UNIT_TEST", "OPENSSL_NO_WEAK_SSL_CIPHERS", "OPENSSL_NO_DYNAMIC_ENGINE", "OPENSSL_NO_AFALGENG" ],
+  openssl_other_defines => [ "OPENSSL_RAND_SEED_OS", "OPENSSL_NO_AFALGENG", "OPENSSL_NO_ASAN", "OPENSSL_NO_CRYPTO_MDEBUG", "OPENSSL_NO_CRYPTO_MDEBUG_BACKTRACE", "OPENSSL_NO_DEVCRYPTOENG", "OPENSSL_NO_EC_NISTP_64_GCC_128", "OPENSSL_NO_EGD", "OPENSSL_NO_EXTERNAL_TESTS", "OPENSSL_NO_FUZZ_AFL", "OPENSSL_NO_FUZZ_LIBFUZZER", "OPENSSL_NO_HEARTBEATS", "OPENSSL_NO_MSAN", "OPENSSL_NO_SCTP", "OPENSSL_NO_SSL3", "OPENSSL_NO_SSL3_METHOD", "OPENSSL_NO_UBSAN", "OPENSSL_NO_UNIT_TEST", "OPENSSL_NO_WEAK_SSL_CIPHERS", "OPENSSL_NO_DYNAMIC_ENGINE" ],
   openssl_sys_defines => [  ],
   openssl_thread_defines => [ "OPENSSL_THREADS" ],
   openssldir => "",
@@ -111,8 +111,8 @@ our %config = (
   sourcedir => ".",
   target => "linux-ppc64le",
   tdirs => [ "ossl_shim" ],
-  version => "1.1.1d",
-  version_num => "0x1010104fL",
+  version => "1.1.1e",
+  version_num => "0x1010105fL",
 );
 
 our %target = (
@@ -239,6 +239,7 @@ our @disablables = (
   "dgram",
   "dh",
   "dsa",
+  "dso",
   "dtls",
   "dynamic-engine",
   "ec",
@@ -356,8 +357,8 @@ our %unified_info = (
         {
             "" =>
                 [
-                    "crypto/include/internal/bn_conf.h",
-                    "crypto/include/internal/dso_conf.h",
+                    "include/crypto/bn_conf.h",
+                    "include/crypto/dso_conf.h",
                     "include/openssl/opensslconf.h",
                 ],
             "apps/asn1pars.o" =>
@@ -625,14 +626,6 @@ our %unified_info = (
                     "crypto/perlasm/cbc.pl",
                     "crypto/perlasm/x86asm.pl",
                 ],
-            "crypto/include/internal/bn_conf.h" =>
-                [
-                    "configdata.pm",
-                ],
-            "crypto/include/internal/dso_conf.h" =>
-                [
-                    "configdata.pm",
-                ],
             "crypto/rc4/rc4-586.s" =>
                 [
                     "crypto/perlasm/x86asm.pl",
@@ -708,6 +701,14 @@ our %unified_info = (
                 [
                     "libcrypto",
                 ],
+            "include/crypto/bn_conf.h" =>
+                [
+                    "configdata.pm",
+                ],
+            "include/crypto/dso_conf.h" =>
+                [
+                    "configdata.pm",
+                ],
             "include/openssl/opensslconf.h" =>
                 [
                     "configdata.pm",
@@ -1505,6 +1506,12 @@ our %unified_info = (
                     "libcrypto",
                     "test/libtestutil.a",
                 ],
+            "test/ssl_ctx_test" =>
+                [
+                    "libcrypto",
+                    "libssl",
+                    "test/libtestutil.a",
+                ],
             "test/ssl_test" =>
                 [
                     "libcrypto",
@@ -3239,7 +3246,6 @@ our %unified_info = (
                             "test/testutil/cb.o",
                             "test/testutil/driver.o",
                             "test/testutil/format_output.o",
-                            "test/testutil/init.o",
                             "test/testutil/main.o",
                             "test/testutil/output_helpers.o",
                             "test/testutil/random.o",
@@ -3247,6 +3253,7 @@ our %unified_info = (
                             "test/testutil/tap_bio.o",
                             "test/testutil/test_cleanup.o",
                             "test/testutil/tests.o",
+                            "test/testutil/testutil_init.o",
                         ],
                     "products" =>
                         {
@@ -3745,14 +3752,6 @@ our %unified_info = (
                 [
                     "crypto/ia64cpuid.S",
                 ],
-            "crypto/include/internal/bn_conf.h" =>
-                [
-                    "crypto/include/internal/bn_conf.h.in",
-                ],
-            "crypto/include/internal/dso_conf.h" =>
-                [
-                    "crypto/include/internal/dso_conf.h.in",
-                ],
             "crypto/md5/md5-586.s" =>
                 [
                     "crypto/md5/asm/md5-586.pl",
@@ -4193,6 +4192,14 @@ our %unified_info = (
                     "engines/asm/e_padlock-x86_64.pl",
                     "\$(PERLASM_SCHEME)",
                 ],
+            "include/crypto/bn_conf.h" =>
+                [
+                    "include/crypto/bn_conf.h.in",
+                ],
+            "include/crypto/dso_conf.h" =>
+                [
+                    "include/crypto/dso_conf.h.in",
+                ],
             "include/openssl/opensslconf.h" =>
                 [
                     "include/openssl/opensslconf.h.in",
@@ -4879,7 +4886,6 @@ our %unified_info = (
             "crypto/aes/aes-ppc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/aes/aes-s390x.o" =>
@@ -4893,49 +4899,41 @@ our %unified_info = (
             "crypto/aes/aes_cbc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/aes/aes_cfb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/aes/aes_core.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/aes/aes_ecb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/aes/aes_ige.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/aes/aes_misc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/aes/aes_ofb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/aes/aes_wrap.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/aes/aesfx-sparcv9.o" =>
@@ -4945,7 +4943,6 @@ our %unified_info = (
             "crypto/aes/aesp8-ppc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/aes/aest4-sparcv9.o" =>
@@ -4963,13 +4960,11 @@ our %unified_info = (
             "crypto/aes/vpaes-ppc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/aria/aria.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/arm64cpuid.o" =>
@@ -4983,613 +4978,511 @@ our %unified_info = (
             "crypto/asn1/a_bitstr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_d2i_fp.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_digest.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_dup.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_gentm.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_i2d_fp.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_int.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_mbstr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_object.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_octet.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_print.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_sign.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_strex.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_strnid.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_time.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_type.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_utctm.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_utf8.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_verify.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/ameth_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/asn1_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/asn1_gen.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/asn1_item_list.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/asn1_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/asn1_par.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/asn_mime.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/asn_moid.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/asn_mstbl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/asn_pack.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/bio_asn1.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/bio_ndef.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/d2i_pr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/d2i_pu.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/evp_asn1.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/f_int.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/f_string.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/i2d_pr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/i2d_pu.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/n_pkey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/nsseq.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/p5_pbe.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/p5_pbev2.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/p5_scrypt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/p8_pkey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/t_bitst.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/t_pkey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/t_spki.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/tasn_dec.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/tasn_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/tasn_fre.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/tasn_new.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/tasn_prn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/tasn_scn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/tasn_typ.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/tasn_utl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/x_algor.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/x_bignum.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/x_info.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/x_int64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/x_long.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/x_pkey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/x_sig.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/x_spki.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/x_val.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/async/arch/async_null.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/async/arch/async_posix.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/async/arch/async_win.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/async/async.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/async/async_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/async/async_wait.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bf/bf_cfb64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bf/bf_ecb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bf/bf_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bf/bf_ofb64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bf/bf_skey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/b_addr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/b_dump.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/b_print.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/b_sock.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/b_sock2.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bf_buff.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bf_lbuf.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bf_nbio.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bf_null.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bio_cb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bio_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bio_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bio_meth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bss_acpt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bss_bio.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bss_conn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bss_dgram.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bss_fd.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bss_file.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bss_log.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bss_mem.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bss_null.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bss_sock.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/blake2/blake2b.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/blake2/blake2s.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/blake2/m_blake2b.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/blake2/m_blake2s.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/armv4-gf2m.o" =>
@@ -5607,188 +5500,157 @@ our %unified_info = (
             "crypto/bn/bn-ppc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_add.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_blind.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_const.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_ctx.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_depr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_dh.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_div.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_exp.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto",
                 ],
             "crypto/bn/bn_exp2.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_gcd.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_gf2m.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_intern.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_kron.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_mod.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_mont.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_mpi.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_mul.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_nist.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_prime.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_print.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_rand.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_recp.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_shift.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_sqr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_sqrt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_srp.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_word.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_x931p.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/mips-mont.o" =>
@@ -5798,7 +5660,6 @@ our %unified_info = (
             "crypto/bn/ppc-mont.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/sparct4-mont.o" =>
@@ -5824,13 +5685,11 @@ our %unified_info = (
             "crypto/buffer/buf_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/buffer/buffer.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/buildinf.h" =>
@@ -5840,43 +5699,36 @@ our %unified_info = (
             "crypto/camellia/camellia.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/camellia/cmll_cbc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/camellia/cmll_cfb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/camellia/cmll_ctr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/camellia/cmll_ecb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/camellia/cmll_misc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/camellia/cmll_ofb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/camellia/cmllt4-sparcv9.o" =>
@@ -5886,31 +5738,26 @@ our %unified_info = (
             "crypto/cast/c_cfb64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cast/c_ecb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cast/c_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cast/c_ofb64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cast/c_skey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/chacha/chacha-armv4.o" =>
@@ -5924,7 +5771,6 @@ our %unified_info = (
             "crypto/chacha/chacha-ppc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/chacha/chacha-s390x.o" =>
@@ -5934,272 +5780,227 @@ our %unified_info = (
             "crypto/cmac/cm_ameth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cmac/cm_pmeth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cmac/cmac.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_asn1.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_att.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_cd.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_dd.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_env.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_ess.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_io.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_kari.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_pwri.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_sd.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_smime.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/conf/conf_api.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/conf/conf_def.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/conf/conf_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/conf/conf_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/conf/conf_mall.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/conf/conf_mod.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/conf/conf_sap.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/conf/conf_ssl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cpt_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cryptlib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ct/ct_b64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ct/ct_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ct/ct_log.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ct/ct_oct.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ct/ct_policy.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ct/ct_prn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ct/ct_sct.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ct/ct_sct_ctx.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ct/ct_vfy.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ct/ct_x509v3.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ctype.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cversion.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto",
                 ],
             "crypto/des/cbc_cksm.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/cbc_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/cfb64ede.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/cfb64enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/cfb_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/des_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/dest4-sparcv9.o" =>
@@ -6209,301 +6010,251 @@ our %unified_info = (
             "crypto/des/ecb3_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/ecb_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/fcrypt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/fcrypt_b.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/ofb64ede.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/ofb64enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/ofb_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/pcbc_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/qud_cksm.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/rand_key.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/set_key.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/str2key.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/xcbc_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_ameth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_asn1.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_check.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_depr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_gen.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_kdf.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_key.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_meth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_pmeth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_prn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_rfc5114.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_rfc7919.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dsa/dsa_ameth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dsa/dsa_asn1.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dsa/dsa_depr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dsa/dsa_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dsa/dsa_gen.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dsa/dsa_key.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dsa/dsa_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dsa/dsa_meth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dsa/dsa_ossl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dsa/dsa_pmeth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dsa/dsa_prn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dsa/dsa_sign.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dsa/dsa_vrf.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dso/dso_dl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dso/dso_dlfcn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dso/dso_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dso/dso_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dso/dso_openssl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dso/dso_vms.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dso/dso_win32.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ebcdic.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/curve25519.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/curve448/arch_32/f_impl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto/ec/curve448/arch_32",
                     "crypto/ec/curve448",
@@ -6511,7 +6262,6 @@ our %unified_info = (
             "crypto/ec/curve448/curve448.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto/ec/curve448/arch_32",
                     "crypto/ec/curve448",
@@ -6519,7 +6269,6 @@ our %unified_info = (
             "crypto/ec/curve448/curve448_tables.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto/ec/curve448/arch_32",
                     "crypto/ec/curve448",
@@ -6527,7 +6276,6 @@ our %unified_info = (
             "crypto/ec/curve448/eddsa.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto/ec/curve448/arch_32",
                     "crypto/ec/curve448",
@@ -6535,7 +6283,6 @@ our %unified_info = (
             "crypto/ec/curve448/f_generic.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto/ec/curve448/arch_32",
                     "crypto/ec/curve448",
@@ -6543,7 +6290,6 @@ our %unified_info = (
             "crypto/ec/curve448/scalar.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto/ec/curve448/arch_32",
                     "crypto/ec/curve448",
@@ -6551,163 +6297,136 @@ our %unified_info = (
             "crypto/ec/ec2_oct.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec2_smpl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec_ameth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec_asn1.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec_check.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec_curve.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec_cvt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec_key.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec_kmeth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec_mult.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec_oct.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec_pmeth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec_print.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecdh_kdf.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecdh_ossl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecdsa_ossl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecdsa_sign.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecdsa_vrf.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/eck_prn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecp_mont.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecp_nist.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecp_nistp224.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecp_nistp256.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecp_nistp521.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecp_nistputil.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecp_nistz256-armv4.o" =>
@@ -6721,7 +6440,6 @@ our %unified_info = (
             "crypto/ec/ecp_nistz256-ppc64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecp_nistz256-sparcv9.o" =>
@@ -6731,235 +6449,196 @@ our %unified_info = (
             "crypto/ec/ecp_nistz256.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecp_oct.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecp_smpl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecx_meth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/x25519-ppc64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/eng_all.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/eng_cnf.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/eng_ctrl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/eng_dyn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/eng_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/eng_fat.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/eng_init.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/eng_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/eng_list.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/eng_openssl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/eng_pkey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/eng_rdrand.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/eng_table.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/tb_asnmth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/tb_cipher.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/tb_dh.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/tb_digest.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/tb_dsa.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/tb_eckey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/tb_pkmeth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/tb_rand.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/tb_rsa.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/err/err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/err/err_all.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/err/err_prn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/bio_b64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/bio_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/bio_md.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/bio_ok.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/c_allc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/c_alld.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/cmeth_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/digest.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/e_aes.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto",
                     "crypto/modes",
@@ -6967,21 +6646,18 @@ our %unified_info = (
             "crypto/evp/e_aes_cbc_hmac_sha1.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto/modes",
                 ],
             "crypto/evp/e_aes_cbc_hmac_sha256.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto/modes",
                 ],
             "crypto/evp/e_aria.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto",
                     "crypto/modes",
@@ -6989,13 +6665,11 @@ our %unified_info = (
             "crypto/evp/e_bf.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/e_camellia.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto",
                     "crypto/modes",
@@ -7003,81 +6677,68 @@ our %unified_info = (
             "crypto/evp/e_cast.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/e_chacha20_poly1305.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/e_des.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto",
                 ],
             "crypto/evp/e_des3.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto",
                 ],
             "crypto/evp/e_idea.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/e_null.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/e_old.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/e_rc2.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/e_rc4.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/e_rc4_hmac_md5.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/e_rc5.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/e_seed.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/e_sm4.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto",
                     "crypto/modes",
@@ -7085,328 +6746,267 @@ our %unified_info = (
             "crypto/evp/e_xcbc_d.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/encode.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/evp_cnf.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/evp_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/evp_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/evp_key.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/evp_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/evp_pbe.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/evp_pkey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/m_md2.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/m_md4.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/m_md5.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/m_md5_sha1.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/m_mdc2.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/m_null.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/m_ripemd.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/m_sha1.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/m_sha3.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto",
                 ],
             "crypto/evp/m_sigver.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/m_wp.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/names.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/p5_crpt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/p5_crpt2.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/p_dec.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/p_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/p_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/p_open.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/p_seal.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/p_sign.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/p_verify.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/pbe_scrypt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/pmeth_fn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/pmeth_gn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/pmeth_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ex_data.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/getenv.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/hmac/hm_ameth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/hmac/hm_pmeth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/hmac/hmac.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/idea/i_cbc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/idea/i_cfb64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/idea/i_ecb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/idea/i_ofb64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/idea/i_skey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
-            "crypto/include/internal/bn_conf.h" =>
-                [
-                    ".",
-                ],
-            "crypto/include/internal/dso_conf.h" =>
-                [
-                    ".",
-                ],
             "crypto/init.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/kdf/hkdf.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/kdf/kdf_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/kdf/scrypt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/kdf/tls1_prf.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/lhash/lh_stats.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/lhash/lhash.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/md4/md4_dgst.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/md4/md4_one.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/md5/md5-sparcv9.o" =>
@@ -7416,79 +7016,66 @@ our %unified_info = (
             "crypto/md5/md5_dgst.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/md5/md5_one.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/mdc2/mdc2_one.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/mdc2/mdc2dgst.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/mem.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/mem_dbg.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/mem_sec.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/modes/cbc128.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/modes/ccm128.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/modes/cfb128.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/modes/ctr128.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/modes/cts128.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/modes/gcm128.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto",
                 ],
@@ -7507,7 +7094,6 @@ our %unified_info = (
             "crypto/modes/ghashp8-ppc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/modes/ghashv8-armx.o" =>
@@ -7517,361 +7103,301 @@ our %unified_info = (
             "crypto/modes/ocb128.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/modes/ofb128.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/modes/wrap128.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/modes/xts128.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/o_dir.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/o_fips.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/o_fopen.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/o_init.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/o_str.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/o_time.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/objects/o_names.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/objects/obj_dat.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/objects/obj_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/objects/obj_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/objects/obj_xref.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ocsp/ocsp_asn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ocsp/ocsp_cl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ocsp/ocsp_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ocsp/ocsp_ext.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ocsp/ocsp_ht.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ocsp/ocsp_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ocsp/ocsp_prn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ocsp/ocsp_srv.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ocsp/ocsp_vfy.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ocsp/v3_ocsp.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pem/pem_all.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pem/pem_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pem/pem_info.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pem/pem_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pem/pem_oth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pem/pem_pk8.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pem/pem_pkey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pem/pem_sign.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pem/pem_x509.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pem/pem_xaux.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pem/pvkfmt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_add.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_asn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_attr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_crpt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_crt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_decr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_init.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_key.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_kiss.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_mutl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_npas.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_p8d.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_p8e.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_sbag.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_utl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/pk12err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs7/bio_pk7.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs7/pk7_asn1.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs7/pk7_attr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs7/pk7_doit.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs7/pk7_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs7/pk7_mime.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs7/pk7_smime.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs7/pkcs7err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/poly1305/poly1305-armv4.o" =>
@@ -7889,13 +7415,11 @@ our %unified_info = (
             "crypto/poly1305/poly1305-ppc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/poly1305/poly1305-ppcfp.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/poly1305/poly1305-sparcv9.o" =>
@@ -7905,271 +7429,226 @@ our %unified_info = (
             "crypto/poly1305/poly1305.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/poly1305/poly1305_ameth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/poly1305/poly1305_pmeth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ppccap.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ppccpuid.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rand/drbg_ctr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rand/drbg_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rand/rand_egd.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rand/rand_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rand/rand_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rand/rand_unix.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rand/rand_vms.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rand/rand_win.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rand/randfile.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rc2/rc2_cbc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rc2/rc2_ecb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rc2/rc2_skey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rc2/rc2cfb64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rc2/rc2ofb64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rc4/rc4_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rc4/rc4_skey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ripemd/rmd_dgst.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ripemd/rmd_one.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_ameth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_asn1.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_chk.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_crpt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_depr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_gen.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_meth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_mp.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_none.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_oaep.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_ossl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_pk1.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_pmeth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_prn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_pss.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_saos.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_sign.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_ssl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_x931.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_x931g.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/s390xcpuid.o" =>
@@ -8179,31 +7658,26 @@ our %unified_info = (
             "crypto/seed/seed.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/seed/seed_cbc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/seed/seed_cfb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/seed/seed_ecb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/seed/seed_ofb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sha/keccak1600-armv4.o" =>
@@ -8213,7 +7687,6 @@ our %unified_info = (
             "crypto/sha/keccak1600-ppc64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sha/sha1-armv4-large.o" =>
@@ -8231,7 +7704,6 @@ our %unified_info = (
             "crypto/sha/sha1-ppc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sha/sha1-s390x.o" =>
@@ -8245,13 +7717,11 @@ our %unified_info = (
             "crypto/sha/sha1_one.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sha/sha1dgst.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sha/sha256-armv4.o" =>
@@ -8269,7 +7739,6 @@ our %unified_info = (
             "crypto/sha/sha256-ppc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sha/sha256-s390x.o" =>
@@ -8283,13 +7752,11 @@ our %unified_info = (
             "crypto/sha/sha256.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sha/sha256p8-ppc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sha/sha512-armv4.o" =>
@@ -8307,7 +7774,6 @@ our %unified_info = (
             "crypto/sha/sha512-ppc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sha/sha512-s390x.o" =>
@@ -8321,715 +7787,596 @@ our %unified_info = (
             "crypto/sha/sha512.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sha/sha512p8-ppc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/siphash/siphash.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/siphash/siphash_ameth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/siphash/siphash_pmeth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sm2/sm2_crypt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sm2/sm2_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sm2/sm2_pmeth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sm2/sm2_sign.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sm3/m_sm3.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sm3/sm3.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sm4/sm4.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/srp/srp_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/srp/srp_vfy.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/stack/stack.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/store/loader_file.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/store/store_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/store/store_init.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/store/store_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/store/store_register.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/store/store_strings.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/threads_none.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/threads_pthread.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/threads_win.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ts/ts_asn1.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ts/ts_conf.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ts/ts_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ts/ts_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ts/ts_req_print.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ts/ts_req_utils.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ts/ts_rsp_print.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ts/ts_rsp_sign.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ts/ts_rsp_utils.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ts/ts_rsp_verify.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ts/ts_verify_ctx.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/txt_db/txt_db.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ui/ui_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ui/ui_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ui/ui_null.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ui/ui_openssl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ui/ui_util.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/uid.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/whrlpool/wp_block.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/whrlpool/wp_dgst.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/by_dir.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/by_file.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/t_crl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/t_req.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/t_x509.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_att.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_cmp.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_d2.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_def.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_ext.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_lu.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_meth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_obj.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_r2x.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_req.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_set.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_trs.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_txt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_v3.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_vfy.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_vpm.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509cset.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509name.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509rset.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509spki.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509type.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x_all.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x_attrib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x_crl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x_exten.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x_name.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x_pubkey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x_req.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x_x509.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x_x509a.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/pcy_cache.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/pcy_data.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/pcy_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/pcy_map.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/pcy_node.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/pcy_tree.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_addr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_admis.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_akey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_akeya.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_alt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_asid.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_bcons.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_bitst.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_conf.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_cpols.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_crld.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_enum.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_extku.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_genn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_ia5.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_info.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_int.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_ncons.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_pci.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_pcia.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_pcons.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_pku.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_pmaps.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_prn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_purp.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_skey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_sxnet.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_tlsf.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_utl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "engines/e_capi.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "engines/e_padlock.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "fuzz/asn1.o" =>
@@ -9080,6 +8427,14 @@ our %unified_info = (
                 [
                     "include",
                 ],
+            "include/crypto/bn_conf.h" =>
+                [
+                    ".",
+                ],
+            "include/crypto/dso_conf.h" =>
+                [
+                    ".",
+                ],
             "include/openssl/opensslconf.h" =>
                 [
                     ".",
@@ -9324,7 +8679,6 @@ our %unified_info = (
                 [
                     ".",
                     "include",
-                    "crypto/include",
                 ],
             "test/asn1_string_table_test.o" =>
                 [
@@ -9650,7 +9004,6 @@ our %unified_info = (
                 [
                     ".",
                     "include",
-                    "crypto/include",
                 ],
             "test/cipher_overhead_test.o" =>
                 [
@@ -9696,7 +9049,6 @@ our %unified_info = (
             "test/ctype_internal_test.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "test/curve448_internal_test.o" =>
@@ -9762,7 +9114,6 @@ our %unified_info = (
                 [
                     "include",
                     "crypto/ec",
-                    "crypto/include",
                 ],
             "test/ecdsatest.o" =>
                 [
@@ -9787,7 +9138,6 @@ our %unified_info = (
             "test/evp_extra_test.o" =>
                 [
                     "include",
-                    "crypto/include",
                 ],
             "test/evp_test.o" =>
                 [
@@ -9885,7 +9235,6 @@ our %unified_info = (
                 [
                     ".",
                     "include",
-                    "crypto/include",
                 ],
             "test/rc2test.o" =>
                 [
@@ -9935,18 +9284,15 @@ our %unified_info = (
                 [
                     ".",
                     "include",
-                    "crypto/include",
                 ],
             "test/sm2_internal_test.o" =>
                 [
                     "include",
-                    "crypto/include",
                 ],
             "test/sm4_internal_test.o" =>
                 [
                     ".",
                     "include",
-                    "crypto/include",
                 ],
             "test/srptest.o" =>
                 [
@@ -9957,6 +9303,10 @@ our %unified_info = (
                     ".",
                     "include",
                 ],
+            "test/ssl_ctx_test.o" =>
+                [
+                    "include",
+                ],
             "test/ssl_test.o" =>
                 [
                     "include",
@@ -10020,10 +9370,6 @@ our %unified_info = (
                 [
                     "include",
                 ],
-            "test/testutil/init.o" =>
-                [
-                    "include",
-                ],
             "test/testutil/main.o" =>
                 [
                     "include",
@@ -10052,6 +9398,10 @@ our %unified_info = (
                 [
                     "include",
                 ],
+            "test/testutil/testutil_init.o" =>
+                [
+                    "include",
+                ],
             "test/threadstest.o" =>
                 [
                     "include",
@@ -10316,6 +9666,7 @@ our %unified_info = (
             "test/sm4_internal_test",
             "test/srptest",
             "test/ssl_cert_table_internal_test",
+            "test/ssl_ctx_test",
             "test/ssl_test",
             "test/ssl_test_ctx_test",
             "test/sslapitest",
@@ -15286,7 +14637,6 @@ our %unified_info = (
                     "test/testutil/cb.o",
                     "test/testutil/driver.o",
                     "test/testutil/format_output.o",
-                    "test/testutil/init.o",
                     "test/testutil/main.o",
                     "test/testutil/output_helpers.o",
                     "test/testutil/random.o",
@@ -15294,6 +14644,7 @@ our %unified_info = (
                     "test/testutil/tap_bio.o",
                     "test/testutil/test_cleanup.o",
                     "test/testutil/tests.o",
+                    "test/testutil/testutil_init.o",
                 ],
             "test/md2test" =>
                 [
@@ -15521,6 +14872,14 @@ our %unified_info = (
                 [
                     "test/ssl_cert_table_internal_test.c",
                 ],
+            "test/ssl_ctx_test" =>
+                [
+                    "test/ssl_ctx_test.o",
+                ],
+            "test/ssl_ctx_test.o" =>
+                [
+                    "test/ssl_ctx_test.c",
+                ],
             "test/ssl_test" =>
                 [
                     "test/handshake_helper.o",
@@ -15623,10 +14982,6 @@ our %unified_info = (
                 [
                     "test/testutil/format_output.c",
                 ],
-            "test/testutil/init.o" =>
-                [
-                    "test/testutil/init.c",
-                ],
             "test/testutil/main.o" =>
                 [
                     "test/testutil/main.c",
@@ -15655,6 +15010,10 @@ our %unified_info = (
                 [
                     "test/testutil/tests.c",
                 ],
+            "test/testutil/testutil_init.o" =>
+                [
+                    "test/testutil/testutil_init.c",
+                ],
             "test/threadstest" =>
                 [
                     "test/threadstest.o",
diff --git a/deps/openssl/config/archs/linux-ppc64le/asm/crypto/bn/ppc64-mont.s b/deps/openssl/config/archs/linux-ppc64le/asm/crypto/bn/ppc64-mont.s
deleted file mode 100644
index 5bafae2b27..0000000000
--- a/deps/openssl/config/archs/linux-ppc64le/asm/crypto/bn/ppc64-mont.s
+++ /dev/null
@@ -1,748 +0,0 @@
-.machine	"any"
-.abiversion	2
-.text
-
-.globl	bn_mul_mont_fpu64
-.type	bn_mul_mont_fpu64,@function
-.align	5
-bn_mul_mont_fpu64:
-.localentry	bn_mul_mont_fpu64,0
-	cmpwi	8,3
-	mr	9,3
-	li	3,0
-	.long	0x4dc00020
-	andi.	0,8,1
-	.long	0x4cc20020
-
-	slwi	8,8,3
-	li	12,-4096
-	slwi	10,8,2
-	add	10,10,8
-	addi	10,10,552
-	subf	10,10,1
-	and	10,10,12
-	subf	10,1,10
-	mr	12,1
-	stdux	1,1,10
-
-	std	19,-200(12)
-	std	20,-192(12)
-	std	21,-184(12)
-	std	22,-176(12)
-	std	23,-168(12)
-	std	24,-160(12)
-	std	25,-152(12)
-	std	26,-144(12)
-	std	27,-136(12)
-	std	28,-128(12)
-	std	29,-120(12)
-	std	30,-112(12)
-	std	31,-104(12)
-	stfd	20,-96(12)
-	stfd	21,-88(12)
-	stfd	22,-80(12)
-	stfd	23,-72(12)
-	stfd	24,-64(12)
-	stfd	25,-56(12)
-	stfd	26,-48(12)
-	stfd	27,-40(12)
-	stfd	28,-32(12)
-	stfd	29,-24(12)
-	stfd	30,-16(12)
-	stfd	31,-8(12)
-
-	addi	10,1,264
-	li	12,-64
-	add	22,10,8
-	and	22,22,12
-
-	addi	22,22,-8
-	srwi	11,8,4
-	addi	11,11,-1
-	addi	10,1,184
-	li	0,0
-	mtctr	11
-	ld	23,0(4)
-	ld	27,0(5)
-	ld	7,0(7)
-
-	mulld	31,23,27
-
-	rldicl	24,27,0,48
-	rldicl	25,27,48,48
-	rldicl	26,27,32,48
-	rldicl	27,27,16,48
-	std	24,64(1)
-	std	25,72(1)
-	std	26,80(1)
-	std	27,88(1)
-
-	mulld	31,31,7
-
-	rldicl	28,31,0,48
-	rldicl	29,31,48,48
-	rldicl	30,31,32,48
-	rldicl	31,31,16,48
-	std	28,96(1)
-	std	29,104(1)
-	std	30,112(1)
-	std	31,120(1)
-
-	rldicl	24,23,0,32
-	rldicl	25,23,32,32
-	lwz	26,8(4)
-	lwz	27,12(4)
-	lwz	28,0(6)
-	lwz	29,4(6)
-	lwz	30,8(6)
-	lwz	31,12(6)
-	lfd	0,64(1)
-	lfd	1,72(1)
-	lfd	2,80(1)
-	lfd	3,88(1)
-	lfd	4,96(1)
-	lfd	5,104(1)
-	lfd	6,112(1)
-	lfd	7,120(1)
-	std	24,128(1)
-	std	25,136(1)
-	std	26,144(1)
-	std	27,152(1)
-	std	28,160(1)
-	std	29,168(1)
-	std	30,176(1)
-	std	31,184(1)
-	fcfid	0,0
-	fcfid	1,1
-	fcfid	2,2
-	fcfid	3,3
-	fcfid	4,4
-	fcfid	5,5
-	fcfid	6,6
-	fcfid	7,7
-
-	lfd	10,128(1)
-	lfd	11,136(1)
-	lfd	12,144(1)
-	lfd	13,152(1)
-	lfd	20,160(1)
-	lfd	21,168(1)
-	lfd	22,176(1)
-	lfd	23,184(1)
-	fcfid	10,10
-	fcfid	11,11
-	fcfid	12,12
-	fcfid	13,13
-	fcfid	20,20
-	fcfid	21,21
-	fcfid	22,22
-	fcfid	23,23
-	addi	4,4,16
-	addi	6,6,16
-
-	fmul	26,11,0
-	fmul	27,11,1
-	stfd	10,8(22)
-	stfd	11,16(22)
-	fmul	28,12,0
-	fmul	29,12,1
-	stfd	12,24(22)
-	stfd	13,32(22)
-	fmul	30,13,0
-	fmul	31,13,1
-	stfd	20,40(22)
-	stfd	21,48(22)
-	fmul	24,10,0
-	fmul	25,10,1
-	stfd	22,56(22)
-	stfdu	23,64(22)
-
-	fmadd	26,10,2,26
-	fmadd	27,10,3,27
-	fmadd	28,11,2,28
-	fmadd	29,11,3,29
-	fmadd	30,12,2,30
-	fmadd	31,12,3,31
-	fmul	8,13,2
-	fmul	9,13,3
-
-	fmadd	26,21,4,26
-	fmadd	27,21,5,27
-	fmadd	28,22,4,28
-	fmadd	29,22,5,29
-	fmadd	30,23,4,30
-	fmadd	31,23,5,31
-	fmadd	24,20,4,24
-	fmadd	25,20,5,25
-
-	fmadd	26,20,6,26
-	fmadd	27,20,7,27
-	fmadd	28,21,6,28
-	fmadd	29,21,7,29
-	fmadd	30,22,6,30
-	fmadd	31,22,7,31
-	fmadd	8,23,6,8
-	fmadd	9,23,7,9
-
-	fctid	24,24
-	fctid	25,25
-	fctid	26,26
-	fctid	27,27
-	fctid	28,28
-	fctid	29,29
-	fctid	30,30
-	fctid	31,31
-
-	stfd	24,64(1)
-	stfd	25,72(1)
-	stfd	26,80(1)
-	stfd	27,88(1)
-	stfd	28,96(1)
-	stfd	29,104(1)
-	stfd	30,112(1)
-	stfd	31,120(1)
-
-.align	5
-.L1st:
-	lwz	24,0(4)
-	lwz	25,4(4)
-	lwz	26,8(4)
-	lwz	27,12(4)
-	lwz	28,0(6)
-	lwz	29,4(6)
-	lwz	30,8(6)
-	lwz	31,12(6)
-	std	24,128(1)
-	std	25,136(1)
-	std	26,144(1)
-	std	27,152(1)
-	std	28,160(1)
-	std	29,168(1)
-	std	30,176(1)
-	std	31,184(1)
-	ld	24,64(1)
-	ld	25,72(1)
-	ld	26,80(1)
-	ld	27,88(1)
-	ld	28,96(1)
-	ld	29,104(1)
-	ld	30,112(1)
-	ld	31,120(1)
-	lfd	10,128(1)
-	lfd	11,136(1)
-	lfd	12,144(1)
-	lfd	13,152(1)
-	lfd	20,160(1)
-	lfd	21,168(1)
-	lfd	22,176(1)
-	lfd	23,184(1)
-	fcfid	10,10
-	fcfid	11,11
-	fcfid	12,12
-	fcfid	13,13
-	fcfid	20,20
-	fcfid	21,21
-	fcfid	22,22
-	fcfid	23,23
-	addi	4,4,16
-	addi	6,6,16
-
-	fmul	26,11,0
-	fmul	27,11,1
-	fmul	28,12,0
-	fmul	29,12,1
-	stfd	10,8(22)
-	stfd	11,16(22)
-	fmul	30,13,0
-	fmul	31,13,1
-	fmadd	24,10,0,8
-	fmadd	25,10,1,9
-	stfd	12,24(22)
-	stfd	13,32(22)
-	fmadd	26,10,2,26
-	fmadd	27,10,3,27
-	fmadd	28,11,2,28
-	fmadd	29,11,3,29
-	stfd	20,40(22)
-	stfd	21,48(22)
-	fmadd	30,12,2,30
-	fmadd	31,12,3,31
-	add	24,24,0
-	fmul	8,13,2
-	fmul	9,13,3
-	stfd	22,56(22)
-	stfdu	23,64(22)
-	srdi	0,24,16
-	add	25,25,0
-	srdi	0,25,16
-
-	fmadd	26,21,4,26
-	fmadd	27,21,5,27
-	insrdi	24,25,16,32
-	fmadd	28,22,4,28
-	fmadd	29,22,5,29
-	add	26,26,0
-	fmadd	30,23,4,30
-	fmadd	31,23,5,31
-	srdi	0,26,16
-	fmadd	24,20,4,24
-	fmadd	25,20,5,25
-	insrdi	24,26,16,16
-	add	27,27,0
-	srdi	0,27,16
-
-	fmadd	26,20,6,26
-	fmadd	27,20,7,27
-	insrdi	24,27,16,0
-	fmadd	28,21,6,28
-	fmadd	29,21,7,29
-	add	28,28,0
-	fmadd	30,22,6,30
-	fmadd	31,22,7,31
-	srdi	0,28,16
-	fmadd	8,23,6,8
-	fmadd	9,23,7,9
-	add	29,29,0
-	srdi	0,29,16
-	insrdi	28,29,16,32
-
-	fctid	24,24
-	fctid	25,25
-	add	30,30,0
-	fctid	26,26
-	fctid	27,27
-	srdi	0,30,16
-	fctid	28,28
-	fctid	29,29
-	insrdi	28,30,16,16
-	fctid	30,30
-	fctid	31,31
-	add	31,31,0
-	insrdi	28,31,16,0
-	srdi	0,31,16
-
-	stfd	24,64(1)
-	stfd	25,72(1)
-	stfd	26,80(1)
-	stfd	27,88(1)
-	stfd	28,96(1)
-	stfd	29,104(1)
-	stfd	30,112(1)
-	stfd	31,120(1)
-	std	24,8(10)
-	stdu	28,16(10)
-	bdnz	.L1st
-
-	fctid	8,8
-	fctid	9,9
-	ld	24,64(1)
-	ld	25,72(1)
-	ld	26,80(1)
-	ld	27,88(1)
-	ld	28,96(1)
-	ld	29,104(1)
-	ld	30,112(1)
-	ld	31,120(1)
-	stfd	8,128(1)
-	stfd	9,136(1)
-
-	add	24,24,0
-	srdi	0,24,16
-	add	25,25,0
-	srdi	0,25,16
-	insrdi	24,25,16,32
-	add	26,26,0
-	srdi	0,26,16
-	insrdi	24,26,16,16
-	add	27,27,0
-	srdi	0,27,16
-	insrdi	24,27,16,0
-	add	28,28,0
-	srdi	0,28,16
-	add	29,29,0
-	srdi	0,29,16
-	insrdi	28,29,16,32
-	add	30,30,0
-	srdi	0,30,16
-	insrdi	28,30,16,16
-	add	31,31,0
-	insrdi	28,31,16,0
-	srdi	0,31,16
-	ld	30,128(1)
-	ld	31,136(1)
-
-	std	24,8(10)
-	stdu	28,16(10)
-
-	add	30,30,0
-	srdi	0,30,16
-	add	31,31,0
-	insrdi	30,31,48,0
-	srdi	3,31,48
-	std	30,8(10)
-	slwi	31,8,2
-	subf	22,31,22
-
-	li	12,8
-.align	5
-.Louter:
-	addi	10,1,192
-	li	0,0
-	mtctr	11
-	ldx	27,5,12
-
-	ld	30,200(1)
-	mulld	31,23,27
-	add	31,31,30
-
-	rldicl	24,27,0,48
-	rldicl	25,27,48,48
-	rldicl	26,27,32,48
-	rldicl	27,27,16,48
-	std	24,64(1)
-	std	25,72(1)
-	std	26,80(1)
-	std	27,88(1)
-
-	mulld	31,31,7
-
-	rldicl	28,31,0,48
-	rldicl	29,31,48,48
-	rldicl	30,31,32,48
-	rldicl	31,31,16,48
-	std	28,96(1)
-	std	29,104(1)
-	std	30,112(1)
-	std	31,120(1)
-	lfd	10,8(22)
-	lfd	11,16(22)
-	lfd	12,24(22)
-	lfd	13,32(22)
-	lfd	20,40(22)
-	lfd	21,48(22)
-	lfd	22,56(22)
-	lfdu	23,64(22)
-
-	lfd	0,64(1)
-	lfd	1,72(1)
-	lfd	2,80(1)
-	lfd	3,88(1)
-	lfd	4,96(1)
-	lfd	5,104(1)
-	lfd	6,112(1)
-	lfd	7,120(1)
-
-	fcfid	0,0
-	fcfid	1,1
-	fcfid	2,2
-	fcfid	3,3
-	fcfid	4,4
-	fcfid	5,5
-	fcfid	6,6
-	fcfid	7,7
-
-	fmul	26,11,0
-	fmul	27,11,1
-	fmul	28,12,0
-	fmul	29,12,1
-	fmul	30,13,0
-	fmul	31,13,1
-	fmul	24,10,0
-	fmul	25,10,1
-
-	fmadd	26,10,2,26
-	fmadd	27,10,3,27
-	fmadd	28,11,2,28
-	fmadd	29,11,3,29
-	fmadd	30,12,2,30
-	fmadd	31,12,3,31
-	fmul	8,13,2
-	fmul	9,13,3
-
-	fmadd	26,21,4,26
-	fmadd	27,21,5,27
-	lfd	10,8(22)
-	lfd	11,16(22)
-	fmadd	28,22,4,28
-	fmadd	29,22,5,29
-	lfd	12,24(22)
-	lfd	13,32(22)
-	fmadd	30,23,4,30
-	fmadd	31,23,5,31
-	fmadd	24,20,4,24
-	fmadd	25,20,5,25
-
-	fmadd	26,20,6,26
-	fmadd	27,20,7,27
-	fmadd	28,21,6,28
-	fmadd	29,21,7,29
-	fmadd	30,22,6,30
-	fmadd	31,22,7,31
-	fmadd	8,23,6,8
-	fmadd	9,23,7,9
-
-	fctid	24,24
-	fctid	25,25
-	fctid	26,26
-	fctid	27,27
-	fctid	28,28
-	fctid	29,29
-	fctid	30,30
-	fctid	31,31
-
-	stfd	24,64(1)
-	stfd	25,72(1)
-	stfd	26,80(1)
-	stfd	27,88(1)
-	stfd	28,96(1)
-	stfd	29,104(1)
-	stfd	30,112(1)
-	stfd	31,120(1)
-
-.align	5
-.Linner:
-	fmul	26,11,0
-	fmul	27,11,1
-	fmul	28,12,0
-	fmul	29,12,1
-	lfd	20,40(22)
-	lfd	21,48(22)
-	fmul	30,13,0
-	fmul	31,13,1
-	fmadd	24,10,0,8
-	fmadd	25,10,1,9
-	lfd	22,56(22)
-	lfdu	23,64(22)
-
-	fmadd	26,10,2,26
-	fmadd	27,10,3,27
-	fmadd	28,11,2,28
-	fmadd	29,11,3,29
-	lfd	10,8(22)
-	lfd	11,16(22)
-	fmadd	30,12,2,30
-	fmadd	31,12,3,31
-	fmul	8,13,2
-	fmul	9,13,3
-	lfd	12,24(22)
-	lfd	13,32(22)
-	fmadd	26,21,4,26
-	fmadd	27,21,5,27
-	ld	24,64(1)
-	ld	25,72(1)
-	fmadd	28,22,4,28
-	fmadd	29,22,5,29
-	ld	26,80(1)
-	ld	27,88(1)
-	fmadd	30,23,4,30
-	fmadd	31,23,5,31
-	add	24,24,0
-	ld	28,96(1)
-	ld	29,104(1)
-	fmadd	24,20,4,24
-	fmadd	25,20,5,25
-	srdi	0,24,16
-	add	25,25,0
-	srdi	0,25,16
-	ld	30,112(1)
-	ld	31,120(1)
-
-	fmadd	26,20,6,26
-	fmadd	27,20,7,27
-	insrdi	24,25,16,32
-	ld	25,8(10)
-	fmadd	28,21,6,28
-	fmadd	29,21,7,29
-	add	26,26,0
-	fmadd	30,22,6,30
-	fmadd	31,22,7,31
-	srdi	0,26,16
-	insrdi	24,26,16,16
-	fmadd	8,23,6,8
-	fmadd	9,23,7,9
-	add	27,27,0
-	ldu	26,16(10)
-	srdi	0,27,16
-	insrdi	24,27,16,0
-	add	28,28,0
-
-	fctid	24,24
-	fctid	25,25
-	srdi	0,28,16
-	fctid	26,26
-	fctid	27,27
-	add	29,29,0
-	fctid	28,28
-	fctid	29,29
-	srdi	0,29,16
-	insrdi	28,29,16,32
-	fctid	30,30
-	fctid	31,31
-	add	30,30,0
-	srdi	0,30,16
-	insrdi	28,30,16,16
-
-	stfd	24,64(1)
-	stfd	25,72(1)
-	add	31,31,0
-	addc	27,24,25
-	stfd	26,80(1)
-	stfd	27,88(1)
-	insrdi	28,31,16,0
-	srdi	0,31,16
-	stfd	28,96(1)
-	stfd	29,104(1)
-	adde	29,28,26
-	stfd	30,112(1)
-	stfd	31,120(1)
-	addze	0,0
-	std	27,-16(10)
-	std	29,-8(10)
-	bdnz	.Linner
-
-	fctid	8,8
-	fctid	9,9
-	ld	24,64(1)
-	ld	25,72(1)
-	ld	26,80(1)
-	ld	27,88(1)
-	ld	28,96(1)
-	ld	29,104(1)
-	ld	30,112(1)
-	ld	31,120(1)
-	stfd	8,128(1)
-	stfd	9,136(1)
-
-	add	24,24,0
-	srdi	0,24,16
-	add	25,25,0
-	srdi	0,25,16
-	insrdi	24,25,16,32
-	add	26,26,0
-	ld	25,8(10)
-	srdi	0,26,16
-	insrdi	24,26,16,16
-	add	27,27,0
-	ldu	26,16(10)
-	srdi	0,27,16
-	insrdi	24,27,16,0
-	add	28,28,0
-	srdi	0,28,16
-	add	29,29,0
-	srdi	0,29,16
-	insrdi	28,29,16,32
-	add	30,30,0
-	srdi	0,30,16
-	insrdi	28,30,16,16
-	add	31,31,0
-	insrdi	28,31,16,0
-	srdi	0,31,16
-	ld	30,128(1)
-	ld	31,136(1)
-
-	addc	27,24,25
-	adde	29,28,26
-	addze	0,0
-
-	std	27,-16(10)
-	std	29,-8(10)
-
-	add	0,0,3
-	add	30,30,0
-	srdi	0,30,16
-	add	31,31,0
-	insrdi	30,31,48,0
-	srdi	3,31,48
-	std	30,0(10)
-	slwi	31,8,2
-	addi	12,12,8
-	subf	22,31,22
-	cmpw	12,8
-	blt-	.Louter
-	subf	6,8,6
-	addi	11,11,1
-	subfc	12,12,12
-	addi	10,1,200
-	addi	28,1,208
-	addi	29,6,8
-	addi	30,9,8
-	mtctr	11
-
-.align	4
-.Lsub:	ldx	24,10,12
-	ldx	25,6,12
-	ldx	26,28,12
-	ldx	27,29,12
-	subfe	24,25,24
-	subfe	26,27,26
-	stdx	24,9,12
-	stdx	26,30,12
-	addi	12,12,16
-	bdnz	.Lsub
-
-	li	12,0
-	subfe	3,12,3
-	mtctr	11
-
-.align	4
-.Lcopy:
-	ldx	24,10,12
-	ldx	25,28,12
-	ldx	26,9,12
-	ldx	27,30,12
-	std	12,8(22)
-	std	12,16(22)
-	std	12,24(22)
-	std	12,32(22)
-	std	12,40(22)
-	std	12,48(22)
-	std	12,56(22)
-	stdu	12,64(22)
-	and	24,24,3
-	and	25,25,3
-	andc	26,26,3
-	andc	27,27,3
-	or	24,24,26
-	or	25,25,27
-	stdx	24,9,12
-	stdx	25,30,12
-	stdx	12,10,12
-	stdx	12,28,12
-	addi	12,12,16
-	bdnz	.Lcopy
-	ld	12,0(1)
-	li	3,1
-	ld	19,-200(12)
-	ld	20,-192(12)
-	ld	21,-184(12)
-	ld	22,-176(12)
-	ld	23,-168(12)
-	ld	24,-160(12)
-	ld	25,-152(12)
-	ld	26,-144(12)
-	ld	27,-136(12)
-	ld	28,-128(12)
-	ld	29,-120(12)
-	ld	30,-112(12)
-	ld	31,-104(12)
-	lfd	20,-96(12)
-	lfd	21,-88(12)
-	lfd	22,-80(12)
-	lfd	23,-72(12)
-	lfd	24,-64(12)
-	lfd	25,-56(12)
-	lfd	26,-48(12)
-	lfd	27,-40(12)
-	lfd	28,-32(12)
-	lfd	29,-24(12)
-	lfd	30,-16(12)
-	lfd	31,-8(12)
-	mr	1,12
-	blr	
-.long	0
-.byte	0,12,4,0,0x8c,13,6,0
-.long	0
-.size	bn_mul_mont_fpu64,.-bn_mul_mont_fpu64
-
-.byte	77,111,110,116,103,111,109,101,114,121,32,77,117,108,116,105,112,108,105,99,97,116,105,111,110,32,102,111,114,32,80,80,67,54,52,44,32,67,82,89,80,84,79,71,65,77,83,32,98,121,32,60,97,112,112,114,111,64,111,112,101,110,115,115,108,46,111,114,103,62,0
-.align	2
diff --git a/deps/openssl/config/archs/linux-ppc64le/asm/crypto/buildinf.h b/deps/openssl/config/archs/linux-ppc64le/asm/crypto/buildinf.h
index e7003954bb..1dbf68d356 100644
--- a/deps/openssl/config/archs/linux-ppc64le/asm/crypto/buildinf.h
+++ b/deps/openssl/config/archs/linux-ppc64le/asm/crypto/buildinf.h
@@ -11,7 +11,7 @@
  */
 
 #define PLATFORM "platform: linux-ppc64le"
-#define DATE "built on: Fri Sep 13 16:01:17 2019 UTC"
+#define DATE "built on: Wed Mar 18 21:08:32 2020 UTC"
 
 /*
  * Generate compiler_flags as an array of individual characters. This is a
diff --git a/deps/openssl/config/archs/linux-ppc64le/asm/crypto/include/internal/bn_conf.h b/deps/openssl/config/archs/linux-ppc64le/asm/crypto/include/internal/bn_conf.h
index 34bd8b78b4..5312ef5a7a 100644
--- a/deps/openssl/config/archs/linux-ppc64le/asm/crypto/include/internal/bn_conf.h
+++ b/deps/openssl/config/archs/linux-ppc64le/asm/crypto/include/internal/bn_conf.h
@@ -1,5 +1,5 @@
 /* WARNING: do not edit! */
-/* Generated by Makefile from crypto/include/internal/bn_conf.h.in */
+/* Generated by Makefile from include/crypto/bn_conf.h.in */
 /*
  * Copyright 2016 The OpenSSL Project Authors. All Rights Reserved.
  *
@@ -9,8 +9,8 @@
  * https://www.openssl.org/source/license.html
  */
 
-#ifndef HEADER_BN_CONF_H
-# define HEADER_BN_CONF_H
+#ifndef OSSL_CRYPTO_BN_CONF_H
+# define OSSL_CRYPTO_BN_CONF_H
 
 /*
  * The contents of this file are not used in the UEFI build, as
diff --git a/deps/openssl/config/archs/linux-ppc64le/asm/crypto/include/internal/dso_conf.h b/deps/openssl/config/archs/linux-ppc64le/asm/crypto/include/internal/dso_conf.h
index 252266ec2a..4b1167c3d8 100644
--- a/deps/openssl/config/archs/linux-ppc64le/asm/crypto/include/internal/dso_conf.h
+++ b/deps/openssl/config/archs/linux-ppc64le/asm/crypto/include/internal/dso_conf.h
@@ -1,5 +1,5 @@
 /* WARNING: do not edit! */
-/* Generated by Makefile from crypto/include/internal/dso_conf.h.in */
+/* Generated by Makefile from include/crypto/dso_conf.h.in */
 /*
  * Copyright 2016-2019 The OpenSSL Project Authors. All Rights Reserved.
  *
@@ -9,8 +9,8 @@
  * https://www.openssl.org/source/license.html
  */
 
-#ifndef HEADER_DSO_CONF_H
-# define HEADER_DSO_CONF_H
+#ifndef OSSL_CRYPTO_DSO_CONF_H
+# define OSSL_CRYPTO_DSO_CONF_H
 # define DSO_DLFCN
 # define HAVE_DLFCN_H
 # define DSO_EXTENSION ".so"
diff --git a/deps/openssl/config/archs/linux-ppc64le/asm/include/openssl/opensslconf.h b/deps/openssl/config/archs/linux-ppc64le/asm/include/openssl/opensslconf.h
index 30820b6051..937531fe9f 100644
--- a/deps/openssl/config/archs/linux-ppc64le/asm/include/openssl/opensslconf.h
+++ b/deps/openssl/config/archs/linux-ppc64le/asm/include/openssl/opensslconf.h
@@ -96,9 +96,6 @@ extern "C" {
 #ifndef OPENSSL_NO_DYNAMIC_ENGINE
 # define OPENSSL_NO_DYNAMIC_ENGINE
 #endif
-#ifndef OPENSSL_NO_AFALGENG
-# define OPENSSL_NO_AFALGENG
-#endif
 
 
 /*
diff --git a/deps/openssl/config/archs/linux-ppc64le/asm/include/progs.h b/deps/openssl/config/archs/linux-ppc64le/asm/include/progs.h
index 9b3d270e20..308c65601b 100644
--- a/deps/openssl/config/archs/linux-ppc64le/asm/include/progs.h
+++ b/deps/openssl/config/archs/linux-ppc64le/asm/include/progs.h
@@ -2,7 +2,7 @@
  * WARNING: do not edit!
  * Generated by apps/progs.pl
  *
- * Copyright 1995-2019 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 1995-2020 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
diff --git a/deps/openssl/config/archs/linux-ppc64le/asm_avx2/configdata.pm b/deps/openssl/config/archs/linux-ppc64le/asm_avx2/configdata.pm
index a92bb25067..f007db765e 100644
--- a/deps/openssl/config/archs/linux-ppc64le/asm_avx2/configdata.pm
+++ b/deps/openssl/config/archs/linux-ppc64le/asm_avx2/configdata.pm
@@ -55,7 +55,7 @@ our %config = (
   minor => "1.1",
   openssl_algorithm_defines => [ "OPENSSL_NO_COMP", "OPENSSL_NO_MD2", "OPENSSL_NO_RC5" ],
   openssl_api_defines => [  ],
-  openssl_other_defines => [ "OPENSSL_RAND_SEED_OS", "OPENSSL_NO_AFALGENG", "OPENSSL_NO_ASAN", "OPENSSL_NO_CRYPTO_MDEBUG", "OPENSSL_NO_CRYPTO_MDEBUG_BACKTRACE", "OPENSSL_NO_DEVCRYPTOENG", "OPENSSL_NO_EC_NISTP_64_GCC_128", "OPENSSL_NO_EGD", "OPENSSL_NO_EXTERNAL_TESTS", "OPENSSL_NO_FUZZ_AFL", "OPENSSL_NO_FUZZ_LIBFUZZER", "OPENSSL_NO_HEARTBEATS", "OPENSSL_NO_MSAN", "OPENSSL_NO_SCTP", "OPENSSL_NO_SSL3", "OPENSSL_NO_SSL3_METHOD", "OPENSSL_NO_UBSAN", "OPENSSL_NO_UNIT_TEST", "OPENSSL_NO_WEAK_SSL_CIPHERS", "OPENSSL_NO_DYNAMIC_ENGINE", "OPENSSL_NO_AFALGENG" ],
+  openssl_other_defines => [ "OPENSSL_RAND_SEED_OS", "OPENSSL_NO_AFALGENG", "OPENSSL_NO_ASAN", "OPENSSL_NO_CRYPTO_MDEBUG", "OPENSSL_NO_CRYPTO_MDEBUG_BACKTRACE", "OPENSSL_NO_DEVCRYPTOENG", "OPENSSL_NO_EC_NISTP_64_GCC_128", "OPENSSL_NO_EGD", "OPENSSL_NO_EXTERNAL_TESTS", "OPENSSL_NO_FUZZ_AFL", "OPENSSL_NO_FUZZ_LIBFUZZER", "OPENSSL_NO_HEARTBEATS", "OPENSSL_NO_MSAN", "OPENSSL_NO_SCTP", "OPENSSL_NO_SSL3", "OPENSSL_NO_SSL3_METHOD", "OPENSSL_NO_UBSAN", "OPENSSL_NO_UNIT_TEST", "OPENSSL_NO_WEAK_SSL_CIPHERS", "OPENSSL_NO_DYNAMIC_ENGINE" ],
   openssl_sys_defines => [  ],
   openssl_thread_defines => [ "OPENSSL_THREADS" ],
   openssldir => "",
@@ -111,8 +111,8 @@ our %config = (
   sourcedir => ".",
   target => "linux-ppc64le",
   tdirs => [ "ossl_shim" ],
-  version => "1.1.1d",
-  version_num => "0x1010104fL",
+  version => "1.1.1e",
+  version_num => "0x1010105fL",
 );
 
 our %target = (
@@ -239,6 +239,7 @@ our @disablables = (
   "dgram",
   "dh",
   "dsa",
+  "dso",
   "dtls",
   "dynamic-engine",
   "ec",
@@ -356,8 +357,8 @@ our %unified_info = (
         {
             "" =>
                 [
-                    "crypto/include/internal/bn_conf.h",
-                    "crypto/include/internal/dso_conf.h",
+                    "include/crypto/bn_conf.h",
+                    "include/crypto/dso_conf.h",
                     "include/openssl/opensslconf.h",
                 ],
             "apps/asn1pars.o" =>
@@ -625,14 +626,6 @@ our %unified_info = (
                     "crypto/perlasm/cbc.pl",
                     "crypto/perlasm/x86asm.pl",
                 ],
-            "crypto/include/internal/bn_conf.h" =>
-                [
-                    "configdata.pm",
-                ],
-            "crypto/include/internal/dso_conf.h" =>
-                [
-                    "configdata.pm",
-                ],
             "crypto/rc4/rc4-586.s" =>
                 [
                     "crypto/perlasm/x86asm.pl",
@@ -708,6 +701,14 @@ our %unified_info = (
                 [
                     "libcrypto",
                 ],
+            "include/crypto/bn_conf.h" =>
+                [
+                    "configdata.pm",
+                ],
+            "include/crypto/dso_conf.h" =>
+                [
+                    "configdata.pm",
+                ],
             "include/openssl/opensslconf.h" =>
                 [
                     "configdata.pm",
@@ -1505,6 +1506,12 @@ our %unified_info = (
                     "libcrypto",
                     "test/libtestutil.a",
                 ],
+            "test/ssl_ctx_test" =>
+                [
+                    "libcrypto",
+                    "libssl",
+                    "test/libtestutil.a",
+                ],
             "test/ssl_test" =>
                 [
                     "libcrypto",
@@ -3239,7 +3246,6 @@ our %unified_info = (
                             "test/testutil/cb.o",
                             "test/testutil/driver.o",
                             "test/testutil/format_output.o",
-                            "test/testutil/init.o",
                             "test/testutil/main.o",
                             "test/testutil/output_helpers.o",
                             "test/testutil/random.o",
@@ -3247,6 +3253,7 @@ our %unified_info = (
                             "test/testutil/tap_bio.o",
                             "test/testutil/test_cleanup.o",
                             "test/testutil/tests.o",
+                            "test/testutil/testutil_init.o",
                         ],
                     "products" =>
                         {
@@ -3745,14 +3752,6 @@ our %unified_info = (
                 [
                     "crypto/ia64cpuid.S",
                 ],
-            "crypto/include/internal/bn_conf.h" =>
-                [
-                    "crypto/include/internal/bn_conf.h.in",
-                ],
-            "crypto/include/internal/dso_conf.h" =>
-                [
-                    "crypto/include/internal/dso_conf.h.in",
-                ],
             "crypto/md5/md5-586.s" =>
                 [
                     "crypto/md5/asm/md5-586.pl",
@@ -4193,6 +4192,14 @@ our %unified_info = (
                     "engines/asm/e_padlock-x86_64.pl",
                     "\$(PERLASM_SCHEME)",
                 ],
+            "include/crypto/bn_conf.h" =>
+                [
+                    "include/crypto/bn_conf.h.in",
+                ],
+            "include/crypto/dso_conf.h" =>
+                [
+                    "include/crypto/dso_conf.h.in",
+                ],
             "include/openssl/opensslconf.h" =>
                 [
                     "include/openssl/opensslconf.h.in",
@@ -4879,7 +4886,6 @@ our %unified_info = (
             "crypto/aes/aes-ppc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/aes/aes-s390x.o" =>
@@ -4893,49 +4899,41 @@ our %unified_info = (
             "crypto/aes/aes_cbc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/aes/aes_cfb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/aes/aes_core.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/aes/aes_ecb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/aes/aes_ige.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/aes/aes_misc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/aes/aes_ofb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/aes/aes_wrap.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/aes/aesfx-sparcv9.o" =>
@@ -4945,7 +4943,6 @@ our %unified_info = (
             "crypto/aes/aesp8-ppc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/aes/aest4-sparcv9.o" =>
@@ -4963,13 +4960,11 @@ our %unified_info = (
             "crypto/aes/vpaes-ppc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/aria/aria.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/arm64cpuid.o" =>
@@ -4983,613 +4978,511 @@ our %unified_info = (
             "crypto/asn1/a_bitstr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_d2i_fp.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_digest.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_dup.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_gentm.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_i2d_fp.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_int.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_mbstr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_object.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_octet.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_print.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_sign.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_strex.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_strnid.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_time.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_type.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_utctm.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_utf8.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_verify.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/ameth_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/asn1_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/asn1_gen.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/asn1_item_list.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/asn1_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/asn1_par.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/asn_mime.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/asn_moid.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/asn_mstbl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/asn_pack.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/bio_asn1.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/bio_ndef.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/d2i_pr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/d2i_pu.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/evp_asn1.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/f_int.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/f_string.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/i2d_pr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/i2d_pu.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/n_pkey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/nsseq.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/p5_pbe.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/p5_pbev2.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/p5_scrypt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/p8_pkey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/t_bitst.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/t_pkey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/t_spki.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/tasn_dec.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/tasn_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/tasn_fre.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/tasn_new.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/tasn_prn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/tasn_scn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/tasn_typ.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/tasn_utl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/x_algor.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/x_bignum.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/x_info.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/x_int64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/x_long.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/x_pkey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/x_sig.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/x_spki.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/x_val.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/async/arch/async_null.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/async/arch/async_posix.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/async/arch/async_win.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/async/async.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/async/async_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/async/async_wait.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bf/bf_cfb64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bf/bf_ecb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bf/bf_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bf/bf_ofb64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bf/bf_skey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/b_addr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/b_dump.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/b_print.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/b_sock.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/b_sock2.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bf_buff.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bf_lbuf.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bf_nbio.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bf_null.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bio_cb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bio_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bio_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bio_meth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bss_acpt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bss_bio.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bss_conn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bss_dgram.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bss_fd.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bss_file.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bss_log.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bss_mem.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bss_null.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bss_sock.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/blake2/blake2b.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/blake2/blake2s.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/blake2/m_blake2b.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/blake2/m_blake2s.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/armv4-gf2m.o" =>
@@ -5607,188 +5500,157 @@ our %unified_info = (
             "crypto/bn/bn-ppc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_add.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_blind.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_const.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_ctx.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_depr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_dh.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_div.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_exp.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto",
                 ],
             "crypto/bn/bn_exp2.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_gcd.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_gf2m.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_intern.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_kron.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_mod.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_mont.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_mpi.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_mul.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_nist.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_prime.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_print.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_rand.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_recp.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_shift.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_sqr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_sqrt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_srp.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_word.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_x931p.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/mips-mont.o" =>
@@ -5798,7 +5660,6 @@ our %unified_info = (
             "crypto/bn/ppc-mont.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/sparct4-mont.o" =>
@@ -5824,13 +5685,11 @@ our %unified_info = (
             "crypto/buffer/buf_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/buffer/buffer.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/buildinf.h" =>
@@ -5840,43 +5699,36 @@ our %unified_info = (
             "crypto/camellia/camellia.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/camellia/cmll_cbc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/camellia/cmll_cfb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/camellia/cmll_ctr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/camellia/cmll_ecb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/camellia/cmll_misc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/camellia/cmll_ofb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/camellia/cmllt4-sparcv9.o" =>
@@ -5886,31 +5738,26 @@ our %unified_info = (
             "crypto/cast/c_cfb64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cast/c_ecb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cast/c_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cast/c_ofb64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cast/c_skey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/chacha/chacha-armv4.o" =>
@@ -5924,7 +5771,6 @@ our %unified_info = (
             "crypto/chacha/chacha-ppc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/chacha/chacha-s390x.o" =>
@@ -5934,272 +5780,227 @@ our %unified_info = (
             "crypto/cmac/cm_ameth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cmac/cm_pmeth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cmac/cmac.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_asn1.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_att.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_cd.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_dd.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_env.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_ess.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_io.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_kari.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_pwri.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_sd.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_smime.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/conf/conf_api.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/conf/conf_def.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/conf/conf_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/conf/conf_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/conf/conf_mall.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/conf/conf_mod.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/conf/conf_sap.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/conf/conf_ssl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cpt_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cryptlib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ct/ct_b64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ct/ct_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ct/ct_log.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ct/ct_oct.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ct/ct_policy.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ct/ct_prn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ct/ct_sct.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ct/ct_sct_ctx.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ct/ct_vfy.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ct/ct_x509v3.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ctype.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cversion.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto",
                 ],
             "crypto/des/cbc_cksm.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/cbc_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/cfb64ede.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/cfb64enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/cfb_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/des_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/dest4-sparcv9.o" =>
@@ -6209,301 +6010,251 @@ our %unified_info = (
             "crypto/des/ecb3_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/ecb_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/fcrypt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/fcrypt_b.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/ofb64ede.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/ofb64enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/ofb_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/pcbc_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/qud_cksm.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/rand_key.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/set_key.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/str2key.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/xcbc_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_ameth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_asn1.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_check.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_depr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_gen.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_kdf.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_key.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_meth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_pmeth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_prn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_rfc5114.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_rfc7919.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dsa/dsa_ameth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dsa/dsa_asn1.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dsa/dsa_depr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dsa/dsa_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dsa/dsa_gen.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dsa/dsa_key.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dsa/dsa_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dsa/dsa_meth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dsa/dsa_ossl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dsa/dsa_pmeth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dsa/dsa_prn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dsa/dsa_sign.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dsa/dsa_vrf.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dso/dso_dl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dso/dso_dlfcn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dso/dso_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dso/dso_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dso/dso_openssl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dso/dso_vms.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dso/dso_win32.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ebcdic.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/curve25519.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/curve448/arch_32/f_impl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto/ec/curve448/arch_32",
                     "crypto/ec/curve448",
@@ -6511,7 +6262,6 @@ our %unified_info = (
             "crypto/ec/curve448/curve448.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto/ec/curve448/arch_32",
                     "crypto/ec/curve448",
@@ -6519,7 +6269,6 @@ our %unified_info = (
             "crypto/ec/curve448/curve448_tables.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto/ec/curve448/arch_32",
                     "crypto/ec/curve448",
@@ -6527,7 +6276,6 @@ our %unified_info = (
             "crypto/ec/curve448/eddsa.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto/ec/curve448/arch_32",
                     "crypto/ec/curve448",
@@ -6535,7 +6283,6 @@ our %unified_info = (
             "crypto/ec/curve448/f_generic.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto/ec/curve448/arch_32",
                     "crypto/ec/curve448",
@@ -6543,7 +6290,6 @@ our %unified_info = (
             "crypto/ec/curve448/scalar.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto/ec/curve448/arch_32",
                     "crypto/ec/curve448",
@@ -6551,163 +6297,136 @@ our %unified_info = (
             "crypto/ec/ec2_oct.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec2_smpl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec_ameth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec_asn1.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec_check.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec_curve.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec_cvt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec_key.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec_kmeth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec_mult.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec_oct.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec_pmeth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec_print.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecdh_kdf.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecdh_ossl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecdsa_ossl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecdsa_sign.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecdsa_vrf.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/eck_prn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecp_mont.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecp_nist.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecp_nistp224.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecp_nistp256.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecp_nistp521.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecp_nistputil.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecp_nistz256-armv4.o" =>
@@ -6721,7 +6440,6 @@ our %unified_info = (
             "crypto/ec/ecp_nistz256-ppc64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecp_nistz256-sparcv9.o" =>
@@ -6731,235 +6449,196 @@ our %unified_info = (
             "crypto/ec/ecp_nistz256.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecp_oct.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecp_smpl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecx_meth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/x25519-ppc64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/eng_all.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/eng_cnf.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/eng_ctrl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/eng_dyn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/eng_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/eng_fat.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/eng_init.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/eng_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/eng_list.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/eng_openssl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/eng_pkey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/eng_rdrand.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/eng_table.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/tb_asnmth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/tb_cipher.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/tb_dh.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/tb_digest.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/tb_dsa.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/tb_eckey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/tb_pkmeth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/tb_rand.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/tb_rsa.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/err/err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/err/err_all.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/err/err_prn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/bio_b64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/bio_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/bio_md.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/bio_ok.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/c_allc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/c_alld.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/cmeth_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/digest.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/e_aes.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto",
                     "crypto/modes",
@@ -6967,21 +6646,18 @@ our %unified_info = (
             "crypto/evp/e_aes_cbc_hmac_sha1.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto/modes",
                 ],
             "crypto/evp/e_aes_cbc_hmac_sha256.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto/modes",
                 ],
             "crypto/evp/e_aria.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto",
                     "crypto/modes",
@@ -6989,13 +6665,11 @@ our %unified_info = (
             "crypto/evp/e_bf.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/e_camellia.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto",
                     "crypto/modes",
@@ -7003,81 +6677,68 @@ our %unified_info = (
             "crypto/evp/e_cast.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/e_chacha20_poly1305.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/e_des.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto",
                 ],
             "crypto/evp/e_des3.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto",
                 ],
             "crypto/evp/e_idea.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/e_null.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/e_old.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/e_rc2.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/e_rc4.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/e_rc4_hmac_md5.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/e_rc5.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/e_seed.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/e_sm4.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto",
                     "crypto/modes",
@@ -7085,328 +6746,267 @@ our %unified_info = (
             "crypto/evp/e_xcbc_d.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/encode.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/evp_cnf.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/evp_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/evp_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/evp_key.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/evp_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/evp_pbe.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/evp_pkey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/m_md2.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/m_md4.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/m_md5.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/m_md5_sha1.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/m_mdc2.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/m_null.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/m_ripemd.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/m_sha1.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/m_sha3.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto",
                 ],
             "crypto/evp/m_sigver.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/m_wp.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/names.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/p5_crpt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/p5_crpt2.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/p_dec.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/p_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/p_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/p_open.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/p_seal.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/p_sign.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/p_verify.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/pbe_scrypt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/pmeth_fn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/pmeth_gn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/pmeth_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ex_data.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/getenv.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/hmac/hm_ameth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/hmac/hm_pmeth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/hmac/hmac.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/idea/i_cbc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/idea/i_cfb64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/idea/i_ecb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/idea/i_ofb64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/idea/i_skey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
-            "crypto/include/internal/bn_conf.h" =>
-                [
-                    ".",
-                ],
-            "crypto/include/internal/dso_conf.h" =>
-                [
-                    ".",
-                ],
             "crypto/init.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/kdf/hkdf.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/kdf/kdf_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/kdf/scrypt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/kdf/tls1_prf.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/lhash/lh_stats.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/lhash/lhash.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/md4/md4_dgst.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/md4/md4_one.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/md5/md5-sparcv9.o" =>
@@ -7416,79 +7016,66 @@ our %unified_info = (
             "crypto/md5/md5_dgst.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/md5/md5_one.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/mdc2/mdc2_one.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/mdc2/mdc2dgst.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/mem.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/mem_dbg.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/mem_sec.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/modes/cbc128.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/modes/ccm128.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/modes/cfb128.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/modes/ctr128.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/modes/cts128.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/modes/gcm128.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto",
                 ],
@@ -7507,7 +7094,6 @@ our %unified_info = (
             "crypto/modes/ghashp8-ppc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/modes/ghashv8-armx.o" =>
@@ -7517,361 +7103,301 @@ our %unified_info = (
             "crypto/modes/ocb128.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/modes/ofb128.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/modes/wrap128.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/modes/xts128.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/o_dir.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/o_fips.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/o_fopen.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/o_init.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/o_str.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/o_time.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/objects/o_names.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/objects/obj_dat.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/objects/obj_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/objects/obj_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/objects/obj_xref.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ocsp/ocsp_asn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ocsp/ocsp_cl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ocsp/ocsp_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ocsp/ocsp_ext.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ocsp/ocsp_ht.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ocsp/ocsp_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ocsp/ocsp_prn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ocsp/ocsp_srv.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ocsp/ocsp_vfy.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ocsp/v3_ocsp.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pem/pem_all.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pem/pem_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pem/pem_info.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pem/pem_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pem/pem_oth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pem/pem_pk8.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pem/pem_pkey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pem/pem_sign.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pem/pem_x509.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pem/pem_xaux.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pem/pvkfmt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_add.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_asn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_attr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_crpt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_crt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_decr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_init.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_key.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_kiss.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_mutl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_npas.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_p8d.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_p8e.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_sbag.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_utl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/pk12err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs7/bio_pk7.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs7/pk7_asn1.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs7/pk7_attr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs7/pk7_doit.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs7/pk7_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs7/pk7_mime.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs7/pk7_smime.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs7/pkcs7err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/poly1305/poly1305-armv4.o" =>
@@ -7889,13 +7415,11 @@ our %unified_info = (
             "crypto/poly1305/poly1305-ppc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/poly1305/poly1305-ppcfp.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/poly1305/poly1305-sparcv9.o" =>
@@ -7905,271 +7429,226 @@ our %unified_info = (
             "crypto/poly1305/poly1305.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/poly1305/poly1305_ameth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/poly1305/poly1305_pmeth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ppccap.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ppccpuid.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rand/drbg_ctr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rand/drbg_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rand/rand_egd.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rand/rand_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rand/rand_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rand/rand_unix.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rand/rand_vms.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rand/rand_win.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rand/randfile.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rc2/rc2_cbc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rc2/rc2_ecb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rc2/rc2_skey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rc2/rc2cfb64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rc2/rc2ofb64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rc4/rc4_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rc4/rc4_skey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ripemd/rmd_dgst.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ripemd/rmd_one.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_ameth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_asn1.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_chk.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_crpt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_depr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_gen.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_meth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_mp.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_none.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_oaep.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_ossl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_pk1.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_pmeth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_prn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_pss.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_saos.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_sign.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_ssl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_x931.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_x931g.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/s390xcpuid.o" =>
@@ -8179,31 +7658,26 @@ our %unified_info = (
             "crypto/seed/seed.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/seed/seed_cbc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/seed/seed_cfb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/seed/seed_ecb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/seed/seed_ofb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sha/keccak1600-armv4.o" =>
@@ -8213,7 +7687,6 @@ our %unified_info = (
             "crypto/sha/keccak1600-ppc64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sha/sha1-armv4-large.o" =>
@@ -8231,7 +7704,6 @@ our %unified_info = (
             "crypto/sha/sha1-ppc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sha/sha1-s390x.o" =>
@@ -8245,13 +7717,11 @@ our %unified_info = (
             "crypto/sha/sha1_one.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sha/sha1dgst.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sha/sha256-armv4.o" =>
@@ -8269,7 +7739,6 @@ our %unified_info = (
             "crypto/sha/sha256-ppc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sha/sha256-s390x.o" =>
@@ -8283,13 +7752,11 @@ our %unified_info = (
             "crypto/sha/sha256.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sha/sha256p8-ppc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sha/sha512-armv4.o" =>
@@ -8307,7 +7774,6 @@ our %unified_info = (
             "crypto/sha/sha512-ppc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sha/sha512-s390x.o" =>
@@ -8321,715 +7787,596 @@ our %unified_info = (
             "crypto/sha/sha512.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sha/sha512p8-ppc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/siphash/siphash.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/siphash/siphash_ameth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/siphash/siphash_pmeth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sm2/sm2_crypt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sm2/sm2_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sm2/sm2_pmeth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sm2/sm2_sign.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sm3/m_sm3.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sm3/sm3.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sm4/sm4.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/srp/srp_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/srp/srp_vfy.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/stack/stack.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/store/loader_file.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/store/store_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/store/store_init.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/store/store_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/store/store_register.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/store/store_strings.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/threads_none.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/threads_pthread.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/threads_win.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ts/ts_asn1.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ts/ts_conf.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ts/ts_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ts/ts_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ts/ts_req_print.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ts/ts_req_utils.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ts/ts_rsp_print.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ts/ts_rsp_sign.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ts/ts_rsp_utils.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ts/ts_rsp_verify.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ts/ts_verify_ctx.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/txt_db/txt_db.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ui/ui_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ui/ui_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ui/ui_null.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ui/ui_openssl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ui/ui_util.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/uid.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/whrlpool/wp_block.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/whrlpool/wp_dgst.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/by_dir.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/by_file.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/t_crl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/t_req.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/t_x509.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_att.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_cmp.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_d2.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_def.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_ext.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_lu.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_meth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_obj.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_r2x.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_req.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_set.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_trs.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_txt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_v3.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_vfy.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_vpm.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509cset.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509name.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509rset.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509spki.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509type.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x_all.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x_attrib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x_crl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x_exten.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x_name.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x_pubkey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x_req.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x_x509.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x_x509a.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/pcy_cache.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/pcy_data.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/pcy_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/pcy_map.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/pcy_node.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/pcy_tree.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_addr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_admis.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_akey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_akeya.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_alt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_asid.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_bcons.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_bitst.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_conf.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_cpols.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_crld.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_enum.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_extku.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_genn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_ia5.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_info.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_int.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_ncons.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_pci.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_pcia.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_pcons.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_pku.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_pmaps.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_prn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_purp.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_skey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_sxnet.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_tlsf.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_utl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "engines/e_capi.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "engines/e_padlock.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "fuzz/asn1.o" =>
@@ -9080,6 +8427,14 @@ our %unified_info = (
                 [
                     "include",
                 ],
+            "include/crypto/bn_conf.h" =>
+                [
+                    ".",
+                ],
+            "include/crypto/dso_conf.h" =>
+                [
+                    ".",
+                ],
             "include/openssl/opensslconf.h" =>
                 [
                     ".",
@@ -9324,7 +8679,6 @@ our %unified_info = (
                 [
                     ".",
                     "include",
-                    "crypto/include",
                 ],
             "test/asn1_string_table_test.o" =>
                 [
@@ -9650,7 +9004,6 @@ our %unified_info = (
                 [
                     ".",
                     "include",
-                    "crypto/include",
                 ],
             "test/cipher_overhead_test.o" =>
                 [
@@ -9696,7 +9049,6 @@ our %unified_info = (
             "test/ctype_internal_test.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "test/curve448_internal_test.o" =>
@@ -9762,7 +9114,6 @@ our %unified_info = (
                 [
                     "include",
                     "crypto/ec",
-                    "crypto/include",
                 ],
             "test/ecdsatest.o" =>
                 [
@@ -9787,7 +9138,6 @@ our %unified_info = (
             "test/evp_extra_test.o" =>
                 [
                     "include",
-                    "crypto/include",
                 ],
             "test/evp_test.o" =>
                 [
@@ -9885,7 +9235,6 @@ our %unified_info = (
                 [
                     ".",
                     "include",
-                    "crypto/include",
                 ],
             "test/rc2test.o" =>
                 [
@@ -9935,18 +9284,15 @@ our %unified_info = (
                 [
                     ".",
                     "include",
-                    "crypto/include",
                 ],
             "test/sm2_internal_test.o" =>
                 [
                     "include",
-                    "crypto/include",
                 ],
             "test/sm4_internal_test.o" =>
                 [
                     ".",
                     "include",
-                    "crypto/include",
                 ],
             "test/srptest.o" =>
                 [
@@ -9957,6 +9303,10 @@ our %unified_info = (
                     ".",
                     "include",
                 ],
+            "test/ssl_ctx_test.o" =>
+                [
+                    "include",
+                ],
             "test/ssl_test.o" =>
                 [
                     "include",
@@ -10020,10 +9370,6 @@ our %unified_info = (
                 [
                     "include",
                 ],
-            "test/testutil/init.o" =>
-                [
-                    "include",
-                ],
             "test/testutil/main.o" =>
                 [
                     "include",
@@ -10052,6 +9398,10 @@ our %unified_info = (
                 [
                     "include",
                 ],
+            "test/testutil/testutil_init.o" =>
+                [
+                    "include",
+                ],
             "test/threadstest.o" =>
                 [
                     "include",
@@ -10316,6 +9666,7 @@ our %unified_info = (
             "test/sm4_internal_test",
             "test/srptest",
             "test/ssl_cert_table_internal_test",
+            "test/ssl_ctx_test",
             "test/ssl_test",
             "test/ssl_test_ctx_test",
             "test/sslapitest",
@@ -15286,7 +14637,6 @@ our %unified_info = (
                     "test/testutil/cb.o",
                     "test/testutil/driver.o",
                     "test/testutil/format_output.o",
-                    "test/testutil/init.o",
                     "test/testutil/main.o",
                     "test/testutil/output_helpers.o",
                     "test/testutil/random.o",
@@ -15294,6 +14644,7 @@ our %unified_info = (
                     "test/testutil/tap_bio.o",
                     "test/testutil/test_cleanup.o",
                     "test/testutil/tests.o",
+                    "test/testutil/testutil_init.o",
                 ],
             "test/md2test" =>
                 [
@@ -15521,6 +14872,14 @@ our %unified_info = (
                 [
                     "test/ssl_cert_table_internal_test.c",
                 ],
+            "test/ssl_ctx_test" =>
+                [
+                    "test/ssl_ctx_test.o",
+                ],
+            "test/ssl_ctx_test.o" =>
+                [
+                    "test/ssl_ctx_test.c",
+                ],
             "test/ssl_test" =>
                 [
                     "test/handshake_helper.o",
@@ -15623,10 +14982,6 @@ our %unified_info = (
                 [
                     "test/testutil/format_output.c",
                 ],
-            "test/testutil/init.o" =>
-                [
-                    "test/testutil/init.c",
-                ],
             "test/testutil/main.o" =>
                 [
                     "test/testutil/main.c",
@@ -15655,6 +15010,10 @@ our %unified_info = (
                 [
                     "test/testutil/tests.c",
                 ],
+            "test/testutil/testutil_init.o" =>
+                [
+                    "test/testutil/testutil_init.c",
+                ],
             "test/threadstest" =>
                 [
                     "test/threadstest.o",
diff --git a/deps/openssl/config/archs/linux-ppc64le/asm_avx2/crypto/buildinf.h b/deps/openssl/config/archs/linux-ppc64le/asm_avx2/crypto/buildinf.h
index e8e073c0d2..2bb6163611 100644
--- a/deps/openssl/config/archs/linux-ppc64le/asm_avx2/crypto/buildinf.h
+++ b/deps/openssl/config/archs/linux-ppc64le/asm_avx2/crypto/buildinf.h
@@ -11,7 +11,7 @@
  */
 
 #define PLATFORM "platform: linux-ppc64le"
-#define DATE "built on: Fri Sep 13 16:01:23 2019 UTC"
+#define DATE "built on: Wed Mar 18 21:08:43 2020 UTC"
 
 /*
  * Generate compiler_flags as an array of individual characters. This is a
diff --git a/deps/openssl/config/archs/linux-ppc64le/asm_avx2/crypto/include/internal/bn_conf.h b/deps/openssl/config/archs/linux-ppc64le/asm_avx2/crypto/include/internal/bn_conf.h
index 34bd8b78b4..5312ef5a7a 100644
--- a/deps/openssl/config/archs/linux-ppc64le/asm_avx2/crypto/include/internal/bn_conf.h
+++ b/deps/openssl/config/archs/linux-ppc64le/asm_avx2/crypto/include/internal/bn_conf.h
@@ -1,5 +1,5 @@
 /* WARNING: do not edit! */
-/* Generated by Makefile from crypto/include/internal/bn_conf.h.in */
+/* Generated by Makefile from include/crypto/bn_conf.h.in */
 /*
  * Copyright 2016 The OpenSSL Project Authors. All Rights Reserved.
  *
@@ -9,8 +9,8 @@
  * https://www.openssl.org/source/license.html
  */
 
-#ifndef HEADER_BN_CONF_H
-# define HEADER_BN_CONF_H
+#ifndef OSSL_CRYPTO_BN_CONF_H
+# define OSSL_CRYPTO_BN_CONF_H
 
 /*
  * The contents of this file are not used in the UEFI build, as
diff --git a/deps/openssl/config/archs/linux-ppc64le/asm_avx2/crypto/include/internal/dso_conf.h b/deps/openssl/config/archs/linux-ppc64le/asm_avx2/crypto/include/internal/dso_conf.h
index 252266ec2a..4b1167c3d8 100644
--- a/deps/openssl/config/archs/linux-ppc64le/asm_avx2/crypto/include/internal/dso_conf.h
+++ b/deps/openssl/config/archs/linux-ppc64le/asm_avx2/crypto/include/internal/dso_conf.h
@@ -1,5 +1,5 @@
 /* WARNING: do not edit! */
-/* Generated by Makefile from crypto/include/internal/dso_conf.h.in */
+/* Generated by Makefile from include/crypto/dso_conf.h.in */
 /*
  * Copyright 2016-2019 The OpenSSL Project Authors. All Rights Reserved.
  *
@@ -9,8 +9,8 @@
  * https://www.openssl.org/source/license.html
  */
 
-#ifndef HEADER_DSO_CONF_H
-# define HEADER_DSO_CONF_H
+#ifndef OSSL_CRYPTO_DSO_CONF_H
+# define OSSL_CRYPTO_DSO_CONF_H
 # define DSO_DLFCN
 # define HAVE_DLFCN_H
 # define DSO_EXTENSION ".so"
diff --git a/deps/openssl/config/archs/linux-ppc64le/asm_avx2/include/openssl/opensslconf.h b/deps/openssl/config/archs/linux-ppc64le/asm_avx2/include/openssl/opensslconf.h
index 30820b6051..937531fe9f 100644
--- a/deps/openssl/config/archs/linux-ppc64le/asm_avx2/include/openssl/opensslconf.h
+++ b/deps/openssl/config/archs/linux-ppc64le/asm_avx2/include/openssl/opensslconf.h
@@ -96,9 +96,6 @@ extern "C" {
 #ifndef OPENSSL_NO_DYNAMIC_ENGINE
 # define OPENSSL_NO_DYNAMIC_ENGINE
 #endif
-#ifndef OPENSSL_NO_AFALGENG
-# define OPENSSL_NO_AFALGENG
-#endif
 
 
 /*
diff --git a/deps/openssl/config/archs/linux-ppc64le/asm_avx2/include/progs.h b/deps/openssl/config/archs/linux-ppc64le/asm_avx2/include/progs.h
index 9b3d270e20..308c65601b 100644
--- a/deps/openssl/config/archs/linux-ppc64le/asm_avx2/include/progs.h
+++ b/deps/openssl/config/archs/linux-ppc64le/asm_avx2/include/progs.h
@@ -2,7 +2,7 @@
  * WARNING: do not edit!
  * Generated by apps/progs.pl
  *
- * Copyright 1995-2019 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 1995-2020 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
diff --git a/deps/openssl/config/archs/linux-ppc64le/no-asm/configdata.pm b/deps/openssl/config/archs/linux-ppc64le/no-asm/configdata.pm
index 9d91dea1de..b63dcfe765 100644
--- a/deps/openssl/config/archs/linux-ppc64le/no-asm/configdata.pm
+++ b/deps/openssl/config/archs/linux-ppc64le/no-asm/configdata.pm
@@ -55,7 +55,7 @@ our %config = (
   minor => "1.1",
   openssl_algorithm_defines => [ "OPENSSL_NO_COMP", "OPENSSL_NO_MD2", "OPENSSL_NO_RC5" ],
   openssl_api_defines => [  ],
-  openssl_other_defines => [ "OPENSSL_RAND_SEED_OS", "OPENSSL_NO_AFALGENG", "OPENSSL_NO_ASAN", "OPENSSL_NO_ASM", "OPENSSL_NO_CRYPTO_MDEBUG", "OPENSSL_NO_CRYPTO_MDEBUG_BACKTRACE", "OPENSSL_NO_DEVCRYPTOENG", "OPENSSL_NO_EC_NISTP_64_GCC_128", "OPENSSL_NO_EGD", "OPENSSL_NO_EXTERNAL_TESTS", "OPENSSL_NO_FUZZ_AFL", "OPENSSL_NO_FUZZ_LIBFUZZER", "OPENSSL_NO_HEARTBEATS", "OPENSSL_NO_MSAN", "OPENSSL_NO_SCTP", "OPENSSL_NO_SSL3", "OPENSSL_NO_SSL3_METHOD", "OPENSSL_NO_UBSAN", "OPENSSL_NO_UNIT_TEST", "OPENSSL_NO_WEAK_SSL_CIPHERS", "OPENSSL_NO_DYNAMIC_ENGINE", "OPENSSL_NO_AFALGENG" ],
+  openssl_other_defines => [ "OPENSSL_RAND_SEED_OS", "OPENSSL_NO_AFALGENG", "OPENSSL_NO_ASAN", "OPENSSL_NO_ASM", "OPENSSL_NO_CRYPTO_MDEBUG", "OPENSSL_NO_CRYPTO_MDEBUG_BACKTRACE", "OPENSSL_NO_DEVCRYPTOENG", "OPENSSL_NO_EC_NISTP_64_GCC_128", "OPENSSL_NO_EGD", "OPENSSL_NO_EXTERNAL_TESTS", "OPENSSL_NO_FUZZ_AFL", "OPENSSL_NO_FUZZ_LIBFUZZER", "OPENSSL_NO_HEARTBEATS", "OPENSSL_NO_MSAN", "OPENSSL_NO_SCTP", "OPENSSL_NO_SSL3", "OPENSSL_NO_SSL3_METHOD", "OPENSSL_NO_UBSAN", "OPENSSL_NO_UNIT_TEST", "OPENSSL_NO_WEAK_SSL_CIPHERS", "OPENSSL_NO_DYNAMIC_ENGINE" ],
   openssl_sys_defines => [  ],
   openssl_thread_defines => [ "OPENSSL_THREADS" ],
   openssldir => "",
@@ -111,8 +111,8 @@ our %config = (
   sourcedir => ".",
   target => "linux-ppc64le",
   tdirs => [ "ossl_shim" ],
-  version => "1.1.1d",
-  version_num => "0x1010104fL",
+  version => "1.1.1e",
+  version_num => "0x1010105fL",
 );
 
 our %target = (
@@ -237,6 +237,7 @@ our @disablables = (
   "dgram",
   "dh",
   "dsa",
+  "dso",
   "dtls",
   "dynamic-engine",
   "ec",
@@ -355,8 +356,8 @@ our %unified_info = (
         {
             "" =>
                 [
-                    "crypto/include/internal/bn_conf.h",
-                    "crypto/include/internal/dso_conf.h",
+                    "include/crypto/bn_conf.h",
+                    "include/crypto/dso_conf.h",
                     "include/openssl/opensslconf.h",
                 ],
             "apps/asn1pars.o" =>
@@ -624,14 +625,6 @@ our %unified_info = (
                     "crypto/perlasm/cbc.pl",
                     "crypto/perlasm/x86asm.pl",
                 ],
-            "crypto/include/internal/bn_conf.h" =>
-                [
-                    "configdata.pm",
-                ],
-            "crypto/include/internal/dso_conf.h" =>
-                [
-                    "configdata.pm",
-                ],
             "crypto/rc4/rc4-586.s" =>
                 [
                     "crypto/perlasm/x86asm.pl",
@@ -707,6 +700,14 @@ our %unified_info = (
                 [
                     "libcrypto",
                 ],
+            "include/crypto/bn_conf.h" =>
+                [
+                    "configdata.pm",
+                ],
+            "include/crypto/dso_conf.h" =>
+                [
+                    "configdata.pm",
+                ],
             "include/openssl/opensslconf.h" =>
                 [
                     "configdata.pm",
@@ -1504,6 +1505,12 @@ our %unified_info = (
                     "libcrypto",
                     "test/libtestutil.a",
                 ],
+            "test/ssl_ctx_test" =>
+                [
+                    "libcrypto",
+                    "libssl",
+                    "test/libtestutil.a",
+                ],
             "test/ssl_test" =>
                 [
                     "libcrypto",
@@ -3222,7 +3229,6 @@ our %unified_info = (
                             "test/testutil/cb.o",
                             "test/testutil/driver.o",
                             "test/testutil/format_output.o",
-                            "test/testutil/init.o",
                             "test/testutil/main.o",
                             "test/testutil/output_helpers.o",
                             "test/testutil/random.o",
@@ -3230,6 +3236,7 @@ our %unified_info = (
                             "test/testutil/tap_bio.o",
                             "test/testutil/test_cleanup.o",
                             "test/testutil/tests.o",
+                            "test/testutil/testutil_init.o",
                         ],
                     "products" =>
                         {
@@ -3728,14 +3735,6 @@ our %unified_info = (
                 [
                     "crypto/ia64cpuid.S",
                 ],
-            "crypto/include/internal/bn_conf.h" =>
-                [
-                    "crypto/include/internal/bn_conf.h.in",
-                ],
-            "crypto/include/internal/dso_conf.h" =>
-                [
-                    "crypto/include/internal/dso_conf.h.in",
-                ],
             "crypto/md5/md5-586.s" =>
                 [
                     "crypto/md5/asm/md5-586.pl",
@@ -4176,6 +4175,14 @@ our %unified_info = (
                     "engines/asm/e_padlock-x86_64.pl",
                     "\$(PERLASM_SCHEME)",
                 ],
+            "include/crypto/bn_conf.h" =>
+                [
+                    "include/crypto/bn_conf.h.in",
+                ],
+            "include/crypto/dso_conf.h" =>
+                [
+                    "include/crypto/dso_conf.h.in",
+                ],
             "include/openssl/opensslconf.h" =>
                 [
                     "include/openssl/opensslconf.h.in",
@@ -4870,49 +4877,41 @@ our %unified_info = (
             "crypto/aes/aes_cbc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/aes/aes_cfb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/aes/aes_core.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/aes/aes_ecb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/aes/aes_ige.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/aes/aes_misc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/aes/aes_ofb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/aes/aes_wrap.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/aes/aesfx-sparcv9.o" =>
@@ -4934,7 +4933,6 @@ our %unified_info = (
             "crypto/aria/aria.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/arm64cpuid.o" =>
@@ -4948,613 +4946,511 @@ our %unified_info = (
             "crypto/asn1/a_bitstr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_d2i_fp.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_digest.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_dup.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_gentm.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_i2d_fp.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_int.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_mbstr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_object.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_octet.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_print.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_sign.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_strex.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_strnid.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_time.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_type.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_utctm.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_utf8.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_verify.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/ameth_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/asn1_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/asn1_gen.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/asn1_item_list.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/asn1_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/asn1_par.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/asn_mime.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/asn_moid.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/asn_mstbl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/asn_pack.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/bio_asn1.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/bio_ndef.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/d2i_pr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/d2i_pu.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/evp_asn1.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/f_int.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/f_string.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/i2d_pr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/i2d_pu.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/n_pkey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/nsseq.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/p5_pbe.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/p5_pbev2.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/p5_scrypt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/p8_pkey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/t_bitst.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/t_pkey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/t_spki.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/tasn_dec.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/tasn_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/tasn_fre.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/tasn_new.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/tasn_prn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/tasn_scn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/tasn_typ.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/tasn_utl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/x_algor.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/x_bignum.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/x_info.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/x_int64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/x_long.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/x_pkey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/x_sig.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/x_spki.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/x_val.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/async/arch/async_null.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/async/arch/async_posix.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/async/arch/async_win.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/async/async.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/async/async_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/async/async_wait.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bf/bf_cfb64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bf/bf_ecb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bf/bf_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bf/bf_ofb64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bf/bf_skey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/b_addr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/b_dump.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/b_print.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/b_sock.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/b_sock2.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bf_buff.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bf_lbuf.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bf_nbio.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bf_null.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bio_cb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bio_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bio_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bio_meth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bss_acpt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bss_bio.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bss_conn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bss_dgram.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bss_fd.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bss_file.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bss_log.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bss_mem.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bss_null.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bss_sock.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/blake2/blake2b.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/blake2/blake2s.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/blake2/m_blake2b.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/blake2/m_blake2s.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/armv4-gf2m.o" =>
@@ -5572,188 +5468,157 @@ our %unified_info = (
             "crypto/bn/bn_add.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_asm.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_blind.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_const.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_ctx.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_depr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_dh.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_div.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_exp.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto",
                 ],
             "crypto/bn/bn_exp2.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_gcd.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_gf2m.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_intern.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_kron.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_mod.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_mont.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_mpi.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_mul.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_nist.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_prime.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_print.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_rand.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_recp.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_shift.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_sqr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_sqrt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_srp.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_word.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_x931p.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/mips-mont.o" =>
@@ -5783,13 +5648,11 @@ our %unified_info = (
             "crypto/buffer/buf_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/buffer/buffer.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/buildinf.h" =>
@@ -5799,43 +5662,36 @@ our %unified_info = (
             "crypto/camellia/camellia.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/camellia/cmll_cbc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/camellia/cmll_cfb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/camellia/cmll_ctr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/camellia/cmll_ecb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/camellia/cmll_misc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/camellia/cmll_ofb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/camellia/cmllt4-sparcv9.o" =>
@@ -5845,31 +5701,26 @@ our %unified_info = (
             "crypto/cast/c_cfb64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cast/c_ecb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cast/c_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cast/c_ofb64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cast/c_skey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/chacha/chacha-armv4.o" =>
@@ -5887,278 +5738,232 @@ our %unified_info = (
             "crypto/chacha/chacha_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cmac/cm_ameth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cmac/cm_pmeth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cmac/cmac.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_asn1.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_att.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_cd.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_dd.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_env.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_ess.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_io.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_kari.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_pwri.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_sd.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_smime.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/conf/conf_api.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/conf/conf_def.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/conf/conf_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/conf/conf_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/conf/conf_mall.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/conf/conf_mod.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/conf/conf_sap.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/conf/conf_ssl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cpt_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cryptlib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ct/ct_b64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ct/ct_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ct/ct_log.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ct/ct_oct.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ct/ct_policy.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ct/ct_prn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ct/ct_sct.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ct/ct_sct_ctx.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ct/ct_vfy.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ct/ct_x509v3.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ctype.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cversion.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto",
                 ],
             "crypto/des/cbc_cksm.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/cbc_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/cfb64ede.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/cfb64enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/cfb_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/des_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/dest4-sparcv9.o" =>
@@ -6168,301 +5973,251 @@ our %unified_info = (
             "crypto/des/ecb3_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/ecb_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/fcrypt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/fcrypt_b.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/ofb64ede.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/ofb64enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/ofb_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/pcbc_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/qud_cksm.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/rand_key.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/set_key.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/str2key.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/xcbc_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_ameth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_asn1.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_check.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_depr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_gen.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_kdf.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_key.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_meth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_pmeth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_prn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_rfc5114.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_rfc7919.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dsa/dsa_ameth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dsa/dsa_asn1.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dsa/dsa_depr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dsa/dsa_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dsa/dsa_gen.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dsa/dsa_key.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dsa/dsa_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dsa/dsa_meth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dsa/dsa_ossl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dsa/dsa_pmeth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dsa/dsa_prn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dsa/dsa_sign.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dsa/dsa_vrf.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dso/dso_dl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dso/dso_dlfcn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dso/dso_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dso/dso_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dso/dso_openssl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dso/dso_vms.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dso/dso_win32.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ebcdic.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/curve25519.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/curve448/arch_32/f_impl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto/ec/curve448/arch_32",
                     "crypto/ec/curve448",
@@ -6470,7 +6225,6 @@ our %unified_info = (
             "crypto/ec/curve448/curve448.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto/ec/curve448/arch_32",
                     "crypto/ec/curve448",
@@ -6478,7 +6232,6 @@ our %unified_info = (
             "crypto/ec/curve448/curve448_tables.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto/ec/curve448/arch_32",
                     "crypto/ec/curve448",
@@ -6486,7 +6239,6 @@ our %unified_info = (
             "crypto/ec/curve448/eddsa.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto/ec/curve448/arch_32",
                     "crypto/ec/curve448",
@@ -6494,7 +6246,6 @@ our %unified_info = (
             "crypto/ec/curve448/f_generic.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto/ec/curve448/arch_32",
                     "crypto/ec/curve448",
@@ -6502,7 +6253,6 @@ our %unified_info = (
             "crypto/ec/curve448/scalar.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto/ec/curve448/arch_32",
                     "crypto/ec/curve448",
@@ -6510,163 +6260,136 @@ our %unified_info = (
             "crypto/ec/ec2_oct.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec2_smpl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec_ameth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec_asn1.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec_check.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec_curve.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec_cvt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec_key.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec_kmeth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec_mult.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec_oct.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec_pmeth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec_print.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecdh_kdf.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecdh_ossl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecdsa_ossl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecdsa_sign.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecdsa_vrf.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/eck_prn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecp_mont.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecp_nist.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecp_nistp224.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecp_nistp256.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecp_nistp521.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecp_nistputil.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecp_nistz256-armv4.o" =>
@@ -6684,223 +6407,186 @@ our %unified_info = (
             "crypto/ec/ecp_oct.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecp_smpl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecx_meth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/eng_all.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/eng_cnf.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/eng_ctrl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/eng_dyn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/eng_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/eng_fat.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/eng_init.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/eng_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/eng_list.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/eng_openssl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/eng_pkey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/eng_rdrand.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/eng_table.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/tb_asnmth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/tb_cipher.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/tb_dh.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/tb_digest.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/tb_dsa.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/tb_eckey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/tb_pkmeth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/tb_rand.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/tb_rsa.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/err/err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/err/err_all.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/err/err_prn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/bio_b64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/bio_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/bio_md.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/bio_ok.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/c_allc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/c_alld.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/cmeth_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/digest.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/e_aes.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto",
                     "crypto/modes",
@@ -6908,21 +6594,18 @@ our %unified_info = (
             "crypto/evp/e_aes_cbc_hmac_sha1.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto/modes",
                 ],
             "crypto/evp/e_aes_cbc_hmac_sha256.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto/modes",
                 ],
             "crypto/evp/e_aria.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto",
                     "crypto/modes",
@@ -6930,13 +6613,11 @@ our %unified_info = (
             "crypto/evp/e_bf.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/e_camellia.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto",
                     "crypto/modes",
@@ -6944,81 +6625,68 @@ our %unified_info = (
             "crypto/evp/e_cast.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/e_chacha20_poly1305.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/e_des.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto",
                 ],
             "crypto/evp/e_des3.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto",
                 ],
             "crypto/evp/e_idea.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/e_null.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/e_old.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/e_rc2.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/e_rc4.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/e_rc4_hmac_md5.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/e_rc5.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/e_seed.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/e_sm4.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto",
                     "crypto/modes",
@@ -7026,328 +6694,267 @@ our %unified_info = (
             "crypto/evp/e_xcbc_d.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/encode.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/evp_cnf.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/evp_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/evp_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/evp_key.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/evp_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/evp_pbe.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/evp_pkey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/m_md2.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/m_md4.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/m_md5.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/m_md5_sha1.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/m_mdc2.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/m_null.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/m_ripemd.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/m_sha1.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/m_sha3.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto",
                 ],
             "crypto/evp/m_sigver.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/m_wp.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/names.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/p5_crpt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/p5_crpt2.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/p_dec.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/p_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/p_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/p_open.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/p_seal.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/p_sign.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/p_verify.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/pbe_scrypt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/pmeth_fn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/pmeth_gn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/pmeth_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ex_data.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/getenv.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/hmac/hm_ameth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/hmac/hm_pmeth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/hmac/hmac.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/idea/i_cbc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/idea/i_cfb64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/idea/i_ecb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/idea/i_ofb64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/idea/i_skey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
-            "crypto/include/internal/bn_conf.h" =>
-                [
-                    ".",
-                ],
-            "crypto/include/internal/dso_conf.h" =>
-                [
-                    ".",
-                ],
             "crypto/init.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/kdf/hkdf.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/kdf/kdf_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/kdf/scrypt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/kdf/tls1_prf.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/lhash/lh_stats.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/lhash/lhash.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/md4/md4_dgst.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/md4/md4_one.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/md5/md5-sparcv9.o" =>
@@ -7357,85 +6964,71 @@ our %unified_info = (
             "crypto/md5/md5_dgst.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/md5/md5_one.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/mdc2/mdc2_one.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/mdc2/mdc2dgst.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/mem.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/mem_clr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/mem_dbg.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/mem_sec.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/modes/cbc128.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/modes/ccm128.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/modes/cfb128.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/modes/ctr128.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/modes/cts128.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/modes/gcm128.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto",
                 ],
@@ -7458,361 +7051,301 @@ our %unified_info = (
             "crypto/modes/ocb128.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/modes/ofb128.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/modes/wrap128.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/modes/xts128.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/o_dir.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/o_fips.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/o_fopen.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/o_init.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/o_str.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/o_time.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/objects/o_names.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/objects/obj_dat.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/objects/obj_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/objects/obj_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/objects/obj_xref.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ocsp/ocsp_asn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ocsp/ocsp_cl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ocsp/ocsp_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ocsp/ocsp_ext.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ocsp/ocsp_ht.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ocsp/ocsp_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ocsp/ocsp_prn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ocsp/ocsp_srv.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ocsp/ocsp_vfy.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ocsp/v3_ocsp.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pem/pem_all.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pem/pem_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pem/pem_info.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pem/pem_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pem/pem_oth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pem/pem_pk8.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pem/pem_pkey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pem/pem_sign.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pem/pem_x509.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pem/pem_xaux.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pem/pvkfmt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_add.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_asn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_attr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_crpt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_crt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_decr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_init.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_key.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_kiss.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_mutl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_npas.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_p8d.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_p8e.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_sbag.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_utl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/pk12err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs7/bio_pk7.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs7/pk7_asn1.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs7/pk7_attr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs7/pk7_doit.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs7/pk7_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs7/pk7_mime.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs7/pk7_smime.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs7/pkcs7err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/poly1305/poly1305-armv4.o" =>
@@ -7834,259 +7367,216 @@ our %unified_info = (
             "crypto/poly1305/poly1305.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/poly1305/poly1305_ameth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/poly1305/poly1305_pmeth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rand/drbg_ctr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rand/drbg_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rand/rand_egd.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rand/rand_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rand/rand_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rand/rand_unix.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rand/rand_vms.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rand/rand_win.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rand/randfile.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rc2/rc2_cbc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rc2/rc2_ecb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rc2/rc2_skey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rc2/rc2cfb64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rc2/rc2ofb64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rc4/rc4_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rc4/rc4_skey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ripemd/rmd_dgst.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ripemd/rmd_one.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_ameth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_asn1.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_chk.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_crpt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_depr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_gen.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_meth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_mp.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_none.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_oaep.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_ossl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_pk1.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_pmeth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_prn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_pss.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_saos.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_sign.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_ssl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_x931.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_x931g.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/s390xcpuid.o" =>
@@ -8096,31 +7586,26 @@ our %unified_info = (
             "crypto/seed/seed.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/seed/seed_cbc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/seed/seed_cfb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/seed/seed_ecb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/seed/seed_ofb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sha/keccak1600-armv4.o" =>
@@ -8130,7 +7615,6 @@ our %unified_info = (
             "crypto/sha/keccak1600.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sha/sha1-armv4-large.o" =>
@@ -8156,13 +7640,11 @@ our %unified_info = (
             "crypto/sha/sha1_one.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sha/sha1dgst.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sha/sha256-armv4.o" =>
@@ -8188,7 +7670,6 @@ our %unified_info = (
             "crypto/sha/sha256.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sha/sha512-armv4.o" =>
@@ -8214,709 +7695,591 @@ our %unified_info = (
             "crypto/sha/sha512.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/siphash/siphash.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/siphash/siphash_ameth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/siphash/siphash_pmeth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sm2/sm2_crypt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sm2/sm2_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sm2/sm2_pmeth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sm2/sm2_sign.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sm3/m_sm3.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sm3/sm3.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sm4/sm4.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/srp/srp_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/srp/srp_vfy.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/stack/stack.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/store/loader_file.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/store/store_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/store/store_init.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/store/store_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/store/store_register.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/store/store_strings.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/threads_none.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/threads_pthread.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/threads_win.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ts/ts_asn1.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ts/ts_conf.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ts/ts_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ts/ts_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ts/ts_req_print.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ts/ts_req_utils.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ts/ts_rsp_print.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ts/ts_rsp_sign.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ts/ts_rsp_utils.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ts/ts_rsp_verify.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ts/ts_verify_ctx.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/txt_db/txt_db.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ui/ui_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ui/ui_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ui/ui_null.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ui/ui_openssl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ui/ui_util.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/uid.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/whrlpool/wp_block.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/whrlpool/wp_dgst.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/by_dir.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/by_file.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/t_crl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/t_req.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/t_x509.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_att.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_cmp.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_d2.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_def.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_ext.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_lu.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_meth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_obj.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_r2x.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_req.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_set.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_trs.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_txt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_v3.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_vfy.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_vpm.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509cset.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509name.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509rset.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509spki.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509type.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x_all.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x_attrib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x_crl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x_exten.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x_name.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x_pubkey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x_req.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x_x509.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x_x509a.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/pcy_cache.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/pcy_data.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/pcy_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/pcy_map.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/pcy_node.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/pcy_tree.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_addr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_admis.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_akey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_akeya.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_alt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_asid.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_bcons.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_bitst.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_conf.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_cpols.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_crld.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_enum.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_extku.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_genn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_ia5.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_info.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_int.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_ncons.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_pci.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_pcia.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_pcons.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_pku.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_pmaps.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_prn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_purp.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_skey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_sxnet.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_tlsf.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_utl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "engines/e_capi.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "engines/e_padlock.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "fuzz/asn1.o" =>
@@ -8967,6 +8330,14 @@ our %unified_info = (
                 [
                     "include",
                 ],
+            "include/crypto/bn_conf.h" =>
+                [
+                    ".",
+                ],
+            "include/crypto/dso_conf.h" =>
+                [
+                    ".",
+                ],
             "include/openssl/opensslconf.h" =>
                 [
                     ".",
@@ -9211,7 +8582,6 @@ our %unified_info = (
                 [
                     ".",
                     "include",
-                    "crypto/include",
                 ],
             "test/asn1_string_table_test.o" =>
                 [
@@ -9537,7 +8907,6 @@ our %unified_info = (
                 [
                     ".",
                     "include",
-                    "crypto/include",
                 ],
             "test/cipher_overhead_test.o" =>
                 [
@@ -9583,7 +8952,6 @@ our %unified_info = (
             "test/ctype_internal_test.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "test/curve448_internal_test.o" =>
@@ -9649,7 +9017,6 @@ our %unified_info = (
                 [
                     "include",
                     "crypto/ec",
-                    "crypto/include",
                 ],
             "test/ecdsatest.o" =>
                 [
@@ -9674,7 +9041,6 @@ our %unified_info = (
             "test/evp_extra_test.o" =>
                 [
                     "include",
-                    "crypto/include",
                 ],
             "test/evp_test.o" =>
                 [
@@ -9772,7 +9138,6 @@ our %unified_info = (
                 [
                     ".",
                     "include",
-                    "crypto/include",
                 ],
             "test/rc2test.o" =>
                 [
@@ -9822,18 +9187,15 @@ our %unified_info = (
                 [
                     ".",
                     "include",
-                    "crypto/include",
                 ],
             "test/sm2_internal_test.o" =>
                 [
                     "include",
-                    "crypto/include",
                 ],
             "test/sm4_internal_test.o" =>
                 [
                     ".",
                     "include",
-                    "crypto/include",
                 ],
             "test/srptest.o" =>
                 [
@@ -9844,6 +9206,10 @@ our %unified_info = (
                     ".",
                     "include",
                 ],
+            "test/ssl_ctx_test.o" =>
+                [
+                    "include",
+                ],
             "test/ssl_test.o" =>
                 [
                     "include",
@@ -9907,10 +9273,6 @@ our %unified_info = (
                 [
                     "include",
                 ],
-            "test/testutil/init.o" =>
-                [
-                    "include",
-                ],
             "test/testutil/main.o" =>
                 [
                     "include",
@@ -9939,6 +9301,10 @@ our %unified_info = (
                 [
                     "include",
                 ],
+            "test/testutil/testutil_init.o" =>
+                [
+                    "include",
+                ],
             "test/threadstest.o" =>
                 [
                     "include",
@@ -10203,6 +9569,7 @@ our %unified_info = (
             "test/sm4_internal_test",
             "test/srptest",
             "test/ssl_cert_table_internal_test",
+            "test/ssl_ctx_test",
             "test/ssl_test",
             "test/ssl_test_ctx_test",
             "test/sslapitest",
@@ -15093,7 +14460,6 @@ our %unified_info = (
                     "test/testutil/cb.o",
                     "test/testutil/driver.o",
                     "test/testutil/format_output.o",
-                    "test/testutil/init.o",
                     "test/testutil/main.o",
                     "test/testutil/output_helpers.o",
                     "test/testutil/random.o",
@@ -15101,6 +14467,7 @@ our %unified_info = (
                     "test/testutil/tap_bio.o",
                     "test/testutil/test_cleanup.o",
                     "test/testutil/tests.o",
+                    "test/testutil/testutil_init.o",
                 ],
             "test/md2test" =>
                 [
@@ -15328,6 +14695,14 @@ our %unified_info = (
                 [
                     "test/ssl_cert_table_internal_test.c",
                 ],
+            "test/ssl_ctx_test" =>
+                [
+                    "test/ssl_ctx_test.o",
+                ],
+            "test/ssl_ctx_test.o" =>
+                [
+                    "test/ssl_ctx_test.c",
+                ],
             "test/ssl_test" =>
                 [
                     "test/handshake_helper.o",
@@ -15430,10 +14805,6 @@ our %unified_info = (
                 [
                     "test/testutil/format_output.c",
                 ],
-            "test/testutil/init.o" =>
-                [
-                    "test/testutil/init.c",
-                ],
             "test/testutil/main.o" =>
                 [
                     "test/testutil/main.c",
@@ -15462,6 +14833,10 @@ our %unified_info = (
                 [
                     "test/testutil/tests.c",
                 ],
+            "test/testutil/testutil_init.o" =>
+                [
+                    "test/testutil/testutil_init.c",
+                ],
             "test/threadstest" =>
                 [
                     "test/threadstest.o",
diff --git a/deps/openssl/config/archs/linux-ppc64le/no-asm/crypto/buildinf.h b/deps/openssl/config/archs/linux-ppc64le/no-asm/crypto/buildinf.h
index aebc739df4..98bbd243c1 100644
--- a/deps/openssl/config/archs/linux-ppc64le/no-asm/crypto/buildinf.h
+++ b/deps/openssl/config/archs/linux-ppc64le/no-asm/crypto/buildinf.h
@@ -11,7 +11,7 @@
  */
 
 #define PLATFORM "platform: linux-ppc64le"
-#define DATE "built on: Fri Sep 13 16:01:29 2019 UTC"
+#define DATE "built on: Wed Mar 18 21:08:54 2020 UTC"
 
 /*
  * Generate compiler_flags as an array of individual characters. This is a
diff --git a/deps/openssl/config/archs/linux-ppc64le/no-asm/crypto/include/internal/bn_conf.h b/deps/openssl/config/archs/linux-ppc64le/no-asm/crypto/include/internal/bn_conf.h
index 34bd8b78b4..5312ef5a7a 100644
--- a/deps/openssl/config/archs/linux-ppc64le/no-asm/crypto/include/internal/bn_conf.h
+++ b/deps/openssl/config/archs/linux-ppc64le/no-asm/crypto/include/internal/bn_conf.h
@@ -1,5 +1,5 @@
 /* WARNING: do not edit! */
-/* Generated by Makefile from crypto/include/internal/bn_conf.h.in */
+/* Generated by Makefile from include/crypto/bn_conf.h.in */
 /*
  * Copyright 2016 The OpenSSL Project Authors. All Rights Reserved.
  *
@@ -9,8 +9,8 @@
  * https://www.openssl.org/source/license.html
  */
 
-#ifndef HEADER_BN_CONF_H
-# define HEADER_BN_CONF_H
+#ifndef OSSL_CRYPTO_BN_CONF_H
+# define OSSL_CRYPTO_BN_CONF_H
 
 /*
  * The contents of this file are not used in the UEFI build, as
diff --git a/deps/openssl/config/archs/linux-ppc64le/no-asm/crypto/include/internal/dso_conf.h b/deps/openssl/config/archs/linux-ppc64le/no-asm/crypto/include/internal/dso_conf.h
index 252266ec2a..4b1167c3d8 100644
--- a/deps/openssl/config/archs/linux-ppc64le/no-asm/crypto/include/internal/dso_conf.h
+++ b/deps/openssl/config/archs/linux-ppc64le/no-asm/crypto/include/internal/dso_conf.h
@@ -1,5 +1,5 @@
 /* WARNING: do not edit! */
-/* Generated by Makefile from crypto/include/internal/dso_conf.h.in */
+/* Generated by Makefile from include/crypto/dso_conf.h.in */
 /*
  * Copyright 2016-2019 The OpenSSL Project Authors. All Rights Reserved.
  *
@@ -9,8 +9,8 @@
  * https://www.openssl.org/source/license.html
  */
 
-#ifndef HEADER_DSO_CONF_H
-# define HEADER_DSO_CONF_H
+#ifndef OSSL_CRYPTO_DSO_CONF_H
+# define OSSL_CRYPTO_DSO_CONF_H
 # define DSO_DLFCN
 # define HAVE_DLFCN_H
 # define DSO_EXTENSION ".so"
diff --git a/deps/openssl/config/archs/linux-ppc64le/no-asm/include/openssl/opensslconf.h b/deps/openssl/config/archs/linux-ppc64le/no-asm/include/openssl/opensslconf.h
index 212e3f67d8..781ef739dc 100644
--- a/deps/openssl/config/archs/linux-ppc64le/no-asm/include/openssl/opensslconf.h
+++ b/deps/openssl/config/archs/linux-ppc64le/no-asm/include/openssl/opensslconf.h
@@ -99,9 +99,6 @@ extern "C" {
 #ifndef OPENSSL_NO_DYNAMIC_ENGINE
 # define OPENSSL_NO_DYNAMIC_ENGINE
 #endif
-#ifndef OPENSSL_NO_AFALGENG
-# define OPENSSL_NO_AFALGENG
-#endif
 
 
 /*
diff --git a/deps/openssl/config/archs/linux-ppc64le/no-asm/include/progs.h b/deps/openssl/config/archs/linux-ppc64le/no-asm/include/progs.h
index 9b3d270e20..308c65601b 100644
--- a/deps/openssl/config/archs/linux-ppc64le/no-asm/include/progs.h
+++ b/deps/openssl/config/archs/linux-ppc64le/no-asm/include/progs.h
@@ -2,7 +2,7 @@
  * WARNING: do not edit!
  * Generated by apps/progs.pl
  *
- * Copyright 1995-2019 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 1995-2020 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
diff --git a/deps/openssl/config/archs/linux-x32/asm/configdata.pm b/deps/openssl/config/archs/linux-x32/asm/configdata.pm
index 58a473be95..87cae322cf 100644
--- a/deps/openssl/config/archs/linux-x32/asm/configdata.pm
+++ b/deps/openssl/config/archs/linux-x32/asm/configdata.pm
@@ -49,14 +49,14 @@ our %config = (
   export_var_as_fn => "0",
   includes => [  ],
   lflags => [  ],
-  lib_defines => [ "OPENSSL_PIC", "OPENSSL_CPUID_OBJ", "OPENSSL_IA32_SSE2", "OPENSSL_BN_ASM_MONT", "OPENSSL_BN_ASM_MONT5", "OPENSSL_BN_ASM_GF2m", "SHA1_ASM", "SHA256_ASM", "SHA512_ASM", "KECCAK1600_ASM", "RC4_ASM", "MD5_ASM", "VPAES_ASM", "GHASH_ASM", "ECP_NISTZ256_ASM", "X25519_ASM", "POLY1305_ASM" ],
+  lib_defines => [ "OPENSSL_PIC", "OPENSSL_CPUID_OBJ", "OPENSSL_IA32_SSE2", "OPENSSL_BN_ASM_MONT", "OPENSSL_BN_ASM_MONT5", "OPENSSL_BN_ASM_GF2m", "SHA1_ASM", "SHA256_ASM", "SHA512_ASM", "KECCAK1600_ASM", "RC4_ASM", "MD5_ASM", "AESNI_ASM", "VPAES_ASM", "GHASH_ASM", "ECP_NISTZ256_ASM", "X25519_ASM", "POLY1305_ASM" ],
   libdir => "",
   major => "1",
   makedepprog => "\$(CROSS_COMPILE)gcc",
   minor => "1.1",
   openssl_algorithm_defines => [ "OPENSSL_NO_COMP", "OPENSSL_NO_MD2", "OPENSSL_NO_RC5" ],
   openssl_api_defines => [  ],
-  openssl_other_defines => [ "OPENSSL_RAND_SEED_OS", "OPENSSL_NO_AFALGENG", "OPENSSL_NO_ASAN", "OPENSSL_NO_CRYPTO_MDEBUG", "OPENSSL_NO_CRYPTO_MDEBUG_BACKTRACE", "OPENSSL_NO_DEVCRYPTOENG", "OPENSSL_NO_EC_NISTP_64_GCC_128", "OPENSSL_NO_EGD", "OPENSSL_NO_EXTERNAL_TESTS", "OPENSSL_NO_FUZZ_AFL", "OPENSSL_NO_FUZZ_LIBFUZZER", "OPENSSL_NO_HEARTBEATS", "OPENSSL_NO_MSAN", "OPENSSL_NO_SCTP", "OPENSSL_NO_SSL3", "OPENSSL_NO_SSL3_METHOD", "OPENSSL_NO_UBSAN", "OPENSSL_NO_UNIT_TEST", "OPENSSL_NO_WEAK_SSL_CIPHERS", "OPENSSL_NO_DYNAMIC_ENGINE", "OPENSSL_NO_AFALGENG" ],
+  openssl_other_defines => [ "OPENSSL_RAND_SEED_OS", "OPENSSL_NO_AFALGENG", "OPENSSL_NO_ASAN", "OPENSSL_NO_CRYPTO_MDEBUG", "OPENSSL_NO_CRYPTO_MDEBUG_BACKTRACE", "OPENSSL_NO_DEVCRYPTOENG", "OPENSSL_NO_EC_NISTP_64_GCC_128", "OPENSSL_NO_EGD", "OPENSSL_NO_EXTERNAL_TESTS", "OPENSSL_NO_FUZZ_AFL", "OPENSSL_NO_FUZZ_LIBFUZZER", "OPENSSL_NO_HEARTBEATS", "OPENSSL_NO_MSAN", "OPENSSL_NO_SCTP", "OPENSSL_NO_SSL3", "OPENSSL_NO_SSL3_METHOD", "OPENSSL_NO_UBSAN", "OPENSSL_NO_UNIT_TEST", "OPENSSL_NO_WEAK_SSL_CIPHERS", "OPENSSL_NO_DYNAMIC_ENGINE" ],
   openssl_sys_defines => [  ],
   openssl_thread_defines => [ "OPENSSL_THREADS" ],
   openssldir => "",
@@ -112,8 +112,8 @@ our %config = (
   sourcedir => ".",
   target => "linux-x32",
   tdirs => [ "ossl_shim" ],
-  version => "1.1.1d",
-  version_num => "0x1010104fL",
+  version => "1.1.1e",
+  version_num => "0x1010105fL",
 );
 
 our %target = (
@@ -241,6 +241,7 @@ our @disablables = (
   "dgram",
   "dh",
   "dsa",
+  "dso",
   "dtls",
   "dynamic-engine",
   "ec",
@@ -358,8 +359,8 @@ our %unified_info = (
         {
             "" =>
                 [
-                    "crypto/include/internal/bn_conf.h",
-                    "crypto/include/internal/dso_conf.h",
+                    "include/crypto/bn_conf.h",
+                    "include/crypto/dso_conf.h",
                     "include/openssl/opensslconf.h",
                 ],
             "apps/asn1pars.o" =>
@@ -627,14 +628,6 @@ our %unified_info = (
                     "crypto/perlasm/cbc.pl",
                     "crypto/perlasm/x86asm.pl",
                 ],
-            "crypto/include/internal/bn_conf.h" =>
-                [
-                    "configdata.pm",
-                ],
-            "crypto/include/internal/dso_conf.h" =>
-                [
-                    "configdata.pm",
-                ],
             "crypto/rc4/rc4-586.s" =>
                 [
                     "crypto/perlasm/x86asm.pl",
@@ -710,6 +703,14 @@ our %unified_info = (
                 [
                     "libcrypto",
                 ],
+            "include/crypto/bn_conf.h" =>
+                [
+                    "configdata.pm",
+                ],
+            "include/crypto/dso_conf.h" =>
+                [
+                    "configdata.pm",
+                ],
             "include/openssl/opensslconf.h" =>
                 [
                     "configdata.pm",
@@ -1507,6 +1508,12 @@ our %unified_info = (
                     "libcrypto",
                     "test/libtestutil.a",
                 ],
+            "test/ssl_ctx_test" =>
+                [
+                    "libcrypto",
+                    "libssl",
+                    "test/libtestutil.a",
+                ],
             "test/ssl_test" =>
                 [
                     "libcrypto",
@@ -3261,7 +3268,6 @@ our %unified_info = (
                             "test/testutil/cb.o",
                             "test/testutil/driver.o",
                             "test/testutil/format_output.o",
-                            "test/testutil/init.o",
                             "test/testutil/main.o",
                             "test/testutil/output_helpers.o",
                             "test/testutil/random.o",
@@ -3269,6 +3275,7 @@ our %unified_info = (
                             "test/testutil/tap_bio.o",
                             "test/testutil/test_cleanup.o",
                             "test/testutil/tests.o",
+                            "test/testutil/testutil_init.o",
                         ],
                     "products" =>
                         {
@@ -3767,14 +3774,6 @@ our %unified_info = (
                 [
                     "crypto/ia64cpuid.S",
                 ],
-            "crypto/include/internal/bn_conf.h" =>
-                [
-                    "crypto/include/internal/bn_conf.h.in",
-                ],
-            "crypto/include/internal/dso_conf.h" =>
-                [
-                    "crypto/include/internal/dso_conf.h.in",
-                ],
             "crypto/md5/md5-586.s" =>
                 [
                     "crypto/md5/asm/md5-586.pl",
@@ -4215,6 +4214,14 @@ our %unified_info = (
                     "engines/asm/e_padlock-x86_64.pl",
                     "\$(PERLASM_SCHEME)",
                 ],
+            "include/crypto/bn_conf.h" =>
+                [
+                    "include/crypto/bn_conf.h.in",
+                ],
+            "include/crypto/dso_conf.h" =>
+                [
+                    "include/crypto/dso_conf.h.in",
+                ],
             "include/openssl/opensslconf.h" =>
                 [
                     "include/openssl/opensslconf.h.in",
@@ -4909,49 +4916,41 @@ our %unified_info = (
             "crypto/aes/aes_cbc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/aes/aes_cfb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/aes/aes_core.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/aes/aes_ecb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/aes/aes_ige.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/aes/aes_misc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/aes/aes_ofb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/aes/aes_wrap.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/aes/aesfx-sparcv9.o" =>
@@ -4961,25 +4960,21 @@ our %unified_info = (
             "crypto/aes/aesni-mb-x86_64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/aes/aesni-sha1-x86_64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/aes/aesni-sha256-x86_64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/aes/aesni-x86_64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/aes/aest4-sparcv9.o" =>
@@ -4997,13 +4992,11 @@ our %unified_info = (
             "crypto/aes/vpaes-x86_64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/aria/aria.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/arm64cpuid.o" =>
@@ -5017,613 +5010,511 @@ our %unified_info = (
             "crypto/asn1/a_bitstr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_d2i_fp.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_digest.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_dup.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_gentm.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_i2d_fp.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_int.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_mbstr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_object.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_octet.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_print.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_sign.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_strex.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_strnid.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_time.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_type.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_utctm.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_utf8.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_verify.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/ameth_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/asn1_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/asn1_gen.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/asn1_item_list.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/asn1_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/asn1_par.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/asn_mime.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/asn_moid.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/asn_mstbl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/asn_pack.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/bio_asn1.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/bio_ndef.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/d2i_pr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/d2i_pu.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/evp_asn1.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/f_int.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/f_string.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/i2d_pr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/i2d_pu.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/n_pkey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/nsseq.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/p5_pbe.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/p5_pbev2.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/p5_scrypt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/p8_pkey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/t_bitst.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/t_pkey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/t_spki.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/tasn_dec.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/tasn_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/tasn_fre.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/tasn_new.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/tasn_prn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/tasn_scn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/tasn_typ.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/tasn_utl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/x_algor.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/x_bignum.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/x_info.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/x_int64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/x_long.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/x_pkey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/x_sig.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/x_spki.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/x_val.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/async/arch/async_null.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/async/arch/async_posix.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/async/arch/async_win.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/async/async.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/async/async_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/async/async_wait.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bf/bf_cfb64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bf/bf_ecb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bf/bf_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bf/bf_ofb64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bf/bf_skey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/b_addr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/b_dump.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/b_print.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/b_sock.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/b_sock2.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bf_buff.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bf_lbuf.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bf_nbio.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bf_null.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bio_cb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bio_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bio_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bio_meth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bss_acpt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bss_bio.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bss_conn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bss_dgram.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bss_fd.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bss_file.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bss_log.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bss_mem.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bss_null.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bss_sock.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/blake2/blake2b.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/blake2/blake2s.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/blake2/m_blake2b.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/blake2/m_blake2s.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/armv4-gf2m.o" =>
@@ -5637,7 +5528,6 @@ our %unified_info = (
             "crypto/bn/asm/x86_64-gcc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn-mips.o" =>
@@ -5647,182 +5537,152 @@ our %unified_info = (
             "crypto/bn/bn_add.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_blind.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_const.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_ctx.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_depr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_dh.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_div.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_exp.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto",
                 ],
             "crypto/bn/bn_exp2.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_gcd.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_gf2m.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_intern.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_kron.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_mod.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_mont.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_mpi.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_mul.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_nist.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_prime.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_print.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_rand.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_recp.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_shift.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_sqr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_sqrt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_srp.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_word.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_x931p.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/mips-mont.o" =>
@@ -5832,19 +5692,16 @@ our %unified_info = (
             "crypto/bn/rsaz-avx2.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/rsaz-x86_64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/rsaz_exp.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/sparct4-mont.o" =>
@@ -5870,31 +5727,26 @@ our %unified_info = (
             "crypto/bn/x86_64-gf2m.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/x86_64-mont.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/x86_64-mont5.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/buffer/buf_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/buffer/buffer.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/buildinf.h" =>
@@ -5904,37 +5756,31 @@ our %unified_info = (
             "crypto/camellia/cmll-x86_64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/camellia/cmll_cfb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/camellia/cmll_ctr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/camellia/cmll_ecb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/camellia/cmll_misc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/camellia/cmll_ofb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/camellia/cmllt4-sparcv9.o" =>
@@ -5944,31 +5790,26 @@ our %unified_info = (
             "crypto/cast/c_cfb64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cast/c_ecb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cast/c_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cast/c_ofb64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cast/c_skey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/chacha/chacha-armv4.o" =>
@@ -5986,278 +5827,232 @@ our %unified_info = (
             "crypto/chacha/chacha-x86_64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cmac/cm_ameth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cmac/cm_pmeth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cmac/cmac.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_asn1.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_att.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_cd.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_dd.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_env.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_ess.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_io.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_kari.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_pwri.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_sd.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_smime.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/conf/conf_api.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/conf/conf_def.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/conf/conf_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/conf/conf_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/conf/conf_mall.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/conf/conf_mod.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/conf/conf_sap.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/conf/conf_ssl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cpt_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cryptlib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ct/ct_b64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ct/ct_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ct/ct_log.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ct/ct_oct.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ct/ct_policy.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ct/ct_prn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ct/ct_sct.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ct/ct_sct_ctx.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ct/ct_vfy.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ct/ct_x509v3.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ctype.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cversion.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto",
                 ],
             "crypto/des/cbc_cksm.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/cbc_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/cfb64ede.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/cfb64enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/cfb_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/des_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/dest4-sparcv9.o" =>
@@ -6267,301 +6062,251 @@ our %unified_info = (
             "crypto/des/ecb3_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/ecb_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/fcrypt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/fcrypt_b.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/ofb64ede.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/ofb64enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/ofb_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/pcbc_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/qud_cksm.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/rand_key.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/set_key.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/str2key.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/xcbc_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_ameth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_asn1.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_check.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_depr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_gen.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_kdf.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_key.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_meth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_pmeth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_prn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_rfc5114.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_rfc7919.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dsa/dsa_ameth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dsa/dsa_asn1.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dsa/dsa_depr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dsa/dsa_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dsa/dsa_gen.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dsa/dsa_key.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dsa/dsa_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dsa/dsa_meth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dsa/dsa_ossl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dsa/dsa_pmeth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dsa/dsa_prn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dsa/dsa_sign.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dsa/dsa_vrf.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dso/dso_dl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dso/dso_dlfcn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dso/dso_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dso/dso_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dso/dso_openssl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dso/dso_vms.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dso/dso_win32.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ebcdic.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/curve25519.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/curve448/arch_32/f_impl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto/ec/curve448/arch_32",
                     "crypto/ec/curve448",
@@ -6569,7 +6314,6 @@ our %unified_info = (
             "crypto/ec/curve448/curve448.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto/ec/curve448/arch_32",
                     "crypto/ec/curve448",
@@ -6577,7 +6321,6 @@ our %unified_info = (
             "crypto/ec/curve448/curve448_tables.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto/ec/curve448/arch_32",
                     "crypto/ec/curve448",
@@ -6585,7 +6328,6 @@ our %unified_info = (
             "crypto/ec/curve448/eddsa.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto/ec/curve448/arch_32",
                     "crypto/ec/curve448",
@@ -6593,7 +6335,6 @@ our %unified_info = (
             "crypto/ec/curve448/f_generic.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto/ec/curve448/arch_32",
                     "crypto/ec/curve448",
@@ -6601,7 +6342,6 @@ our %unified_info = (
             "crypto/ec/curve448/scalar.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto/ec/curve448/arch_32",
                     "crypto/ec/curve448",
@@ -6609,163 +6349,136 @@ our %unified_info = (
             "crypto/ec/ec2_oct.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec2_smpl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec_ameth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec_asn1.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec_check.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec_curve.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec_cvt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec_key.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec_kmeth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec_mult.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec_oct.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec_pmeth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec_print.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecdh_kdf.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecdh_ossl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecdsa_ossl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecdsa_sign.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecdsa_vrf.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/eck_prn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecp_mont.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecp_nist.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecp_nistp224.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecp_nistp256.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecp_nistp521.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecp_nistputil.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecp_nistz256-armv4.o" =>
@@ -6783,241 +6496,201 @@ our %unified_info = (
             "crypto/ec/ecp_nistz256-x86_64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecp_nistz256.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecp_oct.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecp_smpl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecx_meth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/x25519-x86_64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/eng_all.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/eng_cnf.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/eng_ctrl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/eng_dyn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/eng_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/eng_fat.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/eng_init.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/eng_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/eng_list.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/eng_openssl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/eng_pkey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/eng_rdrand.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/eng_table.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/tb_asnmth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/tb_cipher.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/tb_dh.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/tb_digest.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/tb_dsa.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/tb_eckey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/tb_pkmeth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/tb_rand.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/tb_rsa.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/err/err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/err/err_all.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/err/err_prn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/bio_b64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/bio_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/bio_md.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/bio_ok.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/c_allc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/c_alld.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/cmeth_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/digest.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/e_aes.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto",
                     "crypto/modes",
@@ -7025,21 +6698,18 @@ our %unified_info = (
             "crypto/evp/e_aes_cbc_hmac_sha1.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto/modes",
                 ],
             "crypto/evp/e_aes_cbc_hmac_sha256.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto/modes",
                 ],
             "crypto/evp/e_aria.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto",
                     "crypto/modes",
@@ -7047,13 +6717,11 @@ our %unified_info = (
             "crypto/evp/e_bf.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/e_camellia.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto",
                     "crypto/modes",
@@ -7061,81 +6729,68 @@ our %unified_info = (
             "crypto/evp/e_cast.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/e_chacha20_poly1305.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/e_des.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto",
                 ],
             "crypto/evp/e_des3.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto",
                 ],
             "crypto/evp/e_idea.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/e_null.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/e_old.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/e_rc2.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/e_rc4.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/e_rc4_hmac_md5.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/e_rc5.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/e_seed.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/e_sm4.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto",
                     "crypto/modes",
@@ -7143,328 +6798,267 @@ our %unified_info = (
             "crypto/evp/e_xcbc_d.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/encode.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/evp_cnf.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/evp_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/evp_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/evp_key.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/evp_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/evp_pbe.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/evp_pkey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/m_md2.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/m_md4.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/m_md5.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/m_md5_sha1.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/m_mdc2.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/m_null.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/m_ripemd.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/m_sha1.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/m_sha3.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto",
                 ],
             "crypto/evp/m_sigver.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/m_wp.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/names.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/p5_crpt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/p5_crpt2.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/p_dec.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/p_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/p_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/p_open.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/p_seal.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/p_sign.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/p_verify.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/pbe_scrypt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/pmeth_fn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/pmeth_gn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/pmeth_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ex_data.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/getenv.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/hmac/hm_ameth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/hmac/hm_pmeth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/hmac/hmac.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/idea/i_cbc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/idea/i_cfb64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/idea/i_ecb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/idea/i_ofb64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/idea/i_skey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
-            "crypto/include/internal/bn_conf.h" =>
-                [
-                    ".",
-                ],
-            "crypto/include/internal/dso_conf.h" =>
-                [
-                    ".",
-                ],
             "crypto/init.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/kdf/hkdf.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/kdf/kdf_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/kdf/scrypt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/kdf/tls1_prf.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/lhash/lh_stats.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/lhash/lhash.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/md4/md4_dgst.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/md4/md4_one.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/md5/md5-sparcv9.o" =>
@@ -7474,91 +7068,76 @@ our %unified_info = (
             "crypto/md5/md5-x86_64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/md5/md5_dgst.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/md5/md5_one.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/mdc2/mdc2_one.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/mdc2/mdc2dgst.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/mem.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/mem_dbg.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/mem_sec.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/modes/aesni-gcm-x86_64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/modes/cbc128.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/modes/ccm128.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/modes/cfb128.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/modes/ctr128.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/modes/cts128.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/modes/gcm128.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto",
                 ],
@@ -7577,7 +7156,6 @@ our %unified_info = (
             "crypto/modes/ghash-x86_64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/modes/ghashv8-armx.o" =>
@@ -7587,361 +7165,301 @@ our %unified_info = (
             "crypto/modes/ocb128.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/modes/ofb128.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/modes/wrap128.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/modes/xts128.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/o_dir.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/o_fips.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/o_fopen.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/o_init.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/o_str.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/o_time.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/objects/o_names.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/objects/obj_dat.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/objects/obj_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/objects/obj_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/objects/obj_xref.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ocsp/ocsp_asn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ocsp/ocsp_cl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ocsp/ocsp_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ocsp/ocsp_ext.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ocsp/ocsp_ht.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ocsp/ocsp_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ocsp/ocsp_prn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ocsp/ocsp_srv.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ocsp/ocsp_vfy.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ocsp/v3_ocsp.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pem/pem_all.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pem/pem_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pem/pem_info.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pem/pem_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pem/pem_oth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pem/pem_pk8.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pem/pem_pkey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pem/pem_sign.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pem/pem_x509.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pem/pem_xaux.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pem/pvkfmt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_add.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_asn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_attr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_crpt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_crt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_decr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_init.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_key.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_kiss.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_mutl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_npas.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_p8d.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_p8e.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_sbag.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_utl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/pk12err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs7/bio_pk7.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs7/pk7_asn1.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs7/pk7_attr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs7/pk7_doit.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs7/pk7_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs7/pk7_mime.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs7/pk7_smime.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs7/pkcs7err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/poly1305/poly1305-armv4.o" =>
@@ -7963,265 +7481,221 @@ our %unified_info = (
             "crypto/poly1305/poly1305-x86_64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/poly1305/poly1305.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/poly1305/poly1305_ameth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/poly1305/poly1305_pmeth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rand/drbg_ctr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rand/drbg_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rand/rand_egd.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rand/rand_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rand/rand_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rand/rand_unix.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rand/rand_vms.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rand/rand_win.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rand/randfile.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rc2/rc2_cbc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rc2/rc2_ecb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rc2/rc2_skey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rc2/rc2cfb64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rc2/rc2ofb64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rc4/rc4-md5-x86_64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rc4/rc4-x86_64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ripemd/rmd_dgst.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ripemd/rmd_one.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_ameth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_asn1.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_chk.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_crpt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_depr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_gen.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_meth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_mp.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_none.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_oaep.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_ossl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_pk1.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_pmeth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_prn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_pss.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_saos.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_sign.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_ssl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_x931.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_x931g.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/s390xcpuid.o" =>
@@ -8231,31 +7705,26 @@ our %unified_info = (
             "crypto/seed/seed.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/seed/seed_cbc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/seed/seed_cfb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/seed/seed_ecb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/seed/seed_ofb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sha/keccak1600-armv4.o" =>
@@ -8265,7 +7734,6 @@ our %unified_info = (
             "crypto/sha/keccak1600-x86_64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sha/sha1-armv4-large.o" =>
@@ -8279,7 +7747,6 @@ our %unified_info = (
             "crypto/sha/sha1-mb-x86_64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sha/sha1-mips.o" =>
@@ -8297,19 +7764,16 @@ our %unified_info = (
             "crypto/sha/sha1-x86_64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sha/sha1_one.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sha/sha1dgst.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sha/sha256-armv4.o" =>
@@ -8323,7 +7787,6 @@ our %unified_info = (
             "crypto/sha/sha256-mb-x86_64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sha/sha256-mips.o" =>
@@ -8341,13 +7804,11 @@ our %unified_info = (
             "crypto/sha/sha256-x86_64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sha/sha256.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sha/sha512-armv4.o" =>
@@ -8373,727 +7834,606 @@ our %unified_info = (
             "crypto/sha/sha512-x86_64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sha/sha512.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/siphash/siphash.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/siphash/siphash_ameth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/siphash/siphash_pmeth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sm2/sm2_crypt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sm2/sm2_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sm2/sm2_pmeth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sm2/sm2_sign.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sm3/m_sm3.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sm3/sm3.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sm4/sm4.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/srp/srp_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/srp/srp_vfy.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/stack/stack.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/store/loader_file.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/store/store_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/store/store_init.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/store/store_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/store/store_register.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/store/store_strings.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/threads_none.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/threads_pthread.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/threads_win.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ts/ts_asn1.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ts/ts_conf.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ts/ts_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ts/ts_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ts/ts_req_print.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ts/ts_req_utils.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ts/ts_rsp_print.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ts/ts_rsp_sign.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ts/ts_rsp_utils.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ts/ts_rsp_verify.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ts/ts_verify_ctx.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/txt_db/txt_db.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ui/ui_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ui/ui_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ui/ui_null.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ui/ui_openssl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ui/ui_util.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/uid.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/whrlpool/wp-x86_64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/whrlpool/wp_dgst.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/by_dir.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/by_file.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/t_crl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/t_req.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/t_x509.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_att.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_cmp.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_d2.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_def.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_ext.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_lu.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_meth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_obj.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_r2x.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_req.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_set.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_trs.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_txt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_v3.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_vfy.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_vpm.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509cset.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509name.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509rset.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509spki.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509type.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x_all.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x_attrib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x_crl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x_exten.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x_name.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x_pubkey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x_req.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x_x509.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x_x509a.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/pcy_cache.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/pcy_data.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/pcy_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/pcy_map.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/pcy_node.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/pcy_tree.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_addr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_admis.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_akey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_akeya.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_alt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_asid.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_bcons.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_bitst.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_conf.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_cpols.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_crld.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_enum.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_extku.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_genn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_ia5.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_info.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_int.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_ncons.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_pci.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_pcia.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_pcons.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_pku.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_pmaps.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_prn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_purp.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_skey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_sxnet.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_tlsf.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_utl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x86_64cpuid.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "engines/e_capi.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "engines/e_padlock-x86_64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "engines/e_padlock.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "fuzz/asn1.o" =>
@@ -9144,6 +8484,14 @@ our %unified_info = (
                 [
                     "include",
                 ],
+            "include/crypto/bn_conf.h" =>
+                [
+                    ".",
+                ],
+            "include/crypto/dso_conf.h" =>
+                [
+                    ".",
+                ],
             "include/openssl/opensslconf.h" =>
                 [
                     ".",
@@ -9388,7 +8736,6 @@ our %unified_info = (
                 [
                     ".",
                     "include",
-                    "crypto/include",
                 ],
             "test/asn1_string_table_test.o" =>
                 [
@@ -9714,7 +9061,6 @@ our %unified_info = (
                 [
                     ".",
                     "include",
-                    "crypto/include",
                 ],
             "test/cipher_overhead_test.o" =>
                 [
@@ -9760,7 +9106,6 @@ our %unified_info = (
             "test/ctype_internal_test.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "test/curve448_internal_test.o" =>
@@ -9826,7 +9171,6 @@ our %unified_info = (
                 [
                     "include",
                     "crypto/ec",
-                    "crypto/include",
                 ],
             "test/ecdsatest.o" =>
                 [
@@ -9851,7 +9195,6 @@ our %unified_info = (
             "test/evp_extra_test.o" =>
                 [
                     "include",
-                    "crypto/include",
                 ],
             "test/evp_test.o" =>
                 [
@@ -9949,7 +9292,6 @@ our %unified_info = (
                 [
                     ".",
                     "include",
-                    "crypto/include",
                 ],
             "test/rc2test.o" =>
                 [
@@ -9999,18 +9341,15 @@ our %unified_info = (
                 [
                     ".",
                     "include",
-                    "crypto/include",
                 ],
             "test/sm2_internal_test.o" =>
                 [
                     "include",
-                    "crypto/include",
                 ],
             "test/sm4_internal_test.o" =>
                 [
                     ".",
                     "include",
-                    "crypto/include",
                 ],
             "test/srptest.o" =>
                 [
@@ -10021,6 +9360,10 @@ our %unified_info = (
                     ".",
                     "include",
                 ],
+            "test/ssl_ctx_test.o" =>
+                [
+                    "include",
+                ],
             "test/ssl_test.o" =>
                 [
                     "include",
@@ -10084,10 +9427,6 @@ our %unified_info = (
                 [
                     "include",
                 ],
-            "test/testutil/init.o" =>
-                [
-                    "include",
-                ],
             "test/testutil/main.o" =>
                 [
                     "include",
@@ -10116,6 +9455,10 @@ our %unified_info = (
                 [
                     "include",
                 ],
+            "test/testutil/testutil_init.o" =>
+                [
+                    "include",
+                ],
             "test/threadstest.o" =>
                 [
                     "include",
@@ -10380,6 +9723,7 @@ our %unified_info = (
             "test/sm4_internal_test",
             "test/srptest",
             "test/ssl_cert_table_internal_test",
+            "test/ssl_ctx_test",
             "test/ssl_test",
             "test/ssl_test_ctx_test",
             "test/sslapitest",
@@ -15385,7 +14729,6 @@ our %unified_info = (
                     "test/testutil/cb.o",
                     "test/testutil/driver.o",
                     "test/testutil/format_output.o",
-                    "test/testutil/init.o",
                     "test/testutil/main.o",
                     "test/testutil/output_helpers.o",
                     "test/testutil/random.o",
@@ -15393,6 +14736,7 @@ our %unified_info = (
                     "test/testutil/tap_bio.o",
                     "test/testutil/test_cleanup.o",
                     "test/testutil/tests.o",
+                    "test/testutil/testutil_init.o",
                 ],
             "test/md2test" =>
                 [
@@ -15620,6 +14964,14 @@ our %unified_info = (
                 [
                     "test/ssl_cert_table_internal_test.c",
                 ],
+            "test/ssl_ctx_test" =>
+                [
+                    "test/ssl_ctx_test.o",
+                ],
+            "test/ssl_ctx_test.o" =>
+                [
+                    "test/ssl_ctx_test.c",
+                ],
             "test/ssl_test" =>
                 [
                     "test/handshake_helper.o",
@@ -15722,10 +15074,6 @@ our %unified_info = (
                 [
                     "test/testutil/format_output.c",
                 ],
-            "test/testutil/init.o" =>
-                [
-                    "test/testutil/init.c",
-                ],
             "test/testutil/main.o" =>
                 [
                     "test/testutil/main.c",
@@ -15754,6 +15102,10 @@ our %unified_info = (
                 [
                     "test/testutil/tests.c",
                 ],
+            "test/testutil/testutil_init.o" =>
+                [
+                    "test/testutil/testutil_init.c",
+                ],
             "test/threadstest" =>
                 [
                     "test/threadstest.o",
diff --git a/deps/openssl/config/archs/linux-x32/asm/crypto/aes/aes-x86_64.s b/deps/openssl/config/archs/linux-x32/asm/crypto/aes/aes-x86_64.s
deleted file mode 100644
index f0c1685fb9..0000000000
--- a/deps/openssl/config/archs/linux-x32/asm/crypto/aes/aes-x86_64.s
+++ /dev/null
@@ -1,2649 +0,0 @@
-.text	
-.type	_x86_64_AES_encrypt,@function
-.align	16
-_x86_64_AES_encrypt:
-	xorl	0(%r15),%eax
-	xorl	4(%r15),%ebx
-	xorl	8(%r15),%ecx
-	xorl	12(%r15),%edx
-
-	movl	240(%r15),%r13d
-	subl	$1,%r13d
-	jmp	.Lenc_loop
-.align	16
-.Lenc_loop:
-
-	movzbl	%al,%esi
-	movzbl	%bl,%edi
-	movzbl	%cl,%ebp
-	movl	0(%r14,%rsi,8),%r10d
-	movl	0(%r14,%rdi,8),%r11d
-	movl	0(%r14,%rbp,8),%r12d
-
-	movzbl	%bh,%esi
-	movzbl	%ch,%edi
-	movzbl	%dl,%ebp
-	xorl	3(%r14,%rsi,8),%r10d
-	xorl	3(%r14,%rdi,8),%r11d
-	movl	0(%r14,%rbp,8),%r8d
-
-	movzbl	%dh,%esi
-	shrl	$16,%ecx
-	movzbl	%ah,%ebp
-	xorl	3(%r14,%rsi,8),%r12d
-	shrl	$16,%edx
-	xorl	3(%r14,%rbp,8),%r8d
-
-	shrl	$16,%ebx
-	leaq	16(%r15),%r15
-	shrl	$16,%eax
-
-	movzbl	%cl,%esi
-	movzbl	%dl,%edi
-	movzbl	%al,%ebp
-	xorl	2(%r14,%rsi,8),%r10d
-	xorl	2(%r14,%rdi,8),%r11d
-	xorl	2(%r14,%rbp,8),%r12d
-
-	movzbl	%dh,%esi
-	movzbl	%ah,%edi
-	movzbl	%bl,%ebp
-	xorl	1(%r14,%rsi,8),%r10d
-	xorl	1(%r14,%rdi,8),%r11d
-	xorl	2(%r14,%rbp,8),%r8d
-
-	movl	12(%r15),%edx
-	movzbl	%bh,%edi
-	movzbl	%ch,%ebp
-	movl	0(%r15),%eax
-	xorl	1(%r14,%rdi,8),%r12d
-	xorl	1(%r14,%rbp,8),%r8d
-
-	movl	4(%r15),%ebx
-	movl	8(%r15),%ecx
-	xorl	%r10d,%eax
-	xorl	%r11d,%ebx
-	xorl	%r12d,%ecx
-	xorl	%r8d,%edx
-	subl	$1,%r13d
-	jnz	.Lenc_loop
-	movzbl	%al,%esi
-	movzbl	%bl,%edi
-	movzbl	%cl,%ebp
-	movzbl	2(%r14,%rsi,8),%r10d
-	movzbl	2(%r14,%rdi,8),%r11d
-	movzbl	2(%r14,%rbp,8),%r12d
-
-	movzbl	%dl,%esi
-	movzbl	%bh,%edi
-	movzbl	%ch,%ebp
-	movzbl	2(%r14,%rsi,8),%r8d
-	movl	0(%r14,%rdi,8),%edi
-	movl	0(%r14,%rbp,8),%ebp
-
-	andl	$0x0000ff00,%edi
-	andl	$0x0000ff00,%ebp
-
-	xorl	%edi,%r10d
-	xorl	%ebp,%r11d
-	shrl	$16,%ecx
-
-	movzbl	%dh,%esi
-	movzbl	%ah,%edi
-	shrl	$16,%edx
-	movl	0(%r14,%rsi,8),%esi
-	movl	0(%r14,%rdi,8),%edi
-
-	andl	$0x0000ff00,%esi
-	andl	$0x0000ff00,%edi
-	shrl	$16,%ebx
-	xorl	%esi,%r12d
-	xorl	%edi,%r8d
-	shrl	$16,%eax
-
-	movzbl	%cl,%esi
-	movzbl	%dl,%edi
-	movzbl	%al,%ebp
-	movl	0(%r14,%rsi,8),%esi
-	movl	0(%r14,%rdi,8),%edi
-	movl	0(%r14,%rbp,8),%ebp
-
-	andl	$0x00ff0000,%esi
-	andl	$0x00ff0000,%edi
-	andl	$0x00ff0000,%ebp
-
-	xorl	%esi,%r10d
-	xorl	%edi,%r11d
-	xorl	%ebp,%r12d
-
-	movzbl	%bl,%esi
-	movzbl	%dh,%edi
-	movzbl	%ah,%ebp
-	movl	0(%r14,%rsi,8),%esi
-	movl	2(%r14,%rdi,8),%edi
-	movl	2(%r14,%rbp,8),%ebp
-
-	andl	$0x00ff0000,%esi
-	andl	$0xff000000,%edi
-	andl	$0xff000000,%ebp
-
-	xorl	%esi,%r8d
-	xorl	%edi,%r10d
-	xorl	%ebp,%r11d
-
-	movzbl	%bh,%esi
-	movzbl	%ch,%edi
-	movl	16+12(%r15),%edx
-	movl	2(%r14,%rsi,8),%esi
-	movl	2(%r14,%rdi,8),%edi
-	movl	16+0(%r15),%eax
-
-	andl	$0xff000000,%esi
-	andl	$0xff000000,%edi
-
-	xorl	%esi,%r12d
-	xorl	%edi,%r8d
-
-	movl	16+4(%r15),%ebx
-	movl	16+8(%r15),%ecx
-	xorl	%r10d,%eax
-	xorl	%r11d,%ebx
-	xorl	%r12d,%ecx
-	xorl	%r8d,%edx
-.byte	0xf3,0xc3
-.size	_x86_64_AES_encrypt,.-_x86_64_AES_encrypt
-.type	_x86_64_AES_encrypt_compact,@function
-.align	16
-_x86_64_AES_encrypt_compact:
-.cfi_startproc	
-	leaq	128(%r14),%r8
-	movl	0-128(%r8),%edi
-	movl	32-128(%r8),%ebp
-	movl	64-128(%r8),%r10d
-	movl	96-128(%r8),%r11d
-	movl	128-128(%r8),%edi
-	movl	160-128(%r8),%ebp
-	movl	192-128(%r8),%r10d
-	movl	224-128(%r8),%r11d
-	jmp	.Lenc_loop_compact
-.align	16
-.Lenc_loop_compact:
-	xorl	0(%r15),%eax
-	xorl	4(%r15),%ebx
-	xorl	8(%r15),%ecx
-	xorl	12(%r15),%edx
-	leaq	16(%r15),%r15
-	movzbl	%al,%r10d
-	movzbl	%bl,%r11d
-	movzbl	%cl,%r12d
-	movzbl	%dl,%r8d
-	movzbl	%bh,%esi
-	movzbl	%ch,%edi
-	shrl	$16,%ecx
-	movzbl	%dh,%ebp
-	movzbl	(%r14,%r10,1),%r10d
-	movzbl	(%r14,%r11,1),%r11d
-	movzbl	(%r14,%r12,1),%r12d
-	movzbl	(%r14,%r8,1),%r8d
-
-	movzbl	(%r14,%rsi,1),%r9d
-	movzbl	%ah,%esi
-	movzbl	(%r14,%rdi,1),%r13d
-	movzbl	%cl,%edi
-	movzbl	(%r14,%rbp,1),%ebp
-	movzbl	(%r14,%rsi,1),%esi
-
-	shll	$8,%r9d
-	shrl	$16,%edx
-	shll	$8,%r13d
-	xorl	%r9d,%r10d
-	shrl	$16,%eax
-	movzbl	%dl,%r9d
-	shrl	$16,%ebx
-	xorl	%r13d,%r11d
-	shll	$8,%ebp
-	movzbl	%al,%r13d
-	movzbl	(%r14,%rdi,1),%edi
-	xorl	%ebp,%r12d
-
-	shll	$8,%esi
-	movzbl	%bl,%ebp
-	shll	$16,%edi
-	xorl	%esi,%r8d
-	movzbl	(%r14,%r9,1),%r9d
-	movzbl	%dh,%esi
-	movzbl	(%r14,%r13,1),%r13d
-	xorl	%edi,%r10d
-
-	shrl	$8,%ecx
-	movzbl	%ah,%edi
-	shll	$16,%r9d
-	shrl	$8,%ebx
-	shll	$16,%r13d
-	xorl	%r9d,%r11d
-	movzbl	(%r14,%rbp,1),%ebp
-	movzbl	(%r14,%rsi,1),%esi
-	movzbl	(%r14,%rdi,1),%edi
-	movzbl	(%r14,%rcx,1),%edx
-	movzbl	(%r14,%rbx,1),%ecx
-
-	shll	$16,%ebp
-	xorl	%r13d,%r12d
-	shll	$24,%esi
-	xorl	%ebp,%r8d
-	shll	$24,%edi
-	xorl	%esi,%r10d
-	shll	$24,%edx
-	xorl	%edi,%r11d
-	shll	$24,%ecx
-	movl	%r10d,%eax
-	movl	%r11d,%ebx
-	xorl	%r12d,%ecx
-	xorl	%r8d,%edx
-	cmpq	16(%rsp),%r15
-	je	.Lenc_compact_done
-	movl	$0x80808080,%r10d
-	movl	$0x80808080,%r11d
-	andl	%eax,%r10d
-	andl	%ebx,%r11d
-	movl	%r10d,%esi
-	movl	%r11d,%edi
-	shrl	$7,%r10d
-	leal	(%rax,%rax,1),%r8d
-	shrl	$7,%r11d
-	leal	(%rbx,%rbx,1),%r9d
-	subl	%r10d,%esi
-	subl	%r11d,%edi
-	andl	$0xfefefefe,%r8d
-	andl	$0xfefefefe,%r9d
-	andl	$0x1b1b1b1b,%esi
-	andl	$0x1b1b1b1b,%edi
-	movl	%eax,%r10d
-	movl	%ebx,%r11d
-	xorl	%esi,%r8d
-	xorl	%edi,%r9d
-
-	xorl	%r8d,%eax
-	xorl	%r9d,%ebx
-	movl	$0x80808080,%r12d
-	roll	$24,%eax
-	movl	$0x80808080,%ebp
-	roll	$24,%ebx
-	andl	%ecx,%r12d
-	andl	%edx,%ebp
-	xorl	%r8d,%eax
-	xorl	%r9d,%ebx
-	movl	%r12d,%esi
-	rorl	$16,%r10d
-	movl	%ebp,%edi
-	rorl	$16,%r11d
-	leal	(%rcx,%rcx,1),%r8d
-	shrl	$7,%r12d
-	xorl	%r10d,%eax
-	shrl	$7,%ebp
-	xorl	%r11d,%ebx
-	rorl	$8,%r10d
-	leal	(%rdx,%rdx,1),%r9d
-	rorl	$8,%r11d
-	subl	%r12d,%esi
-	subl	%ebp,%edi
-	xorl	%r10d,%eax
-	xorl	%r11d,%ebx
-
-	andl	$0xfefefefe,%r8d
-	andl	$0xfefefefe,%r9d
-	andl	$0x1b1b1b1b,%esi
-	andl	$0x1b1b1b1b,%edi
-	movl	%ecx,%r12d
-	movl	%edx,%ebp
-	xorl	%esi,%r8d
-	xorl	%edi,%r9d
-
-	rorl	$16,%r12d
-	xorl	%r8d,%ecx
-	rorl	$16,%ebp
-	xorl	%r9d,%edx
-	roll	$24,%ecx
-	movl	0(%r14),%esi
-	roll	$24,%edx
-	xorl	%r8d,%ecx
-	movl	64(%r14),%edi
-	xorl	%r9d,%edx
-	movl	128(%r14),%r8d
-	xorl	%r12d,%ecx
-	rorl	$8,%r12d
-	xorl	%ebp,%edx
-	rorl	$8,%ebp
-	xorl	%r12d,%ecx
-	movl	192(%r14),%r9d
-	xorl	%ebp,%edx
-	jmp	.Lenc_loop_compact
-.align	16
-.Lenc_compact_done:
-	xorl	0(%r15),%eax
-	xorl	4(%r15),%ebx
-	xorl	8(%r15),%ecx
-	xorl	12(%r15),%edx
-.byte	0xf3,0xc3
-.cfi_endproc	
-.size	_x86_64_AES_encrypt_compact,.-_x86_64_AES_encrypt_compact
-.globl	AES_encrypt
-.type	AES_encrypt,@function
-.align	16
-.globl	asm_AES_encrypt
-.hidden	asm_AES_encrypt
-asm_AES_encrypt:
-AES_encrypt:
-.cfi_startproc	
-	movq	%rsp,%rax
-.cfi_def_cfa_register	%rax
-	pushq	%rbx
-.cfi_offset	%rbx,-16
-	pushq	%rbp
-.cfi_offset	%rbp,-24
-	pushq	%r12
-.cfi_offset	%r12,-32
-	pushq	%r13
-.cfi_offset	%r13,-40
-	pushq	%r14
-.cfi_offset	%r14,-48
-	pushq	%r15
-.cfi_offset	%r15,-56
-
-
-	leaq	-63(%rdx),%rcx
-	andq	$-64,%rsp
-	subq	%rsp,%rcx
-	negq	%rcx
-	andq	$0x3c0,%rcx
-	subq	%rcx,%rsp
-	subq	$32,%rsp
-
-	movq	%rsi,16(%rsp)
-	movq	%rax,24(%rsp)
-.cfi_escape	0x0f,0x05,0x77,0x18,0x06,0x23,0x08
-.Lenc_prologue:
-
-	movq	%rdx,%r15
-	movl	240(%r15),%r13d
-
-	movl	0(%rdi),%eax
-	movl	4(%rdi),%ebx
-	movl	8(%rdi),%ecx
-	movl	12(%rdi),%edx
-
-	shll	$4,%r13d
-	leaq	(%r15,%r13,1),%rbp
-	movq	%r15,(%rsp)
-	movq	%rbp,8(%rsp)
-
-
-	leaq	.LAES_Te+2048(%rip),%r14
-	leaq	768(%rsp),%rbp
-	subq	%r14,%rbp
-	andq	$0x300,%rbp
-	leaq	(%r14,%rbp,1),%r14
-
-	call	_x86_64_AES_encrypt_compact
-
-	movq	16(%rsp),%r9
-	movq	24(%rsp),%rsi
-.cfi_def_cfa	%rsi,8
-	movl	%eax,0(%r9)
-	movl	%ebx,4(%r9)
-	movl	%ecx,8(%r9)
-	movl	%edx,12(%r9)
-
-	movq	-48(%rsi),%r15
-.cfi_restore	%r15
-	movq	-40(%rsi),%r14
-.cfi_restore	%r14
-	movq	-32(%rsi),%r13
-.cfi_restore	%r13
-	movq	-24(%rsi),%r12
-.cfi_restore	%r12
-	movq	-16(%rsi),%rbp
-.cfi_restore	%rbp
-	movq	-8(%rsi),%rbx
-.cfi_restore	%rbx
-	leaq	(%rsi),%rsp
-.cfi_def_cfa_register	%rsp
-.Lenc_epilogue:
-	.byte	0xf3,0xc3
-.cfi_endproc	
-.size	AES_encrypt,.-AES_encrypt
-.type	_x86_64_AES_decrypt,@function
-.align	16
-_x86_64_AES_decrypt:
-	xorl	0(%r15),%eax
-	xorl	4(%r15),%ebx
-	xorl	8(%r15),%ecx
-	xorl	12(%r15),%edx
-
-	movl	240(%r15),%r13d
-	subl	$1,%r13d
-	jmp	.Ldec_loop
-.align	16
-.Ldec_loop:
-
-	movzbl	%al,%esi
-	movzbl	%bl,%edi
-	movzbl	%cl,%ebp
-	movl	0(%r14,%rsi,8),%r10d
-	movl	0(%r14,%rdi,8),%r11d
-	movl	0(%r14,%rbp,8),%r12d
-
-	movzbl	%dh,%esi
-	movzbl	%ah,%edi
-	movzbl	%dl,%ebp
-	xorl	3(%r14,%rsi,8),%r10d
-	xorl	3(%r14,%rdi,8),%r11d
-	movl	0(%r14,%rbp,8),%r8d
-
-	movzbl	%bh,%esi
-	shrl	$16,%eax
-	movzbl	%ch,%ebp
-	xorl	3(%r14,%rsi,8),%r12d
-	shrl	$16,%edx
-	xorl	3(%r14,%rbp,8),%r8d
-
-	shrl	$16,%ebx
-	leaq	16(%r15),%r15
-	shrl	$16,%ecx
-
-	movzbl	%cl,%esi
-	movzbl	%dl,%edi
-	movzbl	%al,%ebp
-	xorl	2(%r14,%rsi,8),%r10d
-	xorl	2(%r14,%rdi,8),%r11d
-	xorl	2(%r14,%rbp,8),%r12d
-
-	movzbl	%bh,%esi
-	movzbl	%ch,%edi
-	movzbl	%bl,%ebp
-	xorl	1(%r14,%rsi,8),%r10d
-	xorl	1(%r14,%rdi,8),%r11d
-	xorl	2(%r14,%rbp,8),%r8d
-
-	movzbl	%dh,%esi
-	movl	12(%r15),%edx
-	movzbl	%ah,%ebp
-	xorl	1(%r14,%rsi,8),%r12d
-	movl	0(%r15),%eax
-	xorl	1(%r14,%rbp,8),%r8d
-
-	xorl	%r10d,%eax
-	movl	4(%r15),%ebx
-	movl	8(%r15),%ecx
-	xorl	%r12d,%ecx
-	xorl	%r11d,%ebx
-	xorl	%r8d,%edx
-	subl	$1,%r13d
-	jnz	.Ldec_loop
-	leaq	2048(%r14),%r14
-	movzbl	%al,%esi
-	movzbl	%bl,%edi
-	movzbl	%cl,%ebp
-	movzbl	(%r14,%rsi,1),%r10d
-	movzbl	(%r14,%rdi,1),%r11d
-	movzbl	(%r14,%rbp,1),%r12d
-
-	movzbl	%dl,%esi
-	movzbl	%dh,%edi
-	movzbl	%ah,%ebp
-	movzbl	(%r14,%rsi,1),%r8d
-	movzbl	(%r14,%rdi,1),%edi
-	movzbl	(%r14,%rbp,1),%ebp
-
-	shll	$8,%edi
-	shll	$8,%ebp
-
-	xorl	%edi,%r10d
-	xorl	%ebp,%r11d
-	shrl	$16,%edx
-
-	movzbl	%bh,%esi
-	movzbl	%ch,%edi
-	shrl	$16,%eax
-	movzbl	(%r14,%rsi,1),%esi
-	movzbl	(%r14,%rdi,1),%edi
-
-	shll	$8,%esi
-	shll	$8,%edi
-	shrl	$16,%ebx
-	xorl	%esi,%r12d
-	xorl	%edi,%r8d
-	shrl	$16,%ecx
-
-	movzbl	%cl,%esi
-	movzbl	%dl,%edi
-	movzbl	%al,%ebp
-	movzbl	(%r14,%rsi,1),%esi
-	movzbl	(%r14,%rdi,1),%edi
-	movzbl	(%r14,%rbp,1),%ebp
-
-	shll	$16,%esi
-	shll	$16,%edi
-	shll	$16,%ebp
-
-	xorl	%esi,%r10d
-	xorl	%edi,%r11d
-	xorl	%ebp,%r12d
-
-	movzbl	%bl,%esi
-	movzbl	%bh,%edi
-	movzbl	%ch,%ebp
-	movzbl	(%r14,%rsi,1),%esi
-	movzbl	(%r14,%rdi,1),%edi
-	movzbl	(%r14,%rbp,1),%ebp
-
-	shll	$16,%esi
-	shll	$24,%edi
-	shll	$24,%ebp
-
-	xorl	%esi,%r8d
-	xorl	%edi,%r10d
-	xorl	%ebp,%r11d
-
-	movzbl	%dh,%esi
-	movzbl	%ah,%edi
-	movl	16+12(%r15),%edx
-	movzbl	(%r14,%rsi,1),%esi
-	movzbl	(%r14,%rdi,1),%edi
-	movl	16+0(%r15),%eax
-
-	shll	$24,%esi
-	shll	$24,%edi
-
-	xorl	%esi,%r12d
-	xorl	%edi,%r8d
-
-	movl	16+4(%r15),%ebx
-	movl	16+8(%r15),%ecx
-	leaq	-2048(%r14),%r14
-	xorl	%r10d,%eax
-	xorl	%r11d,%ebx
-	xorl	%r12d,%ecx
-	xorl	%r8d,%edx
-.byte	0xf3,0xc3
-.size	_x86_64_AES_decrypt,.-_x86_64_AES_decrypt
-.type	_x86_64_AES_decrypt_compact,@function
-.align	16
-_x86_64_AES_decrypt_compact:
-.cfi_startproc	
-	leaq	128(%r14),%r8
-	movl	0-128(%r8),%edi
-	movl	32-128(%r8),%ebp
-	movl	64-128(%r8),%r10d
-	movl	96-128(%r8),%r11d
-	movl	128-128(%r8),%edi
-	movl	160-128(%r8),%ebp
-	movl	192-128(%r8),%r10d
-	movl	224-128(%r8),%r11d
-	jmp	.Ldec_loop_compact
-
-.align	16
-.Ldec_loop_compact:
-	xorl	0(%r15),%eax
-	xorl	4(%r15),%ebx
-	xorl	8(%r15),%ecx
-	xorl	12(%r15),%edx
-	leaq	16(%r15),%r15
-	movzbl	%al,%r10d
-	movzbl	%bl,%r11d
-	movzbl	%cl,%r12d
-	movzbl	%dl,%r8d
-	movzbl	%dh,%esi
-	movzbl	%ah,%edi
-	shrl	$16,%edx
-	movzbl	%bh,%ebp
-	movzbl	(%r14,%r10,1),%r10d
-	movzbl	(%r14,%r11,1),%r11d
-	movzbl	(%r14,%r12,1),%r12d
-	movzbl	(%r14,%r8,1),%r8d
-
-	movzbl	(%r14,%rsi,1),%r9d
-	movzbl	%ch,%esi
-	movzbl	(%r14,%rdi,1),%r13d
-	movzbl	(%r14,%rbp,1),%ebp
-	movzbl	(%r14,%rsi,1),%esi
-
-	shrl	$16,%ecx
-	shll	$8,%r13d
-	shll	$8,%r9d
-	movzbl	%cl,%edi
-	shrl	$16,%eax
-	xorl	%r9d,%r10d
-	shrl	$16,%ebx
-	movzbl	%dl,%r9d
-
-	shll	$8,%ebp
-	xorl	%r13d,%r11d
-	shll	$8,%esi
-	movzbl	%al,%r13d
-	movzbl	(%r14,%rdi,1),%edi
-	xorl	%ebp,%r12d
-	movzbl	%bl,%ebp
-
-	shll	$16,%edi
-	xorl	%esi,%r8d
-	movzbl	(%r14,%r9,1),%r9d
-	movzbl	%bh,%esi
-	movzbl	(%r14,%rbp,1),%ebp
-	xorl	%edi,%r10d
-	movzbl	(%r14,%r13,1),%r13d
-	movzbl	%ch,%edi
-
-	shll	$16,%ebp
-	shll	$16,%r9d
-	shll	$16,%r13d
-	xorl	%ebp,%r8d
-	movzbl	%dh,%ebp
-	xorl	%r9d,%r11d
-	shrl	$8,%eax
-	xorl	%r13d,%r12d
-
-	movzbl	(%r14,%rsi,1),%esi
-	movzbl	(%r14,%rdi,1),%ebx
-	movzbl	(%r14,%rbp,1),%ecx
-	movzbl	(%r14,%rax,1),%edx
-
-	movl	%r10d,%eax
-	shll	$24,%esi
-	shll	$24,%ebx
-	shll	$24,%ecx
-	xorl	%esi,%eax
-	shll	$24,%edx
-	xorl	%r11d,%ebx
-	xorl	%r12d,%ecx
-	xorl	%r8d,%edx
-	cmpq	16(%rsp),%r15
-	je	.Ldec_compact_done
-
-	movq	256+0(%r14),%rsi
-	shlq	$32,%rbx
-	shlq	$32,%rdx
-	movq	256+8(%r14),%rdi
-	orq	%rbx,%rax
-	orq	%rdx,%rcx
-	movq	256+16(%r14),%rbp
-	movq	%rsi,%r9
-	movq	%rsi,%r12
-	andq	%rax,%r9
-	andq	%rcx,%r12
-	movq	%r9,%rbx
-	movq	%r12,%rdx
-	shrq	$7,%r9
-	leaq	(%rax,%rax,1),%r8
-	shrq	$7,%r12
-	leaq	(%rcx,%rcx,1),%r11
-	subq	%r9,%rbx
-	subq	%r12,%rdx
-	andq	%rdi,%r8
-	andq	%rdi,%r11
-	andq	%rbp,%rbx
-	andq	%rbp,%rdx
-	xorq	%rbx,%r8
-	xorq	%rdx,%r11
-	movq	%rsi,%r10
-	movq	%rsi,%r13
-
-	andq	%r8,%r10
-	andq	%r11,%r13
-	movq	%r10,%rbx
-	movq	%r13,%rdx
-	shrq	$7,%r10
-	leaq	(%r8,%r8,1),%r9
-	shrq	$7,%r13
-	leaq	(%r11,%r11,1),%r12
-	subq	%r10,%rbx
-	subq	%r13,%rdx
-	andq	%rdi,%r9
-	andq	%rdi,%r12
-	andq	%rbp,%rbx
-	andq	%rbp,%rdx
-	xorq	%rbx,%r9
-	xorq	%rdx,%r12
-	movq	%rsi,%r10
-	movq	%rsi,%r13
-
-	andq	%r9,%r10
-	andq	%r12,%r13
-	movq	%r10,%rbx
-	movq	%r13,%rdx
-	shrq	$7,%r10
-	xorq	%rax,%r8
-	shrq	$7,%r13
-	xorq	%rcx,%r11
-	subq	%r10,%rbx
-	subq	%r13,%rdx
-	leaq	(%r9,%r9,1),%r10
-	leaq	(%r12,%r12,1),%r13
-	xorq	%rax,%r9
-	xorq	%rcx,%r12
-	andq	%rdi,%r10
-	andq	%rdi,%r13
-	andq	%rbp,%rbx
-	andq	%rbp,%rdx
-	xorq	%rbx,%r10
-	xorq	%rdx,%r13
-
-	xorq	%r10,%rax
-	xorq	%r13,%rcx
-	xorq	%r10,%r8
-	xorq	%r13,%r11
-	movq	%rax,%rbx
-	movq	%rcx,%rdx
-	xorq	%r10,%r9
-	shrq	$32,%rbx
-	xorq	%r13,%r12
-	shrq	$32,%rdx
-	xorq	%r8,%r10
-	roll	$8,%eax
-	xorq	%r11,%r13
-	roll	$8,%ecx
-	xorq	%r9,%r10
-	roll	$8,%ebx
-	xorq	%r12,%r13
-
-	roll	$8,%edx
-	xorl	%r10d,%eax
-	shrq	$32,%r10
-	xorl	%r13d,%ecx
-	shrq	$32,%r13
-	xorl	%r10d,%ebx
-	xorl	%r13d,%edx
-
-	movq	%r8,%r10
-	roll	$24,%r8d
-	movq	%r11,%r13
-	roll	$24,%r11d
-	shrq	$32,%r10
-	xorl	%r8d,%eax
-	shrq	$32,%r13
-	xorl	%r11d,%ecx
-	roll	$24,%r10d
-	movq	%r9,%r8
-	roll	$24,%r13d
-	movq	%r12,%r11
-	shrq	$32,%r8
-	xorl	%r10d,%ebx
-	shrq	$32,%r11
-	xorl	%r13d,%edx
-
-	movq	0(%r14),%rsi
-	roll	$16,%r9d
-	movq	64(%r14),%rdi
-	roll	$16,%r12d
-	movq	128(%r14),%rbp
-	roll	$16,%r8d
-	movq	192(%r14),%r10
-	xorl	%r9d,%eax
-	roll	$16,%r11d
-	xorl	%r12d,%ecx
-	movq	256(%r14),%r13
-	xorl	%r8d,%ebx
-	xorl	%r11d,%edx
-	jmp	.Ldec_loop_compact
-.align	16
-.Ldec_compact_done:
-	xorl	0(%r15),%eax
-	xorl	4(%r15),%ebx
-	xorl	8(%r15),%ecx
-	xorl	12(%r15),%edx
-.byte	0xf3,0xc3
-.cfi_endproc	
-.size	_x86_64_AES_decrypt_compact,.-_x86_64_AES_decrypt_compact
-.globl	AES_decrypt
-.type	AES_decrypt,@function
-.align	16
-.globl	asm_AES_decrypt
-.hidden	asm_AES_decrypt
-asm_AES_decrypt:
-AES_decrypt:
-.cfi_startproc	
-	movq	%rsp,%rax
-.cfi_def_cfa_register	%rax
-	pushq	%rbx
-.cfi_offset	%rbx,-16
-	pushq	%rbp
-.cfi_offset	%rbp,-24
-	pushq	%r12
-.cfi_offset	%r12,-32
-	pushq	%r13
-.cfi_offset	%r13,-40
-	pushq	%r14
-.cfi_offset	%r14,-48
-	pushq	%r15
-.cfi_offset	%r15,-56
-
-
-	leaq	-63(%rdx),%rcx
-	andq	$-64,%rsp
-	subq	%rsp,%rcx
-	negq	%rcx
-	andq	$0x3c0,%rcx
-	subq	%rcx,%rsp
-	subq	$32,%rsp
-
-	movq	%rsi,16(%rsp)
-	movq	%rax,24(%rsp)
-.cfi_escape	0x0f,0x05,0x77,0x18,0x06,0x23,0x08
-.Ldec_prologue:
-
-	movq	%rdx,%r15
-	movl	240(%r15),%r13d
-
-	movl	0(%rdi),%eax
-	movl	4(%rdi),%ebx
-	movl	8(%rdi),%ecx
-	movl	12(%rdi),%edx
-
-	shll	$4,%r13d
-	leaq	(%r15,%r13,1),%rbp
-	movq	%r15,(%rsp)
-	movq	%rbp,8(%rsp)
-
-
-	leaq	.LAES_Td+2048(%rip),%r14
-	leaq	768(%rsp),%rbp
-	subq	%r14,%rbp
-	andq	$0x300,%rbp
-	leaq	(%r14,%rbp,1),%r14
-	shrq	$3,%rbp
-	addq	%rbp,%r14
-
-	call	_x86_64_AES_decrypt_compact
-
-	movq	16(%rsp),%r9
-	movq	24(%rsp),%rsi
-.cfi_def_cfa	%rsi,8
-	movl	%eax,0(%r9)
-	movl	%ebx,4(%r9)
-	movl	%ecx,8(%r9)
-	movl	%edx,12(%r9)
-
-	movq	-48(%rsi),%r15
-.cfi_restore	%r15
-	movq	-40(%rsi),%r14
-.cfi_restore	%r14
-	movq	-32(%rsi),%r13
-.cfi_restore	%r13
-	movq	-24(%rsi),%r12
-.cfi_restore	%r12
-	movq	-16(%rsi),%rbp
-.cfi_restore	%rbp
-	movq	-8(%rsi),%rbx
-.cfi_restore	%rbx
-	leaq	(%rsi),%rsp
-.cfi_def_cfa_register	%rsp
-.Ldec_epilogue:
-	.byte	0xf3,0xc3
-.cfi_endproc	
-.size	AES_decrypt,.-AES_decrypt
-.globl	AES_set_encrypt_key
-.type	AES_set_encrypt_key,@function
-.align	16
-AES_set_encrypt_key:
-.cfi_startproc	
-	pushq	%rbx
-.cfi_adjust_cfa_offset	8
-.cfi_offset	%rbx,-16
-	pushq	%rbp
-.cfi_adjust_cfa_offset	8
-.cfi_offset	%rbp,-24
-	pushq	%r12
-.cfi_adjust_cfa_offset	8
-.cfi_offset	%r12,-32
-	pushq	%r13
-.cfi_adjust_cfa_offset	8
-.cfi_offset	%r13,-40
-	pushq	%r14
-.cfi_adjust_cfa_offset	8
-.cfi_offset	%r14,-48
-	pushq	%r15
-.cfi_adjust_cfa_offset	8
-.cfi_offset	%r15,-56
-	subq	$8,%rsp
-.cfi_adjust_cfa_offset	8
-.Lenc_key_prologue:
-
-	call	_x86_64_AES_set_encrypt_key
-
-	movq	40(%rsp),%rbp
-.cfi_restore	%rbp
-	movq	48(%rsp),%rbx
-.cfi_restore	%rbx
-	addq	$56,%rsp
-.cfi_adjust_cfa_offset	-56
-.Lenc_key_epilogue:
-	.byte	0xf3,0xc3
-.cfi_endproc	
-.size	AES_set_encrypt_key,.-AES_set_encrypt_key
-
-.type	_x86_64_AES_set_encrypt_key,@function
-.align	16
-_x86_64_AES_set_encrypt_key:
-.cfi_startproc	
-	movl	%esi,%ecx
-	movq	%rdi,%rsi
-	movq	%rdx,%rdi
-
-	testq	$-1,%rsi
-	jz	.Lbadpointer
-	testq	$-1,%rdi
-	jz	.Lbadpointer
-
-	leaq	.LAES_Te(%rip),%rbp
-	leaq	2048+128(%rbp),%rbp
-
-
-	movl	0-128(%rbp),%eax
-	movl	32-128(%rbp),%ebx
-	movl	64-128(%rbp),%r8d
-	movl	96-128(%rbp),%edx
-	movl	128-128(%rbp),%eax
-	movl	160-128(%rbp),%ebx
-	movl	192-128(%rbp),%r8d
-	movl	224-128(%rbp),%edx
-
-	cmpl	$128,%ecx
-	je	.L10rounds
-	cmpl	$192,%ecx
-	je	.L12rounds
-	cmpl	$256,%ecx
-	je	.L14rounds
-	movq	$-2,%rax
-	jmp	.Lexit
-
-.L10rounds:
-	movq	0(%rsi),%rax
-	movq	8(%rsi),%rdx
-	movq	%rax,0(%rdi)
-	movq	%rdx,8(%rdi)
-
-	shrq	$32,%rdx
-	xorl	%ecx,%ecx
-	jmp	.L10shortcut
-.align	4
-.L10loop:
-	movl	0(%rdi),%eax
-	movl	12(%rdi),%edx
-.L10shortcut:
-	movzbl	%dl,%esi
-	movzbl	-128(%rbp,%rsi,1),%ebx
-	movzbl	%dh,%esi
-	shll	$24,%ebx
-	xorl	%ebx,%eax
-
-	movzbl	-128(%rbp,%rsi,1),%ebx
-	shrl	$16,%edx
-	movzbl	%dl,%esi
-	xorl	%ebx,%eax
-
-	movzbl	-128(%rbp,%rsi,1),%ebx
-	movzbl	%dh,%esi
-	shll	$8,%ebx
-	xorl	%ebx,%eax
-
-	movzbl	-128(%rbp,%rsi,1),%ebx
-	shll	$16,%ebx
-	xorl	%ebx,%eax
-
-	xorl	1024-128(%rbp,%rcx,4),%eax
-	movl	%eax,16(%rdi)
-	xorl	4(%rdi),%eax
-	movl	%eax,20(%rdi)
-	xorl	8(%rdi),%eax
-	movl	%eax,24(%rdi)
-	xorl	12(%rdi),%eax
-	movl	%eax,28(%rdi)
-	addl	$1,%ecx
-	leaq	16(%rdi),%rdi
-	cmpl	$10,%ecx
-	jl	.L10loop
-
-	movl	$10,80(%rdi)
-	xorq	%rax,%rax
-	jmp	.Lexit
-
-.L12rounds:
-	movq	0(%rsi),%rax
-	movq	8(%rsi),%rbx
-	movq	16(%rsi),%rdx
-	movq	%rax,0(%rdi)
-	movq	%rbx,8(%rdi)
-	movq	%rdx,16(%rdi)
-
-	shrq	$32,%rdx
-	xorl	%ecx,%ecx
-	jmp	.L12shortcut
-.align	4
-.L12loop:
-	movl	0(%rdi),%eax
-	movl	20(%rdi),%edx
-.L12shortcut:
-	movzbl	%dl,%esi
-	movzbl	-128(%rbp,%rsi,1),%ebx
-	movzbl	%dh,%esi
-	shll	$24,%ebx
-	xorl	%ebx,%eax
-
-	movzbl	-128(%rbp,%rsi,1),%ebx
-	shrl	$16,%edx
-	movzbl	%dl,%esi
-	xorl	%ebx,%eax
-
-	movzbl	-128(%rbp,%rsi,1),%ebx
-	movzbl	%dh,%esi
-	shll	$8,%ebx
-	xorl	%ebx,%eax
-
-	movzbl	-128(%rbp,%rsi,1),%ebx
-	shll	$16,%ebx
-	xorl	%ebx,%eax
-
-	xorl	1024-128(%rbp,%rcx,4),%eax
-	movl	%eax,24(%rdi)
-	xorl	4(%rdi),%eax
-	movl	%eax,28(%rdi)
-	xorl	8(%rdi),%eax
-	movl	%eax,32(%rdi)
-	xorl	12(%rdi),%eax
-	movl	%eax,36(%rdi)
-
-	cmpl	$7,%ecx
-	je	.L12break
-	addl	$1,%ecx
-
-	xorl	16(%rdi),%eax
-	movl	%eax,40(%rdi)
-	xorl	20(%rdi),%eax
-	movl	%eax,44(%rdi)
-
-	leaq	24(%rdi),%rdi
-	jmp	.L12loop
-.L12break:
-	movl	$12,72(%rdi)
-	xorq	%rax,%rax
-	jmp	.Lexit
-
-.L14rounds:
-	movq	0(%rsi),%rax
-	movq	8(%rsi),%rbx
-	movq	16(%rsi),%rcx
-	movq	24(%rsi),%rdx
-	movq	%rax,0(%rdi)
-	movq	%rbx,8(%rdi)
-	movq	%rcx,16(%rdi)
-	movq	%rdx,24(%rdi)
-
-	shrq	$32,%rdx
-	xorl	%ecx,%ecx
-	jmp	.L14shortcut
-.align	4
-.L14loop:
-	movl	0(%rdi),%eax
-	movl	28(%rdi),%edx
-.L14shortcut:
-	movzbl	%dl,%esi
-	movzbl	-128(%rbp,%rsi,1),%ebx
-	movzbl	%dh,%esi
-	shll	$24,%ebx
-	xorl	%ebx,%eax
-
-	movzbl	-128(%rbp,%rsi,1),%ebx
-	shrl	$16,%edx
-	movzbl	%dl,%esi
-	xorl	%ebx,%eax
-
-	movzbl	-128(%rbp,%rsi,1),%ebx
-	movzbl	%dh,%esi
-	shll	$8,%ebx
-	xorl	%ebx,%eax
-
-	movzbl	-128(%rbp,%rsi,1),%ebx
-	shll	$16,%ebx
-	xorl	%ebx,%eax
-
-	xorl	1024-128(%rbp,%rcx,4),%eax
-	movl	%eax,32(%rdi)
-	xorl	4(%rdi),%eax
-	movl	%eax,36(%rdi)
-	xorl	8(%rdi),%eax
-	movl	%eax,40(%rdi)
-	xorl	12(%rdi),%eax
-	movl	%eax,44(%rdi)
-
-	cmpl	$6,%ecx
-	je	.L14break
-	addl	$1,%ecx
-
-	movl	%eax,%edx
-	movl	16(%rdi),%eax
-	movzbl	%dl,%esi
-	movzbl	-128(%rbp,%rsi,1),%ebx
-	movzbl	%dh,%esi
-	xorl	%ebx,%eax
-
-	movzbl	-128(%rbp,%rsi,1),%ebx
-	shrl	$16,%edx
-	shll	$8,%ebx
-	movzbl	%dl,%esi
-	xorl	%ebx,%eax
-
-	movzbl	-128(%rbp,%rsi,1),%ebx
-	movzbl	%dh,%esi
-	shll	$16,%ebx
-	xorl	%ebx,%eax
-
-	movzbl	-128(%rbp,%rsi,1),%ebx
-	shll	$24,%ebx
-	xorl	%ebx,%eax
-
-	movl	%eax,48(%rdi)
-	xorl	20(%rdi),%eax
-	movl	%eax,52(%rdi)
-	xorl	24(%rdi),%eax
-	movl	%eax,56(%rdi)
-	xorl	28(%rdi),%eax
-	movl	%eax,60(%rdi)
-
-	leaq	32(%rdi),%rdi
-	jmp	.L14loop
-.L14break:
-	movl	$14,48(%rdi)
-	xorq	%rax,%rax
-	jmp	.Lexit
-
-.Lbadpointer:
-	movq	$-1,%rax
-.Lexit:
-.byte	0xf3,0xc3
-.cfi_endproc	
-.size	_x86_64_AES_set_encrypt_key,.-_x86_64_AES_set_encrypt_key
-.globl	AES_set_decrypt_key
-.type	AES_set_decrypt_key,@function
-.align	16
-AES_set_decrypt_key:
-.cfi_startproc	
-	pushq	%rbx
-.cfi_adjust_cfa_offset	8
-.cfi_offset	%rbx,-16
-	pushq	%rbp
-.cfi_adjust_cfa_offset	8
-.cfi_offset	%rbp,-24
-	pushq	%r12
-.cfi_adjust_cfa_offset	8
-.cfi_offset	%r12,-32
-	pushq	%r13
-.cfi_adjust_cfa_offset	8
-.cfi_offset	%r13,-40
-	pushq	%r14
-.cfi_adjust_cfa_offset	8
-.cfi_offset	%r14,-48
-	pushq	%r15
-.cfi_adjust_cfa_offset	8
-.cfi_offset	%r15,-56
-	pushq	%rdx
-.cfi_adjust_cfa_offset	8
-.Ldec_key_prologue:
-
-	call	_x86_64_AES_set_encrypt_key
-	movq	(%rsp),%r8
-	cmpl	$0,%eax
-	jne	.Labort
-
-	movl	240(%r8),%r14d
-	xorq	%rdi,%rdi
-	leaq	(%rdi,%r14,4),%rcx
-	movq	%r8,%rsi
-	leaq	(%r8,%rcx,4),%rdi
-.align	4
-.Linvert:
-	movq	0(%rsi),%rax
-	movq	8(%rsi),%rbx
-	movq	0(%rdi),%rcx
-	movq	8(%rdi),%rdx
-	movq	%rax,0(%rdi)
-	movq	%rbx,8(%rdi)
-	movq	%rcx,0(%rsi)
-	movq	%rdx,8(%rsi)
-	leaq	16(%rsi),%rsi
-	leaq	-16(%rdi),%rdi
-	cmpq	%rsi,%rdi
-	jne	.Linvert
-
-	leaq	.LAES_Te+2048+1024(%rip),%rax
-
-	movq	40(%rax),%rsi
-	movq	48(%rax),%rdi
-	movq	56(%rax),%rbp
-
-	movq	%r8,%r15
-	subl	$1,%r14d
-.align	4
-.Lpermute:
-	leaq	16(%r15),%r15
-	movq	0(%r15),%rax
-	movq	8(%r15),%rcx
-	movq	%rsi,%r9
-	movq	%rsi,%r12
-	andq	%rax,%r9
-	andq	%rcx,%r12
-	movq	%r9,%rbx
-	movq	%r12,%rdx
-	shrq	$7,%r9
-	leaq	(%rax,%rax,1),%r8
-	shrq	$7,%r12
-	leaq	(%rcx,%rcx,1),%r11
-	subq	%r9,%rbx
-	subq	%r12,%rdx
-	andq	%rdi,%r8
-	andq	%rdi,%r11
-	andq	%rbp,%rbx
-	andq	%rbp,%rdx
-	xorq	%rbx,%r8
-	xorq	%rdx,%r11
-	movq	%rsi,%r10
-	movq	%rsi,%r13
-
-	andq	%r8,%r10
-	andq	%r11,%r13
-	movq	%r10,%rbx
-	movq	%r13,%rdx
-	shrq	$7,%r10
-	leaq	(%r8,%r8,1),%r9
-	shrq	$7,%r13
-	leaq	(%r11,%r11,1),%r12
-	subq	%r10,%rbx
-	subq	%r13,%rdx
-	andq	%rdi,%r9
-	andq	%rdi,%r12
-	andq	%rbp,%rbx
-	andq	%rbp,%rdx
-	xorq	%rbx,%r9
-	xorq	%rdx,%r12
-	movq	%rsi,%r10
-	movq	%rsi,%r13
-
-	andq	%r9,%r10
-	andq	%r12,%r13
-	movq	%r10,%rbx
-	movq	%r13,%rdx
-	shrq	$7,%r10
-	xorq	%rax,%r8
-	shrq	$7,%r13
-	xorq	%rcx,%r11
-	subq	%r10,%rbx
-	subq	%r13,%rdx
-	leaq	(%r9,%r9,1),%r10
-	leaq	(%r12,%r12,1),%r13
-	xorq	%rax,%r9
-	xorq	%rcx,%r12
-	andq	%rdi,%r10
-	andq	%rdi,%r13
-	andq	%rbp,%rbx
-	andq	%rbp,%rdx
-	xorq	%rbx,%r10
-	xorq	%rdx,%r13
-
-	xorq	%r10,%rax
-	xorq	%r13,%rcx
-	xorq	%r10,%r8
-	xorq	%r13,%r11
-	movq	%rax,%rbx
-	movq	%rcx,%rdx
-	xorq	%r10,%r9
-	shrq	$32,%rbx
-	xorq	%r13,%r12
-	shrq	$32,%rdx
-	xorq	%r8,%r10
-	roll	$8,%eax
-	xorq	%r11,%r13
-	roll	$8,%ecx
-	xorq	%r9,%r10
-	roll	$8,%ebx
-	xorq	%r12,%r13
-
-	roll	$8,%edx
-	xorl	%r10d,%eax
-	shrq	$32,%r10
-	xorl	%r13d,%ecx
-	shrq	$32,%r13
-	xorl	%r10d,%ebx
-	xorl	%r13d,%edx
-
-	movq	%r8,%r10
-	roll	$24,%r8d
-	movq	%r11,%r13
-	roll	$24,%r11d
-	shrq	$32,%r10
-	xorl	%r8d,%eax
-	shrq	$32,%r13
-	xorl	%r11d,%ecx
-	roll	$24,%r10d
-	movq	%r9,%r8
-	roll	$24,%r13d
-	movq	%r12,%r11
-	shrq	$32,%r8
-	xorl	%r10d,%ebx
-	shrq	$32,%r11
-	xorl	%r13d,%edx
-
-
-	roll	$16,%r9d
-
-	roll	$16,%r12d
-
-	roll	$16,%r8d
-
-	xorl	%r9d,%eax
-	roll	$16,%r11d
-	xorl	%r12d,%ecx
-
-	xorl	%r8d,%ebx
-	xorl	%r11d,%edx
-	movl	%eax,0(%r15)
-	movl	%ebx,4(%r15)
-	movl	%ecx,8(%r15)
-	movl	%edx,12(%r15)
-	subl	$1,%r14d
-	jnz	.Lpermute
-
-	xorq	%rax,%rax
-.Labort:
-	movq	8(%rsp),%r15
-.cfi_restore	%r15
-	movq	16(%rsp),%r14
-.cfi_restore	%r14
-	movq	24(%rsp),%r13
-.cfi_restore	%r13
-	movq	32(%rsp),%r12
-.cfi_restore	%r12
-	movq	40(%rsp),%rbp
-.cfi_restore	%rbp
-	movq	48(%rsp),%rbx
-.cfi_restore	%rbx
-	addq	$56,%rsp
-.cfi_adjust_cfa_offset	-56
-.Ldec_key_epilogue:
-	.byte	0xf3,0xc3
-.cfi_endproc	
-.size	AES_set_decrypt_key,.-AES_set_decrypt_key
-.globl	AES_cbc_encrypt
-.type	AES_cbc_encrypt,@function
-.align	16
-
-.globl	asm_AES_cbc_encrypt
-.hidden	asm_AES_cbc_encrypt
-asm_AES_cbc_encrypt:
-AES_cbc_encrypt:
-.cfi_startproc	
-	cmpq	$0,%rdx
-	je	.Lcbc_epilogue
-	pushfq
-
-
-.cfi_adjust_cfa_offset	8
-	pushq	%rbx
-.cfi_adjust_cfa_offset	8
-.cfi_offset	%rbx,-24
-	pushq	%rbp
-.cfi_adjust_cfa_offset	8
-.cfi_offset	%rbp,-32
-	pushq	%r12
-.cfi_adjust_cfa_offset	8
-.cfi_offset	%r12,-40
-	pushq	%r13
-.cfi_adjust_cfa_offset	8
-.cfi_offset	%r13,-48
-	pushq	%r14
-.cfi_adjust_cfa_offset	8
-.cfi_offset	%r14,-56
-	pushq	%r15
-.cfi_adjust_cfa_offset	8
-.cfi_offset	%r15,-64
-.Lcbc_prologue:
-
-	cld
-	movl	%r9d,%r9d
-
-	leaq	.LAES_Te(%rip),%r14
-	leaq	.LAES_Td(%rip),%r10
-	cmpq	$0,%r9
-	cmoveq	%r10,%r14
-
-.cfi_remember_state	
-	movl	OPENSSL_ia32cap_P(%rip),%r10d
-	cmpq	$512,%rdx
-	jb	.Lcbc_slow_prologue
-	testq	$15,%rdx
-	jnz	.Lcbc_slow_prologue
-	btl	$28,%r10d
-	jc	.Lcbc_slow_prologue
-
-
-	leaq	-88-248(%rsp),%r15
-	andq	$-64,%r15
-
-
-	movq	%r14,%r10
-	leaq	2304(%r14),%r11
-	movq	%r15,%r12
-	andq	$0xFFF,%r10
-	andq	$0xFFF,%r11
-	andq	$0xFFF,%r12
-
-	cmpq	%r11,%r12
-	jb	.Lcbc_te_break_out
-	subq	%r11,%r12
-	subq	%r12,%r15
-	jmp	.Lcbc_te_ok
-.Lcbc_te_break_out:
-	subq	%r10,%r12
-	andq	$0xFFF,%r12
-	addq	$320,%r12
-	subq	%r12,%r15
-.align	4
-.Lcbc_te_ok:
-
-	xchgq	%rsp,%r15
-.cfi_def_cfa_register	%r15
-
-	movq	%r15,16(%rsp)
-.cfi_escape	0x0f,0x05,0x77,0x10,0x06,0x23,0x40
-.Lcbc_fast_body:
-	movq	%rdi,24(%rsp)
-	movq	%rsi,32(%rsp)
-	movq	%rdx,40(%rsp)
-	movq	%rcx,48(%rsp)
-	movq	%r8,56(%rsp)
-	movl	$0,80+240(%rsp)
-	movq	%r8,%rbp
-	movq	%r9,%rbx
-	movq	%rsi,%r9
-	movq	%rdi,%r8
-	movq	%rcx,%r15
-
-	movl	240(%r15),%eax
-
-	movq	%r15,%r10
-	subq	%r14,%r10
-	andq	$0xfff,%r10
-	cmpq	$2304,%r10
-	jb	.Lcbc_do_ecopy
-	cmpq	$4096-248,%r10
-	jb	.Lcbc_skip_ecopy
-.align	4
-.Lcbc_do_ecopy:
-	movq	%r15,%rsi
-	leaq	80(%rsp),%rdi
-	leaq	80(%rsp),%r15
-	movl	$30,%ecx
-.long	0x90A548F3
-	movl	%eax,(%rdi)
-.Lcbc_skip_ecopy:
-	movq	%r15,0(%rsp)
-
-	movl	$18,%ecx
-.align	4
-.Lcbc_prefetch_te:
-	movq	0(%r14),%r10
-	movq	32(%r14),%r11
-	movq	64(%r14),%r12
-	movq	96(%r14),%r13
-	leaq	128(%r14),%r14
-	subl	$1,%ecx
-	jnz	.Lcbc_prefetch_te
-	leaq	-2304(%r14),%r14
-
-	cmpq	$0,%rbx
-	je	.LFAST_DECRYPT
-
-
-	movl	0(%rbp),%eax
-	movl	4(%rbp),%ebx
-	movl	8(%rbp),%ecx
-	movl	12(%rbp),%edx
-
-.align	4
-.Lcbc_fast_enc_loop:
-	xorl	0(%r8),%eax
-	xorl	4(%r8),%ebx
-	xorl	8(%r8),%ecx
-	xorl	12(%r8),%edx
-	movq	0(%rsp),%r15
-	movq	%r8,24(%rsp)
-
-	call	_x86_64_AES_encrypt
-
-	movq	24(%rsp),%r8
-	movq	40(%rsp),%r10
-	movl	%eax,0(%r9)
-	movl	%ebx,4(%r9)
-	movl	%ecx,8(%r9)
-	movl	%edx,12(%r9)
-
-	leaq	16(%r8),%r8
-	leaq	16(%r9),%r9
-	subq	$16,%r10
-	testq	$-16,%r10
-	movq	%r10,40(%rsp)
-	jnz	.Lcbc_fast_enc_loop
-	movq	56(%rsp),%rbp
-	movl	%eax,0(%rbp)
-	movl	%ebx,4(%rbp)
-	movl	%ecx,8(%rbp)
-	movl	%edx,12(%rbp)
-
-	jmp	.Lcbc_fast_cleanup
-
-
-.align	16
-.LFAST_DECRYPT:
-	cmpq	%r8,%r9
-	je	.Lcbc_fast_dec_in_place
-
-	movq	%rbp,64(%rsp)
-.align	4
-.Lcbc_fast_dec_loop:
-	movl	0(%r8),%eax
-	movl	4(%r8),%ebx
-	movl	8(%r8),%ecx
-	movl	12(%r8),%edx
-	movq	0(%rsp),%r15
-	movq	%r8,24(%rsp)
-
-	call	_x86_64_AES_decrypt
-
-	movq	64(%rsp),%rbp
-	movq	24(%rsp),%r8
-	movq	40(%rsp),%r10
-	xorl	0(%rbp),%eax
-	xorl	4(%rbp),%ebx
-	xorl	8(%rbp),%ecx
-	xorl	12(%rbp),%edx
-	movq	%r8,%rbp
-
-	subq	$16,%r10
-	movq	%r10,40(%rsp)
-	movq	%rbp,64(%rsp)
-
-	movl	%eax,0(%r9)
-	movl	%ebx,4(%r9)
-	movl	%ecx,8(%r9)
-	movl	%edx,12(%r9)
-
-	leaq	16(%r8),%r8
-	leaq	16(%r9),%r9
-	jnz	.Lcbc_fast_dec_loop
-	movq	56(%rsp),%r12
-	movq	0(%rbp),%r10
-	movq	8(%rbp),%r11
-	movq	%r10,0(%r12)
-	movq	%r11,8(%r12)
-	jmp	.Lcbc_fast_cleanup
-
-.align	16
-.Lcbc_fast_dec_in_place:
-	movq	0(%rbp),%r10
-	movq	8(%rbp),%r11
-	movq	%r10,0+64(%rsp)
-	movq	%r11,8+64(%rsp)
-.align	4
-.Lcbc_fast_dec_in_place_loop:
-	movl	0(%r8),%eax
-	movl	4(%r8),%ebx
-	movl	8(%r8),%ecx
-	movl	12(%r8),%edx
-	movq	0(%rsp),%r15
-	movq	%r8,24(%rsp)
-
-	call	_x86_64_AES_decrypt
-
-	movq	24(%rsp),%r8
-	movq	40(%rsp),%r10
-	xorl	0+64(%rsp),%eax
-	xorl	4+64(%rsp),%ebx
-	xorl	8+64(%rsp),%ecx
-	xorl	12+64(%rsp),%edx
-
-	movq	0(%r8),%r11
-	movq	8(%r8),%r12
-	subq	$16,%r10
-	jz	.Lcbc_fast_dec_in_place_done
-
-	movq	%r11,0+64(%rsp)
-	movq	%r12,8+64(%rsp)
-
-	movl	%eax,0(%r9)
-	movl	%ebx,4(%r9)
-	movl	%ecx,8(%r9)
-	movl	%edx,12(%r9)
-
-	leaq	16(%r8),%r8
-	leaq	16(%r9),%r9
-	movq	%r10,40(%rsp)
-	jmp	.Lcbc_fast_dec_in_place_loop
-.Lcbc_fast_dec_in_place_done:
-	movq	56(%rsp),%rdi
-	movq	%r11,0(%rdi)
-	movq	%r12,8(%rdi)
-
-	movl	%eax,0(%r9)
-	movl	%ebx,4(%r9)
-	movl	%ecx,8(%r9)
-	movl	%edx,12(%r9)
-
-.align	4
-.Lcbc_fast_cleanup:
-	cmpl	$0,80+240(%rsp)
-	leaq	80(%rsp),%rdi
-	je	.Lcbc_exit
-	movl	$30,%ecx
-	xorq	%rax,%rax
-.long	0x90AB48F3
-
-	jmp	.Lcbc_exit
-
-
-.align	16
-.Lcbc_slow_prologue:
-.cfi_restore_state	
-
-	leaq	-88(%rsp),%rbp
-	andq	$-64,%rbp
-
-	leaq	-88-63(%rcx),%r10
-	subq	%rbp,%r10
-	negq	%r10
-	andq	$0x3c0,%r10
-	subq	%r10,%rbp
-
-	xchgq	%rsp,%rbp
-.cfi_def_cfa_register	%rbp
-
-	movq	%rbp,16(%rsp)
-.cfi_escape	0x0f,0x05,0x77,0x10,0x06,0x23,0x40
-.Lcbc_slow_body:
-
-
-
-
-	movq	%r8,56(%rsp)
-	movq	%r8,%rbp
-	movq	%r9,%rbx
-	movq	%rsi,%r9
-	movq	%rdi,%r8
-	movq	%rcx,%r15
-	movq	%rdx,%r10
-
-	movl	240(%r15),%eax
-	movq	%r15,0(%rsp)
-	shll	$4,%eax
-	leaq	(%r15,%rax,1),%rax
-	movq	%rax,8(%rsp)
-
-
-	leaq	2048(%r14),%r14
-	leaq	768-8(%rsp),%rax
-	subq	%r14,%rax
-	andq	$0x300,%rax
-	leaq	(%r14,%rax,1),%r14
-
-	cmpq	$0,%rbx
-	je	.LSLOW_DECRYPT
-
-
-	testq	$-16,%r10
-	movl	0(%rbp),%eax
-	movl	4(%rbp),%ebx
-	movl	8(%rbp),%ecx
-	movl	12(%rbp),%edx
-	jz	.Lcbc_slow_enc_tail
-
-.align	4
-.Lcbc_slow_enc_loop:
-	xorl	0(%r8),%eax
-	xorl	4(%r8),%ebx
-	xorl	8(%r8),%ecx
-	xorl	12(%r8),%edx
-	movq	0(%rsp),%r15
-	movq	%r8,24(%rsp)
-	movq	%r9,32(%rsp)
-	movq	%r10,40(%rsp)
-
-	call	_x86_64_AES_encrypt_compact
-
-	movq	24(%rsp),%r8
-	movq	32(%rsp),%r9
-	movq	40(%rsp),%r10
-	movl	%eax,0(%r9)
-	movl	%ebx,4(%r9)
-	movl	%ecx,8(%r9)
-	movl	%edx,12(%r9)
-
-	leaq	16(%r8),%r8
-	leaq	16(%r9),%r9
-	subq	$16,%r10
-	testq	$-16,%r10
-	jnz	.Lcbc_slow_enc_loop
-	testq	$15,%r10
-	jnz	.Lcbc_slow_enc_tail
-	movq	56(%rsp),%rbp
-	movl	%eax,0(%rbp)
-	movl	%ebx,4(%rbp)
-	movl	%ecx,8(%rbp)
-	movl	%edx,12(%rbp)
-
-	jmp	.Lcbc_exit
-
-.align	4
-.Lcbc_slow_enc_tail:
-	movq	%rax,%r11
-	movq	%rcx,%r12
-	movq	%r10,%rcx
-	movq	%r8,%rsi
-	movq	%r9,%rdi
-.long	0x9066A4F3
-	movq	$16,%rcx
-	subq	%r10,%rcx
-	xorq	%rax,%rax
-.long	0x9066AAF3
-	movq	%r9,%r8
-	movq	$16,%r10
-	movq	%r11,%rax
-	movq	%r12,%rcx
-	jmp	.Lcbc_slow_enc_loop
-
-.align	16
-.LSLOW_DECRYPT:
-	shrq	$3,%rax
-	addq	%rax,%r14
-
-	movq	0(%rbp),%r11
-	movq	8(%rbp),%r12
-	movq	%r11,0+64(%rsp)
-	movq	%r12,8+64(%rsp)
-
-.align	4
-.Lcbc_slow_dec_loop:
-	movl	0(%r8),%eax
-	movl	4(%r8),%ebx
-	movl	8(%r8),%ecx
-	movl	12(%r8),%edx
-	movq	0(%rsp),%r15
-	movq	%r8,24(%rsp)
-	movq	%r9,32(%rsp)
-	movq	%r10,40(%rsp)
-
-	call	_x86_64_AES_decrypt_compact
-
-	movq	24(%rsp),%r8
-	movq	32(%rsp),%r9
-	movq	40(%rsp),%r10
-	xorl	0+64(%rsp),%eax
-	xorl	4+64(%rsp),%ebx
-	xorl	8+64(%rsp),%ecx
-	xorl	12+64(%rsp),%edx
-
-	movq	0(%r8),%r11
-	movq	8(%r8),%r12
-	subq	$16,%r10
-	jc	.Lcbc_slow_dec_partial
-	jz	.Lcbc_slow_dec_done
-
-	movq	%r11,0+64(%rsp)
-	movq	%r12,8+64(%rsp)
-
-	movl	%eax,0(%r9)
-	movl	%ebx,4(%r9)
-	movl	%ecx,8(%r9)
-	movl	%edx,12(%r9)
-
-	leaq	16(%r8),%r8
-	leaq	16(%r9),%r9
-	jmp	.Lcbc_slow_dec_loop
-.Lcbc_slow_dec_done:
-	movq	56(%rsp),%rdi
-	movq	%r11,0(%rdi)
-	movq	%r12,8(%rdi)
-
-	movl	%eax,0(%r9)
-	movl	%ebx,4(%r9)
-	movl	%ecx,8(%r9)
-	movl	%edx,12(%r9)
-
-	jmp	.Lcbc_exit
-
-.align	4
-.Lcbc_slow_dec_partial:
-	movq	56(%rsp),%rdi
-	movq	%r11,0(%rdi)
-	movq	%r12,8(%rdi)
-
-	movl	%eax,0+64(%rsp)
-	movl	%ebx,4+64(%rsp)
-	movl	%ecx,8+64(%rsp)
-	movl	%edx,12+64(%rsp)
-
-	movq	%r9,%rdi
-	leaq	64(%rsp),%rsi
-	leaq	16(%r10),%rcx
-.long	0x9066A4F3
-	jmp	.Lcbc_exit
-
-.align	16
-.Lcbc_exit:
-	movq	16(%rsp),%rsi
-.cfi_def_cfa	%rsi,64
-	movq	(%rsi),%r15
-.cfi_restore	%r15
-	movq	8(%rsi),%r14
-.cfi_restore	%r14
-	movq	16(%rsi),%r13
-.cfi_restore	%r13
-	movq	24(%rsi),%r12
-.cfi_restore	%r12
-	movq	32(%rsi),%rbp
-.cfi_restore	%rbp
-	movq	40(%rsi),%rbx
-.cfi_restore	%rbx
-	leaq	48(%rsi),%rsp
-.cfi_def_cfa	%rsp,16
-.Lcbc_popfq:
-	popfq
-
-
-.cfi_adjust_cfa_offset	-8
-.Lcbc_epilogue:
-	.byte	0xf3,0xc3
-.cfi_endproc	
-.size	AES_cbc_encrypt,.-AES_cbc_encrypt
-.align	64
-.LAES_Te:
-.long	0xa56363c6,0xa56363c6
-.long	0x847c7cf8,0x847c7cf8
-.long	0x997777ee,0x997777ee
-.long	0x8d7b7bf6,0x8d7b7bf6
-.long	0x0df2f2ff,0x0df2f2ff
-.long	0xbd6b6bd6,0xbd6b6bd6
-.long	0xb16f6fde,0xb16f6fde
-.long	0x54c5c591,0x54c5c591
-.long	0x50303060,0x50303060
-.long	0x03010102,0x03010102
-.long	0xa96767ce,0xa96767ce
-.long	0x7d2b2b56,0x7d2b2b56
-.long	0x19fefee7,0x19fefee7
-.long	0x62d7d7b5,0x62d7d7b5
-.long	0xe6abab4d,0xe6abab4d
-.long	0x9a7676ec,0x9a7676ec
-.long	0x45caca8f,0x45caca8f
-.long	0x9d82821f,0x9d82821f
-.long	0x40c9c989,0x40c9c989
-.long	0x877d7dfa,0x877d7dfa
-.long	0x15fafaef,0x15fafaef
-.long	0xeb5959b2,0xeb5959b2
-.long	0xc947478e,0xc947478e
-.long	0x0bf0f0fb,0x0bf0f0fb
-.long	0xecadad41,0xecadad41
-.long	0x67d4d4b3,0x67d4d4b3
-.long	0xfda2a25f,0xfda2a25f
-.long	0xeaafaf45,0xeaafaf45
-.long	0xbf9c9c23,0xbf9c9c23
-.long	0xf7a4a453,0xf7a4a453
-.long	0x967272e4,0x967272e4
-.long	0x5bc0c09b,0x5bc0c09b
-.long	0xc2b7b775,0xc2b7b775
-.long	0x1cfdfde1,0x1cfdfde1
-.long	0xae93933d,0xae93933d
-.long	0x6a26264c,0x6a26264c
-.long	0x5a36366c,0x5a36366c
-.long	0x413f3f7e,0x413f3f7e
-.long	0x02f7f7f5,0x02f7f7f5
-.long	0x4fcccc83,0x4fcccc83
-.long	0x5c343468,0x5c343468
-.long	0xf4a5a551,0xf4a5a551
-.long	0x34e5e5d1,0x34e5e5d1
-.long	0x08f1f1f9,0x08f1f1f9
-.long	0x937171e2,0x937171e2
-.long	0x73d8d8ab,0x73d8d8ab
-.long	0x53313162,0x53313162
-.long	0x3f15152a,0x3f15152a
-.long	0x0c040408,0x0c040408
-.long	0x52c7c795,0x52c7c795
-.long	0x65232346,0x65232346
-.long	0x5ec3c39d,0x5ec3c39d
-.long	0x28181830,0x28181830
-.long	0xa1969637,0xa1969637
-.long	0x0f05050a,0x0f05050a
-.long	0xb59a9a2f,0xb59a9a2f
-.long	0x0907070e,0x0907070e
-.long	0x36121224,0x36121224
-.long	0x9b80801b,0x9b80801b
-.long	0x3de2e2df,0x3de2e2df
-.long	0x26ebebcd,0x26ebebcd
-.long	0x6927274e,0x6927274e
-.long	0xcdb2b27f,0xcdb2b27f
-.long	0x9f7575ea,0x9f7575ea
-.long	0x1b090912,0x1b090912
-.long	0x9e83831d,0x9e83831d
-.long	0x742c2c58,0x742c2c58
-.long	0x2e1a1a34,0x2e1a1a34
-.long	0x2d1b1b36,0x2d1b1b36
-.long	0xb26e6edc,0xb26e6edc
-.long	0xee5a5ab4,0xee5a5ab4
-.long	0xfba0a05b,0xfba0a05b
-.long	0xf65252a4,0xf65252a4
-.long	0x4d3b3b76,0x4d3b3b76
-.long	0x61d6d6b7,0x61d6d6b7
-.long	0xceb3b37d,0xceb3b37d
-.long	0x7b292952,0x7b292952
-.long	0x3ee3e3dd,0x3ee3e3dd
-.long	0x712f2f5e,0x712f2f5e
-.long	0x97848413,0x97848413
-.long	0xf55353a6,0xf55353a6
-.long	0x68d1d1b9,0x68d1d1b9
-.long	0x00000000,0x00000000
-.long	0x2cededc1,0x2cededc1
-.long	0x60202040,0x60202040
-.long	0x1ffcfce3,0x1ffcfce3
-.long	0xc8b1b179,0xc8b1b179
-.long	0xed5b5bb6,0xed5b5bb6
-.long	0xbe6a6ad4,0xbe6a6ad4
-.long	0x46cbcb8d,0x46cbcb8d
-.long	0xd9bebe67,0xd9bebe67
-.long	0x4b393972,0x4b393972
-.long	0xde4a4a94,0xde4a4a94
-.long	0xd44c4c98,0xd44c4c98
-.long	0xe85858b0,0xe85858b0
-.long	0x4acfcf85,0x4acfcf85
-.long	0x6bd0d0bb,0x6bd0d0bb
-.long	0x2aefefc5,0x2aefefc5
-.long	0xe5aaaa4f,0xe5aaaa4f
-.long	0x16fbfbed,0x16fbfbed
-.long	0xc5434386,0xc5434386
-.long	0xd74d4d9a,0xd74d4d9a
-.long	0x55333366,0x55333366
-.long	0x94858511,0x94858511
-.long	0xcf45458a,0xcf45458a
-.long	0x10f9f9e9,0x10f9f9e9
-.long	0x06020204,0x06020204
-.long	0x817f7ffe,0x817f7ffe
-.long	0xf05050a0,0xf05050a0
-.long	0x443c3c78,0x443c3c78
-.long	0xba9f9f25,0xba9f9f25
-.long	0xe3a8a84b,0xe3a8a84b
-.long	0xf35151a2,0xf35151a2
-.long	0xfea3a35d,0xfea3a35d
-.long	0xc0404080,0xc0404080
-.long	0x8a8f8f05,0x8a8f8f05
-.long	0xad92923f,0xad92923f
-.long	0xbc9d9d21,0xbc9d9d21
-.long	0x48383870,0x48383870
-.long	0x04f5f5f1,0x04f5f5f1
-.long	0xdfbcbc63,0xdfbcbc63
-.long	0xc1b6b677,0xc1b6b677
-.long	0x75dadaaf,0x75dadaaf
-.long	0x63212142,0x63212142
-.long	0x30101020,0x30101020
-.long	0x1affffe5,0x1affffe5
-.long	0x0ef3f3fd,0x0ef3f3fd
-.long	0x6dd2d2bf,0x6dd2d2bf
-.long	0x4ccdcd81,0x4ccdcd81
-.long	0x140c0c18,0x140c0c18
-.long	0x35131326,0x35131326
-.long	0x2fececc3,0x2fececc3
-.long	0xe15f5fbe,0xe15f5fbe
-.long	0xa2979735,0xa2979735
-.long	0xcc444488,0xcc444488
-.long	0x3917172e,0x3917172e
-.long	0x57c4c493,0x57c4c493
-.long	0xf2a7a755,0xf2a7a755
-.long	0x827e7efc,0x827e7efc
-.long	0x473d3d7a,0x473d3d7a
-.long	0xac6464c8,0xac6464c8
-.long	0xe75d5dba,0xe75d5dba
-.long	0x2b191932,0x2b191932
-.long	0x957373e6,0x957373e6
-.long	0xa06060c0,0xa06060c0
-.long	0x98818119,0x98818119
-.long	0xd14f4f9e,0xd14f4f9e
-.long	0x7fdcdca3,0x7fdcdca3
-.long	0x66222244,0x66222244
-.long	0x7e2a2a54,0x7e2a2a54
-.long	0xab90903b,0xab90903b
-.long	0x8388880b,0x8388880b
-.long	0xca46468c,0xca46468c
-.long	0x29eeeec7,0x29eeeec7
-.long	0xd3b8b86b,0xd3b8b86b
-.long	0x3c141428,0x3c141428
-.long	0x79dedea7,0x79dedea7
-.long	0xe25e5ebc,0xe25e5ebc
-.long	0x1d0b0b16,0x1d0b0b16
-.long	0x76dbdbad,0x76dbdbad
-.long	0x3be0e0db,0x3be0e0db
-.long	0x56323264,0x56323264
-.long	0x4e3a3a74,0x4e3a3a74
-.long	0x1e0a0a14,0x1e0a0a14
-.long	0xdb494992,0xdb494992
-.long	0x0a06060c,0x0a06060c
-.long	0x6c242448,0x6c242448
-.long	0xe45c5cb8,0xe45c5cb8
-.long	0x5dc2c29f,0x5dc2c29f
-.long	0x6ed3d3bd,0x6ed3d3bd
-.long	0xefacac43,0xefacac43
-.long	0xa66262c4,0xa66262c4
-.long	0xa8919139,0xa8919139
-.long	0xa4959531,0xa4959531
-.long	0x37e4e4d3,0x37e4e4d3
-.long	0x8b7979f2,0x8b7979f2
-.long	0x32e7e7d5,0x32e7e7d5
-.long	0x43c8c88b,0x43c8c88b
-.long	0x5937376e,0x5937376e
-.long	0xb76d6dda,0xb76d6dda
-.long	0x8c8d8d01,0x8c8d8d01
-.long	0x64d5d5b1,0x64d5d5b1
-.long	0xd24e4e9c,0xd24e4e9c
-.long	0xe0a9a949,0xe0a9a949
-.long	0xb46c6cd8,0xb46c6cd8
-.long	0xfa5656ac,0xfa5656ac
-.long	0x07f4f4f3,0x07f4f4f3
-.long	0x25eaeacf,0x25eaeacf
-.long	0xaf6565ca,0xaf6565ca
-.long	0x8e7a7af4,0x8e7a7af4
-.long	0xe9aeae47,0xe9aeae47
-.long	0x18080810,0x18080810
-.long	0xd5baba6f,0xd5baba6f
-.long	0x887878f0,0x887878f0
-.long	0x6f25254a,0x6f25254a
-.long	0x722e2e5c,0x722e2e5c
-.long	0x241c1c38,0x241c1c38
-.long	0xf1a6a657,0xf1a6a657
-.long	0xc7b4b473,0xc7b4b473
-.long	0x51c6c697,0x51c6c697
-.long	0x23e8e8cb,0x23e8e8cb
-.long	0x7cdddda1,0x7cdddda1
-.long	0x9c7474e8,0x9c7474e8
-.long	0x211f1f3e,0x211f1f3e
-.long	0xdd4b4b96,0xdd4b4b96
-.long	0xdcbdbd61,0xdcbdbd61
-.long	0x868b8b0d,0x868b8b0d
-.long	0x858a8a0f,0x858a8a0f
-.long	0x907070e0,0x907070e0
-.long	0x423e3e7c,0x423e3e7c
-.long	0xc4b5b571,0xc4b5b571
-.long	0xaa6666cc,0xaa6666cc
-.long	0xd8484890,0xd8484890
-.long	0x05030306,0x05030306
-.long	0x01f6f6f7,0x01f6f6f7
-.long	0x120e0e1c,0x120e0e1c
-.long	0xa36161c2,0xa36161c2
-.long	0x5f35356a,0x5f35356a
-.long	0xf95757ae,0xf95757ae
-.long	0xd0b9b969,0xd0b9b969
-.long	0x91868617,0x91868617
-.long	0x58c1c199,0x58c1c199
-.long	0x271d1d3a,0x271d1d3a
-.long	0xb99e9e27,0xb99e9e27
-.long	0x38e1e1d9,0x38e1e1d9
-.long	0x13f8f8eb,0x13f8f8eb
-.long	0xb398982b,0xb398982b
-.long	0x33111122,0x33111122
-.long	0xbb6969d2,0xbb6969d2
-.long	0x70d9d9a9,0x70d9d9a9
-.long	0x898e8e07,0x898e8e07
-.long	0xa7949433,0xa7949433
-.long	0xb69b9b2d,0xb69b9b2d
-.long	0x221e1e3c,0x221e1e3c
-.long	0x92878715,0x92878715
-.long	0x20e9e9c9,0x20e9e9c9
-.long	0x49cece87,0x49cece87
-.long	0xff5555aa,0xff5555aa
-.long	0x78282850,0x78282850
-.long	0x7adfdfa5,0x7adfdfa5
-.long	0x8f8c8c03,0x8f8c8c03
-.long	0xf8a1a159,0xf8a1a159
-.long	0x80898909,0x80898909
-.long	0x170d0d1a,0x170d0d1a
-.long	0xdabfbf65,0xdabfbf65
-.long	0x31e6e6d7,0x31e6e6d7
-.long	0xc6424284,0xc6424284
-.long	0xb86868d0,0xb86868d0
-.long	0xc3414182,0xc3414182
-.long	0xb0999929,0xb0999929
-.long	0x772d2d5a,0x772d2d5a
-.long	0x110f0f1e,0x110f0f1e
-.long	0xcbb0b07b,0xcbb0b07b
-.long	0xfc5454a8,0xfc5454a8
-.long	0xd6bbbb6d,0xd6bbbb6d
-.long	0x3a16162c,0x3a16162c
-.byte	0x63,0x7c,0x77,0x7b,0xf2,0x6b,0x6f,0xc5
-.byte	0x30,0x01,0x67,0x2b,0xfe,0xd7,0xab,0x76
-.byte	0xca,0x82,0xc9,0x7d,0xfa,0x59,0x47,0xf0
-.byte	0xad,0xd4,0xa2,0xaf,0x9c,0xa4,0x72,0xc0
-.byte	0xb7,0xfd,0x93,0x26,0x36,0x3f,0xf7,0xcc
-.byte	0x34,0xa5,0xe5,0xf1,0x71,0xd8,0x31,0x15
-.byte	0x04,0xc7,0x23,0xc3,0x18,0x96,0x05,0x9a
-.byte	0x07,0x12,0x80,0xe2,0xeb,0x27,0xb2,0x75
-.byte	0x09,0x83,0x2c,0x1a,0x1b,0x6e,0x5a,0xa0
-.byte	0x52,0x3b,0xd6,0xb3,0x29,0xe3,0x2f,0x84
-.byte	0x53,0xd1,0x00,0xed,0x20,0xfc,0xb1,0x5b
-.byte	0x6a,0xcb,0xbe,0x39,0x4a,0x4c,0x58,0xcf
-.byte	0xd0,0xef,0xaa,0xfb,0x43,0x4d,0x33,0x85
-.byte	0x45,0xf9,0x02,0x7f,0x50,0x3c,0x9f,0xa8
-.byte	0x51,0xa3,0x40,0x8f,0x92,0x9d,0x38,0xf5
-.byte	0xbc,0xb6,0xda,0x21,0x10,0xff,0xf3,0xd2
-.byte	0xcd,0x0c,0x13,0xec,0x5f,0x97,0x44,0x17
-.byte	0xc4,0xa7,0x7e,0x3d,0x64,0x5d,0x19,0x73
-.byte	0x60,0x81,0x4f,0xdc,0x22,0x2a,0x90,0x88
-.byte	0x46,0xee,0xb8,0x14,0xde,0x5e,0x0b,0xdb
-.byte	0xe0,0x32,0x3a,0x0a,0x49,0x06,0x24,0x5c
-.byte	0xc2,0xd3,0xac,0x62,0x91,0x95,0xe4,0x79
-.byte	0xe7,0xc8,0x37,0x6d,0x8d,0xd5,0x4e,0xa9
-.byte	0x6c,0x56,0xf4,0xea,0x65,0x7a,0xae,0x08
-.byte	0xba,0x78,0x25,0x2e,0x1c,0xa6,0xb4,0xc6
-.byte	0xe8,0xdd,0x74,0x1f,0x4b,0xbd,0x8b,0x8a
-.byte	0x70,0x3e,0xb5,0x66,0x48,0x03,0xf6,0x0e
-.byte	0x61,0x35,0x57,0xb9,0x86,0xc1,0x1d,0x9e
-.byte	0xe1,0xf8,0x98,0x11,0x69,0xd9,0x8e,0x94
-.byte	0x9b,0x1e,0x87,0xe9,0xce,0x55,0x28,0xdf
-.byte	0x8c,0xa1,0x89,0x0d,0xbf,0xe6,0x42,0x68
-.byte	0x41,0x99,0x2d,0x0f,0xb0,0x54,0xbb,0x16
-.byte	0x63,0x7c,0x77,0x7b,0xf2,0x6b,0x6f,0xc5
-.byte	0x30,0x01,0x67,0x2b,0xfe,0xd7,0xab,0x76
-.byte	0xca,0x82,0xc9,0x7d,0xfa,0x59,0x47,0xf0
-.byte	0xad,0xd4,0xa2,0xaf,0x9c,0xa4,0x72,0xc0
-.byte	0xb7,0xfd,0x93,0x26,0x36,0x3f,0xf7,0xcc
-.byte	0x34,0xa5,0xe5,0xf1,0x71,0xd8,0x31,0x15
-.byte	0x04,0xc7,0x23,0xc3,0x18,0x96,0x05,0x9a
-.byte	0x07,0x12,0x80,0xe2,0xeb,0x27,0xb2,0x75
-.byte	0x09,0x83,0x2c,0x1a,0x1b,0x6e,0x5a,0xa0
-.byte	0x52,0x3b,0xd6,0xb3,0x29,0xe3,0x2f,0x84
-.byte	0x53,0xd1,0x00,0xed,0x20,0xfc,0xb1,0x5b
-.byte	0x6a,0xcb,0xbe,0x39,0x4a,0x4c,0x58,0xcf
-.byte	0xd0,0xef,0xaa,0xfb,0x43,0x4d,0x33,0x85
-.byte	0x45,0xf9,0x02,0x7f,0x50,0x3c,0x9f,0xa8
-.byte	0x51,0xa3,0x40,0x8f,0x92,0x9d,0x38,0xf5
-.byte	0xbc,0xb6,0xda,0x21,0x10,0xff,0xf3,0xd2
-.byte	0xcd,0x0c,0x13,0xec,0x5f,0x97,0x44,0x17
-.byte	0xc4,0xa7,0x7e,0x3d,0x64,0x5d,0x19,0x73
-.byte	0x60,0x81,0x4f,0xdc,0x22,0x2a,0x90,0x88
-.byte	0x46,0xee,0xb8,0x14,0xde,0x5e,0x0b,0xdb
-.byte	0xe0,0x32,0x3a,0x0a,0x49,0x06,0x24,0x5c
-.byte	0xc2,0xd3,0xac,0x62,0x91,0x95,0xe4,0x79
-.byte	0xe7,0xc8,0x37,0x6d,0x8d,0xd5,0x4e,0xa9
-.byte	0x6c,0x56,0xf4,0xea,0x65,0x7a,0xae,0x08
-.byte	0xba,0x78,0x25,0x2e,0x1c,0xa6,0xb4,0xc6
-.byte	0xe8,0xdd,0x74,0x1f,0x4b,0xbd,0x8b,0x8a
-.byte	0x70,0x3e,0xb5,0x66,0x48,0x03,0xf6,0x0e
-.byte	0x61,0x35,0x57,0xb9,0x86,0xc1,0x1d,0x9e
-.byte	0xe1,0xf8,0x98,0x11,0x69,0xd9,0x8e,0x94
-.byte	0x9b,0x1e,0x87,0xe9,0xce,0x55,0x28,0xdf
-.byte	0x8c,0xa1,0x89,0x0d,0xbf,0xe6,0x42,0x68
-.byte	0x41,0x99,0x2d,0x0f,0xb0,0x54,0xbb,0x16
-.byte	0x63,0x7c,0x77,0x7b,0xf2,0x6b,0x6f,0xc5
-.byte	0x30,0x01,0x67,0x2b,0xfe,0xd7,0xab,0x76
-.byte	0xca,0x82,0xc9,0x7d,0xfa,0x59,0x47,0xf0
-.byte	0xad,0xd4,0xa2,0xaf,0x9c,0xa4,0x72,0xc0
-.byte	0xb7,0xfd,0x93,0x26,0x36,0x3f,0xf7,0xcc
-.byte	0x34,0xa5,0xe5,0xf1,0x71,0xd8,0x31,0x15
-.byte	0x04,0xc7,0x23,0xc3,0x18,0x96,0x05,0x9a
-.byte	0x07,0x12,0x80,0xe2,0xeb,0x27,0xb2,0x75
-.byte	0x09,0x83,0x2c,0x1a,0x1b,0x6e,0x5a,0xa0
-.byte	0x52,0x3b,0xd6,0xb3,0x29,0xe3,0x2f,0x84
-.byte	0x53,0xd1,0x00,0xed,0x20,0xfc,0xb1,0x5b
-.byte	0x6a,0xcb,0xbe,0x39,0x4a,0x4c,0x58,0xcf
-.byte	0xd0,0xef,0xaa,0xfb,0x43,0x4d,0x33,0x85
-.byte	0x45,0xf9,0x02,0x7f,0x50,0x3c,0x9f,0xa8
-.byte	0x51,0xa3,0x40,0x8f,0x92,0x9d,0x38,0xf5
-.byte	0xbc,0xb6,0xda,0x21,0x10,0xff,0xf3,0xd2
-.byte	0xcd,0x0c,0x13,0xec,0x5f,0x97,0x44,0x17
-.byte	0xc4,0xa7,0x7e,0x3d,0x64,0x5d,0x19,0x73
-.byte	0x60,0x81,0x4f,0xdc,0x22,0x2a,0x90,0x88
-.byte	0x46,0xee,0xb8,0x14,0xde,0x5e,0x0b,0xdb
-.byte	0xe0,0x32,0x3a,0x0a,0x49,0x06,0x24,0x5c
-.byte	0xc2,0xd3,0xac,0x62,0x91,0x95,0xe4,0x79
-.byte	0xe7,0xc8,0x37,0x6d,0x8d,0xd5,0x4e,0xa9
-.byte	0x6c,0x56,0xf4,0xea,0x65,0x7a,0xae,0x08
-.byte	0xba,0x78,0x25,0x2e,0x1c,0xa6,0xb4,0xc6
-.byte	0xe8,0xdd,0x74,0x1f,0x4b,0xbd,0x8b,0x8a
-.byte	0x70,0x3e,0xb5,0x66,0x48,0x03,0xf6,0x0e
-.byte	0x61,0x35,0x57,0xb9,0x86,0xc1,0x1d,0x9e
-.byte	0xe1,0xf8,0x98,0x11,0x69,0xd9,0x8e,0x94
-.byte	0x9b,0x1e,0x87,0xe9,0xce,0x55,0x28,0xdf
-.byte	0x8c,0xa1,0x89,0x0d,0xbf,0xe6,0x42,0x68
-.byte	0x41,0x99,0x2d,0x0f,0xb0,0x54,0xbb,0x16
-.byte	0x63,0x7c,0x77,0x7b,0xf2,0x6b,0x6f,0xc5
-.byte	0x30,0x01,0x67,0x2b,0xfe,0xd7,0xab,0x76
-.byte	0xca,0x82,0xc9,0x7d,0xfa,0x59,0x47,0xf0
-.byte	0xad,0xd4,0xa2,0xaf,0x9c,0xa4,0x72,0xc0
-.byte	0xb7,0xfd,0x93,0x26,0x36,0x3f,0xf7,0xcc
-.byte	0x34,0xa5,0xe5,0xf1,0x71,0xd8,0x31,0x15
-.byte	0x04,0xc7,0x23,0xc3,0x18,0x96,0x05,0x9a
-.byte	0x07,0x12,0x80,0xe2,0xeb,0x27,0xb2,0x75
-.byte	0x09,0x83,0x2c,0x1a,0x1b,0x6e,0x5a,0xa0
-.byte	0x52,0x3b,0xd6,0xb3,0x29,0xe3,0x2f,0x84
-.byte	0x53,0xd1,0x00,0xed,0x20,0xfc,0xb1,0x5b
-.byte	0x6a,0xcb,0xbe,0x39,0x4a,0x4c,0x58,0xcf
-.byte	0xd0,0xef,0xaa,0xfb,0x43,0x4d,0x33,0x85
-.byte	0x45,0xf9,0x02,0x7f,0x50,0x3c,0x9f,0xa8
-.byte	0x51,0xa3,0x40,0x8f,0x92,0x9d,0x38,0xf5
-.byte	0xbc,0xb6,0xda,0x21,0x10,0xff,0xf3,0xd2
-.byte	0xcd,0x0c,0x13,0xec,0x5f,0x97,0x44,0x17
-.byte	0xc4,0xa7,0x7e,0x3d,0x64,0x5d,0x19,0x73
-.byte	0x60,0x81,0x4f,0xdc,0x22,0x2a,0x90,0x88
-.byte	0x46,0xee,0xb8,0x14,0xde,0x5e,0x0b,0xdb
-.byte	0xe0,0x32,0x3a,0x0a,0x49,0x06,0x24,0x5c
-.byte	0xc2,0xd3,0xac,0x62,0x91,0x95,0xe4,0x79
-.byte	0xe7,0xc8,0x37,0x6d,0x8d,0xd5,0x4e,0xa9
-.byte	0x6c,0x56,0xf4,0xea,0x65,0x7a,0xae,0x08
-.byte	0xba,0x78,0x25,0x2e,0x1c,0xa6,0xb4,0xc6
-.byte	0xe8,0xdd,0x74,0x1f,0x4b,0xbd,0x8b,0x8a
-.byte	0x70,0x3e,0xb5,0x66,0x48,0x03,0xf6,0x0e
-.byte	0x61,0x35,0x57,0xb9,0x86,0xc1,0x1d,0x9e
-.byte	0xe1,0xf8,0x98,0x11,0x69,0xd9,0x8e,0x94
-.byte	0x9b,0x1e,0x87,0xe9,0xce,0x55,0x28,0xdf
-.byte	0x8c,0xa1,0x89,0x0d,0xbf,0xe6,0x42,0x68
-.byte	0x41,0x99,0x2d,0x0f,0xb0,0x54,0xbb,0x16
-.long	0x00000001, 0x00000002, 0x00000004, 0x00000008
-.long	0x00000010, 0x00000020, 0x00000040, 0x00000080
-.long	0x0000001b, 0x00000036, 0x80808080, 0x80808080
-.long	0xfefefefe, 0xfefefefe, 0x1b1b1b1b, 0x1b1b1b1b
-.align	64
-.LAES_Td:
-.long	0x50a7f451,0x50a7f451
-.long	0x5365417e,0x5365417e
-.long	0xc3a4171a,0xc3a4171a
-.long	0x965e273a,0x965e273a
-.long	0xcb6bab3b,0xcb6bab3b
-.long	0xf1459d1f,0xf1459d1f
-.long	0xab58faac,0xab58faac
-.long	0x9303e34b,0x9303e34b
-.long	0x55fa3020,0x55fa3020
-.long	0xf66d76ad,0xf66d76ad
-.long	0x9176cc88,0x9176cc88
-.long	0x254c02f5,0x254c02f5
-.long	0xfcd7e54f,0xfcd7e54f
-.long	0xd7cb2ac5,0xd7cb2ac5
-.long	0x80443526,0x80443526
-.long	0x8fa362b5,0x8fa362b5
-.long	0x495ab1de,0x495ab1de
-.long	0x671bba25,0x671bba25
-.long	0x980eea45,0x980eea45
-.long	0xe1c0fe5d,0xe1c0fe5d
-.long	0x02752fc3,0x02752fc3
-.long	0x12f04c81,0x12f04c81
-.long	0xa397468d,0xa397468d
-.long	0xc6f9d36b,0xc6f9d36b
-.long	0xe75f8f03,0xe75f8f03
-.long	0x959c9215,0x959c9215
-.long	0xeb7a6dbf,0xeb7a6dbf
-.long	0xda595295,0xda595295
-.long	0x2d83bed4,0x2d83bed4
-.long	0xd3217458,0xd3217458
-.long	0x2969e049,0x2969e049
-.long	0x44c8c98e,0x44c8c98e
-.long	0x6a89c275,0x6a89c275
-.long	0x78798ef4,0x78798ef4
-.long	0x6b3e5899,0x6b3e5899
-.long	0xdd71b927,0xdd71b927
-.long	0xb64fe1be,0xb64fe1be
-.long	0x17ad88f0,0x17ad88f0
-.long	0x66ac20c9,0x66ac20c9
-.long	0xb43ace7d,0xb43ace7d
-.long	0x184adf63,0x184adf63
-.long	0x82311ae5,0x82311ae5
-.long	0x60335197,0x60335197
-.long	0x457f5362,0x457f5362
-.long	0xe07764b1,0xe07764b1
-.long	0x84ae6bbb,0x84ae6bbb
-.long	0x1ca081fe,0x1ca081fe
-.long	0x942b08f9,0x942b08f9
-.long	0x58684870,0x58684870
-.long	0x19fd458f,0x19fd458f
-.long	0x876cde94,0x876cde94
-.long	0xb7f87b52,0xb7f87b52
-.long	0x23d373ab,0x23d373ab
-.long	0xe2024b72,0xe2024b72
-.long	0x578f1fe3,0x578f1fe3
-.long	0x2aab5566,0x2aab5566
-.long	0x0728ebb2,0x0728ebb2
-.long	0x03c2b52f,0x03c2b52f
-.long	0x9a7bc586,0x9a7bc586
-.long	0xa50837d3,0xa50837d3
-.long	0xf2872830,0xf2872830
-.long	0xb2a5bf23,0xb2a5bf23
-.long	0xba6a0302,0xba6a0302
-.long	0x5c8216ed,0x5c8216ed
-.long	0x2b1ccf8a,0x2b1ccf8a
-.long	0x92b479a7,0x92b479a7
-.long	0xf0f207f3,0xf0f207f3
-.long	0xa1e2694e,0xa1e2694e
-.long	0xcdf4da65,0xcdf4da65
-.long	0xd5be0506,0xd5be0506
-.long	0x1f6234d1,0x1f6234d1
-.long	0x8afea6c4,0x8afea6c4
-.long	0x9d532e34,0x9d532e34
-.long	0xa055f3a2,0xa055f3a2
-.long	0x32e18a05,0x32e18a05
-.long	0x75ebf6a4,0x75ebf6a4
-.long	0x39ec830b,0x39ec830b
-.long	0xaaef6040,0xaaef6040
-.long	0x069f715e,0x069f715e
-.long	0x51106ebd,0x51106ebd
-.long	0xf98a213e,0xf98a213e
-.long	0x3d06dd96,0x3d06dd96
-.long	0xae053edd,0xae053edd
-.long	0x46bde64d,0x46bde64d
-.long	0xb58d5491,0xb58d5491
-.long	0x055dc471,0x055dc471
-.long	0x6fd40604,0x6fd40604
-.long	0xff155060,0xff155060
-.long	0x24fb9819,0x24fb9819
-.long	0x97e9bdd6,0x97e9bdd6
-.long	0xcc434089,0xcc434089
-.long	0x779ed967,0x779ed967
-.long	0xbd42e8b0,0xbd42e8b0
-.long	0x888b8907,0x888b8907
-.long	0x385b19e7,0x385b19e7
-.long	0xdbeec879,0xdbeec879
-.long	0x470a7ca1,0x470a7ca1
-.long	0xe90f427c,0xe90f427c
-.long	0xc91e84f8,0xc91e84f8
-.long	0x00000000,0x00000000
-.long	0x83868009,0x83868009
-.long	0x48ed2b32,0x48ed2b32
-.long	0xac70111e,0xac70111e
-.long	0x4e725a6c,0x4e725a6c
-.long	0xfbff0efd,0xfbff0efd
-.long	0x5638850f,0x5638850f
-.long	0x1ed5ae3d,0x1ed5ae3d
-.long	0x27392d36,0x27392d36
-.long	0x64d90f0a,0x64d90f0a
-.long	0x21a65c68,0x21a65c68
-.long	0xd1545b9b,0xd1545b9b
-.long	0x3a2e3624,0x3a2e3624
-.long	0xb1670a0c,0xb1670a0c
-.long	0x0fe75793,0x0fe75793
-.long	0xd296eeb4,0xd296eeb4
-.long	0x9e919b1b,0x9e919b1b
-.long	0x4fc5c080,0x4fc5c080
-.long	0xa220dc61,0xa220dc61
-.long	0x694b775a,0x694b775a
-.long	0x161a121c,0x161a121c
-.long	0x0aba93e2,0x0aba93e2
-.long	0xe52aa0c0,0xe52aa0c0
-.long	0x43e0223c,0x43e0223c
-.long	0x1d171b12,0x1d171b12
-.long	0x0b0d090e,0x0b0d090e
-.long	0xadc78bf2,0xadc78bf2
-.long	0xb9a8b62d,0xb9a8b62d
-.long	0xc8a91e14,0xc8a91e14
-.long	0x8519f157,0x8519f157
-.long	0x4c0775af,0x4c0775af
-.long	0xbbdd99ee,0xbbdd99ee
-.long	0xfd607fa3,0xfd607fa3
-.long	0x9f2601f7,0x9f2601f7
-.long	0xbcf5725c,0xbcf5725c
-.long	0xc53b6644,0xc53b6644
-.long	0x347efb5b,0x347efb5b
-.long	0x7629438b,0x7629438b
-.long	0xdcc623cb,0xdcc623cb
-.long	0x68fcedb6,0x68fcedb6
-.long	0x63f1e4b8,0x63f1e4b8
-.long	0xcadc31d7,0xcadc31d7
-.long	0x10856342,0x10856342
-.long	0x40229713,0x40229713
-.long	0x2011c684,0x2011c684
-.long	0x7d244a85,0x7d244a85
-.long	0xf83dbbd2,0xf83dbbd2
-.long	0x1132f9ae,0x1132f9ae
-.long	0x6da129c7,0x6da129c7
-.long	0x4b2f9e1d,0x4b2f9e1d
-.long	0xf330b2dc,0xf330b2dc
-.long	0xec52860d,0xec52860d
-.long	0xd0e3c177,0xd0e3c177
-.long	0x6c16b32b,0x6c16b32b
-.long	0x99b970a9,0x99b970a9
-.long	0xfa489411,0xfa489411
-.long	0x2264e947,0x2264e947
-.long	0xc48cfca8,0xc48cfca8
-.long	0x1a3ff0a0,0x1a3ff0a0
-.long	0xd82c7d56,0xd82c7d56
-.long	0xef903322,0xef903322
-.long	0xc74e4987,0xc74e4987
-.long	0xc1d138d9,0xc1d138d9
-.long	0xfea2ca8c,0xfea2ca8c
-.long	0x360bd498,0x360bd498
-.long	0xcf81f5a6,0xcf81f5a6
-.long	0x28de7aa5,0x28de7aa5
-.long	0x268eb7da,0x268eb7da
-.long	0xa4bfad3f,0xa4bfad3f
-.long	0xe49d3a2c,0xe49d3a2c
-.long	0x0d927850,0x0d927850
-.long	0x9bcc5f6a,0x9bcc5f6a
-.long	0x62467e54,0x62467e54
-.long	0xc2138df6,0xc2138df6
-.long	0xe8b8d890,0xe8b8d890
-.long	0x5ef7392e,0x5ef7392e
-.long	0xf5afc382,0xf5afc382
-.long	0xbe805d9f,0xbe805d9f
-.long	0x7c93d069,0x7c93d069
-.long	0xa92dd56f,0xa92dd56f
-.long	0xb31225cf,0xb31225cf
-.long	0x3b99acc8,0x3b99acc8
-.long	0xa77d1810,0xa77d1810
-.long	0x6e639ce8,0x6e639ce8
-.long	0x7bbb3bdb,0x7bbb3bdb
-.long	0x097826cd,0x097826cd
-.long	0xf418596e,0xf418596e
-.long	0x01b79aec,0x01b79aec
-.long	0xa89a4f83,0xa89a4f83
-.long	0x656e95e6,0x656e95e6
-.long	0x7ee6ffaa,0x7ee6ffaa
-.long	0x08cfbc21,0x08cfbc21
-.long	0xe6e815ef,0xe6e815ef
-.long	0xd99be7ba,0xd99be7ba
-.long	0xce366f4a,0xce366f4a
-.long	0xd4099fea,0xd4099fea
-.long	0xd67cb029,0xd67cb029
-.long	0xafb2a431,0xafb2a431
-.long	0x31233f2a,0x31233f2a
-.long	0x3094a5c6,0x3094a5c6
-.long	0xc066a235,0xc066a235
-.long	0x37bc4e74,0x37bc4e74
-.long	0xa6ca82fc,0xa6ca82fc
-.long	0xb0d090e0,0xb0d090e0
-.long	0x15d8a733,0x15d8a733
-.long	0x4a9804f1,0x4a9804f1
-.long	0xf7daec41,0xf7daec41
-.long	0x0e50cd7f,0x0e50cd7f
-.long	0x2ff69117,0x2ff69117
-.long	0x8dd64d76,0x8dd64d76
-.long	0x4db0ef43,0x4db0ef43
-.long	0x544daacc,0x544daacc
-.long	0xdf0496e4,0xdf0496e4
-.long	0xe3b5d19e,0xe3b5d19e
-.long	0x1b886a4c,0x1b886a4c
-.long	0xb81f2cc1,0xb81f2cc1
-.long	0x7f516546,0x7f516546
-.long	0x04ea5e9d,0x04ea5e9d
-.long	0x5d358c01,0x5d358c01
-.long	0x737487fa,0x737487fa
-.long	0x2e410bfb,0x2e410bfb
-.long	0x5a1d67b3,0x5a1d67b3
-.long	0x52d2db92,0x52d2db92
-.long	0x335610e9,0x335610e9
-.long	0x1347d66d,0x1347d66d
-.long	0x8c61d79a,0x8c61d79a
-.long	0x7a0ca137,0x7a0ca137
-.long	0x8e14f859,0x8e14f859
-.long	0x893c13eb,0x893c13eb
-.long	0xee27a9ce,0xee27a9ce
-.long	0x35c961b7,0x35c961b7
-.long	0xede51ce1,0xede51ce1
-.long	0x3cb1477a,0x3cb1477a
-.long	0x59dfd29c,0x59dfd29c
-.long	0x3f73f255,0x3f73f255
-.long	0x79ce1418,0x79ce1418
-.long	0xbf37c773,0xbf37c773
-.long	0xeacdf753,0xeacdf753
-.long	0x5baafd5f,0x5baafd5f
-.long	0x146f3ddf,0x146f3ddf
-.long	0x86db4478,0x86db4478
-.long	0x81f3afca,0x81f3afca
-.long	0x3ec468b9,0x3ec468b9
-.long	0x2c342438,0x2c342438
-.long	0x5f40a3c2,0x5f40a3c2
-.long	0x72c31d16,0x72c31d16
-.long	0x0c25e2bc,0x0c25e2bc
-.long	0x8b493c28,0x8b493c28
-.long	0x41950dff,0x41950dff
-.long	0x7101a839,0x7101a839
-.long	0xdeb30c08,0xdeb30c08
-.long	0x9ce4b4d8,0x9ce4b4d8
-.long	0x90c15664,0x90c15664
-.long	0x6184cb7b,0x6184cb7b
-.long	0x70b632d5,0x70b632d5
-.long	0x745c6c48,0x745c6c48
-.long	0x4257b8d0,0x4257b8d0
-.byte	0x52,0x09,0x6a,0xd5,0x30,0x36,0xa5,0x38
-.byte	0xbf,0x40,0xa3,0x9e,0x81,0xf3,0xd7,0xfb
-.byte	0x7c,0xe3,0x39,0x82,0x9b,0x2f,0xff,0x87
-.byte	0x34,0x8e,0x43,0x44,0xc4,0xde,0xe9,0xcb
-.byte	0x54,0x7b,0x94,0x32,0xa6,0xc2,0x23,0x3d
-.byte	0xee,0x4c,0x95,0x0b,0x42,0xfa,0xc3,0x4e
-.byte	0x08,0x2e,0xa1,0x66,0x28,0xd9,0x24,0xb2
-.byte	0x76,0x5b,0xa2,0x49,0x6d,0x8b,0xd1,0x25
-.byte	0x72,0xf8,0xf6,0x64,0x86,0x68,0x98,0x16
-.byte	0xd4,0xa4,0x5c,0xcc,0x5d,0x65,0xb6,0x92
-.byte	0x6c,0x70,0x48,0x50,0xfd,0xed,0xb9,0xda
-.byte	0x5e,0x15,0x46,0x57,0xa7,0x8d,0x9d,0x84
-.byte	0x90,0xd8,0xab,0x00,0x8c,0xbc,0xd3,0x0a
-.byte	0xf7,0xe4,0x58,0x05,0xb8,0xb3,0x45,0x06
-.byte	0xd0,0x2c,0x1e,0x8f,0xca,0x3f,0x0f,0x02
-.byte	0xc1,0xaf,0xbd,0x03,0x01,0x13,0x8a,0x6b
-.byte	0x3a,0x91,0x11,0x41,0x4f,0x67,0xdc,0xea
-.byte	0x97,0xf2,0xcf,0xce,0xf0,0xb4,0xe6,0x73
-.byte	0x96,0xac,0x74,0x22,0xe7,0xad,0x35,0x85
-.byte	0xe2,0xf9,0x37,0xe8,0x1c,0x75,0xdf,0x6e
-.byte	0x47,0xf1,0x1a,0x71,0x1d,0x29,0xc5,0x89
-.byte	0x6f,0xb7,0x62,0x0e,0xaa,0x18,0xbe,0x1b
-.byte	0xfc,0x56,0x3e,0x4b,0xc6,0xd2,0x79,0x20
-.byte	0x9a,0xdb,0xc0,0xfe,0x78,0xcd,0x5a,0xf4
-.byte	0x1f,0xdd,0xa8,0x33,0x88,0x07,0xc7,0x31
-.byte	0xb1,0x12,0x10,0x59,0x27,0x80,0xec,0x5f
-.byte	0x60,0x51,0x7f,0xa9,0x19,0xb5,0x4a,0x0d
-.byte	0x2d,0xe5,0x7a,0x9f,0x93,0xc9,0x9c,0xef
-.byte	0xa0,0xe0,0x3b,0x4d,0xae,0x2a,0xf5,0xb0
-.byte	0xc8,0xeb,0xbb,0x3c,0x83,0x53,0x99,0x61
-.byte	0x17,0x2b,0x04,0x7e,0xba,0x77,0xd6,0x26
-.byte	0xe1,0x69,0x14,0x63,0x55,0x21,0x0c,0x7d
-.long	0x80808080, 0x80808080, 0xfefefefe, 0xfefefefe
-.long	0x1b1b1b1b, 0x1b1b1b1b, 0, 0
-.byte	0x52,0x09,0x6a,0xd5,0x30,0x36,0xa5,0x38
-.byte	0xbf,0x40,0xa3,0x9e,0x81,0xf3,0xd7,0xfb
-.byte	0x7c,0xe3,0x39,0x82,0x9b,0x2f,0xff,0x87
-.byte	0x34,0x8e,0x43,0x44,0xc4,0xde,0xe9,0xcb
-.byte	0x54,0x7b,0x94,0x32,0xa6,0xc2,0x23,0x3d
-.byte	0xee,0x4c,0x95,0x0b,0x42,0xfa,0xc3,0x4e
-.byte	0x08,0x2e,0xa1,0x66,0x28,0xd9,0x24,0xb2
-.byte	0x76,0x5b,0xa2,0x49,0x6d,0x8b,0xd1,0x25
-.byte	0x72,0xf8,0xf6,0x64,0x86,0x68,0x98,0x16
-.byte	0xd4,0xa4,0x5c,0xcc,0x5d,0x65,0xb6,0x92
-.byte	0x6c,0x70,0x48,0x50,0xfd,0xed,0xb9,0xda
-.byte	0x5e,0x15,0x46,0x57,0xa7,0x8d,0x9d,0x84
-.byte	0x90,0xd8,0xab,0x00,0x8c,0xbc,0xd3,0x0a
-.byte	0xf7,0xe4,0x58,0x05,0xb8,0xb3,0x45,0x06
-.byte	0xd0,0x2c,0x1e,0x8f,0xca,0x3f,0x0f,0x02
-.byte	0xc1,0xaf,0xbd,0x03,0x01,0x13,0x8a,0x6b
-.byte	0x3a,0x91,0x11,0x41,0x4f,0x67,0xdc,0xea
-.byte	0x97,0xf2,0xcf,0xce,0xf0,0xb4,0xe6,0x73
-.byte	0x96,0xac,0x74,0x22,0xe7,0xad,0x35,0x85
-.byte	0xe2,0xf9,0x37,0xe8,0x1c,0x75,0xdf,0x6e
-.byte	0x47,0xf1,0x1a,0x71,0x1d,0x29,0xc5,0x89
-.byte	0x6f,0xb7,0x62,0x0e,0xaa,0x18,0xbe,0x1b
-.byte	0xfc,0x56,0x3e,0x4b,0xc6,0xd2,0x79,0x20
-.byte	0x9a,0xdb,0xc0,0xfe,0x78,0xcd,0x5a,0xf4
-.byte	0x1f,0xdd,0xa8,0x33,0x88,0x07,0xc7,0x31
-.byte	0xb1,0x12,0x10,0x59,0x27,0x80,0xec,0x5f
-.byte	0x60,0x51,0x7f,0xa9,0x19,0xb5,0x4a,0x0d
-.byte	0x2d,0xe5,0x7a,0x9f,0x93,0xc9,0x9c,0xef
-.byte	0xa0,0xe0,0x3b,0x4d,0xae,0x2a,0xf5,0xb0
-.byte	0xc8,0xeb,0xbb,0x3c,0x83,0x53,0x99,0x61
-.byte	0x17,0x2b,0x04,0x7e,0xba,0x77,0xd6,0x26
-.byte	0xe1,0x69,0x14,0x63,0x55,0x21,0x0c,0x7d
-.long	0x80808080, 0x80808080, 0xfefefefe, 0xfefefefe
-.long	0x1b1b1b1b, 0x1b1b1b1b, 0, 0
-.byte	0x52,0x09,0x6a,0xd5,0x30,0x36,0xa5,0x38
-.byte	0xbf,0x40,0xa3,0x9e,0x81,0xf3,0xd7,0xfb
-.byte	0x7c,0xe3,0x39,0x82,0x9b,0x2f,0xff,0x87
-.byte	0x34,0x8e,0x43,0x44,0xc4,0xde,0xe9,0xcb
-.byte	0x54,0x7b,0x94,0x32,0xa6,0xc2,0x23,0x3d
-.byte	0xee,0x4c,0x95,0x0b,0x42,0xfa,0xc3,0x4e
-.byte	0x08,0x2e,0xa1,0x66,0x28,0xd9,0x24,0xb2
-.byte	0x76,0x5b,0xa2,0x49,0x6d,0x8b,0xd1,0x25
-.byte	0x72,0xf8,0xf6,0x64,0x86,0x68,0x98,0x16
-.byte	0xd4,0xa4,0x5c,0xcc,0x5d,0x65,0xb6,0x92
-.byte	0x6c,0x70,0x48,0x50,0xfd,0xed,0xb9,0xda
-.byte	0x5e,0x15,0x46,0x57,0xa7,0x8d,0x9d,0x84
-.byte	0x90,0xd8,0xab,0x00,0x8c,0xbc,0xd3,0x0a
-.byte	0xf7,0xe4,0x58,0x05,0xb8,0xb3,0x45,0x06
-.byte	0xd0,0x2c,0x1e,0x8f,0xca,0x3f,0x0f,0x02
-.byte	0xc1,0xaf,0xbd,0x03,0x01,0x13,0x8a,0x6b
-.byte	0x3a,0x91,0x11,0x41,0x4f,0x67,0xdc,0xea
-.byte	0x97,0xf2,0xcf,0xce,0xf0,0xb4,0xe6,0x73
-.byte	0x96,0xac,0x74,0x22,0xe7,0xad,0x35,0x85
-.byte	0xe2,0xf9,0x37,0xe8,0x1c,0x75,0xdf,0x6e
-.byte	0x47,0xf1,0x1a,0x71,0x1d,0x29,0xc5,0x89
-.byte	0x6f,0xb7,0x62,0x0e,0xaa,0x18,0xbe,0x1b
-.byte	0xfc,0x56,0x3e,0x4b,0xc6,0xd2,0x79,0x20
-.byte	0x9a,0xdb,0xc0,0xfe,0x78,0xcd,0x5a,0xf4
-.byte	0x1f,0xdd,0xa8,0x33,0x88,0x07,0xc7,0x31
-.byte	0xb1,0x12,0x10,0x59,0x27,0x80,0xec,0x5f
-.byte	0x60,0x51,0x7f,0xa9,0x19,0xb5,0x4a,0x0d
-.byte	0x2d,0xe5,0x7a,0x9f,0x93,0xc9,0x9c,0xef
-.byte	0xa0,0xe0,0x3b,0x4d,0xae,0x2a,0xf5,0xb0
-.byte	0xc8,0xeb,0xbb,0x3c,0x83,0x53,0x99,0x61
-.byte	0x17,0x2b,0x04,0x7e,0xba,0x77,0xd6,0x26
-.byte	0xe1,0x69,0x14,0x63,0x55,0x21,0x0c,0x7d
-.long	0x80808080, 0x80808080, 0xfefefefe, 0xfefefefe
-.long	0x1b1b1b1b, 0x1b1b1b1b, 0, 0
-.byte	0x52,0x09,0x6a,0xd5,0x30,0x36,0xa5,0x38
-.byte	0xbf,0x40,0xa3,0x9e,0x81,0xf3,0xd7,0xfb
-.byte	0x7c,0xe3,0x39,0x82,0x9b,0x2f,0xff,0x87
-.byte	0x34,0x8e,0x43,0x44,0xc4,0xde,0xe9,0xcb
-.byte	0x54,0x7b,0x94,0x32,0xa6,0xc2,0x23,0x3d
-.byte	0xee,0x4c,0x95,0x0b,0x42,0xfa,0xc3,0x4e
-.byte	0x08,0x2e,0xa1,0x66,0x28,0xd9,0x24,0xb2
-.byte	0x76,0x5b,0xa2,0x49,0x6d,0x8b,0xd1,0x25
-.byte	0x72,0xf8,0xf6,0x64,0x86,0x68,0x98,0x16
-.byte	0xd4,0xa4,0x5c,0xcc,0x5d,0x65,0xb6,0x92
-.byte	0x6c,0x70,0x48,0x50,0xfd,0xed,0xb9,0xda
-.byte	0x5e,0x15,0x46,0x57,0xa7,0x8d,0x9d,0x84
-.byte	0x90,0xd8,0xab,0x00,0x8c,0xbc,0xd3,0x0a
-.byte	0xf7,0xe4,0x58,0x05,0xb8,0xb3,0x45,0x06
-.byte	0xd0,0x2c,0x1e,0x8f,0xca,0x3f,0x0f,0x02
-.byte	0xc1,0xaf,0xbd,0x03,0x01,0x13,0x8a,0x6b
-.byte	0x3a,0x91,0x11,0x41,0x4f,0x67,0xdc,0xea
-.byte	0x97,0xf2,0xcf,0xce,0xf0,0xb4,0xe6,0x73
-.byte	0x96,0xac,0x74,0x22,0xe7,0xad,0x35,0x85
-.byte	0xe2,0xf9,0x37,0xe8,0x1c,0x75,0xdf,0x6e
-.byte	0x47,0xf1,0x1a,0x71,0x1d,0x29,0xc5,0x89
-.byte	0x6f,0xb7,0x62,0x0e,0xaa,0x18,0xbe,0x1b
-.byte	0xfc,0x56,0x3e,0x4b,0xc6,0xd2,0x79,0x20
-.byte	0x9a,0xdb,0xc0,0xfe,0x78,0xcd,0x5a,0xf4
-.byte	0x1f,0xdd,0xa8,0x33,0x88,0x07,0xc7,0x31
-.byte	0xb1,0x12,0x10,0x59,0x27,0x80,0xec,0x5f
-.byte	0x60,0x51,0x7f,0xa9,0x19,0xb5,0x4a,0x0d
-.byte	0x2d,0xe5,0x7a,0x9f,0x93,0xc9,0x9c,0xef
-.byte	0xa0,0xe0,0x3b,0x4d,0xae,0x2a,0xf5,0xb0
-.byte	0xc8,0xeb,0xbb,0x3c,0x83,0x53,0x99,0x61
-.byte	0x17,0x2b,0x04,0x7e,0xba,0x77,0xd6,0x26
-.byte	0xe1,0x69,0x14,0x63,0x55,0x21,0x0c,0x7d
-.long	0x80808080, 0x80808080, 0xfefefefe, 0xfefefefe
-.long	0x1b1b1b1b, 0x1b1b1b1b, 0, 0
-.byte	65,69,83,32,102,111,114,32,120,56,54,95,54,52,44,32,67,82,89,80,84,79,71,65,77,83,32,98,121,32,60,97,112,112,114,111,64,111,112,101,110,115,115,108,46,111,114,103,62,0
-.align	64
diff --git a/deps/openssl/config/archs/linux-x32/asm/crypto/aes/aesni-sha1-x86_64.s b/deps/openssl/config/archs/linux-x32/asm/crypto/aes/aesni-sha1-x86_64.s
index 4d2dfe4489..978bd2b623 100644
--- a/deps/openssl/config/archs/linux-x32/asm/crypto/aes/aesni-sha1-x86_64.s
+++ b/deps/openssl/config/archs/linux-x32/asm/crypto/aes/aesni-sha1-x86_64.s
@@ -5,6 +5,7 @@
 .type	aesni_cbc_sha1_enc,@function
 .align	32
 aesni_cbc_sha1_enc:
+.cfi_startproc
 
 	movl	OPENSSL_ia32cap_P+0(%rip),%r10d
 	movq	OPENSSL_ia32cap_P+4(%rip),%r11
@@ -17,6 +18,7 @@ aesni_cbc_sha1_enc:
 	je	aesni_cbc_sha1_enc_avx
 	jmp	aesni_cbc_sha1_enc_ssse3
 	.byte	0xf3,0xc3
+.cfi_endproc
 .size	aesni_cbc_sha1_enc,.-aesni_cbc_sha1_enc
 .type	aesni_cbc_sha1_enc_ssse3,@function
 .align	32
@@ -2730,6 +2732,7 @@ K_XX_XX:
 .type	aesni_cbc_sha1_enc_shaext,@function
 .align	32
 aesni_cbc_sha1_enc_shaext:
+.cfi_startproc
 	movq	8(%rsp),%r10
 	movdqu	(%r9),%xmm8
 	movd	16(%r9),%xmm9
@@ -3028,4 +3031,5 @@ aesni_cbc_sha1_enc_shaext:
 	movdqu	%xmm8,(%r9)
 	movd	%xmm9,16(%r9)
 	.byte	0xf3,0xc3
+.cfi_endproc
 .size	aesni_cbc_sha1_enc_shaext,.-aesni_cbc_sha1_enc_shaext
diff --git a/deps/openssl/config/archs/linux-x32/asm/crypto/aes/aesni-sha256-x86_64.s b/deps/openssl/config/archs/linux-x32/asm/crypto/aes/aesni-sha256-x86_64.s
index 5a47b3ee51..dd09f1b290 100644
--- a/deps/openssl/config/archs/linux-x32/asm/crypto/aes/aesni-sha256-x86_64.s
+++ b/deps/openssl/config/archs/linux-x32/asm/crypto/aes/aesni-sha256-x86_64.s
@@ -5,6 +5,7 @@
 .type	aesni_cbc_sha256_enc,@function
 .align	16
 aesni_cbc_sha256_enc:
+.cfi_startproc
 	leaq	OPENSSL_ia32cap_P(%rip),%r11
 	movl	$1,%eax
 	cmpq	$0,%rdi
@@ -30,6 +31,7 @@ aesni_cbc_sha256_enc:
 	ud2
 .Lprobe:
 	.byte	0xf3,0xc3
+.cfi_endproc
 .size	aesni_cbc_sha256_enc,.-aesni_cbc_sha256_enc
 
 .align	64
@@ -2528,7 +2530,15 @@ aesni_cbc_sha256_enc_avx2:
 	vmovdqa	%ymm4,0(%rsp)
 	xorl	%r14d,%r14d
 	vmovdqa	%ymm5,32(%rsp)
+
+	movq	120(%rsp),%rsi
+.cfi_def_cfa	%rsi,8
 	leaq	-64(%rsp),%rsp
+
+
+
+	movq	%rsi,-8(%rsp)
+.cfi_escape	0x0f,0x05,0x77,0x78,0x06,0x23,0x08
 	movl	%ebx,%esi
 	vmovdqa	%ymm6,0(%rsp)
 	xorl	%ecx,%esi
@@ -2542,6 +2552,12 @@ aesni_cbc_sha256_enc_avx2:
 	vmovdqu	(%r13),%xmm9
 	vpinsrq	$0,%r13,%xmm15,%xmm15
 	leaq	-64(%rsp),%rsp
+.cfi_escape	0x0f,0x05,0x77,0x38,0x06,0x23,0x08
+
+	pushq	64-8(%rsp)
+.cfi_escape	0x0f,0x05,0x77,0x00,0x06,0x23,0x08
+	leaq	8(%rsp),%rsp
+.cfi_escape	0x0f,0x05,0x77,0x78,0x06,0x23,0x08
 	vpalignr	$4,%ymm0,%ymm1,%ymm4
 	addl	0+128(%rsp),%r11d
 	andl	%r8d,%r12d
@@ -2816,6 +2832,12 @@ aesni_cbc_sha256_enc_avx2:
 	movl	%r9d,%r12d
 	vmovdqa	%ymm6,32(%rsp)
 	leaq	-64(%rsp),%rsp
+.cfi_escape	0x0f,0x05,0x77,0x38,0x06,0x23,0x08
+
+	pushq	64-8(%rsp)
+.cfi_escape	0x0f,0x05,0x77,0x00,0x06,0x23,0x08
+	leaq	8(%rsp),%rsp
+.cfi_escape	0x0f,0x05,0x77,0x78,0x06,0x23,0x08
 	vpalignr	$4,%ymm2,%ymm3,%ymm4
 	addl	0+128(%rsp),%r11d
 	andl	%r8d,%r12d
@@ -4029,10 +4051,12 @@ aesni_cbc_sha256_enc_avx2:
 	jbe	.Loop_avx2
 	leaq	(%rsp),%rbp
 
+
+.cfi_escape	0x0f,0x06,0x76,0xf8,0x00,0x06,0x23,0x08
+
 .Ldone_avx2:
-	leaq	(%rbp),%rsp
-	movq	64+32(%rsp),%r8
-	movq	120(%rsp),%rsi
+	movq	64+32(%rbp),%r8
+	movq	64+56(%rbp),%rsi
 .cfi_def_cfa	%rsi,8
 	vmovdqu	%xmm8,(%r8)
 	vzeroall
@@ -4057,6 +4081,7 @@ aesni_cbc_sha256_enc_avx2:
 .type	aesni_cbc_sha256_enc_shaext,@function
 .align	32
 aesni_cbc_sha256_enc_shaext:
+.cfi_startproc
 	movq	8(%rsp),%r10
 	leaq	K256+128(%rip),%rax
 	movdqu	(%r9),%xmm1
@@ -4406,4 +4431,5 @@ aesni_cbc_sha256_enc_shaext:
 	movdqu	%xmm1,(%r9)
 	movdqu	%xmm2,16(%r9)
 	.byte	0xf3,0xc3
+.cfi_endproc
 .size	aesni_cbc_sha256_enc_shaext,.-aesni_cbc_sha256_enc_shaext
diff --git a/deps/openssl/config/archs/linux-x32/asm/crypto/aes/aesni-x86_64.s b/deps/openssl/config/archs/linux-x32/asm/crypto/aes/aesni-x86_64.s
index 2986a647c1..c1e791eff5 100644
--- a/deps/openssl/config/archs/linux-x32/asm/crypto/aes/aesni-x86_64.s
+++ b/deps/openssl/config/archs/linux-x32/asm/crypto/aes/aesni-x86_64.s
@@ -861,6 +861,7 @@ aesni_ecb_encrypt:
 .type	aesni_ccm64_encrypt_blocks,@function
 .align	16
 aesni_ccm64_encrypt_blocks:
+.cfi_startproc
 	movl	240(%rcx),%eax
 	movdqu	(%r8),%xmm6
 	movdqa	.Lincrement64(%rip),%xmm9
@@ -919,11 +920,13 @@ aesni_ccm64_encrypt_blocks:
 	pxor	%xmm8,%xmm8
 	pxor	%xmm6,%xmm6
 	.byte	0xf3,0xc3
+.cfi_endproc
 .size	aesni_ccm64_encrypt_blocks,.-aesni_ccm64_encrypt_blocks
 .globl	aesni_ccm64_decrypt_blocks
 .type	aesni_ccm64_decrypt_blocks,@function
 .align	16
 aesni_ccm64_decrypt_blocks:
+.cfi_startproc
 	movl	240(%rcx),%eax
 	movups	(%r8),%xmm6
 	movdqu	(%r9),%xmm3
@@ -1016,6 +1019,7 @@ aesni_ccm64_decrypt_blocks:
 	pxor	%xmm8,%xmm8
 	pxor	%xmm6,%xmm6
 	.byte	0xf3,0xc3
+.cfi_endproc
 .size	aesni_ccm64_decrypt_blocks,.-aesni_ccm64_decrypt_blocks
 .globl	aesni_ctr32_encrypt_blocks
 .type	aesni_ctr32_encrypt_blocks,@function
@@ -2790,6 +2794,7 @@ aesni_ocb_encrypt:
 .type	__ocb_encrypt6,@function
 .align	32
 __ocb_encrypt6:
+.cfi_startproc
 	pxor	%xmm9,%xmm15
 	movdqu	(%rbx,%r12,1),%xmm11
 	movdqa	%xmm10,%xmm12
@@ -2887,11 +2892,13 @@ __ocb_encrypt6:
 .byte	102,65,15,56,221,246
 .byte	102,65,15,56,221,255
 	.byte	0xf3,0xc3
+.cfi_endproc
 .size	__ocb_encrypt6,.-__ocb_encrypt6
 
 .type	__ocb_encrypt4,@function
 .align	32
 __ocb_encrypt4:
+.cfi_startproc
 	pxor	%xmm9,%xmm15
 	movdqu	(%rbx,%r12,1),%xmm11
 	movdqa	%xmm10,%xmm12
@@ -2956,11 +2963,13 @@ __ocb_encrypt4:
 .byte	102,65,15,56,221,228
 .byte	102,65,15,56,221,237
 	.byte	0xf3,0xc3
+.cfi_endproc
 .size	__ocb_encrypt4,.-__ocb_encrypt4
 
 .type	__ocb_encrypt1,@function
 .align	32
 __ocb_encrypt1:
+.cfi_startproc
 	pxor	%xmm15,%xmm7
 	pxor	%xmm9,%xmm7
 	pxor	%xmm2,%xmm8
@@ -2991,6 +3000,7 @@ __ocb_encrypt1:
 
 .byte	102,15,56,221,215
 	.byte	0xf3,0xc3
+.cfi_endproc
 .size	__ocb_encrypt1,.-__ocb_encrypt1
 
 .globl	aesni_ocb_decrypt
@@ -3233,6 +3243,7 @@ aesni_ocb_decrypt:
 .type	__ocb_decrypt6,@function
 .align	32
 __ocb_decrypt6:
+.cfi_startproc
 	pxor	%xmm9,%xmm15
 	movdqu	(%rbx,%r12,1),%xmm11
 	movdqa	%xmm10,%xmm12
@@ -3324,11 +3335,13 @@ __ocb_decrypt6:
 .byte	102,65,15,56,223,246
 .byte	102,65,15,56,223,255
 	.byte	0xf3,0xc3
+.cfi_endproc
 .size	__ocb_decrypt6,.-__ocb_decrypt6
 
 .type	__ocb_decrypt4,@function
 .align	32
 __ocb_decrypt4:
+.cfi_startproc
 	pxor	%xmm9,%xmm15
 	movdqu	(%rbx,%r12,1),%xmm11
 	movdqa	%xmm10,%xmm12
@@ -3389,11 +3402,13 @@ __ocb_decrypt4:
 .byte	102,65,15,56,223,228
 .byte	102,65,15,56,223,237
 	.byte	0xf3,0xc3
+.cfi_endproc
 .size	__ocb_decrypt4,.-__ocb_decrypt4
 
 .type	__ocb_decrypt1,@function
 .align	32
 __ocb_decrypt1:
+.cfi_startproc
 	pxor	%xmm15,%xmm7
 	pxor	%xmm9,%xmm7
 	pxor	%xmm7,%xmm2
@@ -3423,6 +3438,7 @@ __ocb_decrypt1:
 
 .byte	102,15,56,223,215
 	.byte	0xf3,0xc3
+.cfi_endproc
 .size	__ocb_decrypt1,.-__ocb_decrypt1
 .globl	aesni_cbc_encrypt
 .type	aesni_cbc_encrypt,@function
@@ -4361,7 +4377,6 @@ __aesni_set_encrypt_key:
 	addq	$8,%rsp
 .cfi_adjust_cfa_offset	-8
 	.byte	0xf3,0xc3
-.cfi_endproc	
 .LSEH_end_set_encrypt_key:
 
 .align	16
@@ -4432,6 +4447,7 @@ __aesni_set_encrypt_key:
 	shufps	$170,%xmm1,%xmm1
 	xorps	%xmm1,%xmm2
 	.byte	0xf3,0xc3
+.cfi_endproc
 .size	aesni_set_encrypt_key,.-aesni_set_encrypt_key
 .size	__aesni_set_encrypt_key,.-__aesni_set_encrypt_key
 .align	64
diff --git a/deps/openssl/config/archs/linux-x32/asm/crypto/aes/bsaes-x86_64.s b/deps/openssl/config/archs/linux-x32/asm/crypto/aes/bsaes-x86_64.s
deleted file mode 100644
index e1f3abadbc..0000000000
--- a/deps/openssl/config/archs/linux-x32/asm/crypto/aes/bsaes-x86_64.s
+++ /dev/null
@@ -1,2595 +0,0 @@
-.text	
-
-
-
-
-.type	_bsaes_encrypt8,@function
-.align	64
-_bsaes_encrypt8:
-.cfi_startproc	
-	leaq	.LBS0(%rip),%r11
-
-	movdqa	(%rax),%xmm8
-	leaq	16(%rax),%rax
-	movdqa	80(%r11),%xmm7
-	pxor	%xmm8,%xmm15
-	pxor	%xmm8,%xmm0
-	pxor	%xmm8,%xmm1
-	pxor	%xmm8,%xmm2
-.byte	102,68,15,56,0,255
-.byte	102,15,56,0,199
-	pxor	%xmm8,%xmm3
-	pxor	%xmm8,%xmm4
-.byte	102,15,56,0,207
-.byte	102,15,56,0,215
-	pxor	%xmm8,%xmm5
-	pxor	%xmm8,%xmm6
-.byte	102,15,56,0,223
-.byte	102,15,56,0,231
-.byte	102,15,56,0,239
-.byte	102,15,56,0,247
-_bsaes_encrypt8_bitslice:
-	movdqa	0(%r11),%xmm7
-	movdqa	16(%r11),%xmm8
-	movdqa	%xmm5,%xmm9
-	psrlq	$1,%xmm5
-	movdqa	%xmm3,%xmm10
-	psrlq	$1,%xmm3
-	pxor	%xmm6,%xmm5
-	pxor	%xmm4,%xmm3
-	pand	%xmm7,%xmm5
-	pand	%xmm7,%xmm3
-	pxor	%xmm5,%xmm6
-	psllq	$1,%xmm5
-	pxor	%xmm3,%xmm4
-	psllq	$1,%xmm3
-	pxor	%xmm9,%xmm5
-	pxor	%xmm10,%xmm3
-	movdqa	%xmm1,%xmm9
-	psrlq	$1,%xmm1
-	movdqa	%xmm15,%xmm10
-	psrlq	$1,%xmm15
-	pxor	%xmm2,%xmm1
-	pxor	%xmm0,%xmm15
-	pand	%xmm7,%xmm1
-	pand	%xmm7,%xmm15
-	pxor	%xmm1,%xmm2
-	psllq	$1,%xmm1
-	pxor	%xmm15,%xmm0
-	psllq	$1,%xmm15
-	pxor	%xmm9,%xmm1
-	pxor	%xmm10,%xmm15
-	movdqa	32(%r11),%xmm7
-	movdqa	%xmm4,%xmm9
-	psrlq	$2,%xmm4
-	movdqa	%xmm3,%xmm10
-	psrlq	$2,%xmm3
-	pxor	%xmm6,%xmm4
-	pxor	%xmm5,%xmm3
-	pand	%xmm8,%xmm4
-	pand	%xmm8,%xmm3
-	pxor	%xmm4,%xmm6
-	psllq	$2,%xmm4
-	pxor	%xmm3,%xmm5
-	psllq	$2,%xmm3
-	pxor	%xmm9,%xmm4
-	pxor	%xmm10,%xmm3
-	movdqa	%xmm0,%xmm9
-	psrlq	$2,%xmm0
-	movdqa	%xmm15,%xmm10
-	psrlq	$2,%xmm15
-	pxor	%xmm2,%xmm0
-	pxor	%xmm1,%xmm15
-	pand	%xmm8,%xmm0
-	pand	%xmm8,%xmm15
-	pxor	%xmm0,%xmm2
-	psllq	$2,%xmm0
-	pxor	%xmm15,%xmm1
-	psllq	$2,%xmm15
-	pxor	%xmm9,%xmm0
-	pxor	%xmm10,%xmm15
-	movdqa	%xmm2,%xmm9
-	psrlq	$4,%xmm2
-	movdqa	%xmm1,%xmm10
-	psrlq	$4,%xmm1
-	pxor	%xmm6,%xmm2
-	pxor	%xmm5,%xmm1
-	pand	%xmm7,%xmm2
-	pand	%xmm7,%xmm1
-	pxor	%xmm2,%xmm6
-	psllq	$4,%xmm2
-	pxor	%xmm1,%xmm5
-	psllq	$4,%xmm1
-	pxor	%xmm9,%xmm2
-	pxor	%xmm10,%xmm1
-	movdqa	%xmm0,%xmm9
-	psrlq	$4,%xmm0
-	movdqa	%xmm15,%xmm10
-	psrlq	$4,%xmm15
-	pxor	%xmm4,%xmm0
-	pxor	%xmm3,%xmm15
-	pand	%xmm7,%xmm0
-	pand	%xmm7,%xmm15
-	pxor	%xmm0,%xmm4
-	psllq	$4,%xmm0
-	pxor	%xmm15,%xmm3
-	psllq	$4,%xmm15
-	pxor	%xmm9,%xmm0
-	pxor	%xmm10,%xmm15
-	decl	%r10d
-	jmp	.Lenc_sbox
-.align	16
-.Lenc_loop:
-	pxor	0(%rax),%xmm15
-	pxor	16(%rax),%xmm0
-	pxor	32(%rax),%xmm1
-	pxor	48(%rax),%xmm2
-.byte	102,68,15,56,0,255
-.byte	102,15,56,0,199
-	pxor	64(%rax),%xmm3
-	pxor	80(%rax),%xmm4
-.byte	102,15,56,0,207
-.byte	102,15,56,0,215
-	pxor	96(%rax),%xmm5
-	pxor	112(%rax),%xmm6
-.byte	102,15,56,0,223
-.byte	102,15,56,0,231
-.byte	102,15,56,0,239
-.byte	102,15,56,0,247
-	leaq	128(%rax),%rax
-.Lenc_sbox:
-	pxor	%xmm5,%xmm4
-	pxor	%xmm0,%xmm1
-	pxor	%xmm15,%xmm2
-	pxor	%xmm1,%xmm5
-	pxor	%xmm15,%xmm4
-
-	pxor	%xmm2,%xmm5
-	pxor	%xmm6,%xmm2
-	pxor	%xmm4,%xmm6
-	pxor	%xmm3,%xmm2
-	pxor	%xmm4,%xmm3
-	pxor	%xmm0,%xmm2
-
-	pxor	%xmm6,%xmm1
-	pxor	%xmm4,%xmm0
-	movdqa	%xmm6,%xmm10
-	movdqa	%xmm0,%xmm9
-	movdqa	%xmm4,%xmm8
-	movdqa	%xmm1,%xmm12
-	movdqa	%xmm5,%xmm11
-
-	pxor	%xmm3,%xmm10
-	pxor	%xmm1,%xmm9
-	pxor	%xmm2,%xmm8
-	movdqa	%xmm10,%xmm13
-	pxor	%xmm3,%xmm12
-	movdqa	%xmm9,%xmm7
-	pxor	%xmm15,%xmm11
-	movdqa	%xmm10,%xmm14
-
-	por	%xmm8,%xmm9
-	por	%xmm11,%xmm10
-	pxor	%xmm7,%xmm14
-	pand	%xmm11,%xmm13
-	pxor	%xmm8,%xmm11
-	pand	%xmm8,%xmm7
-	pand	%xmm11,%xmm14
-	movdqa	%xmm2,%xmm11
-	pxor	%xmm15,%xmm11
-	pand	%xmm11,%xmm12
-	pxor	%xmm12,%xmm10
-	pxor	%xmm12,%xmm9
-	movdqa	%xmm6,%xmm12
-	movdqa	%xmm4,%xmm11
-	pxor	%xmm0,%xmm12
-	pxor	%xmm5,%xmm11
-	movdqa	%xmm12,%xmm8
-	pand	%xmm11,%xmm12
-	por	%xmm11,%xmm8
-	pxor	%xmm12,%xmm7
-	pxor	%xmm14,%xmm10
-	pxor	%xmm13,%xmm9
-	pxor	%xmm14,%xmm8
-	movdqa	%xmm1,%xmm11
-	pxor	%xmm13,%xmm7
-	movdqa	%xmm3,%xmm12
-	pxor	%xmm13,%xmm8
-	movdqa	%xmm0,%xmm13
-	pand	%xmm2,%xmm11
-	movdqa	%xmm6,%xmm14
-	pand	%xmm15,%xmm12
-	pand	%xmm4,%xmm13
-	por	%xmm5,%xmm14
-	pxor	%xmm11,%xmm10
-	pxor	%xmm12,%xmm9
-	pxor	%xmm13,%xmm8
-	pxor	%xmm14,%xmm7
-
-
-
-
-
-	movdqa	%xmm10,%xmm11
-	pand	%xmm8,%xmm10
-	pxor	%xmm9,%xmm11
-
-	movdqa	%xmm7,%xmm13
-	movdqa	%xmm11,%xmm14
-	pxor	%xmm10,%xmm13
-	pand	%xmm13,%xmm14
-
-	movdqa	%xmm8,%xmm12
-	pxor	%xmm9,%xmm14
-	pxor	%xmm7,%xmm12
-
-	pxor	%xmm9,%xmm10
-
-	pand	%xmm10,%xmm12
-
-	movdqa	%xmm13,%xmm9
-	pxor	%xmm7,%xmm12
-
-	pxor	%xmm12,%xmm9
-	pxor	%xmm12,%xmm8
-
-	pand	%xmm7,%xmm9
-
-	pxor	%xmm9,%xmm13
-	pxor	%xmm9,%xmm8
-
-	pand	%xmm14,%xmm13
-
-	pxor	%xmm11,%xmm13
-	movdqa	%xmm5,%xmm11
-	movdqa	%xmm4,%xmm7
-	movdqa	%xmm14,%xmm9
-	pxor	%xmm13,%xmm9
-	pand	%xmm5,%xmm9
-	pxor	%xmm4,%xmm5
-	pand	%xmm14,%xmm4
-	pand	%xmm13,%xmm5
-	pxor	%xmm4,%xmm5
-	pxor	%xmm9,%xmm4
-	pxor	%xmm15,%xmm11
-	pxor	%xmm2,%xmm7
-	pxor	%xmm12,%xmm14
-	pxor	%xmm8,%xmm13
-	movdqa	%xmm14,%xmm10
-	movdqa	%xmm12,%xmm9
-	pxor	%xmm13,%xmm10
-	pxor	%xmm8,%xmm9
-	pand	%xmm11,%xmm10
-	pand	%xmm15,%xmm9
-	pxor	%xmm7,%xmm11
-	pxor	%xmm2,%xmm15
-	pand	%xmm14,%xmm7
-	pand	%xmm12,%xmm2
-	pand	%xmm13,%xmm11
-	pand	%xmm8,%xmm15
-	pxor	%xmm11,%xmm7
-	pxor	%xmm2,%xmm15
-	pxor	%xmm10,%xmm11
-	pxor	%xmm9,%xmm2
-	pxor	%xmm11,%xmm5
-	pxor	%xmm11,%xmm15
-	pxor	%xmm7,%xmm4
-	pxor	%xmm7,%xmm2
-
-	movdqa	%xmm6,%xmm11
-	movdqa	%xmm0,%xmm7
-	pxor	%xmm3,%xmm11
-	pxor	%xmm1,%xmm7
-	movdqa	%xmm14,%xmm10
-	movdqa	%xmm12,%xmm9
-	pxor	%xmm13,%xmm10
-	pxor	%xmm8,%xmm9
-	pand	%xmm11,%xmm10
-	pand	%xmm3,%xmm9
-	pxor	%xmm7,%xmm11
-	pxor	%xmm1,%xmm3
-	pand	%xmm14,%xmm7
-	pand	%xmm12,%xmm1
-	pand	%xmm13,%xmm11
-	pand	%xmm8,%xmm3
-	pxor	%xmm11,%xmm7
-	pxor	%xmm1,%xmm3
-	pxor	%xmm10,%xmm11
-	pxor	%xmm9,%xmm1
-	pxor	%xmm12,%xmm14
-	pxor	%xmm8,%xmm13
-	movdqa	%xmm14,%xmm10
-	pxor	%xmm13,%xmm10
-	pand	%xmm6,%xmm10
-	pxor	%xmm0,%xmm6
-	pand	%xmm14,%xmm0
-	pand	%xmm13,%xmm6
-	pxor	%xmm0,%xmm6
-	pxor	%xmm10,%xmm0
-	pxor	%xmm11,%xmm6
-	pxor	%xmm11,%xmm3
-	pxor	%xmm7,%xmm0
-	pxor	%xmm7,%xmm1
-	pxor	%xmm15,%xmm6
-	pxor	%xmm5,%xmm0
-	pxor	%xmm6,%xmm3
-	pxor	%xmm15,%xmm5
-	pxor	%xmm0,%xmm15
-
-	pxor	%xmm4,%xmm0
-	pxor	%xmm1,%xmm4
-	pxor	%xmm2,%xmm1
-	pxor	%xmm4,%xmm2
-	pxor	%xmm4,%xmm3
-
-	pxor	%xmm2,%xmm5
-	decl	%r10d
-	jl	.Lenc_done
-	pshufd	$0x93,%xmm15,%xmm7
-	pshufd	$0x93,%xmm0,%xmm8
-	pxor	%xmm7,%xmm15
-	pshufd	$0x93,%xmm3,%xmm9
-	pxor	%xmm8,%xmm0
-	pshufd	$0x93,%xmm5,%xmm10
-	pxor	%xmm9,%xmm3
-	pshufd	$0x93,%xmm2,%xmm11
-	pxor	%xmm10,%xmm5
-	pshufd	$0x93,%xmm6,%xmm12
-	pxor	%xmm11,%xmm2
-	pshufd	$0x93,%xmm1,%xmm13
-	pxor	%xmm12,%xmm6
-	pshufd	$0x93,%xmm4,%xmm14
-	pxor	%xmm13,%xmm1
-	pxor	%xmm14,%xmm4
-
-	pxor	%xmm15,%xmm8
-	pxor	%xmm4,%xmm7
-	pxor	%xmm4,%xmm8
-	pshufd	$0x4E,%xmm15,%xmm15
-	pxor	%xmm0,%xmm9
-	pshufd	$0x4E,%xmm0,%xmm0
-	pxor	%xmm2,%xmm12
-	pxor	%xmm7,%xmm15
-	pxor	%xmm6,%xmm13
-	pxor	%xmm8,%xmm0
-	pxor	%xmm5,%xmm11
-	pshufd	$0x4E,%xmm2,%xmm7
-	pxor	%xmm1,%xmm14
-	pshufd	$0x4E,%xmm6,%xmm8
-	pxor	%xmm3,%xmm10
-	pshufd	$0x4E,%xmm5,%xmm2
-	pxor	%xmm4,%xmm10
-	pshufd	$0x4E,%xmm4,%xmm6
-	pxor	%xmm4,%xmm11
-	pshufd	$0x4E,%xmm1,%xmm5
-	pxor	%xmm11,%xmm7
-	pshufd	$0x4E,%xmm3,%xmm1
-	pxor	%xmm12,%xmm8
-	pxor	%xmm10,%xmm2
-	pxor	%xmm14,%xmm6
-	pxor	%xmm13,%xmm5
-	movdqa	%xmm7,%xmm3
-	pxor	%xmm9,%xmm1
-	movdqa	%xmm8,%xmm4
-	movdqa	48(%r11),%xmm7
-	jnz	.Lenc_loop
-	movdqa	64(%r11),%xmm7
-	jmp	.Lenc_loop
-.align	16
-.Lenc_done:
-	movdqa	0(%r11),%xmm7
-	movdqa	16(%r11),%xmm8
-	movdqa	%xmm1,%xmm9
-	psrlq	$1,%xmm1
-	movdqa	%xmm2,%xmm10
-	psrlq	$1,%xmm2
-	pxor	%xmm4,%xmm1
-	pxor	%xmm6,%xmm2
-	pand	%xmm7,%xmm1
-	pand	%xmm7,%xmm2
-	pxor	%xmm1,%xmm4
-	psllq	$1,%xmm1
-	pxor	%xmm2,%xmm6
-	psllq	$1,%xmm2
-	pxor	%xmm9,%xmm1
-	pxor	%xmm10,%xmm2
-	movdqa	%xmm3,%xmm9
-	psrlq	$1,%xmm3
-	movdqa	%xmm15,%xmm10
-	psrlq	$1,%xmm15
-	pxor	%xmm5,%xmm3
-	pxor	%xmm0,%xmm15
-	pand	%xmm7,%xmm3
-	pand	%xmm7,%xmm15
-	pxor	%xmm3,%xmm5
-	psllq	$1,%xmm3
-	pxor	%xmm15,%xmm0
-	psllq	$1,%xmm15
-	pxor	%xmm9,%xmm3
-	pxor	%xmm10,%xmm15
-	movdqa	32(%r11),%xmm7
-	movdqa	%xmm6,%xmm9
-	psrlq	$2,%xmm6
-	movdqa	%xmm2,%xmm10
-	psrlq	$2,%xmm2
-	pxor	%xmm4,%xmm6
-	pxor	%xmm1,%xmm2
-	pand	%xmm8,%xmm6
-	pand	%xmm8,%xmm2
-	pxor	%xmm6,%xmm4
-	psllq	$2,%xmm6
-	pxor	%xmm2,%xmm1
-	psllq	$2,%xmm2
-	pxor	%xmm9,%xmm6
-	pxor	%xmm10,%xmm2
-	movdqa	%xmm0,%xmm9
-	psrlq	$2,%xmm0
-	movdqa	%xmm15,%xmm10
-	psrlq	$2,%xmm15
-	pxor	%xmm5,%xmm0
-	pxor	%xmm3,%xmm15
-	pand	%xmm8,%xmm0
-	pand	%xmm8,%xmm15
-	pxor	%xmm0,%xmm5
-	psllq	$2,%xmm0
-	pxor	%xmm15,%xmm3
-	psllq	$2,%xmm15
-	pxor	%xmm9,%xmm0
-	pxor	%xmm10,%xmm15
-	movdqa	%xmm5,%xmm9
-	psrlq	$4,%xmm5
-	movdqa	%xmm3,%xmm10
-	psrlq	$4,%xmm3
-	pxor	%xmm4,%xmm5
-	pxor	%xmm1,%xmm3
-	pand	%xmm7,%xmm5
-	pand	%xmm7,%xmm3
-	pxor	%xmm5,%xmm4
-	psllq	$4,%xmm5
-	pxor	%xmm3,%xmm1
-	psllq	$4,%xmm3
-	pxor	%xmm9,%xmm5
-	pxor	%xmm10,%xmm3
-	movdqa	%xmm0,%xmm9
-	psrlq	$4,%xmm0
-	movdqa	%xmm15,%xmm10
-	psrlq	$4,%xmm15
-	pxor	%xmm6,%xmm0
-	pxor	%xmm2,%xmm15
-	pand	%xmm7,%xmm0
-	pand	%xmm7,%xmm15
-	pxor	%xmm0,%xmm6
-	psllq	$4,%xmm0
-	pxor	%xmm15,%xmm2
-	psllq	$4,%xmm15
-	pxor	%xmm9,%xmm0
-	pxor	%xmm10,%xmm15
-	movdqa	(%rax),%xmm7
-	pxor	%xmm7,%xmm3
-	pxor	%xmm7,%xmm5
-	pxor	%xmm7,%xmm2
-	pxor	%xmm7,%xmm6
-	pxor	%xmm7,%xmm1
-	pxor	%xmm7,%xmm4
-	pxor	%xmm7,%xmm15
-	pxor	%xmm7,%xmm0
-	.byte	0xf3,0xc3
-.cfi_endproc	
-.size	_bsaes_encrypt8,.-_bsaes_encrypt8
-
-.type	_bsaes_decrypt8,@function
-.align	64
-_bsaes_decrypt8:
-.cfi_startproc	
-	leaq	.LBS0(%rip),%r11
-
-	movdqa	(%rax),%xmm8
-	leaq	16(%rax),%rax
-	movdqa	-48(%r11),%xmm7
-	pxor	%xmm8,%xmm15
-	pxor	%xmm8,%xmm0
-	pxor	%xmm8,%xmm1
-	pxor	%xmm8,%xmm2
-.byte	102,68,15,56,0,255
-.byte	102,15,56,0,199
-	pxor	%xmm8,%xmm3
-	pxor	%xmm8,%xmm4
-.byte	102,15,56,0,207
-.byte	102,15,56,0,215
-	pxor	%xmm8,%xmm5
-	pxor	%xmm8,%xmm6
-.byte	102,15,56,0,223
-.byte	102,15,56,0,231
-.byte	102,15,56,0,239
-.byte	102,15,56,0,247
-	movdqa	0(%r11),%xmm7
-	movdqa	16(%r11),%xmm8
-	movdqa	%xmm5,%xmm9
-	psrlq	$1,%xmm5
-	movdqa	%xmm3,%xmm10
-	psrlq	$1,%xmm3
-	pxor	%xmm6,%xmm5
-	pxor	%xmm4,%xmm3
-	pand	%xmm7,%xmm5
-	pand	%xmm7,%xmm3
-	pxor	%xmm5,%xmm6
-	psllq	$1,%xmm5
-	pxor	%xmm3,%xmm4
-	psllq	$1,%xmm3
-	pxor	%xmm9,%xmm5
-	pxor	%xmm10,%xmm3
-	movdqa	%xmm1,%xmm9
-	psrlq	$1,%xmm1
-	movdqa	%xmm15,%xmm10
-	psrlq	$1,%xmm15
-	pxor	%xmm2,%xmm1
-	pxor	%xmm0,%xmm15
-	pand	%xmm7,%xmm1
-	pand	%xmm7,%xmm15
-	pxor	%xmm1,%xmm2
-	psllq	$1,%xmm1
-	pxor	%xmm15,%xmm0
-	psllq	$1,%xmm15
-	pxor	%xmm9,%xmm1
-	pxor	%xmm10,%xmm15
-	movdqa	32(%r11),%xmm7
-	movdqa	%xmm4,%xmm9
-	psrlq	$2,%xmm4
-	movdqa	%xmm3,%xmm10
-	psrlq	$2,%xmm3
-	pxor	%xmm6,%xmm4
-	pxor	%xmm5,%xmm3
-	pand	%xmm8,%xmm4
-	pand	%xmm8,%xmm3
-	pxor	%xmm4,%xmm6
-	psllq	$2,%xmm4
-	pxor	%xmm3,%xmm5
-	psllq	$2,%xmm3
-	pxor	%xmm9,%xmm4
-	pxor	%xmm10,%xmm3
-	movdqa	%xmm0,%xmm9
-	psrlq	$2,%xmm0
-	movdqa	%xmm15,%xmm10
-	psrlq	$2,%xmm15
-	pxor	%xmm2,%xmm0
-	pxor	%xmm1,%xmm15
-	pand	%xmm8,%xmm0
-	pand	%xmm8,%xmm15
-	pxor	%xmm0,%xmm2
-	psllq	$2,%xmm0
-	pxor	%xmm15,%xmm1
-	psllq	$2,%xmm15
-	pxor	%xmm9,%xmm0
-	pxor	%xmm10,%xmm15
-	movdqa	%xmm2,%xmm9
-	psrlq	$4,%xmm2
-	movdqa	%xmm1,%xmm10
-	psrlq	$4,%xmm1
-	pxor	%xmm6,%xmm2
-	pxor	%xmm5,%xmm1
-	pand	%xmm7,%xmm2
-	pand	%xmm7,%xmm1
-	pxor	%xmm2,%xmm6
-	psllq	$4,%xmm2
-	pxor	%xmm1,%xmm5
-	psllq	$4,%xmm1
-	pxor	%xmm9,%xmm2
-	pxor	%xmm10,%xmm1
-	movdqa	%xmm0,%xmm9
-	psrlq	$4,%xmm0
-	movdqa	%xmm15,%xmm10
-	psrlq	$4,%xmm15
-	pxor	%xmm4,%xmm0
-	pxor	%xmm3,%xmm15
-	pand	%xmm7,%xmm0
-	pand	%xmm7,%xmm15
-	pxor	%xmm0,%xmm4
-	psllq	$4,%xmm0
-	pxor	%xmm15,%xmm3
-	psllq	$4,%xmm15
-	pxor	%xmm9,%xmm0
-	pxor	%xmm10,%xmm15
-	decl	%r10d
-	jmp	.Ldec_sbox
-.align	16
-.Ldec_loop:
-	pxor	0(%rax),%xmm15
-	pxor	16(%rax),%xmm0
-	pxor	32(%rax),%xmm1
-	pxor	48(%rax),%xmm2
-.byte	102,68,15,56,0,255
-.byte	102,15,56,0,199
-	pxor	64(%rax),%xmm3
-	pxor	80(%rax),%xmm4
-.byte	102,15,56,0,207
-.byte	102,15,56,0,215
-	pxor	96(%rax),%xmm5
-	pxor	112(%rax),%xmm6
-.byte	102,15,56,0,223
-.byte	102,15,56,0,231
-.byte	102,15,56,0,239
-.byte	102,15,56,0,247
-	leaq	128(%rax),%rax
-.Ldec_sbox:
-	pxor	%xmm3,%xmm2
-
-	pxor	%xmm6,%xmm3
-	pxor	%xmm6,%xmm1
-	pxor	%xmm3,%xmm5
-	pxor	%xmm5,%xmm6
-	pxor	%xmm6,%xmm0
-
-	pxor	%xmm0,%xmm15
-	pxor	%xmm4,%xmm1
-	pxor	%xmm15,%xmm2
-	pxor	%xmm15,%xmm4
-	pxor	%xmm2,%xmm0
-	movdqa	%xmm2,%xmm10
-	movdqa	%xmm6,%xmm9
-	movdqa	%xmm0,%xmm8
-	movdqa	%xmm3,%xmm12
-	movdqa	%xmm4,%xmm11
-
-	pxor	%xmm15,%xmm10
-	pxor	%xmm3,%xmm9
-	pxor	%xmm5,%xmm8
-	movdqa	%xmm10,%xmm13
-	pxor	%xmm15,%xmm12
-	movdqa	%xmm9,%xmm7
-	pxor	%xmm1,%xmm11
-	movdqa	%xmm10,%xmm14
-
-	por	%xmm8,%xmm9
-	por	%xmm11,%xmm10
-	pxor	%xmm7,%xmm14
-	pand	%xmm11,%xmm13
-	pxor	%xmm8,%xmm11
-	pand	%xmm8,%xmm7
-	pand	%xmm11,%xmm14
-	movdqa	%xmm5,%xmm11
-	pxor	%xmm1,%xmm11
-	pand	%xmm11,%xmm12
-	pxor	%xmm12,%xmm10
-	pxor	%xmm12,%xmm9
-	movdqa	%xmm2,%xmm12
-	movdqa	%xmm0,%xmm11
-	pxor	%xmm6,%xmm12
-	pxor	%xmm4,%xmm11
-	movdqa	%xmm12,%xmm8
-	pand	%xmm11,%xmm12
-	por	%xmm11,%xmm8
-	pxor	%xmm12,%xmm7
-	pxor	%xmm14,%xmm10
-	pxor	%xmm13,%xmm9
-	pxor	%xmm14,%xmm8
-	movdqa	%xmm3,%xmm11
-	pxor	%xmm13,%xmm7
-	movdqa	%xmm15,%xmm12
-	pxor	%xmm13,%xmm8
-	movdqa	%xmm6,%xmm13
-	pand	%xmm5,%xmm11
-	movdqa	%xmm2,%xmm14
-	pand	%xmm1,%xmm12
-	pand	%xmm0,%xmm13
-	por	%xmm4,%xmm14
-	pxor	%xmm11,%xmm10
-	pxor	%xmm12,%xmm9
-	pxor	%xmm13,%xmm8
-	pxor	%xmm14,%xmm7
-
-
-
-
-
-	movdqa	%xmm10,%xmm11
-	pand	%xmm8,%xmm10
-	pxor	%xmm9,%xmm11
-
-	movdqa	%xmm7,%xmm13
-	movdqa	%xmm11,%xmm14
-	pxor	%xmm10,%xmm13
-	pand	%xmm13,%xmm14
-
-	movdqa	%xmm8,%xmm12
-	pxor	%xmm9,%xmm14
-	pxor	%xmm7,%xmm12
-
-	pxor	%xmm9,%xmm10
-
-	pand	%xmm10,%xmm12
-
-	movdqa	%xmm13,%xmm9
-	pxor	%xmm7,%xmm12
-
-	pxor	%xmm12,%xmm9
-	pxor	%xmm12,%xmm8
-
-	pand	%xmm7,%xmm9
-
-	pxor	%xmm9,%xmm13
-	pxor	%xmm9,%xmm8
-
-	pand	%xmm14,%xmm13
-
-	pxor	%xmm11,%xmm13
-	movdqa	%xmm4,%xmm11
-	movdqa	%xmm0,%xmm7
-	movdqa	%xmm14,%xmm9
-	pxor	%xmm13,%xmm9
-	pand	%xmm4,%xmm9
-	pxor	%xmm0,%xmm4
-	pand	%xmm14,%xmm0
-	pand	%xmm13,%xmm4
-	pxor	%xmm0,%xmm4
-	pxor	%xmm9,%xmm0
-	pxor	%xmm1,%xmm11
-	pxor	%xmm5,%xmm7
-	pxor	%xmm12,%xmm14
-	pxor	%xmm8,%xmm13
-	movdqa	%xmm14,%xmm10
-	movdqa	%xmm12,%xmm9
-	pxor	%xmm13,%xmm10
-	pxor	%xmm8,%xmm9
-	pand	%xmm11,%xmm10
-	pand	%xmm1,%xmm9
-	pxor	%xmm7,%xmm11
-	pxor	%xmm5,%xmm1
-	pand	%xmm14,%xmm7
-	pand	%xmm12,%xmm5
-	pand	%xmm13,%xmm11
-	pand	%xmm8,%xmm1
-	pxor	%xmm11,%xmm7
-	pxor	%xmm5,%xmm1
-	pxor	%xmm10,%xmm11
-	pxor	%xmm9,%xmm5
-	pxor	%xmm11,%xmm4
-	pxor	%xmm11,%xmm1
-	pxor	%xmm7,%xmm0
-	pxor	%xmm7,%xmm5
-
-	movdqa	%xmm2,%xmm11
-	movdqa	%xmm6,%xmm7
-	pxor	%xmm15,%xmm11
-	pxor	%xmm3,%xmm7
-	movdqa	%xmm14,%xmm10
-	movdqa	%xmm12,%xmm9
-	pxor	%xmm13,%xmm10
-	pxor	%xmm8,%xmm9
-	pand	%xmm11,%xmm10
-	pand	%xmm15,%xmm9
-	pxor	%xmm7,%xmm11
-	pxor	%xmm3,%xmm15
-	pand	%xmm14,%xmm7
-	pand	%xmm12,%xmm3
-	pand	%xmm13,%xmm11
-	pand	%xmm8,%xmm15
-	pxor	%xmm11,%xmm7
-	pxor	%xmm3,%xmm15
-	pxor	%xmm10,%xmm11
-	pxor	%xmm9,%xmm3
-	pxor	%xmm12,%xmm14
-	pxor	%xmm8,%xmm13
-	movdqa	%xmm14,%xmm10
-	pxor	%xmm13,%xmm10
-	pand	%xmm2,%xmm10
-	pxor	%xmm6,%xmm2
-	pand	%xmm14,%xmm6
-	pand	%xmm13,%xmm2
-	pxor	%xmm6,%xmm2
-	pxor	%xmm10,%xmm6
-	pxor	%xmm11,%xmm2
-	pxor	%xmm11,%xmm15
-	pxor	%xmm7,%xmm6
-	pxor	%xmm7,%xmm3
-	pxor	%xmm6,%xmm0
-	pxor	%xmm4,%xmm5
-
-	pxor	%xmm0,%xmm3
-	pxor	%xmm6,%xmm1
-	pxor	%xmm6,%xmm4
-	pxor	%xmm1,%xmm3
-	pxor	%xmm15,%xmm6
-	pxor	%xmm4,%xmm3
-	pxor	%xmm5,%xmm2
-	pxor	%xmm0,%xmm5
-	pxor	%xmm3,%xmm2
-
-	pxor	%xmm15,%xmm3
-	pxor	%xmm2,%xmm6
-	decl	%r10d
-	jl	.Ldec_done
-
-	pshufd	$0x4E,%xmm15,%xmm7
-	pshufd	$0x4E,%xmm2,%xmm13
-	pxor	%xmm15,%xmm7
-	pshufd	$0x4E,%xmm4,%xmm14
-	pxor	%xmm2,%xmm13
-	pshufd	$0x4E,%xmm0,%xmm8
-	pxor	%xmm4,%xmm14
-	pshufd	$0x4E,%xmm5,%xmm9
-	pxor	%xmm0,%xmm8
-	pshufd	$0x4E,%xmm3,%xmm10
-	pxor	%xmm5,%xmm9
-	pxor	%xmm13,%xmm15
-	pxor	%xmm13,%xmm0
-	pshufd	$0x4E,%xmm1,%xmm11
-	pxor	%xmm3,%xmm10
-	pxor	%xmm7,%xmm5
-	pxor	%xmm8,%xmm3
-	pshufd	$0x4E,%xmm6,%xmm12
-	pxor	%xmm1,%xmm11
-	pxor	%xmm14,%xmm0
-	pxor	%xmm9,%xmm1
-	pxor	%xmm6,%xmm12
-
-	pxor	%xmm14,%xmm5
-	pxor	%xmm13,%xmm3
-	pxor	%xmm13,%xmm1
-	pxor	%xmm10,%xmm6
-	pxor	%xmm11,%xmm2
-	pxor	%xmm14,%xmm1
-	pxor	%xmm14,%xmm6
-	pxor	%xmm12,%xmm4
-	pshufd	$0x93,%xmm15,%xmm7
-	pshufd	$0x93,%xmm0,%xmm8
-	pxor	%xmm7,%xmm15
-	pshufd	$0x93,%xmm5,%xmm9
-	pxor	%xmm8,%xmm0
-	pshufd	$0x93,%xmm3,%xmm10
-	pxor	%xmm9,%xmm5
-	pshufd	$0x93,%xmm1,%xmm11
-	pxor	%xmm10,%xmm3
-	pshufd	$0x93,%xmm6,%xmm12
-	pxor	%xmm11,%xmm1
-	pshufd	$0x93,%xmm2,%xmm13
-	pxor	%xmm12,%xmm6
-	pshufd	$0x93,%xmm4,%xmm14
-	pxor	%xmm13,%xmm2
-	pxor	%xmm14,%xmm4
-
-	pxor	%xmm15,%xmm8
-	pxor	%xmm4,%xmm7
-	pxor	%xmm4,%xmm8
-	pshufd	$0x4E,%xmm15,%xmm15
-	pxor	%xmm0,%xmm9
-	pshufd	$0x4E,%xmm0,%xmm0
-	pxor	%xmm1,%xmm12
-	pxor	%xmm7,%xmm15
-	pxor	%xmm6,%xmm13
-	pxor	%xmm8,%xmm0
-	pxor	%xmm3,%xmm11
-	pshufd	$0x4E,%xmm1,%xmm7
-	pxor	%xmm2,%xmm14
-	pshufd	$0x4E,%xmm6,%xmm8
-	pxor	%xmm5,%xmm10
-	pshufd	$0x4E,%xmm3,%xmm1
-	pxor	%xmm4,%xmm10
-	pshufd	$0x4E,%xmm4,%xmm6
-	pxor	%xmm4,%xmm11
-	pshufd	$0x4E,%xmm2,%xmm3
-	pxor	%xmm11,%xmm7
-	pshufd	$0x4E,%xmm5,%xmm2
-	pxor	%xmm12,%xmm8
-	pxor	%xmm1,%xmm10
-	pxor	%xmm14,%xmm6
-	pxor	%xmm3,%xmm13
-	movdqa	%xmm7,%xmm3
-	pxor	%xmm9,%xmm2
-	movdqa	%xmm13,%xmm5
-	movdqa	%xmm8,%xmm4
-	movdqa	%xmm2,%xmm1
-	movdqa	%xmm10,%xmm2
-	movdqa	-16(%r11),%xmm7
-	jnz	.Ldec_loop
-	movdqa	-32(%r11),%xmm7
-	jmp	.Ldec_loop
-.align	16
-.Ldec_done:
-	movdqa	0(%r11),%xmm7
-	movdqa	16(%r11),%xmm8
-	movdqa	%xmm2,%xmm9
-	psrlq	$1,%xmm2
-	movdqa	%xmm1,%xmm10
-	psrlq	$1,%xmm1
-	pxor	%xmm4,%xmm2
-	pxor	%xmm6,%xmm1
-	pand	%xmm7,%xmm2
-	pand	%xmm7,%xmm1
-	pxor	%xmm2,%xmm4
-	psllq	$1,%xmm2
-	pxor	%xmm1,%xmm6
-	psllq	$1,%xmm1
-	pxor	%xmm9,%xmm2
-	pxor	%xmm10,%xmm1
-	movdqa	%xmm5,%xmm9
-	psrlq	$1,%xmm5
-	movdqa	%xmm15,%xmm10
-	psrlq	$1,%xmm15
-	pxor	%xmm3,%xmm5
-	pxor	%xmm0,%xmm15
-	pand	%xmm7,%xmm5
-	pand	%xmm7,%xmm15
-	pxor	%xmm5,%xmm3
-	psllq	$1,%xmm5
-	pxor	%xmm15,%xmm0
-	psllq	$1,%xmm15
-	pxor	%xmm9,%xmm5
-	pxor	%xmm10,%xmm15
-	movdqa	32(%r11),%xmm7
-	movdqa	%xmm6,%xmm9
-	psrlq	$2,%xmm6
-	movdqa	%xmm1,%xmm10
-	psrlq	$2,%xmm1
-	pxor	%xmm4,%xmm6
-	pxor	%xmm2,%xmm1
-	pand	%xmm8,%xmm6
-	pand	%xmm8,%xmm1
-	pxor	%xmm6,%xmm4
-	psllq	$2,%xmm6
-	pxor	%xmm1,%xmm2
-	psllq	$2,%xmm1
-	pxor	%xmm9,%xmm6
-	pxor	%xmm10,%xmm1
-	movdqa	%xmm0,%xmm9
-	psrlq	$2,%xmm0
-	movdqa	%xmm15,%xmm10
-	psrlq	$2,%xmm15
-	pxor	%xmm3,%xmm0
-	pxor	%xmm5,%xmm15
-	pand	%xmm8,%xmm0
-	pand	%xmm8,%xmm15
-	pxor	%xmm0,%xmm3
-	psllq	$2,%xmm0
-	pxor	%xmm15,%xmm5
-	psllq	$2,%xmm15
-	pxor	%xmm9,%xmm0
-	pxor	%xmm10,%xmm15
-	movdqa	%xmm3,%xmm9
-	psrlq	$4,%xmm3
-	movdqa	%xmm5,%xmm10
-	psrlq	$4,%xmm5
-	pxor	%xmm4,%xmm3
-	pxor	%xmm2,%xmm5
-	pand	%xmm7,%xmm3
-	pand	%xmm7,%xmm5
-	pxor	%xmm3,%xmm4
-	psllq	$4,%xmm3
-	pxor	%xmm5,%xmm2
-	psllq	$4,%xmm5
-	pxor	%xmm9,%xmm3
-	pxor	%xmm10,%xmm5
-	movdqa	%xmm0,%xmm9
-	psrlq	$4,%xmm0
-	movdqa	%xmm15,%xmm10
-	psrlq	$4,%xmm15
-	pxor	%xmm6,%xmm0
-	pxor	%xmm1,%xmm15
-	pand	%xmm7,%xmm0
-	pand	%xmm7,%xmm15
-	pxor	%xmm0,%xmm6
-	psllq	$4,%xmm0
-	pxor	%xmm15,%xmm1
-	psllq	$4,%xmm15
-	pxor	%xmm9,%xmm0
-	pxor	%xmm10,%xmm15
-	movdqa	(%rax),%xmm7
-	pxor	%xmm7,%xmm5
-	pxor	%xmm7,%xmm3
-	pxor	%xmm7,%xmm1
-	pxor	%xmm7,%xmm6
-	pxor	%xmm7,%xmm2
-	pxor	%xmm7,%xmm4
-	pxor	%xmm7,%xmm15
-	pxor	%xmm7,%xmm0
-	.byte	0xf3,0xc3
-.cfi_endproc	
-.size	_bsaes_decrypt8,.-_bsaes_decrypt8
-.type	_bsaes_key_convert,@function
-.align	16
-_bsaes_key_convert:
-.cfi_startproc	
-	leaq	.Lmasks(%rip),%r11
-	movdqu	(%rcx),%xmm7
-	leaq	16(%rcx),%rcx
-	movdqa	0(%r11),%xmm0
-	movdqa	16(%r11),%xmm1
-	movdqa	32(%r11),%xmm2
-	movdqa	48(%r11),%xmm3
-	movdqa	64(%r11),%xmm4
-	pcmpeqd	%xmm5,%xmm5
-
-	movdqu	(%rcx),%xmm6
-	movdqa	%xmm7,(%rax)
-	leaq	16(%rax),%rax
-	decl	%r10d
-	jmp	.Lkey_loop
-.align	16
-.Lkey_loop:
-.byte	102,15,56,0,244
-
-	movdqa	%xmm0,%xmm8
-	movdqa	%xmm1,%xmm9
-
-	pand	%xmm6,%xmm8
-	pand	%xmm6,%xmm9
-	movdqa	%xmm2,%xmm10
-	pcmpeqb	%xmm0,%xmm8
-	psllq	$4,%xmm0
-	movdqa	%xmm3,%xmm11
-	pcmpeqb	%xmm1,%xmm9
-	psllq	$4,%xmm1
-
-	pand	%xmm6,%xmm10
-	pand	%xmm6,%xmm11
-	movdqa	%xmm0,%xmm12
-	pcmpeqb	%xmm2,%xmm10
-	psllq	$4,%xmm2
-	movdqa	%xmm1,%xmm13
-	pcmpeqb	%xmm3,%xmm11
-	psllq	$4,%xmm3
-
-	movdqa	%xmm2,%xmm14
-	movdqa	%xmm3,%xmm15
-	pxor	%xmm5,%xmm8
-	pxor	%xmm5,%xmm9
-
-	pand	%xmm6,%xmm12
-	pand	%xmm6,%xmm13
-	movdqa	%xmm8,0(%rax)
-	pcmpeqb	%xmm0,%xmm12
-	psrlq	$4,%xmm0
-	movdqa	%xmm9,16(%rax)
-	pcmpeqb	%xmm1,%xmm13
-	psrlq	$4,%xmm1
-	leaq	16(%rcx),%rcx
-
-	pand	%xmm6,%xmm14
-	pand	%xmm6,%xmm15
-	movdqa	%xmm10,32(%rax)
-	pcmpeqb	%xmm2,%xmm14
-	psrlq	$4,%xmm2
-	movdqa	%xmm11,48(%rax)
-	pcmpeqb	%xmm3,%xmm15
-	psrlq	$4,%xmm3
-	movdqu	(%rcx),%xmm6
-
-	pxor	%xmm5,%xmm13
-	pxor	%xmm5,%xmm14
-	movdqa	%xmm12,64(%rax)
-	movdqa	%xmm13,80(%rax)
-	movdqa	%xmm14,96(%rax)
-	movdqa	%xmm15,112(%rax)
-	leaq	128(%rax),%rax
-	decl	%r10d
-	jnz	.Lkey_loop
-
-	movdqa	80(%r11),%xmm7
-
-	.byte	0xf3,0xc3
-.cfi_endproc	
-.size	_bsaes_key_convert,.-_bsaes_key_convert
-
-.globl	bsaes_cbc_encrypt
-.type	bsaes_cbc_encrypt,@function
-.align	16
-bsaes_cbc_encrypt:
-.cfi_startproc	
-	cmpl	$0,%r9d
-	jne	asm_AES_cbc_encrypt
-	cmpq	$128,%rdx
-	jb	asm_AES_cbc_encrypt
-
-	movq	%rsp,%rax
-.Lcbc_dec_prologue:
-	pushq	%rbp
-.cfi_adjust_cfa_offset	8
-.cfi_offset	%rbp,-16
-	pushq	%rbx
-.cfi_adjust_cfa_offset	8
-.cfi_offset	%rbx,-24
-	pushq	%r12
-.cfi_adjust_cfa_offset	8
-.cfi_offset	%r12,-32
-	pushq	%r13
-.cfi_adjust_cfa_offset	8
-.cfi_offset	%r13,-40
-	pushq	%r14
-.cfi_adjust_cfa_offset	8
-.cfi_offset	%r14,-48
-	pushq	%r15
-.cfi_adjust_cfa_offset	8
-.cfi_offset	%r15,-56
-	leaq	-72(%rsp),%rsp
-.cfi_adjust_cfa_offset	0x48
-	movq	%rsp,%rbp
-.cfi_def_cfa_register	%rbp
-	movl	240(%rcx),%eax
-	movq	%rdi,%r12
-	movq	%rsi,%r13
-	movq	%rdx,%r14
-	movq	%rcx,%r15
-	movq	%r8,%rbx
-	shrq	$4,%r14
-
-	movl	%eax,%edx
-	shlq	$7,%rax
-	subq	$96,%rax
-	subq	%rax,%rsp
-
-	movq	%rsp,%rax
-	movq	%r15,%rcx
-	movl	%edx,%r10d
-	call	_bsaes_key_convert
-	pxor	(%rsp),%xmm7
-	movdqa	%xmm6,(%rax)
-	movdqa	%xmm7,(%rsp)
-
-	movdqu	(%rbx),%xmm14
-	subq	$8,%r14
-.Lcbc_dec_loop:
-	movdqu	0(%r12),%xmm15
-	movdqu	16(%r12),%xmm0
-	movdqu	32(%r12),%xmm1
-	movdqu	48(%r12),%xmm2
-	movdqu	64(%r12),%xmm3
-	movdqu	80(%r12),%xmm4
-	movq	%rsp,%rax
-	movdqu	96(%r12),%xmm5
-	movl	%edx,%r10d
-	movdqu	112(%r12),%xmm6
-	movdqa	%xmm14,32(%rbp)
-
-	call	_bsaes_decrypt8
-
-	pxor	32(%rbp),%xmm15
-	movdqu	0(%r12),%xmm7
-	movdqu	16(%r12),%xmm8
-	pxor	%xmm7,%xmm0
-	movdqu	32(%r12),%xmm9
-	pxor	%xmm8,%xmm5
-	movdqu	48(%r12),%xmm10
-	pxor	%xmm9,%xmm3
-	movdqu	64(%r12),%xmm11
-	pxor	%xmm10,%xmm1
-	movdqu	80(%r12),%xmm12
-	pxor	%xmm11,%xmm6
-	movdqu	96(%r12),%xmm13
-	pxor	%xmm12,%xmm2
-	movdqu	112(%r12),%xmm14
-	pxor	%xmm13,%xmm4
-	movdqu	%xmm15,0(%r13)
-	leaq	128(%r12),%r12
-	movdqu	%xmm0,16(%r13)
-	movdqu	%xmm5,32(%r13)
-	movdqu	%xmm3,48(%r13)
-	movdqu	%xmm1,64(%r13)
-	movdqu	%xmm6,80(%r13)
-	movdqu	%xmm2,96(%r13)
-	movdqu	%xmm4,112(%r13)
-	leaq	128(%r13),%r13
-	subq	$8,%r14
-	jnc	.Lcbc_dec_loop
-
-	addq	$8,%r14
-	jz	.Lcbc_dec_done
-
-	movdqu	0(%r12),%xmm15
-	movq	%rsp,%rax
-	movl	%edx,%r10d
-	cmpq	$2,%r14
-	jb	.Lcbc_dec_one
-	movdqu	16(%r12),%xmm0
-	je	.Lcbc_dec_two
-	movdqu	32(%r12),%xmm1
-	cmpq	$4,%r14
-	jb	.Lcbc_dec_three
-	movdqu	48(%r12),%xmm2
-	je	.Lcbc_dec_four
-	movdqu	64(%r12),%xmm3
-	cmpq	$6,%r14
-	jb	.Lcbc_dec_five
-	movdqu	80(%r12),%xmm4
-	je	.Lcbc_dec_six
-	movdqu	96(%r12),%xmm5
-	movdqa	%xmm14,32(%rbp)
-	call	_bsaes_decrypt8
-	pxor	32(%rbp),%xmm15
-	movdqu	0(%r12),%xmm7
-	movdqu	16(%r12),%xmm8
-	pxor	%xmm7,%xmm0
-	movdqu	32(%r12),%xmm9
-	pxor	%xmm8,%xmm5
-	movdqu	48(%r12),%xmm10
-	pxor	%xmm9,%xmm3
-	movdqu	64(%r12),%xmm11
-	pxor	%xmm10,%xmm1
-	movdqu	80(%r12),%xmm12
-	pxor	%xmm11,%xmm6
-	movdqu	96(%r12),%xmm14
-	pxor	%xmm12,%xmm2
-	movdqu	%xmm15,0(%r13)
-	movdqu	%xmm0,16(%r13)
-	movdqu	%xmm5,32(%r13)
-	movdqu	%xmm3,48(%r13)
-	movdqu	%xmm1,64(%r13)
-	movdqu	%xmm6,80(%r13)
-	movdqu	%xmm2,96(%r13)
-	jmp	.Lcbc_dec_done
-.align	16
-.Lcbc_dec_six:
-	movdqa	%xmm14,32(%rbp)
-	call	_bsaes_decrypt8
-	pxor	32(%rbp),%xmm15
-	movdqu	0(%r12),%xmm7
-	movdqu	16(%r12),%xmm8
-	pxor	%xmm7,%xmm0
-	movdqu	32(%r12),%xmm9
-	pxor	%xmm8,%xmm5
-	movdqu	48(%r12),%xmm10
-	pxor	%xmm9,%xmm3
-	movdqu	64(%r12),%xmm11
-	pxor	%xmm10,%xmm1
-	movdqu	80(%r12),%xmm14
-	pxor	%xmm11,%xmm6
-	movdqu	%xmm15,0(%r13)
-	movdqu	%xmm0,16(%r13)
-	movdqu	%xmm5,32(%r13)
-	movdqu	%xmm3,48(%r13)
-	movdqu	%xmm1,64(%r13)
-	movdqu	%xmm6,80(%r13)
-	jmp	.Lcbc_dec_done
-.align	16
-.Lcbc_dec_five:
-	movdqa	%xmm14,32(%rbp)
-	call	_bsaes_decrypt8
-	pxor	32(%rbp),%xmm15
-	movdqu	0(%r12),%xmm7
-	movdqu	16(%r12),%xmm8
-	pxor	%xmm7,%xmm0
-	movdqu	32(%r12),%xmm9
-	pxor	%xmm8,%xmm5
-	movdqu	48(%r12),%xmm10
-	pxor	%xmm9,%xmm3
-	movdqu	64(%r12),%xmm14
-	pxor	%xmm10,%xmm1
-	movdqu	%xmm15,0(%r13)
-	movdqu	%xmm0,16(%r13)
-	movdqu	%xmm5,32(%r13)
-	movdqu	%xmm3,48(%r13)
-	movdqu	%xmm1,64(%r13)
-	jmp	.Lcbc_dec_done
-.align	16
-.Lcbc_dec_four:
-	movdqa	%xmm14,32(%rbp)
-	call	_bsaes_decrypt8
-	pxor	32(%rbp),%xmm15
-	movdqu	0(%r12),%xmm7
-	movdqu	16(%r12),%xmm8
-	pxor	%xmm7,%xmm0
-	movdqu	32(%r12),%xmm9
-	pxor	%xmm8,%xmm5
-	movdqu	48(%r12),%xmm14
-	pxor	%xmm9,%xmm3
-	movdqu	%xmm15,0(%r13)
-	movdqu	%xmm0,16(%r13)
-	movdqu	%xmm5,32(%r13)
-	movdqu	%xmm3,48(%r13)
-	jmp	.Lcbc_dec_done
-.align	16
-.Lcbc_dec_three:
-	movdqa	%xmm14,32(%rbp)
-	call	_bsaes_decrypt8
-	pxor	32(%rbp),%xmm15
-	movdqu	0(%r12),%xmm7
-	movdqu	16(%r12),%xmm8
-	pxor	%xmm7,%xmm0
-	movdqu	32(%r12),%xmm14
-	pxor	%xmm8,%xmm5
-	movdqu	%xmm15,0(%r13)
-	movdqu	%xmm0,16(%r13)
-	movdqu	%xmm5,32(%r13)
-	jmp	.Lcbc_dec_done
-.align	16
-.Lcbc_dec_two:
-	movdqa	%xmm14,32(%rbp)
-	call	_bsaes_decrypt8
-	pxor	32(%rbp),%xmm15
-	movdqu	0(%r12),%xmm7
-	movdqu	16(%r12),%xmm14
-	pxor	%xmm7,%xmm0
-	movdqu	%xmm15,0(%r13)
-	movdqu	%xmm0,16(%r13)
-	jmp	.Lcbc_dec_done
-.align	16
-.Lcbc_dec_one:
-	leaq	(%r12),%rdi
-	leaq	32(%rbp),%rsi
-	leaq	(%r15),%rdx
-	call	asm_AES_decrypt
-	pxor	32(%rbp),%xmm14
-	movdqu	%xmm14,(%r13)
-	movdqa	%xmm15,%xmm14
-
-.Lcbc_dec_done:
-	movdqu	%xmm14,(%rbx)
-	leaq	(%rsp),%rax
-	pxor	%xmm0,%xmm0
-.Lcbc_dec_bzero:
-	movdqa	%xmm0,0(%rax)
-	movdqa	%xmm0,16(%rax)
-	leaq	32(%rax),%rax
-	cmpq	%rax,%rbp
-	ja	.Lcbc_dec_bzero
-
-	leaq	120(%rbp),%rax
-.cfi_def_cfa	%rax,8
-	movq	-48(%rax),%r15
-.cfi_restore	%r15
-	movq	-40(%rax),%r14
-.cfi_restore	%r14
-	movq	-32(%rax),%r13
-.cfi_restore	%r13
-	movq	-24(%rax),%r12
-.cfi_restore	%r12
-	movq	-16(%rax),%rbx
-.cfi_restore	%rbx
-	movq	-8(%rax),%rbp
-.cfi_restore	%rbp
-	leaq	(%rax),%rsp
-.cfi_def_cfa_register	%rsp
-.Lcbc_dec_epilogue:
-	.byte	0xf3,0xc3
-.cfi_endproc	
-.size	bsaes_cbc_encrypt,.-bsaes_cbc_encrypt
-
-.globl	bsaes_ctr32_encrypt_blocks
-.type	bsaes_ctr32_encrypt_blocks,@function
-.align	16
-bsaes_ctr32_encrypt_blocks:
-.cfi_startproc	
-	movq	%rsp,%rax
-.Lctr_enc_prologue:
-	pushq	%rbp
-.cfi_adjust_cfa_offset	8
-.cfi_offset	%rbp,-16
-	pushq	%rbx
-.cfi_adjust_cfa_offset	8
-.cfi_offset	%rbx,-24
-	pushq	%r12
-.cfi_adjust_cfa_offset	8
-.cfi_offset	%r12,-32
-	pushq	%r13
-.cfi_adjust_cfa_offset	8
-.cfi_offset	%r13,-40
-	pushq	%r14
-.cfi_adjust_cfa_offset	8
-.cfi_offset	%r14,-48
-	pushq	%r15
-.cfi_adjust_cfa_offset	8
-.cfi_offset	%r15,-56
-	leaq	-72(%rsp),%rsp
-.cfi_adjust_cfa_offset	0x48
-	movq	%rsp,%rbp
-.cfi_def_cfa_register	%rbp
-	movdqu	(%r8),%xmm0
-	movl	240(%rcx),%eax
-	movq	%rdi,%r12
-	movq	%rsi,%r13
-	movq	%rdx,%r14
-	movq	%rcx,%r15
-	movdqa	%xmm0,32(%rbp)
-	cmpq	$8,%rdx
-	jb	.Lctr_enc_short
-
-	movl	%eax,%ebx
-	shlq	$7,%rax
-	subq	$96,%rax
-	subq	%rax,%rsp
-
-	movq	%rsp,%rax
-	movq	%r15,%rcx
-	movl	%ebx,%r10d
-	call	_bsaes_key_convert
-	pxor	%xmm6,%xmm7
-	movdqa	%xmm7,(%rax)
-
-	movdqa	(%rsp),%xmm8
-	leaq	.LADD1(%rip),%r11
-	movdqa	32(%rbp),%xmm15
-	movdqa	-32(%r11),%xmm7
-.byte	102,68,15,56,0,199
-.byte	102,68,15,56,0,255
-	movdqa	%xmm8,(%rsp)
-	jmp	.Lctr_enc_loop
-.align	16
-.Lctr_enc_loop:
-	movdqa	%xmm15,32(%rbp)
-	movdqa	%xmm15,%xmm0
-	movdqa	%xmm15,%xmm1
-	paddd	0(%r11),%xmm0
-	movdqa	%xmm15,%xmm2
-	paddd	16(%r11),%xmm1
-	movdqa	%xmm15,%xmm3
-	paddd	32(%r11),%xmm2
-	movdqa	%xmm15,%xmm4
-	paddd	48(%r11),%xmm3
-	movdqa	%xmm15,%xmm5
-	paddd	64(%r11),%xmm4
-	movdqa	%xmm15,%xmm6
-	paddd	80(%r11),%xmm5
-	paddd	96(%r11),%xmm6
-
-
-
-	movdqa	(%rsp),%xmm8
-	leaq	16(%rsp),%rax
-	movdqa	-16(%r11),%xmm7
-	pxor	%xmm8,%xmm15
-	pxor	%xmm8,%xmm0
-	pxor	%xmm8,%xmm1
-	pxor	%xmm8,%xmm2
-.byte	102,68,15,56,0,255
-.byte	102,15,56,0,199
-	pxor	%xmm8,%xmm3
-	pxor	%xmm8,%xmm4
-.byte	102,15,56,0,207
-.byte	102,15,56,0,215
-	pxor	%xmm8,%xmm5
-	pxor	%xmm8,%xmm6
-.byte	102,15,56,0,223
-.byte	102,15,56,0,231
-.byte	102,15,56,0,239
-.byte	102,15,56,0,247
-	leaq	.LBS0(%rip),%r11
-	movl	%ebx,%r10d
-
-	call	_bsaes_encrypt8_bitslice
-
-	subq	$8,%r14
-	jc	.Lctr_enc_loop_done
-
-	movdqu	0(%r12),%xmm7
-	movdqu	16(%r12),%xmm8
-	movdqu	32(%r12),%xmm9
-	movdqu	48(%r12),%xmm10
-	movdqu	64(%r12),%xmm11
-	movdqu	80(%r12),%xmm12
-	movdqu	96(%r12),%xmm13
-	movdqu	112(%r12),%xmm14
-	leaq	128(%r12),%r12
-	pxor	%xmm15,%xmm7
-	movdqa	32(%rbp),%xmm15
-	pxor	%xmm8,%xmm0
-	movdqu	%xmm7,0(%r13)
-	pxor	%xmm9,%xmm3
-	movdqu	%xmm0,16(%r13)
-	pxor	%xmm10,%xmm5
-	movdqu	%xmm3,32(%r13)
-	pxor	%xmm11,%xmm2
-	movdqu	%xmm5,48(%r13)
-	pxor	%xmm12,%xmm6
-	movdqu	%xmm2,64(%r13)
-	pxor	%xmm13,%xmm1
-	movdqu	%xmm6,80(%r13)
-	pxor	%xmm14,%xmm4
-	movdqu	%xmm1,96(%r13)
-	leaq	.LADD1(%rip),%r11
-	movdqu	%xmm4,112(%r13)
-	leaq	128(%r13),%r13
-	paddd	112(%r11),%xmm15
-	jnz	.Lctr_enc_loop
-
-	jmp	.Lctr_enc_done
-.align	16
-.Lctr_enc_loop_done:
-	addq	$8,%r14
-	movdqu	0(%r12),%xmm7
-	pxor	%xmm7,%xmm15
-	movdqu	%xmm15,0(%r13)
-	cmpq	$2,%r14
-	jb	.Lctr_enc_done
-	movdqu	16(%r12),%xmm8
-	pxor	%xmm8,%xmm0
-	movdqu	%xmm0,16(%r13)
-	je	.Lctr_enc_done
-	movdqu	32(%r12),%xmm9
-	pxor	%xmm9,%xmm3
-	movdqu	%xmm3,32(%r13)
-	cmpq	$4,%r14
-	jb	.Lctr_enc_done
-	movdqu	48(%r12),%xmm10
-	pxor	%xmm10,%xmm5
-	movdqu	%xmm5,48(%r13)
-	je	.Lctr_enc_done
-	movdqu	64(%r12),%xmm11
-	pxor	%xmm11,%xmm2
-	movdqu	%xmm2,64(%r13)
-	cmpq	$6,%r14
-	jb	.Lctr_enc_done
-	movdqu	80(%r12),%xmm12
-	pxor	%xmm12,%xmm6
-	movdqu	%xmm6,80(%r13)
-	je	.Lctr_enc_done
-	movdqu	96(%r12),%xmm13
-	pxor	%xmm13,%xmm1
-	movdqu	%xmm1,96(%r13)
-	jmp	.Lctr_enc_done
-
-.align	16
-.Lctr_enc_short:
-	leaq	32(%rbp),%rdi
-	leaq	48(%rbp),%rsi
-	leaq	(%r15),%rdx
-	call	asm_AES_encrypt
-	movdqu	(%r12),%xmm0
-	leaq	16(%r12),%r12
-	movl	44(%rbp),%eax
-	bswapl	%eax
-	pxor	48(%rbp),%xmm0
-	incl	%eax
-	movdqu	%xmm0,(%r13)
-	bswapl	%eax
-	leaq	16(%r13),%r13
-	movl	%eax,44(%rsp)
-	decq	%r14
-	jnz	.Lctr_enc_short
-
-.Lctr_enc_done:
-	leaq	(%rsp),%rax
-	pxor	%xmm0,%xmm0
-.Lctr_enc_bzero:
-	movdqa	%xmm0,0(%rax)
-	movdqa	%xmm0,16(%rax)
-	leaq	32(%rax),%rax
-	cmpq	%rax,%rbp
-	ja	.Lctr_enc_bzero
-
-	leaq	120(%rbp),%rax
-.cfi_def_cfa	%rax,8
-	movq	-48(%rax),%r15
-.cfi_restore	%r15
-	movq	-40(%rax),%r14
-.cfi_restore	%r14
-	movq	-32(%rax),%r13
-.cfi_restore	%r13
-	movq	-24(%rax),%r12
-.cfi_restore	%r12
-	movq	-16(%rax),%rbx
-.cfi_restore	%rbx
-	movq	-8(%rax),%rbp
-.cfi_restore	%rbp
-	leaq	(%rax),%rsp
-.cfi_def_cfa_register	%rsp
-.Lctr_enc_epilogue:
-	.byte	0xf3,0xc3
-.cfi_endproc	
-.size	bsaes_ctr32_encrypt_blocks,.-bsaes_ctr32_encrypt_blocks
-.globl	bsaes_xts_encrypt
-.type	bsaes_xts_encrypt,@function
-.align	16
-bsaes_xts_encrypt:
-.cfi_startproc	
-	movq	%rsp,%rax
-.Lxts_enc_prologue:
-	pushq	%rbp
-.cfi_adjust_cfa_offset	8
-.cfi_offset	%rbp,-16
-	pushq	%rbx
-.cfi_adjust_cfa_offset	8
-.cfi_offset	%rbx,-24
-	pushq	%r12
-.cfi_adjust_cfa_offset	8
-.cfi_offset	%r12,-32
-	pushq	%r13
-.cfi_adjust_cfa_offset	8
-.cfi_offset	%r13,-40
-	pushq	%r14
-.cfi_adjust_cfa_offset	8
-.cfi_offset	%r14,-48
-	pushq	%r15
-.cfi_adjust_cfa_offset	8
-.cfi_offset	%r15,-56
-	leaq	-72(%rsp),%rsp
-.cfi_adjust_cfa_offset	0x48
-	movq	%rsp,%rbp
-.cfi_def_cfa_register	%rbp
-	movq	%rdi,%r12
-	movq	%rsi,%r13
-	movq	%rdx,%r14
-	movq	%rcx,%r15
-
-	leaq	(%r9),%rdi
-	leaq	32(%rbp),%rsi
-	leaq	(%r8),%rdx
-	call	asm_AES_encrypt
-
-	movl	240(%r15),%eax
-	movq	%r14,%rbx
-
-	movl	%eax,%edx
-	shlq	$7,%rax
-	subq	$96,%rax
-	subq	%rax,%rsp
-
-	movq	%rsp,%rax
-	movq	%r15,%rcx
-	movl	%edx,%r10d
-	call	_bsaes_key_convert
-	pxor	%xmm6,%xmm7
-	movdqa	%xmm7,(%rax)
-
-	andq	$-16,%r14
-	subq	$0x80,%rsp
-	movdqa	32(%rbp),%xmm6
-
-	pxor	%xmm14,%xmm14
-	movdqa	.Lxts_magic(%rip),%xmm12
-	pcmpgtd	%xmm6,%xmm14
-
-	subq	$0x80,%r14
-	jc	.Lxts_enc_short
-	jmp	.Lxts_enc_loop
-
-.align	16
-.Lxts_enc_loop:
-	pshufd	$0x13,%xmm14,%xmm13
-	pxor	%xmm14,%xmm14
-	movdqa	%xmm6,%xmm15
-	movdqa	%xmm6,0(%rsp)
-	paddq	%xmm6,%xmm6
-	pand	%xmm12,%xmm13
-	pcmpgtd	%xmm6,%xmm14
-	pxor	%xmm13,%xmm6
-	pshufd	$0x13,%xmm14,%xmm13
-	pxor	%xmm14,%xmm14
-	movdqa	%xmm6,%xmm0
-	movdqa	%xmm6,16(%rsp)
-	paddq	%xmm6,%xmm6
-	pand	%xmm12,%xmm13
-	pcmpgtd	%xmm6,%xmm14
-	pxor	%xmm13,%xmm6
-	movdqu	0(%r12),%xmm7
-	pshufd	$0x13,%xmm14,%xmm13
-	pxor	%xmm14,%xmm14
-	movdqa	%xmm6,%xmm1
-	movdqa	%xmm6,32(%rsp)
-	paddq	%xmm6,%xmm6
-	pand	%xmm12,%xmm13
-	pcmpgtd	%xmm6,%xmm14
-	pxor	%xmm13,%xmm6
-	movdqu	16(%r12),%xmm8
-	pxor	%xmm7,%xmm15
-	pshufd	$0x13,%xmm14,%xmm13
-	pxor	%xmm14,%xmm14
-	movdqa	%xmm6,%xmm2
-	movdqa	%xmm6,48(%rsp)
-	paddq	%xmm6,%xmm6
-	pand	%xmm12,%xmm13
-	pcmpgtd	%xmm6,%xmm14
-	pxor	%xmm13,%xmm6
-	movdqu	32(%r12),%xmm9
-	pxor	%xmm8,%xmm0
-	pshufd	$0x13,%xmm14,%xmm13
-	pxor	%xmm14,%xmm14
-	movdqa	%xmm6,%xmm3
-	movdqa	%xmm6,64(%rsp)
-	paddq	%xmm6,%xmm6
-	pand	%xmm12,%xmm13
-	pcmpgtd	%xmm6,%xmm14
-	pxor	%xmm13,%xmm6
-	movdqu	48(%r12),%xmm10
-	pxor	%xmm9,%xmm1
-	pshufd	$0x13,%xmm14,%xmm13
-	pxor	%xmm14,%xmm14
-	movdqa	%xmm6,%xmm4
-	movdqa	%xmm6,80(%rsp)
-	paddq	%xmm6,%xmm6
-	pand	%xmm12,%xmm13
-	pcmpgtd	%xmm6,%xmm14
-	pxor	%xmm13,%xmm6
-	movdqu	64(%r12),%xmm11
-	pxor	%xmm10,%xmm2
-	pshufd	$0x13,%xmm14,%xmm13
-	pxor	%xmm14,%xmm14
-	movdqa	%xmm6,%xmm5
-	movdqa	%xmm6,96(%rsp)
-	paddq	%xmm6,%xmm6
-	pand	%xmm12,%xmm13
-	pcmpgtd	%xmm6,%xmm14
-	pxor	%xmm13,%xmm6
-	movdqu	80(%r12),%xmm12
-	pxor	%xmm11,%xmm3
-	movdqu	96(%r12),%xmm13
-	pxor	%xmm12,%xmm4
-	movdqu	112(%r12),%xmm14
-	leaq	128(%r12),%r12
-	movdqa	%xmm6,112(%rsp)
-	pxor	%xmm13,%xmm5
-	leaq	128(%rsp),%rax
-	pxor	%xmm14,%xmm6
-	movl	%edx,%r10d
-
-	call	_bsaes_encrypt8
-
-	pxor	0(%rsp),%xmm15
-	pxor	16(%rsp),%xmm0
-	movdqu	%xmm15,0(%r13)
-	pxor	32(%rsp),%xmm3
-	movdqu	%xmm0,16(%r13)
-	pxor	48(%rsp),%xmm5
-	movdqu	%xmm3,32(%r13)
-	pxor	64(%rsp),%xmm2
-	movdqu	%xmm5,48(%r13)
-	pxor	80(%rsp),%xmm6
-	movdqu	%xmm2,64(%r13)
-	pxor	96(%rsp),%xmm1
-	movdqu	%xmm6,80(%r13)
-	pxor	112(%rsp),%xmm4
-	movdqu	%xmm1,96(%r13)
-	movdqu	%xmm4,112(%r13)
-	leaq	128(%r13),%r13
-
-	movdqa	112(%rsp),%xmm6
-	pxor	%xmm14,%xmm14
-	movdqa	.Lxts_magic(%rip),%xmm12
-	pcmpgtd	%xmm6,%xmm14
-	pshufd	$0x13,%xmm14,%xmm13
-	pxor	%xmm14,%xmm14
-	paddq	%xmm6,%xmm6
-	pand	%xmm12,%xmm13
-	pcmpgtd	%xmm6,%xmm14
-	pxor	%xmm13,%xmm6
-
-	subq	$0x80,%r14
-	jnc	.Lxts_enc_loop
-
-.Lxts_enc_short:
-	addq	$0x80,%r14
-	jz	.Lxts_enc_done
-	pshufd	$0x13,%xmm14,%xmm13
-	pxor	%xmm14,%xmm14
-	movdqa	%xmm6,%xmm15
-	movdqa	%xmm6,0(%rsp)
-	paddq	%xmm6,%xmm6
-	pand	%xmm12,%xmm13
-	pcmpgtd	%xmm6,%xmm14
-	pxor	%xmm13,%xmm6
-	pshufd	$0x13,%xmm14,%xmm13
-	pxor	%xmm14,%xmm14
-	movdqa	%xmm6,%xmm0
-	movdqa	%xmm6,16(%rsp)
-	paddq	%xmm6,%xmm6
-	pand	%xmm12,%xmm13
-	pcmpgtd	%xmm6,%xmm14
-	pxor	%xmm13,%xmm6
-	movdqu	0(%r12),%xmm7
-	cmpq	$16,%r14
-	je	.Lxts_enc_1
-	pshufd	$0x13,%xmm14,%xmm13
-	pxor	%xmm14,%xmm14
-	movdqa	%xmm6,%xmm1
-	movdqa	%xmm6,32(%rsp)
-	paddq	%xmm6,%xmm6
-	pand	%xmm12,%xmm13
-	pcmpgtd	%xmm6,%xmm14
-	pxor	%xmm13,%xmm6
-	movdqu	16(%r12),%xmm8
-	cmpq	$32,%r14
-	je	.Lxts_enc_2
-	pxor	%xmm7,%xmm15
-	pshufd	$0x13,%xmm14,%xmm13
-	pxor	%xmm14,%xmm14
-	movdqa	%xmm6,%xmm2
-	movdqa	%xmm6,48(%rsp)
-	paddq	%xmm6,%xmm6
-	pand	%xmm12,%xmm13
-	pcmpgtd	%xmm6,%xmm14
-	pxor	%xmm13,%xmm6
-	movdqu	32(%r12),%xmm9
-	cmpq	$48,%r14
-	je	.Lxts_enc_3
-	pxor	%xmm8,%xmm0
-	pshufd	$0x13,%xmm14,%xmm13
-	pxor	%xmm14,%xmm14
-	movdqa	%xmm6,%xmm3
-	movdqa	%xmm6,64(%rsp)
-	paddq	%xmm6,%xmm6
-	pand	%xmm12,%xmm13
-	pcmpgtd	%xmm6,%xmm14
-	pxor	%xmm13,%xmm6
-	movdqu	48(%r12),%xmm10
-	cmpq	$64,%r14
-	je	.Lxts_enc_4
-	pxor	%xmm9,%xmm1
-	pshufd	$0x13,%xmm14,%xmm13
-	pxor	%xmm14,%xmm14
-	movdqa	%xmm6,%xmm4
-	movdqa	%xmm6,80(%rsp)
-	paddq	%xmm6,%xmm6
-	pand	%xmm12,%xmm13
-	pcmpgtd	%xmm6,%xmm14
-	pxor	%xmm13,%xmm6
-	movdqu	64(%r12),%xmm11
-	cmpq	$80,%r14
-	je	.Lxts_enc_5
-	pxor	%xmm10,%xmm2
-	pshufd	$0x13,%xmm14,%xmm13
-	pxor	%xmm14,%xmm14
-	movdqa	%xmm6,%xmm5
-	movdqa	%xmm6,96(%rsp)
-	paddq	%xmm6,%xmm6
-	pand	%xmm12,%xmm13
-	pcmpgtd	%xmm6,%xmm14
-	pxor	%xmm13,%xmm6
-	movdqu	80(%r12),%xmm12
-	cmpq	$96,%r14
-	je	.Lxts_enc_6
-	pxor	%xmm11,%xmm3
-	movdqu	96(%r12),%xmm13
-	pxor	%xmm12,%xmm4
-	movdqa	%xmm6,112(%rsp)
-	leaq	112(%r12),%r12
-	pxor	%xmm13,%xmm5
-	leaq	128(%rsp),%rax
-	movl	%edx,%r10d
-
-	call	_bsaes_encrypt8
-
-	pxor	0(%rsp),%xmm15
-	pxor	16(%rsp),%xmm0
-	movdqu	%xmm15,0(%r13)
-	pxor	32(%rsp),%xmm3
-	movdqu	%xmm0,16(%r13)
-	pxor	48(%rsp),%xmm5
-	movdqu	%xmm3,32(%r13)
-	pxor	64(%rsp),%xmm2
-	movdqu	%xmm5,48(%r13)
-	pxor	80(%rsp),%xmm6
-	movdqu	%xmm2,64(%r13)
-	pxor	96(%rsp),%xmm1
-	movdqu	%xmm6,80(%r13)
-	movdqu	%xmm1,96(%r13)
-	leaq	112(%r13),%r13
-
-	movdqa	112(%rsp),%xmm6
-	jmp	.Lxts_enc_done
-.align	16
-.Lxts_enc_6:
-	pxor	%xmm11,%xmm3
-	leaq	96(%r12),%r12
-	pxor	%xmm12,%xmm4
-	leaq	128(%rsp),%rax
-	movl	%edx,%r10d
-
-	call	_bsaes_encrypt8
-
-	pxor	0(%rsp),%xmm15
-	pxor	16(%rsp),%xmm0
-	movdqu	%xmm15,0(%r13)
-	pxor	32(%rsp),%xmm3
-	movdqu	%xmm0,16(%r13)
-	pxor	48(%rsp),%xmm5
-	movdqu	%xmm3,32(%r13)
-	pxor	64(%rsp),%xmm2
-	movdqu	%xmm5,48(%r13)
-	pxor	80(%rsp),%xmm6
-	movdqu	%xmm2,64(%r13)
-	movdqu	%xmm6,80(%r13)
-	leaq	96(%r13),%r13
-
-	movdqa	96(%rsp),%xmm6
-	jmp	.Lxts_enc_done
-.align	16
-.Lxts_enc_5:
-	pxor	%xmm10,%xmm2
-	leaq	80(%r12),%r12
-	pxor	%xmm11,%xmm3
-	leaq	128(%rsp),%rax
-	movl	%edx,%r10d
-
-	call	_bsaes_encrypt8
-
-	pxor	0(%rsp),%xmm15
-	pxor	16(%rsp),%xmm0
-	movdqu	%xmm15,0(%r13)
-	pxor	32(%rsp),%xmm3
-	movdqu	%xmm0,16(%r13)
-	pxor	48(%rsp),%xmm5
-	movdqu	%xmm3,32(%r13)
-	pxor	64(%rsp),%xmm2
-	movdqu	%xmm5,48(%r13)
-	movdqu	%xmm2,64(%r13)
-	leaq	80(%r13),%r13
-
-	movdqa	80(%rsp),%xmm6
-	jmp	.Lxts_enc_done
-.align	16
-.Lxts_enc_4:
-	pxor	%xmm9,%xmm1
-	leaq	64(%r12),%r12
-	pxor	%xmm10,%xmm2
-	leaq	128(%rsp),%rax
-	movl	%edx,%r10d
-
-	call	_bsaes_encrypt8
-
-	pxor	0(%rsp),%xmm15
-	pxor	16(%rsp),%xmm0
-	movdqu	%xmm15,0(%r13)
-	pxor	32(%rsp),%xmm3
-	movdqu	%xmm0,16(%r13)
-	pxor	48(%rsp),%xmm5
-	movdqu	%xmm3,32(%r13)
-	movdqu	%xmm5,48(%r13)
-	leaq	64(%r13),%r13
-
-	movdqa	64(%rsp),%xmm6
-	jmp	.Lxts_enc_done
-.align	16
-.Lxts_enc_3:
-	pxor	%xmm8,%xmm0
-	leaq	48(%r12),%r12
-	pxor	%xmm9,%xmm1
-	leaq	128(%rsp),%rax
-	movl	%edx,%r10d
-
-	call	_bsaes_encrypt8
-
-	pxor	0(%rsp),%xmm15
-	pxor	16(%rsp),%xmm0
-	movdqu	%xmm15,0(%r13)
-	pxor	32(%rsp),%xmm3
-	movdqu	%xmm0,16(%r13)
-	movdqu	%xmm3,32(%r13)
-	leaq	48(%r13),%r13
-
-	movdqa	48(%rsp),%xmm6
-	jmp	.Lxts_enc_done
-.align	16
-.Lxts_enc_2:
-	pxor	%xmm7,%xmm15
-	leaq	32(%r12),%r12
-	pxor	%xmm8,%xmm0
-	leaq	128(%rsp),%rax
-	movl	%edx,%r10d
-
-	call	_bsaes_encrypt8
-
-	pxor	0(%rsp),%xmm15
-	pxor	16(%rsp),%xmm0
-	movdqu	%xmm15,0(%r13)
-	movdqu	%xmm0,16(%r13)
-	leaq	32(%r13),%r13
-
-	movdqa	32(%rsp),%xmm6
-	jmp	.Lxts_enc_done
-.align	16
-.Lxts_enc_1:
-	pxor	%xmm15,%xmm7
-	leaq	16(%r12),%r12
-	movdqa	%xmm7,32(%rbp)
-	leaq	32(%rbp),%rdi
-	leaq	32(%rbp),%rsi
-	leaq	(%r15),%rdx
-	call	asm_AES_encrypt
-	pxor	32(%rbp),%xmm15
-
-
-
-
-
-	movdqu	%xmm15,0(%r13)
-	leaq	16(%r13),%r13
-
-	movdqa	16(%rsp),%xmm6
-
-.Lxts_enc_done:
-	andl	$15,%ebx
-	jz	.Lxts_enc_ret
-	movq	%r13,%rdx
-
-.Lxts_enc_steal:
-	movzbl	(%r12),%eax
-	movzbl	-16(%rdx),%ecx
-	leaq	1(%r12),%r12
-	movb	%al,-16(%rdx)
-	movb	%cl,0(%rdx)
-	leaq	1(%rdx),%rdx
-	subl	$1,%ebx
-	jnz	.Lxts_enc_steal
-
-	movdqu	-16(%r13),%xmm15
-	leaq	32(%rbp),%rdi
-	pxor	%xmm6,%xmm15
-	leaq	32(%rbp),%rsi
-	movdqa	%xmm15,32(%rbp)
-	leaq	(%r15),%rdx
-	call	asm_AES_encrypt
-	pxor	32(%rbp),%xmm6
-	movdqu	%xmm6,-16(%r13)
-
-.Lxts_enc_ret:
-	leaq	(%rsp),%rax
-	pxor	%xmm0,%xmm0
-.Lxts_enc_bzero:
-	movdqa	%xmm0,0(%rax)
-	movdqa	%xmm0,16(%rax)
-	leaq	32(%rax),%rax
-	cmpq	%rax,%rbp
-	ja	.Lxts_enc_bzero
-
-	leaq	120(%rbp),%rax
-.cfi_def_cfa	%rax,8
-	movq	-48(%rax),%r15
-.cfi_restore	%r15
-	movq	-40(%rax),%r14
-.cfi_restore	%r14
-	movq	-32(%rax),%r13
-.cfi_restore	%r13
-	movq	-24(%rax),%r12
-.cfi_restore	%r12
-	movq	-16(%rax),%rbx
-.cfi_restore	%rbx
-	movq	-8(%rax),%rbp
-.cfi_restore	%rbp
-	leaq	(%rax),%rsp
-.cfi_def_cfa_register	%rsp
-.Lxts_enc_epilogue:
-	.byte	0xf3,0xc3
-.cfi_endproc	
-.size	bsaes_xts_encrypt,.-bsaes_xts_encrypt
-
-.globl	bsaes_xts_decrypt
-.type	bsaes_xts_decrypt,@function
-.align	16
-bsaes_xts_decrypt:
-.cfi_startproc	
-	movq	%rsp,%rax
-.Lxts_dec_prologue:
-	pushq	%rbp
-.cfi_adjust_cfa_offset	8
-.cfi_offset	%rbp,-16
-	pushq	%rbx
-.cfi_adjust_cfa_offset	8
-.cfi_offset	%rbx,-24
-	pushq	%r12
-.cfi_adjust_cfa_offset	8
-.cfi_offset	%r12,-32
-	pushq	%r13
-.cfi_adjust_cfa_offset	8
-.cfi_offset	%r13,-40
-	pushq	%r14
-.cfi_adjust_cfa_offset	8
-.cfi_offset	%r14,-48
-	pushq	%r15
-.cfi_adjust_cfa_offset	8
-.cfi_offset	%r15,-56
-	leaq	-72(%rsp),%rsp
-.cfi_adjust_cfa_offset	0x48
-	movq	%rsp,%rbp
-	movq	%rdi,%r12
-	movq	%rsi,%r13
-	movq	%rdx,%r14
-	movq	%rcx,%r15
-
-	leaq	(%r9),%rdi
-	leaq	32(%rbp),%rsi
-	leaq	(%r8),%rdx
-	call	asm_AES_encrypt
-
-	movl	240(%r15),%eax
-	movq	%r14,%rbx
-
-	movl	%eax,%edx
-	shlq	$7,%rax
-	subq	$96,%rax
-	subq	%rax,%rsp
-
-	movq	%rsp,%rax
-	movq	%r15,%rcx
-	movl	%edx,%r10d
-	call	_bsaes_key_convert
-	pxor	(%rsp),%xmm7
-	movdqa	%xmm6,(%rax)
-	movdqa	%xmm7,(%rsp)
-
-	xorl	%eax,%eax
-	andq	$-16,%r14
-	testl	$15,%ebx
-	setnz	%al
-	shlq	$4,%rax
-	subq	%rax,%r14
-
-	subq	$0x80,%rsp
-	movdqa	32(%rbp),%xmm6
-
-	pxor	%xmm14,%xmm14
-	movdqa	.Lxts_magic(%rip),%xmm12
-	pcmpgtd	%xmm6,%xmm14
-
-	subq	$0x80,%r14
-	jc	.Lxts_dec_short
-	jmp	.Lxts_dec_loop
-
-.align	16
-.Lxts_dec_loop:
-	pshufd	$0x13,%xmm14,%xmm13
-	pxor	%xmm14,%xmm14
-	movdqa	%xmm6,%xmm15
-	movdqa	%xmm6,0(%rsp)
-	paddq	%xmm6,%xmm6
-	pand	%xmm12,%xmm13
-	pcmpgtd	%xmm6,%xmm14
-	pxor	%xmm13,%xmm6
-	pshufd	$0x13,%xmm14,%xmm13
-	pxor	%xmm14,%xmm14
-	movdqa	%xmm6,%xmm0
-	movdqa	%xmm6,16(%rsp)
-	paddq	%xmm6,%xmm6
-	pand	%xmm12,%xmm13
-	pcmpgtd	%xmm6,%xmm14
-	pxor	%xmm13,%xmm6
-	movdqu	0(%r12),%xmm7
-	pshufd	$0x13,%xmm14,%xmm13
-	pxor	%xmm14,%xmm14
-	movdqa	%xmm6,%xmm1
-	movdqa	%xmm6,32(%rsp)
-	paddq	%xmm6,%xmm6
-	pand	%xmm12,%xmm13
-	pcmpgtd	%xmm6,%xmm14
-	pxor	%xmm13,%xmm6
-	movdqu	16(%r12),%xmm8
-	pxor	%xmm7,%xmm15
-	pshufd	$0x13,%xmm14,%xmm13
-	pxor	%xmm14,%xmm14
-	movdqa	%xmm6,%xmm2
-	movdqa	%xmm6,48(%rsp)
-	paddq	%xmm6,%xmm6
-	pand	%xmm12,%xmm13
-	pcmpgtd	%xmm6,%xmm14
-	pxor	%xmm13,%xmm6
-	movdqu	32(%r12),%xmm9
-	pxor	%xmm8,%xmm0
-	pshufd	$0x13,%xmm14,%xmm13
-	pxor	%xmm14,%xmm14
-	movdqa	%xmm6,%xmm3
-	movdqa	%xmm6,64(%rsp)
-	paddq	%xmm6,%xmm6
-	pand	%xmm12,%xmm13
-	pcmpgtd	%xmm6,%xmm14
-	pxor	%xmm13,%xmm6
-	movdqu	48(%r12),%xmm10
-	pxor	%xmm9,%xmm1
-	pshufd	$0x13,%xmm14,%xmm13
-	pxor	%xmm14,%xmm14
-	movdqa	%xmm6,%xmm4
-	movdqa	%xmm6,80(%rsp)
-	paddq	%xmm6,%xmm6
-	pand	%xmm12,%xmm13
-	pcmpgtd	%xmm6,%xmm14
-	pxor	%xmm13,%xmm6
-	movdqu	64(%r12),%xmm11
-	pxor	%xmm10,%xmm2
-	pshufd	$0x13,%xmm14,%xmm13
-	pxor	%xmm14,%xmm14
-	movdqa	%xmm6,%xmm5
-	movdqa	%xmm6,96(%rsp)
-	paddq	%xmm6,%xmm6
-	pand	%xmm12,%xmm13
-	pcmpgtd	%xmm6,%xmm14
-	pxor	%xmm13,%xmm6
-	movdqu	80(%r12),%xmm12
-	pxor	%xmm11,%xmm3
-	movdqu	96(%r12),%xmm13
-	pxor	%xmm12,%xmm4
-	movdqu	112(%r12),%xmm14
-	leaq	128(%r12),%r12
-	movdqa	%xmm6,112(%rsp)
-	pxor	%xmm13,%xmm5
-	leaq	128(%rsp),%rax
-	pxor	%xmm14,%xmm6
-	movl	%edx,%r10d
-
-	call	_bsaes_decrypt8
-
-	pxor	0(%rsp),%xmm15
-	pxor	16(%rsp),%xmm0
-	movdqu	%xmm15,0(%r13)
-	pxor	32(%rsp),%xmm5
-	movdqu	%xmm0,16(%r13)
-	pxor	48(%rsp),%xmm3
-	movdqu	%xmm5,32(%r13)
-	pxor	64(%rsp),%xmm1
-	movdqu	%xmm3,48(%r13)
-	pxor	80(%rsp),%xmm6
-	movdqu	%xmm1,64(%r13)
-	pxor	96(%rsp),%xmm2
-	movdqu	%xmm6,80(%r13)
-	pxor	112(%rsp),%xmm4
-	movdqu	%xmm2,96(%r13)
-	movdqu	%xmm4,112(%r13)
-	leaq	128(%r13),%r13
-
-	movdqa	112(%rsp),%xmm6
-	pxor	%xmm14,%xmm14
-	movdqa	.Lxts_magic(%rip),%xmm12
-	pcmpgtd	%xmm6,%xmm14
-	pshufd	$0x13,%xmm14,%xmm13
-	pxor	%xmm14,%xmm14
-	paddq	%xmm6,%xmm6
-	pand	%xmm12,%xmm13
-	pcmpgtd	%xmm6,%xmm14
-	pxor	%xmm13,%xmm6
-
-	subq	$0x80,%r14
-	jnc	.Lxts_dec_loop
-
-.Lxts_dec_short:
-	addq	$0x80,%r14
-	jz	.Lxts_dec_done
-	pshufd	$0x13,%xmm14,%xmm13
-	pxor	%xmm14,%xmm14
-	movdqa	%xmm6,%xmm15
-	movdqa	%xmm6,0(%rsp)
-	paddq	%xmm6,%xmm6
-	pand	%xmm12,%xmm13
-	pcmpgtd	%xmm6,%xmm14
-	pxor	%xmm13,%xmm6
-	pshufd	$0x13,%xmm14,%xmm13
-	pxor	%xmm14,%xmm14
-	movdqa	%xmm6,%xmm0
-	movdqa	%xmm6,16(%rsp)
-	paddq	%xmm6,%xmm6
-	pand	%xmm12,%xmm13
-	pcmpgtd	%xmm6,%xmm14
-	pxor	%xmm13,%xmm6
-	movdqu	0(%r12),%xmm7
-	cmpq	$16,%r14
-	je	.Lxts_dec_1
-	pshufd	$0x13,%xmm14,%xmm13
-	pxor	%xmm14,%xmm14
-	movdqa	%xmm6,%xmm1
-	movdqa	%xmm6,32(%rsp)
-	paddq	%xmm6,%xmm6
-	pand	%xmm12,%xmm13
-	pcmpgtd	%xmm6,%xmm14
-	pxor	%xmm13,%xmm6
-	movdqu	16(%r12),%xmm8
-	cmpq	$32,%r14
-	je	.Lxts_dec_2
-	pxor	%xmm7,%xmm15
-	pshufd	$0x13,%xmm14,%xmm13
-	pxor	%xmm14,%xmm14
-	movdqa	%xmm6,%xmm2
-	movdqa	%xmm6,48(%rsp)
-	paddq	%xmm6,%xmm6
-	pand	%xmm12,%xmm13
-	pcmpgtd	%xmm6,%xmm14
-	pxor	%xmm13,%xmm6
-	movdqu	32(%r12),%xmm9
-	cmpq	$48,%r14
-	je	.Lxts_dec_3
-	pxor	%xmm8,%xmm0
-	pshufd	$0x13,%xmm14,%xmm13
-	pxor	%xmm14,%xmm14
-	movdqa	%xmm6,%xmm3
-	movdqa	%xmm6,64(%rsp)
-	paddq	%xmm6,%xmm6
-	pand	%xmm12,%xmm13
-	pcmpgtd	%xmm6,%xmm14
-	pxor	%xmm13,%xmm6
-	movdqu	48(%r12),%xmm10
-	cmpq	$64,%r14
-	je	.Lxts_dec_4
-	pxor	%xmm9,%xmm1
-	pshufd	$0x13,%xmm14,%xmm13
-	pxor	%xmm14,%xmm14
-	movdqa	%xmm6,%xmm4
-	movdqa	%xmm6,80(%rsp)
-	paddq	%xmm6,%xmm6
-	pand	%xmm12,%xmm13
-	pcmpgtd	%xmm6,%xmm14
-	pxor	%xmm13,%xmm6
-	movdqu	64(%r12),%xmm11
-	cmpq	$80,%r14
-	je	.Lxts_dec_5
-	pxor	%xmm10,%xmm2
-	pshufd	$0x13,%xmm14,%xmm13
-	pxor	%xmm14,%xmm14
-	movdqa	%xmm6,%xmm5
-	movdqa	%xmm6,96(%rsp)
-	paddq	%xmm6,%xmm6
-	pand	%xmm12,%xmm13
-	pcmpgtd	%xmm6,%xmm14
-	pxor	%xmm13,%xmm6
-	movdqu	80(%r12),%xmm12
-	cmpq	$96,%r14
-	je	.Lxts_dec_6
-	pxor	%xmm11,%xmm3
-	movdqu	96(%r12),%xmm13
-	pxor	%xmm12,%xmm4
-	movdqa	%xmm6,112(%rsp)
-	leaq	112(%r12),%r12
-	pxor	%xmm13,%xmm5
-	leaq	128(%rsp),%rax
-	movl	%edx,%r10d
-
-	call	_bsaes_decrypt8
-
-	pxor	0(%rsp),%xmm15
-	pxor	16(%rsp),%xmm0
-	movdqu	%xmm15,0(%r13)
-	pxor	32(%rsp),%xmm5
-	movdqu	%xmm0,16(%r13)
-	pxor	48(%rsp),%xmm3
-	movdqu	%xmm5,32(%r13)
-	pxor	64(%rsp),%xmm1
-	movdqu	%xmm3,48(%r13)
-	pxor	80(%rsp),%xmm6
-	movdqu	%xmm1,64(%r13)
-	pxor	96(%rsp),%xmm2
-	movdqu	%xmm6,80(%r13)
-	movdqu	%xmm2,96(%r13)
-	leaq	112(%r13),%r13
-
-	movdqa	112(%rsp),%xmm6
-	jmp	.Lxts_dec_done
-.align	16
-.Lxts_dec_6:
-	pxor	%xmm11,%xmm3
-	leaq	96(%r12),%r12
-	pxor	%xmm12,%xmm4
-	leaq	128(%rsp),%rax
-	movl	%edx,%r10d
-
-	call	_bsaes_decrypt8
-
-	pxor	0(%rsp),%xmm15
-	pxor	16(%rsp),%xmm0
-	movdqu	%xmm15,0(%r13)
-	pxor	32(%rsp),%xmm5
-	movdqu	%xmm0,16(%r13)
-	pxor	48(%rsp),%xmm3
-	movdqu	%xmm5,32(%r13)
-	pxor	64(%rsp),%xmm1
-	movdqu	%xmm3,48(%r13)
-	pxor	80(%rsp),%xmm6
-	movdqu	%xmm1,64(%r13)
-	movdqu	%xmm6,80(%r13)
-	leaq	96(%r13),%r13
-
-	movdqa	96(%rsp),%xmm6
-	jmp	.Lxts_dec_done
-.align	16
-.Lxts_dec_5:
-	pxor	%xmm10,%xmm2
-	leaq	80(%r12),%r12
-	pxor	%xmm11,%xmm3
-	leaq	128(%rsp),%rax
-	movl	%edx,%r10d
-
-	call	_bsaes_decrypt8
-
-	pxor	0(%rsp),%xmm15
-	pxor	16(%rsp),%xmm0
-	movdqu	%xmm15,0(%r13)
-	pxor	32(%rsp),%xmm5
-	movdqu	%xmm0,16(%r13)
-	pxor	48(%rsp),%xmm3
-	movdqu	%xmm5,32(%r13)
-	pxor	64(%rsp),%xmm1
-	movdqu	%xmm3,48(%r13)
-	movdqu	%xmm1,64(%r13)
-	leaq	80(%r13),%r13
-
-	movdqa	80(%rsp),%xmm6
-	jmp	.Lxts_dec_done
-.align	16
-.Lxts_dec_4:
-	pxor	%xmm9,%xmm1
-	leaq	64(%r12),%r12
-	pxor	%xmm10,%xmm2
-	leaq	128(%rsp),%rax
-	movl	%edx,%r10d
-
-	call	_bsaes_decrypt8
-
-	pxor	0(%rsp),%xmm15
-	pxor	16(%rsp),%xmm0
-	movdqu	%xmm15,0(%r13)
-	pxor	32(%rsp),%xmm5
-	movdqu	%xmm0,16(%r13)
-	pxor	48(%rsp),%xmm3
-	movdqu	%xmm5,32(%r13)
-	movdqu	%xmm3,48(%r13)
-	leaq	64(%r13),%r13
-
-	movdqa	64(%rsp),%xmm6
-	jmp	.Lxts_dec_done
-.align	16
-.Lxts_dec_3:
-	pxor	%xmm8,%xmm0
-	leaq	48(%r12),%r12
-	pxor	%xmm9,%xmm1
-	leaq	128(%rsp),%rax
-	movl	%edx,%r10d
-
-	call	_bsaes_decrypt8
-
-	pxor	0(%rsp),%xmm15
-	pxor	16(%rsp),%xmm0
-	movdqu	%xmm15,0(%r13)
-	pxor	32(%rsp),%xmm5
-	movdqu	%xmm0,16(%r13)
-	movdqu	%xmm5,32(%r13)
-	leaq	48(%r13),%r13
-
-	movdqa	48(%rsp),%xmm6
-	jmp	.Lxts_dec_done
-.align	16
-.Lxts_dec_2:
-	pxor	%xmm7,%xmm15
-	leaq	32(%r12),%r12
-	pxor	%xmm8,%xmm0
-	leaq	128(%rsp),%rax
-	movl	%edx,%r10d
-
-	call	_bsaes_decrypt8
-
-	pxor	0(%rsp),%xmm15
-	pxor	16(%rsp),%xmm0
-	movdqu	%xmm15,0(%r13)
-	movdqu	%xmm0,16(%r13)
-	leaq	32(%r13),%r13
-
-	movdqa	32(%rsp),%xmm6
-	jmp	.Lxts_dec_done
-.align	16
-.Lxts_dec_1:
-	pxor	%xmm15,%xmm7
-	leaq	16(%r12),%r12
-	movdqa	%xmm7,32(%rbp)
-	leaq	32(%rbp),%rdi
-	leaq	32(%rbp),%rsi
-	leaq	(%r15),%rdx
-	call	asm_AES_decrypt
-	pxor	32(%rbp),%xmm15
-
-
-
-
-
-	movdqu	%xmm15,0(%r13)
-	leaq	16(%r13),%r13
-
-	movdqa	16(%rsp),%xmm6
-
-.Lxts_dec_done:
-	andl	$15,%ebx
-	jz	.Lxts_dec_ret
-
-	pxor	%xmm14,%xmm14
-	movdqa	.Lxts_magic(%rip),%xmm12
-	pcmpgtd	%xmm6,%xmm14
-	pshufd	$0x13,%xmm14,%xmm13
-	movdqa	%xmm6,%xmm5
-	paddq	%xmm6,%xmm6
-	pand	%xmm12,%xmm13
-	movdqu	(%r12),%xmm15
-	pxor	%xmm13,%xmm6
-
-	leaq	32(%rbp),%rdi
-	pxor	%xmm6,%xmm15
-	leaq	32(%rbp),%rsi
-	movdqa	%xmm15,32(%rbp)
-	leaq	(%r15),%rdx
-	call	asm_AES_decrypt
-	pxor	32(%rbp),%xmm6
-	movq	%r13,%rdx
-	movdqu	%xmm6,(%r13)
-
-.Lxts_dec_steal:
-	movzbl	16(%r12),%eax
-	movzbl	(%rdx),%ecx
-	leaq	1(%r12),%r12
-	movb	%al,(%rdx)
-	movb	%cl,16(%rdx)
-	leaq	1(%rdx),%rdx
-	subl	$1,%ebx
-	jnz	.Lxts_dec_steal
-
-	movdqu	(%r13),%xmm15
-	leaq	32(%rbp),%rdi
-	pxor	%xmm5,%xmm15
-	leaq	32(%rbp),%rsi
-	movdqa	%xmm15,32(%rbp)
-	leaq	(%r15),%rdx
-	call	asm_AES_decrypt
-	pxor	32(%rbp),%xmm5
-	movdqu	%xmm5,(%r13)
-
-.Lxts_dec_ret:
-	leaq	(%rsp),%rax
-	pxor	%xmm0,%xmm0
-.Lxts_dec_bzero:
-	movdqa	%xmm0,0(%rax)
-	movdqa	%xmm0,16(%rax)
-	leaq	32(%rax),%rax
-	cmpq	%rax,%rbp
-	ja	.Lxts_dec_bzero
-
-	leaq	120(%rbp),%rax
-.cfi_def_cfa	%rax,8
-	movq	-48(%rax),%r15
-.cfi_restore	%r15
-	movq	-40(%rax),%r14
-.cfi_restore	%r14
-	movq	-32(%rax),%r13
-.cfi_restore	%r13
-	movq	-24(%rax),%r12
-.cfi_restore	%r12
-	movq	-16(%rax),%rbx
-.cfi_restore	%rbx
-	movq	-8(%rax),%rbp
-.cfi_restore	%rbp
-	leaq	(%rax),%rsp
-.cfi_def_cfa_register	%rsp
-.Lxts_dec_epilogue:
-	.byte	0xf3,0xc3
-.cfi_endproc	
-.size	bsaes_xts_decrypt,.-bsaes_xts_decrypt
-.type	_bsaes_const,@object
-.align	64
-_bsaes_const:
-.LM0ISR:
-.quad	0x0a0e0206070b0f03, 0x0004080c0d010509
-.LISRM0:
-.quad	0x01040b0e0205080f, 0x0306090c00070a0d
-.LISR:
-.quad	0x0504070602010003, 0x0f0e0d0c080b0a09
-.LBS0:
-.quad	0x5555555555555555, 0x5555555555555555
-.LBS1:
-.quad	0x3333333333333333, 0x3333333333333333
-.LBS2:
-.quad	0x0f0f0f0f0f0f0f0f, 0x0f0f0f0f0f0f0f0f
-.LSR:
-.quad	0x0504070600030201, 0x0f0e0d0c0a09080b
-.LSRM0:
-.quad	0x0304090e00050a0f, 0x01060b0c0207080d
-.LM0SR:
-.quad	0x0a0e02060f03070b, 0x0004080c05090d01
-.LSWPUP:
-.quad	0x0706050403020100, 0x0c0d0e0f0b0a0908
-.LSWPUPM0SR:
-.quad	0x0a0d02060c03070b, 0x0004080f05090e01
-.LADD1:
-.quad	0x0000000000000000, 0x0000000100000000
-.LADD2:
-.quad	0x0000000000000000, 0x0000000200000000
-.LADD3:
-.quad	0x0000000000000000, 0x0000000300000000
-.LADD4:
-.quad	0x0000000000000000, 0x0000000400000000
-.LADD5:
-.quad	0x0000000000000000, 0x0000000500000000
-.LADD6:
-.quad	0x0000000000000000, 0x0000000600000000
-.LADD7:
-.quad	0x0000000000000000, 0x0000000700000000
-.LADD8:
-.quad	0x0000000000000000, 0x0000000800000000
-.Lxts_magic:
-.long	0x87,0,1,0
-.Lmasks:
-.quad	0x0101010101010101, 0x0101010101010101
-.quad	0x0202020202020202, 0x0202020202020202
-.quad	0x0404040404040404, 0x0404040404040404
-.quad	0x0808080808080808, 0x0808080808080808
-.LM0:
-.quad	0x02060a0e03070b0f, 0x0004080c0105090d
-.L63:
-.quad	0x6363636363636363, 0x6363636363636363
-.byte	66,105,116,45,115,108,105,99,101,100,32,65,69,83,32,102,111,114,32,120,56,54,95,54,52,47,83,83,83,69,51,44,32,69,109,105,108,105,97,32,75,195,164,115,112,101,114,44,32,80,101,116,101,114,32,83,99,104,119,97,98,101,44,32,65,110,100,121,32,80,111,108,121,97,107,111,118,0
-.align	64
-.size	_bsaes_const,.-_bsaes_const
diff --git a/deps/openssl/config/archs/linux-x32/asm/crypto/bn/rsaz-x86_64.s b/deps/openssl/config/archs/linux-x32/asm/crypto/bn/rsaz-x86_64.s
index f8e4a80588..7876e0b8f9 100644
--- a/deps/openssl/config/archs/linux-x32/asm/crypto/bn/rsaz-x86_64.s
+++ b/deps/openssl/config/archs/linux-x32/asm/crypto/bn/rsaz-x86_64.s
@@ -29,7 +29,7 @@ rsaz_512_sqr:
 	subq	$128+24,%rsp
 .cfi_adjust_cfa_offset	128+24
 .Lsqr_body:
-	movq	%rdx,%rbp
+.byte	102,72,15,110,202
 	movq	(%rsi),%rdx
 	movq	8(%rsi),%rax
 	movq	%rcx,128(%rsp)
@@ -44,6 +44,7 @@ rsaz_512_sqr:
 	movl	%r8d,128+8(%rsp)
 
 	movq	%rdx,%rbx
+	movq	%rax,%rbp
 	mulq	%rdx
 	movq	%rax,%r8
 	movq	16(%rsi),%rax
@@ -82,31 +83,29 @@ rsaz_512_sqr:
 	mulq	%rbx
 	addq	%rax,%r14
 	movq	%rbx,%rax
-	movq	%rdx,%r15
-	adcq	$0,%r15
+	adcq	$0,%rdx
 
+	xorq	%rcx,%rcx
 	addq	%r8,%r8
-	movq	%r9,%rcx
-	adcq	%r9,%r9
+	movq	%rdx,%r15
+	adcq	$0,%rcx
 
 	mulq	%rax
-	movq	%rax,(%rsp)
-	addq	%rdx,%r8
-	adcq	$0,%r9
+	addq	%r8,%rdx
+	adcq	$0,%rcx
 
-	movq	%r8,8(%rsp)
-	shrq	$63,%rcx
+	movq	%rax,(%rsp)
+	movq	%rdx,8(%rsp)
 
 
-	movq	8(%rsi),%r8
 	movq	16(%rsi),%rax
-	mulq	%r8
+	mulq	%rbp
 	addq	%rax,%r10
 	movq	24(%rsi),%rax
 	movq	%rdx,%rbx
 	adcq	$0,%rbx
 
-	mulq	%r8
+	mulq	%rbp
 	addq	%rax,%r11
 	movq	32(%rsi),%rax
 	adcq	$0,%rdx
@@ -114,7 +113,7 @@ rsaz_512_sqr:
 	movq	%rdx,%rbx
 	adcq	$0,%rbx
 
-	mulq	%r8
+	mulq	%rbp
 	addq	%rax,%r12
 	movq	40(%rsi),%rax
 	adcq	$0,%rdx
@@ -122,7 +121,7 @@ rsaz_512_sqr:
 	movq	%rdx,%rbx
 	adcq	$0,%rbx
 
-	mulq	%r8
+	mulq	%rbp
 	addq	%rax,%r13
 	movq	48(%rsi),%rax
 	adcq	$0,%rdx
@@ -130,7 +129,7 @@ rsaz_512_sqr:
 	movq	%rdx,%rbx
 	adcq	$0,%rbx
 
-	mulq	%r8
+	mulq	%rbp
 	addq	%rax,%r14
 	movq	56(%rsi),%rax
 	adcq	$0,%rdx
@@ -138,39 +137,39 @@ rsaz_512_sqr:
 	movq	%rdx,%rbx
 	adcq	$0,%rbx
 
-	mulq	%r8
+	mulq	%rbp
 	addq	%rax,%r15
-	movq	%r8,%rax
+	movq	%rbp,%rax
 	adcq	$0,%rdx
 	addq	%rbx,%r15
-	movq	%rdx,%r8
-	movq	%r10,%rdx
-	adcq	$0,%r8
+	adcq	$0,%rdx
 
-	addq	%rdx,%rdx
-	leaq	(%rcx,%r10,2),%r10
-	movq	%r11,%rbx
-	adcq	%r11,%r11
+	xorq	%rbx,%rbx
+	addq	%r9,%r9
+	movq	%rdx,%r8
+	adcq	%r10,%r10
+	adcq	$0,%rbx
 
 	mulq	%rax
+
+	addq	%rcx,%rax
+	movq	16(%rsi),%rbp
 	addq	%rax,%r9
+	movq	24(%rsi),%rax
 	adcq	%rdx,%r10
-	adcq	$0,%r11
+	adcq	$0,%rbx
 
 	movq	%r9,16(%rsp)
 	movq	%r10,24(%rsp)
-	shrq	$63,%rbx
 
 
-	movq	16(%rsi),%r9
-	movq	24(%rsi),%rax
-	mulq	%r9
+	mulq	%rbp
 	addq	%rax,%r12
 	movq	32(%rsi),%rax
 	movq	%rdx,%rcx
 	adcq	$0,%rcx
 
-	mulq	%r9
+	mulq	%rbp
 	addq	%rax,%r13
 	movq	40(%rsi),%rax
 	adcq	$0,%rdx
@@ -178,7 +177,7 @@ rsaz_512_sqr:
 	movq	%rdx,%rcx
 	adcq	$0,%rcx
 
-	mulq	%r9
+	mulq	%rbp
 	addq	%rax,%r14
 	movq	48(%rsi),%rax
 	adcq	$0,%rdx
@@ -186,9 +185,7 @@ rsaz_512_sqr:
 	movq	%rdx,%rcx
 	adcq	$0,%rcx
 
-	mulq	%r9
-	movq	%r12,%r10
-	leaq	(%rbx,%r12,2),%r12
+	mulq	%rbp
 	addq	%rax,%r15
 	movq	56(%rsi),%rax
 	adcq	$0,%rdx
@@ -196,36 +193,40 @@ rsaz_512_sqr:
 	movq	%rdx,%rcx
 	adcq	$0,%rcx
 
-	mulq	%r9
-	shrq	$63,%r10
+	mulq	%rbp
 	addq	%rax,%r8
-	movq	%r9,%rax
+	movq	%rbp,%rax
 	adcq	$0,%rdx
 	addq	%rcx,%r8
-	movq	%rdx,%r9
-	adcq	$0,%r9
+	adcq	$0,%rdx
 
-	movq	%r13,%rcx
-	leaq	(%r10,%r13,2),%r13
+	xorq	%rcx,%rcx
+	addq	%r11,%r11
+	movq	%rdx,%r9
+	adcq	%r12,%r12
+	adcq	$0,%rcx
 
 	mulq	%rax
+
+	addq	%rbx,%rax
+	movq	24(%rsi),%r10
 	addq	%rax,%r11
+	movq	32(%rsi),%rax
 	adcq	%rdx,%r12
-	adcq	$0,%r13
+	adcq	$0,%rcx
 
 	movq	%r11,32(%rsp)
 	movq	%r12,40(%rsp)
-	shrq	$63,%rcx
 
 
-	movq	24(%rsi),%r10
-	movq	32(%rsi),%rax
+	movq	%rax,%r11
 	mulq	%r10
 	addq	%rax,%r14
 	movq	40(%rsi),%rax
 	movq	%rdx,%rbx
 	adcq	$0,%rbx
 
+	movq	%rax,%r12
 	mulq	%r10
 	addq	%rax,%r15
 	movq	48(%rsi),%rax
@@ -234,9 +235,8 @@ rsaz_512_sqr:
 	movq	%rdx,%rbx
 	adcq	$0,%rbx
 
+	movq	%rax,%rbp
 	mulq	%r10
-	movq	%r14,%r12
-	leaq	(%rcx,%r14,2),%r14
 	addq	%rax,%r8
 	movq	56(%rsi),%rax
 	adcq	$0,%rdx
@@ -245,32 +245,33 @@ rsaz_512_sqr:
 	adcq	$0,%rbx
 
 	mulq	%r10
-	shrq	$63,%r12
 	addq	%rax,%r9
 	movq	%r10,%rax
 	adcq	$0,%rdx
 	addq	%rbx,%r9
-	movq	%rdx,%r10
-	adcq	$0,%r10
+	adcq	$0,%rdx
 
-	movq	%r15,%rbx
-	leaq	(%r12,%r15,2),%r15
+	xorq	%rbx,%rbx
+	addq	%r13,%r13
+	movq	%rdx,%r10
+	adcq	%r14,%r14
+	adcq	$0,%rbx
 
 	mulq	%rax
+
+	addq	%rcx,%rax
 	addq	%rax,%r13
+	movq	%r12,%rax
 	adcq	%rdx,%r14
-	adcq	$0,%r15
+	adcq	$0,%rbx
 
 	movq	%r13,48(%rsp)
 	movq	%r14,56(%rsp)
-	shrq	$63,%rbx
 
 
-	movq	32(%rsi),%r11
-	movq	40(%rsi),%rax
 	mulq	%r11
 	addq	%rax,%r8
-	movq	48(%rsi),%rax
+	movq	%rbp,%rax
 	movq	%rdx,%rcx
 	adcq	$0,%rcx
 
@@ -278,97 +279,99 @@ rsaz_512_sqr:
 	addq	%rax,%r9
 	movq	56(%rsi),%rax
 	adcq	$0,%rdx
-	movq	%r8,%r12
-	leaq	(%rbx,%r8,2),%r8
 	addq	%rcx,%r9
 	movq	%rdx,%rcx
 	adcq	$0,%rcx
 
+	movq	%rax,%r14
 	mulq	%r11
-	shrq	$63,%r12
 	addq	%rax,%r10
 	movq	%r11,%rax
 	adcq	$0,%rdx
 	addq	%rcx,%r10
-	movq	%rdx,%r11
-	adcq	$0,%r11
+	adcq	$0,%rdx
 
-	movq	%r9,%rcx
-	leaq	(%r12,%r9,2),%r9
+	xorq	%rcx,%rcx
+	addq	%r15,%r15
+	movq	%rdx,%r11
+	adcq	%r8,%r8
+	adcq	$0,%rcx
 
 	mulq	%rax
+
+	addq	%rbx,%rax
 	addq	%rax,%r15
+	movq	%rbp,%rax
 	adcq	%rdx,%r8
-	adcq	$0,%r9
+	adcq	$0,%rcx
 
 	movq	%r15,64(%rsp)
 	movq	%r8,72(%rsp)
-	shrq	$63,%rcx
 
 
-	movq	40(%rsi),%r12
-	movq	48(%rsi),%rax
 	mulq	%r12
 	addq	%rax,%r10
-	movq	56(%rsi),%rax
+	movq	%r14,%rax
 	movq	%rdx,%rbx
 	adcq	$0,%rbx
 
 	mulq	%r12
 	addq	%rax,%r11
 	movq	%r12,%rax
-	movq	%r10,%r15
-	leaq	(%rcx,%r10,2),%r10
 	adcq	$0,%rdx
-	shrq	$63,%r15
 	addq	%rbx,%r11
-	movq	%rdx,%r12
-	adcq	$0,%r12
+	adcq	$0,%rdx
 
-	movq	%r11,%rbx
-	leaq	(%r15,%r11,2),%r11
+	xorq	%rbx,%rbx
+	addq	%r9,%r9
+	movq	%rdx,%r12
+	adcq	%r10,%r10
+	adcq	$0,%rbx
 
 	mulq	%rax
+
+	addq	%rcx,%rax
 	addq	%rax,%r9
+	movq	%r14,%rax
 	adcq	%rdx,%r10
-	adcq	$0,%r11
+	adcq	$0,%rbx
 
 	movq	%r9,80(%rsp)
 	movq	%r10,88(%rsp)
 
 
-	movq	48(%rsi),%r13
-	movq	56(%rsi),%rax
-	mulq	%r13
+	mulq	%rbp
 	addq	%rax,%r12
-	movq	%r13,%rax
-	movq	%rdx,%r13
-	adcq	$0,%r13
+	movq	%rbp,%rax
+	adcq	$0,%rdx
 
-	xorq	%r14,%r14
-	shlq	$1,%rbx
+	xorq	%rcx,%rcx
+	addq	%r11,%r11
+	movq	%rdx,%r13
 	adcq	%r12,%r12
-	adcq	%r13,%r13
-	adcq	%r14,%r14
+	adcq	$0,%rcx
 
 	mulq	%rax
+
+	addq	%rbx,%rax
 	addq	%rax,%r11
+	movq	%r14,%rax
 	adcq	%rdx,%r12
-	adcq	$0,%r13
+	adcq	$0,%rcx
 
 	movq	%r11,96(%rsp)
 	movq	%r12,104(%rsp)
 
 
-	movq	56(%rsi),%rax
-	mulq	%rax
-	addq	%rax,%r13
-	adcq	$0,%rdx
+	xorq	%rbx,%rbx
+	addq	%r13,%r13
+	adcq	$0,%rbx
 
-	addq	%rdx,%r14
+	mulq	%rax
 
-	movq	%r13,112(%rsp)
-	movq	%r14,120(%rsp)
+	addq	%rcx,%rax
+	addq	%r13,%rax
+	adcq	%rbx,%rdx
 
 	movq	(%rsp),%r8
 	movq	8(%rsp),%r9
@@ -378,6 +381,10 @@ rsaz_512_sqr:
 	movq	40(%rsp),%r13
 	movq	48(%rsp),%r14
 	movq	56(%rsp),%r15
+.byte	102,72,15,126,205
+
+	movq	%rax,112(%rsp)
+	movq	%rdx,120(%rsp)
 
 	call	__rsaz_512_reduce
 
@@ -406,9 +413,9 @@ rsaz_512_sqr:
 .Loop_sqrx:
 	movl	%r8d,128+8(%rsp)
 .byte	102,72,15,110,199
-.byte	102,72,15,110,205
 
 	mulxq	%rax,%r8,%r9
+	movq	%rax,%rbx
 
 	mulxq	16(%rsi),%rcx,%r10
 	xorq	%rbp,%rbp
@@ -416,40 +423,39 @@ rsaz_512_sqr:
 	mulxq	24(%rsi),%rax,%r11
 	adcxq	%rcx,%r9
 
-	mulxq	32(%rsi),%rcx,%r12
+.byte	0xc4,0x62,0xf3,0xf6,0xa6,0x20,0x00,0x00,0x00
 	adcxq	%rax,%r10
 
-	mulxq	40(%rsi),%rax,%r13
+.byte	0xc4,0x62,0xfb,0xf6,0xae,0x28,0x00,0x00,0x00
 	adcxq	%rcx,%r11
 
-.byte	0xc4,0x62,0xf3,0xf6,0xb6,0x30,0x00,0x00,0x00
+	mulxq	48(%rsi),%rcx,%r14
 	adcxq	%rax,%r12
 	adcxq	%rcx,%r13
 
-.byte	0xc4,0x62,0xfb,0xf6,0xbe,0x38,0x00,0x00,0x00
+	mulxq	56(%rsi),%rax,%r15
 	adcxq	%rax,%r14
 	adcxq	%rbp,%r15
 
-	movq	%r9,%rcx
-	shldq	$1,%r8,%r9
-	shlq	$1,%r8
-
-	xorl	%ebp,%ebp
-	mulxq	%rdx,%rax,%rdx
-	adcxq	%rdx,%r8
-	movq	8(%rsi),%rdx
-	adcxq	%rbp,%r9
+	mulxq	%rdx,%rax,%rdi
+	movq	%rbx,%rdx
+	xorq	%rcx,%rcx
+	adoxq	%r8,%r8
+	adcxq	%rdi,%r8
+	adoxq	%rbp,%rcx
+	adcxq	%rbp,%rcx
 
 	movq	%rax,(%rsp)
 	movq	%r8,8(%rsp)
 
 
-	mulxq	16(%rsi),%rax,%rbx
+.byte	0xc4,0xe2,0xfb,0xf6,0x9e,0x10,0x00,0x00,0x00
 	adoxq	%rax,%r10
 	adcxq	%rbx,%r11
 
-.byte	0xc4,0x62,0xc3,0xf6,0x86,0x18,0x00,0x00,0x00
+	mulxq	24(%rsi),%rdi,%r8
 	adoxq	%rdi,%r11
+.byte	0x66
 	adcxq	%r8,%r12
 
 	mulxq	32(%rsi),%rax,%rbx
@@ -467,24 +473,25 @@ rsaz_512_sqr:
 .byte	0xc4,0x62,0xc3,0xf6,0x86,0x38,0x00,0x00,0x00
 	adoxq	%rdi,%r15
 	adcxq	%rbp,%r8
+	mulxq	%rdx,%rax,%rdi
 	adoxq	%rbp,%r8
+.byte	0x48,0x8b,0x96,0x10,0x00,0x00,0x00
 
-	movq	%r11,%rbx
-	shldq	$1,%r10,%r11
-	shldq	$1,%rcx,%r10
+	xorq	%rbx,%rbx
+	adoxq	%r9,%r9
 
-	xorl	%ebp,%ebp
-	mulxq	%rdx,%rax,%rcx
-	movq	16(%rsi),%rdx
+	adcxq	%rcx,%rax
+	adoxq	%r10,%r10
 	adcxq	%rax,%r9
-	adcxq	%rcx,%r10
-	adcxq	%rbp,%r11
+	adoxq	%rbp,%rbx
+	adcxq	%rdi,%r10
+	adcxq	%rbp,%rbx
 
 	movq	%r9,16(%rsp)
 .byte	0x4c,0x89,0x94,0x24,0x18,0x00,0x00,0x00
 
 
-.byte	0xc4,0x62,0xc3,0xf6,0x8e,0x18,0x00,0x00,0x00
+	mulxq	24(%rsi),%rdi,%r9
 	adoxq	%rdi,%r12
 	adcxq	%r9,%r13
 
@@ -492,7 +499,7 @@ rsaz_512_sqr:
 	adoxq	%rax,%r13
 	adcxq	%rcx,%r14
 
-	mulxq	40(%rsi),%rdi,%r9
+.byte	0xc4,0x62,0xc3,0xf6,0x8e,0x28,0x00,0x00,0x00
 	adoxq	%rdi,%r14
 	adcxq	%r9,%r15
 
@@ -500,27 +507,28 @@ rsaz_512_sqr:
 	adoxq	%rax,%r15
 	adcxq	%rcx,%r8
 
-.byte	0xc4,0x62,0xc3,0xf6,0x8e,0x38,0x00,0x00,0x00
+	mulxq	56(%rsi),%rdi,%r9
 	adoxq	%rdi,%r8
 	adcxq	%rbp,%r9
+	mulxq	%rdx,%rax,%rdi
 	adoxq	%rbp,%r9
+	movq	24(%rsi),%rdx
 
-	movq	%r13,%rcx
-	shldq	$1,%r12,%r13
-	shldq	$1,%rbx,%r12
+	xorq	%rcx,%rcx
+	adoxq	%r11,%r11
 
-	xorl	%ebp,%ebp
-	mulxq	%rdx,%rax,%rdx
+	adcxq	%rbx,%rax
+	adoxq	%r12,%r12
 	adcxq	%rax,%r11
-	adcxq	%rdx,%r12
-	movq	24(%rsi),%rdx
-	adcxq	%rbp,%r13
+	adoxq	%rbp,%rcx
+	adcxq	%rdi,%r12
+	adcxq	%rbp,%rcx
 
 	movq	%r11,32(%rsp)
-.byte	0x4c,0x89,0xa4,0x24,0x28,0x00,0x00,0x00
+	movq	%r12,40(%rsp)
 
 
-.byte	0xc4,0xe2,0xfb,0xf6,0x9e,0x20,0x00,0x00,0x00
+	mulxq	32(%rsi),%rax,%rbx
 	adoxq	%rax,%r14
 	adcxq	%rbx,%r15
 
@@ -535,25 +543,25 @@ rsaz_512_sqr:
 	mulxq	56(%rsi),%rdi,%r10
 	adoxq	%rdi,%r9
 	adcxq	%rbp,%r10
+	mulxq	%rdx,%rax,%rdi
 	adoxq	%rbp,%r10
+	movq	32(%rsi),%rdx
 
-.byte	0x66
-	movq	%r15,%rbx
-	shldq	$1,%r14,%r15
-	shldq	$1,%rcx,%r14
+	xorq	%rbx,%rbx
+	adoxq	%r13,%r13
 
-	xorl	%ebp,%ebp
-	mulxq	%rdx,%rax,%rdx
+	adcxq	%rcx,%rax
+	adoxq	%r14,%r14
 	adcxq	%rax,%r13
-	adcxq	%rdx,%r14
-	movq	32(%rsi),%rdx
-	adcxq	%rbp,%r15
+	adoxq	%rbp,%rbx
+	adcxq	%rdi,%r14
+	adcxq	%rbp,%rbx
 
 	movq	%r13,48(%rsp)
 	movq	%r14,56(%rsp)
 
 
-.byte	0xc4,0x62,0xc3,0xf6,0x9e,0x28,0x00,0x00,0x00
+	mulxq	40(%rsi),%rdi,%r11
 	adoxq	%rdi,%r8
 	adcxq	%r11,%r9
 
@@ -564,18 +572,19 @@ rsaz_512_sqr:
 	mulxq	56(%rsi),%rdi,%r11
 	adoxq	%rdi,%r10
 	adcxq	%rbp,%r11
+	mulxq	%rdx,%rax,%rdi
+	movq	40(%rsi),%rdx
 	adoxq	%rbp,%r11
 
-	movq	%r9,%rcx
-	shldq	$1,%r8,%r9
-	shldq	$1,%rbx,%r8
+	xorq	%rcx,%rcx
+	adoxq	%r15,%r15
 
-	xorl	%ebp,%ebp
-	mulxq	%rdx,%rax,%rdx
+	adcxq	%rbx,%rax
+	adoxq	%r8,%r8
 	adcxq	%rax,%r15
-	adcxq	%rdx,%r8
-	movq	40(%rsi),%rdx
-	adcxq	%rbp,%r9
+	adoxq	%rbp,%rcx
+	adcxq	%rdi,%r8
+	adcxq	%rbp,%rcx
 
 	movq	%r15,64(%rsp)
 	movq	%r8,72(%rsp)
@@ -588,18 +597,19 @@ rsaz_512_sqr:
 .byte	0xc4,0x62,0xc3,0xf6,0xa6,0x38,0x00,0x00,0x00
 	adoxq	%rdi,%r11
 	adcxq	%rbp,%r12
+	mulxq	%rdx,%rax,%rdi
 	adoxq	%rbp,%r12
+	movq	48(%rsi),%rdx
 
-	movq	%r11,%rbx
-	shldq	$1,%r10,%r11
-	shldq	$1,%rcx,%r10
+	xorq	%rbx,%rbx
+	adoxq	%r9,%r9
 
-	xorl	%ebp,%ebp
-	mulxq	%rdx,%rax,%rdx
+	adcxq	%rcx,%rax
+	adoxq	%r10,%r10
 	adcxq	%rax,%r9
-	adcxq	%rdx,%r10
-	movq	48(%rsi),%rdx
-	adcxq	%rbp,%r11
+	adcxq	%rdi,%r10
+	adoxq	%rbp,%rbx
+	adcxq	%rbp,%rbx
 
 	movq	%r9,80(%rsp)
 	movq	%r10,88(%rsp)
@@ -609,31 +619,31 @@ rsaz_512_sqr:
 	adoxq	%rax,%r12
 	adoxq	%rbp,%r13
 
-	xorq	%r14,%r14
-	shldq	$1,%r13,%r14
-	shldq	$1,%r12,%r13
-	shldq	$1,%rbx,%r12
+	mulxq	%rdx,%rax,%rdi
+	xorq	%rcx,%rcx
+	movq	56(%rsi),%rdx
+	adoxq	%r11,%r11
 
-	xorl	%ebp,%ebp
-	mulxq	%rdx,%rax,%rdx
+	adcxq	%rbx,%rax
+	adoxq	%r12,%r12
 	adcxq	%rax,%r11
-	adcxq	%rdx,%r12
-	movq	56(%rsi),%rdx
-	adcxq	%rbp,%r13
+	adoxq	%rbp,%rcx
+	adcxq	%rdi,%r12
+	adcxq	%rbp,%rcx
 
 .byte	0x4c,0x89,0x9c,0x24,0x60,0x00,0x00,0x00
 .byte	0x4c,0x89,0xa4,0x24,0x68,0x00,0x00,0x00
 
 
 	mulxq	%rdx,%rax,%rdx
-	adoxq	%rax,%r13
-	adoxq	%rbp,%rdx
+	xorq	%rbx,%rbx
+	adoxq	%r13,%r13
 
-.byte	0x66
-	addq	%rdx,%r14
+	adcxq	%rcx,%rax
+	adoxq	%rbp,%rbx
+	adcxq	%r13,%rax
+	adcxq	%rdx,%rbx
 
-	movq	%r13,112(%rsp)
-	movq	%r14,120(%rsp)
 .byte	102,72,15,126,199
 .byte	102,72,15,126,205
 
@@ -647,6 +657,9 @@ rsaz_512_sqr:
 	movq	48(%rsp),%r14
 	movq	56(%rsp),%r15
 
+	movq	%rax,112(%rsp)
+	movq	%rbx,120(%rsp)
+
 	call	__rsaz_512_reducex
 
 	addq	64(%rsp),%r8
@@ -1440,6 +1453,7 @@ rsaz_512_mul_by_one:
 .type	__rsaz_512_reduce,@function
 .align	32
 __rsaz_512_reduce:
+.cfi_startproc
 	movq	%r8,%rbx
 	imulq	128+8(%rsp),%rbx
 	movq	0(%rbp),%rax
@@ -1519,10 +1533,12 @@ __rsaz_512_reduce:
 	jne	.Lreduction_loop
 
 	.byte	0xf3,0xc3
+.cfi_endproc
 .size	__rsaz_512_reduce,.-__rsaz_512_reduce
 .type	__rsaz_512_reducex,@function
 .align	32
 __rsaz_512_reducex:
+.cfi_startproc
 
 	imulq	%r8,%rdx
 	xorq	%rsi,%rsi
@@ -1575,10 +1591,12 @@ __rsaz_512_reducex:
 	jne	.Lreduction_loopx
 
 	.byte	0xf3,0xc3
+.cfi_endproc
 .size	__rsaz_512_reducex,.-__rsaz_512_reducex
 .type	__rsaz_512_subtract,@function
 .align	32
 __rsaz_512_subtract:
+.cfi_startproc
 	movq	%r8,(%rdi)
 	movq	%r9,8(%rdi)
 	movq	%r10,16(%rdi)
@@ -1632,10 +1650,12 @@ __rsaz_512_subtract:
 	movq	%r15,56(%rdi)
 
 	.byte	0xf3,0xc3
+.cfi_endproc
 .size	__rsaz_512_subtract,.-__rsaz_512_subtract
 .type	__rsaz_512_mul,@function
 .align	32
 __rsaz_512_mul:
+.cfi_startproc
 	leaq	8(%rsp),%rdi
 
 	movq	(%rsi),%rax
@@ -1774,10 +1794,12 @@ __rsaz_512_mul:
 	movq	%r15,56(%rdi)
 
 	.byte	0xf3,0xc3
+.cfi_endproc
 .size	__rsaz_512_mul,.-__rsaz_512_mul
 .type	__rsaz_512_mulx,@function
 .align	32
 __rsaz_512_mulx:
+.cfi_startproc
 	mulxq	(%rsi),%rbx,%r8
 	movq	$-6,%rcx
 
@@ -1894,11 +1916,13 @@ __rsaz_512_mulx:
 	movq	%r15,8+64+56(%rsp)
 
 	.byte	0xf3,0xc3
+.cfi_endproc
 .size	__rsaz_512_mulx,.-__rsaz_512_mulx
 .globl	rsaz_512_scatter4
 .type	rsaz_512_scatter4,@function
 .align	16
 rsaz_512_scatter4:
+.cfi_startproc
 	leaq	(%rdi,%rdx,8),%rdi
 	movl	$8,%r9d
 	jmp	.Loop_scatter
@@ -1911,12 +1935,14 @@ rsaz_512_scatter4:
 	decl	%r9d
 	jnz	.Loop_scatter
 	.byte	0xf3,0xc3
+.cfi_endproc
 .size	rsaz_512_scatter4,.-rsaz_512_scatter4
 
 .globl	rsaz_512_gather4
 .type	rsaz_512_gather4,@function
 .align	16
 rsaz_512_gather4:
+.cfi_startproc
 	movd	%edx,%xmm8
 	movdqa	.Linc+16(%rip),%xmm1
 	movdqa	.Linc(%rip),%xmm0
@@ -1980,6 +2006,7 @@ rsaz_512_gather4:
 	jnz	.Loop_gather
 	.byte	0xf3,0xc3
 .LSEH_end_rsaz_512_gather4:
+.cfi_endproc
 .size	rsaz_512_gather4,.-rsaz_512_gather4
 
 .align	64
diff --git a/deps/openssl/config/archs/linux-x32/asm/crypto/bn/x86_64-mont5.s b/deps/openssl/config/archs/linux-x32/asm/crypto/bn/x86_64-mont5.s
index df4b6610a0..40a60a3c8f 100644
--- a/deps/openssl/config/archs/linux-x32/asm/crypto/bn/x86_64-mont5.s
+++ b/deps/openssl/config/archs/linux-x32/asm/crypto/bn/x86_64-mont5.s
@@ -550,6 +550,7 @@ bn_mul4x_mont_gather5:
 .type	mul4x_internal,@function
 .align	32
 mul4x_internal:
+.cfi_startproc
 	shlq	$5,%r9
 	movd	8(%rax),%xmm5
 	leaq	.Linc(%rip),%rax
@@ -1071,6 +1072,7 @@ mul4x_internal:
 	movq	16(%rbp),%r14
 	movq	24(%rbp),%r15
 	jmp	.Lsqr4x_sub_entry
+.cfi_endproc
 .size	mul4x_internal,.-mul4x_internal
 .globl	bn_power5
 .type	bn_power5,@function
@@ -1213,6 +1215,7 @@ bn_power5:
 .align	32
 bn_sqr8x_internal:
 __bn_sqr8x_internal:
+.cfi_startproc
 
 
 
@@ -1987,10 +1990,12 @@ __bn_sqr8x_reduction:
 	cmpq	%rdx,%rdi
 	jb	.L8x_reduction_loop
 	.byte	0xf3,0xc3
+.cfi_endproc
 .size	bn_sqr8x_internal,.-bn_sqr8x_internal
 .type	__bn_post4x_internal,@function
 .align	32
 __bn_post4x_internal:
+.cfi_startproc
 	movq	0(%rbp),%r12
 	leaq	(%rdi,%r9,1),%rbx
 	movq	%r9,%rcx
@@ -2041,15 +2046,18 @@ __bn_post4x_internal:
 	movq	%r9,%r10
 	negq	%r9
 	.byte	0xf3,0xc3
+.cfi_endproc
 .size	__bn_post4x_internal,.-__bn_post4x_internal
 .globl	bn_from_montgomery
 .type	bn_from_montgomery,@function
 .align	32
 bn_from_montgomery:
+.cfi_startproc
 	testl	$7,%r9d
 	jz	bn_from_mont8x
 	xorl	%eax,%eax
 	.byte	0xf3,0xc3
+.cfi_endproc
 .size	bn_from_montgomery,.-bn_from_montgomery
 
 .type	bn_from_mont8x,@function
@@ -2333,6 +2341,7 @@ bn_mulx4x_mont_gather5:
 .type	mulx4x_internal,@function
 .align	32
 mulx4x_internal:
+.cfi_startproc
 	movq	%r9,8(%rsp)
 	movq	%r9,%r10
 	negq	%r9
@@ -2751,6 +2760,7 @@ mulx4x_internal:
 	movq	16(%rbp),%r14
 	movq	24(%rbp),%r15
 	jmp	.Lsqrx4x_sub_entry
+.cfi_endproc
 .size	mulx4x_internal,.-mulx4x_internal
 .type	bn_powerx5,@function
 .align	32
@@ -3509,6 +3519,7 @@ __bn_sqrx8x_reduction:
 .size	bn_sqrx8x_internal,.-bn_sqrx8x_internal
 .align	32
 __bn_postx4x_internal:
+.cfi_startproc
 	movq	0(%rbp),%r12
 	movq	%rcx,%r10
 	movq	%rcx,%r9
@@ -3556,11 +3567,13 @@ __bn_postx4x_internal:
 	negq	%r9
 
 	.byte	0xf3,0xc3
+.cfi_endproc
 .size	__bn_postx4x_internal,.-__bn_postx4x_internal
 .globl	bn_get_bits5
 .type	bn_get_bits5,@function
 .align	16
 bn_get_bits5:
+.cfi_startproc
 	leaq	0(%rdi),%r10
 	leaq	1(%rdi),%r11
 	movl	%esi,%ecx
@@ -3574,12 +3587,14 @@ bn_get_bits5:
 	shrl	%cl,%eax
 	andl	$31,%eax
 	.byte	0xf3,0xc3
+.cfi_endproc
 .size	bn_get_bits5,.-bn_get_bits5
 
 .globl	bn_scatter5
 .type	bn_scatter5,@function
 .align	16
 bn_scatter5:
+.cfi_startproc
 	cmpl	$0,%esi
 	jz	.Lscatter_epilogue
 	leaq	(%rdx,%rcx,8),%rdx
@@ -3592,6 +3607,7 @@ bn_scatter5:
 	jnz	.Lscatter
 .Lscatter_epilogue:
 	.byte	0xf3,0xc3
+.cfi_endproc
 .size	bn_scatter5,.-bn_scatter5
 
 .globl	bn_gather5
@@ -3599,6 +3615,7 @@ bn_scatter5:
 .align	32
 bn_gather5:
 .LSEH_begin_bn_gather5:
+.cfi_startproc
 
 .byte	0x4c,0x8d,0x14,0x24
 .byte	0x48,0x81,0xec,0x08,0x01,0x00,0x00
@@ -3756,6 +3773,7 @@ bn_gather5:
 	leaq	(%r10),%rsp
 	.byte	0xf3,0xc3
 .LSEH_end_bn_gather5:
+.cfi_endproc
 .size	bn_gather5,.-bn_gather5
 .align	64
 .Linc:
diff --git a/deps/openssl/config/archs/linux-x32/asm/crypto/buildinf.h b/deps/openssl/config/archs/linux-x32/asm/crypto/buildinf.h
index c9b1f19894..2dbe97005c 100644
--- a/deps/openssl/config/archs/linux-x32/asm/crypto/buildinf.h
+++ b/deps/openssl/config/archs/linux-x32/asm/crypto/buildinf.h
@@ -11,7 +11,7 @@
  */
 
 #define PLATFORM "platform: linux-x32"
-#define DATE "built on: Fri Sep 13 15:59:43 2019 UTC"
+#define DATE "built on: Wed Mar 18 21:06:40 2020 UTC"
 
 /*
  * Generate compiler_flags as an array of individual characters. This is a
@@ -37,10 +37,10 @@ static const char compiler_flags[] = {
     'M',' ','-','D','S','H','A','5','1','2','_','A','S','M',' ','-',
     'D','K','E','C','C','A','K','1','6','0','0','_','A','S','M',' ',
     '-','D','R','C','4','_','A','S','M',' ','-','D','M','D','5','_',
-    'A','S','M',' ','-','D','V','P','A','E','S','_','A','S','M',' ',
-    '-','D','G','H','A','S','H','_','A','S','M',' ','-','D','E','C',
-    'P','_','N','I','S','T','Z','2','5','6','_','A','S','M',' ','-',
-    'D','X','2','5','5','1','9','_','A','S','M',' ','-','D','P','O',
-    'L','Y','1','3','0','5','_','A','S','M',' ','-','D','N','D','E',
-    'B','U','G','\0'
+    'A','S','M',' ','-','D','A','E','S','N','I','_','A','S','M',' ',
+    '-','D','V','P','A','E','S','_','A','S','M',' ','-','D','G','H',
+    'A','S','H','_','A','S','M',' ','-','D','E','C','P','_','N','I',
+    'S','T','Z','2','5','6','_','A','S','M',' ','-','D','X','2','5',
+    '5','1','9','_','A','S','M',' ','-','D','P','O','L','Y','1','3',
+    '0','5','_','A','S','M',' ','-','D','N','D','E','B','U','G','\0'
 };
diff --git a/deps/openssl/config/archs/linux-x32/asm/crypto/camellia/cmll-x86_64.s b/deps/openssl/config/archs/linux-x32/asm/crypto/camellia/cmll-x86_64.s
index 405566b01c..eeb20dd229 100644
--- a/deps/openssl/config/archs/linux-x32/asm/crypto/camellia/cmll-x86_64.s
+++ b/deps/openssl/config/archs/linux-x32/asm/crypto/camellia/cmll-x86_64.s
@@ -5,11 +5,13 @@
 .type	Camellia_EncryptBlock,@function
 .align	16
 Camellia_EncryptBlock:
+.cfi_startproc
 	movl	$128,%eax
 	subl	%edi,%eax
 	movl	$3,%edi
 	adcl	$0,%edi
 	jmp	.Lenc_rounds
+.cfi_endproc
 .size	Camellia_EncryptBlock,.-Camellia_EncryptBlock
 
 .globl	Camellia_EncryptBlock_Rounds
@@ -83,6 +85,7 @@ Camellia_EncryptBlock_Rounds:
 .type	_x86_64_Camellia_encrypt,@function
 .align	16
 _x86_64_Camellia_encrypt:
+.cfi_startproc
 	xorl	0(%r14),%r9d
 	xorl	4(%r14),%r8d
 	xorl	8(%r14),%r11d
@@ -285,6 +288,7 @@ _x86_64_Camellia_encrypt:
 	movl	%edx,%r11d
 
 .byte	0xf3,0xc3
+.cfi_endproc
 .size	_x86_64_Camellia_encrypt,.-_x86_64_Camellia_encrypt
 
 
@@ -292,11 +296,13 @@ _x86_64_Camellia_encrypt:
 .type	Camellia_DecryptBlock,@function
 .align	16
 Camellia_DecryptBlock:
+.cfi_startproc
 	movl	$128,%eax
 	subl	%edi,%eax
 	movl	$3,%edi
 	adcl	$0,%edi
 	jmp	.Ldec_rounds
+.cfi_endproc
 .size	Camellia_DecryptBlock,.-Camellia_DecryptBlock
 
 .globl	Camellia_DecryptBlock_Rounds
@@ -370,6 +376,7 @@ Camellia_DecryptBlock_Rounds:
 .type	_x86_64_Camellia_decrypt,@function
 .align	16
 _x86_64_Camellia_decrypt:
+.cfi_startproc
 	xorl	0(%r14),%r9d
 	xorl	4(%r14),%r8d
 	xorl	8(%r14),%r11d
@@ -573,6 +580,7 @@ _x86_64_Camellia_decrypt:
 	movl	%ebx,%r11d
 
 .byte	0xf3,0xc3
+.cfi_endproc
 .size	_x86_64_Camellia_decrypt,.-_x86_64_Camellia_decrypt
 .globl	Camellia_Ekeygen
 .type	Camellia_Ekeygen,@function
diff --git a/deps/openssl/config/archs/linux-x32/asm/crypto/ec/ecp_nistz256-x86_64.s b/deps/openssl/config/archs/linux-x32/asm/crypto/ec/ecp_nistz256-x86_64.s
index 62b9ac6616..5c9e405041 100644
--- a/deps/openssl/config/archs/linux-x32/asm/crypto/ec/ecp_nistz256-x86_64.s
+++ b/deps/openssl/config/archs/linux-x32/asm/crypto/ec/ecp_nistz256-x86_64.s
@@ -3874,10 +3874,12 @@ ecp_nistz256_ord_sqr_montx:
 .type	ecp_nistz256_to_mont,@function
 .align	32
 ecp_nistz256_to_mont:
+.cfi_startproc
 	movl	$0x80100,%ecx
 	andl	OPENSSL_ia32cap_P+8(%rip),%ecx
 	leaq	.LRR(%rip),%rdx
 	jmp	.Lmul_mont
+.cfi_endproc
 .size	ecp_nistz256_to_mont,.-ecp_nistz256_to_mont
 
 
@@ -4821,6 +4823,7 @@ ecp_nistz256_from_mont:
 .type	ecp_nistz256_scatter_w5,@function
 .align	32
 ecp_nistz256_scatter_w5:
+.cfi_startproc
 	leal	-3(%rdx,%rdx,2),%edx
 	movdqa	0(%rsi),%xmm0
 	shll	$5,%edx
@@ -4837,6 +4840,7 @@ ecp_nistz256_scatter_w5:
 	movdqa	%xmm5,80(%rdi,%rdx,1)
 
 	.byte	0xf3,0xc3
+.cfi_endproc
 .size	ecp_nistz256_scatter_w5,.-ecp_nistz256_scatter_w5
 
 
@@ -4910,6 +4914,7 @@ ecp_nistz256_gather_w5:
 .type	ecp_nistz256_scatter_w7,@function
 .align	32
 ecp_nistz256_scatter_w7:
+.cfi_startproc
 	movdqu	0(%rsi),%xmm0
 	shll	$6,%edx
 	movdqu	16(%rsi),%xmm1
@@ -4921,6 +4926,7 @@ ecp_nistz256_scatter_w7:
 	movdqa	%xmm3,48(%rdi,%rdx,1)
 
 	.byte	0xf3,0xc3
+.cfi_endproc
 .size	ecp_nistz256_scatter_w7,.-ecp_nistz256_scatter_w7
 
 
@@ -5655,26 +5661,16 @@ ecp_nistz256_point_add:
 	orq	%r8,%r12
 	orq	%r9,%r12
 
-.byte	0x3e
-	jnz	.Ladd_proceedq
 .byte	102,73,15,126,208
 .byte	102,73,15,126,217
-	testq	%r8,%r8
-	jnz	.Ladd_proceedq
-	testq	%r9,%r9
-	jz	.Ladd_doubleq
 
-.byte	102,72,15,126,199
-	pxor	%xmm0,%xmm0
-	movdqu	%xmm0,0(%rdi)
-	movdqu	%xmm0,16(%rdi)
-	movdqu	%xmm0,32(%rdi)
-	movdqu	%xmm0,48(%rdi)
-	movdqu	%xmm0,64(%rdi)
-	movdqu	%xmm0,80(%rdi)
-	jmp	.Ladd_doneq
+	orq	%r8,%r12
+	orq	%r9,%r12
+
+
+.byte	0x3e
+	jnz	.Ladd_proceedq
 
-.align	32
 .Ladd_doubleq:
 .byte	102,72,15,126,206
 .byte	102,72,15,126,199
@@ -6774,26 +6770,16 @@ ecp_nistz256_point_addx:
 	orq	%r8,%r12
 	orq	%r9,%r12
 
-.byte	0x3e
-	jnz	.Ladd_proceedx
 .byte	102,73,15,126,208
 .byte	102,73,15,126,217
-	testq	%r8,%r8
-	jnz	.Ladd_proceedx
-	testq	%r9,%r9
-	jz	.Ladd_doublex
 
-.byte	102,72,15,126,199
-	pxor	%xmm0,%xmm0
-	movdqu	%xmm0,0(%rdi)
-	movdqu	%xmm0,16(%rdi)
-	movdqu	%xmm0,32(%rdi)
-	movdqu	%xmm0,48(%rdi)
-	movdqu	%xmm0,64(%rdi)
-	movdqu	%xmm0,80(%rdi)
-	jmp	.Ladd_donex
+	orq	%r8,%r12
+	orq	%r9,%r12
+
+
+.byte	0x3e
+	jnz	.Ladd_proceedx
 
-.align	32
 .Ladd_doublex:
 .byte	102,72,15,126,206
 .byte	102,72,15,126,199
diff --git a/deps/openssl/config/archs/linux-x32/asm/crypto/ec/x25519-x86_64.s b/deps/openssl/config/archs/linux-x32/asm/crypto/ec/x25519-x86_64.s
index 2a18eaee28..1788e568cd 100644
--- a/deps/openssl/config/archs/linux-x32/asm/crypto/ec/x25519-x86_64.s
+++ b/deps/openssl/config/archs/linux-x32/asm/crypto/ec/x25519-x86_64.s
@@ -400,12 +400,14 @@ x25519_fe51_mul121666:
 .type	x25519_fe64_eligible,@function
 .align	32
 x25519_fe64_eligible:
+.cfi_startproc
 	movl	OPENSSL_ia32cap_P+8(%rip),%ecx
 	xorl	%eax,%eax
 	andl	$0x80100,%ecx
 	cmpl	$0x80100,%ecx
 	cmovel	%ecx,%eax
 	.byte	0xf3,0xc3
+.cfi_endproc
 .size	x25519_fe64_eligible,.-x25519_fe64_eligible
 
 .globl	x25519_fe64_mul
@@ -648,6 +650,7 @@ x25519_fe64_sqr:
 .align	32
 x25519_fe64_mul121666:
 .Lfe64_mul121666_body:
+.cfi_startproc
 	movl	$121666,%edx
 	mulxq	0(%rsi),%r8,%rcx
 	mulxq	8(%rsi),%r9,%rax
@@ -676,6 +679,7 @@ x25519_fe64_mul121666:
 
 .Lfe64_mul121666_epilogue:
 	.byte	0xf3,0xc3
+.cfi_endproc
 .size	x25519_fe64_mul121666,.-x25519_fe64_mul121666
 
 .globl	x25519_fe64_add
@@ -683,6 +687,7 @@ x25519_fe64_mul121666:
 .align	32
 x25519_fe64_add:
 .Lfe64_add_body:
+.cfi_startproc
 	movq	0(%rsi),%r8
 	movq	8(%rsi),%r9
 	movq	16(%rsi),%r10
@@ -711,6 +716,7 @@ x25519_fe64_add:
 
 .Lfe64_add_epilogue:
 	.byte	0xf3,0xc3
+.cfi_endproc
 .size	x25519_fe64_add,.-x25519_fe64_add
 
 .globl	x25519_fe64_sub
@@ -718,6 +724,7 @@ x25519_fe64_add:
 .align	32
 x25519_fe64_sub:
 .Lfe64_sub_body:
+.cfi_startproc
 	movq	0(%rsi),%r8
 	movq	8(%rsi),%r9
 	movq	16(%rsi),%r10
@@ -746,6 +753,7 @@ x25519_fe64_sub:
 
 .Lfe64_sub_epilogue:
 	.byte	0xf3,0xc3
+.cfi_endproc
 .size	x25519_fe64_sub,.-x25519_fe64_sub
 
 .globl	x25519_fe64_tobytes
@@ -753,6 +761,7 @@ x25519_fe64_sub:
 .align	32
 x25519_fe64_tobytes:
 .Lfe64_to_body:
+.cfi_startproc
 	movq	0(%rsi),%r8
 	movq	8(%rsi),%r9
 	movq	16(%rsi),%r10
@@ -788,5 +797,6 @@ x25519_fe64_tobytes:
 
 .Lfe64_to_epilogue:
 	.byte	0xf3,0xc3
+.cfi_endproc
 .size	x25519_fe64_tobytes,.-x25519_fe64_tobytes
 .byte	88,50,53,53,49,57,32,112,114,105,109,105,116,105,118,101,115,32,102,111,114,32,120,56,54,95,54,52,44,32,67,82,89,80,84,79,71,65,77,83,32,98,121,32,60,97,112,112,114,111,64,111,112,101,110,115,115,108,46,111,114,103,62,0
diff --git a/deps/openssl/config/archs/linux-x32/asm/crypto/include/internal/bn_conf.h b/deps/openssl/config/archs/linux-x32/asm/crypto/include/internal/bn_conf.h
index 0d071bda66..93f75e2e15 100644
--- a/deps/openssl/config/archs/linux-x32/asm/crypto/include/internal/bn_conf.h
+++ b/deps/openssl/config/archs/linux-x32/asm/crypto/include/internal/bn_conf.h
@@ -1,5 +1,5 @@
 /* WARNING: do not edit! */
-/* Generated by Makefile from crypto/include/internal/bn_conf.h.in */
+/* Generated by Makefile from include/crypto/bn_conf.h.in */
 /*
  * Copyright 2016 The OpenSSL Project Authors. All Rights Reserved.
  *
@@ -9,8 +9,8 @@
  * https://www.openssl.org/source/license.html
  */
 
-#ifndef HEADER_BN_CONF_H
-# define HEADER_BN_CONF_H
+#ifndef OSSL_CRYPTO_BN_CONF_H
+# define OSSL_CRYPTO_BN_CONF_H
 
 /*
  * The contents of this file are not used in the UEFI build, as
diff --git a/deps/openssl/config/archs/linux-x32/asm/crypto/include/internal/dso_conf.h b/deps/openssl/config/archs/linux-x32/asm/crypto/include/internal/dso_conf.h
index 252266ec2a..4b1167c3d8 100644
--- a/deps/openssl/config/archs/linux-x32/asm/crypto/include/internal/dso_conf.h
+++ b/deps/openssl/config/archs/linux-x32/asm/crypto/include/internal/dso_conf.h
@@ -1,5 +1,5 @@
 /* WARNING: do not edit! */
-/* Generated by Makefile from crypto/include/internal/dso_conf.h.in */
+/* Generated by Makefile from include/crypto/dso_conf.h.in */
 /*
  * Copyright 2016-2019 The OpenSSL Project Authors. All Rights Reserved.
  *
@@ -9,8 +9,8 @@
  * https://www.openssl.org/source/license.html
  */
 
-#ifndef HEADER_DSO_CONF_H
-# define HEADER_DSO_CONF_H
+#ifndef OSSL_CRYPTO_DSO_CONF_H
+# define OSSL_CRYPTO_DSO_CONF_H
 # define DSO_DLFCN
 # define HAVE_DLFCN_H
 # define DSO_EXTENSION ".so"
diff --git a/deps/openssl/config/archs/linux-x32/asm/crypto/modes/aesni-gcm-x86_64.s b/deps/openssl/config/archs/linux-x32/asm/crypto/modes/aesni-gcm-x86_64.s
index 6a7a9577c7..01d89630a4 100644
--- a/deps/openssl/config/archs/linux-x32/asm/crypto/modes/aesni-gcm-x86_64.s
+++ b/deps/openssl/config/archs/linux-x32/asm/crypto/modes/aesni-gcm-x86_64.s
@@ -3,6 +3,7 @@
 .type	_aesni_ctr32_ghash_6x,@function
 .align	32
 _aesni_ctr32_ghash_6x:
+.cfi_startproc
 	vmovdqu	32(%r11),%xmm2
 	subq	$6,%rdx
 	vpxor	%xmm4,%xmm4,%xmm4
@@ -310,6 +311,7 @@ _aesni_ctr32_ghash_6x:
 	vpxor	%xmm4,%xmm8,%xmm8
 
 	.byte	0xf3,0xc3
+.cfi_endproc
 .size	_aesni_ctr32_ghash_6x,.-_aesni_ctr32_ghash_6x
 .globl	aesni_gcm_decrypt
 .type	aesni_gcm_decrypt,@function
@@ -416,6 +418,7 @@ aesni_gcm_decrypt:
 .type	_aesni_ctr32_6x,@function
 .align	32
 _aesni_ctr32_6x:
+.cfi_startproc
 	vmovdqu	0-128(%rcx),%xmm4
 	vmovdqu	32(%r11),%xmm2
 	leaq	-1(%rbp),%r13
@@ -502,6 +505,7 @@ _aesni_ctr32_6x:
 	vpshufb	%xmm0,%xmm1,%xmm1
 	vpxor	%xmm4,%xmm14,%xmm14
 	jmp	.Loop_ctr32
+.cfi_endproc
 .size	_aesni_ctr32_6x,.-_aesni_ctr32_6x
 
 .globl	aesni_gcm_encrypt
diff --git a/deps/openssl/config/archs/linux-x32/asm/crypto/poly1305/poly1305-x86_64.s b/deps/openssl/config/archs/linux-x32/asm/crypto/poly1305/poly1305-x86_64.s
index 0e08513b66..0cdd406e84 100644
--- a/deps/openssl/config/archs/linux-x32/asm/crypto/poly1305/poly1305-x86_64.s
+++ b/deps/openssl/config/archs/linux-x32/asm/crypto/poly1305/poly1305-x86_64.s
@@ -12,6 +12,7 @@
 .type	poly1305_init,@function
 .align	32
 poly1305_init:
+.cfi_startproc
 	xorq	%rax,%rax
 	movq	%rax,0(%rdi)
 	movq	%rax,8(%rdi)
@@ -47,6 +48,7 @@ poly1305_init:
 	movl	$1,%eax
 .Lno_key:
 	.byte	0xf3,0xc3
+.cfi_endproc
 .size	poly1305_init,.-poly1305_init
 
 .type	poly1305_blocks,@function
@@ -167,6 +169,7 @@ poly1305_blocks:
 .type	poly1305_emit,@function
 .align	32
 poly1305_emit:
+.cfi_startproc
 .Lemit:
 	movq	0(%rdi),%r8
 	movq	8(%rdi),%r9
@@ -187,10 +190,12 @@ poly1305_emit:
 	movq	%rcx,8(%rsi)
 
 	.byte	0xf3,0xc3
+.cfi_endproc
 .size	poly1305_emit,.-poly1305_emit
 .type	__poly1305_block,@function
 .align	32
 __poly1305_block:
+.cfi_startproc
 	mulq	%r14
 	movq	%rax,%r9
 	movq	%r11,%rax
@@ -230,11 +235,13 @@ __poly1305_block:
 	adcq	$0,%rbx
 	adcq	$0,%rbp
 	.byte	0xf3,0xc3
+.cfi_endproc
 .size	__poly1305_block,.-__poly1305_block
 
 .type	__poly1305_init_avx,@function
 .align	32
 __poly1305_init_avx:
+.cfi_startproc
 	movq	%r11,%r14
 	movq	%r12,%rbx
 	xorq	%rbp,%rbp
@@ -392,6 +399,7 @@ __poly1305_init_avx:
 
 	leaq	-48-64(%rdi),%rdi
 	.byte	0xf3,0xc3
+.cfi_endproc
 .size	__poly1305_init_avx,.-__poly1305_init_avx
 
 .type	poly1305_blocks_avx,@function
@@ -1232,6 +1240,7 @@ poly1305_blocks_avx:
 .type	poly1305_emit_avx,@function
 .align	32
 poly1305_emit_avx:
+.cfi_startproc
 	cmpl	$0,20(%rdi)
 	je	.Lemit
 
@@ -1282,6 +1291,7 @@ poly1305_emit_avx:
 	movq	%rcx,8(%rsi)
 
 	.byte	0xf3,0xc3
+.cfi_endproc
 .size	poly1305_emit_avx,.-poly1305_emit_avx
 .type	poly1305_blocks_avx2,@function
 .align	32
@@ -2478,6 +2488,7 @@ poly1305_blocks_avx512:
 .type	poly1305_init_base2_44,@function
 .align	32
 poly1305_init_base2_44:
+.cfi_startproc
 	xorq	%rax,%rax
 	movq	%rax,0(%rdi)
 	movq	%rax,8(%rdi)
@@ -2511,10 +2522,12 @@ poly1305_init_base2_44:
 	movl	%r11d,4(%rdx)
 	movl	$1,%eax
 	.byte	0xf3,0xc3
+.cfi_endproc
 .size	poly1305_init_base2_44,.-poly1305_init_base2_44
 .type	poly1305_blocks_vpmadd52,@function
 .align	32
 poly1305_blocks_vpmadd52:
+.cfi_startproc
 	shrq	$4,%rdx
 	jz	.Lno_data_vpmadd52
 
@@ -2621,10 +2634,12 @@ poly1305_blocks_vpmadd52:
 
 .Lno_data_vpmadd52:
 	.byte	0xf3,0xc3
+.cfi_endproc
 .size	poly1305_blocks_vpmadd52,.-poly1305_blocks_vpmadd52
 .type	poly1305_blocks_vpmadd52_4x,@function
 .align	32
 poly1305_blocks_vpmadd52_4x:
+.cfi_startproc
 	shrq	$4,%rdx
 	jz	.Lno_data_vpmadd52_4x
 
@@ -3049,10 +3064,12 @@ poly1305_blocks_vpmadd52_4x:
 
 .Lno_data_vpmadd52_4x:
 	.byte	0xf3,0xc3
+.cfi_endproc
 .size	poly1305_blocks_vpmadd52_4x,.-poly1305_blocks_vpmadd52_4x
 .type	poly1305_blocks_vpmadd52_8x,@function
 .align	32
 poly1305_blocks_vpmadd52_8x:
+.cfi_startproc
 	shrq	$4,%rdx
 	jz	.Lno_data_vpmadd52_8x
 
@@ -3393,10 +3410,12 @@ poly1305_blocks_vpmadd52_8x:
 
 .Lno_data_vpmadd52_8x:
 	.byte	0xf3,0xc3
+.cfi_endproc
 .size	poly1305_blocks_vpmadd52_8x,.-poly1305_blocks_vpmadd52_8x
 .type	poly1305_emit_base2_44,@function
 .align	32
 poly1305_emit_base2_44:
+.cfi_startproc
 	movq	0(%rdi),%r8
 	movq	8(%rdi),%r9
 	movq	16(%rdi),%r10
@@ -3427,6 +3446,7 @@ poly1305_emit_base2_44:
 	movq	%rcx,8(%rsi)
 
 	.byte	0xf3,0xc3
+.cfi_endproc
 .size	poly1305_emit_base2_44,.-poly1305_emit_base2_44
 .align	64
 .Lconst:
@@ -3465,6 +3485,7 @@ poly1305_emit_base2_44:
 .type	xor128_encrypt_n_pad,@function
 .align	16
 xor128_encrypt_n_pad:
+.cfi_startproc
 	subq	%rdx,%rsi
 	subq	%rdx,%rdi
 	movq	%rcx,%r10
@@ -3506,12 +3527,14 @@ xor128_encrypt_n_pad:
 .Ldone_enc:
 	movq	%rdx,%rax
 	.byte	0xf3,0xc3
+.cfi_endproc
 .size	xor128_encrypt_n_pad,.-xor128_encrypt_n_pad
 
 .globl	xor128_decrypt_n_pad
 .type	xor128_decrypt_n_pad,@function
 .align	16
 xor128_decrypt_n_pad:
+.cfi_startproc
 	subq	%rdx,%rsi
 	subq	%rdx,%rdi
 	movq	%rcx,%r10
@@ -3557,4 +3580,5 @@ xor128_decrypt_n_pad:
 .Ldone_dec:
 	movq	%rdx,%rax
 	.byte	0xf3,0xc3
+.cfi_endproc
 .size	xor128_decrypt_n_pad,.-xor128_decrypt_n_pad
diff --git a/deps/openssl/config/archs/linux-x32/asm/crypto/rc4/rc4-x86_64.s b/deps/openssl/config/archs/linux-x32/asm/crypto/rc4/rc4-x86_64.s
index fba70351d4..b97c757550 100644
--- a/deps/openssl/config/archs/linux-x32/asm/crypto/rc4/rc4-x86_64.s
+++ b/deps/openssl/config/archs/linux-x32/asm/crypto/rc4/rc4-x86_64.s
@@ -4,11 +4,12 @@
 .globl	RC4
 .type	RC4,@function
 .align	16
-RC4:	orq	%rsi,%rsi
+RC4:
+.cfi_startproc
+	orq	%rsi,%rsi
 	jne	.Lentry
 	.byte	0xf3,0xc3
 .Lentry:
-.cfi_startproc	
 	pushq	%rbx
 .cfi_adjust_cfa_offset	8
 .cfi_offset	%rbx,-16
@@ -533,6 +534,7 @@ RC4:	orq	%rsi,%rsi
 .type	RC4_set_key,@function
 .align	16
 RC4_set_key:
+.cfi_startproc
 	leaq	8(%rdi),%rdi
 	leaq	(%rdx,%rsi,1),%rdx
 	negq	%rsi
@@ -599,12 +601,14 @@ RC4_set_key:
 	movl	%eax,-8(%rdi)
 	movl	%eax,-4(%rdi)
 	.byte	0xf3,0xc3
+.cfi_endproc
 .size	RC4_set_key,.-RC4_set_key
 
 .globl	RC4_options
 .type	RC4_options,@function
 .align	16
 RC4_options:
+.cfi_startproc
 	leaq	.Lopts(%rip),%rax
 	movl	OPENSSL_ia32cap_P(%rip),%edx
 	btl	$20,%edx
@@ -617,6 +621,7 @@ RC4_options:
 	addq	$12,%rax
 .Ldone:
 	.byte	0xf3,0xc3
+.cfi_endproc
 .align	64
 .Lopts:
 .byte	114,99,52,40,56,120,44,105,110,116,41,0
diff --git a/deps/openssl/config/archs/linux-x32/asm/crypto/sha/keccak1600-x86_64.s b/deps/openssl/config/archs/linux-x32/asm/crypto/sha/keccak1600-x86_64.s
index e511f25035..09617d014b 100644
--- a/deps/openssl/config/archs/linux-x32/asm/crypto/sha/keccak1600-x86_64.s
+++ b/deps/openssl/config/archs/linux-x32/asm/crypto/sha/keccak1600-x86_64.s
@@ -3,6 +3,7 @@
 .type	__KeccakF1600,@function
 .align	32
 __KeccakF1600:
+.cfi_startproc
 	movq	60(%rdi),%rax
 	movq	68(%rdi),%rbx
 	movq	76(%rdi),%rcx
@@ -255,6 +256,7 @@ __KeccakF1600:
 
 	leaq	-192(%r15),%r15
 	.byte	0xf3,0xc3
+.cfi_endproc
 .size	__KeccakF1600,.-__KeccakF1600
 
 .type	KeccakF1600,@function
diff --git a/deps/openssl/config/archs/linux-x32/asm/crypto/sha/sha1-x86_64.s b/deps/openssl/config/archs/linux-x32/asm/crypto/sha/sha1-x86_64.s
index e436521a04..98541727e5 100644
--- a/deps/openssl/config/archs/linux-x32/asm/crypto/sha/sha1-x86_64.s
+++ b/deps/openssl/config/archs/linux-x32/asm/crypto/sha/sha1-x86_64.s
@@ -1421,8 +1421,8 @@ _shaext_shortcut:
 	pshufd	$27,%xmm1,%xmm1
 	movdqu	%xmm0,(%rdi)
 	movd	%xmm1,16(%rdi)
-.cfi_endproc	
 	.byte	0xf3,0xc3
+.cfi_endproc
 .size	sha1_block_data_order_shaext,.-sha1_block_data_order_shaext
 .type	sha1_block_data_order_ssse3,@function
 .align	16
diff --git a/deps/openssl/config/archs/linux-x32/asm/crypto/sha/sha256-x86_64.s b/deps/openssl/config/archs/linux-x32/asm/crypto/sha/sha256-x86_64.s
index 42b24df18e..9357385da3 100644
--- a/deps/openssl/config/archs/linux-x32/asm/crypto/sha/sha256-x86_64.s
+++ b/deps/openssl/config/archs/linux-x32/asm/crypto/sha/sha256-x86_64.s
@@ -1775,6 +1775,7 @@ K256:
 .align	64
 sha256_block_data_order_shaext:
 _shaext_shortcut:
+.cfi_startproc
 	leaq	K256+128(%rip),%rcx
 	movdqu	(%rdi),%xmm1
 	movdqu	16(%rdi),%xmm2
@@ -1977,6 +1978,7 @@ _shaext_shortcut:
 	movdqu	%xmm1,(%rdi)
 	movdqu	%xmm2,16(%rdi)
 	.byte	0xf3,0xc3
+.cfi_endproc
 .size	sha256_block_data_order_shaext,.-sha256_block_data_order_shaext
 .type	sha256_block_data_order_ssse3,@function
 .align	64
@@ -4238,7 +4240,15 @@ sha256_block_data_order_avx2:
 	vmovdqa	%ymm4,0(%rsp)
 	xorl	%r14d,%r14d
 	vmovdqa	%ymm5,32(%rsp)
+
+	movq	88(%rsp),%rdi
+.cfi_def_cfa	%rdi,8
 	leaq	-64(%rsp),%rsp
+
+
+
+	movq	%rdi,-8(%rsp)
+.cfi_escape	0x0f,0x05,0x77,0x78,0x06,0x23,0x08
 	movl	%ebx,%edi
 	vmovdqa	%ymm6,0(%rsp)
 	xorl	%ecx,%edi
@@ -4250,6 +4260,12 @@ sha256_block_data_order_avx2:
 .align	16
 .Lavx2_00_47:
 	leaq	-64(%rsp),%rsp
+.cfi_escape	0x0f,0x05,0x77,0x38,0x06,0x23,0x08
+
+	pushq	64-8(%rsp)
+.cfi_escape	0x0f,0x05,0x77,0x00,0x06,0x23,0x08
+	leaq	8(%rsp),%rsp
+.cfi_escape	0x0f,0x05,0x77,0x78,0x06,0x23,0x08
 	vpalignr	$4,%ymm0,%ymm1,%ymm4
 	addl	0+128(%rsp),%r11d
 	andl	%r8d,%r12d
@@ -4505,6 +4521,12 @@ sha256_block_data_order_avx2:
 	movl	%r9d,%r12d
 	vmovdqa	%ymm6,32(%rsp)
 	leaq	-64(%rsp),%rsp
+.cfi_escape	0x0f,0x05,0x77,0x38,0x06,0x23,0x08
+
+	pushq	64-8(%rsp)
+.cfi_escape	0x0f,0x05,0x77,0x00,0x06,0x23,0x08
+	leaq	8(%rsp),%rsp
+.cfi_escape	0x0f,0x05,0x77,0x78,0x06,0x23,0x08
 	vpalignr	$4,%ymm2,%ymm3,%ymm4
 	addl	0+128(%rsp),%r11d
 	andl	%r8d,%r12d
@@ -5380,6 +5402,8 @@ sha256_block_data_order_avx2:
 
 	leaq	448(%rsp),%rsp
 
+.cfi_escape	0x0f,0x06,0x77,0xd8,0x00,0x06,0x23,0x08
+
 	addl	0(%rdi),%eax
 	addl	4(%rdi),%ebx
 	addl	8(%rdi),%ecx
@@ -5405,9 +5429,11 @@ sha256_block_data_order_avx2:
 	jbe	.Loop_avx2
 	leaq	(%rsp),%rbp
 
+
+.cfi_escape	0x0f,0x06,0x76,0xd8,0x00,0x06,0x23,0x08
+
 .Ldone_avx2:
-	leaq	(%rbp),%rsp
-	movq	88(%rsp),%rsi
+	movq	88(%rbp),%rsi
 .cfi_def_cfa	%rsi,8
 	vzeroupper
 	movq	-48(%rsi),%r15
diff --git a/deps/openssl/config/archs/linux-x32/asm/crypto/sha/sha512-x86_64.s b/deps/openssl/config/archs/linux-x32/asm/crypto/sha/sha512-x86_64.s
index 5931a2a932..939f1ca71c 100644
--- a/deps/openssl/config/archs/linux-x32/asm/crypto/sha/sha512-x86_64.s
+++ b/deps/openssl/config/archs/linux-x32/asm/crypto/sha/sha512-x86_64.s
@@ -4165,7 +4165,15 @@ sha512_block_data_order_avx2:
 	vmovdqa	%ymm10,64(%rsp)
 	vpaddq	64(%rbp),%ymm6,%ymm10
 	vmovdqa	%ymm11,96(%rsp)
+
+	movq	152(%rsp),%rdi
+.cfi_def_cfa	%rdi,8
 	leaq	-128(%rsp),%rsp
+
+
+
+	movq	%rdi,-8(%rsp)
+.cfi_escape	0x0f,0x05,0x77,0x78,0x06,0x23,0x08
 	vpaddq	96(%rbp),%ymm7,%ymm11
 	vmovdqa	%ymm8,0(%rsp)
 	xorq	%r14,%r14
@@ -4181,6 +4189,12 @@ sha512_block_data_order_avx2:
 .align	16
 .Lavx2_00_47:
 	leaq	-128(%rsp),%rsp
+.cfi_escape	0x0f,0x06,0x77,0xf8,0x00,0x06,0x23,0x08
+
+	pushq	128-8(%rsp)
+.cfi_escape	0x0f,0x05,0x77,0x00,0x06,0x23,0x08
+	leaq	8(%rsp),%rsp
+.cfi_escape	0x0f,0x05,0x77,0x78,0x06,0x23,0x08
 	vpalignr	$8,%ymm0,%ymm1,%ymm8
 	addq	0+256(%rsp),%r11
 	andq	%r8,%r12
@@ -4474,6 +4488,12 @@ sha512_block_data_order_avx2:
 	movq	%r9,%r12
 	vmovdqa	%ymm10,96(%rsp)
 	leaq	-128(%rsp),%rsp
+.cfi_escape	0x0f,0x06,0x77,0xf8,0x00,0x06,0x23,0x08
+
+	pushq	128-8(%rsp)
+.cfi_escape	0x0f,0x05,0x77,0x00,0x06,0x23,0x08
+	leaq	8(%rsp),%rsp
+.cfi_escape	0x0f,0x05,0x77,0x78,0x06,0x23,0x08
 	vpalignr	$8,%ymm4,%ymm5,%ymm8
 	addq	0+256(%rsp),%r11
 	andq	%r8,%r12
@@ -5387,6 +5407,8 @@ sha512_block_data_order_avx2:
 
 	leaq	1152(%rsp),%rsp
 
+.cfi_escape	0x0f,0x06,0x77,0x98,0x01,0x06,0x23,0x08
+
 	addq	0(%rdi),%rax
 	addq	8(%rdi),%rbx
 	addq	16(%rdi),%rcx
@@ -5412,9 +5434,11 @@ sha512_block_data_order_avx2:
 	jbe	.Loop_avx2
 	leaq	(%rsp),%rbp
 
+
+.cfi_escape	0x0f,0x06,0x76,0x98,0x01,0x06,0x23,0x08
+
 .Ldone_avx2:
-	leaq	(%rbp),%rsp
-	movq	152(%rsp),%rsi
+	movq	152(%rbp),%rsi
 .cfi_def_cfa	%rsi,8
 	vzeroupper
 	movq	-48(%rsi),%r15
diff --git a/deps/openssl/config/archs/linux-x32/asm/crypto/x86_64cpuid.s b/deps/openssl/config/archs/linux-x32/asm/crypto/x86_64cpuid.s
index fd17eaaba4..9268ce8c9a 100644
--- a/deps/openssl/config/archs/linux-x32/asm/crypto/x86_64cpuid.s
+++ b/deps/openssl/config/archs/linux-x32/asm/crypto/x86_64cpuid.s
@@ -12,6 +12,7 @@
 .type	OPENSSL_atomic_add,@function
 .align	16
 OPENSSL_atomic_add:
+.cfi_startproc
 	movl	(%rdi),%eax
 .Lspin:	leaq	(%rsi,%rax,1),%r8
 .byte	0xf0
@@ -20,16 +21,19 @@ OPENSSL_atomic_add:
 	movl	%r8d,%eax
 .byte	0x48,0x98
 	.byte	0xf3,0xc3
+.cfi_endproc
 .size	OPENSSL_atomic_add,.-OPENSSL_atomic_add
 
 .globl	OPENSSL_rdtsc
 .type	OPENSSL_rdtsc,@function
 .align	16
 OPENSSL_rdtsc:
+.cfi_startproc
 	rdtsc
 	shlq	$32,%rdx
 	orq	%rdx,%rax
 	.byte	0xf3,0xc3
+.cfi_endproc
 .size	OPENSSL_rdtsc,.-OPENSSL_rdtsc
 
 .globl	OPENSSL_ia32_cpuid
@@ -205,6 +209,7 @@ OPENSSL_ia32_cpuid:
 .type	OPENSSL_cleanse,@function
 .align	16
 OPENSSL_cleanse:
+.cfi_startproc
 	xorq	%rax,%rax
 	cmpq	$15,%rsi
 	jae	.Lot
@@ -234,12 +239,14 @@ OPENSSL_cleanse:
 	cmpq	$0,%rsi
 	jne	.Little
 	.byte	0xf3,0xc3
+.cfi_endproc
 .size	OPENSSL_cleanse,.-OPENSSL_cleanse
 
 .globl	CRYPTO_memcmp
 .type	CRYPTO_memcmp,@function
 .align	16
 CRYPTO_memcmp:
+.cfi_startproc
 	xorq	%rax,%rax
 	xorq	%r10,%r10
 	cmpq	$0,%rdx
@@ -268,11 +275,13 @@ CRYPTO_memcmp:
 	shrq	$63,%rax
 .Lno_data:
 	.byte	0xf3,0xc3
+.cfi_endproc
 .size	CRYPTO_memcmp,.-CRYPTO_memcmp
 .globl	OPENSSL_wipe_cpu
 .type	OPENSSL_wipe_cpu,@function
 .align	16
 OPENSSL_wipe_cpu:
+.cfi_startproc
 	pxor	%xmm0,%xmm0
 	pxor	%xmm1,%xmm1
 	pxor	%xmm2,%xmm2
@@ -299,11 +308,13 @@ OPENSSL_wipe_cpu:
 	xorq	%r11,%r11
 	leaq	8(%rsp),%rax
 	.byte	0xf3,0xc3
+.cfi_endproc
 .size	OPENSSL_wipe_cpu,.-OPENSSL_wipe_cpu
 .globl	OPENSSL_instrument_bus
 .type	OPENSSL_instrument_bus,@function
 .align	16
 OPENSSL_instrument_bus:
+.cfi_startproc
 	movq	%rdi,%r10
 	movq	%rsi,%rcx
 	movq	%rsi,%r11
@@ -330,12 +341,14 @@ OPENSSL_instrument_bus:
 
 	movq	%r11,%rax
 	.byte	0xf3,0xc3
+.cfi_endproc
 .size	OPENSSL_instrument_bus,.-OPENSSL_instrument_bus
 
 .globl	OPENSSL_instrument_bus2
 .type	OPENSSL_instrument_bus2,@function
 .align	16
 OPENSSL_instrument_bus2:
+.cfi_startproc
 	movq	%rdi,%r10
 	movq	%rsi,%rcx
 	movq	%rdx,%r11
@@ -378,11 +391,13 @@ OPENSSL_instrument_bus2:
 	movq	8(%rsp),%rax
 	subq	%rcx,%rax
 	.byte	0xf3,0xc3
+.cfi_endproc
 .size	OPENSSL_instrument_bus2,.-OPENSSL_instrument_bus2
 .globl	OPENSSL_ia32_rdrand_bytes
 .type	OPENSSL_ia32_rdrand_bytes,@function
 .align	16
 OPENSSL_ia32_rdrand_bytes:
+.cfi_startproc
 	xorq	%rax,%rax
 	cmpq	$0,%rsi
 	je	.Ldone_rdrand_bytes
@@ -419,11 +434,13 @@ OPENSSL_ia32_rdrand_bytes:
 .Ldone_rdrand_bytes:
 	xorq	%r10,%r10
 	.byte	0xf3,0xc3
+.cfi_endproc
 .size	OPENSSL_ia32_rdrand_bytes,.-OPENSSL_ia32_rdrand_bytes
 .globl	OPENSSL_ia32_rdseed_bytes
 .type	OPENSSL_ia32_rdseed_bytes,@function
 .align	16
 OPENSSL_ia32_rdseed_bytes:
+.cfi_startproc
 	xorq	%rax,%rax
 	cmpq	$0,%rsi
 	je	.Ldone_rdseed_bytes
@@ -460,4 +477,5 @@ OPENSSL_ia32_rdseed_bytes:
 .Ldone_rdseed_bytes:
 	xorq	%r10,%r10
 	.byte	0xf3,0xc3
+.cfi_endproc
 .size	OPENSSL_ia32_rdseed_bytes,.-OPENSSL_ia32_rdseed_bytes
diff --git a/deps/openssl/config/archs/linux-x32/asm/include/openssl/opensslconf.h b/deps/openssl/config/archs/linux-x32/asm/include/openssl/opensslconf.h
index 7dda69d359..992473943e 100644
--- a/deps/openssl/config/archs/linux-x32/asm/include/openssl/opensslconf.h
+++ b/deps/openssl/config/archs/linux-x32/asm/include/openssl/opensslconf.h
@@ -96,9 +96,6 @@ extern "C" {
 #ifndef OPENSSL_NO_DYNAMIC_ENGINE
 # define OPENSSL_NO_DYNAMIC_ENGINE
 #endif
-#ifndef OPENSSL_NO_AFALGENG
-# define OPENSSL_NO_AFALGENG
-#endif
 
 
 /*
diff --git a/deps/openssl/config/archs/linux-x32/asm/include/progs.h b/deps/openssl/config/archs/linux-x32/asm/include/progs.h
index 9b3d270e20..308c65601b 100644
--- a/deps/openssl/config/archs/linux-x32/asm/include/progs.h
+++ b/deps/openssl/config/archs/linux-x32/asm/include/progs.h
@@ -2,7 +2,7 @@
  * WARNING: do not edit!
  * Generated by apps/progs.pl
  *
- * Copyright 1995-2019 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 1995-2020 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
diff --git a/deps/openssl/config/archs/linux-x32/asm/openssl-cl.gypi b/deps/openssl/config/archs/linux-x32/asm/openssl-cl.gypi
index 859eb1a369..8e2deecf84 100644
--- a/deps/openssl/config/archs/linux-x32/asm/openssl-cl.gypi
+++ b/deps/openssl/config/archs/linux-x32/asm/openssl-cl.gypi
@@ -16,6 +16,7 @@
       'KECCAK1600_ASM',
       'RC4_ASM',
       'MD5_ASM',
+      'AESNI_ASM',
       'VPAES_ASM',
       'GHASH_ASM',
       'ECP_NISTZ256_ASM',
diff --git a/deps/openssl/config/archs/linux-x32/asm/openssl.gypi b/deps/openssl/config/archs/linux-x32/asm/openssl.gypi
index 5faef9c0e4..98d69c56a7 100644
--- a/deps/openssl/config/archs/linux-x32/asm/openssl.gypi
+++ b/deps/openssl/config/archs/linux-x32/asm/openssl.gypi
@@ -723,6 +723,7 @@
       'KECCAK1600_ASM',
       'RC4_ASM',
       'MD5_ASM',
+      'AESNI_ASM',
       'VPAES_ASM',
       'GHASH_ASM',
       'ECP_NISTZ256_ASM',
diff --git a/deps/openssl/config/archs/linux-x32/asm_avx2/configdata.pm b/deps/openssl/config/archs/linux-x32/asm_avx2/configdata.pm
index c85073cdc5..73d49d831b 100644
--- a/deps/openssl/config/archs/linux-x32/asm_avx2/configdata.pm
+++ b/deps/openssl/config/archs/linux-x32/asm_avx2/configdata.pm
@@ -49,14 +49,14 @@ our %config = (
   export_var_as_fn => "0",
   includes => [  ],
   lflags => [  ],
-  lib_defines => [ "OPENSSL_PIC", "OPENSSL_CPUID_OBJ", "OPENSSL_IA32_SSE2", "OPENSSL_BN_ASM_MONT", "OPENSSL_BN_ASM_MONT5", "OPENSSL_BN_ASM_GF2m", "SHA1_ASM", "SHA256_ASM", "SHA512_ASM", "KECCAK1600_ASM", "RC4_ASM", "MD5_ASM", "VPAES_ASM", "GHASH_ASM", "ECP_NISTZ256_ASM", "X25519_ASM", "POLY1305_ASM" ],
+  lib_defines => [ "OPENSSL_PIC", "OPENSSL_CPUID_OBJ", "OPENSSL_IA32_SSE2", "OPENSSL_BN_ASM_MONT", "OPENSSL_BN_ASM_MONT5", "OPENSSL_BN_ASM_GF2m", "SHA1_ASM", "SHA256_ASM", "SHA512_ASM", "KECCAK1600_ASM", "RC4_ASM", "MD5_ASM", "AESNI_ASM", "VPAES_ASM", "GHASH_ASM", "ECP_NISTZ256_ASM", "X25519_ASM", "POLY1305_ASM" ],
   libdir => "",
   major => "1",
   makedepprog => "\$(CROSS_COMPILE)../config/fake_gcc.pl",
   minor => "1.1",
   openssl_algorithm_defines => [ "OPENSSL_NO_COMP", "OPENSSL_NO_MD2", "OPENSSL_NO_RC5" ],
   openssl_api_defines => [  ],
-  openssl_other_defines => [ "OPENSSL_RAND_SEED_OS", "OPENSSL_NO_AFALGENG", "OPENSSL_NO_ASAN", "OPENSSL_NO_CRYPTO_MDEBUG", "OPENSSL_NO_CRYPTO_MDEBUG_BACKTRACE", "OPENSSL_NO_DEVCRYPTOENG", "OPENSSL_NO_EC_NISTP_64_GCC_128", "OPENSSL_NO_EGD", "OPENSSL_NO_EXTERNAL_TESTS", "OPENSSL_NO_FUZZ_AFL", "OPENSSL_NO_FUZZ_LIBFUZZER", "OPENSSL_NO_HEARTBEATS", "OPENSSL_NO_MSAN", "OPENSSL_NO_SCTP", "OPENSSL_NO_SSL3", "OPENSSL_NO_SSL3_METHOD", "OPENSSL_NO_UBSAN", "OPENSSL_NO_UNIT_TEST", "OPENSSL_NO_WEAK_SSL_CIPHERS", "OPENSSL_NO_DYNAMIC_ENGINE", "OPENSSL_NO_AFALGENG" ],
+  openssl_other_defines => [ "OPENSSL_RAND_SEED_OS", "OPENSSL_NO_AFALGENG", "OPENSSL_NO_ASAN", "OPENSSL_NO_CRYPTO_MDEBUG", "OPENSSL_NO_CRYPTO_MDEBUG_BACKTRACE", "OPENSSL_NO_DEVCRYPTOENG", "OPENSSL_NO_EC_NISTP_64_GCC_128", "OPENSSL_NO_EGD", "OPENSSL_NO_EXTERNAL_TESTS", "OPENSSL_NO_FUZZ_AFL", "OPENSSL_NO_FUZZ_LIBFUZZER", "OPENSSL_NO_HEARTBEATS", "OPENSSL_NO_MSAN", "OPENSSL_NO_SCTP", "OPENSSL_NO_SSL3", "OPENSSL_NO_SSL3_METHOD", "OPENSSL_NO_UBSAN", "OPENSSL_NO_UNIT_TEST", "OPENSSL_NO_WEAK_SSL_CIPHERS", "OPENSSL_NO_DYNAMIC_ENGINE" ],
   openssl_sys_defines => [  ],
   openssl_thread_defines => [ "OPENSSL_THREADS" ],
   openssldir => "",
@@ -112,8 +112,8 @@ our %config = (
   sourcedir => ".",
   target => "linux-x32",
   tdirs => [ "ossl_shim" ],
-  version => "1.1.1d",
-  version_num => "0x1010104fL",
+  version => "1.1.1e",
+  version_num => "0x1010105fL",
 );
 
 our %target = (
@@ -241,6 +241,7 @@ our @disablables = (
   "dgram",
   "dh",
   "dsa",
+  "dso",
   "dtls",
   "dynamic-engine",
   "ec",
@@ -358,8 +359,8 @@ our %unified_info = (
         {
             "" =>
                 [
-                    "crypto/include/internal/bn_conf.h",
-                    "crypto/include/internal/dso_conf.h",
+                    "include/crypto/bn_conf.h",
+                    "include/crypto/dso_conf.h",
                     "include/openssl/opensslconf.h",
                 ],
             "apps/asn1pars.o" =>
@@ -627,14 +628,6 @@ our %unified_info = (
                     "crypto/perlasm/cbc.pl",
                     "crypto/perlasm/x86asm.pl",
                 ],
-            "crypto/include/internal/bn_conf.h" =>
-                [
-                    "configdata.pm",
-                ],
-            "crypto/include/internal/dso_conf.h" =>
-                [
-                    "configdata.pm",
-                ],
             "crypto/rc4/rc4-586.s" =>
                 [
                     "crypto/perlasm/x86asm.pl",
@@ -710,6 +703,14 @@ our %unified_info = (
                 [
                     "libcrypto",
                 ],
+            "include/crypto/bn_conf.h" =>
+                [
+                    "configdata.pm",
+                ],
+            "include/crypto/dso_conf.h" =>
+                [
+                    "configdata.pm",
+                ],
             "include/openssl/opensslconf.h" =>
                 [
                     "configdata.pm",
@@ -1507,6 +1508,12 @@ our %unified_info = (
                     "libcrypto",
                     "test/libtestutil.a",
                 ],
+            "test/ssl_ctx_test" =>
+                [
+                    "libcrypto",
+                    "libssl",
+                    "test/libtestutil.a",
+                ],
             "test/ssl_test" =>
                 [
                     "libcrypto",
@@ -3261,7 +3268,6 @@ our %unified_info = (
                             "test/testutil/cb.o",
                             "test/testutil/driver.o",
                             "test/testutil/format_output.o",
-                            "test/testutil/init.o",
                             "test/testutil/main.o",
                             "test/testutil/output_helpers.o",
                             "test/testutil/random.o",
@@ -3269,6 +3275,7 @@ our %unified_info = (
                             "test/testutil/tap_bio.o",
                             "test/testutil/test_cleanup.o",
                             "test/testutil/tests.o",
+                            "test/testutil/testutil_init.o",
                         ],
                     "products" =>
                         {
@@ -3767,14 +3774,6 @@ our %unified_info = (
                 [
                     "crypto/ia64cpuid.S",
                 ],
-            "crypto/include/internal/bn_conf.h" =>
-                [
-                    "crypto/include/internal/bn_conf.h.in",
-                ],
-            "crypto/include/internal/dso_conf.h" =>
-                [
-                    "crypto/include/internal/dso_conf.h.in",
-                ],
             "crypto/md5/md5-586.s" =>
                 [
                     "crypto/md5/asm/md5-586.pl",
@@ -4215,6 +4214,14 @@ our %unified_info = (
                     "engines/asm/e_padlock-x86_64.pl",
                     "\$(PERLASM_SCHEME)",
                 ],
+            "include/crypto/bn_conf.h" =>
+                [
+                    "include/crypto/bn_conf.h.in",
+                ],
+            "include/crypto/dso_conf.h" =>
+                [
+                    "include/crypto/dso_conf.h.in",
+                ],
             "include/openssl/opensslconf.h" =>
                 [
                     "include/openssl/opensslconf.h.in",
@@ -4909,49 +4916,41 @@ our %unified_info = (
             "crypto/aes/aes_cbc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/aes/aes_cfb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/aes/aes_core.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/aes/aes_ecb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/aes/aes_ige.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/aes/aes_misc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/aes/aes_ofb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/aes/aes_wrap.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/aes/aesfx-sparcv9.o" =>
@@ -4961,25 +4960,21 @@ our %unified_info = (
             "crypto/aes/aesni-mb-x86_64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/aes/aesni-sha1-x86_64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/aes/aesni-sha256-x86_64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/aes/aesni-x86_64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/aes/aest4-sparcv9.o" =>
@@ -4997,13 +4992,11 @@ our %unified_info = (
             "crypto/aes/vpaes-x86_64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/aria/aria.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/arm64cpuid.o" =>
@@ -5017,613 +5010,511 @@ our %unified_info = (
             "crypto/asn1/a_bitstr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_d2i_fp.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_digest.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_dup.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_gentm.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_i2d_fp.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_int.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_mbstr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_object.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_octet.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_print.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_sign.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_strex.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_strnid.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_time.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_type.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_utctm.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_utf8.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_verify.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/ameth_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/asn1_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/asn1_gen.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/asn1_item_list.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/asn1_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/asn1_par.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/asn_mime.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/asn_moid.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/asn_mstbl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/asn_pack.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/bio_asn1.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/bio_ndef.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/d2i_pr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/d2i_pu.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/evp_asn1.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/f_int.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/f_string.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/i2d_pr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/i2d_pu.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/n_pkey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/nsseq.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/p5_pbe.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/p5_pbev2.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/p5_scrypt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/p8_pkey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/t_bitst.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/t_pkey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/t_spki.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/tasn_dec.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/tasn_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/tasn_fre.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/tasn_new.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/tasn_prn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/tasn_scn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/tasn_typ.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/tasn_utl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/x_algor.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/x_bignum.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/x_info.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/x_int64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/x_long.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/x_pkey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/x_sig.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/x_spki.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/x_val.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/async/arch/async_null.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/async/arch/async_posix.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/async/arch/async_win.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/async/async.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/async/async_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/async/async_wait.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bf/bf_cfb64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bf/bf_ecb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bf/bf_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bf/bf_ofb64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bf/bf_skey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/b_addr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/b_dump.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/b_print.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/b_sock.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/b_sock2.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bf_buff.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bf_lbuf.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bf_nbio.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bf_null.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bio_cb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bio_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bio_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bio_meth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bss_acpt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bss_bio.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bss_conn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bss_dgram.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bss_fd.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bss_file.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bss_log.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bss_mem.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bss_null.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bss_sock.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/blake2/blake2b.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/blake2/blake2s.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/blake2/m_blake2b.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/blake2/m_blake2s.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/armv4-gf2m.o" =>
@@ -5637,7 +5528,6 @@ our %unified_info = (
             "crypto/bn/asm/x86_64-gcc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn-mips.o" =>
@@ -5647,182 +5537,152 @@ our %unified_info = (
             "crypto/bn/bn_add.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_blind.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_const.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_ctx.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_depr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_dh.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_div.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_exp.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto",
                 ],
             "crypto/bn/bn_exp2.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_gcd.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_gf2m.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_intern.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_kron.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_mod.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_mont.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_mpi.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_mul.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_nist.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_prime.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_print.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_rand.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_recp.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_shift.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_sqr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_sqrt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_srp.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_word.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_x931p.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/mips-mont.o" =>
@@ -5832,19 +5692,16 @@ our %unified_info = (
             "crypto/bn/rsaz-avx2.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/rsaz-x86_64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/rsaz_exp.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/sparct4-mont.o" =>
@@ -5870,31 +5727,26 @@ our %unified_info = (
             "crypto/bn/x86_64-gf2m.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/x86_64-mont.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/x86_64-mont5.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/buffer/buf_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/buffer/buffer.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/buildinf.h" =>
@@ -5904,37 +5756,31 @@ our %unified_info = (
             "crypto/camellia/cmll-x86_64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/camellia/cmll_cfb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/camellia/cmll_ctr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/camellia/cmll_ecb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/camellia/cmll_misc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/camellia/cmll_ofb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/camellia/cmllt4-sparcv9.o" =>
@@ -5944,31 +5790,26 @@ our %unified_info = (
             "crypto/cast/c_cfb64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cast/c_ecb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cast/c_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cast/c_ofb64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cast/c_skey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/chacha/chacha-armv4.o" =>
@@ -5986,278 +5827,232 @@ our %unified_info = (
             "crypto/chacha/chacha-x86_64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cmac/cm_ameth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cmac/cm_pmeth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cmac/cmac.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_asn1.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_att.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_cd.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_dd.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_env.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_ess.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_io.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_kari.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_pwri.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_sd.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_smime.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/conf/conf_api.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/conf/conf_def.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/conf/conf_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/conf/conf_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/conf/conf_mall.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/conf/conf_mod.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/conf/conf_sap.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/conf/conf_ssl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cpt_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cryptlib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ct/ct_b64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ct/ct_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ct/ct_log.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ct/ct_oct.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ct/ct_policy.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ct/ct_prn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ct/ct_sct.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ct/ct_sct_ctx.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ct/ct_vfy.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ct/ct_x509v3.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ctype.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cversion.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto",
                 ],
             "crypto/des/cbc_cksm.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/cbc_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/cfb64ede.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/cfb64enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/cfb_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/des_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/dest4-sparcv9.o" =>
@@ -6267,301 +6062,251 @@ our %unified_info = (
             "crypto/des/ecb3_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/ecb_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/fcrypt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/fcrypt_b.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/ofb64ede.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/ofb64enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/ofb_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/pcbc_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/qud_cksm.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/rand_key.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/set_key.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/str2key.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/xcbc_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_ameth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_asn1.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_check.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_depr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_gen.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_kdf.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_key.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_meth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_pmeth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_prn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_rfc5114.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_rfc7919.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dsa/dsa_ameth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dsa/dsa_asn1.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dsa/dsa_depr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dsa/dsa_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dsa/dsa_gen.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dsa/dsa_key.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dsa/dsa_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dsa/dsa_meth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dsa/dsa_ossl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dsa/dsa_pmeth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dsa/dsa_prn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dsa/dsa_sign.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dsa/dsa_vrf.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dso/dso_dl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dso/dso_dlfcn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dso/dso_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dso/dso_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dso/dso_openssl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dso/dso_vms.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dso/dso_win32.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ebcdic.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/curve25519.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/curve448/arch_32/f_impl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto/ec/curve448/arch_32",
                     "crypto/ec/curve448",
@@ -6569,7 +6314,6 @@ our %unified_info = (
             "crypto/ec/curve448/curve448.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto/ec/curve448/arch_32",
                     "crypto/ec/curve448",
@@ -6577,7 +6321,6 @@ our %unified_info = (
             "crypto/ec/curve448/curve448_tables.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto/ec/curve448/arch_32",
                     "crypto/ec/curve448",
@@ -6585,7 +6328,6 @@ our %unified_info = (
             "crypto/ec/curve448/eddsa.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto/ec/curve448/arch_32",
                     "crypto/ec/curve448",
@@ -6593,7 +6335,6 @@ our %unified_info = (
             "crypto/ec/curve448/f_generic.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto/ec/curve448/arch_32",
                     "crypto/ec/curve448",
@@ -6601,7 +6342,6 @@ our %unified_info = (
             "crypto/ec/curve448/scalar.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto/ec/curve448/arch_32",
                     "crypto/ec/curve448",
@@ -6609,163 +6349,136 @@ our %unified_info = (
             "crypto/ec/ec2_oct.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec2_smpl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec_ameth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec_asn1.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec_check.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec_curve.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec_cvt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec_key.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec_kmeth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec_mult.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec_oct.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec_pmeth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec_print.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecdh_kdf.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecdh_ossl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecdsa_ossl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecdsa_sign.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecdsa_vrf.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/eck_prn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecp_mont.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecp_nist.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecp_nistp224.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecp_nistp256.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecp_nistp521.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecp_nistputil.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecp_nistz256-armv4.o" =>
@@ -6783,241 +6496,201 @@ our %unified_info = (
             "crypto/ec/ecp_nistz256-x86_64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecp_nistz256.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecp_oct.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecp_smpl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecx_meth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/x25519-x86_64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/eng_all.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/eng_cnf.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/eng_ctrl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/eng_dyn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/eng_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/eng_fat.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/eng_init.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/eng_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/eng_list.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/eng_openssl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/eng_pkey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/eng_rdrand.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/eng_table.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/tb_asnmth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/tb_cipher.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/tb_dh.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/tb_digest.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/tb_dsa.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/tb_eckey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/tb_pkmeth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/tb_rand.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/tb_rsa.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/err/err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/err/err_all.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/err/err_prn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/bio_b64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/bio_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/bio_md.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/bio_ok.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/c_allc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/c_alld.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/cmeth_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/digest.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/e_aes.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto",
                     "crypto/modes",
@@ -7025,21 +6698,18 @@ our %unified_info = (
             "crypto/evp/e_aes_cbc_hmac_sha1.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto/modes",
                 ],
             "crypto/evp/e_aes_cbc_hmac_sha256.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto/modes",
                 ],
             "crypto/evp/e_aria.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto",
                     "crypto/modes",
@@ -7047,13 +6717,11 @@ our %unified_info = (
             "crypto/evp/e_bf.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/e_camellia.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto",
                     "crypto/modes",
@@ -7061,81 +6729,68 @@ our %unified_info = (
             "crypto/evp/e_cast.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/e_chacha20_poly1305.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/e_des.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto",
                 ],
             "crypto/evp/e_des3.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto",
                 ],
             "crypto/evp/e_idea.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/e_null.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/e_old.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/e_rc2.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/e_rc4.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/e_rc4_hmac_md5.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/e_rc5.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/e_seed.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/e_sm4.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto",
                     "crypto/modes",
@@ -7143,328 +6798,267 @@ our %unified_info = (
             "crypto/evp/e_xcbc_d.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/encode.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/evp_cnf.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/evp_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/evp_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/evp_key.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/evp_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/evp_pbe.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/evp_pkey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/m_md2.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/m_md4.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/m_md5.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/m_md5_sha1.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/m_mdc2.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/m_null.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/m_ripemd.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/m_sha1.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/m_sha3.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto",
                 ],
             "crypto/evp/m_sigver.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/m_wp.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/names.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/p5_crpt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/p5_crpt2.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/p_dec.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/p_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/p_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/p_open.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/p_seal.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/p_sign.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/p_verify.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/pbe_scrypt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/pmeth_fn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/pmeth_gn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/pmeth_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ex_data.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/getenv.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/hmac/hm_ameth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/hmac/hm_pmeth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/hmac/hmac.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/idea/i_cbc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/idea/i_cfb64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/idea/i_ecb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/idea/i_ofb64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/idea/i_skey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
-            "crypto/include/internal/bn_conf.h" =>
-                [
-                    ".",
-                ],
-            "crypto/include/internal/dso_conf.h" =>
-                [
-                    ".",
-                ],
             "crypto/init.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/kdf/hkdf.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/kdf/kdf_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/kdf/scrypt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/kdf/tls1_prf.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/lhash/lh_stats.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/lhash/lhash.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/md4/md4_dgst.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/md4/md4_one.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/md5/md5-sparcv9.o" =>
@@ -7474,91 +7068,76 @@ our %unified_info = (
             "crypto/md5/md5-x86_64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/md5/md5_dgst.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/md5/md5_one.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/mdc2/mdc2_one.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/mdc2/mdc2dgst.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/mem.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/mem_dbg.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/mem_sec.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/modes/aesni-gcm-x86_64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/modes/cbc128.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/modes/ccm128.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/modes/cfb128.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/modes/ctr128.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/modes/cts128.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/modes/gcm128.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto",
                 ],
@@ -7577,7 +7156,6 @@ our %unified_info = (
             "crypto/modes/ghash-x86_64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/modes/ghashv8-armx.o" =>
@@ -7587,361 +7165,301 @@ our %unified_info = (
             "crypto/modes/ocb128.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/modes/ofb128.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/modes/wrap128.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/modes/xts128.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/o_dir.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/o_fips.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/o_fopen.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/o_init.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/o_str.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/o_time.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/objects/o_names.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/objects/obj_dat.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/objects/obj_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/objects/obj_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/objects/obj_xref.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ocsp/ocsp_asn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ocsp/ocsp_cl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ocsp/ocsp_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ocsp/ocsp_ext.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ocsp/ocsp_ht.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ocsp/ocsp_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ocsp/ocsp_prn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ocsp/ocsp_srv.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ocsp/ocsp_vfy.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ocsp/v3_ocsp.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pem/pem_all.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pem/pem_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pem/pem_info.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pem/pem_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pem/pem_oth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pem/pem_pk8.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pem/pem_pkey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pem/pem_sign.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pem/pem_x509.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pem/pem_xaux.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pem/pvkfmt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_add.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_asn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_attr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_crpt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_crt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_decr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_init.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_key.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_kiss.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_mutl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_npas.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_p8d.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_p8e.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_sbag.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_utl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/pk12err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs7/bio_pk7.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs7/pk7_asn1.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs7/pk7_attr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs7/pk7_doit.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs7/pk7_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs7/pk7_mime.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs7/pk7_smime.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs7/pkcs7err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/poly1305/poly1305-armv4.o" =>
@@ -7963,265 +7481,221 @@ our %unified_info = (
             "crypto/poly1305/poly1305-x86_64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/poly1305/poly1305.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/poly1305/poly1305_ameth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/poly1305/poly1305_pmeth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rand/drbg_ctr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rand/drbg_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rand/rand_egd.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rand/rand_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rand/rand_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rand/rand_unix.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rand/rand_vms.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rand/rand_win.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rand/randfile.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rc2/rc2_cbc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rc2/rc2_ecb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rc2/rc2_skey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rc2/rc2cfb64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rc2/rc2ofb64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rc4/rc4-md5-x86_64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rc4/rc4-x86_64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ripemd/rmd_dgst.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ripemd/rmd_one.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_ameth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_asn1.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_chk.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_crpt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_depr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_gen.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_meth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_mp.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_none.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_oaep.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_ossl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_pk1.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_pmeth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_prn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_pss.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_saos.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_sign.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_ssl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_x931.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_x931g.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/s390xcpuid.o" =>
@@ -8231,31 +7705,26 @@ our %unified_info = (
             "crypto/seed/seed.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/seed/seed_cbc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/seed/seed_cfb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/seed/seed_ecb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/seed/seed_ofb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sha/keccak1600-armv4.o" =>
@@ -8265,7 +7734,6 @@ our %unified_info = (
             "crypto/sha/keccak1600-x86_64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sha/sha1-armv4-large.o" =>
@@ -8279,7 +7747,6 @@ our %unified_info = (
             "crypto/sha/sha1-mb-x86_64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sha/sha1-mips.o" =>
@@ -8297,19 +7764,16 @@ our %unified_info = (
             "crypto/sha/sha1-x86_64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sha/sha1_one.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sha/sha1dgst.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sha/sha256-armv4.o" =>
@@ -8323,7 +7787,6 @@ our %unified_info = (
             "crypto/sha/sha256-mb-x86_64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sha/sha256-mips.o" =>
@@ -8341,13 +7804,11 @@ our %unified_info = (
             "crypto/sha/sha256-x86_64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sha/sha256.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sha/sha512-armv4.o" =>
@@ -8373,727 +7834,606 @@ our %unified_info = (
             "crypto/sha/sha512-x86_64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sha/sha512.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/siphash/siphash.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/siphash/siphash_ameth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/siphash/siphash_pmeth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sm2/sm2_crypt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sm2/sm2_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sm2/sm2_pmeth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sm2/sm2_sign.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sm3/m_sm3.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sm3/sm3.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sm4/sm4.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/srp/srp_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/srp/srp_vfy.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/stack/stack.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/store/loader_file.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/store/store_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/store/store_init.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/store/store_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/store/store_register.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/store/store_strings.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/threads_none.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/threads_pthread.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/threads_win.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ts/ts_asn1.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ts/ts_conf.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ts/ts_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ts/ts_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ts/ts_req_print.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ts/ts_req_utils.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ts/ts_rsp_print.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ts/ts_rsp_sign.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ts/ts_rsp_utils.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ts/ts_rsp_verify.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ts/ts_verify_ctx.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/txt_db/txt_db.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ui/ui_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ui/ui_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ui/ui_null.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ui/ui_openssl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ui/ui_util.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/uid.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/whrlpool/wp-x86_64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/whrlpool/wp_dgst.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/by_dir.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/by_file.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/t_crl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/t_req.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/t_x509.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_att.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_cmp.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_d2.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_def.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_ext.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_lu.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_meth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_obj.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_r2x.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_req.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_set.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_trs.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_txt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_v3.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_vfy.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_vpm.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509cset.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509name.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509rset.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509spki.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509type.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x_all.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x_attrib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x_crl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x_exten.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x_name.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x_pubkey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x_req.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x_x509.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x_x509a.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/pcy_cache.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/pcy_data.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/pcy_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/pcy_map.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/pcy_node.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/pcy_tree.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_addr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_admis.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_akey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_akeya.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_alt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_asid.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_bcons.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_bitst.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_conf.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_cpols.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_crld.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_enum.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_extku.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_genn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_ia5.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_info.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_int.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_ncons.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_pci.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_pcia.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_pcons.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_pku.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_pmaps.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_prn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_purp.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_skey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_sxnet.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_tlsf.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_utl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x86_64cpuid.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "engines/e_capi.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "engines/e_padlock-x86_64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "engines/e_padlock.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "fuzz/asn1.o" =>
@@ -9144,6 +8484,14 @@ our %unified_info = (
                 [
                     "include",
                 ],
+            "include/crypto/bn_conf.h" =>
+                [
+                    ".",
+                ],
+            "include/crypto/dso_conf.h" =>
+                [
+                    ".",
+                ],
             "include/openssl/opensslconf.h" =>
                 [
                     ".",
@@ -9388,7 +8736,6 @@ our %unified_info = (
                 [
                     ".",
                     "include",
-                    "crypto/include",
                 ],
             "test/asn1_string_table_test.o" =>
                 [
@@ -9714,7 +9061,6 @@ our %unified_info = (
                 [
                     ".",
                     "include",
-                    "crypto/include",
                 ],
             "test/cipher_overhead_test.o" =>
                 [
@@ -9760,7 +9106,6 @@ our %unified_info = (
             "test/ctype_internal_test.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "test/curve448_internal_test.o" =>
@@ -9826,7 +9171,6 @@ our %unified_info = (
                 [
                     "include",
                     "crypto/ec",
-                    "crypto/include",
                 ],
             "test/ecdsatest.o" =>
                 [
@@ -9851,7 +9195,6 @@ our %unified_info = (
             "test/evp_extra_test.o" =>
                 [
                     "include",
-                    "crypto/include",
                 ],
             "test/evp_test.o" =>
                 [
@@ -9949,7 +9292,6 @@ our %unified_info = (
                 [
                     ".",
                     "include",
-                    "crypto/include",
                 ],
             "test/rc2test.o" =>
                 [
@@ -9999,18 +9341,15 @@ our %unified_info = (
                 [
                     ".",
                     "include",
-                    "crypto/include",
                 ],
             "test/sm2_internal_test.o" =>
                 [
                     "include",
-                    "crypto/include",
                 ],
             "test/sm4_internal_test.o" =>
                 [
                     ".",
                     "include",
-                    "crypto/include",
                 ],
             "test/srptest.o" =>
                 [
@@ -10021,6 +9360,10 @@ our %unified_info = (
                     ".",
                     "include",
                 ],
+            "test/ssl_ctx_test.o" =>
+                [
+                    "include",
+                ],
             "test/ssl_test.o" =>
                 [
                     "include",
@@ -10084,10 +9427,6 @@ our %unified_info = (
                 [
                     "include",
                 ],
-            "test/testutil/init.o" =>
-                [
-                    "include",
-                ],
             "test/testutil/main.o" =>
                 [
                     "include",
@@ -10116,6 +9455,10 @@ our %unified_info = (
                 [
                     "include",
                 ],
+            "test/testutil/testutil_init.o" =>
+                [
+                    "include",
+                ],
             "test/threadstest.o" =>
                 [
                     "include",
@@ -10380,6 +9723,7 @@ our %unified_info = (
             "test/sm4_internal_test",
             "test/srptest",
             "test/ssl_cert_table_internal_test",
+            "test/ssl_ctx_test",
             "test/ssl_test",
             "test/ssl_test_ctx_test",
             "test/sslapitest",
@@ -15385,7 +14729,6 @@ our %unified_info = (
                     "test/testutil/cb.o",
                     "test/testutil/driver.o",
                     "test/testutil/format_output.o",
-                    "test/testutil/init.o",
                     "test/testutil/main.o",
                     "test/testutil/output_helpers.o",
                     "test/testutil/random.o",
@@ -15393,6 +14736,7 @@ our %unified_info = (
                     "test/testutil/tap_bio.o",
                     "test/testutil/test_cleanup.o",
                     "test/testutil/tests.o",
+                    "test/testutil/testutil_init.o",
                 ],
             "test/md2test" =>
                 [
@@ -15620,6 +14964,14 @@ our %unified_info = (
                 [
                     "test/ssl_cert_table_internal_test.c",
                 ],
+            "test/ssl_ctx_test" =>
+                [
+                    "test/ssl_ctx_test.o",
+                ],
+            "test/ssl_ctx_test.o" =>
+                [
+                    "test/ssl_ctx_test.c",
+                ],
             "test/ssl_test" =>
                 [
                     "test/handshake_helper.o",
@@ -15722,10 +15074,6 @@ our %unified_info = (
                 [
                     "test/testutil/format_output.c",
                 ],
-            "test/testutil/init.o" =>
-                [
-                    "test/testutil/init.c",
-                ],
             "test/testutil/main.o" =>
                 [
                     "test/testutil/main.c",
@@ -15754,6 +15102,10 @@ our %unified_info = (
                 [
                     "test/testutil/tests.c",
                 ],
+            "test/testutil/testutil_init.o" =>
+                [
+                    "test/testutil/testutil_init.c",
+                ],
             "test/threadstest" =>
                 [
                     "test/threadstest.o",
diff --git a/deps/openssl/config/archs/linux-x32/asm_avx2/crypto/aes/aes-x86_64.s b/deps/openssl/config/archs/linux-x32/asm_avx2/crypto/aes/aes-x86_64.s
deleted file mode 100644
index f0c1685fb9..0000000000
--- a/deps/openssl/config/archs/linux-x32/asm_avx2/crypto/aes/aes-x86_64.s
+++ /dev/null
@@ -1,2649 +0,0 @@
-.text	
-.type	_x86_64_AES_encrypt,@function
-.align	16
-_x86_64_AES_encrypt:
-	xorl	0(%r15),%eax
-	xorl	4(%r15),%ebx
-	xorl	8(%r15),%ecx
-	xorl	12(%r15),%edx
-
-	movl	240(%r15),%r13d
-	subl	$1,%r13d
-	jmp	.Lenc_loop
-.align	16
-.Lenc_loop:
-
-	movzbl	%al,%esi
-	movzbl	%bl,%edi
-	movzbl	%cl,%ebp
-	movl	0(%r14,%rsi,8),%r10d
-	movl	0(%r14,%rdi,8),%r11d
-	movl	0(%r14,%rbp,8),%r12d
-
-	movzbl	%bh,%esi
-	movzbl	%ch,%edi
-	movzbl	%dl,%ebp
-	xorl	3(%r14,%rsi,8),%r10d
-	xorl	3(%r14,%rdi,8),%r11d
-	movl	0(%r14,%rbp,8),%r8d
-
-	movzbl	%dh,%esi
-	shrl	$16,%ecx
-	movzbl	%ah,%ebp
-	xorl	3(%r14,%rsi,8),%r12d
-	shrl	$16,%edx
-	xorl	3(%r14,%rbp,8),%r8d
-
-	shrl	$16,%ebx
-	leaq	16(%r15),%r15
-	shrl	$16,%eax
-
-	movzbl	%cl,%esi
-	movzbl	%dl,%edi
-	movzbl	%al,%ebp
-	xorl	2(%r14,%rsi,8),%r10d
-	xorl	2(%r14,%rdi,8),%r11d
-	xorl	2(%r14,%rbp,8),%r12d
-
-	movzbl	%dh,%esi
-	movzbl	%ah,%edi
-	movzbl	%bl,%ebp
-	xorl	1(%r14,%rsi,8),%r10d
-	xorl	1(%r14,%rdi,8),%r11d
-	xorl	2(%r14,%rbp,8),%r8d
-
-	movl	12(%r15),%edx
-	movzbl	%bh,%edi
-	movzbl	%ch,%ebp
-	movl	0(%r15),%eax
-	xorl	1(%r14,%rdi,8),%r12d
-	xorl	1(%r14,%rbp,8),%r8d
-
-	movl	4(%r15),%ebx
-	movl	8(%r15),%ecx
-	xorl	%r10d,%eax
-	xorl	%r11d,%ebx
-	xorl	%r12d,%ecx
-	xorl	%r8d,%edx
-	subl	$1,%r13d
-	jnz	.Lenc_loop
-	movzbl	%al,%esi
-	movzbl	%bl,%edi
-	movzbl	%cl,%ebp
-	movzbl	2(%r14,%rsi,8),%r10d
-	movzbl	2(%r14,%rdi,8),%r11d
-	movzbl	2(%r14,%rbp,8),%r12d
-
-	movzbl	%dl,%esi
-	movzbl	%bh,%edi
-	movzbl	%ch,%ebp
-	movzbl	2(%r14,%rsi,8),%r8d
-	movl	0(%r14,%rdi,8),%edi
-	movl	0(%r14,%rbp,8),%ebp
-
-	andl	$0x0000ff00,%edi
-	andl	$0x0000ff00,%ebp
-
-	xorl	%edi,%r10d
-	xorl	%ebp,%r11d
-	shrl	$16,%ecx
-
-	movzbl	%dh,%esi
-	movzbl	%ah,%edi
-	shrl	$16,%edx
-	movl	0(%r14,%rsi,8),%esi
-	movl	0(%r14,%rdi,8),%edi
-
-	andl	$0x0000ff00,%esi
-	andl	$0x0000ff00,%edi
-	shrl	$16,%ebx
-	xorl	%esi,%r12d
-	xorl	%edi,%r8d
-	shrl	$16,%eax
-
-	movzbl	%cl,%esi
-	movzbl	%dl,%edi
-	movzbl	%al,%ebp
-	movl	0(%r14,%rsi,8),%esi
-	movl	0(%r14,%rdi,8),%edi
-	movl	0(%r14,%rbp,8),%ebp
-
-	andl	$0x00ff0000,%esi
-	andl	$0x00ff0000,%edi
-	andl	$0x00ff0000,%ebp
-
-	xorl	%esi,%r10d
-	xorl	%edi,%r11d
-	xorl	%ebp,%r12d
-
-	movzbl	%bl,%esi
-	movzbl	%dh,%edi
-	movzbl	%ah,%ebp
-	movl	0(%r14,%rsi,8),%esi
-	movl	2(%r14,%rdi,8),%edi
-	movl	2(%r14,%rbp,8),%ebp
-
-	andl	$0x00ff0000,%esi
-	andl	$0xff000000,%edi
-	andl	$0xff000000,%ebp
-
-	xorl	%esi,%r8d
-	xorl	%edi,%r10d
-	xorl	%ebp,%r11d
-
-	movzbl	%bh,%esi
-	movzbl	%ch,%edi
-	movl	16+12(%r15),%edx
-	movl	2(%r14,%rsi,8),%esi
-	movl	2(%r14,%rdi,8),%edi
-	movl	16+0(%r15),%eax
-
-	andl	$0xff000000,%esi
-	andl	$0xff000000,%edi
-
-	xorl	%esi,%r12d
-	xorl	%edi,%r8d
-
-	movl	16+4(%r15),%ebx
-	movl	16+8(%r15),%ecx
-	xorl	%r10d,%eax
-	xorl	%r11d,%ebx
-	xorl	%r12d,%ecx
-	xorl	%r8d,%edx
-.byte	0xf3,0xc3
-.size	_x86_64_AES_encrypt,.-_x86_64_AES_encrypt
-.type	_x86_64_AES_encrypt_compact,@function
-.align	16
-_x86_64_AES_encrypt_compact:
-.cfi_startproc	
-	leaq	128(%r14),%r8
-	movl	0-128(%r8),%edi
-	movl	32-128(%r8),%ebp
-	movl	64-128(%r8),%r10d
-	movl	96-128(%r8),%r11d
-	movl	128-128(%r8),%edi
-	movl	160-128(%r8),%ebp
-	movl	192-128(%r8),%r10d
-	movl	224-128(%r8),%r11d
-	jmp	.Lenc_loop_compact
-.align	16
-.Lenc_loop_compact:
-	xorl	0(%r15),%eax
-	xorl	4(%r15),%ebx
-	xorl	8(%r15),%ecx
-	xorl	12(%r15),%edx
-	leaq	16(%r15),%r15
-	movzbl	%al,%r10d
-	movzbl	%bl,%r11d
-	movzbl	%cl,%r12d
-	movzbl	%dl,%r8d
-	movzbl	%bh,%esi
-	movzbl	%ch,%edi
-	shrl	$16,%ecx
-	movzbl	%dh,%ebp
-	movzbl	(%r14,%r10,1),%r10d
-	movzbl	(%r14,%r11,1),%r11d
-	movzbl	(%r14,%r12,1),%r12d
-	movzbl	(%r14,%r8,1),%r8d
-
-	movzbl	(%r14,%rsi,1),%r9d
-	movzbl	%ah,%esi
-	movzbl	(%r14,%rdi,1),%r13d
-	movzbl	%cl,%edi
-	movzbl	(%r14,%rbp,1),%ebp
-	movzbl	(%r14,%rsi,1),%esi
-
-	shll	$8,%r9d
-	shrl	$16,%edx
-	shll	$8,%r13d
-	xorl	%r9d,%r10d
-	shrl	$16,%eax
-	movzbl	%dl,%r9d
-	shrl	$16,%ebx
-	xorl	%r13d,%r11d
-	shll	$8,%ebp
-	movzbl	%al,%r13d
-	movzbl	(%r14,%rdi,1),%edi
-	xorl	%ebp,%r12d
-
-	shll	$8,%esi
-	movzbl	%bl,%ebp
-	shll	$16,%edi
-	xorl	%esi,%r8d
-	movzbl	(%r14,%r9,1),%r9d
-	movzbl	%dh,%esi
-	movzbl	(%r14,%r13,1),%r13d
-	xorl	%edi,%r10d
-
-	shrl	$8,%ecx
-	movzbl	%ah,%edi
-	shll	$16,%r9d
-	shrl	$8,%ebx
-	shll	$16,%r13d
-	xorl	%r9d,%r11d
-	movzbl	(%r14,%rbp,1),%ebp
-	movzbl	(%r14,%rsi,1),%esi
-	movzbl	(%r14,%rdi,1),%edi
-	movzbl	(%r14,%rcx,1),%edx
-	movzbl	(%r14,%rbx,1),%ecx
-
-	shll	$16,%ebp
-	xorl	%r13d,%r12d
-	shll	$24,%esi
-	xorl	%ebp,%r8d
-	shll	$24,%edi
-	xorl	%esi,%r10d
-	shll	$24,%edx
-	xorl	%edi,%r11d
-	shll	$24,%ecx
-	movl	%r10d,%eax
-	movl	%r11d,%ebx
-	xorl	%r12d,%ecx
-	xorl	%r8d,%edx
-	cmpq	16(%rsp),%r15
-	je	.Lenc_compact_done
-	movl	$0x80808080,%r10d
-	movl	$0x80808080,%r11d
-	andl	%eax,%r10d
-	andl	%ebx,%r11d
-	movl	%r10d,%esi
-	movl	%r11d,%edi
-	shrl	$7,%r10d
-	leal	(%rax,%rax,1),%r8d
-	shrl	$7,%r11d
-	leal	(%rbx,%rbx,1),%r9d
-	subl	%r10d,%esi
-	subl	%r11d,%edi
-	andl	$0xfefefefe,%r8d
-	andl	$0xfefefefe,%r9d
-	andl	$0x1b1b1b1b,%esi
-	andl	$0x1b1b1b1b,%edi
-	movl	%eax,%r10d
-	movl	%ebx,%r11d
-	xorl	%esi,%r8d
-	xorl	%edi,%r9d
-
-	xorl	%r8d,%eax
-	xorl	%r9d,%ebx
-	movl	$0x80808080,%r12d
-	roll	$24,%eax
-	movl	$0x80808080,%ebp
-	roll	$24,%ebx
-	andl	%ecx,%r12d
-	andl	%edx,%ebp
-	xorl	%r8d,%eax
-	xorl	%r9d,%ebx
-	movl	%r12d,%esi
-	rorl	$16,%r10d
-	movl	%ebp,%edi
-	rorl	$16,%r11d
-	leal	(%rcx,%rcx,1),%r8d
-	shrl	$7,%r12d
-	xorl	%r10d,%eax
-	shrl	$7,%ebp
-	xorl	%r11d,%ebx
-	rorl	$8,%r10d
-	leal	(%rdx,%rdx,1),%r9d
-	rorl	$8,%r11d
-	subl	%r12d,%esi
-	subl	%ebp,%edi
-	xorl	%r10d,%eax
-	xorl	%r11d,%ebx
-
-	andl	$0xfefefefe,%r8d
-	andl	$0xfefefefe,%r9d
-	andl	$0x1b1b1b1b,%esi
-	andl	$0x1b1b1b1b,%edi
-	movl	%ecx,%r12d
-	movl	%edx,%ebp
-	xorl	%esi,%r8d
-	xorl	%edi,%r9d
-
-	rorl	$16,%r12d
-	xorl	%r8d,%ecx
-	rorl	$16,%ebp
-	xorl	%r9d,%edx
-	roll	$24,%ecx
-	movl	0(%r14),%esi
-	roll	$24,%edx
-	xorl	%r8d,%ecx
-	movl	64(%r14),%edi
-	xorl	%r9d,%edx
-	movl	128(%r14),%r8d
-	xorl	%r12d,%ecx
-	rorl	$8,%r12d
-	xorl	%ebp,%edx
-	rorl	$8,%ebp
-	xorl	%r12d,%ecx
-	movl	192(%r14),%r9d
-	xorl	%ebp,%edx
-	jmp	.Lenc_loop_compact
-.align	16
-.Lenc_compact_done:
-	xorl	0(%r15),%eax
-	xorl	4(%r15),%ebx
-	xorl	8(%r15),%ecx
-	xorl	12(%r15),%edx
-.byte	0xf3,0xc3
-.cfi_endproc	
-.size	_x86_64_AES_encrypt_compact,.-_x86_64_AES_encrypt_compact
-.globl	AES_encrypt
-.type	AES_encrypt,@function
-.align	16
-.globl	asm_AES_encrypt
-.hidden	asm_AES_encrypt
-asm_AES_encrypt:
-AES_encrypt:
-.cfi_startproc	
-	movq	%rsp,%rax
-.cfi_def_cfa_register	%rax
-	pushq	%rbx
-.cfi_offset	%rbx,-16
-	pushq	%rbp
-.cfi_offset	%rbp,-24
-	pushq	%r12
-.cfi_offset	%r12,-32
-	pushq	%r13
-.cfi_offset	%r13,-40
-	pushq	%r14
-.cfi_offset	%r14,-48
-	pushq	%r15
-.cfi_offset	%r15,-56
-
-
-	leaq	-63(%rdx),%rcx
-	andq	$-64,%rsp
-	subq	%rsp,%rcx
-	negq	%rcx
-	andq	$0x3c0,%rcx
-	subq	%rcx,%rsp
-	subq	$32,%rsp
-
-	movq	%rsi,16(%rsp)
-	movq	%rax,24(%rsp)
-.cfi_escape	0x0f,0x05,0x77,0x18,0x06,0x23,0x08
-.Lenc_prologue:
-
-	movq	%rdx,%r15
-	movl	240(%r15),%r13d
-
-	movl	0(%rdi),%eax
-	movl	4(%rdi),%ebx
-	movl	8(%rdi),%ecx
-	movl	12(%rdi),%edx
-
-	shll	$4,%r13d
-	leaq	(%r15,%r13,1),%rbp
-	movq	%r15,(%rsp)
-	movq	%rbp,8(%rsp)
-
-
-	leaq	.LAES_Te+2048(%rip),%r14
-	leaq	768(%rsp),%rbp
-	subq	%r14,%rbp
-	andq	$0x300,%rbp
-	leaq	(%r14,%rbp,1),%r14
-
-	call	_x86_64_AES_encrypt_compact
-
-	movq	16(%rsp),%r9
-	movq	24(%rsp),%rsi
-.cfi_def_cfa	%rsi,8
-	movl	%eax,0(%r9)
-	movl	%ebx,4(%r9)
-	movl	%ecx,8(%r9)
-	movl	%edx,12(%r9)
-
-	movq	-48(%rsi),%r15
-.cfi_restore	%r15
-	movq	-40(%rsi),%r14
-.cfi_restore	%r14
-	movq	-32(%rsi),%r13
-.cfi_restore	%r13
-	movq	-24(%rsi),%r12
-.cfi_restore	%r12
-	movq	-16(%rsi),%rbp
-.cfi_restore	%rbp
-	movq	-8(%rsi),%rbx
-.cfi_restore	%rbx
-	leaq	(%rsi),%rsp
-.cfi_def_cfa_register	%rsp
-.Lenc_epilogue:
-	.byte	0xf3,0xc3
-.cfi_endproc	
-.size	AES_encrypt,.-AES_encrypt
-.type	_x86_64_AES_decrypt,@function
-.align	16
-_x86_64_AES_decrypt:
-	xorl	0(%r15),%eax
-	xorl	4(%r15),%ebx
-	xorl	8(%r15),%ecx
-	xorl	12(%r15),%edx
-
-	movl	240(%r15),%r13d
-	subl	$1,%r13d
-	jmp	.Ldec_loop
-.align	16
-.Ldec_loop:
-
-	movzbl	%al,%esi
-	movzbl	%bl,%edi
-	movzbl	%cl,%ebp
-	movl	0(%r14,%rsi,8),%r10d
-	movl	0(%r14,%rdi,8),%r11d
-	movl	0(%r14,%rbp,8),%r12d
-
-	movzbl	%dh,%esi
-	movzbl	%ah,%edi
-	movzbl	%dl,%ebp
-	xorl	3(%r14,%rsi,8),%r10d
-	xorl	3(%r14,%rdi,8),%r11d
-	movl	0(%r14,%rbp,8),%r8d
-
-	movzbl	%bh,%esi
-	shrl	$16,%eax
-	movzbl	%ch,%ebp
-	xorl	3(%r14,%rsi,8),%r12d
-	shrl	$16,%edx
-	xorl	3(%r14,%rbp,8),%r8d
-
-	shrl	$16,%ebx
-	leaq	16(%r15),%r15
-	shrl	$16,%ecx
-
-	movzbl	%cl,%esi
-	movzbl	%dl,%edi
-	movzbl	%al,%ebp
-	xorl	2(%r14,%rsi,8),%r10d
-	xorl	2(%r14,%rdi,8),%r11d
-	xorl	2(%r14,%rbp,8),%r12d
-
-	movzbl	%bh,%esi
-	movzbl	%ch,%edi
-	movzbl	%bl,%ebp
-	xorl	1(%r14,%rsi,8),%r10d
-	xorl	1(%r14,%rdi,8),%r11d
-	xorl	2(%r14,%rbp,8),%r8d
-
-	movzbl	%dh,%esi
-	movl	12(%r15),%edx
-	movzbl	%ah,%ebp
-	xorl	1(%r14,%rsi,8),%r12d
-	movl	0(%r15),%eax
-	xorl	1(%r14,%rbp,8),%r8d
-
-	xorl	%r10d,%eax
-	movl	4(%r15),%ebx
-	movl	8(%r15),%ecx
-	xorl	%r12d,%ecx
-	xorl	%r11d,%ebx
-	xorl	%r8d,%edx
-	subl	$1,%r13d
-	jnz	.Ldec_loop
-	leaq	2048(%r14),%r14
-	movzbl	%al,%esi
-	movzbl	%bl,%edi
-	movzbl	%cl,%ebp
-	movzbl	(%r14,%rsi,1),%r10d
-	movzbl	(%r14,%rdi,1),%r11d
-	movzbl	(%r14,%rbp,1),%r12d
-
-	movzbl	%dl,%esi
-	movzbl	%dh,%edi
-	movzbl	%ah,%ebp
-	movzbl	(%r14,%rsi,1),%r8d
-	movzbl	(%r14,%rdi,1),%edi
-	movzbl	(%r14,%rbp,1),%ebp
-
-	shll	$8,%edi
-	shll	$8,%ebp
-
-	xorl	%edi,%r10d
-	xorl	%ebp,%r11d
-	shrl	$16,%edx
-
-	movzbl	%bh,%esi
-	movzbl	%ch,%edi
-	shrl	$16,%eax
-	movzbl	(%r14,%rsi,1),%esi
-	movzbl	(%r14,%rdi,1),%edi
-
-	shll	$8,%esi
-	shll	$8,%edi
-	shrl	$16,%ebx
-	xorl	%esi,%r12d
-	xorl	%edi,%r8d
-	shrl	$16,%ecx
-
-	movzbl	%cl,%esi
-	movzbl	%dl,%edi
-	movzbl	%al,%ebp
-	movzbl	(%r14,%rsi,1),%esi
-	movzbl	(%r14,%rdi,1),%edi
-	movzbl	(%r14,%rbp,1),%ebp
-
-	shll	$16,%esi
-	shll	$16,%edi
-	shll	$16,%ebp
-
-	xorl	%esi,%r10d
-	xorl	%edi,%r11d
-	xorl	%ebp,%r12d
-
-	movzbl	%bl,%esi
-	movzbl	%bh,%edi
-	movzbl	%ch,%ebp
-	movzbl	(%r14,%rsi,1),%esi
-	movzbl	(%r14,%rdi,1),%edi
-	movzbl	(%r14,%rbp,1),%ebp
-
-	shll	$16,%esi
-	shll	$24,%edi
-	shll	$24,%ebp
-
-	xorl	%esi,%r8d
-	xorl	%edi,%r10d
-	xorl	%ebp,%r11d
-
-	movzbl	%dh,%esi
-	movzbl	%ah,%edi
-	movl	16+12(%r15),%edx
-	movzbl	(%r14,%rsi,1),%esi
-	movzbl	(%r14,%rdi,1),%edi
-	movl	16+0(%r15),%eax
-
-	shll	$24,%esi
-	shll	$24,%edi
-
-	xorl	%esi,%r12d
-	xorl	%edi,%r8d
-
-	movl	16+4(%r15),%ebx
-	movl	16+8(%r15),%ecx
-	leaq	-2048(%r14),%r14
-	xorl	%r10d,%eax
-	xorl	%r11d,%ebx
-	xorl	%r12d,%ecx
-	xorl	%r8d,%edx
-.byte	0xf3,0xc3
-.size	_x86_64_AES_decrypt,.-_x86_64_AES_decrypt
-.type	_x86_64_AES_decrypt_compact,@function
-.align	16
-_x86_64_AES_decrypt_compact:
-.cfi_startproc	
-	leaq	128(%r14),%r8
-	movl	0-128(%r8),%edi
-	movl	32-128(%r8),%ebp
-	movl	64-128(%r8),%r10d
-	movl	96-128(%r8),%r11d
-	movl	128-128(%r8),%edi
-	movl	160-128(%r8),%ebp
-	movl	192-128(%r8),%r10d
-	movl	224-128(%r8),%r11d
-	jmp	.Ldec_loop_compact
-
-.align	16
-.Ldec_loop_compact:
-	xorl	0(%r15),%eax
-	xorl	4(%r15),%ebx
-	xorl	8(%r15),%ecx
-	xorl	12(%r15),%edx
-	leaq	16(%r15),%r15
-	movzbl	%al,%r10d
-	movzbl	%bl,%r11d
-	movzbl	%cl,%r12d
-	movzbl	%dl,%r8d
-	movzbl	%dh,%esi
-	movzbl	%ah,%edi
-	shrl	$16,%edx
-	movzbl	%bh,%ebp
-	movzbl	(%r14,%r10,1),%r10d
-	movzbl	(%r14,%r11,1),%r11d
-	movzbl	(%r14,%r12,1),%r12d
-	movzbl	(%r14,%r8,1),%r8d
-
-	movzbl	(%r14,%rsi,1),%r9d
-	movzbl	%ch,%esi
-	movzbl	(%r14,%rdi,1),%r13d
-	movzbl	(%r14,%rbp,1),%ebp
-	movzbl	(%r14,%rsi,1),%esi
-
-	shrl	$16,%ecx
-	shll	$8,%r13d
-	shll	$8,%r9d
-	movzbl	%cl,%edi
-	shrl	$16,%eax
-	xorl	%r9d,%r10d
-	shrl	$16,%ebx
-	movzbl	%dl,%r9d
-
-	shll	$8,%ebp
-	xorl	%r13d,%r11d
-	shll	$8,%esi
-	movzbl	%al,%r13d
-	movzbl	(%r14,%rdi,1),%edi
-	xorl	%ebp,%r12d
-	movzbl	%bl,%ebp
-
-	shll	$16,%edi
-	xorl	%esi,%r8d
-	movzbl	(%r14,%r9,1),%r9d
-	movzbl	%bh,%esi
-	movzbl	(%r14,%rbp,1),%ebp
-	xorl	%edi,%r10d
-	movzbl	(%r14,%r13,1),%r13d
-	movzbl	%ch,%edi
-
-	shll	$16,%ebp
-	shll	$16,%r9d
-	shll	$16,%r13d
-	xorl	%ebp,%r8d
-	movzbl	%dh,%ebp
-	xorl	%r9d,%r11d
-	shrl	$8,%eax
-	xorl	%r13d,%r12d
-
-	movzbl	(%r14,%rsi,1),%esi
-	movzbl	(%r14,%rdi,1),%ebx
-	movzbl	(%r14,%rbp,1),%ecx
-	movzbl	(%r14,%rax,1),%edx
-
-	movl	%r10d,%eax
-	shll	$24,%esi
-	shll	$24,%ebx
-	shll	$24,%ecx
-	xorl	%esi,%eax
-	shll	$24,%edx
-	xorl	%r11d,%ebx
-	xorl	%r12d,%ecx
-	xorl	%r8d,%edx
-	cmpq	16(%rsp),%r15
-	je	.Ldec_compact_done
-
-	movq	256+0(%r14),%rsi
-	shlq	$32,%rbx
-	shlq	$32,%rdx
-	movq	256+8(%r14),%rdi
-	orq	%rbx,%rax
-	orq	%rdx,%rcx
-	movq	256+16(%r14),%rbp
-	movq	%rsi,%r9
-	movq	%rsi,%r12
-	andq	%rax,%r9
-	andq	%rcx,%r12
-	movq	%r9,%rbx
-	movq	%r12,%rdx
-	shrq	$7,%r9
-	leaq	(%rax,%rax,1),%r8
-	shrq	$7,%r12
-	leaq	(%rcx,%rcx,1),%r11
-	subq	%r9,%rbx
-	subq	%r12,%rdx
-	andq	%rdi,%r8
-	andq	%rdi,%r11
-	andq	%rbp,%rbx
-	andq	%rbp,%rdx
-	xorq	%rbx,%r8
-	xorq	%rdx,%r11
-	movq	%rsi,%r10
-	movq	%rsi,%r13
-
-	andq	%r8,%r10
-	andq	%r11,%r13
-	movq	%r10,%rbx
-	movq	%r13,%rdx
-	shrq	$7,%r10
-	leaq	(%r8,%r8,1),%r9
-	shrq	$7,%r13
-	leaq	(%r11,%r11,1),%r12
-	subq	%r10,%rbx
-	subq	%r13,%rdx
-	andq	%rdi,%r9
-	andq	%rdi,%r12
-	andq	%rbp,%rbx
-	andq	%rbp,%rdx
-	xorq	%rbx,%r9
-	xorq	%rdx,%r12
-	movq	%rsi,%r10
-	movq	%rsi,%r13
-
-	andq	%r9,%r10
-	andq	%r12,%r13
-	movq	%r10,%rbx
-	movq	%r13,%rdx
-	shrq	$7,%r10
-	xorq	%rax,%r8
-	shrq	$7,%r13
-	xorq	%rcx,%r11
-	subq	%r10,%rbx
-	subq	%r13,%rdx
-	leaq	(%r9,%r9,1),%r10
-	leaq	(%r12,%r12,1),%r13
-	xorq	%rax,%r9
-	xorq	%rcx,%r12
-	andq	%rdi,%r10
-	andq	%rdi,%r13
-	andq	%rbp,%rbx
-	andq	%rbp,%rdx
-	xorq	%rbx,%r10
-	xorq	%rdx,%r13
-
-	xorq	%r10,%rax
-	xorq	%r13,%rcx
-	xorq	%r10,%r8
-	xorq	%r13,%r11
-	movq	%rax,%rbx
-	movq	%rcx,%rdx
-	xorq	%r10,%r9
-	shrq	$32,%rbx
-	xorq	%r13,%r12
-	shrq	$32,%rdx
-	xorq	%r8,%r10
-	roll	$8,%eax
-	xorq	%r11,%r13
-	roll	$8,%ecx
-	xorq	%r9,%r10
-	roll	$8,%ebx
-	xorq	%r12,%r13
-
-	roll	$8,%edx
-	xorl	%r10d,%eax
-	shrq	$32,%r10
-	xorl	%r13d,%ecx
-	shrq	$32,%r13
-	xorl	%r10d,%ebx
-	xorl	%r13d,%edx
-
-	movq	%r8,%r10
-	roll	$24,%r8d
-	movq	%r11,%r13
-	roll	$24,%r11d
-	shrq	$32,%r10
-	xorl	%r8d,%eax
-	shrq	$32,%r13
-	xorl	%r11d,%ecx
-	roll	$24,%r10d
-	movq	%r9,%r8
-	roll	$24,%r13d
-	movq	%r12,%r11
-	shrq	$32,%r8
-	xorl	%r10d,%ebx
-	shrq	$32,%r11
-	xorl	%r13d,%edx
-
-	movq	0(%r14),%rsi
-	roll	$16,%r9d
-	movq	64(%r14),%rdi
-	roll	$16,%r12d
-	movq	128(%r14),%rbp
-	roll	$16,%r8d
-	movq	192(%r14),%r10
-	xorl	%r9d,%eax
-	roll	$16,%r11d
-	xorl	%r12d,%ecx
-	movq	256(%r14),%r13
-	xorl	%r8d,%ebx
-	xorl	%r11d,%edx
-	jmp	.Ldec_loop_compact
-.align	16
-.Ldec_compact_done:
-	xorl	0(%r15),%eax
-	xorl	4(%r15),%ebx
-	xorl	8(%r15),%ecx
-	xorl	12(%r15),%edx
-.byte	0xf3,0xc3
-.cfi_endproc	
-.size	_x86_64_AES_decrypt_compact,.-_x86_64_AES_decrypt_compact
-.globl	AES_decrypt
-.type	AES_decrypt,@function
-.align	16
-.globl	asm_AES_decrypt
-.hidden	asm_AES_decrypt
-asm_AES_decrypt:
-AES_decrypt:
-.cfi_startproc	
-	movq	%rsp,%rax
-.cfi_def_cfa_register	%rax
-	pushq	%rbx
-.cfi_offset	%rbx,-16
-	pushq	%rbp
-.cfi_offset	%rbp,-24
-	pushq	%r12
-.cfi_offset	%r12,-32
-	pushq	%r13
-.cfi_offset	%r13,-40
-	pushq	%r14
-.cfi_offset	%r14,-48
-	pushq	%r15
-.cfi_offset	%r15,-56
-
-
-	leaq	-63(%rdx),%rcx
-	andq	$-64,%rsp
-	subq	%rsp,%rcx
-	negq	%rcx
-	andq	$0x3c0,%rcx
-	subq	%rcx,%rsp
-	subq	$32,%rsp
-
-	movq	%rsi,16(%rsp)
-	movq	%rax,24(%rsp)
-.cfi_escape	0x0f,0x05,0x77,0x18,0x06,0x23,0x08
-.Ldec_prologue:
-
-	movq	%rdx,%r15
-	movl	240(%r15),%r13d
-
-	movl	0(%rdi),%eax
-	movl	4(%rdi),%ebx
-	movl	8(%rdi),%ecx
-	movl	12(%rdi),%edx
-
-	shll	$4,%r13d
-	leaq	(%r15,%r13,1),%rbp
-	movq	%r15,(%rsp)
-	movq	%rbp,8(%rsp)
-
-
-	leaq	.LAES_Td+2048(%rip),%r14
-	leaq	768(%rsp),%rbp
-	subq	%r14,%rbp
-	andq	$0x300,%rbp
-	leaq	(%r14,%rbp,1),%r14
-	shrq	$3,%rbp
-	addq	%rbp,%r14
-
-	call	_x86_64_AES_decrypt_compact
-
-	movq	16(%rsp),%r9
-	movq	24(%rsp),%rsi
-.cfi_def_cfa	%rsi,8
-	movl	%eax,0(%r9)
-	movl	%ebx,4(%r9)
-	movl	%ecx,8(%r9)
-	movl	%edx,12(%r9)
-
-	movq	-48(%rsi),%r15
-.cfi_restore	%r15
-	movq	-40(%rsi),%r14
-.cfi_restore	%r14
-	movq	-32(%rsi),%r13
-.cfi_restore	%r13
-	movq	-24(%rsi),%r12
-.cfi_restore	%r12
-	movq	-16(%rsi),%rbp
-.cfi_restore	%rbp
-	movq	-8(%rsi),%rbx
-.cfi_restore	%rbx
-	leaq	(%rsi),%rsp
-.cfi_def_cfa_register	%rsp
-.Ldec_epilogue:
-	.byte	0xf3,0xc3
-.cfi_endproc	
-.size	AES_decrypt,.-AES_decrypt
-.globl	AES_set_encrypt_key
-.type	AES_set_encrypt_key,@function
-.align	16
-AES_set_encrypt_key:
-.cfi_startproc	
-	pushq	%rbx
-.cfi_adjust_cfa_offset	8
-.cfi_offset	%rbx,-16
-	pushq	%rbp
-.cfi_adjust_cfa_offset	8
-.cfi_offset	%rbp,-24
-	pushq	%r12
-.cfi_adjust_cfa_offset	8
-.cfi_offset	%r12,-32
-	pushq	%r13
-.cfi_adjust_cfa_offset	8
-.cfi_offset	%r13,-40
-	pushq	%r14
-.cfi_adjust_cfa_offset	8
-.cfi_offset	%r14,-48
-	pushq	%r15
-.cfi_adjust_cfa_offset	8
-.cfi_offset	%r15,-56
-	subq	$8,%rsp
-.cfi_adjust_cfa_offset	8
-.Lenc_key_prologue:
-
-	call	_x86_64_AES_set_encrypt_key
-
-	movq	40(%rsp),%rbp
-.cfi_restore	%rbp
-	movq	48(%rsp),%rbx
-.cfi_restore	%rbx
-	addq	$56,%rsp
-.cfi_adjust_cfa_offset	-56
-.Lenc_key_epilogue:
-	.byte	0xf3,0xc3
-.cfi_endproc	
-.size	AES_set_encrypt_key,.-AES_set_encrypt_key
-
-.type	_x86_64_AES_set_encrypt_key,@function
-.align	16
-_x86_64_AES_set_encrypt_key:
-.cfi_startproc	
-	movl	%esi,%ecx
-	movq	%rdi,%rsi
-	movq	%rdx,%rdi
-
-	testq	$-1,%rsi
-	jz	.Lbadpointer
-	testq	$-1,%rdi
-	jz	.Lbadpointer
-
-	leaq	.LAES_Te(%rip),%rbp
-	leaq	2048+128(%rbp),%rbp
-
-
-	movl	0-128(%rbp),%eax
-	movl	32-128(%rbp),%ebx
-	movl	64-128(%rbp),%r8d
-	movl	96-128(%rbp),%edx
-	movl	128-128(%rbp),%eax
-	movl	160-128(%rbp),%ebx
-	movl	192-128(%rbp),%r8d
-	movl	224-128(%rbp),%edx
-
-	cmpl	$128,%ecx
-	je	.L10rounds
-	cmpl	$192,%ecx
-	je	.L12rounds
-	cmpl	$256,%ecx
-	je	.L14rounds
-	movq	$-2,%rax
-	jmp	.Lexit
-
-.L10rounds:
-	movq	0(%rsi),%rax
-	movq	8(%rsi),%rdx
-	movq	%rax,0(%rdi)
-	movq	%rdx,8(%rdi)
-
-	shrq	$32,%rdx
-	xorl	%ecx,%ecx
-	jmp	.L10shortcut
-.align	4
-.L10loop:
-	movl	0(%rdi),%eax
-	movl	12(%rdi),%edx
-.L10shortcut:
-	movzbl	%dl,%esi
-	movzbl	-128(%rbp,%rsi,1),%ebx
-	movzbl	%dh,%esi
-	shll	$24,%ebx
-	xorl	%ebx,%eax
-
-	movzbl	-128(%rbp,%rsi,1),%ebx
-	shrl	$16,%edx
-	movzbl	%dl,%esi
-	xorl	%ebx,%eax
-
-	movzbl	-128(%rbp,%rsi,1),%ebx
-	movzbl	%dh,%esi
-	shll	$8,%ebx
-	xorl	%ebx,%eax
-
-	movzbl	-128(%rbp,%rsi,1),%ebx
-	shll	$16,%ebx
-	xorl	%ebx,%eax
-
-	xorl	1024-128(%rbp,%rcx,4),%eax
-	movl	%eax,16(%rdi)
-	xorl	4(%rdi),%eax
-	movl	%eax,20(%rdi)
-	xorl	8(%rdi),%eax
-	movl	%eax,24(%rdi)
-	xorl	12(%rdi),%eax
-	movl	%eax,28(%rdi)
-	addl	$1,%ecx
-	leaq	16(%rdi),%rdi
-	cmpl	$10,%ecx
-	jl	.L10loop
-
-	movl	$10,80(%rdi)
-	xorq	%rax,%rax
-	jmp	.Lexit
-
-.L12rounds:
-	movq	0(%rsi),%rax
-	movq	8(%rsi),%rbx
-	movq	16(%rsi),%rdx
-	movq	%rax,0(%rdi)
-	movq	%rbx,8(%rdi)
-	movq	%rdx,16(%rdi)
-
-	shrq	$32,%rdx
-	xorl	%ecx,%ecx
-	jmp	.L12shortcut
-.align	4
-.L12loop:
-	movl	0(%rdi),%eax
-	movl	20(%rdi),%edx
-.L12shortcut:
-	movzbl	%dl,%esi
-	movzbl	-128(%rbp,%rsi,1),%ebx
-	movzbl	%dh,%esi
-	shll	$24,%ebx
-	xorl	%ebx,%eax
-
-	movzbl	-128(%rbp,%rsi,1),%ebx
-	shrl	$16,%edx
-	movzbl	%dl,%esi
-	xorl	%ebx,%eax
-
-	movzbl	-128(%rbp,%rsi,1),%ebx
-	movzbl	%dh,%esi
-	shll	$8,%ebx
-	xorl	%ebx,%eax
-
-	movzbl	-128(%rbp,%rsi,1),%ebx
-	shll	$16,%ebx
-	xorl	%ebx,%eax
-
-	xorl	1024-128(%rbp,%rcx,4),%eax
-	movl	%eax,24(%rdi)
-	xorl	4(%rdi),%eax
-	movl	%eax,28(%rdi)
-	xorl	8(%rdi),%eax
-	movl	%eax,32(%rdi)
-	xorl	12(%rdi),%eax
-	movl	%eax,36(%rdi)
-
-	cmpl	$7,%ecx
-	je	.L12break
-	addl	$1,%ecx
-
-	xorl	16(%rdi),%eax
-	movl	%eax,40(%rdi)
-	xorl	20(%rdi),%eax
-	movl	%eax,44(%rdi)
-
-	leaq	24(%rdi),%rdi
-	jmp	.L12loop
-.L12break:
-	movl	$12,72(%rdi)
-	xorq	%rax,%rax
-	jmp	.Lexit
-
-.L14rounds:
-	movq	0(%rsi),%rax
-	movq	8(%rsi),%rbx
-	movq	16(%rsi),%rcx
-	movq	24(%rsi),%rdx
-	movq	%rax,0(%rdi)
-	movq	%rbx,8(%rdi)
-	movq	%rcx,16(%rdi)
-	movq	%rdx,24(%rdi)
-
-	shrq	$32,%rdx
-	xorl	%ecx,%ecx
-	jmp	.L14shortcut
-.align	4
-.L14loop:
-	movl	0(%rdi),%eax
-	movl	28(%rdi),%edx
-.L14shortcut:
-	movzbl	%dl,%esi
-	movzbl	-128(%rbp,%rsi,1),%ebx
-	movzbl	%dh,%esi
-	shll	$24,%ebx
-	xorl	%ebx,%eax
-
-	movzbl	-128(%rbp,%rsi,1),%ebx
-	shrl	$16,%edx
-	movzbl	%dl,%esi
-	xorl	%ebx,%eax
-
-	movzbl	-128(%rbp,%rsi,1),%ebx
-	movzbl	%dh,%esi
-	shll	$8,%ebx
-	xorl	%ebx,%eax
-
-	movzbl	-128(%rbp,%rsi,1),%ebx
-	shll	$16,%ebx
-	xorl	%ebx,%eax
-
-	xorl	1024-128(%rbp,%rcx,4),%eax
-	movl	%eax,32(%rdi)
-	xorl	4(%rdi),%eax
-	movl	%eax,36(%rdi)
-	xorl	8(%rdi),%eax
-	movl	%eax,40(%rdi)
-	xorl	12(%rdi),%eax
-	movl	%eax,44(%rdi)
-
-	cmpl	$6,%ecx
-	je	.L14break
-	addl	$1,%ecx
-
-	movl	%eax,%edx
-	movl	16(%rdi),%eax
-	movzbl	%dl,%esi
-	movzbl	-128(%rbp,%rsi,1),%ebx
-	movzbl	%dh,%esi
-	xorl	%ebx,%eax
-
-	movzbl	-128(%rbp,%rsi,1),%ebx
-	shrl	$16,%edx
-	shll	$8,%ebx
-	movzbl	%dl,%esi
-	xorl	%ebx,%eax
-
-	movzbl	-128(%rbp,%rsi,1),%ebx
-	movzbl	%dh,%esi
-	shll	$16,%ebx
-	xorl	%ebx,%eax
-
-	movzbl	-128(%rbp,%rsi,1),%ebx
-	shll	$24,%ebx
-	xorl	%ebx,%eax
-
-	movl	%eax,48(%rdi)
-	xorl	20(%rdi),%eax
-	movl	%eax,52(%rdi)
-	xorl	24(%rdi),%eax
-	movl	%eax,56(%rdi)
-	xorl	28(%rdi),%eax
-	movl	%eax,60(%rdi)
-
-	leaq	32(%rdi),%rdi
-	jmp	.L14loop
-.L14break:
-	movl	$14,48(%rdi)
-	xorq	%rax,%rax
-	jmp	.Lexit
-
-.Lbadpointer:
-	movq	$-1,%rax
-.Lexit:
-.byte	0xf3,0xc3
-.cfi_endproc	
-.size	_x86_64_AES_set_encrypt_key,.-_x86_64_AES_set_encrypt_key
-.globl	AES_set_decrypt_key
-.type	AES_set_decrypt_key,@function
-.align	16
-AES_set_decrypt_key:
-.cfi_startproc	
-	pushq	%rbx
-.cfi_adjust_cfa_offset	8
-.cfi_offset	%rbx,-16
-	pushq	%rbp
-.cfi_adjust_cfa_offset	8
-.cfi_offset	%rbp,-24
-	pushq	%r12
-.cfi_adjust_cfa_offset	8
-.cfi_offset	%r12,-32
-	pushq	%r13
-.cfi_adjust_cfa_offset	8
-.cfi_offset	%r13,-40
-	pushq	%r14
-.cfi_adjust_cfa_offset	8
-.cfi_offset	%r14,-48
-	pushq	%r15
-.cfi_adjust_cfa_offset	8
-.cfi_offset	%r15,-56
-	pushq	%rdx
-.cfi_adjust_cfa_offset	8
-.Ldec_key_prologue:
-
-	call	_x86_64_AES_set_encrypt_key
-	movq	(%rsp),%r8
-	cmpl	$0,%eax
-	jne	.Labort
-
-	movl	240(%r8),%r14d
-	xorq	%rdi,%rdi
-	leaq	(%rdi,%r14,4),%rcx
-	movq	%r8,%rsi
-	leaq	(%r8,%rcx,4),%rdi
-.align	4
-.Linvert:
-	movq	0(%rsi),%rax
-	movq	8(%rsi),%rbx
-	movq	0(%rdi),%rcx
-	movq	8(%rdi),%rdx
-	movq	%rax,0(%rdi)
-	movq	%rbx,8(%rdi)
-	movq	%rcx,0(%rsi)
-	movq	%rdx,8(%rsi)
-	leaq	16(%rsi),%rsi
-	leaq	-16(%rdi),%rdi
-	cmpq	%rsi,%rdi
-	jne	.Linvert
-
-	leaq	.LAES_Te+2048+1024(%rip),%rax
-
-	movq	40(%rax),%rsi
-	movq	48(%rax),%rdi
-	movq	56(%rax),%rbp
-
-	movq	%r8,%r15
-	subl	$1,%r14d
-.align	4
-.Lpermute:
-	leaq	16(%r15),%r15
-	movq	0(%r15),%rax
-	movq	8(%r15),%rcx
-	movq	%rsi,%r9
-	movq	%rsi,%r12
-	andq	%rax,%r9
-	andq	%rcx,%r12
-	movq	%r9,%rbx
-	movq	%r12,%rdx
-	shrq	$7,%r9
-	leaq	(%rax,%rax,1),%r8
-	shrq	$7,%r12
-	leaq	(%rcx,%rcx,1),%r11
-	subq	%r9,%rbx
-	subq	%r12,%rdx
-	andq	%rdi,%r8
-	andq	%rdi,%r11
-	andq	%rbp,%rbx
-	andq	%rbp,%rdx
-	xorq	%rbx,%r8
-	xorq	%rdx,%r11
-	movq	%rsi,%r10
-	movq	%rsi,%r13
-
-	andq	%r8,%r10
-	andq	%r11,%r13
-	movq	%r10,%rbx
-	movq	%r13,%rdx
-	shrq	$7,%r10
-	leaq	(%r8,%r8,1),%r9
-	shrq	$7,%r13
-	leaq	(%r11,%r11,1),%r12
-	subq	%r10,%rbx
-	subq	%r13,%rdx
-	andq	%rdi,%r9
-	andq	%rdi,%r12
-	andq	%rbp,%rbx
-	andq	%rbp,%rdx
-	xorq	%rbx,%r9
-	xorq	%rdx,%r12
-	movq	%rsi,%r10
-	movq	%rsi,%r13
-
-	andq	%r9,%r10
-	andq	%r12,%r13
-	movq	%r10,%rbx
-	movq	%r13,%rdx
-	shrq	$7,%r10
-	xorq	%rax,%r8
-	shrq	$7,%r13
-	xorq	%rcx,%r11
-	subq	%r10,%rbx
-	subq	%r13,%rdx
-	leaq	(%r9,%r9,1),%r10
-	leaq	(%r12,%r12,1),%r13
-	xorq	%rax,%r9
-	xorq	%rcx,%r12
-	andq	%rdi,%r10
-	andq	%rdi,%r13
-	andq	%rbp,%rbx
-	andq	%rbp,%rdx
-	xorq	%rbx,%r10
-	xorq	%rdx,%r13
-
-	xorq	%r10,%rax
-	xorq	%r13,%rcx
-	xorq	%r10,%r8
-	xorq	%r13,%r11
-	movq	%rax,%rbx
-	movq	%rcx,%rdx
-	xorq	%r10,%r9
-	shrq	$32,%rbx
-	xorq	%r13,%r12
-	shrq	$32,%rdx
-	xorq	%r8,%r10
-	roll	$8,%eax
-	xorq	%r11,%r13
-	roll	$8,%ecx
-	xorq	%r9,%r10
-	roll	$8,%ebx
-	xorq	%r12,%r13
-
-	roll	$8,%edx
-	xorl	%r10d,%eax
-	shrq	$32,%r10
-	xorl	%r13d,%ecx
-	shrq	$32,%r13
-	xorl	%r10d,%ebx
-	xorl	%r13d,%edx
-
-	movq	%r8,%r10
-	roll	$24,%r8d
-	movq	%r11,%r13
-	roll	$24,%r11d
-	shrq	$32,%r10
-	xorl	%r8d,%eax
-	shrq	$32,%r13
-	xorl	%r11d,%ecx
-	roll	$24,%r10d
-	movq	%r9,%r8
-	roll	$24,%r13d
-	movq	%r12,%r11
-	shrq	$32,%r8
-	xorl	%r10d,%ebx
-	shrq	$32,%r11
-	xorl	%r13d,%edx
-
-
-	roll	$16,%r9d
-
-	roll	$16,%r12d
-
-	roll	$16,%r8d
-
-	xorl	%r9d,%eax
-	roll	$16,%r11d
-	xorl	%r12d,%ecx
-
-	xorl	%r8d,%ebx
-	xorl	%r11d,%edx
-	movl	%eax,0(%r15)
-	movl	%ebx,4(%r15)
-	movl	%ecx,8(%r15)
-	movl	%edx,12(%r15)
-	subl	$1,%r14d
-	jnz	.Lpermute
-
-	xorq	%rax,%rax
-.Labort:
-	movq	8(%rsp),%r15
-.cfi_restore	%r15
-	movq	16(%rsp),%r14
-.cfi_restore	%r14
-	movq	24(%rsp),%r13
-.cfi_restore	%r13
-	movq	32(%rsp),%r12
-.cfi_restore	%r12
-	movq	40(%rsp),%rbp
-.cfi_restore	%rbp
-	movq	48(%rsp),%rbx
-.cfi_restore	%rbx
-	addq	$56,%rsp
-.cfi_adjust_cfa_offset	-56
-.Ldec_key_epilogue:
-	.byte	0xf3,0xc3
-.cfi_endproc	
-.size	AES_set_decrypt_key,.-AES_set_decrypt_key
-.globl	AES_cbc_encrypt
-.type	AES_cbc_encrypt,@function
-.align	16
-
-.globl	asm_AES_cbc_encrypt
-.hidden	asm_AES_cbc_encrypt
-asm_AES_cbc_encrypt:
-AES_cbc_encrypt:
-.cfi_startproc	
-	cmpq	$0,%rdx
-	je	.Lcbc_epilogue
-	pushfq
-
-
-.cfi_adjust_cfa_offset	8
-	pushq	%rbx
-.cfi_adjust_cfa_offset	8
-.cfi_offset	%rbx,-24
-	pushq	%rbp
-.cfi_adjust_cfa_offset	8
-.cfi_offset	%rbp,-32
-	pushq	%r12
-.cfi_adjust_cfa_offset	8
-.cfi_offset	%r12,-40
-	pushq	%r13
-.cfi_adjust_cfa_offset	8
-.cfi_offset	%r13,-48
-	pushq	%r14
-.cfi_adjust_cfa_offset	8
-.cfi_offset	%r14,-56
-	pushq	%r15
-.cfi_adjust_cfa_offset	8
-.cfi_offset	%r15,-64
-.Lcbc_prologue:
-
-	cld
-	movl	%r9d,%r9d
-
-	leaq	.LAES_Te(%rip),%r14
-	leaq	.LAES_Td(%rip),%r10
-	cmpq	$0,%r9
-	cmoveq	%r10,%r14
-
-.cfi_remember_state	
-	movl	OPENSSL_ia32cap_P(%rip),%r10d
-	cmpq	$512,%rdx
-	jb	.Lcbc_slow_prologue
-	testq	$15,%rdx
-	jnz	.Lcbc_slow_prologue
-	btl	$28,%r10d
-	jc	.Lcbc_slow_prologue
-
-
-	leaq	-88-248(%rsp),%r15
-	andq	$-64,%r15
-
-
-	movq	%r14,%r10
-	leaq	2304(%r14),%r11
-	movq	%r15,%r12
-	andq	$0xFFF,%r10
-	andq	$0xFFF,%r11
-	andq	$0xFFF,%r12
-
-	cmpq	%r11,%r12
-	jb	.Lcbc_te_break_out
-	subq	%r11,%r12
-	subq	%r12,%r15
-	jmp	.Lcbc_te_ok
-.Lcbc_te_break_out:
-	subq	%r10,%r12
-	andq	$0xFFF,%r12
-	addq	$320,%r12
-	subq	%r12,%r15
-.align	4
-.Lcbc_te_ok:
-
-	xchgq	%rsp,%r15
-.cfi_def_cfa_register	%r15
-
-	movq	%r15,16(%rsp)
-.cfi_escape	0x0f,0x05,0x77,0x10,0x06,0x23,0x40
-.Lcbc_fast_body:
-	movq	%rdi,24(%rsp)
-	movq	%rsi,32(%rsp)
-	movq	%rdx,40(%rsp)
-	movq	%rcx,48(%rsp)
-	movq	%r8,56(%rsp)
-	movl	$0,80+240(%rsp)
-	movq	%r8,%rbp
-	movq	%r9,%rbx
-	movq	%rsi,%r9
-	movq	%rdi,%r8
-	movq	%rcx,%r15
-
-	movl	240(%r15),%eax
-
-	movq	%r15,%r10
-	subq	%r14,%r10
-	andq	$0xfff,%r10
-	cmpq	$2304,%r10
-	jb	.Lcbc_do_ecopy
-	cmpq	$4096-248,%r10
-	jb	.Lcbc_skip_ecopy
-.align	4
-.Lcbc_do_ecopy:
-	movq	%r15,%rsi
-	leaq	80(%rsp),%rdi
-	leaq	80(%rsp),%r15
-	movl	$30,%ecx
-.long	0x90A548F3
-	movl	%eax,(%rdi)
-.Lcbc_skip_ecopy:
-	movq	%r15,0(%rsp)
-
-	movl	$18,%ecx
-.align	4
-.Lcbc_prefetch_te:
-	movq	0(%r14),%r10
-	movq	32(%r14),%r11
-	movq	64(%r14),%r12
-	movq	96(%r14),%r13
-	leaq	128(%r14),%r14
-	subl	$1,%ecx
-	jnz	.Lcbc_prefetch_te
-	leaq	-2304(%r14),%r14
-
-	cmpq	$0,%rbx
-	je	.LFAST_DECRYPT
-
-
-	movl	0(%rbp),%eax
-	movl	4(%rbp),%ebx
-	movl	8(%rbp),%ecx
-	movl	12(%rbp),%edx
-
-.align	4
-.Lcbc_fast_enc_loop:
-	xorl	0(%r8),%eax
-	xorl	4(%r8),%ebx
-	xorl	8(%r8),%ecx
-	xorl	12(%r8),%edx
-	movq	0(%rsp),%r15
-	movq	%r8,24(%rsp)
-
-	call	_x86_64_AES_encrypt
-
-	movq	24(%rsp),%r8
-	movq	40(%rsp),%r10
-	movl	%eax,0(%r9)
-	movl	%ebx,4(%r9)
-	movl	%ecx,8(%r9)
-	movl	%edx,12(%r9)
-
-	leaq	16(%r8),%r8
-	leaq	16(%r9),%r9
-	subq	$16,%r10
-	testq	$-16,%r10
-	movq	%r10,40(%rsp)
-	jnz	.Lcbc_fast_enc_loop
-	movq	56(%rsp),%rbp
-	movl	%eax,0(%rbp)
-	movl	%ebx,4(%rbp)
-	movl	%ecx,8(%rbp)
-	movl	%edx,12(%rbp)
-
-	jmp	.Lcbc_fast_cleanup
-
-
-.align	16
-.LFAST_DECRYPT:
-	cmpq	%r8,%r9
-	je	.Lcbc_fast_dec_in_place
-
-	movq	%rbp,64(%rsp)
-.align	4
-.Lcbc_fast_dec_loop:
-	movl	0(%r8),%eax
-	movl	4(%r8),%ebx
-	movl	8(%r8),%ecx
-	movl	12(%r8),%edx
-	movq	0(%rsp),%r15
-	movq	%r8,24(%rsp)
-
-	call	_x86_64_AES_decrypt
-
-	movq	64(%rsp),%rbp
-	movq	24(%rsp),%r8
-	movq	40(%rsp),%r10
-	xorl	0(%rbp),%eax
-	xorl	4(%rbp),%ebx
-	xorl	8(%rbp),%ecx
-	xorl	12(%rbp),%edx
-	movq	%r8,%rbp
-
-	subq	$16,%r10
-	movq	%r10,40(%rsp)
-	movq	%rbp,64(%rsp)
-
-	movl	%eax,0(%r9)
-	movl	%ebx,4(%r9)
-	movl	%ecx,8(%r9)
-	movl	%edx,12(%r9)
-
-	leaq	16(%r8),%r8
-	leaq	16(%r9),%r9
-	jnz	.Lcbc_fast_dec_loop
-	movq	56(%rsp),%r12
-	movq	0(%rbp),%r10
-	movq	8(%rbp),%r11
-	movq	%r10,0(%r12)
-	movq	%r11,8(%r12)
-	jmp	.Lcbc_fast_cleanup
-
-.align	16
-.Lcbc_fast_dec_in_place:
-	movq	0(%rbp),%r10
-	movq	8(%rbp),%r11
-	movq	%r10,0+64(%rsp)
-	movq	%r11,8+64(%rsp)
-.align	4
-.Lcbc_fast_dec_in_place_loop:
-	movl	0(%r8),%eax
-	movl	4(%r8),%ebx
-	movl	8(%r8),%ecx
-	movl	12(%r8),%edx
-	movq	0(%rsp),%r15
-	movq	%r8,24(%rsp)
-
-	call	_x86_64_AES_decrypt
-
-	movq	24(%rsp),%r8
-	movq	40(%rsp),%r10
-	xorl	0+64(%rsp),%eax
-	xorl	4+64(%rsp),%ebx
-	xorl	8+64(%rsp),%ecx
-	xorl	12+64(%rsp),%edx
-
-	movq	0(%r8),%r11
-	movq	8(%r8),%r12
-	subq	$16,%r10
-	jz	.Lcbc_fast_dec_in_place_done
-
-	movq	%r11,0+64(%rsp)
-	movq	%r12,8+64(%rsp)
-
-	movl	%eax,0(%r9)
-	movl	%ebx,4(%r9)
-	movl	%ecx,8(%r9)
-	movl	%edx,12(%r9)
-
-	leaq	16(%r8),%r8
-	leaq	16(%r9),%r9
-	movq	%r10,40(%rsp)
-	jmp	.Lcbc_fast_dec_in_place_loop
-.Lcbc_fast_dec_in_place_done:
-	movq	56(%rsp),%rdi
-	movq	%r11,0(%rdi)
-	movq	%r12,8(%rdi)
-
-	movl	%eax,0(%r9)
-	movl	%ebx,4(%r9)
-	movl	%ecx,8(%r9)
-	movl	%edx,12(%r9)
-
-.align	4
-.Lcbc_fast_cleanup:
-	cmpl	$0,80+240(%rsp)
-	leaq	80(%rsp),%rdi
-	je	.Lcbc_exit
-	movl	$30,%ecx
-	xorq	%rax,%rax
-.long	0x90AB48F3
-
-	jmp	.Lcbc_exit
-
-
-.align	16
-.Lcbc_slow_prologue:
-.cfi_restore_state	
-
-	leaq	-88(%rsp),%rbp
-	andq	$-64,%rbp
-
-	leaq	-88-63(%rcx),%r10
-	subq	%rbp,%r10
-	negq	%r10
-	andq	$0x3c0,%r10
-	subq	%r10,%rbp
-
-	xchgq	%rsp,%rbp
-.cfi_def_cfa_register	%rbp
-
-	movq	%rbp,16(%rsp)
-.cfi_escape	0x0f,0x05,0x77,0x10,0x06,0x23,0x40
-.Lcbc_slow_body:
-
-
-
-
-	movq	%r8,56(%rsp)
-	movq	%r8,%rbp
-	movq	%r9,%rbx
-	movq	%rsi,%r9
-	movq	%rdi,%r8
-	movq	%rcx,%r15
-	movq	%rdx,%r10
-
-	movl	240(%r15),%eax
-	movq	%r15,0(%rsp)
-	shll	$4,%eax
-	leaq	(%r15,%rax,1),%rax
-	movq	%rax,8(%rsp)
-
-
-	leaq	2048(%r14),%r14
-	leaq	768-8(%rsp),%rax
-	subq	%r14,%rax
-	andq	$0x300,%rax
-	leaq	(%r14,%rax,1),%r14
-
-	cmpq	$0,%rbx
-	je	.LSLOW_DECRYPT
-
-
-	testq	$-16,%r10
-	movl	0(%rbp),%eax
-	movl	4(%rbp),%ebx
-	movl	8(%rbp),%ecx
-	movl	12(%rbp),%edx
-	jz	.Lcbc_slow_enc_tail
-
-.align	4
-.Lcbc_slow_enc_loop:
-	xorl	0(%r8),%eax
-	xorl	4(%r8),%ebx
-	xorl	8(%r8),%ecx
-	xorl	12(%r8),%edx
-	movq	0(%rsp),%r15
-	movq	%r8,24(%rsp)
-	movq	%r9,32(%rsp)
-	movq	%r10,40(%rsp)
-
-	call	_x86_64_AES_encrypt_compact
-
-	movq	24(%rsp),%r8
-	movq	32(%rsp),%r9
-	movq	40(%rsp),%r10
-	movl	%eax,0(%r9)
-	movl	%ebx,4(%r9)
-	movl	%ecx,8(%r9)
-	movl	%edx,12(%r9)
-
-	leaq	16(%r8),%r8
-	leaq	16(%r9),%r9
-	subq	$16,%r10
-	testq	$-16,%r10
-	jnz	.Lcbc_slow_enc_loop
-	testq	$15,%r10
-	jnz	.Lcbc_slow_enc_tail
-	movq	56(%rsp),%rbp
-	movl	%eax,0(%rbp)
-	movl	%ebx,4(%rbp)
-	movl	%ecx,8(%rbp)
-	movl	%edx,12(%rbp)
-
-	jmp	.Lcbc_exit
-
-.align	4
-.Lcbc_slow_enc_tail:
-	movq	%rax,%r11
-	movq	%rcx,%r12
-	movq	%r10,%rcx
-	movq	%r8,%rsi
-	movq	%r9,%rdi
-.long	0x9066A4F3
-	movq	$16,%rcx
-	subq	%r10,%rcx
-	xorq	%rax,%rax
-.long	0x9066AAF3
-	movq	%r9,%r8
-	movq	$16,%r10
-	movq	%r11,%rax
-	movq	%r12,%rcx
-	jmp	.Lcbc_slow_enc_loop
-
-.align	16
-.LSLOW_DECRYPT:
-	shrq	$3,%rax
-	addq	%rax,%r14
-
-	movq	0(%rbp),%r11
-	movq	8(%rbp),%r12
-	movq	%r11,0+64(%rsp)
-	movq	%r12,8+64(%rsp)
-
-.align	4
-.Lcbc_slow_dec_loop:
-	movl	0(%r8),%eax
-	movl	4(%r8),%ebx
-	movl	8(%r8),%ecx
-	movl	12(%r8),%edx
-	movq	0(%rsp),%r15
-	movq	%r8,24(%rsp)
-	movq	%r9,32(%rsp)
-	movq	%r10,40(%rsp)
-
-	call	_x86_64_AES_decrypt_compact
-
-	movq	24(%rsp),%r8
-	movq	32(%rsp),%r9
-	movq	40(%rsp),%r10
-	xorl	0+64(%rsp),%eax
-	xorl	4+64(%rsp),%ebx
-	xorl	8+64(%rsp),%ecx
-	xorl	12+64(%rsp),%edx
-
-	movq	0(%r8),%r11
-	movq	8(%r8),%r12
-	subq	$16,%r10
-	jc	.Lcbc_slow_dec_partial
-	jz	.Lcbc_slow_dec_done
-
-	movq	%r11,0+64(%rsp)
-	movq	%r12,8+64(%rsp)
-
-	movl	%eax,0(%r9)
-	movl	%ebx,4(%r9)
-	movl	%ecx,8(%r9)
-	movl	%edx,12(%r9)
-
-	leaq	16(%r8),%r8
-	leaq	16(%r9),%r9
-	jmp	.Lcbc_slow_dec_loop
-.Lcbc_slow_dec_done:
-	movq	56(%rsp),%rdi
-	movq	%r11,0(%rdi)
-	movq	%r12,8(%rdi)
-
-	movl	%eax,0(%r9)
-	movl	%ebx,4(%r9)
-	movl	%ecx,8(%r9)
-	movl	%edx,12(%r9)
-
-	jmp	.Lcbc_exit
-
-.align	4
-.Lcbc_slow_dec_partial:
-	movq	56(%rsp),%rdi
-	movq	%r11,0(%rdi)
-	movq	%r12,8(%rdi)
-
-	movl	%eax,0+64(%rsp)
-	movl	%ebx,4+64(%rsp)
-	movl	%ecx,8+64(%rsp)
-	movl	%edx,12+64(%rsp)
-
-	movq	%r9,%rdi
-	leaq	64(%rsp),%rsi
-	leaq	16(%r10),%rcx
-.long	0x9066A4F3
-	jmp	.Lcbc_exit
-
-.align	16
-.Lcbc_exit:
-	movq	16(%rsp),%rsi
-.cfi_def_cfa	%rsi,64
-	movq	(%rsi),%r15
-.cfi_restore	%r15
-	movq	8(%rsi),%r14
-.cfi_restore	%r14
-	movq	16(%rsi),%r13
-.cfi_restore	%r13
-	movq	24(%rsi),%r12
-.cfi_restore	%r12
-	movq	32(%rsi),%rbp
-.cfi_restore	%rbp
-	movq	40(%rsi),%rbx
-.cfi_restore	%rbx
-	leaq	48(%rsi),%rsp
-.cfi_def_cfa	%rsp,16
-.Lcbc_popfq:
-	popfq
-
-
-.cfi_adjust_cfa_offset	-8
-.Lcbc_epilogue:
-	.byte	0xf3,0xc3
-.cfi_endproc	
-.size	AES_cbc_encrypt,.-AES_cbc_encrypt
-.align	64
-.LAES_Te:
-.long	0xa56363c6,0xa56363c6
-.long	0x847c7cf8,0x847c7cf8
-.long	0x997777ee,0x997777ee
-.long	0x8d7b7bf6,0x8d7b7bf6
-.long	0x0df2f2ff,0x0df2f2ff
-.long	0xbd6b6bd6,0xbd6b6bd6
-.long	0xb16f6fde,0xb16f6fde
-.long	0x54c5c591,0x54c5c591
-.long	0x50303060,0x50303060
-.long	0x03010102,0x03010102
-.long	0xa96767ce,0xa96767ce
-.long	0x7d2b2b56,0x7d2b2b56
-.long	0x19fefee7,0x19fefee7
-.long	0x62d7d7b5,0x62d7d7b5
-.long	0xe6abab4d,0xe6abab4d
-.long	0x9a7676ec,0x9a7676ec
-.long	0x45caca8f,0x45caca8f
-.long	0x9d82821f,0x9d82821f
-.long	0x40c9c989,0x40c9c989
-.long	0x877d7dfa,0x877d7dfa
-.long	0x15fafaef,0x15fafaef
-.long	0xeb5959b2,0xeb5959b2
-.long	0xc947478e,0xc947478e
-.long	0x0bf0f0fb,0x0bf0f0fb
-.long	0xecadad41,0xecadad41
-.long	0x67d4d4b3,0x67d4d4b3
-.long	0xfda2a25f,0xfda2a25f
-.long	0xeaafaf45,0xeaafaf45
-.long	0xbf9c9c23,0xbf9c9c23
-.long	0xf7a4a453,0xf7a4a453
-.long	0x967272e4,0x967272e4
-.long	0x5bc0c09b,0x5bc0c09b
-.long	0xc2b7b775,0xc2b7b775
-.long	0x1cfdfde1,0x1cfdfde1
-.long	0xae93933d,0xae93933d
-.long	0x6a26264c,0x6a26264c
-.long	0x5a36366c,0x5a36366c
-.long	0x413f3f7e,0x413f3f7e
-.long	0x02f7f7f5,0x02f7f7f5
-.long	0x4fcccc83,0x4fcccc83
-.long	0x5c343468,0x5c343468
-.long	0xf4a5a551,0xf4a5a551
-.long	0x34e5e5d1,0x34e5e5d1
-.long	0x08f1f1f9,0x08f1f1f9
-.long	0x937171e2,0x937171e2
-.long	0x73d8d8ab,0x73d8d8ab
-.long	0x53313162,0x53313162
-.long	0x3f15152a,0x3f15152a
-.long	0x0c040408,0x0c040408
-.long	0x52c7c795,0x52c7c795
-.long	0x65232346,0x65232346
-.long	0x5ec3c39d,0x5ec3c39d
-.long	0x28181830,0x28181830
-.long	0xa1969637,0xa1969637
-.long	0x0f05050a,0x0f05050a
-.long	0xb59a9a2f,0xb59a9a2f
-.long	0x0907070e,0x0907070e
-.long	0x36121224,0x36121224
-.long	0x9b80801b,0x9b80801b
-.long	0x3de2e2df,0x3de2e2df
-.long	0x26ebebcd,0x26ebebcd
-.long	0x6927274e,0x6927274e
-.long	0xcdb2b27f,0xcdb2b27f
-.long	0x9f7575ea,0x9f7575ea
-.long	0x1b090912,0x1b090912
-.long	0x9e83831d,0x9e83831d
-.long	0x742c2c58,0x742c2c58
-.long	0x2e1a1a34,0x2e1a1a34
-.long	0x2d1b1b36,0x2d1b1b36
-.long	0xb26e6edc,0xb26e6edc
-.long	0xee5a5ab4,0xee5a5ab4
-.long	0xfba0a05b,0xfba0a05b
-.long	0xf65252a4,0xf65252a4
-.long	0x4d3b3b76,0x4d3b3b76
-.long	0x61d6d6b7,0x61d6d6b7
-.long	0xceb3b37d,0xceb3b37d
-.long	0x7b292952,0x7b292952
-.long	0x3ee3e3dd,0x3ee3e3dd
-.long	0x712f2f5e,0x712f2f5e
-.long	0x97848413,0x97848413
-.long	0xf55353a6,0xf55353a6
-.long	0x68d1d1b9,0x68d1d1b9
-.long	0x00000000,0x00000000
-.long	0x2cededc1,0x2cededc1
-.long	0x60202040,0x60202040
-.long	0x1ffcfce3,0x1ffcfce3
-.long	0xc8b1b179,0xc8b1b179
-.long	0xed5b5bb6,0xed5b5bb6
-.long	0xbe6a6ad4,0xbe6a6ad4
-.long	0x46cbcb8d,0x46cbcb8d
-.long	0xd9bebe67,0xd9bebe67
-.long	0x4b393972,0x4b393972
-.long	0xde4a4a94,0xde4a4a94
-.long	0xd44c4c98,0xd44c4c98
-.long	0xe85858b0,0xe85858b0
-.long	0x4acfcf85,0x4acfcf85
-.long	0x6bd0d0bb,0x6bd0d0bb
-.long	0x2aefefc5,0x2aefefc5
-.long	0xe5aaaa4f,0xe5aaaa4f
-.long	0x16fbfbed,0x16fbfbed
-.long	0xc5434386,0xc5434386
-.long	0xd74d4d9a,0xd74d4d9a
-.long	0x55333366,0x55333366
-.long	0x94858511,0x94858511
-.long	0xcf45458a,0xcf45458a
-.long	0x10f9f9e9,0x10f9f9e9
-.long	0x06020204,0x06020204
-.long	0x817f7ffe,0x817f7ffe
-.long	0xf05050a0,0xf05050a0
-.long	0x443c3c78,0x443c3c78
-.long	0xba9f9f25,0xba9f9f25
-.long	0xe3a8a84b,0xe3a8a84b
-.long	0xf35151a2,0xf35151a2
-.long	0xfea3a35d,0xfea3a35d
-.long	0xc0404080,0xc0404080
-.long	0x8a8f8f05,0x8a8f8f05
-.long	0xad92923f,0xad92923f
-.long	0xbc9d9d21,0xbc9d9d21
-.long	0x48383870,0x48383870
-.long	0x04f5f5f1,0x04f5f5f1
-.long	0xdfbcbc63,0xdfbcbc63
-.long	0xc1b6b677,0xc1b6b677
-.long	0x75dadaaf,0x75dadaaf
-.long	0x63212142,0x63212142
-.long	0x30101020,0x30101020
-.long	0x1affffe5,0x1affffe5
-.long	0x0ef3f3fd,0x0ef3f3fd
-.long	0x6dd2d2bf,0x6dd2d2bf
-.long	0x4ccdcd81,0x4ccdcd81
-.long	0x140c0c18,0x140c0c18
-.long	0x35131326,0x35131326
-.long	0x2fececc3,0x2fececc3
-.long	0xe15f5fbe,0xe15f5fbe
-.long	0xa2979735,0xa2979735
-.long	0xcc444488,0xcc444488
-.long	0x3917172e,0x3917172e
-.long	0x57c4c493,0x57c4c493
-.long	0xf2a7a755,0xf2a7a755
-.long	0x827e7efc,0x827e7efc
-.long	0x473d3d7a,0x473d3d7a
-.long	0xac6464c8,0xac6464c8
-.long	0xe75d5dba,0xe75d5dba
-.long	0x2b191932,0x2b191932
-.long	0x957373e6,0x957373e6
-.long	0xa06060c0,0xa06060c0
-.long	0x98818119,0x98818119
-.long	0xd14f4f9e,0xd14f4f9e
-.long	0x7fdcdca3,0x7fdcdca3
-.long	0x66222244,0x66222244
-.long	0x7e2a2a54,0x7e2a2a54
-.long	0xab90903b,0xab90903b
-.long	0x8388880b,0x8388880b
-.long	0xca46468c,0xca46468c
-.long	0x29eeeec7,0x29eeeec7
-.long	0xd3b8b86b,0xd3b8b86b
-.long	0x3c141428,0x3c141428
-.long	0x79dedea7,0x79dedea7
-.long	0xe25e5ebc,0xe25e5ebc
-.long	0x1d0b0b16,0x1d0b0b16
-.long	0x76dbdbad,0x76dbdbad
-.long	0x3be0e0db,0x3be0e0db
-.long	0x56323264,0x56323264
-.long	0x4e3a3a74,0x4e3a3a74
-.long	0x1e0a0a14,0x1e0a0a14
-.long	0xdb494992,0xdb494992
-.long	0x0a06060c,0x0a06060c
-.long	0x6c242448,0x6c242448
-.long	0xe45c5cb8,0xe45c5cb8
-.long	0x5dc2c29f,0x5dc2c29f
-.long	0x6ed3d3bd,0x6ed3d3bd
-.long	0xefacac43,0xefacac43
-.long	0xa66262c4,0xa66262c4
-.long	0xa8919139,0xa8919139
-.long	0xa4959531,0xa4959531
-.long	0x37e4e4d3,0x37e4e4d3
-.long	0x8b7979f2,0x8b7979f2
-.long	0x32e7e7d5,0x32e7e7d5
-.long	0x43c8c88b,0x43c8c88b
-.long	0x5937376e,0x5937376e
-.long	0xb76d6dda,0xb76d6dda
-.long	0x8c8d8d01,0x8c8d8d01
-.long	0x64d5d5b1,0x64d5d5b1
-.long	0xd24e4e9c,0xd24e4e9c
-.long	0xe0a9a949,0xe0a9a949
-.long	0xb46c6cd8,0xb46c6cd8
-.long	0xfa5656ac,0xfa5656ac
-.long	0x07f4f4f3,0x07f4f4f3
-.long	0x25eaeacf,0x25eaeacf
-.long	0xaf6565ca,0xaf6565ca
-.long	0x8e7a7af4,0x8e7a7af4
-.long	0xe9aeae47,0xe9aeae47
-.long	0x18080810,0x18080810
-.long	0xd5baba6f,0xd5baba6f
-.long	0x887878f0,0x887878f0
-.long	0x6f25254a,0x6f25254a
-.long	0x722e2e5c,0x722e2e5c
-.long	0x241c1c38,0x241c1c38
-.long	0xf1a6a657,0xf1a6a657
-.long	0xc7b4b473,0xc7b4b473
-.long	0x51c6c697,0x51c6c697
-.long	0x23e8e8cb,0x23e8e8cb
-.long	0x7cdddda1,0x7cdddda1
-.long	0x9c7474e8,0x9c7474e8
-.long	0x211f1f3e,0x211f1f3e
-.long	0xdd4b4b96,0xdd4b4b96
-.long	0xdcbdbd61,0xdcbdbd61
-.long	0x868b8b0d,0x868b8b0d
-.long	0x858a8a0f,0x858a8a0f
-.long	0x907070e0,0x907070e0
-.long	0x423e3e7c,0x423e3e7c
-.long	0xc4b5b571,0xc4b5b571
-.long	0xaa6666cc,0xaa6666cc
-.long	0xd8484890,0xd8484890
-.long	0x05030306,0x05030306
-.long	0x01f6f6f7,0x01f6f6f7
-.long	0x120e0e1c,0x120e0e1c
-.long	0xa36161c2,0xa36161c2
-.long	0x5f35356a,0x5f35356a
-.long	0xf95757ae,0xf95757ae
-.long	0xd0b9b969,0xd0b9b969
-.long	0x91868617,0x91868617
-.long	0x58c1c199,0x58c1c199
-.long	0x271d1d3a,0x271d1d3a
-.long	0xb99e9e27,0xb99e9e27
-.long	0x38e1e1d9,0x38e1e1d9
-.long	0x13f8f8eb,0x13f8f8eb
-.long	0xb398982b,0xb398982b
-.long	0x33111122,0x33111122
-.long	0xbb6969d2,0xbb6969d2
-.long	0x70d9d9a9,0x70d9d9a9
-.long	0x898e8e07,0x898e8e07
-.long	0xa7949433,0xa7949433
-.long	0xb69b9b2d,0xb69b9b2d
-.long	0x221e1e3c,0x221e1e3c
-.long	0x92878715,0x92878715
-.long	0x20e9e9c9,0x20e9e9c9
-.long	0x49cece87,0x49cece87
-.long	0xff5555aa,0xff5555aa
-.long	0x78282850,0x78282850
-.long	0x7adfdfa5,0x7adfdfa5
-.long	0x8f8c8c03,0x8f8c8c03
-.long	0xf8a1a159,0xf8a1a159
-.long	0x80898909,0x80898909
-.long	0x170d0d1a,0x170d0d1a
-.long	0xdabfbf65,0xdabfbf65
-.long	0x31e6e6d7,0x31e6e6d7
-.long	0xc6424284,0xc6424284
-.long	0xb86868d0,0xb86868d0
-.long	0xc3414182,0xc3414182
-.long	0xb0999929,0xb0999929
-.long	0x772d2d5a,0x772d2d5a
-.long	0x110f0f1e,0x110f0f1e
-.long	0xcbb0b07b,0xcbb0b07b
-.long	0xfc5454a8,0xfc5454a8
-.long	0xd6bbbb6d,0xd6bbbb6d
-.long	0x3a16162c,0x3a16162c
-.byte	0x63,0x7c,0x77,0x7b,0xf2,0x6b,0x6f,0xc5
-.byte	0x30,0x01,0x67,0x2b,0xfe,0xd7,0xab,0x76
-.byte	0xca,0x82,0xc9,0x7d,0xfa,0x59,0x47,0xf0
-.byte	0xad,0xd4,0xa2,0xaf,0x9c,0xa4,0x72,0xc0
-.byte	0xb7,0xfd,0x93,0x26,0x36,0x3f,0xf7,0xcc
-.byte	0x34,0xa5,0xe5,0xf1,0x71,0xd8,0x31,0x15
-.byte	0x04,0xc7,0x23,0xc3,0x18,0x96,0x05,0x9a
-.byte	0x07,0x12,0x80,0xe2,0xeb,0x27,0xb2,0x75
-.byte	0x09,0x83,0x2c,0x1a,0x1b,0x6e,0x5a,0xa0
-.byte	0x52,0x3b,0xd6,0xb3,0x29,0xe3,0x2f,0x84
-.byte	0x53,0xd1,0x00,0xed,0x20,0xfc,0xb1,0x5b
-.byte	0x6a,0xcb,0xbe,0x39,0x4a,0x4c,0x58,0xcf
-.byte	0xd0,0xef,0xaa,0xfb,0x43,0x4d,0x33,0x85
-.byte	0x45,0xf9,0x02,0x7f,0x50,0x3c,0x9f,0xa8
-.byte	0x51,0xa3,0x40,0x8f,0x92,0x9d,0x38,0xf5
-.byte	0xbc,0xb6,0xda,0x21,0x10,0xff,0xf3,0xd2
-.byte	0xcd,0x0c,0x13,0xec,0x5f,0x97,0x44,0x17
-.byte	0xc4,0xa7,0x7e,0x3d,0x64,0x5d,0x19,0x73
-.byte	0x60,0x81,0x4f,0xdc,0x22,0x2a,0x90,0x88
-.byte	0x46,0xee,0xb8,0x14,0xde,0x5e,0x0b,0xdb
-.byte	0xe0,0x32,0x3a,0x0a,0x49,0x06,0x24,0x5c
-.byte	0xc2,0xd3,0xac,0x62,0x91,0x95,0xe4,0x79
-.byte	0xe7,0xc8,0x37,0x6d,0x8d,0xd5,0x4e,0xa9
-.byte	0x6c,0x56,0xf4,0xea,0x65,0x7a,0xae,0x08
-.byte	0xba,0x78,0x25,0x2e,0x1c,0xa6,0xb4,0xc6
-.byte	0xe8,0xdd,0x74,0x1f,0x4b,0xbd,0x8b,0x8a
-.byte	0x70,0x3e,0xb5,0x66,0x48,0x03,0xf6,0x0e
-.byte	0x61,0x35,0x57,0xb9,0x86,0xc1,0x1d,0x9e
-.byte	0xe1,0xf8,0x98,0x11,0x69,0xd9,0x8e,0x94
-.byte	0x9b,0x1e,0x87,0xe9,0xce,0x55,0x28,0xdf
-.byte	0x8c,0xa1,0x89,0x0d,0xbf,0xe6,0x42,0x68
-.byte	0x41,0x99,0x2d,0x0f,0xb0,0x54,0xbb,0x16
-.byte	0x63,0x7c,0x77,0x7b,0xf2,0x6b,0x6f,0xc5
-.byte	0x30,0x01,0x67,0x2b,0xfe,0xd7,0xab,0x76
-.byte	0xca,0x82,0xc9,0x7d,0xfa,0x59,0x47,0xf0
-.byte	0xad,0xd4,0xa2,0xaf,0x9c,0xa4,0x72,0xc0
-.byte	0xb7,0xfd,0x93,0x26,0x36,0x3f,0xf7,0xcc
-.byte	0x34,0xa5,0xe5,0xf1,0x71,0xd8,0x31,0x15
-.byte	0x04,0xc7,0x23,0xc3,0x18,0x96,0x05,0x9a
-.byte	0x07,0x12,0x80,0xe2,0xeb,0x27,0xb2,0x75
-.byte	0x09,0x83,0x2c,0x1a,0x1b,0x6e,0x5a,0xa0
-.byte	0x52,0x3b,0xd6,0xb3,0x29,0xe3,0x2f,0x84
-.byte	0x53,0xd1,0x00,0xed,0x20,0xfc,0xb1,0x5b
-.byte	0x6a,0xcb,0xbe,0x39,0x4a,0x4c,0x58,0xcf
-.byte	0xd0,0xef,0xaa,0xfb,0x43,0x4d,0x33,0x85
-.byte	0x45,0xf9,0x02,0x7f,0x50,0x3c,0x9f,0xa8
-.byte	0x51,0xa3,0x40,0x8f,0x92,0x9d,0x38,0xf5
-.byte	0xbc,0xb6,0xda,0x21,0x10,0xff,0xf3,0xd2
-.byte	0xcd,0x0c,0x13,0xec,0x5f,0x97,0x44,0x17
-.byte	0xc4,0xa7,0x7e,0x3d,0x64,0x5d,0x19,0x73
-.byte	0x60,0x81,0x4f,0xdc,0x22,0x2a,0x90,0x88
-.byte	0x46,0xee,0xb8,0x14,0xde,0x5e,0x0b,0xdb
-.byte	0xe0,0x32,0x3a,0x0a,0x49,0x06,0x24,0x5c
-.byte	0xc2,0xd3,0xac,0x62,0x91,0x95,0xe4,0x79
-.byte	0xe7,0xc8,0x37,0x6d,0x8d,0xd5,0x4e,0xa9
-.byte	0x6c,0x56,0xf4,0xea,0x65,0x7a,0xae,0x08
-.byte	0xba,0x78,0x25,0x2e,0x1c,0xa6,0xb4,0xc6
-.byte	0xe8,0xdd,0x74,0x1f,0x4b,0xbd,0x8b,0x8a
-.byte	0x70,0x3e,0xb5,0x66,0x48,0x03,0xf6,0x0e
-.byte	0x61,0x35,0x57,0xb9,0x86,0xc1,0x1d,0x9e
-.byte	0xe1,0xf8,0x98,0x11,0x69,0xd9,0x8e,0x94
-.byte	0x9b,0x1e,0x87,0xe9,0xce,0x55,0x28,0xdf
-.byte	0x8c,0xa1,0x89,0x0d,0xbf,0xe6,0x42,0x68
-.byte	0x41,0x99,0x2d,0x0f,0xb0,0x54,0xbb,0x16
-.byte	0x63,0x7c,0x77,0x7b,0xf2,0x6b,0x6f,0xc5
-.byte	0x30,0x01,0x67,0x2b,0xfe,0xd7,0xab,0x76
-.byte	0xca,0x82,0xc9,0x7d,0xfa,0x59,0x47,0xf0
-.byte	0xad,0xd4,0xa2,0xaf,0x9c,0xa4,0x72,0xc0
-.byte	0xb7,0xfd,0x93,0x26,0x36,0x3f,0xf7,0xcc
-.byte	0x34,0xa5,0xe5,0xf1,0x71,0xd8,0x31,0x15
-.byte	0x04,0xc7,0x23,0xc3,0x18,0x96,0x05,0x9a
-.byte	0x07,0x12,0x80,0xe2,0xeb,0x27,0xb2,0x75
-.byte	0x09,0x83,0x2c,0x1a,0x1b,0x6e,0x5a,0xa0
-.byte	0x52,0x3b,0xd6,0xb3,0x29,0xe3,0x2f,0x84
-.byte	0x53,0xd1,0x00,0xed,0x20,0xfc,0xb1,0x5b
-.byte	0x6a,0xcb,0xbe,0x39,0x4a,0x4c,0x58,0xcf
-.byte	0xd0,0xef,0xaa,0xfb,0x43,0x4d,0x33,0x85
-.byte	0x45,0xf9,0x02,0x7f,0x50,0x3c,0x9f,0xa8
-.byte	0x51,0xa3,0x40,0x8f,0x92,0x9d,0x38,0xf5
-.byte	0xbc,0xb6,0xda,0x21,0x10,0xff,0xf3,0xd2
-.byte	0xcd,0x0c,0x13,0xec,0x5f,0x97,0x44,0x17
-.byte	0xc4,0xa7,0x7e,0x3d,0x64,0x5d,0x19,0x73
-.byte	0x60,0x81,0x4f,0xdc,0x22,0x2a,0x90,0x88
-.byte	0x46,0xee,0xb8,0x14,0xde,0x5e,0x0b,0xdb
-.byte	0xe0,0x32,0x3a,0x0a,0x49,0x06,0x24,0x5c
-.byte	0xc2,0xd3,0xac,0x62,0x91,0x95,0xe4,0x79
-.byte	0xe7,0xc8,0x37,0x6d,0x8d,0xd5,0x4e,0xa9
-.byte	0x6c,0x56,0xf4,0xea,0x65,0x7a,0xae,0x08
-.byte	0xba,0x78,0x25,0x2e,0x1c,0xa6,0xb4,0xc6
-.byte	0xe8,0xdd,0x74,0x1f,0x4b,0xbd,0x8b,0x8a
-.byte	0x70,0x3e,0xb5,0x66,0x48,0x03,0xf6,0x0e
-.byte	0x61,0x35,0x57,0xb9,0x86,0xc1,0x1d,0x9e
-.byte	0xe1,0xf8,0x98,0x11,0x69,0xd9,0x8e,0x94
-.byte	0x9b,0x1e,0x87,0xe9,0xce,0x55,0x28,0xdf
-.byte	0x8c,0xa1,0x89,0x0d,0xbf,0xe6,0x42,0x68
-.byte	0x41,0x99,0x2d,0x0f,0xb0,0x54,0xbb,0x16
-.byte	0x63,0x7c,0x77,0x7b,0xf2,0x6b,0x6f,0xc5
-.byte	0x30,0x01,0x67,0x2b,0xfe,0xd7,0xab,0x76
-.byte	0xca,0x82,0xc9,0x7d,0xfa,0x59,0x47,0xf0
-.byte	0xad,0xd4,0xa2,0xaf,0x9c,0xa4,0x72,0xc0
-.byte	0xb7,0xfd,0x93,0x26,0x36,0x3f,0xf7,0xcc
-.byte	0x34,0xa5,0xe5,0xf1,0x71,0xd8,0x31,0x15
-.byte	0x04,0xc7,0x23,0xc3,0x18,0x96,0x05,0x9a
-.byte	0x07,0x12,0x80,0xe2,0xeb,0x27,0xb2,0x75
-.byte	0x09,0x83,0x2c,0x1a,0x1b,0x6e,0x5a,0xa0
-.byte	0x52,0x3b,0xd6,0xb3,0x29,0xe3,0x2f,0x84
-.byte	0x53,0xd1,0x00,0xed,0x20,0xfc,0xb1,0x5b
-.byte	0x6a,0xcb,0xbe,0x39,0x4a,0x4c,0x58,0xcf
-.byte	0xd0,0xef,0xaa,0xfb,0x43,0x4d,0x33,0x85
-.byte	0x45,0xf9,0x02,0x7f,0x50,0x3c,0x9f,0xa8
-.byte	0x51,0xa3,0x40,0x8f,0x92,0x9d,0x38,0xf5
-.byte	0xbc,0xb6,0xda,0x21,0x10,0xff,0xf3,0xd2
-.byte	0xcd,0x0c,0x13,0xec,0x5f,0x97,0x44,0x17
-.byte	0xc4,0xa7,0x7e,0x3d,0x64,0x5d,0x19,0x73
-.byte	0x60,0x81,0x4f,0xdc,0x22,0x2a,0x90,0x88
-.byte	0x46,0xee,0xb8,0x14,0xde,0x5e,0x0b,0xdb
-.byte	0xe0,0x32,0x3a,0x0a,0x49,0x06,0x24,0x5c
-.byte	0xc2,0xd3,0xac,0x62,0x91,0x95,0xe4,0x79
-.byte	0xe7,0xc8,0x37,0x6d,0x8d,0xd5,0x4e,0xa9
-.byte	0x6c,0x56,0xf4,0xea,0x65,0x7a,0xae,0x08
-.byte	0xba,0x78,0x25,0x2e,0x1c,0xa6,0xb4,0xc6
-.byte	0xe8,0xdd,0x74,0x1f,0x4b,0xbd,0x8b,0x8a
-.byte	0x70,0x3e,0xb5,0x66,0x48,0x03,0xf6,0x0e
-.byte	0x61,0x35,0x57,0xb9,0x86,0xc1,0x1d,0x9e
-.byte	0xe1,0xf8,0x98,0x11,0x69,0xd9,0x8e,0x94
-.byte	0x9b,0x1e,0x87,0xe9,0xce,0x55,0x28,0xdf
-.byte	0x8c,0xa1,0x89,0x0d,0xbf,0xe6,0x42,0x68
-.byte	0x41,0x99,0x2d,0x0f,0xb0,0x54,0xbb,0x16
-.long	0x00000001, 0x00000002, 0x00000004, 0x00000008
-.long	0x00000010, 0x00000020, 0x00000040, 0x00000080
-.long	0x0000001b, 0x00000036, 0x80808080, 0x80808080
-.long	0xfefefefe, 0xfefefefe, 0x1b1b1b1b, 0x1b1b1b1b
-.align	64
-.LAES_Td:
-.long	0x50a7f451,0x50a7f451
-.long	0x5365417e,0x5365417e
-.long	0xc3a4171a,0xc3a4171a
-.long	0x965e273a,0x965e273a
-.long	0xcb6bab3b,0xcb6bab3b
-.long	0xf1459d1f,0xf1459d1f
-.long	0xab58faac,0xab58faac
-.long	0x9303e34b,0x9303e34b
-.long	0x55fa3020,0x55fa3020
-.long	0xf66d76ad,0xf66d76ad
-.long	0x9176cc88,0x9176cc88
-.long	0x254c02f5,0x254c02f5
-.long	0xfcd7e54f,0xfcd7e54f
-.long	0xd7cb2ac5,0xd7cb2ac5
-.long	0x80443526,0x80443526
-.long	0x8fa362b5,0x8fa362b5
-.long	0x495ab1de,0x495ab1de
-.long	0x671bba25,0x671bba25
-.long	0x980eea45,0x980eea45
-.long	0xe1c0fe5d,0xe1c0fe5d
-.long	0x02752fc3,0x02752fc3
-.long	0x12f04c81,0x12f04c81
-.long	0xa397468d,0xa397468d
-.long	0xc6f9d36b,0xc6f9d36b
-.long	0xe75f8f03,0xe75f8f03
-.long	0x959c9215,0x959c9215
-.long	0xeb7a6dbf,0xeb7a6dbf
-.long	0xda595295,0xda595295
-.long	0x2d83bed4,0x2d83bed4
-.long	0xd3217458,0xd3217458
-.long	0x2969e049,0x2969e049
-.long	0x44c8c98e,0x44c8c98e
-.long	0x6a89c275,0x6a89c275
-.long	0x78798ef4,0x78798ef4
-.long	0x6b3e5899,0x6b3e5899
-.long	0xdd71b927,0xdd71b927
-.long	0xb64fe1be,0xb64fe1be
-.long	0x17ad88f0,0x17ad88f0
-.long	0x66ac20c9,0x66ac20c9
-.long	0xb43ace7d,0xb43ace7d
-.long	0x184adf63,0x184adf63
-.long	0x82311ae5,0x82311ae5
-.long	0x60335197,0x60335197
-.long	0x457f5362,0x457f5362
-.long	0xe07764b1,0xe07764b1
-.long	0x84ae6bbb,0x84ae6bbb
-.long	0x1ca081fe,0x1ca081fe
-.long	0x942b08f9,0x942b08f9
-.long	0x58684870,0x58684870
-.long	0x19fd458f,0x19fd458f
-.long	0x876cde94,0x876cde94
-.long	0xb7f87b52,0xb7f87b52
-.long	0x23d373ab,0x23d373ab
-.long	0xe2024b72,0xe2024b72
-.long	0x578f1fe3,0x578f1fe3
-.long	0x2aab5566,0x2aab5566
-.long	0x0728ebb2,0x0728ebb2
-.long	0x03c2b52f,0x03c2b52f
-.long	0x9a7bc586,0x9a7bc586
-.long	0xa50837d3,0xa50837d3
-.long	0xf2872830,0xf2872830
-.long	0xb2a5bf23,0xb2a5bf23
-.long	0xba6a0302,0xba6a0302
-.long	0x5c8216ed,0x5c8216ed
-.long	0x2b1ccf8a,0x2b1ccf8a
-.long	0x92b479a7,0x92b479a7
-.long	0xf0f207f3,0xf0f207f3
-.long	0xa1e2694e,0xa1e2694e
-.long	0xcdf4da65,0xcdf4da65
-.long	0xd5be0506,0xd5be0506
-.long	0x1f6234d1,0x1f6234d1
-.long	0x8afea6c4,0x8afea6c4
-.long	0x9d532e34,0x9d532e34
-.long	0xa055f3a2,0xa055f3a2
-.long	0x32e18a05,0x32e18a05
-.long	0x75ebf6a4,0x75ebf6a4
-.long	0x39ec830b,0x39ec830b
-.long	0xaaef6040,0xaaef6040
-.long	0x069f715e,0x069f715e
-.long	0x51106ebd,0x51106ebd
-.long	0xf98a213e,0xf98a213e
-.long	0x3d06dd96,0x3d06dd96
-.long	0xae053edd,0xae053edd
-.long	0x46bde64d,0x46bde64d
-.long	0xb58d5491,0xb58d5491
-.long	0x055dc471,0x055dc471
-.long	0x6fd40604,0x6fd40604
-.long	0xff155060,0xff155060
-.long	0x24fb9819,0x24fb9819
-.long	0x97e9bdd6,0x97e9bdd6
-.long	0xcc434089,0xcc434089
-.long	0x779ed967,0x779ed967
-.long	0xbd42e8b0,0xbd42e8b0
-.long	0x888b8907,0x888b8907
-.long	0x385b19e7,0x385b19e7
-.long	0xdbeec879,0xdbeec879
-.long	0x470a7ca1,0x470a7ca1
-.long	0xe90f427c,0xe90f427c
-.long	0xc91e84f8,0xc91e84f8
-.long	0x00000000,0x00000000
-.long	0x83868009,0x83868009
-.long	0x48ed2b32,0x48ed2b32
-.long	0xac70111e,0xac70111e
-.long	0x4e725a6c,0x4e725a6c
-.long	0xfbff0efd,0xfbff0efd
-.long	0x5638850f,0x5638850f
-.long	0x1ed5ae3d,0x1ed5ae3d
-.long	0x27392d36,0x27392d36
-.long	0x64d90f0a,0x64d90f0a
-.long	0x21a65c68,0x21a65c68
-.long	0xd1545b9b,0xd1545b9b
-.long	0x3a2e3624,0x3a2e3624
-.long	0xb1670a0c,0xb1670a0c
-.long	0x0fe75793,0x0fe75793
-.long	0xd296eeb4,0xd296eeb4
-.long	0x9e919b1b,0x9e919b1b
-.long	0x4fc5c080,0x4fc5c080
-.long	0xa220dc61,0xa220dc61
-.long	0x694b775a,0x694b775a
-.long	0x161a121c,0x161a121c
-.long	0x0aba93e2,0x0aba93e2
-.long	0xe52aa0c0,0xe52aa0c0
-.long	0x43e0223c,0x43e0223c
-.long	0x1d171b12,0x1d171b12
-.long	0x0b0d090e,0x0b0d090e
-.long	0xadc78bf2,0xadc78bf2
-.long	0xb9a8b62d,0xb9a8b62d
-.long	0xc8a91e14,0xc8a91e14
-.long	0x8519f157,0x8519f157
-.long	0x4c0775af,0x4c0775af
-.long	0xbbdd99ee,0xbbdd99ee
-.long	0xfd607fa3,0xfd607fa3
-.long	0x9f2601f7,0x9f2601f7
-.long	0xbcf5725c,0xbcf5725c
-.long	0xc53b6644,0xc53b6644
-.long	0x347efb5b,0x347efb5b
-.long	0x7629438b,0x7629438b
-.long	0xdcc623cb,0xdcc623cb
-.long	0x68fcedb6,0x68fcedb6
-.long	0x63f1e4b8,0x63f1e4b8
-.long	0xcadc31d7,0xcadc31d7
-.long	0x10856342,0x10856342
-.long	0x40229713,0x40229713
-.long	0x2011c684,0x2011c684
-.long	0x7d244a85,0x7d244a85
-.long	0xf83dbbd2,0xf83dbbd2
-.long	0x1132f9ae,0x1132f9ae
-.long	0x6da129c7,0x6da129c7
-.long	0x4b2f9e1d,0x4b2f9e1d
-.long	0xf330b2dc,0xf330b2dc
-.long	0xec52860d,0xec52860d
-.long	0xd0e3c177,0xd0e3c177
-.long	0x6c16b32b,0x6c16b32b
-.long	0x99b970a9,0x99b970a9
-.long	0xfa489411,0xfa489411
-.long	0x2264e947,0x2264e947
-.long	0xc48cfca8,0xc48cfca8
-.long	0x1a3ff0a0,0x1a3ff0a0
-.long	0xd82c7d56,0xd82c7d56
-.long	0xef903322,0xef903322
-.long	0xc74e4987,0xc74e4987
-.long	0xc1d138d9,0xc1d138d9
-.long	0xfea2ca8c,0xfea2ca8c
-.long	0x360bd498,0x360bd498
-.long	0xcf81f5a6,0xcf81f5a6
-.long	0x28de7aa5,0x28de7aa5
-.long	0x268eb7da,0x268eb7da
-.long	0xa4bfad3f,0xa4bfad3f
-.long	0xe49d3a2c,0xe49d3a2c
-.long	0x0d927850,0x0d927850
-.long	0x9bcc5f6a,0x9bcc5f6a
-.long	0x62467e54,0x62467e54
-.long	0xc2138df6,0xc2138df6
-.long	0xe8b8d890,0xe8b8d890
-.long	0x5ef7392e,0x5ef7392e
-.long	0xf5afc382,0xf5afc382
-.long	0xbe805d9f,0xbe805d9f
-.long	0x7c93d069,0x7c93d069
-.long	0xa92dd56f,0xa92dd56f
-.long	0xb31225cf,0xb31225cf
-.long	0x3b99acc8,0x3b99acc8
-.long	0xa77d1810,0xa77d1810
-.long	0x6e639ce8,0x6e639ce8
-.long	0x7bbb3bdb,0x7bbb3bdb
-.long	0x097826cd,0x097826cd
-.long	0xf418596e,0xf418596e
-.long	0x01b79aec,0x01b79aec
-.long	0xa89a4f83,0xa89a4f83
-.long	0x656e95e6,0x656e95e6
-.long	0x7ee6ffaa,0x7ee6ffaa
-.long	0x08cfbc21,0x08cfbc21
-.long	0xe6e815ef,0xe6e815ef
-.long	0xd99be7ba,0xd99be7ba
-.long	0xce366f4a,0xce366f4a
-.long	0xd4099fea,0xd4099fea
-.long	0xd67cb029,0xd67cb029
-.long	0xafb2a431,0xafb2a431
-.long	0x31233f2a,0x31233f2a
-.long	0x3094a5c6,0x3094a5c6
-.long	0xc066a235,0xc066a235
-.long	0x37bc4e74,0x37bc4e74
-.long	0xa6ca82fc,0xa6ca82fc
-.long	0xb0d090e0,0xb0d090e0
-.long	0x15d8a733,0x15d8a733
-.long	0x4a9804f1,0x4a9804f1
-.long	0xf7daec41,0xf7daec41
-.long	0x0e50cd7f,0x0e50cd7f
-.long	0x2ff69117,0x2ff69117
-.long	0x8dd64d76,0x8dd64d76
-.long	0x4db0ef43,0x4db0ef43
-.long	0x544daacc,0x544daacc
-.long	0xdf0496e4,0xdf0496e4
-.long	0xe3b5d19e,0xe3b5d19e
-.long	0x1b886a4c,0x1b886a4c
-.long	0xb81f2cc1,0xb81f2cc1
-.long	0x7f516546,0x7f516546
-.long	0x04ea5e9d,0x04ea5e9d
-.long	0x5d358c01,0x5d358c01
-.long	0x737487fa,0x737487fa
-.long	0x2e410bfb,0x2e410bfb
-.long	0x5a1d67b3,0x5a1d67b3
-.long	0x52d2db92,0x52d2db92
-.long	0x335610e9,0x335610e9
-.long	0x1347d66d,0x1347d66d
-.long	0x8c61d79a,0x8c61d79a
-.long	0x7a0ca137,0x7a0ca137
-.long	0x8e14f859,0x8e14f859
-.long	0x893c13eb,0x893c13eb
-.long	0xee27a9ce,0xee27a9ce
-.long	0x35c961b7,0x35c961b7
-.long	0xede51ce1,0xede51ce1
-.long	0x3cb1477a,0x3cb1477a
-.long	0x59dfd29c,0x59dfd29c
-.long	0x3f73f255,0x3f73f255
-.long	0x79ce1418,0x79ce1418
-.long	0xbf37c773,0xbf37c773
-.long	0xeacdf753,0xeacdf753
-.long	0x5baafd5f,0x5baafd5f
-.long	0x146f3ddf,0x146f3ddf
-.long	0x86db4478,0x86db4478
-.long	0x81f3afca,0x81f3afca
-.long	0x3ec468b9,0x3ec468b9
-.long	0x2c342438,0x2c342438
-.long	0x5f40a3c2,0x5f40a3c2
-.long	0x72c31d16,0x72c31d16
-.long	0x0c25e2bc,0x0c25e2bc
-.long	0x8b493c28,0x8b493c28
-.long	0x41950dff,0x41950dff
-.long	0x7101a839,0x7101a839
-.long	0xdeb30c08,0xdeb30c08
-.long	0x9ce4b4d8,0x9ce4b4d8
-.long	0x90c15664,0x90c15664
-.long	0x6184cb7b,0x6184cb7b
-.long	0x70b632d5,0x70b632d5
-.long	0x745c6c48,0x745c6c48
-.long	0x4257b8d0,0x4257b8d0
-.byte	0x52,0x09,0x6a,0xd5,0x30,0x36,0xa5,0x38
-.byte	0xbf,0x40,0xa3,0x9e,0x81,0xf3,0xd7,0xfb
-.byte	0x7c,0xe3,0x39,0x82,0x9b,0x2f,0xff,0x87
-.byte	0x34,0x8e,0x43,0x44,0xc4,0xde,0xe9,0xcb
-.byte	0x54,0x7b,0x94,0x32,0xa6,0xc2,0x23,0x3d
-.byte	0xee,0x4c,0x95,0x0b,0x42,0xfa,0xc3,0x4e
-.byte	0x08,0x2e,0xa1,0x66,0x28,0xd9,0x24,0xb2
-.byte	0x76,0x5b,0xa2,0x49,0x6d,0x8b,0xd1,0x25
-.byte	0x72,0xf8,0xf6,0x64,0x86,0x68,0x98,0x16
-.byte	0xd4,0xa4,0x5c,0xcc,0x5d,0x65,0xb6,0x92
-.byte	0x6c,0x70,0x48,0x50,0xfd,0xed,0xb9,0xda
-.byte	0x5e,0x15,0x46,0x57,0xa7,0x8d,0x9d,0x84
-.byte	0x90,0xd8,0xab,0x00,0x8c,0xbc,0xd3,0x0a
-.byte	0xf7,0xe4,0x58,0x05,0xb8,0xb3,0x45,0x06
-.byte	0xd0,0x2c,0x1e,0x8f,0xca,0x3f,0x0f,0x02
-.byte	0xc1,0xaf,0xbd,0x03,0x01,0x13,0x8a,0x6b
-.byte	0x3a,0x91,0x11,0x41,0x4f,0x67,0xdc,0xea
-.byte	0x97,0xf2,0xcf,0xce,0xf0,0xb4,0xe6,0x73
-.byte	0x96,0xac,0x74,0x22,0xe7,0xad,0x35,0x85
-.byte	0xe2,0xf9,0x37,0xe8,0x1c,0x75,0xdf,0x6e
-.byte	0x47,0xf1,0x1a,0x71,0x1d,0x29,0xc5,0x89
-.byte	0x6f,0xb7,0x62,0x0e,0xaa,0x18,0xbe,0x1b
-.byte	0xfc,0x56,0x3e,0x4b,0xc6,0xd2,0x79,0x20
-.byte	0x9a,0xdb,0xc0,0xfe,0x78,0xcd,0x5a,0xf4
-.byte	0x1f,0xdd,0xa8,0x33,0x88,0x07,0xc7,0x31
-.byte	0xb1,0x12,0x10,0x59,0x27,0x80,0xec,0x5f
-.byte	0x60,0x51,0x7f,0xa9,0x19,0xb5,0x4a,0x0d
-.byte	0x2d,0xe5,0x7a,0x9f,0x93,0xc9,0x9c,0xef
-.byte	0xa0,0xe0,0x3b,0x4d,0xae,0x2a,0xf5,0xb0
-.byte	0xc8,0xeb,0xbb,0x3c,0x83,0x53,0x99,0x61
-.byte	0x17,0x2b,0x04,0x7e,0xba,0x77,0xd6,0x26
-.byte	0xe1,0x69,0x14,0x63,0x55,0x21,0x0c,0x7d
-.long	0x80808080, 0x80808080, 0xfefefefe, 0xfefefefe
-.long	0x1b1b1b1b, 0x1b1b1b1b, 0, 0
-.byte	0x52,0x09,0x6a,0xd5,0x30,0x36,0xa5,0x38
-.byte	0xbf,0x40,0xa3,0x9e,0x81,0xf3,0xd7,0xfb
-.byte	0x7c,0xe3,0x39,0x82,0x9b,0x2f,0xff,0x87
-.byte	0x34,0x8e,0x43,0x44,0xc4,0xde,0xe9,0xcb
-.byte	0x54,0x7b,0x94,0x32,0xa6,0xc2,0x23,0x3d
-.byte	0xee,0x4c,0x95,0x0b,0x42,0xfa,0xc3,0x4e
-.byte	0x08,0x2e,0xa1,0x66,0x28,0xd9,0x24,0xb2
-.byte	0x76,0x5b,0xa2,0x49,0x6d,0x8b,0xd1,0x25
-.byte	0x72,0xf8,0xf6,0x64,0x86,0x68,0x98,0x16
-.byte	0xd4,0xa4,0x5c,0xcc,0x5d,0x65,0xb6,0x92
-.byte	0x6c,0x70,0x48,0x50,0xfd,0xed,0xb9,0xda
-.byte	0x5e,0x15,0x46,0x57,0xa7,0x8d,0x9d,0x84
-.byte	0x90,0xd8,0xab,0x00,0x8c,0xbc,0xd3,0x0a
-.byte	0xf7,0xe4,0x58,0x05,0xb8,0xb3,0x45,0x06
-.byte	0xd0,0x2c,0x1e,0x8f,0xca,0x3f,0x0f,0x02
-.byte	0xc1,0xaf,0xbd,0x03,0x01,0x13,0x8a,0x6b
-.byte	0x3a,0x91,0x11,0x41,0x4f,0x67,0xdc,0xea
-.byte	0x97,0xf2,0xcf,0xce,0xf0,0xb4,0xe6,0x73
-.byte	0x96,0xac,0x74,0x22,0xe7,0xad,0x35,0x85
-.byte	0xe2,0xf9,0x37,0xe8,0x1c,0x75,0xdf,0x6e
-.byte	0x47,0xf1,0x1a,0x71,0x1d,0x29,0xc5,0x89
-.byte	0x6f,0xb7,0x62,0x0e,0xaa,0x18,0xbe,0x1b
-.byte	0xfc,0x56,0x3e,0x4b,0xc6,0xd2,0x79,0x20
-.byte	0x9a,0xdb,0xc0,0xfe,0x78,0xcd,0x5a,0xf4
-.byte	0x1f,0xdd,0xa8,0x33,0x88,0x07,0xc7,0x31
-.byte	0xb1,0x12,0x10,0x59,0x27,0x80,0xec,0x5f
-.byte	0x60,0x51,0x7f,0xa9,0x19,0xb5,0x4a,0x0d
-.byte	0x2d,0xe5,0x7a,0x9f,0x93,0xc9,0x9c,0xef
-.byte	0xa0,0xe0,0x3b,0x4d,0xae,0x2a,0xf5,0xb0
-.byte	0xc8,0xeb,0xbb,0x3c,0x83,0x53,0x99,0x61
-.byte	0x17,0x2b,0x04,0x7e,0xba,0x77,0xd6,0x26
-.byte	0xe1,0x69,0x14,0x63,0x55,0x21,0x0c,0x7d
-.long	0x80808080, 0x80808080, 0xfefefefe, 0xfefefefe
-.long	0x1b1b1b1b, 0x1b1b1b1b, 0, 0
-.byte	0x52,0x09,0x6a,0xd5,0x30,0x36,0xa5,0x38
-.byte	0xbf,0x40,0xa3,0x9e,0x81,0xf3,0xd7,0xfb
-.byte	0x7c,0xe3,0x39,0x82,0x9b,0x2f,0xff,0x87
-.byte	0x34,0x8e,0x43,0x44,0xc4,0xde,0xe9,0xcb
-.byte	0x54,0x7b,0x94,0x32,0xa6,0xc2,0x23,0x3d
-.byte	0xee,0x4c,0x95,0x0b,0x42,0xfa,0xc3,0x4e
-.byte	0x08,0x2e,0xa1,0x66,0x28,0xd9,0x24,0xb2
-.byte	0x76,0x5b,0xa2,0x49,0x6d,0x8b,0xd1,0x25
-.byte	0x72,0xf8,0xf6,0x64,0x86,0x68,0x98,0x16
-.byte	0xd4,0xa4,0x5c,0xcc,0x5d,0x65,0xb6,0x92
-.byte	0x6c,0x70,0x48,0x50,0xfd,0xed,0xb9,0xda
-.byte	0x5e,0x15,0x46,0x57,0xa7,0x8d,0x9d,0x84
-.byte	0x90,0xd8,0xab,0x00,0x8c,0xbc,0xd3,0x0a
-.byte	0xf7,0xe4,0x58,0x05,0xb8,0xb3,0x45,0x06
-.byte	0xd0,0x2c,0x1e,0x8f,0xca,0x3f,0x0f,0x02
-.byte	0xc1,0xaf,0xbd,0x03,0x01,0x13,0x8a,0x6b
-.byte	0x3a,0x91,0x11,0x41,0x4f,0x67,0xdc,0xea
-.byte	0x97,0xf2,0xcf,0xce,0xf0,0xb4,0xe6,0x73
-.byte	0x96,0xac,0x74,0x22,0xe7,0xad,0x35,0x85
-.byte	0xe2,0xf9,0x37,0xe8,0x1c,0x75,0xdf,0x6e
-.byte	0x47,0xf1,0x1a,0x71,0x1d,0x29,0xc5,0x89
-.byte	0x6f,0xb7,0x62,0x0e,0xaa,0x18,0xbe,0x1b
-.byte	0xfc,0x56,0x3e,0x4b,0xc6,0xd2,0x79,0x20
-.byte	0x9a,0xdb,0xc0,0xfe,0x78,0xcd,0x5a,0xf4
-.byte	0x1f,0xdd,0xa8,0x33,0x88,0x07,0xc7,0x31
-.byte	0xb1,0x12,0x10,0x59,0x27,0x80,0xec,0x5f
-.byte	0x60,0x51,0x7f,0xa9,0x19,0xb5,0x4a,0x0d
-.byte	0x2d,0xe5,0x7a,0x9f,0x93,0xc9,0x9c,0xef
-.byte	0xa0,0xe0,0x3b,0x4d,0xae,0x2a,0xf5,0xb0
-.byte	0xc8,0xeb,0xbb,0x3c,0x83,0x53,0x99,0x61
-.byte	0x17,0x2b,0x04,0x7e,0xba,0x77,0xd6,0x26
-.byte	0xe1,0x69,0x14,0x63,0x55,0x21,0x0c,0x7d
-.long	0x80808080, 0x80808080, 0xfefefefe, 0xfefefefe
-.long	0x1b1b1b1b, 0x1b1b1b1b, 0, 0
-.byte	0x52,0x09,0x6a,0xd5,0x30,0x36,0xa5,0x38
-.byte	0xbf,0x40,0xa3,0x9e,0x81,0xf3,0xd7,0xfb
-.byte	0x7c,0xe3,0x39,0x82,0x9b,0x2f,0xff,0x87
-.byte	0x34,0x8e,0x43,0x44,0xc4,0xde,0xe9,0xcb
-.byte	0x54,0x7b,0x94,0x32,0xa6,0xc2,0x23,0x3d
-.byte	0xee,0x4c,0x95,0x0b,0x42,0xfa,0xc3,0x4e
-.byte	0x08,0x2e,0xa1,0x66,0x28,0xd9,0x24,0xb2
-.byte	0x76,0x5b,0xa2,0x49,0x6d,0x8b,0xd1,0x25
-.byte	0x72,0xf8,0xf6,0x64,0x86,0x68,0x98,0x16
-.byte	0xd4,0xa4,0x5c,0xcc,0x5d,0x65,0xb6,0x92
-.byte	0x6c,0x70,0x48,0x50,0xfd,0xed,0xb9,0xda
-.byte	0x5e,0x15,0x46,0x57,0xa7,0x8d,0x9d,0x84
-.byte	0x90,0xd8,0xab,0x00,0x8c,0xbc,0xd3,0x0a
-.byte	0xf7,0xe4,0x58,0x05,0xb8,0xb3,0x45,0x06
-.byte	0xd0,0x2c,0x1e,0x8f,0xca,0x3f,0x0f,0x02
-.byte	0xc1,0xaf,0xbd,0x03,0x01,0x13,0x8a,0x6b
-.byte	0x3a,0x91,0x11,0x41,0x4f,0x67,0xdc,0xea
-.byte	0x97,0xf2,0xcf,0xce,0xf0,0xb4,0xe6,0x73
-.byte	0x96,0xac,0x74,0x22,0xe7,0xad,0x35,0x85
-.byte	0xe2,0xf9,0x37,0xe8,0x1c,0x75,0xdf,0x6e
-.byte	0x47,0xf1,0x1a,0x71,0x1d,0x29,0xc5,0x89
-.byte	0x6f,0xb7,0x62,0x0e,0xaa,0x18,0xbe,0x1b
-.byte	0xfc,0x56,0x3e,0x4b,0xc6,0xd2,0x79,0x20
-.byte	0x9a,0xdb,0xc0,0xfe,0x78,0xcd,0x5a,0xf4
-.byte	0x1f,0xdd,0xa8,0x33,0x88,0x07,0xc7,0x31
-.byte	0xb1,0x12,0x10,0x59,0x27,0x80,0xec,0x5f
-.byte	0x60,0x51,0x7f,0xa9,0x19,0xb5,0x4a,0x0d
-.byte	0x2d,0xe5,0x7a,0x9f,0x93,0xc9,0x9c,0xef
-.byte	0xa0,0xe0,0x3b,0x4d,0xae,0x2a,0xf5,0xb0
-.byte	0xc8,0xeb,0xbb,0x3c,0x83,0x53,0x99,0x61
-.byte	0x17,0x2b,0x04,0x7e,0xba,0x77,0xd6,0x26
-.byte	0xe1,0x69,0x14,0x63,0x55,0x21,0x0c,0x7d
-.long	0x80808080, 0x80808080, 0xfefefefe, 0xfefefefe
-.long	0x1b1b1b1b, 0x1b1b1b1b, 0, 0
-.byte	65,69,83,32,102,111,114,32,120,56,54,95,54,52,44,32,67,82,89,80,84,79,71,65,77,83,32,98,121,32,60,97,112,112,114,111,64,111,112,101,110,115,115,108,46,111,114,103,62,0
-.align	64
diff --git a/deps/openssl/config/archs/linux-x32/asm_avx2/crypto/aes/aesni-sha1-x86_64.s b/deps/openssl/config/archs/linux-x32/asm_avx2/crypto/aes/aesni-sha1-x86_64.s
index 4d2dfe4489..978bd2b623 100644
--- a/deps/openssl/config/archs/linux-x32/asm_avx2/crypto/aes/aesni-sha1-x86_64.s
+++ b/deps/openssl/config/archs/linux-x32/asm_avx2/crypto/aes/aesni-sha1-x86_64.s
@@ -5,6 +5,7 @@
 .type	aesni_cbc_sha1_enc,@function
 .align	32
 aesni_cbc_sha1_enc:
+.cfi_startproc
 
 	movl	OPENSSL_ia32cap_P+0(%rip),%r10d
 	movq	OPENSSL_ia32cap_P+4(%rip),%r11
@@ -17,6 +18,7 @@ aesni_cbc_sha1_enc:
 	je	aesni_cbc_sha1_enc_avx
 	jmp	aesni_cbc_sha1_enc_ssse3
 	.byte	0xf3,0xc3
+.cfi_endproc
 .size	aesni_cbc_sha1_enc,.-aesni_cbc_sha1_enc
 .type	aesni_cbc_sha1_enc_ssse3,@function
 .align	32
@@ -2730,6 +2732,7 @@ K_XX_XX:
 .type	aesni_cbc_sha1_enc_shaext,@function
 .align	32
 aesni_cbc_sha1_enc_shaext:
+.cfi_startproc
 	movq	8(%rsp),%r10
 	movdqu	(%r9),%xmm8
 	movd	16(%r9),%xmm9
@@ -3028,4 +3031,5 @@ aesni_cbc_sha1_enc_shaext:
 	movdqu	%xmm8,(%r9)
 	movd	%xmm9,16(%r9)
 	.byte	0xf3,0xc3
+.cfi_endproc
 .size	aesni_cbc_sha1_enc_shaext,.-aesni_cbc_sha1_enc_shaext
diff --git a/deps/openssl/config/archs/linux-x32/asm_avx2/crypto/aes/aesni-sha256-x86_64.s b/deps/openssl/config/archs/linux-x32/asm_avx2/crypto/aes/aesni-sha256-x86_64.s
index 5a47b3ee51..dd09f1b290 100644
--- a/deps/openssl/config/archs/linux-x32/asm_avx2/crypto/aes/aesni-sha256-x86_64.s
+++ b/deps/openssl/config/archs/linux-x32/asm_avx2/crypto/aes/aesni-sha256-x86_64.s
@@ -5,6 +5,7 @@
 .type	aesni_cbc_sha256_enc,@function
 .align	16
 aesni_cbc_sha256_enc:
+.cfi_startproc
 	leaq	OPENSSL_ia32cap_P(%rip),%r11
 	movl	$1,%eax
 	cmpq	$0,%rdi
@@ -30,6 +31,7 @@ aesni_cbc_sha256_enc:
 	ud2
 .Lprobe:
 	.byte	0xf3,0xc3
+.cfi_endproc
 .size	aesni_cbc_sha256_enc,.-aesni_cbc_sha256_enc
 
 .align	64
@@ -2528,7 +2530,15 @@ aesni_cbc_sha256_enc_avx2:
 	vmovdqa	%ymm4,0(%rsp)
 	xorl	%r14d,%r14d
 	vmovdqa	%ymm5,32(%rsp)
+
+	movq	120(%rsp),%rsi
+.cfi_def_cfa	%rsi,8
 	leaq	-64(%rsp),%rsp
+
+
+
+	movq	%rsi,-8(%rsp)
+.cfi_escape	0x0f,0x05,0x77,0x78,0x06,0x23,0x08
 	movl	%ebx,%esi
 	vmovdqa	%ymm6,0(%rsp)
 	xorl	%ecx,%esi
@@ -2542,6 +2552,12 @@ aesni_cbc_sha256_enc_avx2:
 	vmovdqu	(%r13),%xmm9
 	vpinsrq	$0,%r13,%xmm15,%xmm15
 	leaq	-64(%rsp),%rsp
+.cfi_escape	0x0f,0x05,0x77,0x38,0x06,0x23,0x08
+
+	pushq	64-8(%rsp)
+.cfi_escape	0x0f,0x05,0x77,0x00,0x06,0x23,0x08
+	leaq	8(%rsp),%rsp
+.cfi_escape	0x0f,0x05,0x77,0x78,0x06,0x23,0x08
 	vpalignr	$4,%ymm0,%ymm1,%ymm4
 	addl	0+128(%rsp),%r11d
 	andl	%r8d,%r12d
@@ -2816,6 +2832,12 @@ aesni_cbc_sha256_enc_avx2:
 	movl	%r9d,%r12d
 	vmovdqa	%ymm6,32(%rsp)
 	leaq	-64(%rsp),%rsp
+.cfi_escape	0x0f,0x05,0x77,0x38,0x06,0x23,0x08
+
+	pushq	64-8(%rsp)
+.cfi_escape	0x0f,0x05,0x77,0x00,0x06,0x23,0x08
+	leaq	8(%rsp),%rsp
+.cfi_escape	0x0f,0x05,0x77,0x78,0x06,0x23,0x08
 	vpalignr	$4,%ymm2,%ymm3,%ymm4
 	addl	0+128(%rsp),%r11d
 	andl	%r8d,%r12d
@@ -4029,10 +4051,12 @@ aesni_cbc_sha256_enc_avx2:
 	jbe	.Loop_avx2
 	leaq	(%rsp),%rbp
 
+
+.cfi_escape	0x0f,0x06,0x76,0xf8,0x00,0x06,0x23,0x08
+
 .Ldone_avx2:
-	leaq	(%rbp),%rsp
-	movq	64+32(%rsp),%r8
-	movq	120(%rsp),%rsi
+	movq	64+32(%rbp),%r8
+	movq	64+56(%rbp),%rsi
 .cfi_def_cfa	%rsi,8
 	vmovdqu	%xmm8,(%r8)
 	vzeroall
@@ -4057,6 +4081,7 @@ aesni_cbc_sha256_enc_avx2:
 .type	aesni_cbc_sha256_enc_shaext,@function
 .align	32
 aesni_cbc_sha256_enc_shaext:
+.cfi_startproc
 	movq	8(%rsp),%r10
 	leaq	K256+128(%rip),%rax
 	movdqu	(%r9),%xmm1
@@ -4406,4 +4431,5 @@ aesni_cbc_sha256_enc_shaext:
 	movdqu	%xmm1,(%r9)
 	movdqu	%xmm2,16(%r9)
 	.byte	0xf3,0xc3
+.cfi_endproc
 .size	aesni_cbc_sha256_enc_shaext,.-aesni_cbc_sha256_enc_shaext
diff --git a/deps/openssl/config/archs/linux-x32/asm_avx2/crypto/aes/aesni-x86_64.s b/deps/openssl/config/archs/linux-x32/asm_avx2/crypto/aes/aesni-x86_64.s
index 2986a647c1..c1e791eff5 100644
--- a/deps/openssl/config/archs/linux-x32/asm_avx2/crypto/aes/aesni-x86_64.s
+++ b/deps/openssl/config/archs/linux-x32/asm_avx2/crypto/aes/aesni-x86_64.s
@@ -861,6 +861,7 @@ aesni_ecb_encrypt:
 .type	aesni_ccm64_encrypt_blocks,@function
 .align	16
 aesni_ccm64_encrypt_blocks:
+.cfi_startproc
 	movl	240(%rcx),%eax
 	movdqu	(%r8),%xmm6
 	movdqa	.Lincrement64(%rip),%xmm9
@@ -919,11 +920,13 @@ aesni_ccm64_encrypt_blocks:
 	pxor	%xmm8,%xmm8
 	pxor	%xmm6,%xmm6
 	.byte	0xf3,0xc3
+.cfi_endproc
 .size	aesni_ccm64_encrypt_blocks,.-aesni_ccm64_encrypt_blocks
 .globl	aesni_ccm64_decrypt_blocks
 .type	aesni_ccm64_decrypt_blocks,@function
 .align	16
 aesni_ccm64_decrypt_blocks:
+.cfi_startproc
 	movl	240(%rcx),%eax
 	movups	(%r8),%xmm6
 	movdqu	(%r9),%xmm3
@@ -1016,6 +1019,7 @@ aesni_ccm64_decrypt_blocks:
 	pxor	%xmm8,%xmm8
 	pxor	%xmm6,%xmm6
 	.byte	0xf3,0xc3
+.cfi_endproc
 .size	aesni_ccm64_decrypt_blocks,.-aesni_ccm64_decrypt_blocks
 .globl	aesni_ctr32_encrypt_blocks
 .type	aesni_ctr32_encrypt_blocks,@function
@@ -2790,6 +2794,7 @@ aesni_ocb_encrypt:
 .type	__ocb_encrypt6,@function
 .align	32
 __ocb_encrypt6:
+.cfi_startproc
 	pxor	%xmm9,%xmm15
 	movdqu	(%rbx,%r12,1),%xmm11
 	movdqa	%xmm10,%xmm12
@@ -2887,11 +2892,13 @@ __ocb_encrypt6:
 .byte	102,65,15,56,221,246
 .byte	102,65,15,56,221,255
 	.byte	0xf3,0xc3
+.cfi_endproc
 .size	__ocb_encrypt6,.-__ocb_encrypt6
 
 .type	__ocb_encrypt4,@function
 .align	32
 __ocb_encrypt4:
+.cfi_startproc
 	pxor	%xmm9,%xmm15
 	movdqu	(%rbx,%r12,1),%xmm11
 	movdqa	%xmm10,%xmm12
@@ -2956,11 +2963,13 @@ __ocb_encrypt4:
 .byte	102,65,15,56,221,228
 .byte	102,65,15,56,221,237
 	.byte	0xf3,0xc3
+.cfi_endproc
 .size	__ocb_encrypt4,.-__ocb_encrypt4
 
 .type	__ocb_encrypt1,@function
 .align	32
 __ocb_encrypt1:
+.cfi_startproc
 	pxor	%xmm15,%xmm7
 	pxor	%xmm9,%xmm7
 	pxor	%xmm2,%xmm8
@@ -2991,6 +3000,7 @@ __ocb_encrypt1:
 
 .byte	102,15,56,221,215
 	.byte	0xf3,0xc3
+.cfi_endproc
 .size	__ocb_encrypt1,.-__ocb_encrypt1
 
 .globl	aesni_ocb_decrypt
@@ -3233,6 +3243,7 @@ aesni_ocb_decrypt:
 .type	__ocb_decrypt6,@function
 .align	32
 __ocb_decrypt6:
+.cfi_startproc
 	pxor	%xmm9,%xmm15
 	movdqu	(%rbx,%r12,1),%xmm11
 	movdqa	%xmm10,%xmm12
@@ -3324,11 +3335,13 @@ __ocb_decrypt6:
 .byte	102,65,15,56,223,246
 .byte	102,65,15,56,223,255
 	.byte	0xf3,0xc3
+.cfi_endproc
 .size	__ocb_decrypt6,.-__ocb_decrypt6
 
 .type	__ocb_decrypt4,@function
 .align	32
 __ocb_decrypt4:
+.cfi_startproc
 	pxor	%xmm9,%xmm15
 	movdqu	(%rbx,%r12,1),%xmm11
 	movdqa	%xmm10,%xmm12
@@ -3389,11 +3402,13 @@ __ocb_decrypt4:
 .byte	102,65,15,56,223,228
 .byte	102,65,15,56,223,237
 	.byte	0xf3,0xc3
+.cfi_endproc
 .size	__ocb_decrypt4,.-__ocb_decrypt4
 
 .type	__ocb_decrypt1,@function
 .align	32
 __ocb_decrypt1:
+.cfi_startproc
 	pxor	%xmm15,%xmm7
 	pxor	%xmm9,%xmm7
 	pxor	%xmm7,%xmm2
@@ -3423,6 +3438,7 @@ __ocb_decrypt1:
 
 .byte	102,15,56,223,215
 	.byte	0xf3,0xc3
+.cfi_endproc
 .size	__ocb_decrypt1,.-__ocb_decrypt1
 .globl	aesni_cbc_encrypt
 .type	aesni_cbc_encrypt,@function
@@ -4361,7 +4377,6 @@ __aesni_set_encrypt_key:
 	addq	$8,%rsp
 .cfi_adjust_cfa_offset	-8
 	.byte	0xf3,0xc3
-.cfi_endproc	
 .LSEH_end_set_encrypt_key:
 
 .align	16
@@ -4432,6 +4447,7 @@ __aesni_set_encrypt_key:
 	shufps	$170,%xmm1,%xmm1
 	xorps	%xmm1,%xmm2
 	.byte	0xf3,0xc3
+.cfi_endproc
 .size	aesni_set_encrypt_key,.-aesni_set_encrypt_key
 .size	__aesni_set_encrypt_key,.-__aesni_set_encrypt_key
 .align	64
diff --git a/deps/openssl/config/archs/linux-x32/asm_avx2/crypto/aes/bsaes-x86_64.s b/deps/openssl/config/archs/linux-x32/asm_avx2/crypto/aes/bsaes-x86_64.s
deleted file mode 100644
index e1f3abadbc..0000000000
--- a/deps/openssl/config/archs/linux-x32/asm_avx2/crypto/aes/bsaes-x86_64.s
+++ /dev/null
@@ -1,2595 +0,0 @@
-.text	
-
-
-
-
-.type	_bsaes_encrypt8,@function
-.align	64
-_bsaes_encrypt8:
-.cfi_startproc	
-	leaq	.LBS0(%rip),%r11
-
-	movdqa	(%rax),%xmm8
-	leaq	16(%rax),%rax
-	movdqa	80(%r11),%xmm7
-	pxor	%xmm8,%xmm15
-	pxor	%xmm8,%xmm0
-	pxor	%xmm8,%xmm1
-	pxor	%xmm8,%xmm2
-.byte	102,68,15,56,0,255
-.byte	102,15,56,0,199
-	pxor	%xmm8,%xmm3
-	pxor	%xmm8,%xmm4
-.byte	102,15,56,0,207
-.byte	102,15,56,0,215
-	pxor	%xmm8,%xmm5
-	pxor	%xmm8,%xmm6
-.byte	102,15,56,0,223
-.byte	102,15,56,0,231
-.byte	102,15,56,0,239
-.byte	102,15,56,0,247
-_bsaes_encrypt8_bitslice:
-	movdqa	0(%r11),%xmm7
-	movdqa	16(%r11),%xmm8
-	movdqa	%xmm5,%xmm9
-	psrlq	$1,%xmm5
-	movdqa	%xmm3,%xmm10
-	psrlq	$1,%xmm3
-	pxor	%xmm6,%xmm5
-	pxor	%xmm4,%xmm3
-	pand	%xmm7,%xmm5
-	pand	%xmm7,%xmm3
-	pxor	%xmm5,%xmm6
-	psllq	$1,%xmm5
-	pxor	%xmm3,%xmm4
-	psllq	$1,%xmm3
-	pxor	%xmm9,%xmm5
-	pxor	%xmm10,%xmm3
-	movdqa	%xmm1,%xmm9
-	psrlq	$1,%xmm1
-	movdqa	%xmm15,%xmm10
-	psrlq	$1,%xmm15
-	pxor	%xmm2,%xmm1
-	pxor	%xmm0,%xmm15
-	pand	%xmm7,%xmm1
-	pand	%xmm7,%xmm15
-	pxor	%xmm1,%xmm2
-	psllq	$1,%xmm1
-	pxor	%xmm15,%xmm0
-	psllq	$1,%xmm15
-	pxor	%xmm9,%xmm1
-	pxor	%xmm10,%xmm15
-	movdqa	32(%r11),%xmm7
-	movdqa	%xmm4,%xmm9
-	psrlq	$2,%xmm4
-	movdqa	%xmm3,%xmm10
-	psrlq	$2,%xmm3
-	pxor	%xmm6,%xmm4
-	pxor	%xmm5,%xmm3
-	pand	%xmm8,%xmm4
-	pand	%xmm8,%xmm3
-	pxor	%xmm4,%xmm6
-	psllq	$2,%xmm4
-	pxor	%xmm3,%xmm5
-	psllq	$2,%xmm3
-	pxor	%xmm9,%xmm4
-	pxor	%xmm10,%xmm3
-	movdqa	%xmm0,%xmm9
-	psrlq	$2,%xmm0
-	movdqa	%xmm15,%xmm10
-	psrlq	$2,%xmm15
-	pxor	%xmm2,%xmm0
-	pxor	%xmm1,%xmm15
-	pand	%xmm8,%xmm0
-	pand	%xmm8,%xmm15
-	pxor	%xmm0,%xmm2
-	psllq	$2,%xmm0
-	pxor	%xmm15,%xmm1
-	psllq	$2,%xmm15
-	pxor	%xmm9,%xmm0
-	pxor	%xmm10,%xmm15
-	movdqa	%xmm2,%xmm9
-	psrlq	$4,%xmm2
-	movdqa	%xmm1,%xmm10
-	psrlq	$4,%xmm1
-	pxor	%xmm6,%xmm2
-	pxor	%xmm5,%xmm1
-	pand	%xmm7,%xmm2
-	pand	%xmm7,%xmm1
-	pxor	%xmm2,%xmm6
-	psllq	$4,%xmm2
-	pxor	%xmm1,%xmm5
-	psllq	$4,%xmm1
-	pxor	%xmm9,%xmm2
-	pxor	%xmm10,%xmm1
-	movdqa	%xmm0,%xmm9
-	psrlq	$4,%xmm0
-	movdqa	%xmm15,%xmm10
-	psrlq	$4,%xmm15
-	pxor	%xmm4,%xmm0
-	pxor	%xmm3,%xmm15
-	pand	%xmm7,%xmm0
-	pand	%xmm7,%xmm15
-	pxor	%xmm0,%xmm4
-	psllq	$4,%xmm0
-	pxor	%xmm15,%xmm3
-	psllq	$4,%xmm15
-	pxor	%xmm9,%xmm0
-	pxor	%xmm10,%xmm15
-	decl	%r10d
-	jmp	.Lenc_sbox
-.align	16
-.Lenc_loop:
-	pxor	0(%rax),%xmm15
-	pxor	16(%rax),%xmm0
-	pxor	32(%rax),%xmm1
-	pxor	48(%rax),%xmm2
-.byte	102,68,15,56,0,255
-.byte	102,15,56,0,199
-	pxor	64(%rax),%xmm3
-	pxor	80(%rax),%xmm4
-.byte	102,15,56,0,207
-.byte	102,15,56,0,215
-	pxor	96(%rax),%xmm5
-	pxor	112(%rax),%xmm6
-.byte	102,15,56,0,223
-.byte	102,15,56,0,231
-.byte	102,15,56,0,239
-.byte	102,15,56,0,247
-	leaq	128(%rax),%rax
-.Lenc_sbox:
-	pxor	%xmm5,%xmm4
-	pxor	%xmm0,%xmm1
-	pxor	%xmm15,%xmm2
-	pxor	%xmm1,%xmm5
-	pxor	%xmm15,%xmm4
-
-	pxor	%xmm2,%xmm5
-	pxor	%xmm6,%xmm2
-	pxor	%xmm4,%xmm6
-	pxor	%xmm3,%xmm2
-	pxor	%xmm4,%xmm3
-	pxor	%xmm0,%xmm2
-
-	pxor	%xmm6,%xmm1
-	pxor	%xmm4,%xmm0
-	movdqa	%xmm6,%xmm10
-	movdqa	%xmm0,%xmm9
-	movdqa	%xmm4,%xmm8
-	movdqa	%xmm1,%xmm12
-	movdqa	%xmm5,%xmm11
-
-	pxor	%xmm3,%xmm10
-	pxor	%xmm1,%xmm9
-	pxor	%xmm2,%xmm8
-	movdqa	%xmm10,%xmm13
-	pxor	%xmm3,%xmm12
-	movdqa	%xmm9,%xmm7
-	pxor	%xmm15,%xmm11
-	movdqa	%xmm10,%xmm14
-
-	por	%xmm8,%xmm9
-	por	%xmm11,%xmm10
-	pxor	%xmm7,%xmm14
-	pand	%xmm11,%xmm13
-	pxor	%xmm8,%xmm11
-	pand	%xmm8,%xmm7
-	pand	%xmm11,%xmm14
-	movdqa	%xmm2,%xmm11
-	pxor	%xmm15,%xmm11
-	pand	%xmm11,%xmm12
-	pxor	%xmm12,%xmm10
-	pxor	%xmm12,%xmm9
-	movdqa	%xmm6,%xmm12
-	movdqa	%xmm4,%xmm11
-	pxor	%xmm0,%xmm12
-	pxor	%xmm5,%xmm11
-	movdqa	%xmm12,%xmm8
-	pand	%xmm11,%xmm12
-	por	%xmm11,%xmm8
-	pxor	%xmm12,%xmm7
-	pxor	%xmm14,%xmm10
-	pxor	%xmm13,%xmm9
-	pxor	%xmm14,%xmm8
-	movdqa	%xmm1,%xmm11
-	pxor	%xmm13,%xmm7
-	movdqa	%xmm3,%xmm12
-	pxor	%xmm13,%xmm8
-	movdqa	%xmm0,%xmm13
-	pand	%xmm2,%xmm11
-	movdqa	%xmm6,%xmm14
-	pand	%xmm15,%xmm12
-	pand	%xmm4,%xmm13
-	por	%xmm5,%xmm14
-	pxor	%xmm11,%xmm10
-	pxor	%xmm12,%xmm9
-	pxor	%xmm13,%xmm8
-	pxor	%xmm14,%xmm7
-
-
-
-
-
-	movdqa	%xmm10,%xmm11
-	pand	%xmm8,%xmm10
-	pxor	%xmm9,%xmm11
-
-	movdqa	%xmm7,%xmm13
-	movdqa	%xmm11,%xmm14
-	pxor	%xmm10,%xmm13
-	pand	%xmm13,%xmm14
-
-	movdqa	%xmm8,%xmm12
-	pxor	%xmm9,%xmm14
-	pxor	%xmm7,%xmm12
-
-	pxor	%xmm9,%xmm10
-
-	pand	%xmm10,%xmm12
-
-	movdqa	%xmm13,%xmm9
-	pxor	%xmm7,%xmm12
-
-	pxor	%xmm12,%xmm9
-	pxor	%xmm12,%xmm8
-
-	pand	%xmm7,%xmm9
-
-	pxor	%xmm9,%xmm13
-	pxor	%xmm9,%xmm8
-
-	pand	%xmm14,%xmm13
-
-	pxor	%xmm11,%xmm13
-	movdqa	%xmm5,%xmm11
-	movdqa	%xmm4,%xmm7
-	movdqa	%xmm14,%xmm9
-	pxor	%xmm13,%xmm9
-	pand	%xmm5,%xmm9
-	pxor	%xmm4,%xmm5
-	pand	%xmm14,%xmm4
-	pand	%xmm13,%xmm5
-	pxor	%xmm4,%xmm5
-	pxor	%xmm9,%xmm4
-	pxor	%xmm15,%xmm11
-	pxor	%xmm2,%xmm7
-	pxor	%xmm12,%xmm14
-	pxor	%xmm8,%xmm13
-	movdqa	%xmm14,%xmm10
-	movdqa	%xmm12,%xmm9
-	pxor	%xmm13,%xmm10
-	pxor	%xmm8,%xmm9
-	pand	%xmm11,%xmm10
-	pand	%xmm15,%xmm9
-	pxor	%xmm7,%xmm11
-	pxor	%xmm2,%xmm15
-	pand	%xmm14,%xmm7
-	pand	%xmm12,%xmm2
-	pand	%xmm13,%xmm11
-	pand	%xmm8,%xmm15
-	pxor	%xmm11,%xmm7
-	pxor	%xmm2,%xmm15
-	pxor	%xmm10,%xmm11
-	pxor	%xmm9,%xmm2
-	pxor	%xmm11,%xmm5
-	pxor	%xmm11,%xmm15
-	pxor	%xmm7,%xmm4
-	pxor	%xmm7,%xmm2
-
-	movdqa	%xmm6,%xmm11
-	movdqa	%xmm0,%xmm7
-	pxor	%xmm3,%xmm11
-	pxor	%xmm1,%xmm7
-	movdqa	%xmm14,%xmm10
-	movdqa	%xmm12,%xmm9
-	pxor	%xmm13,%xmm10
-	pxor	%xmm8,%xmm9
-	pand	%xmm11,%xmm10
-	pand	%xmm3,%xmm9
-	pxor	%xmm7,%xmm11
-	pxor	%xmm1,%xmm3
-	pand	%xmm14,%xmm7
-	pand	%xmm12,%xmm1
-	pand	%xmm13,%xmm11
-	pand	%xmm8,%xmm3
-	pxor	%xmm11,%xmm7
-	pxor	%xmm1,%xmm3
-	pxor	%xmm10,%xmm11
-	pxor	%xmm9,%xmm1
-	pxor	%xmm12,%xmm14
-	pxor	%xmm8,%xmm13
-	movdqa	%xmm14,%xmm10
-	pxor	%xmm13,%xmm10
-	pand	%xmm6,%xmm10
-	pxor	%xmm0,%xmm6
-	pand	%xmm14,%xmm0
-	pand	%xmm13,%xmm6
-	pxor	%xmm0,%xmm6
-	pxor	%xmm10,%xmm0
-	pxor	%xmm11,%xmm6
-	pxor	%xmm11,%xmm3
-	pxor	%xmm7,%xmm0
-	pxor	%xmm7,%xmm1
-	pxor	%xmm15,%xmm6
-	pxor	%xmm5,%xmm0
-	pxor	%xmm6,%xmm3
-	pxor	%xmm15,%xmm5
-	pxor	%xmm0,%xmm15
-
-	pxor	%xmm4,%xmm0
-	pxor	%xmm1,%xmm4
-	pxor	%xmm2,%xmm1
-	pxor	%xmm4,%xmm2
-	pxor	%xmm4,%xmm3
-
-	pxor	%xmm2,%xmm5
-	decl	%r10d
-	jl	.Lenc_done
-	pshufd	$0x93,%xmm15,%xmm7
-	pshufd	$0x93,%xmm0,%xmm8
-	pxor	%xmm7,%xmm15
-	pshufd	$0x93,%xmm3,%xmm9
-	pxor	%xmm8,%xmm0
-	pshufd	$0x93,%xmm5,%xmm10
-	pxor	%xmm9,%xmm3
-	pshufd	$0x93,%xmm2,%xmm11
-	pxor	%xmm10,%xmm5
-	pshufd	$0x93,%xmm6,%xmm12
-	pxor	%xmm11,%xmm2
-	pshufd	$0x93,%xmm1,%xmm13
-	pxor	%xmm12,%xmm6
-	pshufd	$0x93,%xmm4,%xmm14
-	pxor	%xmm13,%xmm1
-	pxor	%xmm14,%xmm4
-
-	pxor	%xmm15,%xmm8
-	pxor	%xmm4,%xmm7
-	pxor	%xmm4,%xmm8
-	pshufd	$0x4E,%xmm15,%xmm15
-	pxor	%xmm0,%xmm9
-	pshufd	$0x4E,%xmm0,%xmm0
-	pxor	%xmm2,%xmm12
-	pxor	%xmm7,%xmm15
-	pxor	%xmm6,%xmm13
-	pxor	%xmm8,%xmm0
-	pxor	%xmm5,%xmm11
-	pshufd	$0x4E,%xmm2,%xmm7
-	pxor	%xmm1,%xmm14
-	pshufd	$0x4E,%xmm6,%xmm8
-	pxor	%xmm3,%xmm10
-	pshufd	$0x4E,%xmm5,%xmm2
-	pxor	%xmm4,%xmm10
-	pshufd	$0x4E,%xmm4,%xmm6
-	pxor	%xmm4,%xmm11
-	pshufd	$0x4E,%xmm1,%xmm5
-	pxor	%xmm11,%xmm7
-	pshufd	$0x4E,%xmm3,%xmm1
-	pxor	%xmm12,%xmm8
-	pxor	%xmm10,%xmm2
-	pxor	%xmm14,%xmm6
-	pxor	%xmm13,%xmm5
-	movdqa	%xmm7,%xmm3
-	pxor	%xmm9,%xmm1
-	movdqa	%xmm8,%xmm4
-	movdqa	48(%r11),%xmm7
-	jnz	.Lenc_loop
-	movdqa	64(%r11),%xmm7
-	jmp	.Lenc_loop
-.align	16
-.Lenc_done:
-	movdqa	0(%r11),%xmm7
-	movdqa	16(%r11),%xmm8
-	movdqa	%xmm1,%xmm9
-	psrlq	$1,%xmm1
-	movdqa	%xmm2,%xmm10
-	psrlq	$1,%xmm2
-	pxor	%xmm4,%xmm1
-	pxor	%xmm6,%xmm2
-	pand	%xmm7,%xmm1
-	pand	%xmm7,%xmm2
-	pxor	%xmm1,%xmm4
-	psllq	$1,%xmm1
-	pxor	%xmm2,%xmm6
-	psllq	$1,%xmm2
-	pxor	%xmm9,%xmm1
-	pxor	%xmm10,%xmm2
-	movdqa	%xmm3,%xmm9
-	psrlq	$1,%xmm3
-	movdqa	%xmm15,%xmm10
-	psrlq	$1,%xmm15
-	pxor	%xmm5,%xmm3
-	pxor	%xmm0,%xmm15
-	pand	%xmm7,%xmm3
-	pand	%xmm7,%xmm15
-	pxor	%xmm3,%xmm5
-	psllq	$1,%xmm3
-	pxor	%xmm15,%xmm0
-	psllq	$1,%xmm15
-	pxor	%xmm9,%xmm3
-	pxor	%xmm10,%xmm15
-	movdqa	32(%r11),%xmm7
-	movdqa	%xmm6,%xmm9
-	psrlq	$2,%xmm6
-	movdqa	%xmm2,%xmm10
-	psrlq	$2,%xmm2
-	pxor	%xmm4,%xmm6
-	pxor	%xmm1,%xmm2
-	pand	%xmm8,%xmm6
-	pand	%xmm8,%xmm2
-	pxor	%xmm6,%xmm4
-	psllq	$2,%xmm6
-	pxor	%xmm2,%xmm1
-	psllq	$2,%xmm2
-	pxor	%xmm9,%xmm6
-	pxor	%xmm10,%xmm2
-	movdqa	%xmm0,%xmm9
-	psrlq	$2,%xmm0
-	movdqa	%xmm15,%xmm10
-	psrlq	$2,%xmm15
-	pxor	%xmm5,%xmm0
-	pxor	%xmm3,%xmm15
-	pand	%xmm8,%xmm0
-	pand	%xmm8,%xmm15
-	pxor	%xmm0,%xmm5
-	psllq	$2,%xmm0
-	pxor	%xmm15,%xmm3
-	psllq	$2,%xmm15
-	pxor	%xmm9,%xmm0
-	pxor	%xmm10,%xmm15
-	movdqa	%xmm5,%xmm9
-	psrlq	$4,%xmm5
-	movdqa	%xmm3,%xmm10
-	psrlq	$4,%xmm3
-	pxor	%xmm4,%xmm5
-	pxor	%xmm1,%xmm3
-	pand	%xmm7,%xmm5
-	pand	%xmm7,%xmm3
-	pxor	%xmm5,%xmm4
-	psllq	$4,%xmm5
-	pxor	%xmm3,%xmm1
-	psllq	$4,%xmm3
-	pxor	%xmm9,%xmm5
-	pxor	%xmm10,%xmm3
-	movdqa	%xmm0,%xmm9
-	psrlq	$4,%xmm0
-	movdqa	%xmm15,%xmm10
-	psrlq	$4,%xmm15
-	pxor	%xmm6,%xmm0
-	pxor	%xmm2,%xmm15
-	pand	%xmm7,%xmm0
-	pand	%xmm7,%xmm15
-	pxor	%xmm0,%xmm6
-	psllq	$4,%xmm0
-	pxor	%xmm15,%xmm2
-	psllq	$4,%xmm15
-	pxor	%xmm9,%xmm0
-	pxor	%xmm10,%xmm15
-	movdqa	(%rax),%xmm7
-	pxor	%xmm7,%xmm3
-	pxor	%xmm7,%xmm5
-	pxor	%xmm7,%xmm2
-	pxor	%xmm7,%xmm6
-	pxor	%xmm7,%xmm1
-	pxor	%xmm7,%xmm4
-	pxor	%xmm7,%xmm15
-	pxor	%xmm7,%xmm0
-	.byte	0xf3,0xc3
-.cfi_endproc	
-.size	_bsaes_encrypt8,.-_bsaes_encrypt8
-
-.type	_bsaes_decrypt8,@function
-.align	64
-_bsaes_decrypt8:
-.cfi_startproc	
-	leaq	.LBS0(%rip),%r11
-
-	movdqa	(%rax),%xmm8
-	leaq	16(%rax),%rax
-	movdqa	-48(%r11),%xmm7
-	pxor	%xmm8,%xmm15
-	pxor	%xmm8,%xmm0
-	pxor	%xmm8,%xmm1
-	pxor	%xmm8,%xmm2
-.byte	102,68,15,56,0,255
-.byte	102,15,56,0,199
-	pxor	%xmm8,%xmm3
-	pxor	%xmm8,%xmm4
-.byte	102,15,56,0,207
-.byte	102,15,56,0,215
-	pxor	%xmm8,%xmm5
-	pxor	%xmm8,%xmm6
-.byte	102,15,56,0,223
-.byte	102,15,56,0,231
-.byte	102,15,56,0,239
-.byte	102,15,56,0,247
-	movdqa	0(%r11),%xmm7
-	movdqa	16(%r11),%xmm8
-	movdqa	%xmm5,%xmm9
-	psrlq	$1,%xmm5
-	movdqa	%xmm3,%xmm10
-	psrlq	$1,%xmm3
-	pxor	%xmm6,%xmm5
-	pxor	%xmm4,%xmm3
-	pand	%xmm7,%xmm5
-	pand	%xmm7,%xmm3
-	pxor	%xmm5,%xmm6
-	psllq	$1,%xmm5
-	pxor	%xmm3,%xmm4
-	psllq	$1,%xmm3
-	pxor	%xmm9,%xmm5
-	pxor	%xmm10,%xmm3
-	movdqa	%xmm1,%xmm9
-	psrlq	$1,%xmm1
-	movdqa	%xmm15,%xmm10
-	psrlq	$1,%xmm15
-	pxor	%xmm2,%xmm1
-	pxor	%xmm0,%xmm15
-	pand	%xmm7,%xmm1
-	pand	%xmm7,%xmm15
-	pxor	%xmm1,%xmm2
-	psllq	$1,%xmm1
-	pxor	%xmm15,%xmm0
-	psllq	$1,%xmm15
-	pxor	%xmm9,%xmm1
-	pxor	%xmm10,%xmm15
-	movdqa	32(%r11),%xmm7
-	movdqa	%xmm4,%xmm9
-	psrlq	$2,%xmm4
-	movdqa	%xmm3,%xmm10
-	psrlq	$2,%xmm3
-	pxor	%xmm6,%xmm4
-	pxor	%xmm5,%xmm3
-	pand	%xmm8,%xmm4
-	pand	%xmm8,%xmm3
-	pxor	%xmm4,%xmm6
-	psllq	$2,%xmm4
-	pxor	%xmm3,%xmm5
-	psllq	$2,%xmm3
-	pxor	%xmm9,%xmm4
-	pxor	%xmm10,%xmm3
-	movdqa	%xmm0,%xmm9
-	psrlq	$2,%xmm0
-	movdqa	%xmm15,%xmm10
-	psrlq	$2,%xmm15
-	pxor	%xmm2,%xmm0
-	pxor	%xmm1,%xmm15
-	pand	%xmm8,%xmm0
-	pand	%xmm8,%xmm15
-	pxor	%xmm0,%xmm2
-	psllq	$2,%xmm0
-	pxor	%xmm15,%xmm1
-	psllq	$2,%xmm15
-	pxor	%xmm9,%xmm0
-	pxor	%xmm10,%xmm15
-	movdqa	%xmm2,%xmm9
-	psrlq	$4,%xmm2
-	movdqa	%xmm1,%xmm10
-	psrlq	$4,%xmm1
-	pxor	%xmm6,%xmm2
-	pxor	%xmm5,%xmm1
-	pand	%xmm7,%xmm2
-	pand	%xmm7,%xmm1
-	pxor	%xmm2,%xmm6
-	psllq	$4,%xmm2
-	pxor	%xmm1,%xmm5
-	psllq	$4,%xmm1
-	pxor	%xmm9,%xmm2
-	pxor	%xmm10,%xmm1
-	movdqa	%xmm0,%xmm9
-	psrlq	$4,%xmm0
-	movdqa	%xmm15,%xmm10
-	psrlq	$4,%xmm15
-	pxor	%xmm4,%xmm0
-	pxor	%xmm3,%xmm15
-	pand	%xmm7,%xmm0
-	pand	%xmm7,%xmm15
-	pxor	%xmm0,%xmm4
-	psllq	$4,%xmm0
-	pxor	%xmm15,%xmm3
-	psllq	$4,%xmm15
-	pxor	%xmm9,%xmm0
-	pxor	%xmm10,%xmm15
-	decl	%r10d
-	jmp	.Ldec_sbox
-.align	16
-.Ldec_loop:
-	pxor	0(%rax),%xmm15
-	pxor	16(%rax),%xmm0
-	pxor	32(%rax),%xmm1
-	pxor	48(%rax),%xmm2
-.byte	102,68,15,56,0,255
-.byte	102,15,56,0,199
-	pxor	64(%rax),%xmm3
-	pxor	80(%rax),%xmm4
-.byte	102,15,56,0,207
-.byte	102,15,56,0,215
-	pxor	96(%rax),%xmm5
-	pxor	112(%rax),%xmm6
-.byte	102,15,56,0,223
-.byte	102,15,56,0,231
-.byte	102,15,56,0,239
-.byte	102,15,56,0,247
-	leaq	128(%rax),%rax
-.Ldec_sbox:
-	pxor	%xmm3,%xmm2
-
-	pxor	%xmm6,%xmm3
-	pxor	%xmm6,%xmm1
-	pxor	%xmm3,%xmm5
-	pxor	%xmm5,%xmm6
-	pxor	%xmm6,%xmm0
-
-	pxor	%xmm0,%xmm15
-	pxor	%xmm4,%xmm1
-	pxor	%xmm15,%xmm2
-	pxor	%xmm15,%xmm4
-	pxor	%xmm2,%xmm0
-	movdqa	%xmm2,%xmm10
-	movdqa	%xmm6,%xmm9
-	movdqa	%xmm0,%xmm8
-	movdqa	%xmm3,%xmm12
-	movdqa	%xmm4,%xmm11
-
-	pxor	%xmm15,%xmm10
-	pxor	%xmm3,%xmm9
-	pxor	%xmm5,%xmm8
-	movdqa	%xmm10,%xmm13
-	pxor	%xmm15,%xmm12
-	movdqa	%xmm9,%xmm7
-	pxor	%xmm1,%xmm11
-	movdqa	%xmm10,%xmm14
-
-	por	%xmm8,%xmm9
-	por	%xmm11,%xmm10
-	pxor	%xmm7,%xmm14
-	pand	%xmm11,%xmm13
-	pxor	%xmm8,%xmm11
-	pand	%xmm8,%xmm7
-	pand	%xmm11,%xmm14
-	movdqa	%xmm5,%xmm11
-	pxor	%xmm1,%xmm11
-	pand	%xmm11,%xmm12
-	pxor	%xmm12,%xmm10
-	pxor	%xmm12,%xmm9
-	movdqa	%xmm2,%xmm12
-	movdqa	%xmm0,%xmm11
-	pxor	%xmm6,%xmm12
-	pxor	%xmm4,%xmm11
-	movdqa	%xmm12,%xmm8
-	pand	%xmm11,%xmm12
-	por	%xmm11,%xmm8
-	pxor	%xmm12,%xmm7
-	pxor	%xmm14,%xmm10
-	pxor	%xmm13,%xmm9
-	pxor	%xmm14,%xmm8
-	movdqa	%xmm3,%xmm11
-	pxor	%xmm13,%xmm7
-	movdqa	%xmm15,%xmm12
-	pxor	%xmm13,%xmm8
-	movdqa	%xmm6,%xmm13
-	pand	%xmm5,%xmm11
-	movdqa	%xmm2,%xmm14
-	pand	%xmm1,%xmm12
-	pand	%xmm0,%xmm13
-	por	%xmm4,%xmm14
-	pxor	%xmm11,%xmm10
-	pxor	%xmm12,%xmm9
-	pxor	%xmm13,%xmm8
-	pxor	%xmm14,%xmm7
-
-
-
-
-
-	movdqa	%xmm10,%xmm11
-	pand	%xmm8,%xmm10
-	pxor	%xmm9,%xmm11
-
-	movdqa	%xmm7,%xmm13
-	movdqa	%xmm11,%xmm14
-	pxor	%xmm10,%xmm13
-	pand	%xmm13,%xmm14
-
-	movdqa	%xmm8,%xmm12
-	pxor	%xmm9,%xmm14
-	pxor	%xmm7,%xmm12
-
-	pxor	%xmm9,%xmm10
-
-	pand	%xmm10,%xmm12
-
-	movdqa	%xmm13,%xmm9
-	pxor	%xmm7,%xmm12
-
-	pxor	%xmm12,%xmm9
-	pxor	%xmm12,%xmm8
-
-	pand	%xmm7,%xmm9
-
-	pxor	%xmm9,%xmm13
-	pxor	%xmm9,%xmm8
-
-	pand	%xmm14,%xmm13
-
-	pxor	%xmm11,%xmm13
-	movdqa	%xmm4,%xmm11
-	movdqa	%xmm0,%xmm7
-	movdqa	%xmm14,%xmm9
-	pxor	%xmm13,%xmm9
-	pand	%xmm4,%xmm9
-	pxor	%xmm0,%xmm4
-	pand	%xmm14,%xmm0
-	pand	%xmm13,%xmm4
-	pxor	%xmm0,%xmm4
-	pxor	%xmm9,%xmm0
-	pxor	%xmm1,%xmm11
-	pxor	%xmm5,%xmm7
-	pxor	%xmm12,%xmm14
-	pxor	%xmm8,%xmm13
-	movdqa	%xmm14,%xmm10
-	movdqa	%xmm12,%xmm9
-	pxor	%xmm13,%xmm10
-	pxor	%xmm8,%xmm9
-	pand	%xmm11,%xmm10
-	pand	%xmm1,%xmm9
-	pxor	%xmm7,%xmm11
-	pxor	%xmm5,%xmm1
-	pand	%xmm14,%xmm7
-	pand	%xmm12,%xmm5
-	pand	%xmm13,%xmm11
-	pand	%xmm8,%xmm1
-	pxor	%xmm11,%xmm7
-	pxor	%xmm5,%xmm1
-	pxor	%xmm10,%xmm11
-	pxor	%xmm9,%xmm5
-	pxor	%xmm11,%xmm4
-	pxor	%xmm11,%xmm1
-	pxor	%xmm7,%xmm0
-	pxor	%xmm7,%xmm5
-
-	movdqa	%xmm2,%xmm11
-	movdqa	%xmm6,%xmm7
-	pxor	%xmm15,%xmm11
-	pxor	%xmm3,%xmm7
-	movdqa	%xmm14,%xmm10
-	movdqa	%xmm12,%xmm9
-	pxor	%xmm13,%xmm10
-	pxor	%xmm8,%xmm9
-	pand	%xmm11,%xmm10
-	pand	%xmm15,%xmm9
-	pxor	%xmm7,%xmm11
-	pxor	%xmm3,%xmm15
-	pand	%xmm14,%xmm7
-	pand	%xmm12,%xmm3
-	pand	%xmm13,%xmm11
-	pand	%xmm8,%xmm15
-	pxor	%xmm11,%xmm7
-	pxor	%xmm3,%xmm15
-	pxor	%xmm10,%xmm11
-	pxor	%xmm9,%xmm3
-	pxor	%xmm12,%xmm14
-	pxor	%xmm8,%xmm13
-	movdqa	%xmm14,%xmm10
-	pxor	%xmm13,%xmm10
-	pand	%xmm2,%xmm10
-	pxor	%xmm6,%xmm2
-	pand	%xmm14,%xmm6
-	pand	%xmm13,%xmm2
-	pxor	%xmm6,%xmm2
-	pxor	%xmm10,%xmm6
-	pxor	%xmm11,%xmm2
-	pxor	%xmm11,%xmm15
-	pxor	%xmm7,%xmm6
-	pxor	%xmm7,%xmm3
-	pxor	%xmm6,%xmm0
-	pxor	%xmm4,%xmm5
-
-	pxor	%xmm0,%xmm3
-	pxor	%xmm6,%xmm1
-	pxor	%xmm6,%xmm4
-	pxor	%xmm1,%xmm3
-	pxor	%xmm15,%xmm6
-	pxor	%xmm4,%xmm3
-	pxor	%xmm5,%xmm2
-	pxor	%xmm0,%xmm5
-	pxor	%xmm3,%xmm2
-
-	pxor	%xmm15,%xmm3
-	pxor	%xmm2,%xmm6
-	decl	%r10d
-	jl	.Ldec_done
-
-	pshufd	$0x4E,%xmm15,%xmm7
-	pshufd	$0x4E,%xmm2,%xmm13
-	pxor	%xmm15,%xmm7
-	pshufd	$0x4E,%xmm4,%xmm14
-	pxor	%xmm2,%xmm13
-	pshufd	$0x4E,%xmm0,%xmm8
-	pxor	%xmm4,%xmm14
-	pshufd	$0x4E,%xmm5,%xmm9
-	pxor	%xmm0,%xmm8
-	pshufd	$0x4E,%xmm3,%xmm10
-	pxor	%xmm5,%xmm9
-	pxor	%xmm13,%xmm15
-	pxor	%xmm13,%xmm0
-	pshufd	$0x4E,%xmm1,%xmm11
-	pxor	%xmm3,%xmm10
-	pxor	%xmm7,%xmm5
-	pxor	%xmm8,%xmm3
-	pshufd	$0x4E,%xmm6,%xmm12
-	pxor	%xmm1,%xmm11
-	pxor	%xmm14,%xmm0
-	pxor	%xmm9,%xmm1
-	pxor	%xmm6,%xmm12
-
-	pxor	%xmm14,%xmm5
-	pxor	%xmm13,%xmm3
-	pxor	%xmm13,%xmm1
-	pxor	%xmm10,%xmm6
-	pxor	%xmm11,%xmm2
-	pxor	%xmm14,%xmm1
-	pxor	%xmm14,%xmm6
-	pxor	%xmm12,%xmm4
-	pshufd	$0x93,%xmm15,%xmm7
-	pshufd	$0x93,%xmm0,%xmm8
-	pxor	%xmm7,%xmm15
-	pshufd	$0x93,%xmm5,%xmm9
-	pxor	%xmm8,%xmm0
-	pshufd	$0x93,%xmm3,%xmm10
-	pxor	%xmm9,%xmm5
-	pshufd	$0x93,%xmm1,%xmm11
-	pxor	%xmm10,%xmm3
-	pshufd	$0x93,%xmm6,%xmm12
-	pxor	%xmm11,%xmm1
-	pshufd	$0x93,%xmm2,%xmm13
-	pxor	%xmm12,%xmm6
-	pshufd	$0x93,%xmm4,%xmm14
-	pxor	%xmm13,%xmm2
-	pxor	%xmm14,%xmm4
-
-	pxor	%xmm15,%xmm8
-	pxor	%xmm4,%xmm7
-	pxor	%xmm4,%xmm8
-	pshufd	$0x4E,%xmm15,%xmm15
-	pxor	%xmm0,%xmm9
-	pshufd	$0x4E,%xmm0,%xmm0
-	pxor	%xmm1,%xmm12
-	pxor	%xmm7,%xmm15
-	pxor	%xmm6,%xmm13
-	pxor	%xmm8,%xmm0
-	pxor	%xmm3,%xmm11
-	pshufd	$0x4E,%xmm1,%xmm7
-	pxor	%xmm2,%xmm14
-	pshufd	$0x4E,%xmm6,%xmm8
-	pxor	%xmm5,%xmm10
-	pshufd	$0x4E,%xmm3,%xmm1
-	pxor	%xmm4,%xmm10
-	pshufd	$0x4E,%xmm4,%xmm6
-	pxor	%xmm4,%xmm11
-	pshufd	$0x4E,%xmm2,%xmm3
-	pxor	%xmm11,%xmm7
-	pshufd	$0x4E,%xmm5,%xmm2
-	pxor	%xmm12,%xmm8
-	pxor	%xmm1,%xmm10
-	pxor	%xmm14,%xmm6
-	pxor	%xmm3,%xmm13
-	movdqa	%xmm7,%xmm3
-	pxor	%xmm9,%xmm2
-	movdqa	%xmm13,%xmm5
-	movdqa	%xmm8,%xmm4
-	movdqa	%xmm2,%xmm1
-	movdqa	%xmm10,%xmm2
-	movdqa	-16(%r11),%xmm7
-	jnz	.Ldec_loop
-	movdqa	-32(%r11),%xmm7
-	jmp	.Ldec_loop
-.align	16
-.Ldec_done:
-	movdqa	0(%r11),%xmm7
-	movdqa	16(%r11),%xmm8
-	movdqa	%xmm2,%xmm9
-	psrlq	$1,%xmm2
-	movdqa	%xmm1,%xmm10
-	psrlq	$1,%xmm1
-	pxor	%xmm4,%xmm2
-	pxor	%xmm6,%xmm1
-	pand	%xmm7,%xmm2
-	pand	%xmm7,%xmm1
-	pxor	%xmm2,%xmm4
-	psllq	$1,%xmm2
-	pxor	%xmm1,%xmm6
-	psllq	$1,%xmm1
-	pxor	%xmm9,%xmm2
-	pxor	%xmm10,%xmm1
-	movdqa	%xmm5,%xmm9
-	psrlq	$1,%xmm5
-	movdqa	%xmm15,%xmm10
-	psrlq	$1,%xmm15
-	pxor	%xmm3,%xmm5
-	pxor	%xmm0,%xmm15
-	pand	%xmm7,%xmm5
-	pand	%xmm7,%xmm15
-	pxor	%xmm5,%xmm3
-	psllq	$1,%xmm5
-	pxor	%xmm15,%xmm0
-	psllq	$1,%xmm15
-	pxor	%xmm9,%xmm5
-	pxor	%xmm10,%xmm15
-	movdqa	32(%r11),%xmm7
-	movdqa	%xmm6,%xmm9
-	psrlq	$2,%xmm6
-	movdqa	%xmm1,%xmm10
-	psrlq	$2,%xmm1
-	pxor	%xmm4,%xmm6
-	pxor	%xmm2,%xmm1
-	pand	%xmm8,%xmm6
-	pand	%xmm8,%xmm1
-	pxor	%xmm6,%xmm4
-	psllq	$2,%xmm6
-	pxor	%xmm1,%xmm2
-	psllq	$2,%xmm1
-	pxor	%xmm9,%xmm6
-	pxor	%xmm10,%xmm1
-	movdqa	%xmm0,%xmm9
-	psrlq	$2,%xmm0
-	movdqa	%xmm15,%xmm10
-	psrlq	$2,%xmm15
-	pxor	%xmm3,%xmm0
-	pxor	%xmm5,%xmm15
-	pand	%xmm8,%xmm0
-	pand	%xmm8,%xmm15
-	pxor	%xmm0,%xmm3
-	psllq	$2,%xmm0
-	pxor	%xmm15,%xmm5
-	psllq	$2,%xmm15
-	pxor	%xmm9,%xmm0
-	pxor	%xmm10,%xmm15
-	movdqa	%xmm3,%xmm9
-	psrlq	$4,%xmm3
-	movdqa	%xmm5,%xmm10
-	psrlq	$4,%xmm5
-	pxor	%xmm4,%xmm3
-	pxor	%xmm2,%xmm5
-	pand	%xmm7,%xmm3
-	pand	%xmm7,%xmm5
-	pxor	%xmm3,%xmm4
-	psllq	$4,%xmm3
-	pxor	%xmm5,%xmm2
-	psllq	$4,%xmm5
-	pxor	%xmm9,%xmm3
-	pxor	%xmm10,%xmm5
-	movdqa	%xmm0,%xmm9
-	psrlq	$4,%xmm0
-	movdqa	%xmm15,%xmm10
-	psrlq	$4,%xmm15
-	pxor	%xmm6,%xmm0
-	pxor	%xmm1,%xmm15
-	pand	%xmm7,%xmm0
-	pand	%xmm7,%xmm15
-	pxor	%xmm0,%xmm6
-	psllq	$4,%xmm0
-	pxor	%xmm15,%xmm1
-	psllq	$4,%xmm15
-	pxor	%xmm9,%xmm0
-	pxor	%xmm10,%xmm15
-	movdqa	(%rax),%xmm7
-	pxor	%xmm7,%xmm5
-	pxor	%xmm7,%xmm3
-	pxor	%xmm7,%xmm1
-	pxor	%xmm7,%xmm6
-	pxor	%xmm7,%xmm2
-	pxor	%xmm7,%xmm4
-	pxor	%xmm7,%xmm15
-	pxor	%xmm7,%xmm0
-	.byte	0xf3,0xc3
-.cfi_endproc	
-.size	_bsaes_decrypt8,.-_bsaes_decrypt8
-.type	_bsaes_key_convert,@function
-.align	16
-_bsaes_key_convert:
-.cfi_startproc	
-	leaq	.Lmasks(%rip),%r11
-	movdqu	(%rcx),%xmm7
-	leaq	16(%rcx),%rcx
-	movdqa	0(%r11),%xmm0
-	movdqa	16(%r11),%xmm1
-	movdqa	32(%r11),%xmm2
-	movdqa	48(%r11),%xmm3
-	movdqa	64(%r11),%xmm4
-	pcmpeqd	%xmm5,%xmm5
-
-	movdqu	(%rcx),%xmm6
-	movdqa	%xmm7,(%rax)
-	leaq	16(%rax),%rax
-	decl	%r10d
-	jmp	.Lkey_loop
-.align	16
-.Lkey_loop:
-.byte	102,15,56,0,244
-
-	movdqa	%xmm0,%xmm8
-	movdqa	%xmm1,%xmm9
-
-	pand	%xmm6,%xmm8
-	pand	%xmm6,%xmm9
-	movdqa	%xmm2,%xmm10
-	pcmpeqb	%xmm0,%xmm8
-	psllq	$4,%xmm0
-	movdqa	%xmm3,%xmm11
-	pcmpeqb	%xmm1,%xmm9
-	psllq	$4,%xmm1
-
-	pand	%xmm6,%xmm10
-	pand	%xmm6,%xmm11
-	movdqa	%xmm0,%xmm12
-	pcmpeqb	%xmm2,%xmm10
-	psllq	$4,%xmm2
-	movdqa	%xmm1,%xmm13
-	pcmpeqb	%xmm3,%xmm11
-	psllq	$4,%xmm3
-
-	movdqa	%xmm2,%xmm14
-	movdqa	%xmm3,%xmm15
-	pxor	%xmm5,%xmm8
-	pxor	%xmm5,%xmm9
-
-	pand	%xmm6,%xmm12
-	pand	%xmm6,%xmm13
-	movdqa	%xmm8,0(%rax)
-	pcmpeqb	%xmm0,%xmm12
-	psrlq	$4,%xmm0
-	movdqa	%xmm9,16(%rax)
-	pcmpeqb	%xmm1,%xmm13
-	psrlq	$4,%xmm1
-	leaq	16(%rcx),%rcx
-
-	pand	%xmm6,%xmm14
-	pand	%xmm6,%xmm15
-	movdqa	%xmm10,32(%rax)
-	pcmpeqb	%xmm2,%xmm14
-	psrlq	$4,%xmm2
-	movdqa	%xmm11,48(%rax)
-	pcmpeqb	%xmm3,%xmm15
-	psrlq	$4,%xmm3
-	movdqu	(%rcx),%xmm6
-
-	pxor	%xmm5,%xmm13
-	pxor	%xmm5,%xmm14
-	movdqa	%xmm12,64(%rax)
-	movdqa	%xmm13,80(%rax)
-	movdqa	%xmm14,96(%rax)
-	movdqa	%xmm15,112(%rax)
-	leaq	128(%rax),%rax
-	decl	%r10d
-	jnz	.Lkey_loop
-
-	movdqa	80(%r11),%xmm7
-
-	.byte	0xf3,0xc3
-.cfi_endproc	
-.size	_bsaes_key_convert,.-_bsaes_key_convert
-
-.globl	bsaes_cbc_encrypt
-.type	bsaes_cbc_encrypt,@function
-.align	16
-bsaes_cbc_encrypt:
-.cfi_startproc	
-	cmpl	$0,%r9d
-	jne	asm_AES_cbc_encrypt
-	cmpq	$128,%rdx
-	jb	asm_AES_cbc_encrypt
-
-	movq	%rsp,%rax
-.Lcbc_dec_prologue:
-	pushq	%rbp
-.cfi_adjust_cfa_offset	8
-.cfi_offset	%rbp,-16
-	pushq	%rbx
-.cfi_adjust_cfa_offset	8
-.cfi_offset	%rbx,-24
-	pushq	%r12
-.cfi_adjust_cfa_offset	8
-.cfi_offset	%r12,-32
-	pushq	%r13
-.cfi_adjust_cfa_offset	8
-.cfi_offset	%r13,-40
-	pushq	%r14
-.cfi_adjust_cfa_offset	8
-.cfi_offset	%r14,-48
-	pushq	%r15
-.cfi_adjust_cfa_offset	8
-.cfi_offset	%r15,-56
-	leaq	-72(%rsp),%rsp
-.cfi_adjust_cfa_offset	0x48
-	movq	%rsp,%rbp
-.cfi_def_cfa_register	%rbp
-	movl	240(%rcx),%eax
-	movq	%rdi,%r12
-	movq	%rsi,%r13
-	movq	%rdx,%r14
-	movq	%rcx,%r15
-	movq	%r8,%rbx
-	shrq	$4,%r14
-
-	movl	%eax,%edx
-	shlq	$7,%rax
-	subq	$96,%rax
-	subq	%rax,%rsp
-
-	movq	%rsp,%rax
-	movq	%r15,%rcx
-	movl	%edx,%r10d
-	call	_bsaes_key_convert
-	pxor	(%rsp),%xmm7
-	movdqa	%xmm6,(%rax)
-	movdqa	%xmm7,(%rsp)
-
-	movdqu	(%rbx),%xmm14
-	subq	$8,%r14
-.Lcbc_dec_loop:
-	movdqu	0(%r12),%xmm15
-	movdqu	16(%r12),%xmm0
-	movdqu	32(%r12),%xmm1
-	movdqu	48(%r12),%xmm2
-	movdqu	64(%r12),%xmm3
-	movdqu	80(%r12),%xmm4
-	movq	%rsp,%rax
-	movdqu	96(%r12),%xmm5
-	movl	%edx,%r10d
-	movdqu	112(%r12),%xmm6
-	movdqa	%xmm14,32(%rbp)
-
-	call	_bsaes_decrypt8
-
-	pxor	32(%rbp),%xmm15
-	movdqu	0(%r12),%xmm7
-	movdqu	16(%r12),%xmm8
-	pxor	%xmm7,%xmm0
-	movdqu	32(%r12),%xmm9
-	pxor	%xmm8,%xmm5
-	movdqu	48(%r12),%xmm10
-	pxor	%xmm9,%xmm3
-	movdqu	64(%r12),%xmm11
-	pxor	%xmm10,%xmm1
-	movdqu	80(%r12),%xmm12
-	pxor	%xmm11,%xmm6
-	movdqu	96(%r12),%xmm13
-	pxor	%xmm12,%xmm2
-	movdqu	112(%r12),%xmm14
-	pxor	%xmm13,%xmm4
-	movdqu	%xmm15,0(%r13)
-	leaq	128(%r12),%r12
-	movdqu	%xmm0,16(%r13)
-	movdqu	%xmm5,32(%r13)
-	movdqu	%xmm3,48(%r13)
-	movdqu	%xmm1,64(%r13)
-	movdqu	%xmm6,80(%r13)
-	movdqu	%xmm2,96(%r13)
-	movdqu	%xmm4,112(%r13)
-	leaq	128(%r13),%r13
-	subq	$8,%r14
-	jnc	.Lcbc_dec_loop
-
-	addq	$8,%r14
-	jz	.Lcbc_dec_done
-
-	movdqu	0(%r12),%xmm15
-	movq	%rsp,%rax
-	movl	%edx,%r10d
-	cmpq	$2,%r14
-	jb	.Lcbc_dec_one
-	movdqu	16(%r12),%xmm0
-	je	.Lcbc_dec_two
-	movdqu	32(%r12),%xmm1
-	cmpq	$4,%r14
-	jb	.Lcbc_dec_three
-	movdqu	48(%r12),%xmm2
-	je	.Lcbc_dec_four
-	movdqu	64(%r12),%xmm3
-	cmpq	$6,%r14
-	jb	.Lcbc_dec_five
-	movdqu	80(%r12),%xmm4
-	je	.Lcbc_dec_six
-	movdqu	96(%r12),%xmm5
-	movdqa	%xmm14,32(%rbp)
-	call	_bsaes_decrypt8
-	pxor	32(%rbp),%xmm15
-	movdqu	0(%r12),%xmm7
-	movdqu	16(%r12),%xmm8
-	pxor	%xmm7,%xmm0
-	movdqu	32(%r12),%xmm9
-	pxor	%xmm8,%xmm5
-	movdqu	48(%r12),%xmm10
-	pxor	%xmm9,%xmm3
-	movdqu	64(%r12),%xmm11
-	pxor	%xmm10,%xmm1
-	movdqu	80(%r12),%xmm12
-	pxor	%xmm11,%xmm6
-	movdqu	96(%r12),%xmm14
-	pxor	%xmm12,%xmm2
-	movdqu	%xmm15,0(%r13)
-	movdqu	%xmm0,16(%r13)
-	movdqu	%xmm5,32(%r13)
-	movdqu	%xmm3,48(%r13)
-	movdqu	%xmm1,64(%r13)
-	movdqu	%xmm6,80(%r13)
-	movdqu	%xmm2,96(%r13)
-	jmp	.Lcbc_dec_done
-.align	16
-.Lcbc_dec_six:
-	movdqa	%xmm14,32(%rbp)
-	call	_bsaes_decrypt8
-	pxor	32(%rbp),%xmm15
-	movdqu	0(%r12),%xmm7
-	movdqu	16(%r12),%xmm8
-	pxor	%xmm7,%xmm0
-	movdqu	32(%r12),%xmm9
-	pxor	%xmm8,%xmm5
-	movdqu	48(%r12),%xmm10
-	pxor	%xmm9,%xmm3
-	movdqu	64(%r12),%xmm11
-	pxor	%xmm10,%xmm1
-	movdqu	80(%r12),%xmm14
-	pxor	%xmm11,%xmm6
-	movdqu	%xmm15,0(%r13)
-	movdqu	%xmm0,16(%r13)
-	movdqu	%xmm5,32(%r13)
-	movdqu	%xmm3,48(%r13)
-	movdqu	%xmm1,64(%r13)
-	movdqu	%xmm6,80(%r13)
-	jmp	.Lcbc_dec_done
-.align	16
-.Lcbc_dec_five:
-	movdqa	%xmm14,32(%rbp)
-	call	_bsaes_decrypt8
-	pxor	32(%rbp),%xmm15
-	movdqu	0(%r12),%xmm7
-	movdqu	16(%r12),%xmm8
-	pxor	%xmm7,%xmm0
-	movdqu	32(%r12),%xmm9
-	pxor	%xmm8,%xmm5
-	movdqu	48(%r12),%xmm10
-	pxor	%xmm9,%xmm3
-	movdqu	64(%r12),%xmm14
-	pxor	%xmm10,%xmm1
-	movdqu	%xmm15,0(%r13)
-	movdqu	%xmm0,16(%r13)
-	movdqu	%xmm5,32(%r13)
-	movdqu	%xmm3,48(%r13)
-	movdqu	%xmm1,64(%r13)
-	jmp	.Lcbc_dec_done
-.align	16
-.Lcbc_dec_four:
-	movdqa	%xmm14,32(%rbp)
-	call	_bsaes_decrypt8
-	pxor	32(%rbp),%xmm15
-	movdqu	0(%r12),%xmm7
-	movdqu	16(%r12),%xmm8
-	pxor	%xmm7,%xmm0
-	movdqu	32(%r12),%xmm9
-	pxor	%xmm8,%xmm5
-	movdqu	48(%r12),%xmm14
-	pxor	%xmm9,%xmm3
-	movdqu	%xmm15,0(%r13)
-	movdqu	%xmm0,16(%r13)
-	movdqu	%xmm5,32(%r13)
-	movdqu	%xmm3,48(%r13)
-	jmp	.Lcbc_dec_done
-.align	16
-.Lcbc_dec_three:
-	movdqa	%xmm14,32(%rbp)
-	call	_bsaes_decrypt8
-	pxor	32(%rbp),%xmm15
-	movdqu	0(%r12),%xmm7
-	movdqu	16(%r12),%xmm8
-	pxor	%xmm7,%xmm0
-	movdqu	32(%r12),%xmm14
-	pxor	%xmm8,%xmm5
-	movdqu	%xmm15,0(%r13)
-	movdqu	%xmm0,16(%r13)
-	movdqu	%xmm5,32(%r13)
-	jmp	.Lcbc_dec_done
-.align	16
-.Lcbc_dec_two:
-	movdqa	%xmm14,32(%rbp)
-	call	_bsaes_decrypt8
-	pxor	32(%rbp),%xmm15
-	movdqu	0(%r12),%xmm7
-	movdqu	16(%r12),%xmm14
-	pxor	%xmm7,%xmm0
-	movdqu	%xmm15,0(%r13)
-	movdqu	%xmm0,16(%r13)
-	jmp	.Lcbc_dec_done
-.align	16
-.Lcbc_dec_one:
-	leaq	(%r12),%rdi
-	leaq	32(%rbp),%rsi
-	leaq	(%r15),%rdx
-	call	asm_AES_decrypt
-	pxor	32(%rbp),%xmm14
-	movdqu	%xmm14,(%r13)
-	movdqa	%xmm15,%xmm14
-
-.Lcbc_dec_done:
-	movdqu	%xmm14,(%rbx)
-	leaq	(%rsp),%rax
-	pxor	%xmm0,%xmm0
-.Lcbc_dec_bzero:
-	movdqa	%xmm0,0(%rax)
-	movdqa	%xmm0,16(%rax)
-	leaq	32(%rax),%rax
-	cmpq	%rax,%rbp
-	ja	.Lcbc_dec_bzero
-
-	leaq	120(%rbp),%rax
-.cfi_def_cfa	%rax,8
-	movq	-48(%rax),%r15
-.cfi_restore	%r15
-	movq	-40(%rax),%r14
-.cfi_restore	%r14
-	movq	-32(%rax),%r13
-.cfi_restore	%r13
-	movq	-24(%rax),%r12
-.cfi_restore	%r12
-	movq	-16(%rax),%rbx
-.cfi_restore	%rbx
-	movq	-8(%rax),%rbp
-.cfi_restore	%rbp
-	leaq	(%rax),%rsp
-.cfi_def_cfa_register	%rsp
-.Lcbc_dec_epilogue:
-	.byte	0xf3,0xc3
-.cfi_endproc	
-.size	bsaes_cbc_encrypt,.-bsaes_cbc_encrypt
-
-.globl	bsaes_ctr32_encrypt_blocks
-.type	bsaes_ctr32_encrypt_blocks,@function
-.align	16
-bsaes_ctr32_encrypt_blocks:
-.cfi_startproc	
-	movq	%rsp,%rax
-.Lctr_enc_prologue:
-	pushq	%rbp
-.cfi_adjust_cfa_offset	8
-.cfi_offset	%rbp,-16
-	pushq	%rbx
-.cfi_adjust_cfa_offset	8
-.cfi_offset	%rbx,-24
-	pushq	%r12
-.cfi_adjust_cfa_offset	8
-.cfi_offset	%r12,-32
-	pushq	%r13
-.cfi_adjust_cfa_offset	8
-.cfi_offset	%r13,-40
-	pushq	%r14
-.cfi_adjust_cfa_offset	8
-.cfi_offset	%r14,-48
-	pushq	%r15
-.cfi_adjust_cfa_offset	8
-.cfi_offset	%r15,-56
-	leaq	-72(%rsp),%rsp
-.cfi_adjust_cfa_offset	0x48
-	movq	%rsp,%rbp
-.cfi_def_cfa_register	%rbp
-	movdqu	(%r8),%xmm0
-	movl	240(%rcx),%eax
-	movq	%rdi,%r12
-	movq	%rsi,%r13
-	movq	%rdx,%r14
-	movq	%rcx,%r15
-	movdqa	%xmm0,32(%rbp)
-	cmpq	$8,%rdx
-	jb	.Lctr_enc_short
-
-	movl	%eax,%ebx
-	shlq	$7,%rax
-	subq	$96,%rax
-	subq	%rax,%rsp
-
-	movq	%rsp,%rax
-	movq	%r15,%rcx
-	movl	%ebx,%r10d
-	call	_bsaes_key_convert
-	pxor	%xmm6,%xmm7
-	movdqa	%xmm7,(%rax)
-
-	movdqa	(%rsp),%xmm8
-	leaq	.LADD1(%rip),%r11
-	movdqa	32(%rbp),%xmm15
-	movdqa	-32(%r11),%xmm7
-.byte	102,68,15,56,0,199
-.byte	102,68,15,56,0,255
-	movdqa	%xmm8,(%rsp)
-	jmp	.Lctr_enc_loop
-.align	16
-.Lctr_enc_loop:
-	movdqa	%xmm15,32(%rbp)
-	movdqa	%xmm15,%xmm0
-	movdqa	%xmm15,%xmm1
-	paddd	0(%r11),%xmm0
-	movdqa	%xmm15,%xmm2
-	paddd	16(%r11),%xmm1
-	movdqa	%xmm15,%xmm3
-	paddd	32(%r11),%xmm2
-	movdqa	%xmm15,%xmm4
-	paddd	48(%r11),%xmm3
-	movdqa	%xmm15,%xmm5
-	paddd	64(%r11),%xmm4
-	movdqa	%xmm15,%xmm6
-	paddd	80(%r11),%xmm5
-	paddd	96(%r11),%xmm6
-
-
-
-	movdqa	(%rsp),%xmm8
-	leaq	16(%rsp),%rax
-	movdqa	-16(%r11),%xmm7
-	pxor	%xmm8,%xmm15
-	pxor	%xmm8,%xmm0
-	pxor	%xmm8,%xmm1
-	pxor	%xmm8,%xmm2
-.byte	102,68,15,56,0,255
-.byte	102,15,56,0,199
-	pxor	%xmm8,%xmm3
-	pxor	%xmm8,%xmm4
-.byte	102,15,56,0,207
-.byte	102,15,56,0,215
-	pxor	%xmm8,%xmm5
-	pxor	%xmm8,%xmm6
-.byte	102,15,56,0,223
-.byte	102,15,56,0,231
-.byte	102,15,56,0,239
-.byte	102,15,56,0,247
-	leaq	.LBS0(%rip),%r11
-	movl	%ebx,%r10d
-
-	call	_bsaes_encrypt8_bitslice
-
-	subq	$8,%r14
-	jc	.Lctr_enc_loop_done
-
-	movdqu	0(%r12),%xmm7
-	movdqu	16(%r12),%xmm8
-	movdqu	32(%r12),%xmm9
-	movdqu	48(%r12),%xmm10
-	movdqu	64(%r12),%xmm11
-	movdqu	80(%r12),%xmm12
-	movdqu	96(%r12),%xmm13
-	movdqu	112(%r12),%xmm14
-	leaq	128(%r12),%r12
-	pxor	%xmm15,%xmm7
-	movdqa	32(%rbp),%xmm15
-	pxor	%xmm8,%xmm0
-	movdqu	%xmm7,0(%r13)
-	pxor	%xmm9,%xmm3
-	movdqu	%xmm0,16(%r13)
-	pxor	%xmm10,%xmm5
-	movdqu	%xmm3,32(%r13)
-	pxor	%xmm11,%xmm2
-	movdqu	%xmm5,48(%r13)
-	pxor	%xmm12,%xmm6
-	movdqu	%xmm2,64(%r13)
-	pxor	%xmm13,%xmm1
-	movdqu	%xmm6,80(%r13)
-	pxor	%xmm14,%xmm4
-	movdqu	%xmm1,96(%r13)
-	leaq	.LADD1(%rip),%r11
-	movdqu	%xmm4,112(%r13)
-	leaq	128(%r13),%r13
-	paddd	112(%r11),%xmm15
-	jnz	.Lctr_enc_loop
-
-	jmp	.Lctr_enc_done
-.align	16
-.Lctr_enc_loop_done:
-	addq	$8,%r14
-	movdqu	0(%r12),%xmm7
-	pxor	%xmm7,%xmm15
-	movdqu	%xmm15,0(%r13)
-	cmpq	$2,%r14
-	jb	.Lctr_enc_done
-	movdqu	16(%r12),%xmm8
-	pxor	%xmm8,%xmm0
-	movdqu	%xmm0,16(%r13)
-	je	.Lctr_enc_done
-	movdqu	32(%r12),%xmm9
-	pxor	%xmm9,%xmm3
-	movdqu	%xmm3,32(%r13)
-	cmpq	$4,%r14
-	jb	.Lctr_enc_done
-	movdqu	48(%r12),%xmm10
-	pxor	%xmm10,%xmm5
-	movdqu	%xmm5,48(%r13)
-	je	.Lctr_enc_done
-	movdqu	64(%r12),%xmm11
-	pxor	%xmm11,%xmm2
-	movdqu	%xmm2,64(%r13)
-	cmpq	$6,%r14
-	jb	.Lctr_enc_done
-	movdqu	80(%r12),%xmm12
-	pxor	%xmm12,%xmm6
-	movdqu	%xmm6,80(%r13)
-	je	.Lctr_enc_done
-	movdqu	96(%r12),%xmm13
-	pxor	%xmm13,%xmm1
-	movdqu	%xmm1,96(%r13)
-	jmp	.Lctr_enc_done
-
-.align	16
-.Lctr_enc_short:
-	leaq	32(%rbp),%rdi
-	leaq	48(%rbp),%rsi
-	leaq	(%r15),%rdx
-	call	asm_AES_encrypt
-	movdqu	(%r12),%xmm0
-	leaq	16(%r12),%r12
-	movl	44(%rbp),%eax
-	bswapl	%eax
-	pxor	48(%rbp),%xmm0
-	incl	%eax
-	movdqu	%xmm0,(%r13)
-	bswapl	%eax
-	leaq	16(%r13),%r13
-	movl	%eax,44(%rsp)
-	decq	%r14
-	jnz	.Lctr_enc_short
-
-.Lctr_enc_done:
-	leaq	(%rsp),%rax
-	pxor	%xmm0,%xmm0
-.Lctr_enc_bzero:
-	movdqa	%xmm0,0(%rax)
-	movdqa	%xmm0,16(%rax)
-	leaq	32(%rax),%rax
-	cmpq	%rax,%rbp
-	ja	.Lctr_enc_bzero
-
-	leaq	120(%rbp),%rax
-.cfi_def_cfa	%rax,8
-	movq	-48(%rax),%r15
-.cfi_restore	%r15
-	movq	-40(%rax),%r14
-.cfi_restore	%r14
-	movq	-32(%rax),%r13
-.cfi_restore	%r13
-	movq	-24(%rax),%r12
-.cfi_restore	%r12
-	movq	-16(%rax),%rbx
-.cfi_restore	%rbx
-	movq	-8(%rax),%rbp
-.cfi_restore	%rbp
-	leaq	(%rax),%rsp
-.cfi_def_cfa_register	%rsp
-.Lctr_enc_epilogue:
-	.byte	0xf3,0xc3
-.cfi_endproc	
-.size	bsaes_ctr32_encrypt_blocks,.-bsaes_ctr32_encrypt_blocks
-.globl	bsaes_xts_encrypt
-.type	bsaes_xts_encrypt,@function
-.align	16
-bsaes_xts_encrypt:
-.cfi_startproc	
-	movq	%rsp,%rax
-.Lxts_enc_prologue:
-	pushq	%rbp
-.cfi_adjust_cfa_offset	8
-.cfi_offset	%rbp,-16
-	pushq	%rbx
-.cfi_adjust_cfa_offset	8
-.cfi_offset	%rbx,-24
-	pushq	%r12
-.cfi_adjust_cfa_offset	8
-.cfi_offset	%r12,-32
-	pushq	%r13
-.cfi_adjust_cfa_offset	8
-.cfi_offset	%r13,-40
-	pushq	%r14
-.cfi_adjust_cfa_offset	8
-.cfi_offset	%r14,-48
-	pushq	%r15
-.cfi_adjust_cfa_offset	8
-.cfi_offset	%r15,-56
-	leaq	-72(%rsp),%rsp
-.cfi_adjust_cfa_offset	0x48
-	movq	%rsp,%rbp
-.cfi_def_cfa_register	%rbp
-	movq	%rdi,%r12
-	movq	%rsi,%r13
-	movq	%rdx,%r14
-	movq	%rcx,%r15
-
-	leaq	(%r9),%rdi
-	leaq	32(%rbp),%rsi
-	leaq	(%r8),%rdx
-	call	asm_AES_encrypt
-
-	movl	240(%r15),%eax
-	movq	%r14,%rbx
-
-	movl	%eax,%edx
-	shlq	$7,%rax
-	subq	$96,%rax
-	subq	%rax,%rsp
-
-	movq	%rsp,%rax
-	movq	%r15,%rcx
-	movl	%edx,%r10d
-	call	_bsaes_key_convert
-	pxor	%xmm6,%xmm7
-	movdqa	%xmm7,(%rax)
-
-	andq	$-16,%r14
-	subq	$0x80,%rsp
-	movdqa	32(%rbp),%xmm6
-
-	pxor	%xmm14,%xmm14
-	movdqa	.Lxts_magic(%rip),%xmm12
-	pcmpgtd	%xmm6,%xmm14
-
-	subq	$0x80,%r14
-	jc	.Lxts_enc_short
-	jmp	.Lxts_enc_loop
-
-.align	16
-.Lxts_enc_loop:
-	pshufd	$0x13,%xmm14,%xmm13
-	pxor	%xmm14,%xmm14
-	movdqa	%xmm6,%xmm15
-	movdqa	%xmm6,0(%rsp)
-	paddq	%xmm6,%xmm6
-	pand	%xmm12,%xmm13
-	pcmpgtd	%xmm6,%xmm14
-	pxor	%xmm13,%xmm6
-	pshufd	$0x13,%xmm14,%xmm13
-	pxor	%xmm14,%xmm14
-	movdqa	%xmm6,%xmm0
-	movdqa	%xmm6,16(%rsp)
-	paddq	%xmm6,%xmm6
-	pand	%xmm12,%xmm13
-	pcmpgtd	%xmm6,%xmm14
-	pxor	%xmm13,%xmm6
-	movdqu	0(%r12),%xmm7
-	pshufd	$0x13,%xmm14,%xmm13
-	pxor	%xmm14,%xmm14
-	movdqa	%xmm6,%xmm1
-	movdqa	%xmm6,32(%rsp)
-	paddq	%xmm6,%xmm6
-	pand	%xmm12,%xmm13
-	pcmpgtd	%xmm6,%xmm14
-	pxor	%xmm13,%xmm6
-	movdqu	16(%r12),%xmm8
-	pxor	%xmm7,%xmm15
-	pshufd	$0x13,%xmm14,%xmm13
-	pxor	%xmm14,%xmm14
-	movdqa	%xmm6,%xmm2
-	movdqa	%xmm6,48(%rsp)
-	paddq	%xmm6,%xmm6
-	pand	%xmm12,%xmm13
-	pcmpgtd	%xmm6,%xmm14
-	pxor	%xmm13,%xmm6
-	movdqu	32(%r12),%xmm9
-	pxor	%xmm8,%xmm0
-	pshufd	$0x13,%xmm14,%xmm13
-	pxor	%xmm14,%xmm14
-	movdqa	%xmm6,%xmm3
-	movdqa	%xmm6,64(%rsp)
-	paddq	%xmm6,%xmm6
-	pand	%xmm12,%xmm13
-	pcmpgtd	%xmm6,%xmm14
-	pxor	%xmm13,%xmm6
-	movdqu	48(%r12),%xmm10
-	pxor	%xmm9,%xmm1
-	pshufd	$0x13,%xmm14,%xmm13
-	pxor	%xmm14,%xmm14
-	movdqa	%xmm6,%xmm4
-	movdqa	%xmm6,80(%rsp)
-	paddq	%xmm6,%xmm6
-	pand	%xmm12,%xmm13
-	pcmpgtd	%xmm6,%xmm14
-	pxor	%xmm13,%xmm6
-	movdqu	64(%r12),%xmm11
-	pxor	%xmm10,%xmm2
-	pshufd	$0x13,%xmm14,%xmm13
-	pxor	%xmm14,%xmm14
-	movdqa	%xmm6,%xmm5
-	movdqa	%xmm6,96(%rsp)
-	paddq	%xmm6,%xmm6
-	pand	%xmm12,%xmm13
-	pcmpgtd	%xmm6,%xmm14
-	pxor	%xmm13,%xmm6
-	movdqu	80(%r12),%xmm12
-	pxor	%xmm11,%xmm3
-	movdqu	96(%r12),%xmm13
-	pxor	%xmm12,%xmm4
-	movdqu	112(%r12),%xmm14
-	leaq	128(%r12),%r12
-	movdqa	%xmm6,112(%rsp)
-	pxor	%xmm13,%xmm5
-	leaq	128(%rsp),%rax
-	pxor	%xmm14,%xmm6
-	movl	%edx,%r10d
-
-	call	_bsaes_encrypt8
-
-	pxor	0(%rsp),%xmm15
-	pxor	16(%rsp),%xmm0
-	movdqu	%xmm15,0(%r13)
-	pxor	32(%rsp),%xmm3
-	movdqu	%xmm0,16(%r13)
-	pxor	48(%rsp),%xmm5
-	movdqu	%xmm3,32(%r13)
-	pxor	64(%rsp),%xmm2
-	movdqu	%xmm5,48(%r13)
-	pxor	80(%rsp),%xmm6
-	movdqu	%xmm2,64(%r13)
-	pxor	96(%rsp),%xmm1
-	movdqu	%xmm6,80(%r13)
-	pxor	112(%rsp),%xmm4
-	movdqu	%xmm1,96(%r13)
-	movdqu	%xmm4,112(%r13)
-	leaq	128(%r13),%r13
-
-	movdqa	112(%rsp),%xmm6
-	pxor	%xmm14,%xmm14
-	movdqa	.Lxts_magic(%rip),%xmm12
-	pcmpgtd	%xmm6,%xmm14
-	pshufd	$0x13,%xmm14,%xmm13
-	pxor	%xmm14,%xmm14
-	paddq	%xmm6,%xmm6
-	pand	%xmm12,%xmm13
-	pcmpgtd	%xmm6,%xmm14
-	pxor	%xmm13,%xmm6
-
-	subq	$0x80,%r14
-	jnc	.Lxts_enc_loop
-
-.Lxts_enc_short:
-	addq	$0x80,%r14
-	jz	.Lxts_enc_done
-	pshufd	$0x13,%xmm14,%xmm13
-	pxor	%xmm14,%xmm14
-	movdqa	%xmm6,%xmm15
-	movdqa	%xmm6,0(%rsp)
-	paddq	%xmm6,%xmm6
-	pand	%xmm12,%xmm13
-	pcmpgtd	%xmm6,%xmm14
-	pxor	%xmm13,%xmm6
-	pshufd	$0x13,%xmm14,%xmm13
-	pxor	%xmm14,%xmm14
-	movdqa	%xmm6,%xmm0
-	movdqa	%xmm6,16(%rsp)
-	paddq	%xmm6,%xmm6
-	pand	%xmm12,%xmm13
-	pcmpgtd	%xmm6,%xmm14
-	pxor	%xmm13,%xmm6
-	movdqu	0(%r12),%xmm7
-	cmpq	$16,%r14
-	je	.Lxts_enc_1
-	pshufd	$0x13,%xmm14,%xmm13
-	pxor	%xmm14,%xmm14
-	movdqa	%xmm6,%xmm1
-	movdqa	%xmm6,32(%rsp)
-	paddq	%xmm6,%xmm6
-	pand	%xmm12,%xmm13
-	pcmpgtd	%xmm6,%xmm14
-	pxor	%xmm13,%xmm6
-	movdqu	16(%r12),%xmm8
-	cmpq	$32,%r14
-	je	.Lxts_enc_2
-	pxor	%xmm7,%xmm15
-	pshufd	$0x13,%xmm14,%xmm13
-	pxor	%xmm14,%xmm14
-	movdqa	%xmm6,%xmm2
-	movdqa	%xmm6,48(%rsp)
-	paddq	%xmm6,%xmm6
-	pand	%xmm12,%xmm13
-	pcmpgtd	%xmm6,%xmm14
-	pxor	%xmm13,%xmm6
-	movdqu	32(%r12),%xmm9
-	cmpq	$48,%r14
-	je	.Lxts_enc_3
-	pxor	%xmm8,%xmm0
-	pshufd	$0x13,%xmm14,%xmm13
-	pxor	%xmm14,%xmm14
-	movdqa	%xmm6,%xmm3
-	movdqa	%xmm6,64(%rsp)
-	paddq	%xmm6,%xmm6
-	pand	%xmm12,%xmm13
-	pcmpgtd	%xmm6,%xmm14
-	pxor	%xmm13,%xmm6
-	movdqu	48(%r12),%xmm10
-	cmpq	$64,%r14
-	je	.Lxts_enc_4
-	pxor	%xmm9,%xmm1
-	pshufd	$0x13,%xmm14,%xmm13
-	pxor	%xmm14,%xmm14
-	movdqa	%xmm6,%xmm4
-	movdqa	%xmm6,80(%rsp)
-	paddq	%xmm6,%xmm6
-	pand	%xmm12,%xmm13
-	pcmpgtd	%xmm6,%xmm14
-	pxor	%xmm13,%xmm6
-	movdqu	64(%r12),%xmm11
-	cmpq	$80,%r14
-	je	.Lxts_enc_5
-	pxor	%xmm10,%xmm2
-	pshufd	$0x13,%xmm14,%xmm13
-	pxor	%xmm14,%xmm14
-	movdqa	%xmm6,%xmm5
-	movdqa	%xmm6,96(%rsp)
-	paddq	%xmm6,%xmm6
-	pand	%xmm12,%xmm13
-	pcmpgtd	%xmm6,%xmm14
-	pxor	%xmm13,%xmm6
-	movdqu	80(%r12),%xmm12
-	cmpq	$96,%r14
-	je	.Lxts_enc_6
-	pxor	%xmm11,%xmm3
-	movdqu	96(%r12),%xmm13
-	pxor	%xmm12,%xmm4
-	movdqa	%xmm6,112(%rsp)
-	leaq	112(%r12),%r12
-	pxor	%xmm13,%xmm5
-	leaq	128(%rsp),%rax
-	movl	%edx,%r10d
-
-	call	_bsaes_encrypt8
-
-	pxor	0(%rsp),%xmm15
-	pxor	16(%rsp),%xmm0
-	movdqu	%xmm15,0(%r13)
-	pxor	32(%rsp),%xmm3
-	movdqu	%xmm0,16(%r13)
-	pxor	48(%rsp),%xmm5
-	movdqu	%xmm3,32(%r13)
-	pxor	64(%rsp),%xmm2
-	movdqu	%xmm5,48(%r13)
-	pxor	80(%rsp),%xmm6
-	movdqu	%xmm2,64(%r13)
-	pxor	96(%rsp),%xmm1
-	movdqu	%xmm6,80(%r13)
-	movdqu	%xmm1,96(%r13)
-	leaq	112(%r13),%r13
-
-	movdqa	112(%rsp),%xmm6
-	jmp	.Lxts_enc_done
-.align	16
-.Lxts_enc_6:
-	pxor	%xmm11,%xmm3
-	leaq	96(%r12),%r12
-	pxor	%xmm12,%xmm4
-	leaq	128(%rsp),%rax
-	movl	%edx,%r10d
-
-	call	_bsaes_encrypt8
-
-	pxor	0(%rsp),%xmm15
-	pxor	16(%rsp),%xmm0
-	movdqu	%xmm15,0(%r13)
-	pxor	32(%rsp),%xmm3
-	movdqu	%xmm0,16(%r13)
-	pxor	48(%rsp),%xmm5
-	movdqu	%xmm3,32(%r13)
-	pxor	64(%rsp),%xmm2
-	movdqu	%xmm5,48(%r13)
-	pxor	80(%rsp),%xmm6
-	movdqu	%xmm2,64(%r13)
-	movdqu	%xmm6,80(%r13)
-	leaq	96(%r13),%r13
-
-	movdqa	96(%rsp),%xmm6
-	jmp	.Lxts_enc_done
-.align	16
-.Lxts_enc_5:
-	pxor	%xmm10,%xmm2
-	leaq	80(%r12),%r12
-	pxor	%xmm11,%xmm3
-	leaq	128(%rsp),%rax
-	movl	%edx,%r10d
-
-	call	_bsaes_encrypt8
-
-	pxor	0(%rsp),%xmm15
-	pxor	16(%rsp),%xmm0
-	movdqu	%xmm15,0(%r13)
-	pxor	32(%rsp),%xmm3
-	movdqu	%xmm0,16(%r13)
-	pxor	48(%rsp),%xmm5
-	movdqu	%xmm3,32(%r13)
-	pxor	64(%rsp),%xmm2
-	movdqu	%xmm5,48(%r13)
-	movdqu	%xmm2,64(%r13)
-	leaq	80(%r13),%r13
-
-	movdqa	80(%rsp),%xmm6
-	jmp	.Lxts_enc_done
-.align	16
-.Lxts_enc_4:
-	pxor	%xmm9,%xmm1
-	leaq	64(%r12),%r12
-	pxor	%xmm10,%xmm2
-	leaq	128(%rsp),%rax
-	movl	%edx,%r10d
-
-	call	_bsaes_encrypt8
-
-	pxor	0(%rsp),%xmm15
-	pxor	16(%rsp),%xmm0
-	movdqu	%xmm15,0(%r13)
-	pxor	32(%rsp),%xmm3
-	movdqu	%xmm0,16(%r13)
-	pxor	48(%rsp),%xmm5
-	movdqu	%xmm3,32(%r13)
-	movdqu	%xmm5,48(%r13)
-	leaq	64(%r13),%r13
-
-	movdqa	64(%rsp),%xmm6
-	jmp	.Lxts_enc_done
-.align	16
-.Lxts_enc_3:
-	pxor	%xmm8,%xmm0
-	leaq	48(%r12),%r12
-	pxor	%xmm9,%xmm1
-	leaq	128(%rsp),%rax
-	movl	%edx,%r10d
-
-	call	_bsaes_encrypt8
-
-	pxor	0(%rsp),%xmm15
-	pxor	16(%rsp),%xmm0
-	movdqu	%xmm15,0(%r13)
-	pxor	32(%rsp),%xmm3
-	movdqu	%xmm0,16(%r13)
-	movdqu	%xmm3,32(%r13)
-	leaq	48(%r13),%r13
-
-	movdqa	48(%rsp),%xmm6
-	jmp	.Lxts_enc_done
-.align	16
-.Lxts_enc_2:
-	pxor	%xmm7,%xmm15
-	leaq	32(%r12),%r12
-	pxor	%xmm8,%xmm0
-	leaq	128(%rsp),%rax
-	movl	%edx,%r10d
-
-	call	_bsaes_encrypt8
-
-	pxor	0(%rsp),%xmm15
-	pxor	16(%rsp),%xmm0
-	movdqu	%xmm15,0(%r13)
-	movdqu	%xmm0,16(%r13)
-	leaq	32(%r13),%r13
-
-	movdqa	32(%rsp),%xmm6
-	jmp	.Lxts_enc_done
-.align	16
-.Lxts_enc_1:
-	pxor	%xmm15,%xmm7
-	leaq	16(%r12),%r12
-	movdqa	%xmm7,32(%rbp)
-	leaq	32(%rbp),%rdi
-	leaq	32(%rbp),%rsi
-	leaq	(%r15),%rdx
-	call	asm_AES_encrypt
-	pxor	32(%rbp),%xmm15
-
-
-
-
-
-	movdqu	%xmm15,0(%r13)
-	leaq	16(%r13),%r13
-
-	movdqa	16(%rsp),%xmm6
-
-.Lxts_enc_done:
-	andl	$15,%ebx
-	jz	.Lxts_enc_ret
-	movq	%r13,%rdx
-
-.Lxts_enc_steal:
-	movzbl	(%r12),%eax
-	movzbl	-16(%rdx),%ecx
-	leaq	1(%r12),%r12
-	movb	%al,-16(%rdx)
-	movb	%cl,0(%rdx)
-	leaq	1(%rdx),%rdx
-	subl	$1,%ebx
-	jnz	.Lxts_enc_steal
-
-	movdqu	-16(%r13),%xmm15
-	leaq	32(%rbp),%rdi
-	pxor	%xmm6,%xmm15
-	leaq	32(%rbp),%rsi
-	movdqa	%xmm15,32(%rbp)
-	leaq	(%r15),%rdx
-	call	asm_AES_encrypt
-	pxor	32(%rbp),%xmm6
-	movdqu	%xmm6,-16(%r13)
-
-.Lxts_enc_ret:
-	leaq	(%rsp),%rax
-	pxor	%xmm0,%xmm0
-.Lxts_enc_bzero:
-	movdqa	%xmm0,0(%rax)
-	movdqa	%xmm0,16(%rax)
-	leaq	32(%rax),%rax
-	cmpq	%rax,%rbp
-	ja	.Lxts_enc_bzero
-
-	leaq	120(%rbp),%rax
-.cfi_def_cfa	%rax,8
-	movq	-48(%rax),%r15
-.cfi_restore	%r15
-	movq	-40(%rax),%r14
-.cfi_restore	%r14
-	movq	-32(%rax),%r13
-.cfi_restore	%r13
-	movq	-24(%rax),%r12
-.cfi_restore	%r12
-	movq	-16(%rax),%rbx
-.cfi_restore	%rbx
-	movq	-8(%rax),%rbp
-.cfi_restore	%rbp
-	leaq	(%rax),%rsp
-.cfi_def_cfa_register	%rsp
-.Lxts_enc_epilogue:
-	.byte	0xf3,0xc3
-.cfi_endproc	
-.size	bsaes_xts_encrypt,.-bsaes_xts_encrypt
-
-.globl	bsaes_xts_decrypt
-.type	bsaes_xts_decrypt,@function
-.align	16
-bsaes_xts_decrypt:
-.cfi_startproc	
-	movq	%rsp,%rax
-.Lxts_dec_prologue:
-	pushq	%rbp
-.cfi_adjust_cfa_offset	8
-.cfi_offset	%rbp,-16
-	pushq	%rbx
-.cfi_adjust_cfa_offset	8
-.cfi_offset	%rbx,-24
-	pushq	%r12
-.cfi_adjust_cfa_offset	8
-.cfi_offset	%r12,-32
-	pushq	%r13
-.cfi_adjust_cfa_offset	8
-.cfi_offset	%r13,-40
-	pushq	%r14
-.cfi_adjust_cfa_offset	8
-.cfi_offset	%r14,-48
-	pushq	%r15
-.cfi_adjust_cfa_offset	8
-.cfi_offset	%r15,-56
-	leaq	-72(%rsp),%rsp
-.cfi_adjust_cfa_offset	0x48
-	movq	%rsp,%rbp
-	movq	%rdi,%r12
-	movq	%rsi,%r13
-	movq	%rdx,%r14
-	movq	%rcx,%r15
-
-	leaq	(%r9),%rdi
-	leaq	32(%rbp),%rsi
-	leaq	(%r8),%rdx
-	call	asm_AES_encrypt
-
-	movl	240(%r15),%eax
-	movq	%r14,%rbx
-
-	movl	%eax,%edx
-	shlq	$7,%rax
-	subq	$96,%rax
-	subq	%rax,%rsp
-
-	movq	%rsp,%rax
-	movq	%r15,%rcx
-	movl	%edx,%r10d
-	call	_bsaes_key_convert
-	pxor	(%rsp),%xmm7
-	movdqa	%xmm6,(%rax)
-	movdqa	%xmm7,(%rsp)
-
-	xorl	%eax,%eax
-	andq	$-16,%r14
-	testl	$15,%ebx
-	setnz	%al
-	shlq	$4,%rax
-	subq	%rax,%r14
-
-	subq	$0x80,%rsp
-	movdqa	32(%rbp),%xmm6
-
-	pxor	%xmm14,%xmm14
-	movdqa	.Lxts_magic(%rip),%xmm12
-	pcmpgtd	%xmm6,%xmm14
-
-	subq	$0x80,%r14
-	jc	.Lxts_dec_short
-	jmp	.Lxts_dec_loop
-
-.align	16
-.Lxts_dec_loop:
-	pshufd	$0x13,%xmm14,%xmm13
-	pxor	%xmm14,%xmm14
-	movdqa	%xmm6,%xmm15
-	movdqa	%xmm6,0(%rsp)
-	paddq	%xmm6,%xmm6
-	pand	%xmm12,%xmm13
-	pcmpgtd	%xmm6,%xmm14
-	pxor	%xmm13,%xmm6
-	pshufd	$0x13,%xmm14,%xmm13
-	pxor	%xmm14,%xmm14
-	movdqa	%xmm6,%xmm0
-	movdqa	%xmm6,16(%rsp)
-	paddq	%xmm6,%xmm6
-	pand	%xmm12,%xmm13
-	pcmpgtd	%xmm6,%xmm14
-	pxor	%xmm13,%xmm6
-	movdqu	0(%r12),%xmm7
-	pshufd	$0x13,%xmm14,%xmm13
-	pxor	%xmm14,%xmm14
-	movdqa	%xmm6,%xmm1
-	movdqa	%xmm6,32(%rsp)
-	paddq	%xmm6,%xmm6
-	pand	%xmm12,%xmm13
-	pcmpgtd	%xmm6,%xmm14
-	pxor	%xmm13,%xmm6
-	movdqu	16(%r12),%xmm8
-	pxor	%xmm7,%xmm15
-	pshufd	$0x13,%xmm14,%xmm13
-	pxor	%xmm14,%xmm14
-	movdqa	%xmm6,%xmm2
-	movdqa	%xmm6,48(%rsp)
-	paddq	%xmm6,%xmm6
-	pand	%xmm12,%xmm13
-	pcmpgtd	%xmm6,%xmm14
-	pxor	%xmm13,%xmm6
-	movdqu	32(%r12),%xmm9
-	pxor	%xmm8,%xmm0
-	pshufd	$0x13,%xmm14,%xmm13
-	pxor	%xmm14,%xmm14
-	movdqa	%xmm6,%xmm3
-	movdqa	%xmm6,64(%rsp)
-	paddq	%xmm6,%xmm6
-	pand	%xmm12,%xmm13
-	pcmpgtd	%xmm6,%xmm14
-	pxor	%xmm13,%xmm6
-	movdqu	48(%r12),%xmm10
-	pxor	%xmm9,%xmm1
-	pshufd	$0x13,%xmm14,%xmm13
-	pxor	%xmm14,%xmm14
-	movdqa	%xmm6,%xmm4
-	movdqa	%xmm6,80(%rsp)
-	paddq	%xmm6,%xmm6
-	pand	%xmm12,%xmm13
-	pcmpgtd	%xmm6,%xmm14
-	pxor	%xmm13,%xmm6
-	movdqu	64(%r12),%xmm11
-	pxor	%xmm10,%xmm2
-	pshufd	$0x13,%xmm14,%xmm13
-	pxor	%xmm14,%xmm14
-	movdqa	%xmm6,%xmm5
-	movdqa	%xmm6,96(%rsp)
-	paddq	%xmm6,%xmm6
-	pand	%xmm12,%xmm13
-	pcmpgtd	%xmm6,%xmm14
-	pxor	%xmm13,%xmm6
-	movdqu	80(%r12),%xmm12
-	pxor	%xmm11,%xmm3
-	movdqu	96(%r12),%xmm13
-	pxor	%xmm12,%xmm4
-	movdqu	112(%r12),%xmm14
-	leaq	128(%r12),%r12
-	movdqa	%xmm6,112(%rsp)
-	pxor	%xmm13,%xmm5
-	leaq	128(%rsp),%rax
-	pxor	%xmm14,%xmm6
-	movl	%edx,%r10d
-
-	call	_bsaes_decrypt8
-
-	pxor	0(%rsp),%xmm15
-	pxor	16(%rsp),%xmm0
-	movdqu	%xmm15,0(%r13)
-	pxor	32(%rsp),%xmm5
-	movdqu	%xmm0,16(%r13)
-	pxor	48(%rsp),%xmm3
-	movdqu	%xmm5,32(%r13)
-	pxor	64(%rsp),%xmm1
-	movdqu	%xmm3,48(%r13)
-	pxor	80(%rsp),%xmm6
-	movdqu	%xmm1,64(%r13)
-	pxor	96(%rsp),%xmm2
-	movdqu	%xmm6,80(%r13)
-	pxor	112(%rsp),%xmm4
-	movdqu	%xmm2,96(%r13)
-	movdqu	%xmm4,112(%r13)
-	leaq	128(%r13),%r13
-
-	movdqa	112(%rsp),%xmm6
-	pxor	%xmm14,%xmm14
-	movdqa	.Lxts_magic(%rip),%xmm12
-	pcmpgtd	%xmm6,%xmm14
-	pshufd	$0x13,%xmm14,%xmm13
-	pxor	%xmm14,%xmm14
-	paddq	%xmm6,%xmm6
-	pand	%xmm12,%xmm13
-	pcmpgtd	%xmm6,%xmm14
-	pxor	%xmm13,%xmm6
-
-	subq	$0x80,%r14
-	jnc	.Lxts_dec_loop
-
-.Lxts_dec_short:
-	addq	$0x80,%r14
-	jz	.Lxts_dec_done
-	pshufd	$0x13,%xmm14,%xmm13
-	pxor	%xmm14,%xmm14
-	movdqa	%xmm6,%xmm15
-	movdqa	%xmm6,0(%rsp)
-	paddq	%xmm6,%xmm6
-	pand	%xmm12,%xmm13
-	pcmpgtd	%xmm6,%xmm14
-	pxor	%xmm13,%xmm6
-	pshufd	$0x13,%xmm14,%xmm13
-	pxor	%xmm14,%xmm14
-	movdqa	%xmm6,%xmm0
-	movdqa	%xmm6,16(%rsp)
-	paddq	%xmm6,%xmm6
-	pand	%xmm12,%xmm13
-	pcmpgtd	%xmm6,%xmm14
-	pxor	%xmm13,%xmm6
-	movdqu	0(%r12),%xmm7
-	cmpq	$16,%r14
-	je	.Lxts_dec_1
-	pshufd	$0x13,%xmm14,%xmm13
-	pxor	%xmm14,%xmm14
-	movdqa	%xmm6,%xmm1
-	movdqa	%xmm6,32(%rsp)
-	paddq	%xmm6,%xmm6
-	pand	%xmm12,%xmm13
-	pcmpgtd	%xmm6,%xmm14
-	pxor	%xmm13,%xmm6
-	movdqu	16(%r12),%xmm8
-	cmpq	$32,%r14
-	je	.Lxts_dec_2
-	pxor	%xmm7,%xmm15
-	pshufd	$0x13,%xmm14,%xmm13
-	pxor	%xmm14,%xmm14
-	movdqa	%xmm6,%xmm2
-	movdqa	%xmm6,48(%rsp)
-	paddq	%xmm6,%xmm6
-	pand	%xmm12,%xmm13
-	pcmpgtd	%xmm6,%xmm14
-	pxor	%xmm13,%xmm6
-	movdqu	32(%r12),%xmm9
-	cmpq	$48,%r14
-	je	.Lxts_dec_3
-	pxor	%xmm8,%xmm0
-	pshufd	$0x13,%xmm14,%xmm13
-	pxor	%xmm14,%xmm14
-	movdqa	%xmm6,%xmm3
-	movdqa	%xmm6,64(%rsp)
-	paddq	%xmm6,%xmm6
-	pand	%xmm12,%xmm13
-	pcmpgtd	%xmm6,%xmm14
-	pxor	%xmm13,%xmm6
-	movdqu	48(%r12),%xmm10
-	cmpq	$64,%r14
-	je	.Lxts_dec_4
-	pxor	%xmm9,%xmm1
-	pshufd	$0x13,%xmm14,%xmm13
-	pxor	%xmm14,%xmm14
-	movdqa	%xmm6,%xmm4
-	movdqa	%xmm6,80(%rsp)
-	paddq	%xmm6,%xmm6
-	pand	%xmm12,%xmm13
-	pcmpgtd	%xmm6,%xmm14
-	pxor	%xmm13,%xmm6
-	movdqu	64(%r12),%xmm11
-	cmpq	$80,%r14
-	je	.Lxts_dec_5
-	pxor	%xmm10,%xmm2
-	pshufd	$0x13,%xmm14,%xmm13
-	pxor	%xmm14,%xmm14
-	movdqa	%xmm6,%xmm5
-	movdqa	%xmm6,96(%rsp)
-	paddq	%xmm6,%xmm6
-	pand	%xmm12,%xmm13
-	pcmpgtd	%xmm6,%xmm14
-	pxor	%xmm13,%xmm6
-	movdqu	80(%r12),%xmm12
-	cmpq	$96,%r14
-	je	.Lxts_dec_6
-	pxor	%xmm11,%xmm3
-	movdqu	96(%r12),%xmm13
-	pxor	%xmm12,%xmm4
-	movdqa	%xmm6,112(%rsp)
-	leaq	112(%r12),%r12
-	pxor	%xmm13,%xmm5
-	leaq	128(%rsp),%rax
-	movl	%edx,%r10d
-
-	call	_bsaes_decrypt8
-
-	pxor	0(%rsp),%xmm15
-	pxor	16(%rsp),%xmm0
-	movdqu	%xmm15,0(%r13)
-	pxor	32(%rsp),%xmm5
-	movdqu	%xmm0,16(%r13)
-	pxor	48(%rsp),%xmm3
-	movdqu	%xmm5,32(%r13)
-	pxor	64(%rsp),%xmm1
-	movdqu	%xmm3,48(%r13)
-	pxor	80(%rsp),%xmm6
-	movdqu	%xmm1,64(%r13)
-	pxor	96(%rsp),%xmm2
-	movdqu	%xmm6,80(%r13)
-	movdqu	%xmm2,96(%r13)
-	leaq	112(%r13),%r13
-
-	movdqa	112(%rsp),%xmm6
-	jmp	.Lxts_dec_done
-.align	16
-.Lxts_dec_6:
-	pxor	%xmm11,%xmm3
-	leaq	96(%r12),%r12
-	pxor	%xmm12,%xmm4
-	leaq	128(%rsp),%rax
-	movl	%edx,%r10d
-
-	call	_bsaes_decrypt8
-
-	pxor	0(%rsp),%xmm15
-	pxor	16(%rsp),%xmm0
-	movdqu	%xmm15,0(%r13)
-	pxor	32(%rsp),%xmm5
-	movdqu	%xmm0,16(%r13)
-	pxor	48(%rsp),%xmm3
-	movdqu	%xmm5,32(%r13)
-	pxor	64(%rsp),%xmm1
-	movdqu	%xmm3,48(%r13)
-	pxor	80(%rsp),%xmm6
-	movdqu	%xmm1,64(%r13)
-	movdqu	%xmm6,80(%r13)
-	leaq	96(%r13),%r13
-
-	movdqa	96(%rsp),%xmm6
-	jmp	.Lxts_dec_done
-.align	16
-.Lxts_dec_5:
-	pxor	%xmm10,%xmm2
-	leaq	80(%r12),%r12
-	pxor	%xmm11,%xmm3
-	leaq	128(%rsp),%rax
-	movl	%edx,%r10d
-
-	call	_bsaes_decrypt8
-
-	pxor	0(%rsp),%xmm15
-	pxor	16(%rsp),%xmm0
-	movdqu	%xmm15,0(%r13)
-	pxor	32(%rsp),%xmm5
-	movdqu	%xmm0,16(%r13)
-	pxor	48(%rsp),%xmm3
-	movdqu	%xmm5,32(%r13)
-	pxor	64(%rsp),%xmm1
-	movdqu	%xmm3,48(%r13)
-	movdqu	%xmm1,64(%r13)
-	leaq	80(%r13),%r13
-
-	movdqa	80(%rsp),%xmm6
-	jmp	.Lxts_dec_done
-.align	16
-.Lxts_dec_4:
-	pxor	%xmm9,%xmm1
-	leaq	64(%r12),%r12
-	pxor	%xmm10,%xmm2
-	leaq	128(%rsp),%rax
-	movl	%edx,%r10d
-
-	call	_bsaes_decrypt8
-
-	pxor	0(%rsp),%xmm15
-	pxor	16(%rsp),%xmm0
-	movdqu	%xmm15,0(%r13)
-	pxor	32(%rsp),%xmm5
-	movdqu	%xmm0,16(%r13)
-	pxor	48(%rsp),%xmm3
-	movdqu	%xmm5,32(%r13)
-	movdqu	%xmm3,48(%r13)
-	leaq	64(%r13),%r13
-
-	movdqa	64(%rsp),%xmm6
-	jmp	.Lxts_dec_done
-.align	16
-.Lxts_dec_3:
-	pxor	%xmm8,%xmm0
-	leaq	48(%r12),%r12
-	pxor	%xmm9,%xmm1
-	leaq	128(%rsp),%rax
-	movl	%edx,%r10d
-
-	call	_bsaes_decrypt8
-
-	pxor	0(%rsp),%xmm15
-	pxor	16(%rsp),%xmm0
-	movdqu	%xmm15,0(%r13)
-	pxor	32(%rsp),%xmm5
-	movdqu	%xmm0,16(%r13)
-	movdqu	%xmm5,32(%r13)
-	leaq	48(%r13),%r13
-
-	movdqa	48(%rsp),%xmm6
-	jmp	.Lxts_dec_done
-.align	16
-.Lxts_dec_2:
-	pxor	%xmm7,%xmm15
-	leaq	32(%r12),%r12
-	pxor	%xmm8,%xmm0
-	leaq	128(%rsp),%rax
-	movl	%edx,%r10d
-
-	call	_bsaes_decrypt8
-
-	pxor	0(%rsp),%xmm15
-	pxor	16(%rsp),%xmm0
-	movdqu	%xmm15,0(%r13)
-	movdqu	%xmm0,16(%r13)
-	leaq	32(%r13),%r13
-
-	movdqa	32(%rsp),%xmm6
-	jmp	.Lxts_dec_done
-.align	16
-.Lxts_dec_1:
-	pxor	%xmm15,%xmm7
-	leaq	16(%r12),%r12
-	movdqa	%xmm7,32(%rbp)
-	leaq	32(%rbp),%rdi
-	leaq	32(%rbp),%rsi
-	leaq	(%r15),%rdx
-	call	asm_AES_decrypt
-	pxor	32(%rbp),%xmm15
-
-
-
-
-
-	movdqu	%xmm15,0(%r13)
-	leaq	16(%r13),%r13
-
-	movdqa	16(%rsp),%xmm6
-
-.Lxts_dec_done:
-	andl	$15,%ebx
-	jz	.Lxts_dec_ret
-
-	pxor	%xmm14,%xmm14
-	movdqa	.Lxts_magic(%rip),%xmm12
-	pcmpgtd	%xmm6,%xmm14
-	pshufd	$0x13,%xmm14,%xmm13
-	movdqa	%xmm6,%xmm5
-	paddq	%xmm6,%xmm6
-	pand	%xmm12,%xmm13
-	movdqu	(%r12),%xmm15
-	pxor	%xmm13,%xmm6
-
-	leaq	32(%rbp),%rdi
-	pxor	%xmm6,%xmm15
-	leaq	32(%rbp),%rsi
-	movdqa	%xmm15,32(%rbp)
-	leaq	(%r15),%rdx
-	call	asm_AES_decrypt
-	pxor	32(%rbp),%xmm6
-	movq	%r13,%rdx
-	movdqu	%xmm6,(%r13)
-
-.Lxts_dec_steal:
-	movzbl	16(%r12),%eax
-	movzbl	(%rdx),%ecx
-	leaq	1(%r12),%r12
-	movb	%al,(%rdx)
-	movb	%cl,16(%rdx)
-	leaq	1(%rdx),%rdx
-	subl	$1,%ebx
-	jnz	.Lxts_dec_steal
-
-	movdqu	(%r13),%xmm15
-	leaq	32(%rbp),%rdi
-	pxor	%xmm5,%xmm15
-	leaq	32(%rbp),%rsi
-	movdqa	%xmm15,32(%rbp)
-	leaq	(%r15),%rdx
-	call	asm_AES_decrypt
-	pxor	32(%rbp),%xmm5
-	movdqu	%xmm5,(%r13)
-
-.Lxts_dec_ret:
-	leaq	(%rsp),%rax
-	pxor	%xmm0,%xmm0
-.Lxts_dec_bzero:
-	movdqa	%xmm0,0(%rax)
-	movdqa	%xmm0,16(%rax)
-	leaq	32(%rax),%rax
-	cmpq	%rax,%rbp
-	ja	.Lxts_dec_bzero
-
-	leaq	120(%rbp),%rax
-.cfi_def_cfa	%rax,8
-	movq	-48(%rax),%r15
-.cfi_restore	%r15
-	movq	-40(%rax),%r14
-.cfi_restore	%r14
-	movq	-32(%rax),%r13
-.cfi_restore	%r13
-	movq	-24(%rax),%r12
-.cfi_restore	%r12
-	movq	-16(%rax),%rbx
-.cfi_restore	%rbx
-	movq	-8(%rax),%rbp
-.cfi_restore	%rbp
-	leaq	(%rax),%rsp
-.cfi_def_cfa_register	%rsp
-.Lxts_dec_epilogue:
-	.byte	0xf3,0xc3
-.cfi_endproc	
-.size	bsaes_xts_decrypt,.-bsaes_xts_decrypt
-.type	_bsaes_const,@object
-.align	64
-_bsaes_const:
-.LM0ISR:
-.quad	0x0a0e0206070b0f03, 0x0004080c0d010509
-.LISRM0:
-.quad	0x01040b0e0205080f, 0x0306090c00070a0d
-.LISR:
-.quad	0x0504070602010003, 0x0f0e0d0c080b0a09
-.LBS0:
-.quad	0x5555555555555555, 0x5555555555555555
-.LBS1:
-.quad	0x3333333333333333, 0x3333333333333333
-.LBS2:
-.quad	0x0f0f0f0f0f0f0f0f, 0x0f0f0f0f0f0f0f0f
-.LSR:
-.quad	0x0504070600030201, 0x0f0e0d0c0a09080b
-.LSRM0:
-.quad	0x0304090e00050a0f, 0x01060b0c0207080d
-.LM0SR:
-.quad	0x0a0e02060f03070b, 0x0004080c05090d01
-.LSWPUP:
-.quad	0x0706050403020100, 0x0c0d0e0f0b0a0908
-.LSWPUPM0SR:
-.quad	0x0a0d02060c03070b, 0x0004080f05090e01
-.LADD1:
-.quad	0x0000000000000000, 0x0000000100000000
-.LADD2:
-.quad	0x0000000000000000, 0x0000000200000000
-.LADD3:
-.quad	0x0000000000000000, 0x0000000300000000
-.LADD4:
-.quad	0x0000000000000000, 0x0000000400000000
-.LADD5:
-.quad	0x0000000000000000, 0x0000000500000000
-.LADD6:
-.quad	0x0000000000000000, 0x0000000600000000
-.LADD7:
-.quad	0x0000000000000000, 0x0000000700000000
-.LADD8:
-.quad	0x0000000000000000, 0x0000000800000000
-.Lxts_magic:
-.long	0x87,0,1,0
-.Lmasks:
-.quad	0x0101010101010101, 0x0101010101010101
-.quad	0x0202020202020202, 0x0202020202020202
-.quad	0x0404040404040404, 0x0404040404040404
-.quad	0x0808080808080808, 0x0808080808080808
-.LM0:
-.quad	0x02060a0e03070b0f, 0x0004080c0105090d
-.L63:
-.quad	0x6363636363636363, 0x6363636363636363
-.byte	66,105,116,45,115,108,105,99,101,100,32,65,69,83,32,102,111,114,32,120,56,54,95,54,52,47,83,83,83,69,51,44,32,69,109,105,108,105,97,32,75,195,164,115,112,101,114,44,32,80,101,116,101,114,32,83,99,104,119,97,98,101,44,32,65,110,100,121,32,80,111,108,121,97,107,111,118,0
-.align	64
-.size	_bsaes_const,.-_bsaes_const
diff --git a/deps/openssl/config/archs/linux-x32/asm_avx2/crypto/bn/rsaz-x86_64.s b/deps/openssl/config/archs/linux-x32/asm_avx2/crypto/bn/rsaz-x86_64.s
index f8e4a80588..7876e0b8f9 100644
--- a/deps/openssl/config/archs/linux-x32/asm_avx2/crypto/bn/rsaz-x86_64.s
+++ b/deps/openssl/config/archs/linux-x32/asm_avx2/crypto/bn/rsaz-x86_64.s
@@ -29,7 +29,7 @@ rsaz_512_sqr:
 	subq	$128+24,%rsp
 .cfi_adjust_cfa_offset	128+24
 .Lsqr_body:
-	movq	%rdx,%rbp
+.byte	102,72,15,110,202
 	movq	(%rsi),%rdx
 	movq	8(%rsi),%rax
 	movq	%rcx,128(%rsp)
@@ -44,6 +44,7 @@ rsaz_512_sqr:
 	movl	%r8d,128+8(%rsp)
 
 	movq	%rdx,%rbx
+	movq	%rax,%rbp
 	mulq	%rdx
 	movq	%rax,%r8
 	movq	16(%rsi),%rax
@@ -82,31 +83,29 @@ rsaz_512_sqr:
 	mulq	%rbx
 	addq	%rax,%r14
 	movq	%rbx,%rax
-	movq	%rdx,%r15
-	adcq	$0,%r15
+	adcq	$0,%rdx
 
+	xorq	%rcx,%rcx
 	addq	%r8,%r8
-	movq	%r9,%rcx
-	adcq	%r9,%r9
+	movq	%rdx,%r15
+	adcq	$0,%rcx
 
 	mulq	%rax
-	movq	%rax,(%rsp)
-	addq	%rdx,%r8
-	adcq	$0,%r9
+	addq	%r8,%rdx
+	adcq	$0,%rcx
 
-	movq	%r8,8(%rsp)
-	shrq	$63,%rcx
+	movq	%rax,(%rsp)
+	movq	%rdx,8(%rsp)
 
 
-	movq	8(%rsi),%r8
 	movq	16(%rsi),%rax
-	mulq	%r8
+	mulq	%rbp
 	addq	%rax,%r10
 	movq	24(%rsi),%rax
 	movq	%rdx,%rbx
 	adcq	$0,%rbx
 
-	mulq	%r8
+	mulq	%rbp
 	addq	%rax,%r11
 	movq	32(%rsi),%rax
 	adcq	$0,%rdx
@@ -114,7 +113,7 @@ rsaz_512_sqr:
 	movq	%rdx,%rbx
 	adcq	$0,%rbx
 
-	mulq	%r8
+	mulq	%rbp
 	addq	%rax,%r12
 	movq	40(%rsi),%rax
 	adcq	$0,%rdx
@@ -122,7 +121,7 @@ rsaz_512_sqr:
 	movq	%rdx,%rbx
 	adcq	$0,%rbx
 
-	mulq	%r8
+	mulq	%rbp
 	addq	%rax,%r13
 	movq	48(%rsi),%rax
 	adcq	$0,%rdx
@@ -130,7 +129,7 @@ rsaz_512_sqr:
 	movq	%rdx,%rbx
 	adcq	$0,%rbx
 
-	mulq	%r8
+	mulq	%rbp
 	addq	%rax,%r14
 	movq	56(%rsi),%rax
 	adcq	$0,%rdx
@@ -138,39 +137,39 @@ rsaz_512_sqr:
 	movq	%rdx,%rbx
 	adcq	$0,%rbx
 
-	mulq	%r8
+	mulq	%rbp
 	addq	%rax,%r15
-	movq	%r8,%rax
+	movq	%rbp,%rax
 	adcq	$0,%rdx
 	addq	%rbx,%r15
-	movq	%rdx,%r8
-	movq	%r10,%rdx
-	adcq	$0,%r8
+	adcq	$0,%rdx
 
-	addq	%rdx,%rdx
-	leaq	(%rcx,%r10,2),%r10
-	movq	%r11,%rbx
-	adcq	%r11,%r11
+	xorq	%rbx,%rbx
+	addq	%r9,%r9
+	movq	%rdx,%r8
+	adcq	%r10,%r10
+	adcq	$0,%rbx
 
 	mulq	%rax
+
+	addq	%rcx,%rax
+	movq	16(%rsi),%rbp
 	addq	%rax,%r9
+	movq	24(%rsi),%rax
 	adcq	%rdx,%r10
-	adcq	$0,%r11
+	adcq	$0,%rbx
 
 	movq	%r9,16(%rsp)
 	movq	%r10,24(%rsp)
-	shrq	$63,%rbx
 
 
-	movq	16(%rsi),%r9
-	movq	24(%rsi),%rax
-	mulq	%r9
+	mulq	%rbp
 	addq	%rax,%r12
 	movq	32(%rsi),%rax
 	movq	%rdx,%rcx
 	adcq	$0,%rcx
 
-	mulq	%r9
+	mulq	%rbp
 	addq	%rax,%r13
 	movq	40(%rsi),%rax
 	adcq	$0,%rdx
@@ -178,7 +177,7 @@ rsaz_512_sqr:
 	movq	%rdx,%rcx
 	adcq	$0,%rcx
 
-	mulq	%r9
+	mulq	%rbp
 	addq	%rax,%r14
 	movq	48(%rsi),%rax
 	adcq	$0,%rdx
@@ -186,9 +185,7 @@ rsaz_512_sqr:
 	movq	%rdx,%rcx
 	adcq	$0,%rcx
 
-	mulq	%r9
-	movq	%r12,%r10
-	leaq	(%rbx,%r12,2),%r12
+	mulq	%rbp
 	addq	%rax,%r15
 	movq	56(%rsi),%rax
 	adcq	$0,%rdx
@@ -196,36 +193,40 @@ rsaz_512_sqr:
 	movq	%rdx,%rcx
 	adcq	$0,%rcx
 
-	mulq	%r9
-	shrq	$63,%r10
+	mulq	%rbp
 	addq	%rax,%r8
-	movq	%r9,%rax
+	movq	%rbp,%rax
 	adcq	$0,%rdx
 	addq	%rcx,%r8
-	movq	%rdx,%r9
-	adcq	$0,%r9
+	adcq	$0,%rdx
 
-	movq	%r13,%rcx
-	leaq	(%r10,%r13,2),%r13
+	xorq	%rcx,%rcx
+	addq	%r11,%r11
+	movq	%rdx,%r9
+	adcq	%r12,%r12
+	adcq	$0,%rcx
 
 	mulq	%rax
+
+	addq	%rbx,%rax
+	movq	24(%rsi),%r10
 	addq	%rax,%r11
+	movq	32(%rsi),%rax
 	adcq	%rdx,%r12
-	adcq	$0,%r13
+	adcq	$0,%rcx
 
 	movq	%r11,32(%rsp)
 	movq	%r12,40(%rsp)
-	shrq	$63,%rcx
 
 
-	movq	24(%rsi),%r10
-	movq	32(%rsi),%rax
+	movq	%rax,%r11
 	mulq	%r10
 	addq	%rax,%r14
 	movq	40(%rsi),%rax
 	movq	%rdx,%rbx
 	adcq	$0,%rbx
 
+	movq	%rax,%r12
 	mulq	%r10
 	addq	%rax,%r15
 	movq	48(%rsi),%rax
@@ -234,9 +235,8 @@ rsaz_512_sqr:
 	movq	%rdx,%rbx
 	adcq	$0,%rbx
 
+	movq	%rax,%rbp
 	mulq	%r10
-	movq	%r14,%r12
-	leaq	(%rcx,%r14,2),%r14
 	addq	%rax,%r8
 	movq	56(%rsi),%rax
 	adcq	$0,%rdx
@@ -245,32 +245,33 @@ rsaz_512_sqr:
 	adcq	$0,%rbx
 
 	mulq	%r10
-	shrq	$63,%r12
 	addq	%rax,%r9
 	movq	%r10,%rax
 	adcq	$0,%rdx
 	addq	%rbx,%r9
-	movq	%rdx,%r10
-	adcq	$0,%r10
+	adcq	$0,%rdx
 
-	movq	%r15,%rbx
-	leaq	(%r12,%r15,2),%r15
+	xorq	%rbx,%rbx
+	addq	%r13,%r13
+	movq	%rdx,%r10
+	adcq	%r14,%r14
+	adcq	$0,%rbx
 
 	mulq	%rax
+
+	addq	%rcx,%rax
 	addq	%rax,%r13
+	movq	%r12,%rax
 	adcq	%rdx,%r14
-	adcq	$0,%r15
+	adcq	$0,%rbx
 
 	movq	%r13,48(%rsp)
 	movq	%r14,56(%rsp)
-	shrq	$63,%rbx
 
 
-	movq	32(%rsi),%r11
-	movq	40(%rsi),%rax
 	mulq	%r11
 	addq	%rax,%r8
-	movq	48(%rsi),%rax
+	movq	%rbp,%rax
 	movq	%rdx,%rcx
 	adcq	$0,%rcx
 
@@ -278,97 +279,99 @@ rsaz_512_sqr:
 	addq	%rax,%r9
 	movq	56(%rsi),%rax
 	adcq	$0,%rdx
-	movq	%r8,%r12
-	leaq	(%rbx,%r8,2),%r8
 	addq	%rcx,%r9
 	movq	%rdx,%rcx
 	adcq	$0,%rcx
 
+	movq	%rax,%r14
 	mulq	%r11
-	shrq	$63,%r12
 	addq	%rax,%r10
 	movq	%r11,%rax
 	adcq	$0,%rdx
 	addq	%rcx,%r10
-	movq	%rdx,%r11
-	adcq	$0,%r11
+	adcq	$0,%rdx
 
-	movq	%r9,%rcx
-	leaq	(%r12,%r9,2),%r9
+	xorq	%rcx,%rcx
+	addq	%r15,%r15
+	movq	%rdx,%r11
+	adcq	%r8,%r8
+	adcq	$0,%rcx
 
 	mulq	%rax
+
+	addq	%rbx,%rax
 	addq	%rax,%r15
+	movq	%rbp,%rax
 	adcq	%rdx,%r8
-	adcq	$0,%r9
+	adcq	$0,%rcx
 
 	movq	%r15,64(%rsp)
 	movq	%r8,72(%rsp)
-	shrq	$63,%rcx
 
 
-	movq	40(%rsi),%r12
-	movq	48(%rsi),%rax
 	mulq	%r12
 	addq	%rax,%r10
-	movq	56(%rsi),%rax
+	movq	%r14,%rax
 	movq	%rdx,%rbx
 	adcq	$0,%rbx
 
 	mulq	%r12
 	addq	%rax,%r11
 	movq	%r12,%rax
-	movq	%r10,%r15
-	leaq	(%rcx,%r10,2),%r10
 	adcq	$0,%rdx
-	shrq	$63,%r15
 	addq	%rbx,%r11
-	movq	%rdx,%r12
-	adcq	$0,%r12
+	adcq	$0,%rdx
 
-	movq	%r11,%rbx
-	leaq	(%r15,%r11,2),%r11
+	xorq	%rbx,%rbx
+	addq	%r9,%r9
+	movq	%rdx,%r12
+	adcq	%r10,%r10
+	adcq	$0,%rbx
 
 	mulq	%rax
+
+	addq	%rcx,%rax
 	addq	%rax,%r9
+	movq	%r14,%rax
 	adcq	%rdx,%r10
-	adcq	$0,%r11
+	adcq	$0,%rbx
 
 	movq	%r9,80(%rsp)
 	movq	%r10,88(%rsp)
 
 
-	movq	48(%rsi),%r13
-	movq	56(%rsi),%rax
-	mulq	%r13
+	mulq	%rbp
 	addq	%rax,%r12
-	movq	%r13,%rax
-	movq	%rdx,%r13
-	adcq	$0,%r13
+	movq	%rbp,%rax
+	adcq	$0,%rdx
 
-	xorq	%r14,%r14
-	shlq	$1,%rbx
+	xorq	%rcx,%rcx
+	addq	%r11,%r11
+	movq	%rdx,%r13
 	adcq	%r12,%r12
-	adcq	%r13,%r13
-	adcq	%r14,%r14
+	adcq	$0,%rcx
 
 	mulq	%rax
+
+	addq	%rbx,%rax
 	addq	%rax,%r11
+	movq	%r14,%rax
 	adcq	%rdx,%r12
-	adcq	$0,%r13
+	adcq	$0,%rcx
 
 	movq	%r11,96(%rsp)
 	movq	%r12,104(%rsp)
 
 
-	movq	56(%rsi),%rax
-	mulq	%rax
-	addq	%rax,%r13
-	adcq	$0,%rdx
+	xorq	%rbx,%rbx
+	addq	%r13,%r13
+	adcq	$0,%rbx
 
-	addq	%rdx,%r14
+	mulq	%rax
 
-	movq	%r13,112(%rsp)
-	movq	%r14,120(%rsp)
+	addq	%rcx,%rax
+	addq	%r13,%rax
+	adcq	%rbx,%rdx
 
 	movq	(%rsp),%r8
 	movq	8(%rsp),%r9
@@ -378,6 +381,10 @@ rsaz_512_sqr:
 	movq	40(%rsp),%r13
 	movq	48(%rsp),%r14
 	movq	56(%rsp),%r15
+.byte	102,72,15,126,205
+
+	movq	%rax,112(%rsp)
+	movq	%rdx,120(%rsp)
 
 	call	__rsaz_512_reduce
 
@@ -406,9 +413,9 @@ rsaz_512_sqr:
 .Loop_sqrx:
 	movl	%r8d,128+8(%rsp)
 .byte	102,72,15,110,199
-.byte	102,72,15,110,205
 
 	mulxq	%rax,%r8,%r9
+	movq	%rax,%rbx
 
 	mulxq	16(%rsi),%rcx,%r10
 	xorq	%rbp,%rbp
@@ -416,40 +423,39 @@ rsaz_512_sqr:
 	mulxq	24(%rsi),%rax,%r11
 	adcxq	%rcx,%r9
 
-	mulxq	32(%rsi),%rcx,%r12
+.byte	0xc4,0x62,0xf3,0xf6,0xa6,0x20,0x00,0x00,0x00
 	adcxq	%rax,%r10
 
-	mulxq	40(%rsi),%rax,%r13
+.byte	0xc4,0x62,0xfb,0xf6,0xae,0x28,0x00,0x00,0x00
 	adcxq	%rcx,%r11
 
-.byte	0xc4,0x62,0xf3,0xf6,0xb6,0x30,0x00,0x00,0x00
+	mulxq	48(%rsi),%rcx,%r14
 	adcxq	%rax,%r12
 	adcxq	%rcx,%r13
 
-.byte	0xc4,0x62,0xfb,0xf6,0xbe,0x38,0x00,0x00,0x00
+	mulxq	56(%rsi),%rax,%r15
 	adcxq	%rax,%r14
 	adcxq	%rbp,%r15
 
-	movq	%r9,%rcx
-	shldq	$1,%r8,%r9
-	shlq	$1,%r8
-
-	xorl	%ebp,%ebp
-	mulxq	%rdx,%rax,%rdx
-	adcxq	%rdx,%r8
-	movq	8(%rsi),%rdx
-	adcxq	%rbp,%r9
+	mulxq	%rdx,%rax,%rdi
+	movq	%rbx,%rdx
+	xorq	%rcx,%rcx
+	adoxq	%r8,%r8
+	adcxq	%rdi,%r8
+	adoxq	%rbp,%rcx
+	adcxq	%rbp,%rcx
 
 	movq	%rax,(%rsp)
 	movq	%r8,8(%rsp)
 
 
-	mulxq	16(%rsi),%rax,%rbx
+.byte	0xc4,0xe2,0xfb,0xf6,0x9e,0x10,0x00,0x00,0x00
 	adoxq	%rax,%r10
 	adcxq	%rbx,%r11
 
-.byte	0xc4,0x62,0xc3,0xf6,0x86,0x18,0x00,0x00,0x00
+	mulxq	24(%rsi),%rdi,%r8
 	adoxq	%rdi,%r11
+.byte	0x66
 	adcxq	%r8,%r12
 
 	mulxq	32(%rsi),%rax,%rbx
@@ -467,24 +473,25 @@ rsaz_512_sqr:
 .byte	0xc4,0x62,0xc3,0xf6,0x86,0x38,0x00,0x00,0x00
 	adoxq	%rdi,%r15
 	adcxq	%rbp,%r8
+	mulxq	%rdx,%rax,%rdi
 	adoxq	%rbp,%r8
+.byte	0x48,0x8b,0x96,0x10,0x00,0x00,0x00
 
-	movq	%r11,%rbx
-	shldq	$1,%r10,%r11
-	shldq	$1,%rcx,%r10
+	xorq	%rbx,%rbx
+	adoxq	%r9,%r9
 
-	xorl	%ebp,%ebp
-	mulxq	%rdx,%rax,%rcx
-	movq	16(%rsi),%rdx
+	adcxq	%rcx,%rax
+	adoxq	%r10,%r10
 	adcxq	%rax,%r9
-	adcxq	%rcx,%r10
-	adcxq	%rbp,%r11
+	adoxq	%rbp,%rbx
+	adcxq	%rdi,%r10
+	adcxq	%rbp,%rbx
 
 	movq	%r9,16(%rsp)
 .byte	0x4c,0x89,0x94,0x24,0x18,0x00,0x00,0x00
 
 
-.byte	0xc4,0x62,0xc3,0xf6,0x8e,0x18,0x00,0x00,0x00
+	mulxq	24(%rsi),%rdi,%r9
 	adoxq	%rdi,%r12
 	adcxq	%r9,%r13
 
@@ -492,7 +499,7 @@ rsaz_512_sqr:
 	adoxq	%rax,%r13
 	adcxq	%rcx,%r14
 
-	mulxq	40(%rsi),%rdi,%r9
+.byte	0xc4,0x62,0xc3,0xf6,0x8e,0x28,0x00,0x00,0x00
 	adoxq	%rdi,%r14
 	adcxq	%r9,%r15
 
@@ -500,27 +507,28 @@ rsaz_512_sqr:
 	adoxq	%rax,%r15
 	adcxq	%rcx,%r8
 
-.byte	0xc4,0x62,0xc3,0xf6,0x8e,0x38,0x00,0x00,0x00
+	mulxq	56(%rsi),%rdi,%r9
 	adoxq	%rdi,%r8
 	adcxq	%rbp,%r9
+	mulxq	%rdx,%rax,%rdi
 	adoxq	%rbp,%r9
+	movq	24(%rsi),%rdx
 
-	movq	%r13,%rcx
-	shldq	$1,%r12,%r13
-	shldq	$1,%rbx,%r12
+	xorq	%rcx,%rcx
+	adoxq	%r11,%r11
 
-	xorl	%ebp,%ebp
-	mulxq	%rdx,%rax,%rdx
+	adcxq	%rbx,%rax
+	adoxq	%r12,%r12
 	adcxq	%rax,%r11
-	adcxq	%rdx,%r12
-	movq	24(%rsi),%rdx
-	adcxq	%rbp,%r13
+	adoxq	%rbp,%rcx
+	adcxq	%rdi,%r12
+	adcxq	%rbp,%rcx
 
 	movq	%r11,32(%rsp)
-.byte	0x4c,0x89,0xa4,0x24,0x28,0x00,0x00,0x00
+	movq	%r12,40(%rsp)
 
 
-.byte	0xc4,0xe2,0xfb,0xf6,0x9e,0x20,0x00,0x00,0x00
+	mulxq	32(%rsi),%rax,%rbx
 	adoxq	%rax,%r14
 	adcxq	%rbx,%r15
 
@@ -535,25 +543,25 @@ rsaz_512_sqr:
 	mulxq	56(%rsi),%rdi,%r10
 	adoxq	%rdi,%r9
 	adcxq	%rbp,%r10
+	mulxq	%rdx,%rax,%rdi
 	adoxq	%rbp,%r10
+	movq	32(%rsi),%rdx
 
-.byte	0x66
-	movq	%r15,%rbx
-	shldq	$1,%r14,%r15
-	shldq	$1,%rcx,%r14
+	xorq	%rbx,%rbx
+	adoxq	%r13,%r13
 
-	xorl	%ebp,%ebp
-	mulxq	%rdx,%rax,%rdx
+	adcxq	%rcx,%rax
+	adoxq	%r14,%r14
 	adcxq	%rax,%r13
-	adcxq	%rdx,%r14
-	movq	32(%rsi),%rdx
-	adcxq	%rbp,%r15
+	adoxq	%rbp,%rbx
+	adcxq	%rdi,%r14
+	adcxq	%rbp,%rbx
 
 	movq	%r13,48(%rsp)
 	movq	%r14,56(%rsp)
 
 
-.byte	0xc4,0x62,0xc3,0xf6,0x9e,0x28,0x00,0x00,0x00
+	mulxq	40(%rsi),%rdi,%r11
 	adoxq	%rdi,%r8
 	adcxq	%r11,%r9
 
@@ -564,18 +572,19 @@ rsaz_512_sqr:
 	mulxq	56(%rsi),%rdi,%r11
 	adoxq	%rdi,%r10
 	adcxq	%rbp,%r11
+	mulxq	%rdx,%rax,%rdi
+	movq	40(%rsi),%rdx
 	adoxq	%rbp,%r11
 
-	movq	%r9,%rcx
-	shldq	$1,%r8,%r9
-	shldq	$1,%rbx,%r8
+	xorq	%rcx,%rcx
+	adoxq	%r15,%r15
 
-	xorl	%ebp,%ebp
-	mulxq	%rdx,%rax,%rdx
+	adcxq	%rbx,%rax
+	adoxq	%r8,%r8
 	adcxq	%rax,%r15
-	adcxq	%rdx,%r8
-	movq	40(%rsi),%rdx
-	adcxq	%rbp,%r9
+	adoxq	%rbp,%rcx
+	adcxq	%rdi,%r8
+	adcxq	%rbp,%rcx
 
 	movq	%r15,64(%rsp)
 	movq	%r8,72(%rsp)
@@ -588,18 +597,19 @@ rsaz_512_sqr:
 .byte	0xc4,0x62,0xc3,0xf6,0xa6,0x38,0x00,0x00,0x00
 	adoxq	%rdi,%r11
 	adcxq	%rbp,%r12
+	mulxq	%rdx,%rax,%rdi
 	adoxq	%rbp,%r12
+	movq	48(%rsi),%rdx
 
-	movq	%r11,%rbx
-	shldq	$1,%r10,%r11
-	shldq	$1,%rcx,%r10
+	xorq	%rbx,%rbx
+	adoxq	%r9,%r9
 
-	xorl	%ebp,%ebp
-	mulxq	%rdx,%rax,%rdx
+	adcxq	%rcx,%rax
+	adoxq	%r10,%r10
 	adcxq	%rax,%r9
-	adcxq	%rdx,%r10
-	movq	48(%rsi),%rdx
-	adcxq	%rbp,%r11
+	adcxq	%rdi,%r10
+	adoxq	%rbp,%rbx
+	adcxq	%rbp,%rbx
 
 	movq	%r9,80(%rsp)
 	movq	%r10,88(%rsp)
@@ -609,31 +619,31 @@ rsaz_512_sqr:
 	adoxq	%rax,%r12
 	adoxq	%rbp,%r13
 
-	xorq	%r14,%r14
-	shldq	$1,%r13,%r14
-	shldq	$1,%r12,%r13
-	shldq	$1,%rbx,%r12
+	mulxq	%rdx,%rax,%rdi
+	xorq	%rcx,%rcx
+	movq	56(%rsi),%rdx
+	adoxq	%r11,%r11
 
-	xorl	%ebp,%ebp
-	mulxq	%rdx,%rax,%rdx
+	adcxq	%rbx,%rax
+	adoxq	%r12,%r12
 	adcxq	%rax,%r11
-	adcxq	%rdx,%r12
-	movq	56(%rsi),%rdx
-	adcxq	%rbp,%r13
+	adoxq	%rbp,%rcx
+	adcxq	%rdi,%r12
+	adcxq	%rbp,%rcx
 
 .byte	0x4c,0x89,0x9c,0x24,0x60,0x00,0x00,0x00
 .byte	0x4c,0x89,0xa4,0x24,0x68,0x00,0x00,0x00
 
 
 	mulxq	%rdx,%rax,%rdx
-	adoxq	%rax,%r13
-	adoxq	%rbp,%rdx
+	xorq	%rbx,%rbx
+	adoxq	%r13,%r13
 
-.byte	0x66
-	addq	%rdx,%r14
+	adcxq	%rcx,%rax
+	adoxq	%rbp,%rbx
+	adcxq	%r13,%rax
+	adcxq	%rdx,%rbx
 
-	movq	%r13,112(%rsp)
-	movq	%r14,120(%rsp)
 .byte	102,72,15,126,199
 .byte	102,72,15,126,205
 
@@ -647,6 +657,9 @@ rsaz_512_sqr:
 	movq	48(%rsp),%r14
 	movq	56(%rsp),%r15
 
+	movq	%rax,112(%rsp)
+	movq	%rbx,120(%rsp)
+
 	call	__rsaz_512_reducex
 
 	addq	64(%rsp),%r8
@@ -1440,6 +1453,7 @@ rsaz_512_mul_by_one:
 .type	__rsaz_512_reduce,@function
 .align	32
 __rsaz_512_reduce:
+.cfi_startproc
 	movq	%r8,%rbx
 	imulq	128+8(%rsp),%rbx
 	movq	0(%rbp),%rax
@@ -1519,10 +1533,12 @@ __rsaz_512_reduce:
 	jne	.Lreduction_loop
 
 	.byte	0xf3,0xc3
+.cfi_endproc
 .size	__rsaz_512_reduce,.-__rsaz_512_reduce
 .type	__rsaz_512_reducex,@function
 .align	32
 __rsaz_512_reducex:
+.cfi_startproc
 
 	imulq	%r8,%rdx
 	xorq	%rsi,%rsi
@@ -1575,10 +1591,12 @@ __rsaz_512_reducex:
 	jne	.Lreduction_loopx
 
 	.byte	0xf3,0xc3
+.cfi_endproc
 .size	__rsaz_512_reducex,.-__rsaz_512_reducex
 .type	__rsaz_512_subtract,@function
 .align	32
 __rsaz_512_subtract:
+.cfi_startproc
 	movq	%r8,(%rdi)
 	movq	%r9,8(%rdi)
 	movq	%r10,16(%rdi)
@@ -1632,10 +1650,12 @@ __rsaz_512_subtract:
 	movq	%r15,56(%rdi)
 
 	.byte	0xf3,0xc3
+.cfi_endproc
 .size	__rsaz_512_subtract,.-__rsaz_512_subtract
 .type	__rsaz_512_mul,@function
 .align	32
 __rsaz_512_mul:
+.cfi_startproc
 	leaq	8(%rsp),%rdi
 
 	movq	(%rsi),%rax
@@ -1774,10 +1794,12 @@ __rsaz_512_mul:
 	movq	%r15,56(%rdi)
 
 	.byte	0xf3,0xc3
+.cfi_endproc
 .size	__rsaz_512_mul,.-__rsaz_512_mul
 .type	__rsaz_512_mulx,@function
 .align	32
 __rsaz_512_mulx:
+.cfi_startproc
 	mulxq	(%rsi),%rbx,%r8
 	movq	$-6,%rcx
 
@@ -1894,11 +1916,13 @@ __rsaz_512_mulx:
 	movq	%r15,8+64+56(%rsp)
 
 	.byte	0xf3,0xc3
+.cfi_endproc
 .size	__rsaz_512_mulx,.-__rsaz_512_mulx
 .globl	rsaz_512_scatter4
 .type	rsaz_512_scatter4,@function
 .align	16
 rsaz_512_scatter4:
+.cfi_startproc
 	leaq	(%rdi,%rdx,8),%rdi
 	movl	$8,%r9d
 	jmp	.Loop_scatter
@@ -1911,12 +1935,14 @@ rsaz_512_scatter4:
 	decl	%r9d
 	jnz	.Loop_scatter
 	.byte	0xf3,0xc3
+.cfi_endproc
 .size	rsaz_512_scatter4,.-rsaz_512_scatter4
 
 .globl	rsaz_512_gather4
 .type	rsaz_512_gather4,@function
 .align	16
 rsaz_512_gather4:
+.cfi_startproc
 	movd	%edx,%xmm8
 	movdqa	.Linc+16(%rip),%xmm1
 	movdqa	.Linc(%rip),%xmm0
@@ -1980,6 +2006,7 @@ rsaz_512_gather4:
 	jnz	.Loop_gather
 	.byte	0xf3,0xc3
 .LSEH_end_rsaz_512_gather4:
+.cfi_endproc
 .size	rsaz_512_gather4,.-rsaz_512_gather4
 
 .align	64
diff --git a/deps/openssl/config/archs/linux-x32/asm_avx2/crypto/bn/x86_64-mont5.s b/deps/openssl/config/archs/linux-x32/asm_avx2/crypto/bn/x86_64-mont5.s
index df4b6610a0..40a60a3c8f 100644
--- a/deps/openssl/config/archs/linux-x32/asm_avx2/crypto/bn/x86_64-mont5.s
+++ b/deps/openssl/config/archs/linux-x32/asm_avx2/crypto/bn/x86_64-mont5.s
@@ -550,6 +550,7 @@ bn_mul4x_mont_gather5:
 .type	mul4x_internal,@function
 .align	32
 mul4x_internal:
+.cfi_startproc
 	shlq	$5,%r9
 	movd	8(%rax),%xmm5
 	leaq	.Linc(%rip),%rax
@@ -1071,6 +1072,7 @@ mul4x_internal:
 	movq	16(%rbp),%r14
 	movq	24(%rbp),%r15
 	jmp	.Lsqr4x_sub_entry
+.cfi_endproc
 .size	mul4x_internal,.-mul4x_internal
 .globl	bn_power5
 .type	bn_power5,@function
@@ -1213,6 +1215,7 @@ bn_power5:
 .align	32
 bn_sqr8x_internal:
 __bn_sqr8x_internal:
+.cfi_startproc
 
 
 
@@ -1987,10 +1990,12 @@ __bn_sqr8x_reduction:
 	cmpq	%rdx,%rdi
 	jb	.L8x_reduction_loop
 	.byte	0xf3,0xc3
+.cfi_endproc
 .size	bn_sqr8x_internal,.-bn_sqr8x_internal
 .type	__bn_post4x_internal,@function
 .align	32
 __bn_post4x_internal:
+.cfi_startproc
 	movq	0(%rbp),%r12
 	leaq	(%rdi,%r9,1),%rbx
 	movq	%r9,%rcx
@@ -2041,15 +2046,18 @@ __bn_post4x_internal:
 	movq	%r9,%r10
 	negq	%r9
 	.byte	0xf3,0xc3
+.cfi_endproc
 .size	__bn_post4x_internal,.-__bn_post4x_internal
 .globl	bn_from_montgomery
 .type	bn_from_montgomery,@function
 .align	32
 bn_from_montgomery:
+.cfi_startproc
 	testl	$7,%r9d
 	jz	bn_from_mont8x
 	xorl	%eax,%eax
 	.byte	0xf3,0xc3
+.cfi_endproc
 .size	bn_from_montgomery,.-bn_from_montgomery
 
 .type	bn_from_mont8x,@function
@@ -2333,6 +2341,7 @@ bn_mulx4x_mont_gather5:
 .type	mulx4x_internal,@function
 .align	32
 mulx4x_internal:
+.cfi_startproc
 	movq	%r9,8(%rsp)
 	movq	%r9,%r10
 	negq	%r9
@@ -2751,6 +2760,7 @@ mulx4x_internal:
 	movq	16(%rbp),%r14
 	movq	24(%rbp),%r15
 	jmp	.Lsqrx4x_sub_entry
+.cfi_endproc
 .size	mulx4x_internal,.-mulx4x_internal
 .type	bn_powerx5,@function
 .align	32
@@ -3509,6 +3519,7 @@ __bn_sqrx8x_reduction:
 .size	bn_sqrx8x_internal,.-bn_sqrx8x_internal
 .align	32
 __bn_postx4x_internal:
+.cfi_startproc
 	movq	0(%rbp),%r12
 	movq	%rcx,%r10
 	movq	%rcx,%r9
@@ -3556,11 +3567,13 @@ __bn_postx4x_internal:
 	negq	%r9
 
 	.byte	0xf3,0xc3
+.cfi_endproc
 .size	__bn_postx4x_internal,.-__bn_postx4x_internal
 .globl	bn_get_bits5
 .type	bn_get_bits5,@function
 .align	16
 bn_get_bits5:
+.cfi_startproc
 	leaq	0(%rdi),%r10
 	leaq	1(%rdi),%r11
 	movl	%esi,%ecx
@@ -3574,12 +3587,14 @@ bn_get_bits5:
 	shrl	%cl,%eax
 	andl	$31,%eax
 	.byte	0xf3,0xc3
+.cfi_endproc
 .size	bn_get_bits5,.-bn_get_bits5
 
 .globl	bn_scatter5
 .type	bn_scatter5,@function
 .align	16
 bn_scatter5:
+.cfi_startproc
 	cmpl	$0,%esi
 	jz	.Lscatter_epilogue
 	leaq	(%rdx,%rcx,8),%rdx
@@ -3592,6 +3607,7 @@ bn_scatter5:
 	jnz	.Lscatter
 .Lscatter_epilogue:
 	.byte	0xf3,0xc3
+.cfi_endproc
 .size	bn_scatter5,.-bn_scatter5
 
 .globl	bn_gather5
@@ -3599,6 +3615,7 @@ bn_scatter5:
 .align	32
 bn_gather5:
 .LSEH_begin_bn_gather5:
+.cfi_startproc
 
 .byte	0x4c,0x8d,0x14,0x24
 .byte	0x48,0x81,0xec,0x08,0x01,0x00,0x00
@@ -3756,6 +3773,7 @@ bn_gather5:
 	leaq	(%r10),%rsp
 	.byte	0xf3,0xc3
 .LSEH_end_bn_gather5:
+.cfi_endproc
 .size	bn_gather5,.-bn_gather5
 .align	64
 .Linc:
diff --git a/deps/openssl/config/archs/linux-x32/asm_avx2/crypto/buildinf.h b/deps/openssl/config/archs/linux-x32/asm_avx2/crypto/buildinf.h
index f567041169..5b88a094e6 100644
--- a/deps/openssl/config/archs/linux-x32/asm_avx2/crypto/buildinf.h
+++ b/deps/openssl/config/archs/linux-x32/asm_avx2/crypto/buildinf.h
@@ -11,7 +11,7 @@
  */
 
 #define PLATFORM "platform: linux-x32"
-#define DATE "built on: Fri Sep 13 15:59:58 2019 UTC"
+#define DATE "built on: Wed Mar 18 21:06:52 2020 UTC"
 
 /*
  * Generate compiler_flags as an array of individual characters. This is a
@@ -38,10 +38,11 @@ static const char compiler_flags[] = {
     'A','S','M',' ','-','D','S','H','A','5','1','2','_','A','S','M',
     ' ','-','D','K','E','C','C','A','K','1','6','0','0','_','A','S',
     'M',' ','-','D','R','C','4','_','A','S','M',' ','-','D','M','D',
-    '5','_','A','S','M',' ','-','D','V','P','A','E','S','_','A','S',
-    'M',' ','-','D','G','H','A','S','H','_','A','S','M',' ','-','D',
-    'E','C','P','_','N','I','S','T','Z','2','5','6','_','A','S','M',
-    ' ','-','D','X','2','5','5','1','9','_','A','S','M',' ','-','D',
-    'P','O','L','Y','1','3','0','5','_','A','S','M',' ','-','D','N',
-    'D','E','B','U','G','\0'
+    '5','_','A','S','M',' ','-','D','A','E','S','N','I','_','A','S',
+    'M',' ','-','D','V','P','A','E','S','_','A','S','M',' ','-','D',
+    'G','H','A','S','H','_','A','S','M',' ','-','D','E','C','P','_',
+    'N','I','S','T','Z','2','5','6','_','A','S','M',' ','-','D','X',
+    '2','5','5','1','9','_','A','S','M',' ','-','D','P','O','L','Y',
+    '1','3','0','5','_','A','S','M',' ','-','D','N','D','E','B','U',
+    'G','\0'
 };
diff --git a/deps/openssl/config/archs/linux-x32/asm_avx2/crypto/camellia/cmll-x86_64.s b/deps/openssl/config/archs/linux-x32/asm_avx2/crypto/camellia/cmll-x86_64.s
index 405566b01c..eeb20dd229 100644
--- a/deps/openssl/config/archs/linux-x32/asm_avx2/crypto/camellia/cmll-x86_64.s
+++ b/deps/openssl/config/archs/linux-x32/asm_avx2/crypto/camellia/cmll-x86_64.s
@@ -5,11 +5,13 @@
 .type	Camellia_EncryptBlock,@function
 .align	16
 Camellia_EncryptBlock:
+.cfi_startproc
 	movl	$128,%eax
 	subl	%edi,%eax
 	movl	$3,%edi
 	adcl	$0,%edi
 	jmp	.Lenc_rounds
+.cfi_endproc
 .size	Camellia_EncryptBlock,.-Camellia_EncryptBlock
 
 .globl	Camellia_EncryptBlock_Rounds
@@ -83,6 +85,7 @@ Camellia_EncryptBlock_Rounds:
 .type	_x86_64_Camellia_encrypt,@function
 .align	16
 _x86_64_Camellia_encrypt:
+.cfi_startproc
 	xorl	0(%r14),%r9d
 	xorl	4(%r14),%r8d
 	xorl	8(%r14),%r11d
@@ -285,6 +288,7 @@ _x86_64_Camellia_encrypt:
 	movl	%edx,%r11d
 
 .byte	0xf3,0xc3
+.cfi_endproc
 .size	_x86_64_Camellia_encrypt,.-_x86_64_Camellia_encrypt
 
 
@@ -292,11 +296,13 @@ _x86_64_Camellia_encrypt:
 .type	Camellia_DecryptBlock,@function
 .align	16
 Camellia_DecryptBlock:
+.cfi_startproc
 	movl	$128,%eax
 	subl	%edi,%eax
 	movl	$3,%edi
 	adcl	$0,%edi
 	jmp	.Ldec_rounds
+.cfi_endproc
 .size	Camellia_DecryptBlock,.-Camellia_DecryptBlock
 
 .globl	Camellia_DecryptBlock_Rounds
@@ -370,6 +376,7 @@ Camellia_DecryptBlock_Rounds:
 .type	_x86_64_Camellia_decrypt,@function
 .align	16
 _x86_64_Camellia_decrypt:
+.cfi_startproc
 	xorl	0(%r14),%r9d
 	xorl	4(%r14),%r8d
 	xorl	8(%r14),%r11d
@@ -573,6 +580,7 @@ _x86_64_Camellia_decrypt:
 	movl	%ebx,%r11d
 
 .byte	0xf3,0xc3
+.cfi_endproc
 .size	_x86_64_Camellia_decrypt,.-_x86_64_Camellia_decrypt
 .globl	Camellia_Ekeygen
 .type	Camellia_Ekeygen,@function
diff --git a/deps/openssl/config/archs/linux-x32/asm_avx2/crypto/ec/ecp_nistz256-x86_64.s b/deps/openssl/config/archs/linux-x32/asm_avx2/crypto/ec/ecp_nistz256-x86_64.s
index 62b9ac6616..5c9e405041 100644
--- a/deps/openssl/config/archs/linux-x32/asm_avx2/crypto/ec/ecp_nistz256-x86_64.s
+++ b/deps/openssl/config/archs/linux-x32/asm_avx2/crypto/ec/ecp_nistz256-x86_64.s
@@ -3874,10 +3874,12 @@ ecp_nistz256_ord_sqr_montx:
 .type	ecp_nistz256_to_mont,@function
 .align	32
 ecp_nistz256_to_mont:
+.cfi_startproc
 	movl	$0x80100,%ecx
 	andl	OPENSSL_ia32cap_P+8(%rip),%ecx
 	leaq	.LRR(%rip),%rdx
 	jmp	.Lmul_mont
+.cfi_endproc
 .size	ecp_nistz256_to_mont,.-ecp_nistz256_to_mont
 
 
@@ -4821,6 +4823,7 @@ ecp_nistz256_from_mont:
 .type	ecp_nistz256_scatter_w5,@function
 .align	32
 ecp_nistz256_scatter_w5:
+.cfi_startproc
 	leal	-3(%rdx,%rdx,2),%edx
 	movdqa	0(%rsi),%xmm0
 	shll	$5,%edx
@@ -4837,6 +4840,7 @@ ecp_nistz256_scatter_w5:
 	movdqa	%xmm5,80(%rdi,%rdx,1)
 
 	.byte	0xf3,0xc3
+.cfi_endproc
 .size	ecp_nistz256_scatter_w5,.-ecp_nistz256_scatter_w5
 
 
@@ -4910,6 +4914,7 @@ ecp_nistz256_gather_w5:
 .type	ecp_nistz256_scatter_w7,@function
 .align	32
 ecp_nistz256_scatter_w7:
+.cfi_startproc
 	movdqu	0(%rsi),%xmm0
 	shll	$6,%edx
 	movdqu	16(%rsi),%xmm1
@@ -4921,6 +4926,7 @@ ecp_nistz256_scatter_w7:
 	movdqa	%xmm3,48(%rdi,%rdx,1)
 
 	.byte	0xf3,0xc3
+.cfi_endproc
 .size	ecp_nistz256_scatter_w7,.-ecp_nistz256_scatter_w7
 
 
@@ -5655,26 +5661,16 @@ ecp_nistz256_point_add:
 	orq	%r8,%r12
 	orq	%r9,%r12
 
-.byte	0x3e
-	jnz	.Ladd_proceedq
 .byte	102,73,15,126,208
 .byte	102,73,15,126,217
-	testq	%r8,%r8
-	jnz	.Ladd_proceedq
-	testq	%r9,%r9
-	jz	.Ladd_doubleq
 
-.byte	102,72,15,126,199
-	pxor	%xmm0,%xmm0
-	movdqu	%xmm0,0(%rdi)
-	movdqu	%xmm0,16(%rdi)
-	movdqu	%xmm0,32(%rdi)
-	movdqu	%xmm0,48(%rdi)
-	movdqu	%xmm0,64(%rdi)
-	movdqu	%xmm0,80(%rdi)
-	jmp	.Ladd_doneq
+	orq	%r8,%r12
+	orq	%r9,%r12
+
+
+.byte	0x3e
+	jnz	.Ladd_proceedq
 
-.align	32
 .Ladd_doubleq:
 .byte	102,72,15,126,206
 .byte	102,72,15,126,199
@@ -6774,26 +6770,16 @@ ecp_nistz256_point_addx:
 	orq	%r8,%r12
 	orq	%r9,%r12
 
-.byte	0x3e
-	jnz	.Ladd_proceedx
 .byte	102,73,15,126,208
 .byte	102,73,15,126,217
-	testq	%r8,%r8
-	jnz	.Ladd_proceedx
-	testq	%r9,%r9
-	jz	.Ladd_doublex
 
-.byte	102,72,15,126,199
-	pxor	%xmm0,%xmm0
-	movdqu	%xmm0,0(%rdi)
-	movdqu	%xmm0,16(%rdi)
-	movdqu	%xmm0,32(%rdi)
-	movdqu	%xmm0,48(%rdi)
-	movdqu	%xmm0,64(%rdi)
-	movdqu	%xmm0,80(%rdi)
-	jmp	.Ladd_donex
+	orq	%r8,%r12
+	orq	%r9,%r12
+
+
+.byte	0x3e
+	jnz	.Ladd_proceedx
 
-.align	32
 .Ladd_doublex:
 .byte	102,72,15,126,206
 .byte	102,72,15,126,199
diff --git a/deps/openssl/config/archs/linux-x32/asm_avx2/crypto/ec/x25519-x86_64.s b/deps/openssl/config/archs/linux-x32/asm_avx2/crypto/ec/x25519-x86_64.s
index 2a18eaee28..1788e568cd 100644
--- a/deps/openssl/config/archs/linux-x32/asm_avx2/crypto/ec/x25519-x86_64.s
+++ b/deps/openssl/config/archs/linux-x32/asm_avx2/crypto/ec/x25519-x86_64.s
@@ -400,12 +400,14 @@ x25519_fe51_mul121666:
 .type	x25519_fe64_eligible,@function
 .align	32
 x25519_fe64_eligible:
+.cfi_startproc
 	movl	OPENSSL_ia32cap_P+8(%rip),%ecx
 	xorl	%eax,%eax
 	andl	$0x80100,%ecx
 	cmpl	$0x80100,%ecx
 	cmovel	%ecx,%eax
 	.byte	0xf3,0xc3
+.cfi_endproc
 .size	x25519_fe64_eligible,.-x25519_fe64_eligible
 
 .globl	x25519_fe64_mul
@@ -648,6 +650,7 @@ x25519_fe64_sqr:
 .align	32
 x25519_fe64_mul121666:
 .Lfe64_mul121666_body:
+.cfi_startproc
 	movl	$121666,%edx
 	mulxq	0(%rsi),%r8,%rcx
 	mulxq	8(%rsi),%r9,%rax
@@ -676,6 +679,7 @@ x25519_fe64_mul121666:
 
 .Lfe64_mul121666_epilogue:
 	.byte	0xf3,0xc3
+.cfi_endproc
 .size	x25519_fe64_mul121666,.-x25519_fe64_mul121666
 
 .globl	x25519_fe64_add
@@ -683,6 +687,7 @@ x25519_fe64_mul121666:
 .align	32
 x25519_fe64_add:
 .Lfe64_add_body:
+.cfi_startproc
 	movq	0(%rsi),%r8
 	movq	8(%rsi),%r9
 	movq	16(%rsi),%r10
@@ -711,6 +716,7 @@ x25519_fe64_add:
 
 .Lfe64_add_epilogue:
 	.byte	0xf3,0xc3
+.cfi_endproc
 .size	x25519_fe64_add,.-x25519_fe64_add
 
 .globl	x25519_fe64_sub
@@ -718,6 +724,7 @@ x25519_fe64_add:
 .align	32
 x25519_fe64_sub:
 .Lfe64_sub_body:
+.cfi_startproc
 	movq	0(%rsi),%r8
 	movq	8(%rsi),%r9
 	movq	16(%rsi),%r10
@@ -746,6 +753,7 @@ x25519_fe64_sub:
 
 .Lfe64_sub_epilogue:
 	.byte	0xf3,0xc3
+.cfi_endproc
 .size	x25519_fe64_sub,.-x25519_fe64_sub
 
 .globl	x25519_fe64_tobytes
@@ -753,6 +761,7 @@ x25519_fe64_sub:
 .align	32
 x25519_fe64_tobytes:
 .Lfe64_to_body:
+.cfi_startproc
 	movq	0(%rsi),%r8
 	movq	8(%rsi),%r9
 	movq	16(%rsi),%r10
@@ -788,5 +797,6 @@ x25519_fe64_tobytes:
 
 .Lfe64_to_epilogue:
 	.byte	0xf3,0xc3
+.cfi_endproc
 .size	x25519_fe64_tobytes,.-x25519_fe64_tobytes
 .byte	88,50,53,53,49,57,32,112,114,105,109,105,116,105,118,101,115,32,102,111,114,32,120,56,54,95,54,52,44,32,67,82,89,80,84,79,71,65,77,83,32,98,121,32,60,97,112,112,114,111,64,111,112,101,110,115,115,108,46,111,114,103,62,0
diff --git a/deps/openssl/config/archs/linux-x32/asm_avx2/crypto/include/internal/bn_conf.h b/deps/openssl/config/archs/linux-x32/asm_avx2/crypto/include/internal/bn_conf.h
index 0d071bda66..93f75e2e15 100644
--- a/deps/openssl/config/archs/linux-x32/asm_avx2/crypto/include/internal/bn_conf.h
+++ b/deps/openssl/config/archs/linux-x32/asm_avx2/crypto/include/internal/bn_conf.h
@@ -1,5 +1,5 @@
 /* WARNING: do not edit! */
-/* Generated by Makefile from crypto/include/internal/bn_conf.h.in */
+/* Generated by Makefile from include/crypto/bn_conf.h.in */
 /*
  * Copyright 2016 The OpenSSL Project Authors. All Rights Reserved.
  *
@@ -9,8 +9,8 @@
  * https://www.openssl.org/source/license.html
  */
 
-#ifndef HEADER_BN_CONF_H
-# define HEADER_BN_CONF_H
+#ifndef OSSL_CRYPTO_BN_CONF_H
+# define OSSL_CRYPTO_BN_CONF_H
 
 /*
  * The contents of this file are not used in the UEFI build, as
diff --git a/deps/openssl/config/archs/linux-x32/asm_avx2/crypto/include/internal/dso_conf.h b/deps/openssl/config/archs/linux-x32/asm_avx2/crypto/include/internal/dso_conf.h
index 252266ec2a..4b1167c3d8 100644
--- a/deps/openssl/config/archs/linux-x32/asm_avx2/crypto/include/internal/dso_conf.h
+++ b/deps/openssl/config/archs/linux-x32/asm_avx2/crypto/include/internal/dso_conf.h
@@ -1,5 +1,5 @@
 /* WARNING: do not edit! */
-/* Generated by Makefile from crypto/include/internal/dso_conf.h.in */
+/* Generated by Makefile from include/crypto/dso_conf.h.in */
 /*
  * Copyright 2016-2019 The OpenSSL Project Authors. All Rights Reserved.
  *
@@ -9,8 +9,8 @@
  * https://www.openssl.org/source/license.html
  */
 
-#ifndef HEADER_DSO_CONF_H
-# define HEADER_DSO_CONF_H
+#ifndef OSSL_CRYPTO_DSO_CONF_H
+# define OSSL_CRYPTO_DSO_CONF_H
 # define DSO_DLFCN
 # define HAVE_DLFCN_H
 # define DSO_EXTENSION ".so"
diff --git a/deps/openssl/config/archs/linux-x32/asm_avx2/crypto/modes/aesni-gcm-x86_64.s b/deps/openssl/config/archs/linux-x32/asm_avx2/crypto/modes/aesni-gcm-x86_64.s
index 6a7a9577c7..01d89630a4 100644
--- a/deps/openssl/config/archs/linux-x32/asm_avx2/crypto/modes/aesni-gcm-x86_64.s
+++ b/deps/openssl/config/archs/linux-x32/asm_avx2/crypto/modes/aesni-gcm-x86_64.s
@@ -3,6 +3,7 @@
 .type	_aesni_ctr32_ghash_6x,@function
 .align	32
 _aesni_ctr32_ghash_6x:
+.cfi_startproc
 	vmovdqu	32(%r11),%xmm2
 	subq	$6,%rdx
 	vpxor	%xmm4,%xmm4,%xmm4
@@ -310,6 +311,7 @@ _aesni_ctr32_ghash_6x:
 	vpxor	%xmm4,%xmm8,%xmm8
 
 	.byte	0xf3,0xc3
+.cfi_endproc
 .size	_aesni_ctr32_ghash_6x,.-_aesni_ctr32_ghash_6x
 .globl	aesni_gcm_decrypt
 .type	aesni_gcm_decrypt,@function
@@ -416,6 +418,7 @@ aesni_gcm_decrypt:
 .type	_aesni_ctr32_6x,@function
 .align	32
 _aesni_ctr32_6x:
+.cfi_startproc
 	vmovdqu	0-128(%rcx),%xmm4
 	vmovdqu	32(%r11),%xmm2
 	leaq	-1(%rbp),%r13
@@ -502,6 +505,7 @@ _aesni_ctr32_6x:
 	vpshufb	%xmm0,%xmm1,%xmm1
 	vpxor	%xmm4,%xmm14,%xmm14
 	jmp	.Loop_ctr32
+.cfi_endproc
 .size	_aesni_ctr32_6x,.-_aesni_ctr32_6x
 
 .globl	aesni_gcm_encrypt
diff --git a/deps/openssl/config/archs/linux-x32/asm_avx2/crypto/poly1305/poly1305-x86_64.s b/deps/openssl/config/archs/linux-x32/asm_avx2/crypto/poly1305/poly1305-x86_64.s
index 2d829b713b..505c06471d 100644
--- a/deps/openssl/config/archs/linux-x32/asm_avx2/crypto/poly1305/poly1305-x86_64.s
+++ b/deps/openssl/config/archs/linux-x32/asm_avx2/crypto/poly1305/poly1305-x86_64.s
@@ -12,6 +12,7 @@
 .type	poly1305_init,@function
 .align	32
 poly1305_init:
+.cfi_startproc
 	xorq	%rax,%rax
 	movq	%rax,0(%rdi)
 	movq	%rax,8(%rdi)
@@ -42,6 +43,7 @@ poly1305_init:
 	movl	$1,%eax
 .Lno_key:
 	.byte	0xf3,0xc3
+.cfi_endproc
 .size	poly1305_init,.-poly1305_init
 
 .type	poly1305_blocks,@function
@@ -162,6 +164,7 @@ poly1305_blocks:
 .type	poly1305_emit,@function
 .align	32
 poly1305_emit:
+.cfi_startproc
 .Lemit:
 	movq	0(%rdi),%r8
 	movq	8(%rdi),%r9
@@ -182,10 +185,12 @@ poly1305_emit:
 	movq	%rcx,8(%rsi)
 
 	.byte	0xf3,0xc3
+.cfi_endproc
 .size	poly1305_emit,.-poly1305_emit
 .type	__poly1305_block,@function
 .align	32
 __poly1305_block:
+.cfi_startproc
 	mulq	%r14
 	movq	%rax,%r9
 	movq	%r11,%rax
@@ -225,11 +230,13 @@ __poly1305_block:
 	adcq	$0,%rbx
 	adcq	$0,%rbp
 	.byte	0xf3,0xc3
+.cfi_endproc
 .size	__poly1305_block,.-__poly1305_block
 
 .type	__poly1305_init_avx,@function
 .align	32
 __poly1305_init_avx:
+.cfi_startproc
 	movq	%r11,%r14
 	movq	%r12,%rbx
 	xorq	%rbp,%rbp
@@ -387,6 +394,7 @@ __poly1305_init_avx:
 
 	leaq	-48-64(%rdi),%rdi
 	.byte	0xf3,0xc3
+.cfi_endproc
 .size	__poly1305_init_avx,.-__poly1305_init_avx
 
 .type	poly1305_blocks_avx,@function
@@ -1227,6 +1235,7 @@ poly1305_blocks_avx:
 .type	poly1305_emit_avx,@function
 .align	32
 poly1305_emit_avx:
+.cfi_startproc
 	cmpl	$0,20(%rdi)
 	je	.Lemit
 
@@ -1277,6 +1286,7 @@ poly1305_emit_avx:
 	movq	%rcx,8(%rsi)
 
 	.byte	0xf3,0xc3
+.cfi_endproc
 .size	poly1305_emit_avx,.-poly1305_emit_avx
 .type	poly1305_blocks_avx2,@function
 .align	32
@@ -1959,6 +1969,7 @@ poly1305_blocks_avx2:
 .type	xor128_encrypt_n_pad,@function
 .align	16
 xor128_encrypt_n_pad:
+.cfi_startproc
 	subq	%rdx,%rsi
 	subq	%rdx,%rdi
 	movq	%rcx,%r10
@@ -2000,12 +2011,14 @@ xor128_encrypt_n_pad:
 .Ldone_enc:
 	movq	%rdx,%rax
 	.byte	0xf3,0xc3
+.cfi_endproc
 .size	xor128_encrypt_n_pad,.-xor128_encrypt_n_pad
 
 .globl	xor128_decrypt_n_pad
 .type	xor128_decrypt_n_pad,@function
 .align	16
 xor128_decrypt_n_pad:
+.cfi_startproc
 	subq	%rdx,%rsi
 	subq	%rdx,%rdi
 	movq	%rcx,%r10
@@ -2051,4 +2064,5 @@ xor128_decrypt_n_pad:
 .Ldone_dec:
 	movq	%rdx,%rax
 	.byte	0xf3,0xc3
+.cfi_endproc
 .size	xor128_decrypt_n_pad,.-xor128_decrypt_n_pad
diff --git a/deps/openssl/config/archs/linux-x32/asm_avx2/crypto/rc4/rc4-x86_64.s b/deps/openssl/config/archs/linux-x32/asm_avx2/crypto/rc4/rc4-x86_64.s
index fba70351d4..b97c757550 100644
--- a/deps/openssl/config/archs/linux-x32/asm_avx2/crypto/rc4/rc4-x86_64.s
+++ b/deps/openssl/config/archs/linux-x32/asm_avx2/crypto/rc4/rc4-x86_64.s
@@ -4,11 +4,12 @@
 .globl	RC4
 .type	RC4,@function
 .align	16
-RC4:	orq	%rsi,%rsi
+RC4:
+.cfi_startproc
+	orq	%rsi,%rsi
 	jne	.Lentry
 	.byte	0xf3,0xc3
 .Lentry:
-.cfi_startproc	
 	pushq	%rbx
 .cfi_adjust_cfa_offset	8
 .cfi_offset	%rbx,-16
@@ -533,6 +534,7 @@ RC4:	orq	%rsi,%rsi
 .type	RC4_set_key,@function
 .align	16
 RC4_set_key:
+.cfi_startproc
 	leaq	8(%rdi),%rdi
 	leaq	(%rdx,%rsi,1),%rdx
 	negq	%rsi
@@ -599,12 +601,14 @@ RC4_set_key:
 	movl	%eax,-8(%rdi)
 	movl	%eax,-4(%rdi)
 	.byte	0xf3,0xc3
+.cfi_endproc
 .size	RC4_set_key,.-RC4_set_key
 
 .globl	RC4_options
 .type	RC4_options,@function
 .align	16
 RC4_options:
+.cfi_startproc
 	leaq	.Lopts(%rip),%rax
 	movl	OPENSSL_ia32cap_P(%rip),%edx
 	btl	$20,%edx
@@ -617,6 +621,7 @@ RC4_options:
 	addq	$12,%rax
 .Ldone:
 	.byte	0xf3,0xc3
+.cfi_endproc
 .align	64
 .Lopts:
 .byte	114,99,52,40,56,120,44,105,110,116,41,0
diff --git a/deps/openssl/config/archs/linux-x32/asm_avx2/crypto/sha/keccak1600-x86_64.s b/deps/openssl/config/archs/linux-x32/asm_avx2/crypto/sha/keccak1600-x86_64.s
index e511f25035..09617d014b 100644
--- a/deps/openssl/config/archs/linux-x32/asm_avx2/crypto/sha/keccak1600-x86_64.s
+++ b/deps/openssl/config/archs/linux-x32/asm_avx2/crypto/sha/keccak1600-x86_64.s
@@ -3,6 +3,7 @@
 .type	__KeccakF1600,@function
 .align	32
 __KeccakF1600:
+.cfi_startproc
 	movq	60(%rdi),%rax
 	movq	68(%rdi),%rbx
 	movq	76(%rdi),%rcx
@@ -255,6 +256,7 @@ __KeccakF1600:
 
 	leaq	-192(%r15),%r15
 	.byte	0xf3,0xc3
+.cfi_endproc
 .size	__KeccakF1600,.-__KeccakF1600
 
 .type	KeccakF1600,@function
diff --git a/deps/openssl/config/archs/linux-x32/asm_avx2/crypto/sha/sha1-x86_64.s b/deps/openssl/config/archs/linux-x32/asm_avx2/crypto/sha/sha1-x86_64.s
index e436521a04..98541727e5 100644
--- a/deps/openssl/config/archs/linux-x32/asm_avx2/crypto/sha/sha1-x86_64.s
+++ b/deps/openssl/config/archs/linux-x32/asm_avx2/crypto/sha/sha1-x86_64.s
@@ -1421,8 +1421,8 @@ _shaext_shortcut:
 	pshufd	$27,%xmm1,%xmm1
 	movdqu	%xmm0,(%rdi)
 	movd	%xmm1,16(%rdi)
-.cfi_endproc	
 	.byte	0xf3,0xc3
+.cfi_endproc
 .size	sha1_block_data_order_shaext,.-sha1_block_data_order_shaext
 .type	sha1_block_data_order_ssse3,@function
 .align	16
diff --git a/deps/openssl/config/archs/linux-x32/asm_avx2/crypto/sha/sha256-x86_64.s b/deps/openssl/config/archs/linux-x32/asm_avx2/crypto/sha/sha256-x86_64.s
index 42b24df18e..9357385da3 100644
--- a/deps/openssl/config/archs/linux-x32/asm_avx2/crypto/sha/sha256-x86_64.s
+++ b/deps/openssl/config/archs/linux-x32/asm_avx2/crypto/sha/sha256-x86_64.s
@@ -1775,6 +1775,7 @@ K256:
 .align	64
 sha256_block_data_order_shaext:
 _shaext_shortcut:
+.cfi_startproc
 	leaq	K256+128(%rip),%rcx
 	movdqu	(%rdi),%xmm1
 	movdqu	16(%rdi),%xmm2
@@ -1977,6 +1978,7 @@ _shaext_shortcut:
 	movdqu	%xmm1,(%rdi)
 	movdqu	%xmm2,16(%rdi)
 	.byte	0xf3,0xc3
+.cfi_endproc
 .size	sha256_block_data_order_shaext,.-sha256_block_data_order_shaext
 .type	sha256_block_data_order_ssse3,@function
 .align	64
@@ -4238,7 +4240,15 @@ sha256_block_data_order_avx2:
 	vmovdqa	%ymm4,0(%rsp)
 	xorl	%r14d,%r14d
 	vmovdqa	%ymm5,32(%rsp)
+
+	movq	88(%rsp),%rdi
+.cfi_def_cfa	%rdi,8
 	leaq	-64(%rsp),%rsp
+
+
+
+	movq	%rdi,-8(%rsp)
+.cfi_escape	0x0f,0x05,0x77,0x78,0x06,0x23,0x08
 	movl	%ebx,%edi
 	vmovdqa	%ymm6,0(%rsp)
 	xorl	%ecx,%edi
@@ -4250,6 +4260,12 @@ sha256_block_data_order_avx2:
 .align	16
 .Lavx2_00_47:
 	leaq	-64(%rsp),%rsp
+.cfi_escape	0x0f,0x05,0x77,0x38,0x06,0x23,0x08
+
+	pushq	64-8(%rsp)
+.cfi_escape	0x0f,0x05,0x77,0x00,0x06,0x23,0x08
+	leaq	8(%rsp),%rsp
+.cfi_escape	0x0f,0x05,0x77,0x78,0x06,0x23,0x08
 	vpalignr	$4,%ymm0,%ymm1,%ymm4
 	addl	0+128(%rsp),%r11d
 	andl	%r8d,%r12d
@@ -4505,6 +4521,12 @@ sha256_block_data_order_avx2:
 	movl	%r9d,%r12d
 	vmovdqa	%ymm6,32(%rsp)
 	leaq	-64(%rsp),%rsp
+.cfi_escape	0x0f,0x05,0x77,0x38,0x06,0x23,0x08
+
+	pushq	64-8(%rsp)
+.cfi_escape	0x0f,0x05,0x77,0x00,0x06,0x23,0x08
+	leaq	8(%rsp),%rsp
+.cfi_escape	0x0f,0x05,0x77,0x78,0x06,0x23,0x08
 	vpalignr	$4,%ymm2,%ymm3,%ymm4
 	addl	0+128(%rsp),%r11d
 	andl	%r8d,%r12d
@@ -5380,6 +5402,8 @@ sha256_block_data_order_avx2:
 
 	leaq	448(%rsp),%rsp
 
+.cfi_escape	0x0f,0x06,0x77,0xd8,0x00,0x06,0x23,0x08
+
 	addl	0(%rdi),%eax
 	addl	4(%rdi),%ebx
 	addl	8(%rdi),%ecx
@@ -5405,9 +5429,11 @@ sha256_block_data_order_avx2:
 	jbe	.Loop_avx2
 	leaq	(%rsp),%rbp
 
+
+.cfi_escape	0x0f,0x06,0x76,0xd8,0x00,0x06,0x23,0x08
+
 .Ldone_avx2:
-	leaq	(%rbp),%rsp
-	movq	88(%rsp),%rsi
+	movq	88(%rbp),%rsi
 .cfi_def_cfa	%rsi,8
 	vzeroupper
 	movq	-48(%rsi),%r15
diff --git a/deps/openssl/config/archs/linux-x32/asm_avx2/crypto/sha/sha512-x86_64.s b/deps/openssl/config/archs/linux-x32/asm_avx2/crypto/sha/sha512-x86_64.s
index 5931a2a932..939f1ca71c 100644
--- a/deps/openssl/config/archs/linux-x32/asm_avx2/crypto/sha/sha512-x86_64.s
+++ b/deps/openssl/config/archs/linux-x32/asm_avx2/crypto/sha/sha512-x86_64.s
@@ -4165,7 +4165,15 @@ sha512_block_data_order_avx2:
 	vmovdqa	%ymm10,64(%rsp)
 	vpaddq	64(%rbp),%ymm6,%ymm10
 	vmovdqa	%ymm11,96(%rsp)
+
+	movq	152(%rsp),%rdi
+.cfi_def_cfa	%rdi,8
 	leaq	-128(%rsp),%rsp
+
+
+
+	movq	%rdi,-8(%rsp)
+.cfi_escape	0x0f,0x05,0x77,0x78,0x06,0x23,0x08
 	vpaddq	96(%rbp),%ymm7,%ymm11
 	vmovdqa	%ymm8,0(%rsp)
 	xorq	%r14,%r14
@@ -4181,6 +4189,12 @@ sha512_block_data_order_avx2:
 .align	16
 .Lavx2_00_47:
 	leaq	-128(%rsp),%rsp
+.cfi_escape	0x0f,0x06,0x77,0xf8,0x00,0x06,0x23,0x08
+
+	pushq	128-8(%rsp)
+.cfi_escape	0x0f,0x05,0x77,0x00,0x06,0x23,0x08
+	leaq	8(%rsp),%rsp
+.cfi_escape	0x0f,0x05,0x77,0x78,0x06,0x23,0x08
 	vpalignr	$8,%ymm0,%ymm1,%ymm8
 	addq	0+256(%rsp),%r11
 	andq	%r8,%r12
@@ -4474,6 +4488,12 @@ sha512_block_data_order_avx2:
 	movq	%r9,%r12
 	vmovdqa	%ymm10,96(%rsp)
 	leaq	-128(%rsp),%rsp
+.cfi_escape	0x0f,0x06,0x77,0xf8,0x00,0x06,0x23,0x08
+
+	pushq	128-8(%rsp)
+.cfi_escape	0x0f,0x05,0x77,0x00,0x06,0x23,0x08
+	leaq	8(%rsp),%rsp
+.cfi_escape	0x0f,0x05,0x77,0x78,0x06,0x23,0x08
 	vpalignr	$8,%ymm4,%ymm5,%ymm8
 	addq	0+256(%rsp),%r11
 	andq	%r8,%r12
@@ -5387,6 +5407,8 @@ sha512_block_data_order_avx2:
 
 	leaq	1152(%rsp),%rsp
 
+.cfi_escape	0x0f,0x06,0x77,0x98,0x01,0x06,0x23,0x08
+
 	addq	0(%rdi),%rax
 	addq	8(%rdi),%rbx
 	addq	16(%rdi),%rcx
@@ -5412,9 +5434,11 @@ sha512_block_data_order_avx2:
 	jbe	.Loop_avx2
 	leaq	(%rsp),%rbp
 
+
+.cfi_escape	0x0f,0x06,0x76,0x98,0x01,0x06,0x23,0x08
+
 .Ldone_avx2:
-	leaq	(%rbp),%rsp
-	movq	152(%rsp),%rsi
+	movq	152(%rbp),%rsi
 .cfi_def_cfa	%rsi,8
 	vzeroupper
 	movq	-48(%rsi),%r15
diff --git a/deps/openssl/config/archs/linux-x32/asm_avx2/crypto/x86_64cpuid.s b/deps/openssl/config/archs/linux-x32/asm_avx2/crypto/x86_64cpuid.s
index fd17eaaba4..9268ce8c9a 100644
--- a/deps/openssl/config/archs/linux-x32/asm_avx2/crypto/x86_64cpuid.s
+++ b/deps/openssl/config/archs/linux-x32/asm_avx2/crypto/x86_64cpuid.s
@@ -12,6 +12,7 @@
 .type	OPENSSL_atomic_add,@function
 .align	16
 OPENSSL_atomic_add:
+.cfi_startproc
 	movl	(%rdi),%eax
 .Lspin:	leaq	(%rsi,%rax,1),%r8
 .byte	0xf0
@@ -20,16 +21,19 @@ OPENSSL_atomic_add:
 	movl	%r8d,%eax
 .byte	0x48,0x98
 	.byte	0xf3,0xc3
+.cfi_endproc
 .size	OPENSSL_atomic_add,.-OPENSSL_atomic_add
 
 .globl	OPENSSL_rdtsc
 .type	OPENSSL_rdtsc,@function
 .align	16
 OPENSSL_rdtsc:
+.cfi_startproc
 	rdtsc
 	shlq	$32,%rdx
 	orq	%rdx,%rax
 	.byte	0xf3,0xc3
+.cfi_endproc
 .size	OPENSSL_rdtsc,.-OPENSSL_rdtsc
 
 .globl	OPENSSL_ia32_cpuid
@@ -205,6 +209,7 @@ OPENSSL_ia32_cpuid:
 .type	OPENSSL_cleanse,@function
 .align	16
 OPENSSL_cleanse:
+.cfi_startproc
 	xorq	%rax,%rax
 	cmpq	$15,%rsi
 	jae	.Lot
@@ -234,12 +239,14 @@ OPENSSL_cleanse:
 	cmpq	$0,%rsi
 	jne	.Little
 	.byte	0xf3,0xc3
+.cfi_endproc
 .size	OPENSSL_cleanse,.-OPENSSL_cleanse
 
 .globl	CRYPTO_memcmp
 .type	CRYPTO_memcmp,@function
 .align	16
 CRYPTO_memcmp:
+.cfi_startproc
 	xorq	%rax,%rax
 	xorq	%r10,%r10
 	cmpq	$0,%rdx
@@ -268,11 +275,13 @@ CRYPTO_memcmp:
 	shrq	$63,%rax
 .Lno_data:
 	.byte	0xf3,0xc3
+.cfi_endproc
 .size	CRYPTO_memcmp,.-CRYPTO_memcmp
 .globl	OPENSSL_wipe_cpu
 .type	OPENSSL_wipe_cpu,@function
 .align	16
 OPENSSL_wipe_cpu:
+.cfi_startproc
 	pxor	%xmm0,%xmm0
 	pxor	%xmm1,%xmm1
 	pxor	%xmm2,%xmm2
@@ -299,11 +308,13 @@ OPENSSL_wipe_cpu:
 	xorq	%r11,%r11
 	leaq	8(%rsp),%rax
 	.byte	0xf3,0xc3
+.cfi_endproc
 .size	OPENSSL_wipe_cpu,.-OPENSSL_wipe_cpu
 .globl	OPENSSL_instrument_bus
 .type	OPENSSL_instrument_bus,@function
 .align	16
 OPENSSL_instrument_bus:
+.cfi_startproc
 	movq	%rdi,%r10
 	movq	%rsi,%rcx
 	movq	%rsi,%r11
@@ -330,12 +341,14 @@ OPENSSL_instrument_bus:
 
 	movq	%r11,%rax
 	.byte	0xf3,0xc3
+.cfi_endproc
 .size	OPENSSL_instrument_bus,.-OPENSSL_instrument_bus
 
 .globl	OPENSSL_instrument_bus2
 .type	OPENSSL_instrument_bus2,@function
 .align	16
 OPENSSL_instrument_bus2:
+.cfi_startproc
 	movq	%rdi,%r10
 	movq	%rsi,%rcx
 	movq	%rdx,%r11
@@ -378,11 +391,13 @@ OPENSSL_instrument_bus2:
 	movq	8(%rsp),%rax
 	subq	%rcx,%rax
 	.byte	0xf3,0xc3
+.cfi_endproc
 .size	OPENSSL_instrument_bus2,.-OPENSSL_instrument_bus2
 .globl	OPENSSL_ia32_rdrand_bytes
 .type	OPENSSL_ia32_rdrand_bytes,@function
 .align	16
 OPENSSL_ia32_rdrand_bytes:
+.cfi_startproc
 	xorq	%rax,%rax
 	cmpq	$0,%rsi
 	je	.Ldone_rdrand_bytes
@@ -419,11 +434,13 @@ OPENSSL_ia32_rdrand_bytes:
 .Ldone_rdrand_bytes:
 	xorq	%r10,%r10
 	.byte	0xf3,0xc3
+.cfi_endproc
 .size	OPENSSL_ia32_rdrand_bytes,.-OPENSSL_ia32_rdrand_bytes
 .globl	OPENSSL_ia32_rdseed_bytes
 .type	OPENSSL_ia32_rdseed_bytes,@function
 .align	16
 OPENSSL_ia32_rdseed_bytes:
+.cfi_startproc
 	xorq	%rax,%rax
 	cmpq	$0,%rsi
 	je	.Ldone_rdseed_bytes
@@ -460,4 +477,5 @@ OPENSSL_ia32_rdseed_bytes:
 .Ldone_rdseed_bytes:
 	xorq	%r10,%r10
 	.byte	0xf3,0xc3
+.cfi_endproc
 .size	OPENSSL_ia32_rdseed_bytes,.-OPENSSL_ia32_rdseed_bytes
diff --git a/deps/openssl/config/archs/linux-x32/asm_avx2/include/openssl/opensslconf.h b/deps/openssl/config/archs/linux-x32/asm_avx2/include/openssl/opensslconf.h
index 7dda69d359..992473943e 100644
--- a/deps/openssl/config/archs/linux-x32/asm_avx2/include/openssl/opensslconf.h
+++ b/deps/openssl/config/archs/linux-x32/asm_avx2/include/openssl/opensslconf.h
@@ -96,9 +96,6 @@ extern "C" {
 #ifndef OPENSSL_NO_DYNAMIC_ENGINE
 # define OPENSSL_NO_DYNAMIC_ENGINE
 #endif
-#ifndef OPENSSL_NO_AFALGENG
-# define OPENSSL_NO_AFALGENG
-#endif
 
 
 /*
diff --git a/deps/openssl/config/archs/linux-x32/asm_avx2/include/progs.h b/deps/openssl/config/archs/linux-x32/asm_avx2/include/progs.h
index 9b3d270e20..308c65601b 100644
--- a/deps/openssl/config/archs/linux-x32/asm_avx2/include/progs.h
+++ b/deps/openssl/config/archs/linux-x32/asm_avx2/include/progs.h
@@ -2,7 +2,7 @@
  * WARNING: do not edit!
  * Generated by apps/progs.pl
  *
- * Copyright 1995-2019 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 1995-2020 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
diff --git a/deps/openssl/config/archs/linux-x32/asm_avx2/openssl-cl.gypi b/deps/openssl/config/archs/linux-x32/asm_avx2/openssl-cl.gypi
index 859eb1a369..8e2deecf84 100644
--- a/deps/openssl/config/archs/linux-x32/asm_avx2/openssl-cl.gypi
+++ b/deps/openssl/config/archs/linux-x32/asm_avx2/openssl-cl.gypi
@@ -16,6 +16,7 @@
       'KECCAK1600_ASM',
       'RC4_ASM',
       'MD5_ASM',
+      'AESNI_ASM',
       'VPAES_ASM',
       'GHASH_ASM',
       'ECP_NISTZ256_ASM',
diff --git a/deps/openssl/config/archs/linux-x32/asm_avx2/openssl.gypi b/deps/openssl/config/archs/linux-x32/asm_avx2/openssl.gypi
index 7dd6ee5dda..d907f1f290 100644
--- a/deps/openssl/config/archs/linux-x32/asm_avx2/openssl.gypi
+++ b/deps/openssl/config/archs/linux-x32/asm_avx2/openssl.gypi
@@ -723,6 +723,7 @@
       'KECCAK1600_ASM',
       'RC4_ASM',
       'MD5_ASM',
+      'AESNI_ASM',
       'VPAES_ASM',
       'GHASH_ASM',
       'ECP_NISTZ256_ASM',
diff --git a/deps/openssl/config/archs/linux-x32/no-asm/configdata.pm b/deps/openssl/config/archs/linux-x32/no-asm/configdata.pm
index b9a8bebaa2..7943ec12df 100644
--- a/deps/openssl/config/archs/linux-x32/no-asm/configdata.pm
+++ b/deps/openssl/config/archs/linux-x32/no-asm/configdata.pm
@@ -55,7 +55,7 @@ our %config = (
   minor => "1.1",
   openssl_algorithm_defines => [ "OPENSSL_NO_COMP", "OPENSSL_NO_MD2", "OPENSSL_NO_RC5" ],
   openssl_api_defines => [  ],
-  openssl_other_defines => [ "OPENSSL_RAND_SEED_OS", "OPENSSL_NO_AFALGENG", "OPENSSL_NO_ASAN", "OPENSSL_NO_ASM", "OPENSSL_NO_CRYPTO_MDEBUG", "OPENSSL_NO_CRYPTO_MDEBUG_BACKTRACE", "OPENSSL_NO_DEVCRYPTOENG", "OPENSSL_NO_EC_NISTP_64_GCC_128", "OPENSSL_NO_EGD", "OPENSSL_NO_EXTERNAL_TESTS", "OPENSSL_NO_FUZZ_AFL", "OPENSSL_NO_FUZZ_LIBFUZZER", "OPENSSL_NO_HEARTBEATS", "OPENSSL_NO_MSAN", "OPENSSL_NO_SCTP", "OPENSSL_NO_SSL3", "OPENSSL_NO_SSL3_METHOD", "OPENSSL_NO_UBSAN", "OPENSSL_NO_UNIT_TEST", "OPENSSL_NO_WEAK_SSL_CIPHERS", "OPENSSL_NO_DYNAMIC_ENGINE", "OPENSSL_NO_AFALGENG" ],
+  openssl_other_defines => [ "OPENSSL_RAND_SEED_OS", "OPENSSL_NO_AFALGENG", "OPENSSL_NO_ASAN", "OPENSSL_NO_ASM", "OPENSSL_NO_CRYPTO_MDEBUG", "OPENSSL_NO_CRYPTO_MDEBUG_BACKTRACE", "OPENSSL_NO_DEVCRYPTOENG", "OPENSSL_NO_EC_NISTP_64_GCC_128", "OPENSSL_NO_EGD", "OPENSSL_NO_EXTERNAL_TESTS", "OPENSSL_NO_FUZZ_AFL", "OPENSSL_NO_FUZZ_LIBFUZZER", "OPENSSL_NO_HEARTBEATS", "OPENSSL_NO_MSAN", "OPENSSL_NO_SCTP", "OPENSSL_NO_SSL3", "OPENSSL_NO_SSL3_METHOD", "OPENSSL_NO_UBSAN", "OPENSSL_NO_UNIT_TEST", "OPENSSL_NO_WEAK_SSL_CIPHERS", "OPENSSL_NO_DYNAMIC_ENGINE" ],
   openssl_sys_defines => [  ],
   openssl_thread_defines => [ "OPENSSL_THREADS" ],
   openssldir => "",
@@ -111,8 +111,8 @@ our %config = (
   sourcedir => ".",
   target => "linux-x32",
   tdirs => [ "ossl_shim" ],
-  version => "1.1.1d",
-  version_num => "0x1010104fL",
+  version => "1.1.1e",
+  version_num => "0x1010105fL",
 );
 
 our %target = (
@@ -238,6 +238,7 @@ our @disablables = (
   "dgram",
   "dh",
   "dsa",
+  "dso",
   "dtls",
   "dynamic-engine",
   "ec",
@@ -356,8 +357,8 @@ our %unified_info = (
         {
             "" =>
                 [
-                    "crypto/include/internal/bn_conf.h",
-                    "crypto/include/internal/dso_conf.h",
+                    "include/crypto/bn_conf.h",
+                    "include/crypto/dso_conf.h",
                     "include/openssl/opensslconf.h",
                 ],
             "apps/asn1pars.o" =>
@@ -625,14 +626,6 @@ our %unified_info = (
                     "crypto/perlasm/cbc.pl",
                     "crypto/perlasm/x86asm.pl",
                 ],
-            "crypto/include/internal/bn_conf.h" =>
-                [
-                    "configdata.pm",
-                ],
-            "crypto/include/internal/dso_conf.h" =>
-                [
-                    "configdata.pm",
-                ],
             "crypto/rc4/rc4-586.s" =>
                 [
                     "crypto/perlasm/x86asm.pl",
@@ -708,6 +701,14 @@ our %unified_info = (
                 [
                     "libcrypto",
                 ],
+            "include/crypto/bn_conf.h" =>
+                [
+                    "configdata.pm",
+                ],
+            "include/crypto/dso_conf.h" =>
+                [
+                    "configdata.pm",
+                ],
             "include/openssl/opensslconf.h" =>
                 [
                     "configdata.pm",
@@ -1505,6 +1506,12 @@ our %unified_info = (
                     "libcrypto",
                     "test/libtestutil.a",
                 ],
+            "test/ssl_ctx_test" =>
+                [
+                    "libcrypto",
+                    "libssl",
+                    "test/libtestutil.a",
+                ],
             "test/ssl_test" =>
                 [
                     "libcrypto",
@@ -3223,7 +3230,6 @@ our %unified_info = (
                             "test/testutil/cb.o",
                             "test/testutil/driver.o",
                             "test/testutil/format_output.o",
-                            "test/testutil/init.o",
                             "test/testutil/main.o",
                             "test/testutil/output_helpers.o",
                             "test/testutil/random.o",
@@ -3231,6 +3237,7 @@ our %unified_info = (
                             "test/testutil/tap_bio.o",
                             "test/testutil/test_cleanup.o",
                             "test/testutil/tests.o",
+                            "test/testutil/testutil_init.o",
                         ],
                     "products" =>
                         {
@@ -3729,14 +3736,6 @@ our %unified_info = (
                 [
                     "crypto/ia64cpuid.S",
                 ],
-            "crypto/include/internal/bn_conf.h" =>
-                [
-                    "crypto/include/internal/bn_conf.h.in",
-                ],
-            "crypto/include/internal/dso_conf.h" =>
-                [
-                    "crypto/include/internal/dso_conf.h.in",
-                ],
             "crypto/md5/md5-586.s" =>
                 [
                     "crypto/md5/asm/md5-586.pl",
@@ -4177,6 +4176,14 @@ our %unified_info = (
                     "engines/asm/e_padlock-x86_64.pl",
                     "\$(PERLASM_SCHEME)",
                 ],
+            "include/crypto/bn_conf.h" =>
+                [
+                    "include/crypto/bn_conf.h.in",
+                ],
+            "include/crypto/dso_conf.h" =>
+                [
+                    "include/crypto/dso_conf.h.in",
+                ],
             "include/openssl/opensslconf.h" =>
                 [
                     "include/openssl/opensslconf.h.in",
@@ -4871,49 +4878,41 @@ our %unified_info = (
             "crypto/aes/aes_cbc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/aes/aes_cfb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/aes/aes_core.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/aes/aes_ecb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/aes/aes_ige.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/aes/aes_misc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/aes/aes_ofb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/aes/aes_wrap.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/aes/aesfx-sparcv9.o" =>
@@ -4935,7 +4934,6 @@ our %unified_info = (
             "crypto/aria/aria.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/arm64cpuid.o" =>
@@ -4949,613 +4947,511 @@ our %unified_info = (
             "crypto/asn1/a_bitstr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_d2i_fp.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_digest.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_dup.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_gentm.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_i2d_fp.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_int.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_mbstr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_object.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_octet.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_print.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_sign.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_strex.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_strnid.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_time.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_type.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_utctm.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_utf8.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_verify.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/ameth_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/asn1_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/asn1_gen.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/asn1_item_list.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/asn1_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/asn1_par.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/asn_mime.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/asn_moid.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/asn_mstbl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/asn_pack.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/bio_asn1.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/bio_ndef.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/d2i_pr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/d2i_pu.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/evp_asn1.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/f_int.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/f_string.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/i2d_pr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/i2d_pu.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/n_pkey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/nsseq.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/p5_pbe.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/p5_pbev2.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/p5_scrypt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/p8_pkey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/t_bitst.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/t_pkey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/t_spki.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/tasn_dec.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/tasn_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/tasn_fre.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/tasn_new.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/tasn_prn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/tasn_scn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/tasn_typ.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/tasn_utl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/x_algor.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/x_bignum.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/x_info.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/x_int64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/x_long.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/x_pkey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/x_sig.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/x_spki.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/x_val.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/async/arch/async_null.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/async/arch/async_posix.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/async/arch/async_win.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/async/async.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/async/async_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/async/async_wait.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bf/bf_cfb64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bf/bf_ecb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bf/bf_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bf/bf_ofb64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bf/bf_skey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/b_addr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/b_dump.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/b_print.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/b_sock.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/b_sock2.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bf_buff.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bf_lbuf.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bf_nbio.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bf_null.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bio_cb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bio_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bio_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bio_meth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bss_acpt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bss_bio.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bss_conn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bss_dgram.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bss_fd.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bss_file.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bss_log.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bss_mem.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bss_null.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bss_sock.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/blake2/blake2b.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/blake2/blake2s.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/blake2/m_blake2b.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/blake2/m_blake2s.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/armv4-gf2m.o" =>
@@ -5573,188 +5469,157 @@ our %unified_info = (
             "crypto/bn/bn_add.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_asm.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_blind.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_const.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_ctx.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_depr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_dh.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_div.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_exp.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto",
                 ],
             "crypto/bn/bn_exp2.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_gcd.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_gf2m.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_intern.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_kron.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_mod.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_mont.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_mpi.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_mul.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_nist.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_prime.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_print.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_rand.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_recp.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_shift.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_sqr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_sqrt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_srp.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_word.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_x931p.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/mips-mont.o" =>
@@ -5784,13 +5649,11 @@ our %unified_info = (
             "crypto/buffer/buf_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/buffer/buffer.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/buildinf.h" =>
@@ -5800,43 +5663,36 @@ our %unified_info = (
             "crypto/camellia/camellia.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/camellia/cmll_cbc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/camellia/cmll_cfb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/camellia/cmll_ctr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/camellia/cmll_ecb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/camellia/cmll_misc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/camellia/cmll_ofb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/camellia/cmllt4-sparcv9.o" =>
@@ -5846,31 +5702,26 @@ our %unified_info = (
             "crypto/cast/c_cfb64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cast/c_ecb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cast/c_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cast/c_ofb64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cast/c_skey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/chacha/chacha-armv4.o" =>
@@ -5888,278 +5739,232 @@ our %unified_info = (
             "crypto/chacha/chacha_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cmac/cm_ameth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cmac/cm_pmeth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cmac/cmac.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_asn1.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_att.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_cd.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_dd.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_env.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_ess.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_io.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_kari.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_pwri.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_sd.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_smime.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/conf/conf_api.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/conf/conf_def.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/conf/conf_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/conf/conf_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/conf/conf_mall.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/conf/conf_mod.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/conf/conf_sap.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/conf/conf_ssl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cpt_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cryptlib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ct/ct_b64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ct/ct_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ct/ct_log.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ct/ct_oct.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ct/ct_policy.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ct/ct_prn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ct/ct_sct.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ct/ct_sct_ctx.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ct/ct_vfy.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ct/ct_x509v3.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ctype.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cversion.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto",
                 ],
             "crypto/des/cbc_cksm.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/cbc_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/cfb64ede.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/cfb64enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/cfb_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/des_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/dest4-sparcv9.o" =>
@@ -6169,301 +5974,251 @@ our %unified_info = (
             "crypto/des/ecb3_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/ecb_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/fcrypt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/fcrypt_b.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/ofb64ede.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/ofb64enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/ofb_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/pcbc_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/qud_cksm.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/rand_key.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/set_key.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/str2key.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/xcbc_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_ameth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_asn1.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_check.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_depr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_gen.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_kdf.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_key.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_meth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_pmeth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_prn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_rfc5114.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_rfc7919.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dsa/dsa_ameth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dsa/dsa_asn1.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dsa/dsa_depr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dsa/dsa_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dsa/dsa_gen.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dsa/dsa_key.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dsa/dsa_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dsa/dsa_meth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dsa/dsa_ossl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dsa/dsa_pmeth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dsa/dsa_prn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dsa/dsa_sign.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dsa/dsa_vrf.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dso/dso_dl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dso/dso_dlfcn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dso/dso_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dso/dso_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dso/dso_openssl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dso/dso_vms.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dso/dso_win32.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ebcdic.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/curve25519.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/curve448/arch_32/f_impl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto/ec/curve448/arch_32",
                     "crypto/ec/curve448",
@@ -6471,7 +6226,6 @@ our %unified_info = (
             "crypto/ec/curve448/curve448.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto/ec/curve448/arch_32",
                     "crypto/ec/curve448",
@@ -6479,7 +6233,6 @@ our %unified_info = (
             "crypto/ec/curve448/curve448_tables.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto/ec/curve448/arch_32",
                     "crypto/ec/curve448",
@@ -6487,7 +6240,6 @@ our %unified_info = (
             "crypto/ec/curve448/eddsa.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto/ec/curve448/arch_32",
                     "crypto/ec/curve448",
@@ -6495,7 +6247,6 @@ our %unified_info = (
             "crypto/ec/curve448/f_generic.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto/ec/curve448/arch_32",
                     "crypto/ec/curve448",
@@ -6503,7 +6254,6 @@ our %unified_info = (
             "crypto/ec/curve448/scalar.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto/ec/curve448/arch_32",
                     "crypto/ec/curve448",
@@ -6511,163 +6261,136 @@ our %unified_info = (
             "crypto/ec/ec2_oct.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec2_smpl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec_ameth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec_asn1.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec_check.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec_curve.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec_cvt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec_key.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec_kmeth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec_mult.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec_oct.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec_pmeth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec_print.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecdh_kdf.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecdh_ossl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecdsa_ossl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecdsa_sign.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecdsa_vrf.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/eck_prn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecp_mont.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecp_nist.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecp_nistp224.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecp_nistp256.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecp_nistp521.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecp_nistputil.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecp_nistz256-armv4.o" =>
@@ -6685,223 +6408,186 @@ our %unified_info = (
             "crypto/ec/ecp_oct.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecp_smpl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecx_meth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/eng_all.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/eng_cnf.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/eng_ctrl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/eng_dyn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/eng_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/eng_fat.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/eng_init.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/eng_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/eng_list.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/eng_openssl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/eng_pkey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/eng_rdrand.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/eng_table.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/tb_asnmth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/tb_cipher.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/tb_dh.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/tb_digest.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/tb_dsa.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/tb_eckey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/tb_pkmeth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/tb_rand.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/tb_rsa.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/err/err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/err/err_all.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/err/err_prn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/bio_b64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/bio_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/bio_md.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/bio_ok.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/c_allc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/c_alld.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/cmeth_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/digest.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/e_aes.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto",
                     "crypto/modes",
@@ -6909,21 +6595,18 @@ our %unified_info = (
             "crypto/evp/e_aes_cbc_hmac_sha1.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto/modes",
                 ],
             "crypto/evp/e_aes_cbc_hmac_sha256.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto/modes",
                 ],
             "crypto/evp/e_aria.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto",
                     "crypto/modes",
@@ -6931,13 +6614,11 @@ our %unified_info = (
             "crypto/evp/e_bf.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/e_camellia.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto",
                     "crypto/modes",
@@ -6945,81 +6626,68 @@ our %unified_info = (
             "crypto/evp/e_cast.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/e_chacha20_poly1305.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/e_des.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto",
                 ],
             "crypto/evp/e_des3.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto",
                 ],
             "crypto/evp/e_idea.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/e_null.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/e_old.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/e_rc2.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/e_rc4.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/e_rc4_hmac_md5.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/e_rc5.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/e_seed.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/e_sm4.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto",
                     "crypto/modes",
@@ -7027,328 +6695,267 @@ our %unified_info = (
             "crypto/evp/e_xcbc_d.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/encode.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/evp_cnf.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/evp_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/evp_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/evp_key.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/evp_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/evp_pbe.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/evp_pkey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/m_md2.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/m_md4.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/m_md5.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/m_md5_sha1.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/m_mdc2.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/m_null.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/m_ripemd.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/m_sha1.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/m_sha3.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto",
                 ],
             "crypto/evp/m_sigver.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/m_wp.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/names.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/p5_crpt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/p5_crpt2.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/p_dec.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/p_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/p_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/p_open.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/p_seal.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/p_sign.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/p_verify.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/pbe_scrypt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/pmeth_fn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/pmeth_gn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/pmeth_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ex_data.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/getenv.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/hmac/hm_ameth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/hmac/hm_pmeth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/hmac/hmac.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/idea/i_cbc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/idea/i_cfb64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/idea/i_ecb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/idea/i_ofb64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/idea/i_skey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
-            "crypto/include/internal/bn_conf.h" =>
-                [
-                    ".",
-                ],
-            "crypto/include/internal/dso_conf.h" =>
-                [
-                    ".",
-                ],
             "crypto/init.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/kdf/hkdf.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/kdf/kdf_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/kdf/scrypt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/kdf/tls1_prf.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/lhash/lh_stats.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/lhash/lhash.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/md4/md4_dgst.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/md4/md4_one.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/md5/md5-sparcv9.o" =>
@@ -7358,85 +6965,71 @@ our %unified_info = (
             "crypto/md5/md5_dgst.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/md5/md5_one.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/mdc2/mdc2_one.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/mdc2/mdc2dgst.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/mem.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/mem_clr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/mem_dbg.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/mem_sec.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/modes/cbc128.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/modes/ccm128.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/modes/cfb128.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/modes/ctr128.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/modes/cts128.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/modes/gcm128.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto",
                 ],
@@ -7459,361 +7052,301 @@ our %unified_info = (
             "crypto/modes/ocb128.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/modes/ofb128.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/modes/wrap128.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/modes/xts128.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/o_dir.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/o_fips.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/o_fopen.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/o_init.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/o_str.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/o_time.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/objects/o_names.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/objects/obj_dat.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/objects/obj_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/objects/obj_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/objects/obj_xref.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ocsp/ocsp_asn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ocsp/ocsp_cl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ocsp/ocsp_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ocsp/ocsp_ext.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ocsp/ocsp_ht.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ocsp/ocsp_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ocsp/ocsp_prn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ocsp/ocsp_srv.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ocsp/ocsp_vfy.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ocsp/v3_ocsp.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pem/pem_all.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pem/pem_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pem/pem_info.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pem/pem_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pem/pem_oth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pem/pem_pk8.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pem/pem_pkey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pem/pem_sign.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pem/pem_x509.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pem/pem_xaux.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pem/pvkfmt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_add.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_asn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_attr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_crpt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_crt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_decr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_init.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_key.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_kiss.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_mutl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_npas.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_p8d.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_p8e.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_sbag.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_utl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/pk12err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs7/bio_pk7.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs7/pk7_asn1.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs7/pk7_attr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs7/pk7_doit.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs7/pk7_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs7/pk7_mime.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs7/pk7_smime.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs7/pkcs7err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/poly1305/poly1305-armv4.o" =>
@@ -7835,259 +7368,216 @@ our %unified_info = (
             "crypto/poly1305/poly1305.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/poly1305/poly1305_ameth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/poly1305/poly1305_pmeth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rand/drbg_ctr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rand/drbg_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rand/rand_egd.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rand/rand_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rand/rand_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rand/rand_unix.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rand/rand_vms.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rand/rand_win.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rand/randfile.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rc2/rc2_cbc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rc2/rc2_ecb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rc2/rc2_skey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rc2/rc2cfb64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rc2/rc2ofb64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rc4/rc4_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rc4/rc4_skey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ripemd/rmd_dgst.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ripemd/rmd_one.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_ameth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_asn1.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_chk.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_crpt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_depr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_gen.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_meth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_mp.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_none.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_oaep.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_ossl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_pk1.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_pmeth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_prn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_pss.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_saos.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_sign.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_ssl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_x931.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_x931g.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/s390xcpuid.o" =>
@@ -8097,31 +7587,26 @@ our %unified_info = (
             "crypto/seed/seed.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/seed/seed_cbc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/seed/seed_cfb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/seed/seed_ecb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/seed/seed_ofb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sha/keccak1600-armv4.o" =>
@@ -8131,7 +7616,6 @@ our %unified_info = (
             "crypto/sha/keccak1600.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sha/sha1-armv4-large.o" =>
@@ -8157,13 +7641,11 @@ our %unified_info = (
             "crypto/sha/sha1_one.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sha/sha1dgst.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sha/sha256-armv4.o" =>
@@ -8189,7 +7671,6 @@ our %unified_info = (
             "crypto/sha/sha256.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sha/sha512-armv4.o" =>
@@ -8215,709 +7696,591 @@ our %unified_info = (
             "crypto/sha/sha512.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/siphash/siphash.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/siphash/siphash_ameth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/siphash/siphash_pmeth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sm2/sm2_crypt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sm2/sm2_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sm2/sm2_pmeth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sm2/sm2_sign.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sm3/m_sm3.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sm3/sm3.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sm4/sm4.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/srp/srp_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/srp/srp_vfy.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/stack/stack.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/store/loader_file.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/store/store_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/store/store_init.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/store/store_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/store/store_register.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/store/store_strings.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/threads_none.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/threads_pthread.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/threads_win.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ts/ts_asn1.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ts/ts_conf.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ts/ts_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ts/ts_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ts/ts_req_print.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ts/ts_req_utils.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ts/ts_rsp_print.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ts/ts_rsp_sign.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ts/ts_rsp_utils.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ts/ts_rsp_verify.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ts/ts_verify_ctx.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/txt_db/txt_db.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ui/ui_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ui/ui_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ui/ui_null.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ui/ui_openssl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ui/ui_util.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/uid.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/whrlpool/wp_block.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/whrlpool/wp_dgst.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/by_dir.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/by_file.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/t_crl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/t_req.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/t_x509.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_att.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_cmp.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_d2.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_def.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_ext.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_lu.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_meth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_obj.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_r2x.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_req.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_set.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_trs.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_txt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_v3.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_vfy.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_vpm.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509cset.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509name.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509rset.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509spki.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509type.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x_all.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x_attrib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x_crl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x_exten.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x_name.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x_pubkey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x_req.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x_x509.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x_x509a.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/pcy_cache.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/pcy_data.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/pcy_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/pcy_map.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/pcy_node.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/pcy_tree.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_addr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_admis.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_akey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_akeya.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_alt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_asid.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_bcons.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_bitst.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_conf.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_cpols.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_crld.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_enum.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_extku.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_genn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_ia5.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_info.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_int.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_ncons.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_pci.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_pcia.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_pcons.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_pku.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_pmaps.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_prn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_purp.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_skey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_sxnet.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_tlsf.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_utl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "engines/e_capi.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "engines/e_padlock.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "fuzz/asn1.o" =>
@@ -8968,6 +8331,14 @@ our %unified_info = (
                 [
                     "include",
                 ],
+            "include/crypto/bn_conf.h" =>
+                [
+                    ".",
+                ],
+            "include/crypto/dso_conf.h" =>
+                [
+                    ".",
+                ],
             "include/openssl/opensslconf.h" =>
                 [
                     ".",
@@ -9212,7 +8583,6 @@ our %unified_info = (
                 [
                     ".",
                     "include",
-                    "crypto/include",
                 ],
             "test/asn1_string_table_test.o" =>
                 [
@@ -9538,7 +8908,6 @@ our %unified_info = (
                 [
                     ".",
                     "include",
-                    "crypto/include",
                 ],
             "test/cipher_overhead_test.o" =>
                 [
@@ -9584,7 +8953,6 @@ our %unified_info = (
             "test/ctype_internal_test.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "test/curve448_internal_test.o" =>
@@ -9650,7 +9018,6 @@ our %unified_info = (
                 [
                     "include",
                     "crypto/ec",
-                    "crypto/include",
                 ],
             "test/ecdsatest.o" =>
                 [
@@ -9675,7 +9042,6 @@ our %unified_info = (
             "test/evp_extra_test.o" =>
                 [
                     "include",
-                    "crypto/include",
                 ],
             "test/evp_test.o" =>
                 [
@@ -9773,7 +9139,6 @@ our %unified_info = (
                 [
                     ".",
                     "include",
-                    "crypto/include",
                 ],
             "test/rc2test.o" =>
                 [
@@ -9823,18 +9188,15 @@ our %unified_info = (
                 [
                     ".",
                     "include",
-                    "crypto/include",
                 ],
             "test/sm2_internal_test.o" =>
                 [
                     "include",
-                    "crypto/include",
                 ],
             "test/sm4_internal_test.o" =>
                 [
                     ".",
                     "include",
-                    "crypto/include",
                 ],
             "test/srptest.o" =>
                 [
@@ -9845,6 +9207,10 @@ our %unified_info = (
                     ".",
                     "include",
                 ],
+            "test/ssl_ctx_test.o" =>
+                [
+                    "include",
+                ],
             "test/ssl_test.o" =>
                 [
                     "include",
@@ -9908,10 +9274,6 @@ our %unified_info = (
                 [
                     "include",
                 ],
-            "test/testutil/init.o" =>
-                [
-                    "include",
-                ],
             "test/testutil/main.o" =>
                 [
                     "include",
@@ -9940,6 +9302,10 @@ our %unified_info = (
                 [
                     "include",
                 ],
+            "test/testutil/testutil_init.o" =>
+                [
+                    "include",
+                ],
             "test/threadstest.o" =>
                 [
                     "include",
@@ -10204,6 +9570,7 @@ our %unified_info = (
             "test/sm4_internal_test",
             "test/srptest",
             "test/ssl_cert_table_internal_test",
+            "test/ssl_ctx_test",
             "test/ssl_test",
             "test/ssl_test_ctx_test",
             "test/sslapitest",
@@ -15094,7 +14461,6 @@ our %unified_info = (
                     "test/testutil/cb.o",
                     "test/testutil/driver.o",
                     "test/testutil/format_output.o",
-                    "test/testutil/init.o",
                     "test/testutil/main.o",
                     "test/testutil/output_helpers.o",
                     "test/testutil/random.o",
@@ -15102,6 +14468,7 @@ our %unified_info = (
                     "test/testutil/tap_bio.o",
                     "test/testutil/test_cleanup.o",
                     "test/testutil/tests.o",
+                    "test/testutil/testutil_init.o",
                 ],
             "test/md2test" =>
                 [
@@ -15329,6 +14696,14 @@ our %unified_info = (
                 [
                     "test/ssl_cert_table_internal_test.c",
                 ],
+            "test/ssl_ctx_test" =>
+                [
+                    "test/ssl_ctx_test.o",
+                ],
+            "test/ssl_ctx_test.o" =>
+                [
+                    "test/ssl_ctx_test.c",
+                ],
             "test/ssl_test" =>
                 [
                     "test/handshake_helper.o",
@@ -15431,10 +14806,6 @@ our %unified_info = (
                 [
                     "test/testutil/format_output.c",
                 ],
-            "test/testutil/init.o" =>
-                [
-                    "test/testutil/init.c",
-                ],
             "test/testutil/main.o" =>
                 [
                     "test/testutil/main.c",
@@ -15463,6 +14834,10 @@ our %unified_info = (
                 [
                     "test/testutil/tests.c",
                 ],
+            "test/testutil/testutil_init.o" =>
+                [
+                    "test/testutil/testutil_init.c",
+                ],
             "test/threadstest" =>
                 [
                     "test/threadstest.o",
diff --git a/deps/openssl/config/archs/linux-x32/no-asm/crypto/buildinf.h b/deps/openssl/config/archs/linux-x32/no-asm/crypto/buildinf.h
index 369ee61396..fb611fa2c2 100644
--- a/deps/openssl/config/archs/linux-x32/no-asm/crypto/buildinf.h
+++ b/deps/openssl/config/archs/linux-x32/no-asm/crypto/buildinf.h
@@ -11,7 +11,7 @@
  */
 
 #define PLATFORM "platform: linux-x32"
-#define DATE "built on: Fri Sep 13 16:00:12 2019 UTC"
+#define DATE "built on: Wed Mar 18 21:07:03 2020 UTC"
 
 /*
  * Generate compiler_flags as an array of individual characters. This is a
diff --git a/deps/openssl/config/archs/linux-x32/no-asm/crypto/include/internal/bn_conf.h b/deps/openssl/config/archs/linux-x32/no-asm/crypto/include/internal/bn_conf.h
index 0d071bda66..93f75e2e15 100644
--- a/deps/openssl/config/archs/linux-x32/no-asm/crypto/include/internal/bn_conf.h
+++ b/deps/openssl/config/archs/linux-x32/no-asm/crypto/include/internal/bn_conf.h
@@ -1,5 +1,5 @@
 /* WARNING: do not edit! */
-/* Generated by Makefile from crypto/include/internal/bn_conf.h.in */
+/* Generated by Makefile from include/crypto/bn_conf.h.in */
 /*
  * Copyright 2016 The OpenSSL Project Authors. All Rights Reserved.
  *
@@ -9,8 +9,8 @@
  * https://www.openssl.org/source/license.html
  */
 
-#ifndef HEADER_BN_CONF_H
-# define HEADER_BN_CONF_H
+#ifndef OSSL_CRYPTO_BN_CONF_H
+# define OSSL_CRYPTO_BN_CONF_H
 
 /*
  * The contents of this file are not used in the UEFI build, as
diff --git a/deps/openssl/config/archs/linux-x32/no-asm/crypto/include/internal/dso_conf.h b/deps/openssl/config/archs/linux-x32/no-asm/crypto/include/internal/dso_conf.h
index 252266ec2a..4b1167c3d8 100644
--- a/deps/openssl/config/archs/linux-x32/no-asm/crypto/include/internal/dso_conf.h
+++ b/deps/openssl/config/archs/linux-x32/no-asm/crypto/include/internal/dso_conf.h
@@ -1,5 +1,5 @@
 /* WARNING: do not edit! */
-/* Generated by Makefile from crypto/include/internal/dso_conf.h.in */
+/* Generated by Makefile from include/crypto/dso_conf.h.in */
 /*
  * Copyright 2016-2019 The OpenSSL Project Authors. All Rights Reserved.
  *
@@ -9,8 +9,8 @@
  * https://www.openssl.org/source/license.html
  */
 
-#ifndef HEADER_DSO_CONF_H
-# define HEADER_DSO_CONF_H
+#ifndef OSSL_CRYPTO_DSO_CONF_H
+# define OSSL_CRYPTO_DSO_CONF_H
 # define DSO_DLFCN
 # define HAVE_DLFCN_H
 # define DSO_EXTENSION ".so"
diff --git a/deps/openssl/config/archs/linux-x32/no-asm/include/openssl/opensslconf.h b/deps/openssl/config/archs/linux-x32/no-asm/include/openssl/opensslconf.h
index 6ab9dc309c..3d85365931 100644
--- a/deps/openssl/config/archs/linux-x32/no-asm/include/openssl/opensslconf.h
+++ b/deps/openssl/config/archs/linux-x32/no-asm/include/openssl/opensslconf.h
@@ -99,9 +99,6 @@ extern "C" {
 #ifndef OPENSSL_NO_DYNAMIC_ENGINE
 # define OPENSSL_NO_DYNAMIC_ENGINE
 #endif
-#ifndef OPENSSL_NO_AFALGENG
-# define OPENSSL_NO_AFALGENG
-#endif
 
 
 /*
diff --git a/deps/openssl/config/archs/linux-x32/no-asm/include/progs.h b/deps/openssl/config/archs/linux-x32/no-asm/include/progs.h
index 9b3d270e20..308c65601b 100644
--- a/deps/openssl/config/archs/linux-x32/no-asm/include/progs.h
+++ b/deps/openssl/config/archs/linux-x32/no-asm/include/progs.h
@@ -2,7 +2,7 @@
  * WARNING: do not edit!
  * Generated by apps/progs.pl
  *
- * Copyright 1995-2019 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 1995-2020 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
diff --git a/deps/openssl/config/archs/linux-x86_64/asm/configdata.pm b/deps/openssl/config/archs/linux-x86_64/asm/configdata.pm
index 6eac1af414..6962df4c99 100644
--- a/deps/openssl/config/archs/linux-x86_64/asm/configdata.pm
+++ b/deps/openssl/config/archs/linux-x86_64/asm/configdata.pm
@@ -49,14 +49,14 @@ our %config = (
   export_var_as_fn => "0",
   includes => [  ],
   lflags => [  ],
-  lib_defines => [ "OPENSSL_PIC", "OPENSSL_CPUID_OBJ", "OPENSSL_IA32_SSE2", "OPENSSL_BN_ASM_MONT", "OPENSSL_BN_ASM_MONT5", "OPENSSL_BN_ASM_GF2m", "SHA1_ASM", "SHA256_ASM", "SHA512_ASM", "KECCAK1600_ASM", "RC4_ASM", "MD5_ASM", "VPAES_ASM", "GHASH_ASM", "ECP_NISTZ256_ASM", "X25519_ASM", "POLY1305_ASM" ],
+  lib_defines => [ "OPENSSL_PIC", "OPENSSL_CPUID_OBJ", "OPENSSL_IA32_SSE2", "OPENSSL_BN_ASM_MONT", "OPENSSL_BN_ASM_MONT5", "OPENSSL_BN_ASM_GF2m", "SHA1_ASM", "SHA256_ASM", "SHA512_ASM", "KECCAK1600_ASM", "RC4_ASM", "MD5_ASM", "AESNI_ASM", "VPAES_ASM", "GHASH_ASM", "ECP_NISTZ256_ASM", "X25519_ASM", "POLY1305_ASM" ],
   libdir => "",
   major => "1",
   makedepprog => "\$(CROSS_COMPILE)gcc",
   minor => "1.1",
   openssl_algorithm_defines => [ "OPENSSL_NO_COMP", "OPENSSL_NO_MD2", "OPENSSL_NO_RC5" ],
   openssl_api_defines => [  ],
-  openssl_other_defines => [ "OPENSSL_RAND_SEED_OS", "OPENSSL_NO_AFALGENG", "OPENSSL_NO_ASAN", "OPENSSL_NO_CRYPTO_MDEBUG", "OPENSSL_NO_CRYPTO_MDEBUG_BACKTRACE", "OPENSSL_NO_DEVCRYPTOENG", "OPENSSL_NO_EC_NISTP_64_GCC_128", "OPENSSL_NO_EGD", "OPENSSL_NO_EXTERNAL_TESTS", "OPENSSL_NO_FUZZ_AFL", "OPENSSL_NO_FUZZ_LIBFUZZER", "OPENSSL_NO_HEARTBEATS", "OPENSSL_NO_MSAN", "OPENSSL_NO_SCTP", "OPENSSL_NO_SSL3", "OPENSSL_NO_SSL3_METHOD", "OPENSSL_NO_UBSAN", "OPENSSL_NO_UNIT_TEST", "OPENSSL_NO_WEAK_SSL_CIPHERS", "OPENSSL_NO_DYNAMIC_ENGINE", "OPENSSL_NO_AFALGENG" ],
+  openssl_other_defines => [ "OPENSSL_RAND_SEED_OS", "OPENSSL_NO_AFALGENG", "OPENSSL_NO_ASAN", "OPENSSL_NO_CRYPTO_MDEBUG", "OPENSSL_NO_CRYPTO_MDEBUG_BACKTRACE", "OPENSSL_NO_DEVCRYPTOENG", "OPENSSL_NO_EC_NISTP_64_GCC_128", "OPENSSL_NO_EGD", "OPENSSL_NO_EXTERNAL_TESTS", "OPENSSL_NO_FUZZ_AFL", "OPENSSL_NO_FUZZ_LIBFUZZER", "OPENSSL_NO_HEARTBEATS", "OPENSSL_NO_MSAN", "OPENSSL_NO_SCTP", "OPENSSL_NO_SSL3", "OPENSSL_NO_SSL3_METHOD", "OPENSSL_NO_UBSAN", "OPENSSL_NO_UNIT_TEST", "OPENSSL_NO_WEAK_SSL_CIPHERS", "OPENSSL_NO_DYNAMIC_ENGINE" ],
   openssl_sys_defines => [  ],
   openssl_thread_defines => [ "OPENSSL_THREADS" ],
   openssldir => "",
@@ -112,8 +112,8 @@ our %config = (
   sourcedir => ".",
   target => "linux-x86_64",
   tdirs => [ "ossl_shim" ],
-  version => "1.1.1d",
-  version_num => "0x1010104fL",
+  version => "1.1.1e",
+  version_num => "0x1010105fL",
 );
 
 our %target = (
@@ -241,6 +241,7 @@ our @disablables = (
   "dgram",
   "dh",
   "dsa",
+  "dso",
   "dtls",
   "dynamic-engine",
   "ec",
@@ -358,8 +359,8 @@ our %unified_info = (
         {
             "" =>
                 [
-                    "crypto/include/internal/bn_conf.h",
-                    "crypto/include/internal/dso_conf.h",
+                    "include/crypto/bn_conf.h",
+                    "include/crypto/dso_conf.h",
                     "include/openssl/opensslconf.h",
                 ],
             "apps/asn1pars.o" =>
@@ -627,14 +628,6 @@ our %unified_info = (
                     "crypto/perlasm/cbc.pl",
                     "crypto/perlasm/x86asm.pl",
                 ],
-            "crypto/include/internal/bn_conf.h" =>
-                [
-                    "configdata.pm",
-                ],
-            "crypto/include/internal/dso_conf.h" =>
-                [
-                    "configdata.pm",
-                ],
             "crypto/rc4/rc4-586.s" =>
                 [
                     "crypto/perlasm/x86asm.pl",
@@ -710,6 +703,14 @@ our %unified_info = (
                 [
                     "libcrypto",
                 ],
+            "include/crypto/bn_conf.h" =>
+                [
+                    "configdata.pm",
+                ],
+            "include/crypto/dso_conf.h" =>
+                [
+                    "configdata.pm",
+                ],
             "include/openssl/opensslconf.h" =>
                 [
                     "configdata.pm",
@@ -1507,6 +1508,12 @@ our %unified_info = (
                     "libcrypto",
                     "test/libtestutil.a",
                 ],
+            "test/ssl_ctx_test" =>
+                [
+                    "libcrypto",
+                    "libssl",
+                    "test/libtestutil.a",
+                ],
             "test/ssl_test" =>
                 [
                     "libcrypto",
@@ -3261,7 +3268,6 @@ our %unified_info = (
                             "test/testutil/cb.o",
                             "test/testutil/driver.o",
                             "test/testutil/format_output.o",
-                            "test/testutil/init.o",
                             "test/testutil/main.o",
                             "test/testutil/output_helpers.o",
                             "test/testutil/random.o",
@@ -3269,6 +3275,7 @@ our %unified_info = (
                             "test/testutil/tap_bio.o",
                             "test/testutil/test_cleanup.o",
                             "test/testutil/tests.o",
+                            "test/testutil/testutil_init.o",
                         ],
                     "products" =>
                         {
@@ -3767,14 +3774,6 @@ our %unified_info = (
                 [
                     "crypto/ia64cpuid.S",
                 ],
-            "crypto/include/internal/bn_conf.h" =>
-                [
-                    "crypto/include/internal/bn_conf.h.in",
-                ],
-            "crypto/include/internal/dso_conf.h" =>
-                [
-                    "crypto/include/internal/dso_conf.h.in",
-                ],
             "crypto/md5/md5-586.s" =>
                 [
                     "crypto/md5/asm/md5-586.pl",
@@ -4215,6 +4214,14 @@ our %unified_info = (
                     "engines/asm/e_padlock-x86_64.pl",
                     "\$(PERLASM_SCHEME)",
                 ],
+            "include/crypto/bn_conf.h" =>
+                [
+                    "include/crypto/bn_conf.h.in",
+                ],
+            "include/crypto/dso_conf.h" =>
+                [
+                    "include/crypto/dso_conf.h.in",
+                ],
             "include/openssl/opensslconf.h" =>
                 [
                     "include/openssl/opensslconf.h.in",
@@ -4909,49 +4916,41 @@ our %unified_info = (
             "crypto/aes/aes_cbc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/aes/aes_cfb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/aes/aes_core.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/aes/aes_ecb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/aes/aes_ige.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/aes/aes_misc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/aes/aes_ofb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/aes/aes_wrap.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/aes/aesfx-sparcv9.o" =>
@@ -4961,25 +4960,21 @@ our %unified_info = (
             "crypto/aes/aesni-mb-x86_64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/aes/aesni-sha1-x86_64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/aes/aesni-sha256-x86_64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/aes/aesni-x86_64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/aes/aest4-sparcv9.o" =>
@@ -4997,13 +4992,11 @@ our %unified_info = (
             "crypto/aes/vpaes-x86_64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/aria/aria.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/arm64cpuid.o" =>
@@ -5017,613 +5010,511 @@ our %unified_info = (
             "crypto/asn1/a_bitstr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_d2i_fp.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_digest.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_dup.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_gentm.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_i2d_fp.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_int.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_mbstr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_object.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_octet.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_print.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_sign.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_strex.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_strnid.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_time.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_type.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_utctm.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_utf8.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_verify.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/ameth_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/asn1_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/asn1_gen.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/asn1_item_list.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/asn1_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/asn1_par.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/asn_mime.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/asn_moid.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/asn_mstbl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/asn_pack.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/bio_asn1.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/bio_ndef.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/d2i_pr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/d2i_pu.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/evp_asn1.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/f_int.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/f_string.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/i2d_pr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/i2d_pu.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/n_pkey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/nsseq.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/p5_pbe.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/p5_pbev2.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/p5_scrypt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/p8_pkey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/t_bitst.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/t_pkey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/t_spki.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/tasn_dec.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/tasn_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/tasn_fre.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/tasn_new.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/tasn_prn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/tasn_scn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/tasn_typ.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/tasn_utl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/x_algor.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/x_bignum.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/x_info.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/x_int64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/x_long.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/x_pkey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/x_sig.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/x_spki.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/x_val.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/async/arch/async_null.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/async/arch/async_posix.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/async/arch/async_win.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/async/async.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/async/async_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/async/async_wait.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bf/bf_cfb64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bf/bf_ecb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bf/bf_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bf/bf_ofb64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bf/bf_skey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/b_addr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/b_dump.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/b_print.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/b_sock.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/b_sock2.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bf_buff.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bf_lbuf.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bf_nbio.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bf_null.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bio_cb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bio_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bio_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bio_meth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bss_acpt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bss_bio.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bss_conn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bss_dgram.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bss_fd.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bss_file.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bss_log.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bss_mem.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bss_null.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bss_sock.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/blake2/blake2b.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/blake2/blake2s.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/blake2/m_blake2b.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/blake2/m_blake2s.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/armv4-gf2m.o" =>
@@ -5637,7 +5528,6 @@ our %unified_info = (
             "crypto/bn/asm/x86_64-gcc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn-mips.o" =>
@@ -5647,182 +5537,152 @@ our %unified_info = (
             "crypto/bn/bn_add.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_blind.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_const.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_ctx.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_depr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_dh.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_div.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_exp.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto",
                 ],
             "crypto/bn/bn_exp2.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_gcd.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_gf2m.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_intern.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_kron.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_mod.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_mont.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_mpi.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_mul.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_nist.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_prime.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_print.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_rand.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_recp.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_shift.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_sqr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_sqrt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_srp.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_word.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_x931p.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/mips-mont.o" =>
@@ -5832,19 +5692,16 @@ our %unified_info = (
             "crypto/bn/rsaz-avx2.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/rsaz-x86_64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/rsaz_exp.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/sparct4-mont.o" =>
@@ -5870,31 +5727,26 @@ our %unified_info = (
             "crypto/bn/x86_64-gf2m.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/x86_64-mont.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/x86_64-mont5.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/buffer/buf_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/buffer/buffer.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/buildinf.h" =>
@@ -5904,37 +5756,31 @@ our %unified_info = (
             "crypto/camellia/cmll-x86_64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/camellia/cmll_cfb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/camellia/cmll_ctr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/camellia/cmll_ecb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/camellia/cmll_misc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/camellia/cmll_ofb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/camellia/cmllt4-sparcv9.o" =>
@@ -5944,31 +5790,26 @@ our %unified_info = (
             "crypto/cast/c_cfb64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cast/c_ecb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cast/c_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cast/c_ofb64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cast/c_skey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/chacha/chacha-armv4.o" =>
@@ -5986,278 +5827,232 @@ our %unified_info = (
             "crypto/chacha/chacha-x86_64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cmac/cm_ameth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cmac/cm_pmeth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cmac/cmac.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_asn1.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_att.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_cd.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_dd.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_env.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_ess.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_io.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_kari.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_pwri.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_sd.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_smime.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/conf/conf_api.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/conf/conf_def.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/conf/conf_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/conf/conf_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/conf/conf_mall.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/conf/conf_mod.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/conf/conf_sap.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/conf/conf_ssl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cpt_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cryptlib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ct/ct_b64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ct/ct_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ct/ct_log.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ct/ct_oct.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ct/ct_policy.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ct/ct_prn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ct/ct_sct.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ct/ct_sct_ctx.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ct/ct_vfy.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ct/ct_x509v3.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ctype.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cversion.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto",
                 ],
             "crypto/des/cbc_cksm.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/cbc_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/cfb64ede.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/cfb64enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/cfb_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/des_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/dest4-sparcv9.o" =>
@@ -6267,301 +6062,251 @@ our %unified_info = (
             "crypto/des/ecb3_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/ecb_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/fcrypt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/fcrypt_b.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/ofb64ede.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/ofb64enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/ofb_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/pcbc_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/qud_cksm.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/rand_key.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/set_key.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/str2key.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/xcbc_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_ameth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_asn1.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_check.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_depr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_gen.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_kdf.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_key.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_meth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_pmeth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_prn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_rfc5114.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_rfc7919.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dsa/dsa_ameth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dsa/dsa_asn1.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dsa/dsa_depr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dsa/dsa_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dsa/dsa_gen.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dsa/dsa_key.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dsa/dsa_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dsa/dsa_meth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dsa/dsa_ossl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dsa/dsa_pmeth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dsa/dsa_prn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dsa/dsa_sign.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dsa/dsa_vrf.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dso/dso_dl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dso/dso_dlfcn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dso/dso_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dso/dso_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dso/dso_openssl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dso/dso_vms.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dso/dso_win32.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ebcdic.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/curve25519.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/curve448/arch_32/f_impl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto/ec/curve448/arch_32",
                     "crypto/ec/curve448",
@@ -6569,7 +6314,6 @@ our %unified_info = (
             "crypto/ec/curve448/curve448.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto/ec/curve448/arch_32",
                     "crypto/ec/curve448",
@@ -6577,7 +6321,6 @@ our %unified_info = (
             "crypto/ec/curve448/curve448_tables.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto/ec/curve448/arch_32",
                     "crypto/ec/curve448",
@@ -6585,7 +6328,6 @@ our %unified_info = (
             "crypto/ec/curve448/eddsa.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto/ec/curve448/arch_32",
                     "crypto/ec/curve448",
@@ -6593,7 +6335,6 @@ our %unified_info = (
             "crypto/ec/curve448/f_generic.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto/ec/curve448/arch_32",
                     "crypto/ec/curve448",
@@ -6601,7 +6342,6 @@ our %unified_info = (
             "crypto/ec/curve448/scalar.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto/ec/curve448/arch_32",
                     "crypto/ec/curve448",
@@ -6609,163 +6349,136 @@ our %unified_info = (
             "crypto/ec/ec2_oct.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec2_smpl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec_ameth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec_asn1.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec_check.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec_curve.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec_cvt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec_key.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec_kmeth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec_mult.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec_oct.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec_pmeth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec_print.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecdh_kdf.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecdh_ossl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecdsa_ossl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecdsa_sign.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecdsa_vrf.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/eck_prn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecp_mont.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecp_nist.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecp_nistp224.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecp_nistp256.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecp_nistp521.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecp_nistputil.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecp_nistz256-armv4.o" =>
@@ -6783,241 +6496,201 @@ our %unified_info = (
             "crypto/ec/ecp_nistz256-x86_64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecp_nistz256.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecp_oct.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecp_smpl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecx_meth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/x25519-x86_64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/eng_all.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/eng_cnf.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/eng_ctrl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/eng_dyn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/eng_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/eng_fat.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/eng_init.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/eng_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/eng_list.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/eng_openssl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/eng_pkey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/eng_rdrand.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/eng_table.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/tb_asnmth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/tb_cipher.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/tb_dh.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/tb_digest.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/tb_dsa.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/tb_eckey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/tb_pkmeth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/tb_rand.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/tb_rsa.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/err/err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/err/err_all.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/err/err_prn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/bio_b64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/bio_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/bio_md.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/bio_ok.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/c_allc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/c_alld.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/cmeth_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/digest.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/e_aes.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto",
                     "crypto/modes",
@@ -7025,21 +6698,18 @@ our %unified_info = (
             "crypto/evp/e_aes_cbc_hmac_sha1.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto/modes",
                 ],
             "crypto/evp/e_aes_cbc_hmac_sha256.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto/modes",
                 ],
             "crypto/evp/e_aria.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto",
                     "crypto/modes",
@@ -7047,13 +6717,11 @@ our %unified_info = (
             "crypto/evp/e_bf.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/e_camellia.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto",
                     "crypto/modes",
@@ -7061,81 +6729,68 @@ our %unified_info = (
             "crypto/evp/e_cast.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/e_chacha20_poly1305.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/e_des.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto",
                 ],
             "crypto/evp/e_des3.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto",
                 ],
             "crypto/evp/e_idea.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/e_null.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/e_old.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/e_rc2.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/e_rc4.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/e_rc4_hmac_md5.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/e_rc5.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/e_seed.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/e_sm4.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto",
                     "crypto/modes",
@@ -7143,328 +6798,267 @@ our %unified_info = (
             "crypto/evp/e_xcbc_d.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/encode.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/evp_cnf.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/evp_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/evp_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/evp_key.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/evp_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/evp_pbe.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/evp_pkey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/m_md2.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/m_md4.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/m_md5.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/m_md5_sha1.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/m_mdc2.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/m_null.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/m_ripemd.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/m_sha1.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/m_sha3.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto",
                 ],
             "crypto/evp/m_sigver.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/m_wp.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/names.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/p5_crpt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/p5_crpt2.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/p_dec.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/p_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/p_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/p_open.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/p_seal.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/p_sign.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/p_verify.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/pbe_scrypt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/pmeth_fn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/pmeth_gn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/pmeth_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ex_data.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/getenv.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/hmac/hm_ameth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/hmac/hm_pmeth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/hmac/hmac.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/idea/i_cbc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/idea/i_cfb64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/idea/i_ecb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/idea/i_ofb64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/idea/i_skey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
-            "crypto/include/internal/bn_conf.h" =>
-                [
-                    ".",
-                ],
-            "crypto/include/internal/dso_conf.h" =>
-                [
-                    ".",
-                ],
             "crypto/init.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/kdf/hkdf.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/kdf/kdf_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/kdf/scrypt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/kdf/tls1_prf.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/lhash/lh_stats.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/lhash/lhash.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/md4/md4_dgst.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/md4/md4_one.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/md5/md5-sparcv9.o" =>
@@ -7474,91 +7068,76 @@ our %unified_info = (
             "crypto/md5/md5-x86_64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/md5/md5_dgst.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/md5/md5_one.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/mdc2/mdc2_one.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/mdc2/mdc2dgst.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/mem.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/mem_dbg.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/mem_sec.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/modes/aesni-gcm-x86_64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/modes/cbc128.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/modes/ccm128.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/modes/cfb128.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/modes/ctr128.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/modes/cts128.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/modes/gcm128.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto",
                 ],
@@ -7577,7 +7156,6 @@ our %unified_info = (
             "crypto/modes/ghash-x86_64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/modes/ghashv8-armx.o" =>
@@ -7587,361 +7165,301 @@ our %unified_info = (
             "crypto/modes/ocb128.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/modes/ofb128.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/modes/wrap128.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/modes/xts128.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/o_dir.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/o_fips.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/o_fopen.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/o_init.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/o_str.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/o_time.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/objects/o_names.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/objects/obj_dat.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/objects/obj_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/objects/obj_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/objects/obj_xref.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ocsp/ocsp_asn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ocsp/ocsp_cl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ocsp/ocsp_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ocsp/ocsp_ext.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ocsp/ocsp_ht.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ocsp/ocsp_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ocsp/ocsp_prn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ocsp/ocsp_srv.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ocsp/ocsp_vfy.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ocsp/v3_ocsp.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pem/pem_all.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pem/pem_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pem/pem_info.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pem/pem_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pem/pem_oth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pem/pem_pk8.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pem/pem_pkey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pem/pem_sign.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pem/pem_x509.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pem/pem_xaux.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pem/pvkfmt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_add.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_asn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_attr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_crpt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_crt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_decr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_init.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_key.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_kiss.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_mutl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_npas.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_p8d.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_p8e.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_sbag.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_utl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/pk12err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs7/bio_pk7.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs7/pk7_asn1.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs7/pk7_attr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs7/pk7_doit.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs7/pk7_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs7/pk7_mime.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs7/pk7_smime.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs7/pkcs7err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/poly1305/poly1305-armv4.o" =>
@@ -7963,265 +7481,221 @@ our %unified_info = (
             "crypto/poly1305/poly1305-x86_64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/poly1305/poly1305.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/poly1305/poly1305_ameth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/poly1305/poly1305_pmeth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rand/drbg_ctr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rand/drbg_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rand/rand_egd.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rand/rand_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rand/rand_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rand/rand_unix.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rand/rand_vms.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rand/rand_win.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rand/randfile.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rc2/rc2_cbc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rc2/rc2_ecb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rc2/rc2_skey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rc2/rc2cfb64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rc2/rc2ofb64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rc4/rc4-md5-x86_64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rc4/rc4-x86_64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ripemd/rmd_dgst.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ripemd/rmd_one.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_ameth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_asn1.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_chk.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_crpt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_depr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_gen.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_meth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_mp.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_none.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_oaep.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_ossl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_pk1.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_pmeth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_prn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_pss.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_saos.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_sign.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_ssl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_x931.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_x931g.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/s390xcpuid.o" =>
@@ -8231,31 +7705,26 @@ our %unified_info = (
             "crypto/seed/seed.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/seed/seed_cbc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/seed/seed_cfb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/seed/seed_ecb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/seed/seed_ofb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sha/keccak1600-armv4.o" =>
@@ -8265,7 +7734,6 @@ our %unified_info = (
             "crypto/sha/keccak1600-x86_64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sha/sha1-armv4-large.o" =>
@@ -8279,7 +7747,6 @@ our %unified_info = (
             "crypto/sha/sha1-mb-x86_64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sha/sha1-mips.o" =>
@@ -8297,19 +7764,16 @@ our %unified_info = (
             "crypto/sha/sha1-x86_64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sha/sha1_one.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sha/sha1dgst.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sha/sha256-armv4.o" =>
@@ -8323,7 +7787,6 @@ our %unified_info = (
             "crypto/sha/sha256-mb-x86_64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sha/sha256-mips.o" =>
@@ -8341,13 +7804,11 @@ our %unified_info = (
             "crypto/sha/sha256-x86_64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sha/sha256.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sha/sha512-armv4.o" =>
@@ -8373,727 +7834,606 @@ our %unified_info = (
             "crypto/sha/sha512-x86_64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sha/sha512.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/siphash/siphash.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/siphash/siphash_ameth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/siphash/siphash_pmeth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sm2/sm2_crypt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sm2/sm2_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sm2/sm2_pmeth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sm2/sm2_sign.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sm3/m_sm3.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sm3/sm3.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sm4/sm4.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/srp/srp_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/srp/srp_vfy.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/stack/stack.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/store/loader_file.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/store/store_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/store/store_init.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/store/store_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/store/store_register.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/store/store_strings.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/threads_none.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/threads_pthread.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/threads_win.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ts/ts_asn1.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ts/ts_conf.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ts/ts_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ts/ts_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ts/ts_req_print.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ts/ts_req_utils.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ts/ts_rsp_print.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ts/ts_rsp_sign.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ts/ts_rsp_utils.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ts/ts_rsp_verify.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ts/ts_verify_ctx.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/txt_db/txt_db.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ui/ui_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ui/ui_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ui/ui_null.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ui/ui_openssl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ui/ui_util.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/uid.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/whrlpool/wp-x86_64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/whrlpool/wp_dgst.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/by_dir.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/by_file.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/t_crl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/t_req.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/t_x509.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_att.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_cmp.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_d2.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_def.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_ext.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_lu.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_meth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_obj.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_r2x.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_req.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_set.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_trs.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_txt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_v3.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_vfy.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_vpm.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509cset.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509name.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509rset.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509spki.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509type.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x_all.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x_attrib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x_crl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x_exten.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x_name.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x_pubkey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x_req.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x_x509.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x_x509a.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/pcy_cache.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/pcy_data.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/pcy_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/pcy_map.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/pcy_node.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/pcy_tree.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_addr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_admis.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_akey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_akeya.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_alt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_asid.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_bcons.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_bitst.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_conf.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_cpols.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_crld.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_enum.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_extku.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_genn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_ia5.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_info.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_int.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_ncons.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_pci.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_pcia.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_pcons.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_pku.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_pmaps.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_prn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_purp.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_skey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_sxnet.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_tlsf.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_utl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x86_64cpuid.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "engines/e_capi.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "engines/e_padlock-x86_64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "engines/e_padlock.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "fuzz/asn1.o" =>
@@ -9144,6 +8484,14 @@ our %unified_info = (
                 [
                     "include",
                 ],
+            "include/crypto/bn_conf.h" =>
+                [
+                    ".",
+                ],
+            "include/crypto/dso_conf.h" =>
+                [
+                    ".",
+                ],
             "include/openssl/opensslconf.h" =>
                 [
                     ".",
@@ -9388,7 +8736,6 @@ our %unified_info = (
                 [
                     ".",
                     "include",
-                    "crypto/include",
                 ],
             "test/asn1_string_table_test.o" =>
                 [
@@ -9714,7 +9061,6 @@ our %unified_info = (
                 [
                     ".",
                     "include",
-                    "crypto/include",
                 ],
             "test/cipher_overhead_test.o" =>
                 [
@@ -9760,7 +9106,6 @@ our %unified_info = (
             "test/ctype_internal_test.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "test/curve448_internal_test.o" =>
@@ -9826,7 +9171,6 @@ our %unified_info = (
                 [
                     "include",
                     "crypto/ec",
-                    "crypto/include",
                 ],
             "test/ecdsatest.o" =>
                 [
@@ -9851,7 +9195,6 @@ our %unified_info = (
             "test/evp_extra_test.o" =>
                 [
                     "include",
-                    "crypto/include",
                 ],
             "test/evp_test.o" =>
                 [
@@ -9949,7 +9292,6 @@ our %unified_info = (
                 [
                     ".",
                     "include",
-                    "crypto/include",
                 ],
             "test/rc2test.o" =>
                 [
@@ -9999,18 +9341,15 @@ our %unified_info = (
                 [
                     ".",
                     "include",
-                    "crypto/include",
                 ],
             "test/sm2_internal_test.o" =>
                 [
                     "include",
-                    "crypto/include",
                 ],
             "test/sm4_internal_test.o" =>
                 [
                     ".",
                     "include",
-                    "crypto/include",
                 ],
             "test/srptest.o" =>
                 [
@@ -10021,6 +9360,10 @@ our %unified_info = (
                     ".",
                     "include",
                 ],
+            "test/ssl_ctx_test.o" =>
+                [
+                    "include",
+                ],
             "test/ssl_test.o" =>
                 [
                     "include",
@@ -10084,10 +9427,6 @@ our %unified_info = (
                 [
                     "include",
                 ],
-            "test/testutil/init.o" =>
-                [
-                    "include",
-                ],
             "test/testutil/main.o" =>
                 [
                     "include",
@@ -10116,6 +9455,10 @@ our %unified_info = (
                 [
                     "include",
                 ],
+            "test/testutil/testutil_init.o" =>
+                [
+                    "include",
+                ],
             "test/threadstest.o" =>
                 [
                     "include",
@@ -10380,6 +9723,7 @@ our %unified_info = (
             "test/sm4_internal_test",
             "test/srptest",
             "test/ssl_cert_table_internal_test",
+            "test/ssl_ctx_test",
             "test/ssl_test",
             "test/ssl_test_ctx_test",
             "test/sslapitest",
@@ -15385,7 +14729,6 @@ our %unified_info = (
                     "test/testutil/cb.o",
                     "test/testutil/driver.o",
                     "test/testutil/format_output.o",
-                    "test/testutil/init.o",
                     "test/testutil/main.o",
                     "test/testutil/output_helpers.o",
                     "test/testutil/random.o",
@@ -15393,6 +14736,7 @@ our %unified_info = (
                     "test/testutil/tap_bio.o",
                     "test/testutil/test_cleanup.o",
                     "test/testutil/tests.o",
+                    "test/testutil/testutil_init.o",
                 ],
             "test/md2test" =>
                 [
@@ -15620,6 +14964,14 @@ our %unified_info = (
                 [
                     "test/ssl_cert_table_internal_test.c",
                 ],
+            "test/ssl_ctx_test" =>
+                [
+                    "test/ssl_ctx_test.o",
+                ],
+            "test/ssl_ctx_test.o" =>
+                [
+                    "test/ssl_ctx_test.c",
+                ],
             "test/ssl_test" =>
                 [
                     "test/handshake_helper.o",
@@ -15722,10 +15074,6 @@ our %unified_info = (
                 [
                     "test/testutil/format_output.c",
                 ],
-            "test/testutil/init.o" =>
-                [
-                    "test/testutil/init.c",
-                ],
             "test/testutil/main.o" =>
                 [
                     "test/testutil/main.c",
@@ -15754,6 +15102,10 @@ our %unified_info = (
                 [
                     "test/testutil/tests.c",
                 ],
+            "test/testutil/testutil_init.o" =>
+                [
+                    "test/testutil/testutil_init.c",
+                ],
             "test/threadstest" =>
                 [
                     "test/threadstest.o",
diff --git a/deps/openssl/config/archs/linux-x86_64/asm/crypto/aes/aes-x86_64.s b/deps/openssl/config/archs/linux-x86_64/asm/crypto/aes/aes-x86_64.s
deleted file mode 100644
index f0c1685fb9..0000000000
--- a/deps/openssl/config/archs/linux-x86_64/asm/crypto/aes/aes-x86_64.s
+++ /dev/null
@@ -1,2649 +0,0 @@
-.text	
-.type	_x86_64_AES_encrypt,@function
-.align	16
-_x86_64_AES_encrypt:
-	xorl	0(%r15),%eax
-	xorl	4(%r15),%ebx
-	xorl	8(%r15),%ecx
-	xorl	12(%r15),%edx
-
-	movl	240(%r15),%r13d
-	subl	$1,%r13d
-	jmp	.Lenc_loop
-.align	16
-.Lenc_loop:
-
-	movzbl	%al,%esi
-	movzbl	%bl,%edi
-	movzbl	%cl,%ebp
-	movl	0(%r14,%rsi,8),%r10d
-	movl	0(%r14,%rdi,8),%r11d
-	movl	0(%r14,%rbp,8),%r12d
-
-	movzbl	%bh,%esi
-	movzbl	%ch,%edi
-	movzbl	%dl,%ebp
-	xorl	3(%r14,%rsi,8),%r10d
-	xorl	3(%r14,%rdi,8),%r11d
-	movl	0(%r14,%rbp,8),%r8d
-
-	movzbl	%dh,%esi
-	shrl	$16,%ecx
-	movzbl	%ah,%ebp
-	xorl	3(%r14,%rsi,8),%r12d
-	shrl	$16,%edx
-	xorl	3(%r14,%rbp,8),%r8d
-
-	shrl	$16,%ebx
-	leaq	16(%r15),%r15
-	shrl	$16,%eax
-
-	movzbl	%cl,%esi
-	movzbl	%dl,%edi
-	movzbl	%al,%ebp
-	xorl	2(%r14,%rsi,8),%r10d
-	xorl	2(%r14,%rdi,8),%r11d
-	xorl	2(%r14,%rbp,8),%r12d
-
-	movzbl	%dh,%esi
-	movzbl	%ah,%edi
-	movzbl	%bl,%ebp
-	xorl	1(%r14,%rsi,8),%r10d
-	xorl	1(%r14,%rdi,8),%r11d
-	xorl	2(%r14,%rbp,8),%r8d
-
-	movl	12(%r15),%edx
-	movzbl	%bh,%edi
-	movzbl	%ch,%ebp
-	movl	0(%r15),%eax
-	xorl	1(%r14,%rdi,8),%r12d
-	xorl	1(%r14,%rbp,8),%r8d
-
-	movl	4(%r15),%ebx
-	movl	8(%r15),%ecx
-	xorl	%r10d,%eax
-	xorl	%r11d,%ebx
-	xorl	%r12d,%ecx
-	xorl	%r8d,%edx
-	subl	$1,%r13d
-	jnz	.Lenc_loop
-	movzbl	%al,%esi
-	movzbl	%bl,%edi
-	movzbl	%cl,%ebp
-	movzbl	2(%r14,%rsi,8),%r10d
-	movzbl	2(%r14,%rdi,8),%r11d
-	movzbl	2(%r14,%rbp,8),%r12d
-
-	movzbl	%dl,%esi
-	movzbl	%bh,%edi
-	movzbl	%ch,%ebp
-	movzbl	2(%r14,%rsi,8),%r8d
-	movl	0(%r14,%rdi,8),%edi
-	movl	0(%r14,%rbp,8),%ebp
-
-	andl	$0x0000ff00,%edi
-	andl	$0x0000ff00,%ebp
-
-	xorl	%edi,%r10d
-	xorl	%ebp,%r11d
-	shrl	$16,%ecx
-
-	movzbl	%dh,%esi
-	movzbl	%ah,%edi
-	shrl	$16,%edx
-	movl	0(%r14,%rsi,8),%esi
-	movl	0(%r14,%rdi,8),%edi
-
-	andl	$0x0000ff00,%esi
-	andl	$0x0000ff00,%edi
-	shrl	$16,%ebx
-	xorl	%esi,%r12d
-	xorl	%edi,%r8d
-	shrl	$16,%eax
-
-	movzbl	%cl,%esi
-	movzbl	%dl,%edi
-	movzbl	%al,%ebp
-	movl	0(%r14,%rsi,8),%esi
-	movl	0(%r14,%rdi,8),%edi
-	movl	0(%r14,%rbp,8),%ebp
-
-	andl	$0x00ff0000,%esi
-	andl	$0x00ff0000,%edi
-	andl	$0x00ff0000,%ebp
-
-	xorl	%esi,%r10d
-	xorl	%edi,%r11d
-	xorl	%ebp,%r12d
-
-	movzbl	%bl,%esi
-	movzbl	%dh,%edi
-	movzbl	%ah,%ebp
-	movl	0(%r14,%rsi,8),%esi
-	movl	2(%r14,%rdi,8),%edi
-	movl	2(%r14,%rbp,8),%ebp
-
-	andl	$0x00ff0000,%esi
-	andl	$0xff000000,%edi
-	andl	$0xff000000,%ebp
-
-	xorl	%esi,%r8d
-	xorl	%edi,%r10d
-	xorl	%ebp,%r11d
-
-	movzbl	%bh,%esi
-	movzbl	%ch,%edi
-	movl	16+12(%r15),%edx
-	movl	2(%r14,%rsi,8),%esi
-	movl	2(%r14,%rdi,8),%edi
-	movl	16+0(%r15),%eax
-
-	andl	$0xff000000,%esi
-	andl	$0xff000000,%edi
-
-	xorl	%esi,%r12d
-	xorl	%edi,%r8d
-
-	movl	16+4(%r15),%ebx
-	movl	16+8(%r15),%ecx
-	xorl	%r10d,%eax
-	xorl	%r11d,%ebx
-	xorl	%r12d,%ecx
-	xorl	%r8d,%edx
-.byte	0xf3,0xc3
-.size	_x86_64_AES_encrypt,.-_x86_64_AES_encrypt
-.type	_x86_64_AES_encrypt_compact,@function
-.align	16
-_x86_64_AES_encrypt_compact:
-.cfi_startproc	
-	leaq	128(%r14),%r8
-	movl	0-128(%r8),%edi
-	movl	32-128(%r8),%ebp
-	movl	64-128(%r8),%r10d
-	movl	96-128(%r8),%r11d
-	movl	128-128(%r8),%edi
-	movl	160-128(%r8),%ebp
-	movl	192-128(%r8),%r10d
-	movl	224-128(%r8),%r11d
-	jmp	.Lenc_loop_compact
-.align	16
-.Lenc_loop_compact:
-	xorl	0(%r15),%eax
-	xorl	4(%r15),%ebx
-	xorl	8(%r15),%ecx
-	xorl	12(%r15),%edx
-	leaq	16(%r15),%r15
-	movzbl	%al,%r10d
-	movzbl	%bl,%r11d
-	movzbl	%cl,%r12d
-	movzbl	%dl,%r8d
-	movzbl	%bh,%esi
-	movzbl	%ch,%edi
-	shrl	$16,%ecx
-	movzbl	%dh,%ebp
-	movzbl	(%r14,%r10,1),%r10d
-	movzbl	(%r14,%r11,1),%r11d
-	movzbl	(%r14,%r12,1),%r12d
-	movzbl	(%r14,%r8,1),%r8d
-
-	movzbl	(%r14,%rsi,1),%r9d
-	movzbl	%ah,%esi
-	movzbl	(%r14,%rdi,1),%r13d
-	movzbl	%cl,%edi
-	movzbl	(%r14,%rbp,1),%ebp
-	movzbl	(%r14,%rsi,1),%esi
-
-	shll	$8,%r9d
-	shrl	$16,%edx
-	shll	$8,%r13d
-	xorl	%r9d,%r10d
-	shrl	$16,%eax
-	movzbl	%dl,%r9d
-	shrl	$16,%ebx
-	xorl	%r13d,%r11d
-	shll	$8,%ebp
-	movzbl	%al,%r13d
-	movzbl	(%r14,%rdi,1),%edi
-	xorl	%ebp,%r12d
-
-	shll	$8,%esi
-	movzbl	%bl,%ebp
-	shll	$16,%edi
-	xorl	%esi,%r8d
-	movzbl	(%r14,%r9,1),%r9d
-	movzbl	%dh,%esi
-	movzbl	(%r14,%r13,1),%r13d
-	xorl	%edi,%r10d
-
-	shrl	$8,%ecx
-	movzbl	%ah,%edi
-	shll	$16,%r9d
-	shrl	$8,%ebx
-	shll	$16,%r13d
-	xorl	%r9d,%r11d
-	movzbl	(%r14,%rbp,1),%ebp
-	movzbl	(%r14,%rsi,1),%esi
-	movzbl	(%r14,%rdi,1),%edi
-	movzbl	(%r14,%rcx,1),%edx
-	movzbl	(%r14,%rbx,1),%ecx
-
-	shll	$16,%ebp
-	xorl	%r13d,%r12d
-	shll	$24,%esi
-	xorl	%ebp,%r8d
-	shll	$24,%edi
-	xorl	%esi,%r10d
-	shll	$24,%edx
-	xorl	%edi,%r11d
-	shll	$24,%ecx
-	movl	%r10d,%eax
-	movl	%r11d,%ebx
-	xorl	%r12d,%ecx
-	xorl	%r8d,%edx
-	cmpq	16(%rsp),%r15
-	je	.Lenc_compact_done
-	movl	$0x80808080,%r10d
-	movl	$0x80808080,%r11d
-	andl	%eax,%r10d
-	andl	%ebx,%r11d
-	movl	%r10d,%esi
-	movl	%r11d,%edi
-	shrl	$7,%r10d
-	leal	(%rax,%rax,1),%r8d
-	shrl	$7,%r11d
-	leal	(%rbx,%rbx,1),%r9d
-	subl	%r10d,%esi
-	subl	%r11d,%edi
-	andl	$0xfefefefe,%r8d
-	andl	$0xfefefefe,%r9d
-	andl	$0x1b1b1b1b,%esi
-	andl	$0x1b1b1b1b,%edi
-	movl	%eax,%r10d
-	movl	%ebx,%r11d
-	xorl	%esi,%r8d
-	xorl	%edi,%r9d
-
-	xorl	%r8d,%eax
-	xorl	%r9d,%ebx
-	movl	$0x80808080,%r12d
-	roll	$24,%eax
-	movl	$0x80808080,%ebp
-	roll	$24,%ebx
-	andl	%ecx,%r12d
-	andl	%edx,%ebp
-	xorl	%r8d,%eax
-	xorl	%r9d,%ebx
-	movl	%r12d,%esi
-	rorl	$16,%r10d
-	movl	%ebp,%edi
-	rorl	$16,%r11d
-	leal	(%rcx,%rcx,1),%r8d
-	shrl	$7,%r12d
-	xorl	%r10d,%eax
-	shrl	$7,%ebp
-	xorl	%r11d,%ebx
-	rorl	$8,%r10d
-	leal	(%rdx,%rdx,1),%r9d
-	rorl	$8,%r11d
-	subl	%r12d,%esi
-	subl	%ebp,%edi
-	xorl	%r10d,%eax
-	xorl	%r11d,%ebx
-
-	andl	$0xfefefefe,%r8d
-	andl	$0xfefefefe,%r9d
-	andl	$0x1b1b1b1b,%esi
-	andl	$0x1b1b1b1b,%edi
-	movl	%ecx,%r12d
-	movl	%edx,%ebp
-	xorl	%esi,%r8d
-	xorl	%edi,%r9d
-
-	rorl	$16,%r12d
-	xorl	%r8d,%ecx
-	rorl	$16,%ebp
-	xorl	%r9d,%edx
-	roll	$24,%ecx
-	movl	0(%r14),%esi
-	roll	$24,%edx
-	xorl	%r8d,%ecx
-	movl	64(%r14),%edi
-	xorl	%r9d,%edx
-	movl	128(%r14),%r8d
-	xorl	%r12d,%ecx
-	rorl	$8,%r12d
-	xorl	%ebp,%edx
-	rorl	$8,%ebp
-	xorl	%r12d,%ecx
-	movl	192(%r14),%r9d
-	xorl	%ebp,%edx
-	jmp	.Lenc_loop_compact
-.align	16
-.Lenc_compact_done:
-	xorl	0(%r15),%eax
-	xorl	4(%r15),%ebx
-	xorl	8(%r15),%ecx
-	xorl	12(%r15),%edx
-.byte	0xf3,0xc3
-.cfi_endproc	
-.size	_x86_64_AES_encrypt_compact,.-_x86_64_AES_encrypt_compact
-.globl	AES_encrypt
-.type	AES_encrypt,@function
-.align	16
-.globl	asm_AES_encrypt
-.hidden	asm_AES_encrypt
-asm_AES_encrypt:
-AES_encrypt:
-.cfi_startproc	
-	movq	%rsp,%rax
-.cfi_def_cfa_register	%rax
-	pushq	%rbx
-.cfi_offset	%rbx,-16
-	pushq	%rbp
-.cfi_offset	%rbp,-24
-	pushq	%r12
-.cfi_offset	%r12,-32
-	pushq	%r13
-.cfi_offset	%r13,-40
-	pushq	%r14
-.cfi_offset	%r14,-48
-	pushq	%r15
-.cfi_offset	%r15,-56
-
-
-	leaq	-63(%rdx),%rcx
-	andq	$-64,%rsp
-	subq	%rsp,%rcx
-	negq	%rcx
-	andq	$0x3c0,%rcx
-	subq	%rcx,%rsp
-	subq	$32,%rsp
-
-	movq	%rsi,16(%rsp)
-	movq	%rax,24(%rsp)
-.cfi_escape	0x0f,0x05,0x77,0x18,0x06,0x23,0x08
-.Lenc_prologue:
-
-	movq	%rdx,%r15
-	movl	240(%r15),%r13d
-
-	movl	0(%rdi),%eax
-	movl	4(%rdi),%ebx
-	movl	8(%rdi),%ecx
-	movl	12(%rdi),%edx
-
-	shll	$4,%r13d
-	leaq	(%r15,%r13,1),%rbp
-	movq	%r15,(%rsp)
-	movq	%rbp,8(%rsp)
-
-
-	leaq	.LAES_Te+2048(%rip),%r14
-	leaq	768(%rsp),%rbp
-	subq	%r14,%rbp
-	andq	$0x300,%rbp
-	leaq	(%r14,%rbp,1),%r14
-
-	call	_x86_64_AES_encrypt_compact
-
-	movq	16(%rsp),%r9
-	movq	24(%rsp),%rsi
-.cfi_def_cfa	%rsi,8
-	movl	%eax,0(%r9)
-	movl	%ebx,4(%r9)
-	movl	%ecx,8(%r9)
-	movl	%edx,12(%r9)
-
-	movq	-48(%rsi),%r15
-.cfi_restore	%r15
-	movq	-40(%rsi),%r14
-.cfi_restore	%r14
-	movq	-32(%rsi),%r13
-.cfi_restore	%r13
-	movq	-24(%rsi),%r12
-.cfi_restore	%r12
-	movq	-16(%rsi),%rbp
-.cfi_restore	%rbp
-	movq	-8(%rsi),%rbx
-.cfi_restore	%rbx
-	leaq	(%rsi),%rsp
-.cfi_def_cfa_register	%rsp
-.Lenc_epilogue:
-	.byte	0xf3,0xc3
-.cfi_endproc	
-.size	AES_encrypt,.-AES_encrypt
-.type	_x86_64_AES_decrypt,@function
-.align	16
-_x86_64_AES_decrypt:
-	xorl	0(%r15),%eax
-	xorl	4(%r15),%ebx
-	xorl	8(%r15),%ecx
-	xorl	12(%r15),%edx
-
-	movl	240(%r15),%r13d
-	subl	$1,%r13d
-	jmp	.Ldec_loop
-.align	16
-.Ldec_loop:
-
-	movzbl	%al,%esi
-	movzbl	%bl,%edi
-	movzbl	%cl,%ebp
-	movl	0(%r14,%rsi,8),%r10d
-	movl	0(%r14,%rdi,8),%r11d
-	movl	0(%r14,%rbp,8),%r12d
-
-	movzbl	%dh,%esi
-	movzbl	%ah,%edi
-	movzbl	%dl,%ebp
-	xorl	3(%r14,%rsi,8),%r10d
-	xorl	3(%r14,%rdi,8),%r11d
-	movl	0(%r14,%rbp,8),%r8d
-
-	movzbl	%bh,%esi
-	shrl	$16,%eax
-	movzbl	%ch,%ebp
-	xorl	3(%r14,%rsi,8),%r12d
-	shrl	$16,%edx
-	xorl	3(%r14,%rbp,8),%r8d
-
-	shrl	$16,%ebx
-	leaq	16(%r15),%r15
-	shrl	$16,%ecx
-
-	movzbl	%cl,%esi
-	movzbl	%dl,%edi
-	movzbl	%al,%ebp
-	xorl	2(%r14,%rsi,8),%r10d
-	xorl	2(%r14,%rdi,8),%r11d
-	xorl	2(%r14,%rbp,8),%r12d
-
-	movzbl	%bh,%esi
-	movzbl	%ch,%edi
-	movzbl	%bl,%ebp
-	xorl	1(%r14,%rsi,8),%r10d
-	xorl	1(%r14,%rdi,8),%r11d
-	xorl	2(%r14,%rbp,8),%r8d
-
-	movzbl	%dh,%esi
-	movl	12(%r15),%edx
-	movzbl	%ah,%ebp
-	xorl	1(%r14,%rsi,8),%r12d
-	movl	0(%r15),%eax
-	xorl	1(%r14,%rbp,8),%r8d
-
-	xorl	%r10d,%eax
-	movl	4(%r15),%ebx
-	movl	8(%r15),%ecx
-	xorl	%r12d,%ecx
-	xorl	%r11d,%ebx
-	xorl	%r8d,%edx
-	subl	$1,%r13d
-	jnz	.Ldec_loop
-	leaq	2048(%r14),%r14
-	movzbl	%al,%esi
-	movzbl	%bl,%edi
-	movzbl	%cl,%ebp
-	movzbl	(%r14,%rsi,1),%r10d
-	movzbl	(%r14,%rdi,1),%r11d
-	movzbl	(%r14,%rbp,1),%r12d
-
-	movzbl	%dl,%esi
-	movzbl	%dh,%edi
-	movzbl	%ah,%ebp
-	movzbl	(%r14,%rsi,1),%r8d
-	movzbl	(%r14,%rdi,1),%edi
-	movzbl	(%r14,%rbp,1),%ebp
-
-	shll	$8,%edi
-	shll	$8,%ebp
-
-	xorl	%edi,%r10d
-	xorl	%ebp,%r11d
-	shrl	$16,%edx
-
-	movzbl	%bh,%esi
-	movzbl	%ch,%edi
-	shrl	$16,%eax
-	movzbl	(%r14,%rsi,1),%esi
-	movzbl	(%r14,%rdi,1),%edi
-
-	shll	$8,%esi
-	shll	$8,%edi
-	shrl	$16,%ebx
-	xorl	%esi,%r12d
-	xorl	%edi,%r8d
-	shrl	$16,%ecx
-
-	movzbl	%cl,%esi
-	movzbl	%dl,%edi
-	movzbl	%al,%ebp
-	movzbl	(%r14,%rsi,1),%esi
-	movzbl	(%r14,%rdi,1),%edi
-	movzbl	(%r14,%rbp,1),%ebp
-
-	shll	$16,%esi
-	shll	$16,%edi
-	shll	$16,%ebp
-
-	xorl	%esi,%r10d
-	xorl	%edi,%r11d
-	xorl	%ebp,%r12d
-
-	movzbl	%bl,%esi
-	movzbl	%bh,%edi
-	movzbl	%ch,%ebp
-	movzbl	(%r14,%rsi,1),%esi
-	movzbl	(%r14,%rdi,1),%edi
-	movzbl	(%r14,%rbp,1),%ebp
-
-	shll	$16,%esi
-	shll	$24,%edi
-	shll	$24,%ebp
-
-	xorl	%esi,%r8d
-	xorl	%edi,%r10d
-	xorl	%ebp,%r11d
-
-	movzbl	%dh,%esi
-	movzbl	%ah,%edi
-	movl	16+12(%r15),%edx
-	movzbl	(%r14,%rsi,1),%esi
-	movzbl	(%r14,%rdi,1),%edi
-	movl	16+0(%r15),%eax
-
-	shll	$24,%esi
-	shll	$24,%edi
-
-	xorl	%esi,%r12d
-	xorl	%edi,%r8d
-
-	movl	16+4(%r15),%ebx
-	movl	16+8(%r15),%ecx
-	leaq	-2048(%r14),%r14
-	xorl	%r10d,%eax
-	xorl	%r11d,%ebx
-	xorl	%r12d,%ecx
-	xorl	%r8d,%edx
-.byte	0xf3,0xc3
-.size	_x86_64_AES_decrypt,.-_x86_64_AES_decrypt
-.type	_x86_64_AES_decrypt_compact,@function
-.align	16
-_x86_64_AES_decrypt_compact:
-.cfi_startproc	
-	leaq	128(%r14),%r8
-	movl	0-128(%r8),%edi
-	movl	32-128(%r8),%ebp
-	movl	64-128(%r8),%r10d
-	movl	96-128(%r8),%r11d
-	movl	128-128(%r8),%edi
-	movl	160-128(%r8),%ebp
-	movl	192-128(%r8),%r10d
-	movl	224-128(%r8),%r11d
-	jmp	.Ldec_loop_compact
-
-.align	16
-.Ldec_loop_compact:
-	xorl	0(%r15),%eax
-	xorl	4(%r15),%ebx
-	xorl	8(%r15),%ecx
-	xorl	12(%r15),%edx
-	leaq	16(%r15),%r15
-	movzbl	%al,%r10d
-	movzbl	%bl,%r11d
-	movzbl	%cl,%r12d
-	movzbl	%dl,%r8d
-	movzbl	%dh,%esi
-	movzbl	%ah,%edi
-	shrl	$16,%edx
-	movzbl	%bh,%ebp
-	movzbl	(%r14,%r10,1),%r10d
-	movzbl	(%r14,%r11,1),%r11d
-	movzbl	(%r14,%r12,1),%r12d
-	movzbl	(%r14,%r8,1),%r8d
-
-	movzbl	(%r14,%rsi,1),%r9d
-	movzbl	%ch,%esi
-	movzbl	(%r14,%rdi,1),%r13d
-	movzbl	(%r14,%rbp,1),%ebp
-	movzbl	(%r14,%rsi,1),%esi
-
-	shrl	$16,%ecx
-	shll	$8,%r13d
-	shll	$8,%r9d
-	movzbl	%cl,%edi
-	shrl	$16,%eax
-	xorl	%r9d,%r10d
-	shrl	$16,%ebx
-	movzbl	%dl,%r9d
-
-	shll	$8,%ebp
-	xorl	%r13d,%r11d
-	shll	$8,%esi
-	movzbl	%al,%r13d
-	movzbl	(%r14,%rdi,1),%edi
-	xorl	%ebp,%r12d
-	movzbl	%bl,%ebp
-
-	shll	$16,%edi
-	xorl	%esi,%r8d
-	movzbl	(%r14,%r9,1),%r9d
-	movzbl	%bh,%esi
-	movzbl	(%r14,%rbp,1),%ebp
-	xorl	%edi,%r10d
-	movzbl	(%r14,%r13,1),%r13d
-	movzbl	%ch,%edi
-
-	shll	$16,%ebp
-	shll	$16,%r9d
-	shll	$16,%r13d
-	xorl	%ebp,%r8d
-	movzbl	%dh,%ebp
-	xorl	%r9d,%r11d
-	shrl	$8,%eax
-	xorl	%r13d,%r12d
-
-	movzbl	(%r14,%rsi,1),%esi
-	movzbl	(%r14,%rdi,1),%ebx
-	movzbl	(%r14,%rbp,1),%ecx
-	movzbl	(%r14,%rax,1),%edx
-
-	movl	%r10d,%eax
-	shll	$24,%esi
-	shll	$24,%ebx
-	shll	$24,%ecx
-	xorl	%esi,%eax
-	shll	$24,%edx
-	xorl	%r11d,%ebx
-	xorl	%r12d,%ecx
-	xorl	%r8d,%edx
-	cmpq	16(%rsp),%r15
-	je	.Ldec_compact_done
-
-	movq	256+0(%r14),%rsi
-	shlq	$32,%rbx
-	shlq	$32,%rdx
-	movq	256+8(%r14),%rdi
-	orq	%rbx,%rax
-	orq	%rdx,%rcx
-	movq	256+16(%r14),%rbp
-	movq	%rsi,%r9
-	movq	%rsi,%r12
-	andq	%rax,%r9
-	andq	%rcx,%r12
-	movq	%r9,%rbx
-	movq	%r12,%rdx
-	shrq	$7,%r9
-	leaq	(%rax,%rax,1),%r8
-	shrq	$7,%r12
-	leaq	(%rcx,%rcx,1),%r11
-	subq	%r9,%rbx
-	subq	%r12,%rdx
-	andq	%rdi,%r8
-	andq	%rdi,%r11
-	andq	%rbp,%rbx
-	andq	%rbp,%rdx
-	xorq	%rbx,%r8
-	xorq	%rdx,%r11
-	movq	%rsi,%r10
-	movq	%rsi,%r13
-
-	andq	%r8,%r10
-	andq	%r11,%r13
-	movq	%r10,%rbx
-	movq	%r13,%rdx
-	shrq	$7,%r10
-	leaq	(%r8,%r8,1),%r9
-	shrq	$7,%r13
-	leaq	(%r11,%r11,1),%r12
-	subq	%r10,%rbx
-	subq	%r13,%rdx
-	andq	%rdi,%r9
-	andq	%rdi,%r12
-	andq	%rbp,%rbx
-	andq	%rbp,%rdx
-	xorq	%rbx,%r9
-	xorq	%rdx,%r12
-	movq	%rsi,%r10
-	movq	%rsi,%r13
-
-	andq	%r9,%r10
-	andq	%r12,%r13
-	movq	%r10,%rbx
-	movq	%r13,%rdx
-	shrq	$7,%r10
-	xorq	%rax,%r8
-	shrq	$7,%r13
-	xorq	%rcx,%r11
-	subq	%r10,%rbx
-	subq	%r13,%rdx
-	leaq	(%r9,%r9,1),%r10
-	leaq	(%r12,%r12,1),%r13
-	xorq	%rax,%r9
-	xorq	%rcx,%r12
-	andq	%rdi,%r10
-	andq	%rdi,%r13
-	andq	%rbp,%rbx
-	andq	%rbp,%rdx
-	xorq	%rbx,%r10
-	xorq	%rdx,%r13
-
-	xorq	%r10,%rax
-	xorq	%r13,%rcx
-	xorq	%r10,%r8
-	xorq	%r13,%r11
-	movq	%rax,%rbx
-	movq	%rcx,%rdx
-	xorq	%r10,%r9
-	shrq	$32,%rbx
-	xorq	%r13,%r12
-	shrq	$32,%rdx
-	xorq	%r8,%r10
-	roll	$8,%eax
-	xorq	%r11,%r13
-	roll	$8,%ecx
-	xorq	%r9,%r10
-	roll	$8,%ebx
-	xorq	%r12,%r13
-
-	roll	$8,%edx
-	xorl	%r10d,%eax
-	shrq	$32,%r10
-	xorl	%r13d,%ecx
-	shrq	$32,%r13
-	xorl	%r10d,%ebx
-	xorl	%r13d,%edx
-
-	movq	%r8,%r10
-	roll	$24,%r8d
-	movq	%r11,%r13
-	roll	$24,%r11d
-	shrq	$32,%r10
-	xorl	%r8d,%eax
-	shrq	$32,%r13
-	xorl	%r11d,%ecx
-	roll	$24,%r10d
-	movq	%r9,%r8
-	roll	$24,%r13d
-	movq	%r12,%r11
-	shrq	$32,%r8
-	xorl	%r10d,%ebx
-	shrq	$32,%r11
-	xorl	%r13d,%edx
-
-	movq	0(%r14),%rsi
-	roll	$16,%r9d
-	movq	64(%r14),%rdi
-	roll	$16,%r12d
-	movq	128(%r14),%rbp
-	roll	$16,%r8d
-	movq	192(%r14),%r10
-	xorl	%r9d,%eax
-	roll	$16,%r11d
-	xorl	%r12d,%ecx
-	movq	256(%r14),%r13
-	xorl	%r8d,%ebx
-	xorl	%r11d,%edx
-	jmp	.Ldec_loop_compact
-.align	16
-.Ldec_compact_done:
-	xorl	0(%r15),%eax
-	xorl	4(%r15),%ebx
-	xorl	8(%r15),%ecx
-	xorl	12(%r15),%edx
-.byte	0xf3,0xc3
-.cfi_endproc	
-.size	_x86_64_AES_decrypt_compact,.-_x86_64_AES_decrypt_compact
-.globl	AES_decrypt
-.type	AES_decrypt,@function
-.align	16
-.globl	asm_AES_decrypt
-.hidden	asm_AES_decrypt
-asm_AES_decrypt:
-AES_decrypt:
-.cfi_startproc	
-	movq	%rsp,%rax
-.cfi_def_cfa_register	%rax
-	pushq	%rbx
-.cfi_offset	%rbx,-16
-	pushq	%rbp
-.cfi_offset	%rbp,-24
-	pushq	%r12
-.cfi_offset	%r12,-32
-	pushq	%r13
-.cfi_offset	%r13,-40
-	pushq	%r14
-.cfi_offset	%r14,-48
-	pushq	%r15
-.cfi_offset	%r15,-56
-
-
-	leaq	-63(%rdx),%rcx
-	andq	$-64,%rsp
-	subq	%rsp,%rcx
-	negq	%rcx
-	andq	$0x3c0,%rcx
-	subq	%rcx,%rsp
-	subq	$32,%rsp
-
-	movq	%rsi,16(%rsp)
-	movq	%rax,24(%rsp)
-.cfi_escape	0x0f,0x05,0x77,0x18,0x06,0x23,0x08
-.Ldec_prologue:
-
-	movq	%rdx,%r15
-	movl	240(%r15),%r13d
-
-	movl	0(%rdi),%eax
-	movl	4(%rdi),%ebx
-	movl	8(%rdi),%ecx
-	movl	12(%rdi),%edx
-
-	shll	$4,%r13d
-	leaq	(%r15,%r13,1),%rbp
-	movq	%r15,(%rsp)
-	movq	%rbp,8(%rsp)
-
-
-	leaq	.LAES_Td+2048(%rip),%r14
-	leaq	768(%rsp),%rbp
-	subq	%r14,%rbp
-	andq	$0x300,%rbp
-	leaq	(%r14,%rbp,1),%r14
-	shrq	$3,%rbp
-	addq	%rbp,%r14
-
-	call	_x86_64_AES_decrypt_compact
-
-	movq	16(%rsp),%r9
-	movq	24(%rsp),%rsi
-.cfi_def_cfa	%rsi,8
-	movl	%eax,0(%r9)
-	movl	%ebx,4(%r9)
-	movl	%ecx,8(%r9)
-	movl	%edx,12(%r9)
-
-	movq	-48(%rsi),%r15
-.cfi_restore	%r15
-	movq	-40(%rsi),%r14
-.cfi_restore	%r14
-	movq	-32(%rsi),%r13
-.cfi_restore	%r13
-	movq	-24(%rsi),%r12
-.cfi_restore	%r12
-	movq	-16(%rsi),%rbp
-.cfi_restore	%rbp
-	movq	-8(%rsi),%rbx
-.cfi_restore	%rbx
-	leaq	(%rsi),%rsp
-.cfi_def_cfa_register	%rsp
-.Ldec_epilogue:
-	.byte	0xf3,0xc3
-.cfi_endproc	
-.size	AES_decrypt,.-AES_decrypt
-.globl	AES_set_encrypt_key
-.type	AES_set_encrypt_key,@function
-.align	16
-AES_set_encrypt_key:
-.cfi_startproc	
-	pushq	%rbx
-.cfi_adjust_cfa_offset	8
-.cfi_offset	%rbx,-16
-	pushq	%rbp
-.cfi_adjust_cfa_offset	8
-.cfi_offset	%rbp,-24
-	pushq	%r12
-.cfi_adjust_cfa_offset	8
-.cfi_offset	%r12,-32
-	pushq	%r13
-.cfi_adjust_cfa_offset	8
-.cfi_offset	%r13,-40
-	pushq	%r14
-.cfi_adjust_cfa_offset	8
-.cfi_offset	%r14,-48
-	pushq	%r15
-.cfi_adjust_cfa_offset	8
-.cfi_offset	%r15,-56
-	subq	$8,%rsp
-.cfi_adjust_cfa_offset	8
-.Lenc_key_prologue:
-
-	call	_x86_64_AES_set_encrypt_key
-
-	movq	40(%rsp),%rbp
-.cfi_restore	%rbp
-	movq	48(%rsp),%rbx
-.cfi_restore	%rbx
-	addq	$56,%rsp
-.cfi_adjust_cfa_offset	-56
-.Lenc_key_epilogue:
-	.byte	0xf3,0xc3
-.cfi_endproc	
-.size	AES_set_encrypt_key,.-AES_set_encrypt_key
-
-.type	_x86_64_AES_set_encrypt_key,@function
-.align	16
-_x86_64_AES_set_encrypt_key:
-.cfi_startproc	
-	movl	%esi,%ecx
-	movq	%rdi,%rsi
-	movq	%rdx,%rdi
-
-	testq	$-1,%rsi
-	jz	.Lbadpointer
-	testq	$-1,%rdi
-	jz	.Lbadpointer
-
-	leaq	.LAES_Te(%rip),%rbp
-	leaq	2048+128(%rbp),%rbp
-
-
-	movl	0-128(%rbp),%eax
-	movl	32-128(%rbp),%ebx
-	movl	64-128(%rbp),%r8d
-	movl	96-128(%rbp),%edx
-	movl	128-128(%rbp),%eax
-	movl	160-128(%rbp),%ebx
-	movl	192-128(%rbp),%r8d
-	movl	224-128(%rbp),%edx
-
-	cmpl	$128,%ecx
-	je	.L10rounds
-	cmpl	$192,%ecx
-	je	.L12rounds
-	cmpl	$256,%ecx
-	je	.L14rounds
-	movq	$-2,%rax
-	jmp	.Lexit
-
-.L10rounds:
-	movq	0(%rsi),%rax
-	movq	8(%rsi),%rdx
-	movq	%rax,0(%rdi)
-	movq	%rdx,8(%rdi)
-
-	shrq	$32,%rdx
-	xorl	%ecx,%ecx
-	jmp	.L10shortcut
-.align	4
-.L10loop:
-	movl	0(%rdi),%eax
-	movl	12(%rdi),%edx
-.L10shortcut:
-	movzbl	%dl,%esi
-	movzbl	-128(%rbp,%rsi,1),%ebx
-	movzbl	%dh,%esi
-	shll	$24,%ebx
-	xorl	%ebx,%eax
-
-	movzbl	-128(%rbp,%rsi,1),%ebx
-	shrl	$16,%edx
-	movzbl	%dl,%esi
-	xorl	%ebx,%eax
-
-	movzbl	-128(%rbp,%rsi,1),%ebx
-	movzbl	%dh,%esi
-	shll	$8,%ebx
-	xorl	%ebx,%eax
-
-	movzbl	-128(%rbp,%rsi,1),%ebx
-	shll	$16,%ebx
-	xorl	%ebx,%eax
-
-	xorl	1024-128(%rbp,%rcx,4),%eax
-	movl	%eax,16(%rdi)
-	xorl	4(%rdi),%eax
-	movl	%eax,20(%rdi)
-	xorl	8(%rdi),%eax
-	movl	%eax,24(%rdi)
-	xorl	12(%rdi),%eax
-	movl	%eax,28(%rdi)
-	addl	$1,%ecx
-	leaq	16(%rdi),%rdi
-	cmpl	$10,%ecx
-	jl	.L10loop
-
-	movl	$10,80(%rdi)
-	xorq	%rax,%rax
-	jmp	.Lexit
-
-.L12rounds:
-	movq	0(%rsi),%rax
-	movq	8(%rsi),%rbx
-	movq	16(%rsi),%rdx
-	movq	%rax,0(%rdi)
-	movq	%rbx,8(%rdi)
-	movq	%rdx,16(%rdi)
-
-	shrq	$32,%rdx
-	xorl	%ecx,%ecx
-	jmp	.L12shortcut
-.align	4
-.L12loop:
-	movl	0(%rdi),%eax
-	movl	20(%rdi),%edx
-.L12shortcut:
-	movzbl	%dl,%esi
-	movzbl	-128(%rbp,%rsi,1),%ebx
-	movzbl	%dh,%esi
-	shll	$24,%ebx
-	xorl	%ebx,%eax
-
-	movzbl	-128(%rbp,%rsi,1),%ebx
-	shrl	$16,%edx
-	movzbl	%dl,%esi
-	xorl	%ebx,%eax
-
-	movzbl	-128(%rbp,%rsi,1),%ebx
-	movzbl	%dh,%esi
-	shll	$8,%ebx
-	xorl	%ebx,%eax
-
-	movzbl	-128(%rbp,%rsi,1),%ebx
-	shll	$16,%ebx
-	xorl	%ebx,%eax
-
-	xorl	1024-128(%rbp,%rcx,4),%eax
-	movl	%eax,24(%rdi)
-	xorl	4(%rdi),%eax
-	movl	%eax,28(%rdi)
-	xorl	8(%rdi),%eax
-	movl	%eax,32(%rdi)
-	xorl	12(%rdi),%eax
-	movl	%eax,36(%rdi)
-
-	cmpl	$7,%ecx
-	je	.L12break
-	addl	$1,%ecx
-
-	xorl	16(%rdi),%eax
-	movl	%eax,40(%rdi)
-	xorl	20(%rdi),%eax
-	movl	%eax,44(%rdi)
-
-	leaq	24(%rdi),%rdi
-	jmp	.L12loop
-.L12break:
-	movl	$12,72(%rdi)
-	xorq	%rax,%rax
-	jmp	.Lexit
-
-.L14rounds:
-	movq	0(%rsi),%rax
-	movq	8(%rsi),%rbx
-	movq	16(%rsi),%rcx
-	movq	24(%rsi),%rdx
-	movq	%rax,0(%rdi)
-	movq	%rbx,8(%rdi)
-	movq	%rcx,16(%rdi)
-	movq	%rdx,24(%rdi)
-
-	shrq	$32,%rdx
-	xorl	%ecx,%ecx
-	jmp	.L14shortcut
-.align	4
-.L14loop:
-	movl	0(%rdi),%eax
-	movl	28(%rdi),%edx
-.L14shortcut:
-	movzbl	%dl,%esi
-	movzbl	-128(%rbp,%rsi,1),%ebx
-	movzbl	%dh,%esi
-	shll	$24,%ebx
-	xorl	%ebx,%eax
-
-	movzbl	-128(%rbp,%rsi,1),%ebx
-	shrl	$16,%edx
-	movzbl	%dl,%esi
-	xorl	%ebx,%eax
-
-	movzbl	-128(%rbp,%rsi,1),%ebx
-	movzbl	%dh,%esi
-	shll	$8,%ebx
-	xorl	%ebx,%eax
-
-	movzbl	-128(%rbp,%rsi,1),%ebx
-	shll	$16,%ebx
-	xorl	%ebx,%eax
-
-	xorl	1024-128(%rbp,%rcx,4),%eax
-	movl	%eax,32(%rdi)
-	xorl	4(%rdi),%eax
-	movl	%eax,36(%rdi)
-	xorl	8(%rdi),%eax
-	movl	%eax,40(%rdi)
-	xorl	12(%rdi),%eax
-	movl	%eax,44(%rdi)
-
-	cmpl	$6,%ecx
-	je	.L14break
-	addl	$1,%ecx
-
-	movl	%eax,%edx
-	movl	16(%rdi),%eax
-	movzbl	%dl,%esi
-	movzbl	-128(%rbp,%rsi,1),%ebx
-	movzbl	%dh,%esi
-	xorl	%ebx,%eax
-
-	movzbl	-128(%rbp,%rsi,1),%ebx
-	shrl	$16,%edx
-	shll	$8,%ebx
-	movzbl	%dl,%esi
-	xorl	%ebx,%eax
-
-	movzbl	-128(%rbp,%rsi,1),%ebx
-	movzbl	%dh,%esi
-	shll	$16,%ebx
-	xorl	%ebx,%eax
-
-	movzbl	-128(%rbp,%rsi,1),%ebx
-	shll	$24,%ebx
-	xorl	%ebx,%eax
-
-	movl	%eax,48(%rdi)
-	xorl	20(%rdi),%eax
-	movl	%eax,52(%rdi)
-	xorl	24(%rdi),%eax
-	movl	%eax,56(%rdi)
-	xorl	28(%rdi),%eax
-	movl	%eax,60(%rdi)
-
-	leaq	32(%rdi),%rdi
-	jmp	.L14loop
-.L14break:
-	movl	$14,48(%rdi)
-	xorq	%rax,%rax
-	jmp	.Lexit
-
-.Lbadpointer:
-	movq	$-1,%rax
-.Lexit:
-.byte	0xf3,0xc3
-.cfi_endproc	
-.size	_x86_64_AES_set_encrypt_key,.-_x86_64_AES_set_encrypt_key
-.globl	AES_set_decrypt_key
-.type	AES_set_decrypt_key,@function
-.align	16
-AES_set_decrypt_key:
-.cfi_startproc	
-	pushq	%rbx
-.cfi_adjust_cfa_offset	8
-.cfi_offset	%rbx,-16
-	pushq	%rbp
-.cfi_adjust_cfa_offset	8
-.cfi_offset	%rbp,-24
-	pushq	%r12
-.cfi_adjust_cfa_offset	8
-.cfi_offset	%r12,-32
-	pushq	%r13
-.cfi_adjust_cfa_offset	8
-.cfi_offset	%r13,-40
-	pushq	%r14
-.cfi_adjust_cfa_offset	8
-.cfi_offset	%r14,-48
-	pushq	%r15
-.cfi_adjust_cfa_offset	8
-.cfi_offset	%r15,-56
-	pushq	%rdx
-.cfi_adjust_cfa_offset	8
-.Ldec_key_prologue:
-
-	call	_x86_64_AES_set_encrypt_key
-	movq	(%rsp),%r8
-	cmpl	$0,%eax
-	jne	.Labort
-
-	movl	240(%r8),%r14d
-	xorq	%rdi,%rdi
-	leaq	(%rdi,%r14,4),%rcx
-	movq	%r8,%rsi
-	leaq	(%r8,%rcx,4),%rdi
-.align	4
-.Linvert:
-	movq	0(%rsi),%rax
-	movq	8(%rsi),%rbx
-	movq	0(%rdi),%rcx
-	movq	8(%rdi),%rdx
-	movq	%rax,0(%rdi)
-	movq	%rbx,8(%rdi)
-	movq	%rcx,0(%rsi)
-	movq	%rdx,8(%rsi)
-	leaq	16(%rsi),%rsi
-	leaq	-16(%rdi),%rdi
-	cmpq	%rsi,%rdi
-	jne	.Linvert
-
-	leaq	.LAES_Te+2048+1024(%rip),%rax
-
-	movq	40(%rax),%rsi
-	movq	48(%rax),%rdi
-	movq	56(%rax),%rbp
-
-	movq	%r8,%r15
-	subl	$1,%r14d
-.align	4
-.Lpermute:
-	leaq	16(%r15),%r15
-	movq	0(%r15),%rax
-	movq	8(%r15),%rcx
-	movq	%rsi,%r9
-	movq	%rsi,%r12
-	andq	%rax,%r9
-	andq	%rcx,%r12
-	movq	%r9,%rbx
-	movq	%r12,%rdx
-	shrq	$7,%r9
-	leaq	(%rax,%rax,1),%r8
-	shrq	$7,%r12
-	leaq	(%rcx,%rcx,1),%r11
-	subq	%r9,%rbx
-	subq	%r12,%rdx
-	andq	%rdi,%r8
-	andq	%rdi,%r11
-	andq	%rbp,%rbx
-	andq	%rbp,%rdx
-	xorq	%rbx,%r8
-	xorq	%rdx,%r11
-	movq	%rsi,%r10
-	movq	%rsi,%r13
-
-	andq	%r8,%r10
-	andq	%r11,%r13
-	movq	%r10,%rbx
-	movq	%r13,%rdx
-	shrq	$7,%r10
-	leaq	(%r8,%r8,1),%r9
-	shrq	$7,%r13
-	leaq	(%r11,%r11,1),%r12
-	subq	%r10,%rbx
-	subq	%r13,%rdx
-	andq	%rdi,%r9
-	andq	%rdi,%r12
-	andq	%rbp,%rbx
-	andq	%rbp,%rdx
-	xorq	%rbx,%r9
-	xorq	%rdx,%r12
-	movq	%rsi,%r10
-	movq	%rsi,%r13
-
-	andq	%r9,%r10
-	andq	%r12,%r13
-	movq	%r10,%rbx
-	movq	%r13,%rdx
-	shrq	$7,%r10
-	xorq	%rax,%r8
-	shrq	$7,%r13
-	xorq	%rcx,%r11
-	subq	%r10,%rbx
-	subq	%r13,%rdx
-	leaq	(%r9,%r9,1),%r10
-	leaq	(%r12,%r12,1),%r13
-	xorq	%rax,%r9
-	xorq	%rcx,%r12
-	andq	%rdi,%r10
-	andq	%rdi,%r13
-	andq	%rbp,%rbx
-	andq	%rbp,%rdx
-	xorq	%rbx,%r10
-	xorq	%rdx,%r13
-
-	xorq	%r10,%rax
-	xorq	%r13,%rcx
-	xorq	%r10,%r8
-	xorq	%r13,%r11
-	movq	%rax,%rbx
-	movq	%rcx,%rdx
-	xorq	%r10,%r9
-	shrq	$32,%rbx
-	xorq	%r13,%r12
-	shrq	$32,%rdx
-	xorq	%r8,%r10
-	roll	$8,%eax
-	xorq	%r11,%r13
-	roll	$8,%ecx
-	xorq	%r9,%r10
-	roll	$8,%ebx
-	xorq	%r12,%r13
-
-	roll	$8,%edx
-	xorl	%r10d,%eax
-	shrq	$32,%r10
-	xorl	%r13d,%ecx
-	shrq	$32,%r13
-	xorl	%r10d,%ebx
-	xorl	%r13d,%edx
-
-	movq	%r8,%r10
-	roll	$24,%r8d
-	movq	%r11,%r13
-	roll	$24,%r11d
-	shrq	$32,%r10
-	xorl	%r8d,%eax
-	shrq	$32,%r13
-	xorl	%r11d,%ecx
-	roll	$24,%r10d
-	movq	%r9,%r8
-	roll	$24,%r13d
-	movq	%r12,%r11
-	shrq	$32,%r8
-	xorl	%r10d,%ebx
-	shrq	$32,%r11
-	xorl	%r13d,%edx
-
-
-	roll	$16,%r9d
-
-	roll	$16,%r12d
-
-	roll	$16,%r8d
-
-	xorl	%r9d,%eax
-	roll	$16,%r11d
-	xorl	%r12d,%ecx
-
-	xorl	%r8d,%ebx
-	xorl	%r11d,%edx
-	movl	%eax,0(%r15)
-	movl	%ebx,4(%r15)
-	movl	%ecx,8(%r15)
-	movl	%edx,12(%r15)
-	subl	$1,%r14d
-	jnz	.Lpermute
-
-	xorq	%rax,%rax
-.Labort:
-	movq	8(%rsp),%r15
-.cfi_restore	%r15
-	movq	16(%rsp),%r14
-.cfi_restore	%r14
-	movq	24(%rsp),%r13
-.cfi_restore	%r13
-	movq	32(%rsp),%r12
-.cfi_restore	%r12
-	movq	40(%rsp),%rbp
-.cfi_restore	%rbp
-	movq	48(%rsp),%rbx
-.cfi_restore	%rbx
-	addq	$56,%rsp
-.cfi_adjust_cfa_offset	-56
-.Ldec_key_epilogue:
-	.byte	0xf3,0xc3
-.cfi_endproc	
-.size	AES_set_decrypt_key,.-AES_set_decrypt_key
-.globl	AES_cbc_encrypt
-.type	AES_cbc_encrypt,@function
-.align	16
-
-.globl	asm_AES_cbc_encrypt
-.hidden	asm_AES_cbc_encrypt
-asm_AES_cbc_encrypt:
-AES_cbc_encrypt:
-.cfi_startproc	
-	cmpq	$0,%rdx
-	je	.Lcbc_epilogue
-	pushfq
-
-
-.cfi_adjust_cfa_offset	8
-	pushq	%rbx
-.cfi_adjust_cfa_offset	8
-.cfi_offset	%rbx,-24
-	pushq	%rbp
-.cfi_adjust_cfa_offset	8
-.cfi_offset	%rbp,-32
-	pushq	%r12
-.cfi_adjust_cfa_offset	8
-.cfi_offset	%r12,-40
-	pushq	%r13
-.cfi_adjust_cfa_offset	8
-.cfi_offset	%r13,-48
-	pushq	%r14
-.cfi_adjust_cfa_offset	8
-.cfi_offset	%r14,-56
-	pushq	%r15
-.cfi_adjust_cfa_offset	8
-.cfi_offset	%r15,-64
-.Lcbc_prologue:
-
-	cld
-	movl	%r9d,%r9d
-
-	leaq	.LAES_Te(%rip),%r14
-	leaq	.LAES_Td(%rip),%r10
-	cmpq	$0,%r9
-	cmoveq	%r10,%r14
-
-.cfi_remember_state	
-	movl	OPENSSL_ia32cap_P(%rip),%r10d
-	cmpq	$512,%rdx
-	jb	.Lcbc_slow_prologue
-	testq	$15,%rdx
-	jnz	.Lcbc_slow_prologue
-	btl	$28,%r10d
-	jc	.Lcbc_slow_prologue
-
-
-	leaq	-88-248(%rsp),%r15
-	andq	$-64,%r15
-
-
-	movq	%r14,%r10
-	leaq	2304(%r14),%r11
-	movq	%r15,%r12
-	andq	$0xFFF,%r10
-	andq	$0xFFF,%r11
-	andq	$0xFFF,%r12
-
-	cmpq	%r11,%r12
-	jb	.Lcbc_te_break_out
-	subq	%r11,%r12
-	subq	%r12,%r15
-	jmp	.Lcbc_te_ok
-.Lcbc_te_break_out:
-	subq	%r10,%r12
-	andq	$0xFFF,%r12
-	addq	$320,%r12
-	subq	%r12,%r15
-.align	4
-.Lcbc_te_ok:
-
-	xchgq	%rsp,%r15
-.cfi_def_cfa_register	%r15
-
-	movq	%r15,16(%rsp)
-.cfi_escape	0x0f,0x05,0x77,0x10,0x06,0x23,0x40
-.Lcbc_fast_body:
-	movq	%rdi,24(%rsp)
-	movq	%rsi,32(%rsp)
-	movq	%rdx,40(%rsp)
-	movq	%rcx,48(%rsp)
-	movq	%r8,56(%rsp)
-	movl	$0,80+240(%rsp)
-	movq	%r8,%rbp
-	movq	%r9,%rbx
-	movq	%rsi,%r9
-	movq	%rdi,%r8
-	movq	%rcx,%r15
-
-	movl	240(%r15),%eax
-
-	movq	%r15,%r10
-	subq	%r14,%r10
-	andq	$0xfff,%r10
-	cmpq	$2304,%r10
-	jb	.Lcbc_do_ecopy
-	cmpq	$4096-248,%r10
-	jb	.Lcbc_skip_ecopy
-.align	4
-.Lcbc_do_ecopy:
-	movq	%r15,%rsi
-	leaq	80(%rsp),%rdi
-	leaq	80(%rsp),%r15
-	movl	$30,%ecx
-.long	0x90A548F3
-	movl	%eax,(%rdi)
-.Lcbc_skip_ecopy:
-	movq	%r15,0(%rsp)
-
-	movl	$18,%ecx
-.align	4
-.Lcbc_prefetch_te:
-	movq	0(%r14),%r10
-	movq	32(%r14),%r11
-	movq	64(%r14),%r12
-	movq	96(%r14),%r13
-	leaq	128(%r14),%r14
-	subl	$1,%ecx
-	jnz	.Lcbc_prefetch_te
-	leaq	-2304(%r14),%r14
-
-	cmpq	$0,%rbx
-	je	.LFAST_DECRYPT
-
-
-	movl	0(%rbp),%eax
-	movl	4(%rbp),%ebx
-	movl	8(%rbp),%ecx
-	movl	12(%rbp),%edx
-
-.align	4
-.Lcbc_fast_enc_loop:
-	xorl	0(%r8),%eax
-	xorl	4(%r8),%ebx
-	xorl	8(%r8),%ecx
-	xorl	12(%r8),%edx
-	movq	0(%rsp),%r15
-	movq	%r8,24(%rsp)
-
-	call	_x86_64_AES_encrypt
-
-	movq	24(%rsp),%r8
-	movq	40(%rsp),%r10
-	movl	%eax,0(%r9)
-	movl	%ebx,4(%r9)
-	movl	%ecx,8(%r9)
-	movl	%edx,12(%r9)
-
-	leaq	16(%r8),%r8
-	leaq	16(%r9),%r9
-	subq	$16,%r10
-	testq	$-16,%r10
-	movq	%r10,40(%rsp)
-	jnz	.Lcbc_fast_enc_loop
-	movq	56(%rsp),%rbp
-	movl	%eax,0(%rbp)
-	movl	%ebx,4(%rbp)
-	movl	%ecx,8(%rbp)
-	movl	%edx,12(%rbp)
-
-	jmp	.Lcbc_fast_cleanup
-
-
-.align	16
-.LFAST_DECRYPT:
-	cmpq	%r8,%r9
-	je	.Lcbc_fast_dec_in_place
-
-	movq	%rbp,64(%rsp)
-.align	4
-.Lcbc_fast_dec_loop:
-	movl	0(%r8),%eax
-	movl	4(%r8),%ebx
-	movl	8(%r8),%ecx
-	movl	12(%r8),%edx
-	movq	0(%rsp),%r15
-	movq	%r8,24(%rsp)
-
-	call	_x86_64_AES_decrypt
-
-	movq	64(%rsp),%rbp
-	movq	24(%rsp),%r8
-	movq	40(%rsp),%r10
-	xorl	0(%rbp),%eax
-	xorl	4(%rbp),%ebx
-	xorl	8(%rbp),%ecx
-	xorl	12(%rbp),%edx
-	movq	%r8,%rbp
-
-	subq	$16,%r10
-	movq	%r10,40(%rsp)
-	movq	%rbp,64(%rsp)
-
-	movl	%eax,0(%r9)
-	movl	%ebx,4(%r9)
-	movl	%ecx,8(%r9)
-	movl	%edx,12(%r9)
-
-	leaq	16(%r8),%r8
-	leaq	16(%r9),%r9
-	jnz	.Lcbc_fast_dec_loop
-	movq	56(%rsp),%r12
-	movq	0(%rbp),%r10
-	movq	8(%rbp),%r11
-	movq	%r10,0(%r12)
-	movq	%r11,8(%r12)
-	jmp	.Lcbc_fast_cleanup
-
-.align	16
-.Lcbc_fast_dec_in_place:
-	movq	0(%rbp),%r10
-	movq	8(%rbp),%r11
-	movq	%r10,0+64(%rsp)
-	movq	%r11,8+64(%rsp)
-.align	4
-.Lcbc_fast_dec_in_place_loop:
-	movl	0(%r8),%eax
-	movl	4(%r8),%ebx
-	movl	8(%r8),%ecx
-	movl	12(%r8),%edx
-	movq	0(%rsp),%r15
-	movq	%r8,24(%rsp)
-
-	call	_x86_64_AES_decrypt
-
-	movq	24(%rsp),%r8
-	movq	40(%rsp),%r10
-	xorl	0+64(%rsp),%eax
-	xorl	4+64(%rsp),%ebx
-	xorl	8+64(%rsp),%ecx
-	xorl	12+64(%rsp),%edx
-
-	movq	0(%r8),%r11
-	movq	8(%r8),%r12
-	subq	$16,%r10
-	jz	.Lcbc_fast_dec_in_place_done
-
-	movq	%r11,0+64(%rsp)
-	movq	%r12,8+64(%rsp)
-
-	movl	%eax,0(%r9)
-	movl	%ebx,4(%r9)
-	movl	%ecx,8(%r9)
-	movl	%edx,12(%r9)
-
-	leaq	16(%r8),%r8
-	leaq	16(%r9),%r9
-	movq	%r10,40(%rsp)
-	jmp	.Lcbc_fast_dec_in_place_loop
-.Lcbc_fast_dec_in_place_done:
-	movq	56(%rsp),%rdi
-	movq	%r11,0(%rdi)
-	movq	%r12,8(%rdi)
-
-	movl	%eax,0(%r9)
-	movl	%ebx,4(%r9)
-	movl	%ecx,8(%r9)
-	movl	%edx,12(%r9)
-
-.align	4
-.Lcbc_fast_cleanup:
-	cmpl	$0,80+240(%rsp)
-	leaq	80(%rsp),%rdi
-	je	.Lcbc_exit
-	movl	$30,%ecx
-	xorq	%rax,%rax
-.long	0x90AB48F3
-
-	jmp	.Lcbc_exit
-
-
-.align	16
-.Lcbc_slow_prologue:
-.cfi_restore_state	
-
-	leaq	-88(%rsp),%rbp
-	andq	$-64,%rbp
-
-	leaq	-88-63(%rcx),%r10
-	subq	%rbp,%r10
-	negq	%r10
-	andq	$0x3c0,%r10
-	subq	%r10,%rbp
-
-	xchgq	%rsp,%rbp
-.cfi_def_cfa_register	%rbp
-
-	movq	%rbp,16(%rsp)
-.cfi_escape	0x0f,0x05,0x77,0x10,0x06,0x23,0x40
-.Lcbc_slow_body:
-
-
-
-
-	movq	%r8,56(%rsp)
-	movq	%r8,%rbp
-	movq	%r9,%rbx
-	movq	%rsi,%r9
-	movq	%rdi,%r8
-	movq	%rcx,%r15
-	movq	%rdx,%r10
-
-	movl	240(%r15),%eax
-	movq	%r15,0(%rsp)
-	shll	$4,%eax
-	leaq	(%r15,%rax,1),%rax
-	movq	%rax,8(%rsp)
-
-
-	leaq	2048(%r14),%r14
-	leaq	768-8(%rsp),%rax
-	subq	%r14,%rax
-	andq	$0x300,%rax
-	leaq	(%r14,%rax,1),%r14
-
-	cmpq	$0,%rbx
-	je	.LSLOW_DECRYPT
-
-
-	testq	$-16,%r10
-	movl	0(%rbp),%eax
-	movl	4(%rbp),%ebx
-	movl	8(%rbp),%ecx
-	movl	12(%rbp),%edx
-	jz	.Lcbc_slow_enc_tail
-
-.align	4
-.Lcbc_slow_enc_loop:
-	xorl	0(%r8),%eax
-	xorl	4(%r8),%ebx
-	xorl	8(%r8),%ecx
-	xorl	12(%r8),%edx
-	movq	0(%rsp),%r15
-	movq	%r8,24(%rsp)
-	movq	%r9,32(%rsp)
-	movq	%r10,40(%rsp)
-
-	call	_x86_64_AES_encrypt_compact
-
-	movq	24(%rsp),%r8
-	movq	32(%rsp),%r9
-	movq	40(%rsp),%r10
-	movl	%eax,0(%r9)
-	movl	%ebx,4(%r9)
-	movl	%ecx,8(%r9)
-	movl	%edx,12(%r9)
-
-	leaq	16(%r8),%r8
-	leaq	16(%r9),%r9
-	subq	$16,%r10
-	testq	$-16,%r10
-	jnz	.Lcbc_slow_enc_loop
-	testq	$15,%r10
-	jnz	.Lcbc_slow_enc_tail
-	movq	56(%rsp),%rbp
-	movl	%eax,0(%rbp)
-	movl	%ebx,4(%rbp)
-	movl	%ecx,8(%rbp)
-	movl	%edx,12(%rbp)
-
-	jmp	.Lcbc_exit
-
-.align	4
-.Lcbc_slow_enc_tail:
-	movq	%rax,%r11
-	movq	%rcx,%r12
-	movq	%r10,%rcx
-	movq	%r8,%rsi
-	movq	%r9,%rdi
-.long	0x9066A4F3
-	movq	$16,%rcx
-	subq	%r10,%rcx
-	xorq	%rax,%rax
-.long	0x9066AAF3
-	movq	%r9,%r8
-	movq	$16,%r10
-	movq	%r11,%rax
-	movq	%r12,%rcx
-	jmp	.Lcbc_slow_enc_loop
-
-.align	16
-.LSLOW_DECRYPT:
-	shrq	$3,%rax
-	addq	%rax,%r14
-
-	movq	0(%rbp),%r11
-	movq	8(%rbp),%r12
-	movq	%r11,0+64(%rsp)
-	movq	%r12,8+64(%rsp)
-
-.align	4
-.Lcbc_slow_dec_loop:
-	movl	0(%r8),%eax
-	movl	4(%r8),%ebx
-	movl	8(%r8),%ecx
-	movl	12(%r8),%edx
-	movq	0(%rsp),%r15
-	movq	%r8,24(%rsp)
-	movq	%r9,32(%rsp)
-	movq	%r10,40(%rsp)
-
-	call	_x86_64_AES_decrypt_compact
-
-	movq	24(%rsp),%r8
-	movq	32(%rsp),%r9
-	movq	40(%rsp),%r10
-	xorl	0+64(%rsp),%eax
-	xorl	4+64(%rsp),%ebx
-	xorl	8+64(%rsp),%ecx
-	xorl	12+64(%rsp),%edx
-
-	movq	0(%r8),%r11
-	movq	8(%r8),%r12
-	subq	$16,%r10
-	jc	.Lcbc_slow_dec_partial
-	jz	.Lcbc_slow_dec_done
-
-	movq	%r11,0+64(%rsp)
-	movq	%r12,8+64(%rsp)
-
-	movl	%eax,0(%r9)
-	movl	%ebx,4(%r9)
-	movl	%ecx,8(%r9)
-	movl	%edx,12(%r9)
-
-	leaq	16(%r8),%r8
-	leaq	16(%r9),%r9
-	jmp	.Lcbc_slow_dec_loop
-.Lcbc_slow_dec_done:
-	movq	56(%rsp),%rdi
-	movq	%r11,0(%rdi)
-	movq	%r12,8(%rdi)
-
-	movl	%eax,0(%r9)
-	movl	%ebx,4(%r9)
-	movl	%ecx,8(%r9)
-	movl	%edx,12(%r9)
-
-	jmp	.Lcbc_exit
-
-.align	4
-.Lcbc_slow_dec_partial:
-	movq	56(%rsp),%rdi
-	movq	%r11,0(%rdi)
-	movq	%r12,8(%rdi)
-
-	movl	%eax,0+64(%rsp)
-	movl	%ebx,4+64(%rsp)
-	movl	%ecx,8+64(%rsp)
-	movl	%edx,12+64(%rsp)
-
-	movq	%r9,%rdi
-	leaq	64(%rsp),%rsi
-	leaq	16(%r10),%rcx
-.long	0x9066A4F3
-	jmp	.Lcbc_exit
-
-.align	16
-.Lcbc_exit:
-	movq	16(%rsp),%rsi
-.cfi_def_cfa	%rsi,64
-	movq	(%rsi),%r15
-.cfi_restore	%r15
-	movq	8(%rsi),%r14
-.cfi_restore	%r14
-	movq	16(%rsi),%r13
-.cfi_restore	%r13
-	movq	24(%rsi),%r12
-.cfi_restore	%r12
-	movq	32(%rsi),%rbp
-.cfi_restore	%rbp
-	movq	40(%rsi),%rbx
-.cfi_restore	%rbx
-	leaq	48(%rsi),%rsp
-.cfi_def_cfa	%rsp,16
-.Lcbc_popfq:
-	popfq
-
-
-.cfi_adjust_cfa_offset	-8
-.Lcbc_epilogue:
-	.byte	0xf3,0xc3
-.cfi_endproc	
-.size	AES_cbc_encrypt,.-AES_cbc_encrypt
-.align	64
-.LAES_Te:
-.long	0xa56363c6,0xa56363c6
-.long	0x847c7cf8,0x847c7cf8
-.long	0x997777ee,0x997777ee
-.long	0x8d7b7bf6,0x8d7b7bf6
-.long	0x0df2f2ff,0x0df2f2ff
-.long	0xbd6b6bd6,0xbd6b6bd6
-.long	0xb16f6fde,0xb16f6fde
-.long	0x54c5c591,0x54c5c591
-.long	0x50303060,0x50303060
-.long	0x03010102,0x03010102
-.long	0xa96767ce,0xa96767ce
-.long	0x7d2b2b56,0x7d2b2b56
-.long	0x19fefee7,0x19fefee7
-.long	0x62d7d7b5,0x62d7d7b5
-.long	0xe6abab4d,0xe6abab4d
-.long	0x9a7676ec,0x9a7676ec
-.long	0x45caca8f,0x45caca8f
-.long	0x9d82821f,0x9d82821f
-.long	0x40c9c989,0x40c9c989
-.long	0x877d7dfa,0x877d7dfa
-.long	0x15fafaef,0x15fafaef
-.long	0xeb5959b2,0xeb5959b2
-.long	0xc947478e,0xc947478e
-.long	0x0bf0f0fb,0x0bf0f0fb
-.long	0xecadad41,0xecadad41
-.long	0x67d4d4b3,0x67d4d4b3
-.long	0xfda2a25f,0xfda2a25f
-.long	0xeaafaf45,0xeaafaf45
-.long	0xbf9c9c23,0xbf9c9c23
-.long	0xf7a4a453,0xf7a4a453
-.long	0x967272e4,0x967272e4
-.long	0x5bc0c09b,0x5bc0c09b
-.long	0xc2b7b775,0xc2b7b775
-.long	0x1cfdfde1,0x1cfdfde1
-.long	0xae93933d,0xae93933d
-.long	0x6a26264c,0x6a26264c
-.long	0x5a36366c,0x5a36366c
-.long	0x413f3f7e,0x413f3f7e
-.long	0x02f7f7f5,0x02f7f7f5
-.long	0x4fcccc83,0x4fcccc83
-.long	0x5c343468,0x5c343468
-.long	0xf4a5a551,0xf4a5a551
-.long	0x34e5e5d1,0x34e5e5d1
-.long	0x08f1f1f9,0x08f1f1f9
-.long	0x937171e2,0x937171e2
-.long	0x73d8d8ab,0x73d8d8ab
-.long	0x53313162,0x53313162
-.long	0x3f15152a,0x3f15152a
-.long	0x0c040408,0x0c040408
-.long	0x52c7c795,0x52c7c795
-.long	0x65232346,0x65232346
-.long	0x5ec3c39d,0x5ec3c39d
-.long	0x28181830,0x28181830
-.long	0xa1969637,0xa1969637
-.long	0x0f05050a,0x0f05050a
-.long	0xb59a9a2f,0xb59a9a2f
-.long	0x0907070e,0x0907070e
-.long	0x36121224,0x36121224
-.long	0x9b80801b,0x9b80801b
-.long	0x3de2e2df,0x3de2e2df
-.long	0x26ebebcd,0x26ebebcd
-.long	0x6927274e,0x6927274e
-.long	0xcdb2b27f,0xcdb2b27f
-.long	0x9f7575ea,0x9f7575ea
-.long	0x1b090912,0x1b090912
-.long	0x9e83831d,0x9e83831d
-.long	0x742c2c58,0x742c2c58
-.long	0x2e1a1a34,0x2e1a1a34
-.long	0x2d1b1b36,0x2d1b1b36
-.long	0xb26e6edc,0xb26e6edc
-.long	0xee5a5ab4,0xee5a5ab4
-.long	0xfba0a05b,0xfba0a05b
-.long	0xf65252a4,0xf65252a4
-.long	0x4d3b3b76,0x4d3b3b76
-.long	0x61d6d6b7,0x61d6d6b7
-.long	0xceb3b37d,0xceb3b37d
-.long	0x7b292952,0x7b292952
-.long	0x3ee3e3dd,0x3ee3e3dd
-.long	0x712f2f5e,0x712f2f5e
-.long	0x97848413,0x97848413
-.long	0xf55353a6,0xf55353a6
-.long	0x68d1d1b9,0x68d1d1b9
-.long	0x00000000,0x00000000
-.long	0x2cededc1,0x2cededc1
-.long	0x60202040,0x60202040
-.long	0x1ffcfce3,0x1ffcfce3
-.long	0xc8b1b179,0xc8b1b179
-.long	0xed5b5bb6,0xed5b5bb6
-.long	0xbe6a6ad4,0xbe6a6ad4
-.long	0x46cbcb8d,0x46cbcb8d
-.long	0xd9bebe67,0xd9bebe67
-.long	0x4b393972,0x4b393972
-.long	0xde4a4a94,0xde4a4a94
-.long	0xd44c4c98,0xd44c4c98
-.long	0xe85858b0,0xe85858b0
-.long	0x4acfcf85,0x4acfcf85
-.long	0x6bd0d0bb,0x6bd0d0bb
-.long	0x2aefefc5,0x2aefefc5
-.long	0xe5aaaa4f,0xe5aaaa4f
-.long	0x16fbfbed,0x16fbfbed
-.long	0xc5434386,0xc5434386
-.long	0xd74d4d9a,0xd74d4d9a
-.long	0x55333366,0x55333366
-.long	0x94858511,0x94858511
-.long	0xcf45458a,0xcf45458a
-.long	0x10f9f9e9,0x10f9f9e9
-.long	0x06020204,0x06020204
-.long	0x817f7ffe,0x817f7ffe
-.long	0xf05050a0,0xf05050a0
-.long	0x443c3c78,0x443c3c78
-.long	0xba9f9f25,0xba9f9f25
-.long	0xe3a8a84b,0xe3a8a84b
-.long	0xf35151a2,0xf35151a2
-.long	0xfea3a35d,0xfea3a35d
-.long	0xc0404080,0xc0404080
-.long	0x8a8f8f05,0x8a8f8f05
-.long	0xad92923f,0xad92923f
-.long	0xbc9d9d21,0xbc9d9d21
-.long	0x48383870,0x48383870
-.long	0x04f5f5f1,0x04f5f5f1
-.long	0xdfbcbc63,0xdfbcbc63
-.long	0xc1b6b677,0xc1b6b677
-.long	0x75dadaaf,0x75dadaaf
-.long	0x63212142,0x63212142
-.long	0x30101020,0x30101020
-.long	0x1affffe5,0x1affffe5
-.long	0x0ef3f3fd,0x0ef3f3fd
-.long	0x6dd2d2bf,0x6dd2d2bf
-.long	0x4ccdcd81,0x4ccdcd81
-.long	0x140c0c18,0x140c0c18
-.long	0x35131326,0x35131326
-.long	0x2fececc3,0x2fececc3
-.long	0xe15f5fbe,0xe15f5fbe
-.long	0xa2979735,0xa2979735
-.long	0xcc444488,0xcc444488
-.long	0x3917172e,0x3917172e
-.long	0x57c4c493,0x57c4c493
-.long	0xf2a7a755,0xf2a7a755
-.long	0x827e7efc,0x827e7efc
-.long	0x473d3d7a,0x473d3d7a
-.long	0xac6464c8,0xac6464c8
-.long	0xe75d5dba,0xe75d5dba
-.long	0x2b191932,0x2b191932
-.long	0x957373e6,0x957373e6
-.long	0xa06060c0,0xa06060c0
-.long	0x98818119,0x98818119
-.long	0xd14f4f9e,0xd14f4f9e
-.long	0x7fdcdca3,0x7fdcdca3
-.long	0x66222244,0x66222244
-.long	0x7e2a2a54,0x7e2a2a54
-.long	0xab90903b,0xab90903b
-.long	0x8388880b,0x8388880b
-.long	0xca46468c,0xca46468c
-.long	0x29eeeec7,0x29eeeec7
-.long	0xd3b8b86b,0xd3b8b86b
-.long	0x3c141428,0x3c141428
-.long	0x79dedea7,0x79dedea7
-.long	0xe25e5ebc,0xe25e5ebc
-.long	0x1d0b0b16,0x1d0b0b16
-.long	0x76dbdbad,0x76dbdbad
-.long	0x3be0e0db,0x3be0e0db
-.long	0x56323264,0x56323264
-.long	0x4e3a3a74,0x4e3a3a74
-.long	0x1e0a0a14,0x1e0a0a14
-.long	0xdb494992,0xdb494992
-.long	0x0a06060c,0x0a06060c
-.long	0x6c242448,0x6c242448
-.long	0xe45c5cb8,0xe45c5cb8
-.long	0x5dc2c29f,0x5dc2c29f
-.long	0x6ed3d3bd,0x6ed3d3bd
-.long	0xefacac43,0xefacac43
-.long	0xa66262c4,0xa66262c4
-.long	0xa8919139,0xa8919139
-.long	0xa4959531,0xa4959531
-.long	0x37e4e4d3,0x37e4e4d3
-.long	0x8b7979f2,0x8b7979f2
-.long	0x32e7e7d5,0x32e7e7d5
-.long	0x43c8c88b,0x43c8c88b
-.long	0x5937376e,0x5937376e
-.long	0xb76d6dda,0xb76d6dda
-.long	0x8c8d8d01,0x8c8d8d01
-.long	0x64d5d5b1,0x64d5d5b1
-.long	0xd24e4e9c,0xd24e4e9c
-.long	0xe0a9a949,0xe0a9a949
-.long	0xb46c6cd8,0xb46c6cd8
-.long	0xfa5656ac,0xfa5656ac
-.long	0x07f4f4f3,0x07f4f4f3
-.long	0x25eaeacf,0x25eaeacf
-.long	0xaf6565ca,0xaf6565ca
-.long	0x8e7a7af4,0x8e7a7af4
-.long	0xe9aeae47,0xe9aeae47
-.long	0x18080810,0x18080810
-.long	0xd5baba6f,0xd5baba6f
-.long	0x887878f0,0x887878f0
-.long	0x6f25254a,0x6f25254a
-.long	0x722e2e5c,0x722e2e5c
-.long	0x241c1c38,0x241c1c38
-.long	0xf1a6a657,0xf1a6a657
-.long	0xc7b4b473,0xc7b4b473
-.long	0x51c6c697,0x51c6c697
-.long	0x23e8e8cb,0x23e8e8cb
-.long	0x7cdddda1,0x7cdddda1
-.long	0x9c7474e8,0x9c7474e8
-.long	0x211f1f3e,0x211f1f3e
-.long	0xdd4b4b96,0xdd4b4b96
-.long	0xdcbdbd61,0xdcbdbd61
-.long	0x868b8b0d,0x868b8b0d
-.long	0x858a8a0f,0x858a8a0f
-.long	0x907070e0,0x907070e0
-.long	0x423e3e7c,0x423e3e7c
-.long	0xc4b5b571,0xc4b5b571
-.long	0xaa6666cc,0xaa6666cc
-.long	0xd8484890,0xd8484890
-.long	0x05030306,0x05030306
-.long	0x01f6f6f7,0x01f6f6f7
-.long	0x120e0e1c,0x120e0e1c
-.long	0xa36161c2,0xa36161c2
-.long	0x5f35356a,0x5f35356a
-.long	0xf95757ae,0xf95757ae
-.long	0xd0b9b969,0xd0b9b969
-.long	0x91868617,0x91868617
-.long	0x58c1c199,0x58c1c199
-.long	0x271d1d3a,0x271d1d3a
-.long	0xb99e9e27,0xb99e9e27
-.long	0x38e1e1d9,0x38e1e1d9
-.long	0x13f8f8eb,0x13f8f8eb
-.long	0xb398982b,0xb398982b
-.long	0x33111122,0x33111122
-.long	0xbb6969d2,0xbb6969d2
-.long	0x70d9d9a9,0x70d9d9a9
-.long	0x898e8e07,0x898e8e07
-.long	0xa7949433,0xa7949433
-.long	0xb69b9b2d,0xb69b9b2d
-.long	0x221e1e3c,0x221e1e3c
-.long	0x92878715,0x92878715
-.long	0x20e9e9c9,0x20e9e9c9
-.long	0x49cece87,0x49cece87
-.long	0xff5555aa,0xff5555aa
-.long	0x78282850,0x78282850
-.long	0x7adfdfa5,0x7adfdfa5
-.long	0x8f8c8c03,0x8f8c8c03
-.long	0xf8a1a159,0xf8a1a159
-.long	0x80898909,0x80898909
-.long	0x170d0d1a,0x170d0d1a
-.long	0xdabfbf65,0xdabfbf65
-.long	0x31e6e6d7,0x31e6e6d7
-.long	0xc6424284,0xc6424284
-.long	0xb86868d0,0xb86868d0
-.long	0xc3414182,0xc3414182
-.long	0xb0999929,0xb0999929
-.long	0x772d2d5a,0x772d2d5a
-.long	0x110f0f1e,0x110f0f1e
-.long	0xcbb0b07b,0xcbb0b07b
-.long	0xfc5454a8,0xfc5454a8
-.long	0xd6bbbb6d,0xd6bbbb6d
-.long	0x3a16162c,0x3a16162c
-.byte	0x63,0x7c,0x77,0x7b,0xf2,0x6b,0x6f,0xc5
-.byte	0x30,0x01,0x67,0x2b,0xfe,0xd7,0xab,0x76
-.byte	0xca,0x82,0xc9,0x7d,0xfa,0x59,0x47,0xf0
-.byte	0xad,0xd4,0xa2,0xaf,0x9c,0xa4,0x72,0xc0
-.byte	0xb7,0xfd,0x93,0x26,0x36,0x3f,0xf7,0xcc
-.byte	0x34,0xa5,0xe5,0xf1,0x71,0xd8,0x31,0x15
-.byte	0x04,0xc7,0x23,0xc3,0x18,0x96,0x05,0x9a
-.byte	0x07,0x12,0x80,0xe2,0xeb,0x27,0xb2,0x75
-.byte	0x09,0x83,0x2c,0x1a,0x1b,0x6e,0x5a,0xa0
-.byte	0x52,0x3b,0xd6,0xb3,0x29,0xe3,0x2f,0x84
-.byte	0x53,0xd1,0x00,0xed,0x20,0xfc,0xb1,0x5b
-.byte	0x6a,0xcb,0xbe,0x39,0x4a,0x4c,0x58,0xcf
-.byte	0xd0,0xef,0xaa,0xfb,0x43,0x4d,0x33,0x85
-.byte	0x45,0xf9,0x02,0x7f,0x50,0x3c,0x9f,0xa8
-.byte	0x51,0xa3,0x40,0x8f,0x92,0x9d,0x38,0xf5
-.byte	0xbc,0xb6,0xda,0x21,0x10,0xff,0xf3,0xd2
-.byte	0xcd,0x0c,0x13,0xec,0x5f,0x97,0x44,0x17
-.byte	0xc4,0xa7,0x7e,0x3d,0x64,0x5d,0x19,0x73
-.byte	0x60,0x81,0x4f,0xdc,0x22,0x2a,0x90,0x88
-.byte	0x46,0xee,0xb8,0x14,0xde,0x5e,0x0b,0xdb
-.byte	0xe0,0x32,0x3a,0x0a,0x49,0x06,0x24,0x5c
-.byte	0xc2,0xd3,0xac,0x62,0x91,0x95,0xe4,0x79
-.byte	0xe7,0xc8,0x37,0x6d,0x8d,0xd5,0x4e,0xa9
-.byte	0x6c,0x56,0xf4,0xea,0x65,0x7a,0xae,0x08
-.byte	0xba,0x78,0x25,0x2e,0x1c,0xa6,0xb4,0xc6
-.byte	0xe8,0xdd,0x74,0x1f,0x4b,0xbd,0x8b,0x8a
-.byte	0x70,0x3e,0xb5,0x66,0x48,0x03,0xf6,0x0e
-.byte	0x61,0x35,0x57,0xb9,0x86,0xc1,0x1d,0x9e
-.byte	0xe1,0xf8,0x98,0x11,0x69,0xd9,0x8e,0x94
-.byte	0x9b,0x1e,0x87,0xe9,0xce,0x55,0x28,0xdf
-.byte	0x8c,0xa1,0x89,0x0d,0xbf,0xe6,0x42,0x68
-.byte	0x41,0x99,0x2d,0x0f,0xb0,0x54,0xbb,0x16
-.byte	0x63,0x7c,0x77,0x7b,0xf2,0x6b,0x6f,0xc5
-.byte	0x30,0x01,0x67,0x2b,0xfe,0xd7,0xab,0x76
-.byte	0xca,0x82,0xc9,0x7d,0xfa,0x59,0x47,0xf0
-.byte	0xad,0xd4,0xa2,0xaf,0x9c,0xa4,0x72,0xc0
-.byte	0xb7,0xfd,0x93,0x26,0x36,0x3f,0xf7,0xcc
-.byte	0x34,0xa5,0xe5,0xf1,0x71,0xd8,0x31,0x15
-.byte	0x04,0xc7,0x23,0xc3,0x18,0x96,0x05,0x9a
-.byte	0x07,0x12,0x80,0xe2,0xeb,0x27,0xb2,0x75
-.byte	0x09,0x83,0x2c,0x1a,0x1b,0x6e,0x5a,0xa0
-.byte	0x52,0x3b,0xd6,0xb3,0x29,0xe3,0x2f,0x84
-.byte	0x53,0xd1,0x00,0xed,0x20,0xfc,0xb1,0x5b
-.byte	0x6a,0xcb,0xbe,0x39,0x4a,0x4c,0x58,0xcf
-.byte	0xd0,0xef,0xaa,0xfb,0x43,0x4d,0x33,0x85
-.byte	0x45,0xf9,0x02,0x7f,0x50,0x3c,0x9f,0xa8
-.byte	0x51,0xa3,0x40,0x8f,0x92,0x9d,0x38,0xf5
-.byte	0xbc,0xb6,0xda,0x21,0x10,0xff,0xf3,0xd2
-.byte	0xcd,0x0c,0x13,0xec,0x5f,0x97,0x44,0x17
-.byte	0xc4,0xa7,0x7e,0x3d,0x64,0x5d,0x19,0x73
-.byte	0x60,0x81,0x4f,0xdc,0x22,0x2a,0x90,0x88
-.byte	0x46,0xee,0xb8,0x14,0xde,0x5e,0x0b,0xdb
-.byte	0xe0,0x32,0x3a,0x0a,0x49,0x06,0x24,0x5c
-.byte	0xc2,0xd3,0xac,0x62,0x91,0x95,0xe4,0x79
-.byte	0xe7,0xc8,0x37,0x6d,0x8d,0xd5,0x4e,0xa9
-.byte	0x6c,0x56,0xf4,0xea,0x65,0x7a,0xae,0x08
-.byte	0xba,0x78,0x25,0x2e,0x1c,0xa6,0xb4,0xc6
-.byte	0xe8,0xdd,0x74,0x1f,0x4b,0xbd,0x8b,0x8a
-.byte	0x70,0x3e,0xb5,0x66,0x48,0x03,0xf6,0x0e
-.byte	0x61,0x35,0x57,0xb9,0x86,0xc1,0x1d,0x9e
-.byte	0xe1,0xf8,0x98,0x11,0x69,0xd9,0x8e,0x94
-.byte	0x9b,0x1e,0x87,0xe9,0xce,0x55,0x28,0xdf
-.byte	0x8c,0xa1,0x89,0x0d,0xbf,0xe6,0x42,0x68
-.byte	0x41,0x99,0x2d,0x0f,0xb0,0x54,0xbb,0x16
-.byte	0x63,0x7c,0x77,0x7b,0xf2,0x6b,0x6f,0xc5
-.byte	0x30,0x01,0x67,0x2b,0xfe,0xd7,0xab,0x76
-.byte	0xca,0x82,0xc9,0x7d,0xfa,0x59,0x47,0xf0
-.byte	0xad,0xd4,0xa2,0xaf,0x9c,0xa4,0x72,0xc0
-.byte	0xb7,0xfd,0x93,0x26,0x36,0x3f,0xf7,0xcc
-.byte	0x34,0xa5,0xe5,0xf1,0x71,0xd8,0x31,0x15
-.byte	0x04,0xc7,0x23,0xc3,0x18,0x96,0x05,0x9a
-.byte	0x07,0x12,0x80,0xe2,0xeb,0x27,0xb2,0x75
-.byte	0x09,0x83,0x2c,0x1a,0x1b,0x6e,0x5a,0xa0
-.byte	0x52,0x3b,0xd6,0xb3,0x29,0xe3,0x2f,0x84
-.byte	0x53,0xd1,0x00,0xed,0x20,0xfc,0xb1,0x5b
-.byte	0x6a,0xcb,0xbe,0x39,0x4a,0x4c,0x58,0xcf
-.byte	0xd0,0xef,0xaa,0xfb,0x43,0x4d,0x33,0x85
-.byte	0x45,0xf9,0x02,0x7f,0x50,0x3c,0x9f,0xa8
-.byte	0x51,0xa3,0x40,0x8f,0x92,0x9d,0x38,0xf5
-.byte	0xbc,0xb6,0xda,0x21,0x10,0xff,0xf3,0xd2
-.byte	0xcd,0x0c,0x13,0xec,0x5f,0x97,0x44,0x17
-.byte	0xc4,0xa7,0x7e,0x3d,0x64,0x5d,0x19,0x73
-.byte	0x60,0x81,0x4f,0xdc,0x22,0x2a,0x90,0x88
-.byte	0x46,0xee,0xb8,0x14,0xde,0x5e,0x0b,0xdb
-.byte	0xe0,0x32,0x3a,0x0a,0x49,0x06,0x24,0x5c
-.byte	0xc2,0xd3,0xac,0x62,0x91,0x95,0xe4,0x79
-.byte	0xe7,0xc8,0x37,0x6d,0x8d,0xd5,0x4e,0xa9
-.byte	0x6c,0x56,0xf4,0xea,0x65,0x7a,0xae,0x08
-.byte	0xba,0x78,0x25,0x2e,0x1c,0xa6,0xb4,0xc6
-.byte	0xe8,0xdd,0x74,0x1f,0x4b,0xbd,0x8b,0x8a
-.byte	0x70,0x3e,0xb5,0x66,0x48,0x03,0xf6,0x0e
-.byte	0x61,0x35,0x57,0xb9,0x86,0xc1,0x1d,0x9e
-.byte	0xe1,0xf8,0x98,0x11,0x69,0xd9,0x8e,0x94
-.byte	0x9b,0x1e,0x87,0xe9,0xce,0x55,0x28,0xdf
-.byte	0x8c,0xa1,0x89,0x0d,0xbf,0xe6,0x42,0x68
-.byte	0x41,0x99,0x2d,0x0f,0xb0,0x54,0xbb,0x16
-.byte	0x63,0x7c,0x77,0x7b,0xf2,0x6b,0x6f,0xc5
-.byte	0x30,0x01,0x67,0x2b,0xfe,0xd7,0xab,0x76
-.byte	0xca,0x82,0xc9,0x7d,0xfa,0x59,0x47,0xf0
-.byte	0xad,0xd4,0xa2,0xaf,0x9c,0xa4,0x72,0xc0
-.byte	0xb7,0xfd,0x93,0x26,0x36,0x3f,0xf7,0xcc
-.byte	0x34,0xa5,0xe5,0xf1,0x71,0xd8,0x31,0x15
-.byte	0x04,0xc7,0x23,0xc3,0x18,0x96,0x05,0x9a
-.byte	0x07,0x12,0x80,0xe2,0xeb,0x27,0xb2,0x75
-.byte	0x09,0x83,0x2c,0x1a,0x1b,0x6e,0x5a,0xa0
-.byte	0x52,0x3b,0xd6,0xb3,0x29,0xe3,0x2f,0x84
-.byte	0x53,0xd1,0x00,0xed,0x20,0xfc,0xb1,0x5b
-.byte	0x6a,0xcb,0xbe,0x39,0x4a,0x4c,0x58,0xcf
-.byte	0xd0,0xef,0xaa,0xfb,0x43,0x4d,0x33,0x85
-.byte	0x45,0xf9,0x02,0x7f,0x50,0x3c,0x9f,0xa8
-.byte	0x51,0xa3,0x40,0x8f,0x92,0x9d,0x38,0xf5
-.byte	0xbc,0xb6,0xda,0x21,0x10,0xff,0xf3,0xd2
-.byte	0xcd,0x0c,0x13,0xec,0x5f,0x97,0x44,0x17
-.byte	0xc4,0xa7,0x7e,0x3d,0x64,0x5d,0x19,0x73
-.byte	0x60,0x81,0x4f,0xdc,0x22,0x2a,0x90,0x88
-.byte	0x46,0xee,0xb8,0x14,0xde,0x5e,0x0b,0xdb
-.byte	0xe0,0x32,0x3a,0x0a,0x49,0x06,0x24,0x5c
-.byte	0xc2,0xd3,0xac,0x62,0x91,0x95,0xe4,0x79
-.byte	0xe7,0xc8,0x37,0x6d,0x8d,0xd5,0x4e,0xa9
-.byte	0x6c,0x56,0xf4,0xea,0x65,0x7a,0xae,0x08
-.byte	0xba,0x78,0x25,0x2e,0x1c,0xa6,0xb4,0xc6
-.byte	0xe8,0xdd,0x74,0x1f,0x4b,0xbd,0x8b,0x8a
-.byte	0x70,0x3e,0xb5,0x66,0x48,0x03,0xf6,0x0e
-.byte	0x61,0x35,0x57,0xb9,0x86,0xc1,0x1d,0x9e
-.byte	0xe1,0xf8,0x98,0x11,0x69,0xd9,0x8e,0x94
-.byte	0x9b,0x1e,0x87,0xe9,0xce,0x55,0x28,0xdf
-.byte	0x8c,0xa1,0x89,0x0d,0xbf,0xe6,0x42,0x68
-.byte	0x41,0x99,0x2d,0x0f,0xb0,0x54,0xbb,0x16
-.long	0x00000001, 0x00000002, 0x00000004, 0x00000008
-.long	0x00000010, 0x00000020, 0x00000040, 0x00000080
-.long	0x0000001b, 0x00000036, 0x80808080, 0x80808080
-.long	0xfefefefe, 0xfefefefe, 0x1b1b1b1b, 0x1b1b1b1b
-.align	64
-.LAES_Td:
-.long	0x50a7f451,0x50a7f451
-.long	0x5365417e,0x5365417e
-.long	0xc3a4171a,0xc3a4171a
-.long	0x965e273a,0x965e273a
-.long	0xcb6bab3b,0xcb6bab3b
-.long	0xf1459d1f,0xf1459d1f
-.long	0xab58faac,0xab58faac
-.long	0x9303e34b,0x9303e34b
-.long	0x55fa3020,0x55fa3020
-.long	0xf66d76ad,0xf66d76ad
-.long	0x9176cc88,0x9176cc88
-.long	0x254c02f5,0x254c02f5
-.long	0xfcd7e54f,0xfcd7e54f
-.long	0xd7cb2ac5,0xd7cb2ac5
-.long	0x80443526,0x80443526
-.long	0x8fa362b5,0x8fa362b5
-.long	0x495ab1de,0x495ab1de
-.long	0x671bba25,0x671bba25
-.long	0x980eea45,0x980eea45
-.long	0xe1c0fe5d,0xe1c0fe5d
-.long	0x02752fc3,0x02752fc3
-.long	0x12f04c81,0x12f04c81
-.long	0xa397468d,0xa397468d
-.long	0xc6f9d36b,0xc6f9d36b
-.long	0xe75f8f03,0xe75f8f03
-.long	0x959c9215,0x959c9215
-.long	0xeb7a6dbf,0xeb7a6dbf
-.long	0xda595295,0xda595295
-.long	0x2d83bed4,0x2d83bed4
-.long	0xd3217458,0xd3217458
-.long	0x2969e049,0x2969e049
-.long	0x44c8c98e,0x44c8c98e
-.long	0x6a89c275,0x6a89c275
-.long	0x78798ef4,0x78798ef4
-.long	0x6b3e5899,0x6b3e5899
-.long	0xdd71b927,0xdd71b927
-.long	0xb64fe1be,0xb64fe1be
-.long	0x17ad88f0,0x17ad88f0
-.long	0x66ac20c9,0x66ac20c9
-.long	0xb43ace7d,0xb43ace7d
-.long	0x184adf63,0x184adf63
-.long	0x82311ae5,0x82311ae5
-.long	0x60335197,0x60335197
-.long	0x457f5362,0x457f5362
-.long	0xe07764b1,0xe07764b1
-.long	0x84ae6bbb,0x84ae6bbb
-.long	0x1ca081fe,0x1ca081fe
-.long	0x942b08f9,0x942b08f9
-.long	0x58684870,0x58684870
-.long	0x19fd458f,0x19fd458f
-.long	0x876cde94,0x876cde94
-.long	0xb7f87b52,0xb7f87b52
-.long	0x23d373ab,0x23d373ab
-.long	0xe2024b72,0xe2024b72
-.long	0x578f1fe3,0x578f1fe3
-.long	0x2aab5566,0x2aab5566
-.long	0x0728ebb2,0x0728ebb2
-.long	0x03c2b52f,0x03c2b52f
-.long	0x9a7bc586,0x9a7bc586
-.long	0xa50837d3,0xa50837d3
-.long	0xf2872830,0xf2872830
-.long	0xb2a5bf23,0xb2a5bf23
-.long	0xba6a0302,0xba6a0302
-.long	0x5c8216ed,0x5c8216ed
-.long	0x2b1ccf8a,0x2b1ccf8a
-.long	0x92b479a7,0x92b479a7
-.long	0xf0f207f3,0xf0f207f3
-.long	0xa1e2694e,0xa1e2694e
-.long	0xcdf4da65,0xcdf4da65
-.long	0xd5be0506,0xd5be0506
-.long	0x1f6234d1,0x1f6234d1
-.long	0x8afea6c4,0x8afea6c4
-.long	0x9d532e34,0x9d532e34
-.long	0xa055f3a2,0xa055f3a2
-.long	0x32e18a05,0x32e18a05
-.long	0x75ebf6a4,0x75ebf6a4
-.long	0x39ec830b,0x39ec830b
-.long	0xaaef6040,0xaaef6040
-.long	0x069f715e,0x069f715e
-.long	0x51106ebd,0x51106ebd
-.long	0xf98a213e,0xf98a213e
-.long	0x3d06dd96,0x3d06dd96
-.long	0xae053edd,0xae053edd
-.long	0x46bde64d,0x46bde64d
-.long	0xb58d5491,0xb58d5491
-.long	0x055dc471,0x055dc471
-.long	0x6fd40604,0x6fd40604
-.long	0xff155060,0xff155060
-.long	0x24fb9819,0x24fb9819
-.long	0x97e9bdd6,0x97e9bdd6
-.long	0xcc434089,0xcc434089
-.long	0x779ed967,0x779ed967
-.long	0xbd42e8b0,0xbd42e8b0
-.long	0x888b8907,0x888b8907
-.long	0x385b19e7,0x385b19e7
-.long	0xdbeec879,0xdbeec879
-.long	0x470a7ca1,0x470a7ca1
-.long	0xe90f427c,0xe90f427c
-.long	0xc91e84f8,0xc91e84f8
-.long	0x00000000,0x00000000
-.long	0x83868009,0x83868009
-.long	0x48ed2b32,0x48ed2b32
-.long	0xac70111e,0xac70111e
-.long	0x4e725a6c,0x4e725a6c
-.long	0xfbff0efd,0xfbff0efd
-.long	0x5638850f,0x5638850f
-.long	0x1ed5ae3d,0x1ed5ae3d
-.long	0x27392d36,0x27392d36
-.long	0x64d90f0a,0x64d90f0a
-.long	0x21a65c68,0x21a65c68
-.long	0xd1545b9b,0xd1545b9b
-.long	0x3a2e3624,0x3a2e3624
-.long	0xb1670a0c,0xb1670a0c
-.long	0x0fe75793,0x0fe75793
-.long	0xd296eeb4,0xd296eeb4
-.long	0x9e919b1b,0x9e919b1b
-.long	0x4fc5c080,0x4fc5c080
-.long	0xa220dc61,0xa220dc61
-.long	0x694b775a,0x694b775a
-.long	0x161a121c,0x161a121c
-.long	0x0aba93e2,0x0aba93e2
-.long	0xe52aa0c0,0xe52aa0c0
-.long	0x43e0223c,0x43e0223c
-.long	0x1d171b12,0x1d171b12
-.long	0x0b0d090e,0x0b0d090e
-.long	0xadc78bf2,0xadc78bf2
-.long	0xb9a8b62d,0xb9a8b62d
-.long	0xc8a91e14,0xc8a91e14
-.long	0x8519f157,0x8519f157
-.long	0x4c0775af,0x4c0775af
-.long	0xbbdd99ee,0xbbdd99ee
-.long	0xfd607fa3,0xfd607fa3
-.long	0x9f2601f7,0x9f2601f7
-.long	0xbcf5725c,0xbcf5725c
-.long	0xc53b6644,0xc53b6644
-.long	0x347efb5b,0x347efb5b
-.long	0x7629438b,0x7629438b
-.long	0xdcc623cb,0xdcc623cb
-.long	0x68fcedb6,0x68fcedb6
-.long	0x63f1e4b8,0x63f1e4b8
-.long	0xcadc31d7,0xcadc31d7
-.long	0x10856342,0x10856342
-.long	0x40229713,0x40229713
-.long	0x2011c684,0x2011c684
-.long	0x7d244a85,0x7d244a85
-.long	0xf83dbbd2,0xf83dbbd2
-.long	0x1132f9ae,0x1132f9ae
-.long	0x6da129c7,0x6da129c7
-.long	0x4b2f9e1d,0x4b2f9e1d
-.long	0xf330b2dc,0xf330b2dc
-.long	0xec52860d,0xec52860d
-.long	0xd0e3c177,0xd0e3c177
-.long	0x6c16b32b,0x6c16b32b
-.long	0x99b970a9,0x99b970a9
-.long	0xfa489411,0xfa489411
-.long	0x2264e947,0x2264e947
-.long	0xc48cfca8,0xc48cfca8
-.long	0x1a3ff0a0,0x1a3ff0a0
-.long	0xd82c7d56,0xd82c7d56
-.long	0xef903322,0xef903322
-.long	0xc74e4987,0xc74e4987
-.long	0xc1d138d9,0xc1d138d9
-.long	0xfea2ca8c,0xfea2ca8c
-.long	0x360bd498,0x360bd498
-.long	0xcf81f5a6,0xcf81f5a6
-.long	0x28de7aa5,0x28de7aa5
-.long	0x268eb7da,0x268eb7da
-.long	0xa4bfad3f,0xa4bfad3f
-.long	0xe49d3a2c,0xe49d3a2c
-.long	0x0d927850,0x0d927850
-.long	0x9bcc5f6a,0x9bcc5f6a
-.long	0x62467e54,0x62467e54
-.long	0xc2138df6,0xc2138df6
-.long	0xe8b8d890,0xe8b8d890
-.long	0x5ef7392e,0x5ef7392e
-.long	0xf5afc382,0xf5afc382
-.long	0xbe805d9f,0xbe805d9f
-.long	0x7c93d069,0x7c93d069
-.long	0xa92dd56f,0xa92dd56f
-.long	0xb31225cf,0xb31225cf
-.long	0x3b99acc8,0x3b99acc8
-.long	0xa77d1810,0xa77d1810
-.long	0x6e639ce8,0x6e639ce8
-.long	0x7bbb3bdb,0x7bbb3bdb
-.long	0x097826cd,0x097826cd
-.long	0xf418596e,0xf418596e
-.long	0x01b79aec,0x01b79aec
-.long	0xa89a4f83,0xa89a4f83
-.long	0x656e95e6,0x656e95e6
-.long	0x7ee6ffaa,0x7ee6ffaa
-.long	0x08cfbc21,0x08cfbc21
-.long	0xe6e815ef,0xe6e815ef
-.long	0xd99be7ba,0xd99be7ba
-.long	0xce366f4a,0xce366f4a
-.long	0xd4099fea,0xd4099fea
-.long	0xd67cb029,0xd67cb029
-.long	0xafb2a431,0xafb2a431
-.long	0x31233f2a,0x31233f2a
-.long	0x3094a5c6,0x3094a5c6
-.long	0xc066a235,0xc066a235
-.long	0x37bc4e74,0x37bc4e74
-.long	0xa6ca82fc,0xa6ca82fc
-.long	0xb0d090e0,0xb0d090e0
-.long	0x15d8a733,0x15d8a733
-.long	0x4a9804f1,0x4a9804f1
-.long	0xf7daec41,0xf7daec41
-.long	0x0e50cd7f,0x0e50cd7f
-.long	0x2ff69117,0x2ff69117
-.long	0x8dd64d76,0x8dd64d76
-.long	0x4db0ef43,0x4db0ef43
-.long	0x544daacc,0x544daacc
-.long	0xdf0496e4,0xdf0496e4
-.long	0xe3b5d19e,0xe3b5d19e
-.long	0x1b886a4c,0x1b886a4c
-.long	0xb81f2cc1,0xb81f2cc1
-.long	0x7f516546,0x7f516546
-.long	0x04ea5e9d,0x04ea5e9d
-.long	0x5d358c01,0x5d358c01
-.long	0x737487fa,0x737487fa
-.long	0x2e410bfb,0x2e410bfb
-.long	0x5a1d67b3,0x5a1d67b3
-.long	0x52d2db92,0x52d2db92
-.long	0x335610e9,0x335610e9
-.long	0x1347d66d,0x1347d66d
-.long	0x8c61d79a,0x8c61d79a
-.long	0x7a0ca137,0x7a0ca137
-.long	0x8e14f859,0x8e14f859
-.long	0x893c13eb,0x893c13eb
-.long	0xee27a9ce,0xee27a9ce
-.long	0x35c961b7,0x35c961b7
-.long	0xede51ce1,0xede51ce1
-.long	0x3cb1477a,0x3cb1477a
-.long	0x59dfd29c,0x59dfd29c
-.long	0x3f73f255,0x3f73f255
-.long	0x79ce1418,0x79ce1418
-.long	0xbf37c773,0xbf37c773
-.long	0xeacdf753,0xeacdf753
-.long	0x5baafd5f,0x5baafd5f
-.long	0x146f3ddf,0x146f3ddf
-.long	0x86db4478,0x86db4478
-.long	0x81f3afca,0x81f3afca
-.long	0x3ec468b9,0x3ec468b9
-.long	0x2c342438,0x2c342438
-.long	0x5f40a3c2,0x5f40a3c2
-.long	0x72c31d16,0x72c31d16
-.long	0x0c25e2bc,0x0c25e2bc
-.long	0x8b493c28,0x8b493c28
-.long	0x41950dff,0x41950dff
-.long	0x7101a839,0x7101a839
-.long	0xdeb30c08,0xdeb30c08
-.long	0x9ce4b4d8,0x9ce4b4d8
-.long	0x90c15664,0x90c15664
-.long	0x6184cb7b,0x6184cb7b
-.long	0x70b632d5,0x70b632d5
-.long	0x745c6c48,0x745c6c48
-.long	0x4257b8d0,0x4257b8d0
-.byte	0x52,0x09,0x6a,0xd5,0x30,0x36,0xa5,0x38
-.byte	0xbf,0x40,0xa3,0x9e,0x81,0xf3,0xd7,0xfb
-.byte	0x7c,0xe3,0x39,0x82,0x9b,0x2f,0xff,0x87
-.byte	0x34,0x8e,0x43,0x44,0xc4,0xde,0xe9,0xcb
-.byte	0x54,0x7b,0x94,0x32,0xa6,0xc2,0x23,0x3d
-.byte	0xee,0x4c,0x95,0x0b,0x42,0xfa,0xc3,0x4e
-.byte	0x08,0x2e,0xa1,0x66,0x28,0xd9,0x24,0xb2
-.byte	0x76,0x5b,0xa2,0x49,0x6d,0x8b,0xd1,0x25
-.byte	0x72,0xf8,0xf6,0x64,0x86,0x68,0x98,0x16
-.byte	0xd4,0xa4,0x5c,0xcc,0x5d,0x65,0xb6,0x92
-.byte	0x6c,0x70,0x48,0x50,0xfd,0xed,0xb9,0xda
-.byte	0x5e,0x15,0x46,0x57,0xa7,0x8d,0x9d,0x84
-.byte	0x90,0xd8,0xab,0x00,0x8c,0xbc,0xd3,0x0a
-.byte	0xf7,0xe4,0x58,0x05,0xb8,0xb3,0x45,0x06
-.byte	0xd0,0x2c,0x1e,0x8f,0xca,0x3f,0x0f,0x02
-.byte	0xc1,0xaf,0xbd,0x03,0x01,0x13,0x8a,0x6b
-.byte	0x3a,0x91,0x11,0x41,0x4f,0x67,0xdc,0xea
-.byte	0x97,0xf2,0xcf,0xce,0xf0,0xb4,0xe6,0x73
-.byte	0x96,0xac,0x74,0x22,0xe7,0xad,0x35,0x85
-.byte	0xe2,0xf9,0x37,0xe8,0x1c,0x75,0xdf,0x6e
-.byte	0x47,0xf1,0x1a,0x71,0x1d,0x29,0xc5,0x89
-.byte	0x6f,0xb7,0x62,0x0e,0xaa,0x18,0xbe,0x1b
-.byte	0xfc,0x56,0x3e,0x4b,0xc6,0xd2,0x79,0x20
-.byte	0x9a,0xdb,0xc0,0xfe,0x78,0xcd,0x5a,0xf4
-.byte	0x1f,0xdd,0xa8,0x33,0x88,0x07,0xc7,0x31
-.byte	0xb1,0x12,0x10,0x59,0x27,0x80,0xec,0x5f
-.byte	0x60,0x51,0x7f,0xa9,0x19,0xb5,0x4a,0x0d
-.byte	0x2d,0xe5,0x7a,0x9f,0x93,0xc9,0x9c,0xef
-.byte	0xa0,0xe0,0x3b,0x4d,0xae,0x2a,0xf5,0xb0
-.byte	0xc8,0xeb,0xbb,0x3c,0x83,0x53,0x99,0x61
-.byte	0x17,0x2b,0x04,0x7e,0xba,0x77,0xd6,0x26
-.byte	0xe1,0x69,0x14,0x63,0x55,0x21,0x0c,0x7d
-.long	0x80808080, 0x80808080, 0xfefefefe, 0xfefefefe
-.long	0x1b1b1b1b, 0x1b1b1b1b, 0, 0
-.byte	0x52,0x09,0x6a,0xd5,0x30,0x36,0xa5,0x38
-.byte	0xbf,0x40,0xa3,0x9e,0x81,0xf3,0xd7,0xfb
-.byte	0x7c,0xe3,0x39,0x82,0x9b,0x2f,0xff,0x87
-.byte	0x34,0x8e,0x43,0x44,0xc4,0xde,0xe9,0xcb
-.byte	0x54,0x7b,0x94,0x32,0xa6,0xc2,0x23,0x3d
-.byte	0xee,0x4c,0x95,0x0b,0x42,0xfa,0xc3,0x4e
-.byte	0x08,0x2e,0xa1,0x66,0x28,0xd9,0x24,0xb2
-.byte	0x76,0x5b,0xa2,0x49,0x6d,0x8b,0xd1,0x25
-.byte	0x72,0xf8,0xf6,0x64,0x86,0x68,0x98,0x16
-.byte	0xd4,0xa4,0x5c,0xcc,0x5d,0x65,0xb6,0x92
-.byte	0x6c,0x70,0x48,0x50,0xfd,0xed,0xb9,0xda
-.byte	0x5e,0x15,0x46,0x57,0xa7,0x8d,0x9d,0x84
-.byte	0x90,0xd8,0xab,0x00,0x8c,0xbc,0xd3,0x0a
-.byte	0xf7,0xe4,0x58,0x05,0xb8,0xb3,0x45,0x06
-.byte	0xd0,0x2c,0x1e,0x8f,0xca,0x3f,0x0f,0x02
-.byte	0xc1,0xaf,0xbd,0x03,0x01,0x13,0x8a,0x6b
-.byte	0x3a,0x91,0x11,0x41,0x4f,0x67,0xdc,0xea
-.byte	0x97,0xf2,0xcf,0xce,0xf0,0xb4,0xe6,0x73
-.byte	0x96,0xac,0x74,0x22,0xe7,0xad,0x35,0x85
-.byte	0xe2,0xf9,0x37,0xe8,0x1c,0x75,0xdf,0x6e
-.byte	0x47,0xf1,0x1a,0x71,0x1d,0x29,0xc5,0x89
-.byte	0x6f,0xb7,0x62,0x0e,0xaa,0x18,0xbe,0x1b
-.byte	0xfc,0x56,0x3e,0x4b,0xc6,0xd2,0x79,0x20
-.byte	0x9a,0xdb,0xc0,0xfe,0x78,0xcd,0x5a,0xf4
-.byte	0x1f,0xdd,0xa8,0x33,0x88,0x07,0xc7,0x31
-.byte	0xb1,0x12,0x10,0x59,0x27,0x80,0xec,0x5f
-.byte	0x60,0x51,0x7f,0xa9,0x19,0xb5,0x4a,0x0d
-.byte	0x2d,0xe5,0x7a,0x9f,0x93,0xc9,0x9c,0xef
-.byte	0xa0,0xe0,0x3b,0x4d,0xae,0x2a,0xf5,0xb0
-.byte	0xc8,0xeb,0xbb,0x3c,0x83,0x53,0x99,0x61
-.byte	0x17,0x2b,0x04,0x7e,0xba,0x77,0xd6,0x26
-.byte	0xe1,0x69,0x14,0x63,0x55,0x21,0x0c,0x7d
-.long	0x80808080, 0x80808080, 0xfefefefe, 0xfefefefe
-.long	0x1b1b1b1b, 0x1b1b1b1b, 0, 0
-.byte	0x52,0x09,0x6a,0xd5,0x30,0x36,0xa5,0x38
-.byte	0xbf,0x40,0xa3,0x9e,0x81,0xf3,0xd7,0xfb
-.byte	0x7c,0xe3,0x39,0x82,0x9b,0x2f,0xff,0x87
-.byte	0x34,0x8e,0x43,0x44,0xc4,0xde,0xe9,0xcb
-.byte	0x54,0x7b,0x94,0x32,0xa6,0xc2,0x23,0x3d
-.byte	0xee,0x4c,0x95,0x0b,0x42,0xfa,0xc3,0x4e
-.byte	0x08,0x2e,0xa1,0x66,0x28,0xd9,0x24,0xb2
-.byte	0x76,0x5b,0xa2,0x49,0x6d,0x8b,0xd1,0x25
-.byte	0x72,0xf8,0xf6,0x64,0x86,0x68,0x98,0x16
-.byte	0xd4,0xa4,0x5c,0xcc,0x5d,0x65,0xb6,0x92
-.byte	0x6c,0x70,0x48,0x50,0xfd,0xed,0xb9,0xda
-.byte	0x5e,0x15,0x46,0x57,0xa7,0x8d,0x9d,0x84
-.byte	0x90,0xd8,0xab,0x00,0x8c,0xbc,0xd3,0x0a
-.byte	0xf7,0xe4,0x58,0x05,0xb8,0xb3,0x45,0x06
-.byte	0xd0,0x2c,0x1e,0x8f,0xca,0x3f,0x0f,0x02
-.byte	0xc1,0xaf,0xbd,0x03,0x01,0x13,0x8a,0x6b
-.byte	0x3a,0x91,0x11,0x41,0x4f,0x67,0xdc,0xea
-.byte	0x97,0xf2,0xcf,0xce,0xf0,0xb4,0xe6,0x73
-.byte	0x96,0xac,0x74,0x22,0xe7,0xad,0x35,0x85
-.byte	0xe2,0xf9,0x37,0xe8,0x1c,0x75,0xdf,0x6e
-.byte	0x47,0xf1,0x1a,0x71,0x1d,0x29,0xc5,0x89
-.byte	0x6f,0xb7,0x62,0x0e,0xaa,0x18,0xbe,0x1b
-.byte	0xfc,0x56,0x3e,0x4b,0xc6,0xd2,0x79,0x20
-.byte	0x9a,0xdb,0xc0,0xfe,0x78,0xcd,0x5a,0xf4
-.byte	0x1f,0xdd,0xa8,0x33,0x88,0x07,0xc7,0x31
-.byte	0xb1,0x12,0x10,0x59,0x27,0x80,0xec,0x5f
-.byte	0x60,0x51,0x7f,0xa9,0x19,0xb5,0x4a,0x0d
-.byte	0x2d,0xe5,0x7a,0x9f,0x93,0xc9,0x9c,0xef
-.byte	0xa0,0xe0,0x3b,0x4d,0xae,0x2a,0xf5,0xb0
-.byte	0xc8,0xeb,0xbb,0x3c,0x83,0x53,0x99,0x61
-.byte	0x17,0x2b,0x04,0x7e,0xba,0x77,0xd6,0x26
-.byte	0xe1,0x69,0x14,0x63,0x55,0x21,0x0c,0x7d
-.long	0x80808080, 0x80808080, 0xfefefefe, 0xfefefefe
-.long	0x1b1b1b1b, 0x1b1b1b1b, 0, 0
-.byte	0x52,0x09,0x6a,0xd5,0x30,0x36,0xa5,0x38
-.byte	0xbf,0x40,0xa3,0x9e,0x81,0xf3,0xd7,0xfb
-.byte	0x7c,0xe3,0x39,0x82,0x9b,0x2f,0xff,0x87
-.byte	0x34,0x8e,0x43,0x44,0xc4,0xde,0xe9,0xcb
-.byte	0x54,0x7b,0x94,0x32,0xa6,0xc2,0x23,0x3d
-.byte	0xee,0x4c,0x95,0x0b,0x42,0xfa,0xc3,0x4e
-.byte	0x08,0x2e,0xa1,0x66,0x28,0xd9,0x24,0xb2
-.byte	0x76,0x5b,0xa2,0x49,0x6d,0x8b,0xd1,0x25
-.byte	0x72,0xf8,0xf6,0x64,0x86,0x68,0x98,0x16
-.byte	0xd4,0xa4,0x5c,0xcc,0x5d,0x65,0xb6,0x92
-.byte	0x6c,0x70,0x48,0x50,0xfd,0xed,0xb9,0xda
-.byte	0x5e,0x15,0x46,0x57,0xa7,0x8d,0x9d,0x84
-.byte	0x90,0xd8,0xab,0x00,0x8c,0xbc,0xd3,0x0a
-.byte	0xf7,0xe4,0x58,0x05,0xb8,0xb3,0x45,0x06
-.byte	0xd0,0x2c,0x1e,0x8f,0xca,0x3f,0x0f,0x02
-.byte	0xc1,0xaf,0xbd,0x03,0x01,0x13,0x8a,0x6b
-.byte	0x3a,0x91,0x11,0x41,0x4f,0x67,0xdc,0xea
-.byte	0x97,0xf2,0xcf,0xce,0xf0,0xb4,0xe6,0x73
-.byte	0x96,0xac,0x74,0x22,0xe7,0xad,0x35,0x85
-.byte	0xe2,0xf9,0x37,0xe8,0x1c,0x75,0xdf,0x6e
-.byte	0x47,0xf1,0x1a,0x71,0x1d,0x29,0xc5,0x89
-.byte	0x6f,0xb7,0x62,0x0e,0xaa,0x18,0xbe,0x1b
-.byte	0xfc,0x56,0x3e,0x4b,0xc6,0xd2,0x79,0x20
-.byte	0x9a,0xdb,0xc0,0xfe,0x78,0xcd,0x5a,0xf4
-.byte	0x1f,0xdd,0xa8,0x33,0x88,0x07,0xc7,0x31
-.byte	0xb1,0x12,0x10,0x59,0x27,0x80,0xec,0x5f
-.byte	0x60,0x51,0x7f,0xa9,0x19,0xb5,0x4a,0x0d
-.byte	0x2d,0xe5,0x7a,0x9f,0x93,0xc9,0x9c,0xef
-.byte	0xa0,0xe0,0x3b,0x4d,0xae,0x2a,0xf5,0xb0
-.byte	0xc8,0xeb,0xbb,0x3c,0x83,0x53,0x99,0x61
-.byte	0x17,0x2b,0x04,0x7e,0xba,0x77,0xd6,0x26
-.byte	0xe1,0x69,0x14,0x63,0x55,0x21,0x0c,0x7d
-.long	0x80808080, 0x80808080, 0xfefefefe, 0xfefefefe
-.long	0x1b1b1b1b, 0x1b1b1b1b, 0, 0
-.byte	65,69,83,32,102,111,114,32,120,56,54,95,54,52,44,32,67,82,89,80,84,79,71,65,77,83,32,98,121,32,60,97,112,112,114,111,64,111,112,101,110,115,115,108,46,111,114,103,62,0
-.align	64
diff --git a/deps/openssl/config/archs/linux-x86_64/asm/crypto/aes/aesni-sha1-x86_64.s b/deps/openssl/config/archs/linux-x86_64/asm/crypto/aes/aesni-sha1-x86_64.s
index 4d2dfe4489..978bd2b623 100644
--- a/deps/openssl/config/archs/linux-x86_64/asm/crypto/aes/aesni-sha1-x86_64.s
+++ b/deps/openssl/config/archs/linux-x86_64/asm/crypto/aes/aesni-sha1-x86_64.s
@@ -5,6 +5,7 @@
 .type	aesni_cbc_sha1_enc,@function
 .align	32
 aesni_cbc_sha1_enc:
+.cfi_startproc
 
 	movl	OPENSSL_ia32cap_P+0(%rip),%r10d
 	movq	OPENSSL_ia32cap_P+4(%rip),%r11
@@ -17,6 +18,7 @@ aesni_cbc_sha1_enc:
 	je	aesni_cbc_sha1_enc_avx
 	jmp	aesni_cbc_sha1_enc_ssse3
 	.byte	0xf3,0xc3
+.cfi_endproc
 .size	aesni_cbc_sha1_enc,.-aesni_cbc_sha1_enc
 .type	aesni_cbc_sha1_enc_ssse3,@function
 .align	32
@@ -2730,6 +2732,7 @@ K_XX_XX:
 .type	aesni_cbc_sha1_enc_shaext,@function
 .align	32
 aesni_cbc_sha1_enc_shaext:
+.cfi_startproc
 	movq	8(%rsp),%r10
 	movdqu	(%r9),%xmm8
 	movd	16(%r9),%xmm9
@@ -3028,4 +3031,5 @@ aesni_cbc_sha1_enc_shaext:
 	movdqu	%xmm8,(%r9)
 	movd	%xmm9,16(%r9)
 	.byte	0xf3,0xc3
+.cfi_endproc
 .size	aesni_cbc_sha1_enc_shaext,.-aesni_cbc_sha1_enc_shaext
diff --git a/deps/openssl/config/archs/linux-x86_64/asm/crypto/aes/aesni-sha256-x86_64.s b/deps/openssl/config/archs/linux-x86_64/asm/crypto/aes/aesni-sha256-x86_64.s
index 5a47b3ee51..dd09f1b290 100644
--- a/deps/openssl/config/archs/linux-x86_64/asm/crypto/aes/aesni-sha256-x86_64.s
+++ b/deps/openssl/config/archs/linux-x86_64/asm/crypto/aes/aesni-sha256-x86_64.s
@@ -5,6 +5,7 @@
 .type	aesni_cbc_sha256_enc,@function
 .align	16
 aesni_cbc_sha256_enc:
+.cfi_startproc
 	leaq	OPENSSL_ia32cap_P(%rip),%r11
 	movl	$1,%eax
 	cmpq	$0,%rdi
@@ -30,6 +31,7 @@ aesni_cbc_sha256_enc:
 	ud2
 .Lprobe:
 	.byte	0xf3,0xc3
+.cfi_endproc
 .size	aesni_cbc_sha256_enc,.-aesni_cbc_sha256_enc
 
 .align	64
@@ -2528,7 +2530,15 @@ aesni_cbc_sha256_enc_avx2:
 	vmovdqa	%ymm4,0(%rsp)
 	xorl	%r14d,%r14d
 	vmovdqa	%ymm5,32(%rsp)
+
+	movq	120(%rsp),%rsi
+.cfi_def_cfa	%rsi,8
 	leaq	-64(%rsp),%rsp
+
+
+
+	movq	%rsi,-8(%rsp)
+.cfi_escape	0x0f,0x05,0x77,0x78,0x06,0x23,0x08
 	movl	%ebx,%esi
 	vmovdqa	%ymm6,0(%rsp)
 	xorl	%ecx,%esi
@@ -2542,6 +2552,12 @@ aesni_cbc_sha256_enc_avx2:
 	vmovdqu	(%r13),%xmm9
 	vpinsrq	$0,%r13,%xmm15,%xmm15
 	leaq	-64(%rsp),%rsp
+.cfi_escape	0x0f,0x05,0x77,0x38,0x06,0x23,0x08
+
+	pushq	64-8(%rsp)
+.cfi_escape	0x0f,0x05,0x77,0x00,0x06,0x23,0x08
+	leaq	8(%rsp),%rsp
+.cfi_escape	0x0f,0x05,0x77,0x78,0x06,0x23,0x08
 	vpalignr	$4,%ymm0,%ymm1,%ymm4
 	addl	0+128(%rsp),%r11d
 	andl	%r8d,%r12d
@@ -2816,6 +2832,12 @@ aesni_cbc_sha256_enc_avx2:
 	movl	%r9d,%r12d
 	vmovdqa	%ymm6,32(%rsp)
 	leaq	-64(%rsp),%rsp
+.cfi_escape	0x0f,0x05,0x77,0x38,0x06,0x23,0x08
+
+	pushq	64-8(%rsp)
+.cfi_escape	0x0f,0x05,0x77,0x00,0x06,0x23,0x08
+	leaq	8(%rsp),%rsp
+.cfi_escape	0x0f,0x05,0x77,0x78,0x06,0x23,0x08
 	vpalignr	$4,%ymm2,%ymm3,%ymm4
 	addl	0+128(%rsp),%r11d
 	andl	%r8d,%r12d
@@ -4029,10 +4051,12 @@ aesni_cbc_sha256_enc_avx2:
 	jbe	.Loop_avx2
 	leaq	(%rsp),%rbp
 
+
+.cfi_escape	0x0f,0x06,0x76,0xf8,0x00,0x06,0x23,0x08
+
 .Ldone_avx2:
-	leaq	(%rbp),%rsp
-	movq	64+32(%rsp),%r8
-	movq	120(%rsp),%rsi
+	movq	64+32(%rbp),%r8
+	movq	64+56(%rbp),%rsi
 .cfi_def_cfa	%rsi,8
 	vmovdqu	%xmm8,(%r8)
 	vzeroall
@@ -4057,6 +4081,7 @@ aesni_cbc_sha256_enc_avx2:
 .type	aesni_cbc_sha256_enc_shaext,@function
 .align	32
 aesni_cbc_sha256_enc_shaext:
+.cfi_startproc
 	movq	8(%rsp),%r10
 	leaq	K256+128(%rip),%rax
 	movdqu	(%r9),%xmm1
@@ -4406,4 +4431,5 @@ aesni_cbc_sha256_enc_shaext:
 	movdqu	%xmm1,(%r9)
 	movdqu	%xmm2,16(%r9)
 	.byte	0xf3,0xc3
+.cfi_endproc
 .size	aesni_cbc_sha256_enc_shaext,.-aesni_cbc_sha256_enc_shaext
diff --git a/deps/openssl/config/archs/linux-x86_64/asm/crypto/aes/aesni-x86_64.s b/deps/openssl/config/archs/linux-x86_64/asm/crypto/aes/aesni-x86_64.s
index 2986a647c1..c1e791eff5 100644
--- a/deps/openssl/config/archs/linux-x86_64/asm/crypto/aes/aesni-x86_64.s
+++ b/deps/openssl/config/archs/linux-x86_64/asm/crypto/aes/aesni-x86_64.s
@@ -861,6 +861,7 @@ aesni_ecb_encrypt:
 .type	aesni_ccm64_encrypt_blocks,@function
 .align	16
 aesni_ccm64_encrypt_blocks:
+.cfi_startproc
 	movl	240(%rcx),%eax
 	movdqu	(%r8),%xmm6
 	movdqa	.Lincrement64(%rip),%xmm9
@@ -919,11 +920,13 @@ aesni_ccm64_encrypt_blocks:
 	pxor	%xmm8,%xmm8
 	pxor	%xmm6,%xmm6
 	.byte	0xf3,0xc3
+.cfi_endproc
 .size	aesni_ccm64_encrypt_blocks,.-aesni_ccm64_encrypt_blocks
 .globl	aesni_ccm64_decrypt_blocks
 .type	aesni_ccm64_decrypt_blocks,@function
 .align	16
 aesni_ccm64_decrypt_blocks:
+.cfi_startproc
 	movl	240(%rcx),%eax
 	movups	(%r8),%xmm6
 	movdqu	(%r9),%xmm3
@@ -1016,6 +1019,7 @@ aesni_ccm64_decrypt_blocks:
 	pxor	%xmm8,%xmm8
 	pxor	%xmm6,%xmm6
 	.byte	0xf3,0xc3
+.cfi_endproc
 .size	aesni_ccm64_decrypt_blocks,.-aesni_ccm64_decrypt_blocks
 .globl	aesni_ctr32_encrypt_blocks
 .type	aesni_ctr32_encrypt_blocks,@function
@@ -2790,6 +2794,7 @@ aesni_ocb_encrypt:
 .type	__ocb_encrypt6,@function
 .align	32
 __ocb_encrypt6:
+.cfi_startproc
 	pxor	%xmm9,%xmm15
 	movdqu	(%rbx,%r12,1),%xmm11
 	movdqa	%xmm10,%xmm12
@@ -2887,11 +2892,13 @@ __ocb_encrypt6:
 .byte	102,65,15,56,221,246
 .byte	102,65,15,56,221,255
 	.byte	0xf3,0xc3
+.cfi_endproc
 .size	__ocb_encrypt6,.-__ocb_encrypt6
 
 .type	__ocb_encrypt4,@function
 .align	32
 __ocb_encrypt4:
+.cfi_startproc
 	pxor	%xmm9,%xmm15
 	movdqu	(%rbx,%r12,1),%xmm11
 	movdqa	%xmm10,%xmm12
@@ -2956,11 +2963,13 @@ __ocb_encrypt4:
 .byte	102,65,15,56,221,228
 .byte	102,65,15,56,221,237
 	.byte	0xf3,0xc3
+.cfi_endproc
 .size	__ocb_encrypt4,.-__ocb_encrypt4
 
 .type	__ocb_encrypt1,@function
 .align	32
 __ocb_encrypt1:
+.cfi_startproc
 	pxor	%xmm15,%xmm7
 	pxor	%xmm9,%xmm7
 	pxor	%xmm2,%xmm8
@@ -2991,6 +3000,7 @@ __ocb_encrypt1:
 
 .byte	102,15,56,221,215
 	.byte	0xf3,0xc3
+.cfi_endproc
 .size	__ocb_encrypt1,.-__ocb_encrypt1
 
 .globl	aesni_ocb_decrypt
@@ -3233,6 +3243,7 @@ aesni_ocb_decrypt:
 .type	__ocb_decrypt6,@function
 .align	32
 __ocb_decrypt6:
+.cfi_startproc
 	pxor	%xmm9,%xmm15
 	movdqu	(%rbx,%r12,1),%xmm11
 	movdqa	%xmm10,%xmm12
@@ -3324,11 +3335,13 @@ __ocb_decrypt6:
 .byte	102,65,15,56,223,246
 .byte	102,65,15,56,223,255
 	.byte	0xf3,0xc3
+.cfi_endproc
 .size	__ocb_decrypt6,.-__ocb_decrypt6
 
 .type	__ocb_decrypt4,@function
 .align	32
 __ocb_decrypt4:
+.cfi_startproc
 	pxor	%xmm9,%xmm15
 	movdqu	(%rbx,%r12,1),%xmm11
 	movdqa	%xmm10,%xmm12
@@ -3389,11 +3402,13 @@ __ocb_decrypt4:
 .byte	102,65,15,56,223,228
 .byte	102,65,15,56,223,237
 	.byte	0xf3,0xc3
+.cfi_endproc
 .size	__ocb_decrypt4,.-__ocb_decrypt4
 
 .type	__ocb_decrypt1,@function
 .align	32
 __ocb_decrypt1:
+.cfi_startproc
 	pxor	%xmm15,%xmm7
 	pxor	%xmm9,%xmm7
 	pxor	%xmm7,%xmm2
@@ -3423,6 +3438,7 @@ __ocb_decrypt1:
 
 .byte	102,15,56,223,215
 	.byte	0xf3,0xc3
+.cfi_endproc
 .size	__ocb_decrypt1,.-__ocb_decrypt1
 .globl	aesni_cbc_encrypt
 .type	aesni_cbc_encrypt,@function
@@ -4361,7 +4377,6 @@ __aesni_set_encrypt_key:
 	addq	$8,%rsp
 .cfi_adjust_cfa_offset	-8
 	.byte	0xf3,0xc3
-.cfi_endproc	
 .LSEH_end_set_encrypt_key:
 
 .align	16
@@ -4432,6 +4447,7 @@ __aesni_set_encrypt_key:
 	shufps	$170,%xmm1,%xmm1
 	xorps	%xmm1,%xmm2
 	.byte	0xf3,0xc3
+.cfi_endproc
 .size	aesni_set_encrypt_key,.-aesni_set_encrypt_key
 .size	__aesni_set_encrypt_key,.-__aesni_set_encrypt_key
 .align	64
diff --git a/deps/openssl/config/archs/linux-x86_64/asm/crypto/aes/bsaes-x86_64.s b/deps/openssl/config/archs/linux-x86_64/asm/crypto/aes/bsaes-x86_64.s
deleted file mode 100644
index e1f3abadbc..0000000000
--- a/deps/openssl/config/archs/linux-x86_64/asm/crypto/aes/bsaes-x86_64.s
+++ /dev/null
@@ -1,2595 +0,0 @@
-.text	
-
-
-
-
-.type	_bsaes_encrypt8,@function
-.align	64
-_bsaes_encrypt8:
-.cfi_startproc	
-	leaq	.LBS0(%rip),%r11
-
-	movdqa	(%rax),%xmm8
-	leaq	16(%rax),%rax
-	movdqa	80(%r11),%xmm7
-	pxor	%xmm8,%xmm15
-	pxor	%xmm8,%xmm0
-	pxor	%xmm8,%xmm1
-	pxor	%xmm8,%xmm2
-.byte	102,68,15,56,0,255
-.byte	102,15,56,0,199
-	pxor	%xmm8,%xmm3
-	pxor	%xmm8,%xmm4
-.byte	102,15,56,0,207
-.byte	102,15,56,0,215
-	pxor	%xmm8,%xmm5
-	pxor	%xmm8,%xmm6
-.byte	102,15,56,0,223
-.byte	102,15,56,0,231
-.byte	102,15,56,0,239
-.byte	102,15,56,0,247
-_bsaes_encrypt8_bitslice:
-	movdqa	0(%r11),%xmm7
-	movdqa	16(%r11),%xmm8
-	movdqa	%xmm5,%xmm9
-	psrlq	$1,%xmm5
-	movdqa	%xmm3,%xmm10
-	psrlq	$1,%xmm3
-	pxor	%xmm6,%xmm5
-	pxor	%xmm4,%xmm3
-	pand	%xmm7,%xmm5
-	pand	%xmm7,%xmm3
-	pxor	%xmm5,%xmm6
-	psllq	$1,%xmm5
-	pxor	%xmm3,%xmm4
-	psllq	$1,%xmm3
-	pxor	%xmm9,%xmm5
-	pxor	%xmm10,%xmm3
-	movdqa	%xmm1,%xmm9
-	psrlq	$1,%xmm1
-	movdqa	%xmm15,%xmm10
-	psrlq	$1,%xmm15
-	pxor	%xmm2,%xmm1
-	pxor	%xmm0,%xmm15
-	pand	%xmm7,%xmm1
-	pand	%xmm7,%xmm15
-	pxor	%xmm1,%xmm2
-	psllq	$1,%xmm1
-	pxor	%xmm15,%xmm0
-	psllq	$1,%xmm15
-	pxor	%xmm9,%xmm1
-	pxor	%xmm10,%xmm15
-	movdqa	32(%r11),%xmm7
-	movdqa	%xmm4,%xmm9
-	psrlq	$2,%xmm4
-	movdqa	%xmm3,%xmm10
-	psrlq	$2,%xmm3
-	pxor	%xmm6,%xmm4
-	pxor	%xmm5,%xmm3
-	pand	%xmm8,%xmm4
-	pand	%xmm8,%xmm3
-	pxor	%xmm4,%xmm6
-	psllq	$2,%xmm4
-	pxor	%xmm3,%xmm5
-	psllq	$2,%xmm3
-	pxor	%xmm9,%xmm4
-	pxor	%xmm10,%xmm3
-	movdqa	%xmm0,%xmm9
-	psrlq	$2,%xmm0
-	movdqa	%xmm15,%xmm10
-	psrlq	$2,%xmm15
-	pxor	%xmm2,%xmm0
-	pxor	%xmm1,%xmm15
-	pand	%xmm8,%xmm0
-	pand	%xmm8,%xmm15
-	pxor	%xmm0,%xmm2
-	psllq	$2,%xmm0
-	pxor	%xmm15,%xmm1
-	psllq	$2,%xmm15
-	pxor	%xmm9,%xmm0
-	pxor	%xmm10,%xmm15
-	movdqa	%xmm2,%xmm9
-	psrlq	$4,%xmm2
-	movdqa	%xmm1,%xmm10
-	psrlq	$4,%xmm1
-	pxor	%xmm6,%xmm2
-	pxor	%xmm5,%xmm1
-	pand	%xmm7,%xmm2
-	pand	%xmm7,%xmm1
-	pxor	%xmm2,%xmm6
-	psllq	$4,%xmm2
-	pxor	%xmm1,%xmm5
-	psllq	$4,%xmm1
-	pxor	%xmm9,%xmm2
-	pxor	%xmm10,%xmm1
-	movdqa	%xmm0,%xmm9
-	psrlq	$4,%xmm0
-	movdqa	%xmm15,%xmm10
-	psrlq	$4,%xmm15
-	pxor	%xmm4,%xmm0
-	pxor	%xmm3,%xmm15
-	pand	%xmm7,%xmm0
-	pand	%xmm7,%xmm15
-	pxor	%xmm0,%xmm4
-	psllq	$4,%xmm0
-	pxor	%xmm15,%xmm3
-	psllq	$4,%xmm15
-	pxor	%xmm9,%xmm0
-	pxor	%xmm10,%xmm15
-	decl	%r10d
-	jmp	.Lenc_sbox
-.align	16
-.Lenc_loop:
-	pxor	0(%rax),%xmm15
-	pxor	16(%rax),%xmm0
-	pxor	32(%rax),%xmm1
-	pxor	48(%rax),%xmm2
-.byte	102,68,15,56,0,255
-.byte	102,15,56,0,199
-	pxor	64(%rax),%xmm3
-	pxor	80(%rax),%xmm4
-.byte	102,15,56,0,207
-.byte	102,15,56,0,215
-	pxor	96(%rax),%xmm5
-	pxor	112(%rax),%xmm6
-.byte	102,15,56,0,223
-.byte	102,15,56,0,231
-.byte	102,15,56,0,239
-.byte	102,15,56,0,247
-	leaq	128(%rax),%rax
-.Lenc_sbox:
-	pxor	%xmm5,%xmm4
-	pxor	%xmm0,%xmm1
-	pxor	%xmm15,%xmm2
-	pxor	%xmm1,%xmm5
-	pxor	%xmm15,%xmm4
-
-	pxor	%xmm2,%xmm5
-	pxor	%xmm6,%xmm2
-	pxor	%xmm4,%xmm6
-	pxor	%xmm3,%xmm2
-	pxor	%xmm4,%xmm3
-	pxor	%xmm0,%xmm2
-
-	pxor	%xmm6,%xmm1
-	pxor	%xmm4,%xmm0
-	movdqa	%xmm6,%xmm10
-	movdqa	%xmm0,%xmm9
-	movdqa	%xmm4,%xmm8
-	movdqa	%xmm1,%xmm12
-	movdqa	%xmm5,%xmm11
-
-	pxor	%xmm3,%xmm10
-	pxor	%xmm1,%xmm9
-	pxor	%xmm2,%xmm8
-	movdqa	%xmm10,%xmm13
-	pxor	%xmm3,%xmm12
-	movdqa	%xmm9,%xmm7
-	pxor	%xmm15,%xmm11
-	movdqa	%xmm10,%xmm14
-
-	por	%xmm8,%xmm9
-	por	%xmm11,%xmm10
-	pxor	%xmm7,%xmm14
-	pand	%xmm11,%xmm13
-	pxor	%xmm8,%xmm11
-	pand	%xmm8,%xmm7
-	pand	%xmm11,%xmm14
-	movdqa	%xmm2,%xmm11
-	pxor	%xmm15,%xmm11
-	pand	%xmm11,%xmm12
-	pxor	%xmm12,%xmm10
-	pxor	%xmm12,%xmm9
-	movdqa	%xmm6,%xmm12
-	movdqa	%xmm4,%xmm11
-	pxor	%xmm0,%xmm12
-	pxor	%xmm5,%xmm11
-	movdqa	%xmm12,%xmm8
-	pand	%xmm11,%xmm12
-	por	%xmm11,%xmm8
-	pxor	%xmm12,%xmm7
-	pxor	%xmm14,%xmm10
-	pxor	%xmm13,%xmm9
-	pxor	%xmm14,%xmm8
-	movdqa	%xmm1,%xmm11
-	pxor	%xmm13,%xmm7
-	movdqa	%xmm3,%xmm12
-	pxor	%xmm13,%xmm8
-	movdqa	%xmm0,%xmm13
-	pand	%xmm2,%xmm11
-	movdqa	%xmm6,%xmm14
-	pand	%xmm15,%xmm12
-	pand	%xmm4,%xmm13
-	por	%xmm5,%xmm14
-	pxor	%xmm11,%xmm10
-	pxor	%xmm12,%xmm9
-	pxor	%xmm13,%xmm8
-	pxor	%xmm14,%xmm7
-
-
-
-
-
-	movdqa	%xmm10,%xmm11
-	pand	%xmm8,%xmm10
-	pxor	%xmm9,%xmm11
-
-	movdqa	%xmm7,%xmm13
-	movdqa	%xmm11,%xmm14
-	pxor	%xmm10,%xmm13
-	pand	%xmm13,%xmm14
-
-	movdqa	%xmm8,%xmm12
-	pxor	%xmm9,%xmm14
-	pxor	%xmm7,%xmm12
-
-	pxor	%xmm9,%xmm10
-
-	pand	%xmm10,%xmm12
-
-	movdqa	%xmm13,%xmm9
-	pxor	%xmm7,%xmm12
-
-	pxor	%xmm12,%xmm9
-	pxor	%xmm12,%xmm8
-
-	pand	%xmm7,%xmm9
-
-	pxor	%xmm9,%xmm13
-	pxor	%xmm9,%xmm8
-
-	pand	%xmm14,%xmm13
-
-	pxor	%xmm11,%xmm13
-	movdqa	%xmm5,%xmm11
-	movdqa	%xmm4,%xmm7
-	movdqa	%xmm14,%xmm9
-	pxor	%xmm13,%xmm9
-	pand	%xmm5,%xmm9
-	pxor	%xmm4,%xmm5
-	pand	%xmm14,%xmm4
-	pand	%xmm13,%xmm5
-	pxor	%xmm4,%xmm5
-	pxor	%xmm9,%xmm4
-	pxor	%xmm15,%xmm11
-	pxor	%xmm2,%xmm7
-	pxor	%xmm12,%xmm14
-	pxor	%xmm8,%xmm13
-	movdqa	%xmm14,%xmm10
-	movdqa	%xmm12,%xmm9
-	pxor	%xmm13,%xmm10
-	pxor	%xmm8,%xmm9
-	pand	%xmm11,%xmm10
-	pand	%xmm15,%xmm9
-	pxor	%xmm7,%xmm11
-	pxor	%xmm2,%xmm15
-	pand	%xmm14,%xmm7
-	pand	%xmm12,%xmm2
-	pand	%xmm13,%xmm11
-	pand	%xmm8,%xmm15
-	pxor	%xmm11,%xmm7
-	pxor	%xmm2,%xmm15
-	pxor	%xmm10,%xmm11
-	pxor	%xmm9,%xmm2
-	pxor	%xmm11,%xmm5
-	pxor	%xmm11,%xmm15
-	pxor	%xmm7,%xmm4
-	pxor	%xmm7,%xmm2
-
-	movdqa	%xmm6,%xmm11
-	movdqa	%xmm0,%xmm7
-	pxor	%xmm3,%xmm11
-	pxor	%xmm1,%xmm7
-	movdqa	%xmm14,%xmm10
-	movdqa	%xmm12,%xmm9
-	pxor	%xmm13,%xmm10
-	pxor	%xmm8,%xmm9
-	pand	%xmm11,%xmm10
-	pand	%xmm3,%xmm9
-	pxor	%xmm7,%xmm11
-	pxor	%xmm1,%xmm3
-	pand	%xmm14,%xmm7
-	pand	%xmm12,%xmm1
-	pand	%xmm13,%xmm11
-	pand	%xmm8,%xmm3
-	pxor	%xmm11,%xmm7
-	pxor	%xmm1,%xmm3
-	pxor	%xmm10,%xmm11
-	pxor	%xmm9,%xmm1
-	pxor	%xmm12,%xmm14
-	pxor	%xmm8,%xmm13
-	movdqa	%xmm14,%xmm10
-	pxor	%xmm13,%xmm10
-	pand	%xmm6,%xmm10
-	pxor	%xmm0,%xmm6
-	pand	%xmm14,%xmm0
-	pand	%xmm13,%xmm6
-	pxor	%xmm0,%xmm6
-	pxor	%xmm10,%xmm0
-	pxor	%xmm11,%xmm6
-	pxor	%xmm11,%xmm3
-	pxor	%xmm7,%xmm0
-	pxor	%xmm7,%xmm1
-	pxor	%xmm15,%xmm6
-	pxor	%xmm5,%xmm0
-	pxor	%xmm6,%xmm3
-	pxor	%xmm15,%xmm5
-	pxor	%xmm0,%xmm15
-
-	pxor	%xmm4,%xmm0
-	pxor	%xmm1,%xmm4
-	pxor	%xmm2,%xmm1
-	pxor	%xmm4,%xmm2
-	pxor	%xmm4,%xmm3
-
-	pxor	%xmm2,%xmm5
-	decl	%r10d
-	jl	.Lenc_done
-	pshufd	$0x93,%xmm15,%xmm7
-	pshufd	$0x93,%xmm0,%xmm8
-	pxor	%xmm7,%xmm15
-	pshufd	$0x93,%xmm3,%xmm9
-	pxor	%xmm8,%xmm0
-	pshufd	$0x93,%xmm5,%xmm10
-	pxor	%xmm9,%xmm3
-	pshufd	$0x93,%xmm2,%xmm11
-	pxor	%xmm10,%xmm5
-	pshufd	$0x93,%xmm6,%xmm12
-	pxor	%xmm11,%xmm2
-	pshufd	$0x93,%xmm1,%xmm13
-	pxor	%xmm12,%xmm6
-	pshufd	$0x93,%xmm4,%xmm14
-	pxor	%xmm13,%xmm1
-	pxor	%xmm14,%xmm4
-
-	pxor	%xmm15,%xmm8
-	pxor	%xmm4,%xmm7
-	pxor	%xmm4,%xmm8
-	pshufd	$0x4E,%xmm15,%xmm15
-	pxor	%xmm0,%xmm9
-	pshufd	$0x4E,%xmm0,%xmm0
-	pxor	%xmm2,%xmm12
-	pxor	%xmm7,%xmm15
-	pxor	%xmm6,%xmm13
-	pxor	%xmm8,%xmm0
-	pxor	%xmm5,%xmm11
-	pshufd	$0x4E,%xmm2,%xmm7
-	pxor	%xmm1,%xmm14
-	pshufd	$0x4E,%xmm6,%xmm8
-	pxor	%xmm3,%xmm10
-	pshufd	$0x4E,%xmm5,%xmm2
-	pxor	%xmm4,%xmm10
-	pshufd	$0x4E,%xmm4,%xmm6
-	pxor	%xmm4,%xmm11
-	pshufd	$0x4E,%xmm1,%xmm5
-	pxor	%xmm11,%xmm7
-	pshufd	$0x4E,%xmm3,%xmm1
-	pxor	%xmm12,%xmm8
-	pxor	%xmm10,%xmm2
-	pxor	%xmm14,%xmm6
-	pxor	%xmm13,%xmm5
-	movdqa	%xmm7,%xmm3
-	pxor	%xmm9,%xmm1
-	movdqa	%xmm8,%xmm4
-	movdqa	48(%r11),%xmm7
-	jnz	.Lenc_loop
-	movdqa	64(%r11),%xmm7
-	jmp	.Lenc_loop
-.align	16
-.Lenc_done:
-	movdqa	0(%r11),%xmm7
-	movdqa	16(%r11),%xmm8
-	movdqa	%xmm1,%xmm9
-	psrlq	$1,%xmm1
-	movdqa	%xmm2,%xmm10
-	psrlq	$1,%xmm2
-	pxor	%xmm4,%xmm1
-	pxor	%xmm6,%xmm2
-	pand	%xmm7,%xmm1
-	pand	%xmm7,%xmm2
-	pxor	%xmm1,%xmm4
-	psllq	$1,%xmm1
-	pxor	%xmm2,%xmm6
-	psllq	$1,%xmm2
-	pxor	%xmm9,%xmm1
-	pxor	%xmm10,%xmm2
-	movdqa	%xmm3,%xmm9
-	psrlq	$1,%xmm3
-	movdqa	%xmm15,%xmm10
-	psrlq	$1,%xmm15
-	pxor	%xmm5,%xmm3
-	pxor	%xmm0,%xmm15
-	pand	%xmm7,%xmm3
-	pand	%xmm7,%xmm15
-	pxor	%xmm3,%xmm5
-	psllq	$1,%xmm3
-	pxor	%xmm15,%xmm0
-	psllq	$1,%xmm15
-	pxor	%xmm9,%xmm3
-	pxor	%xmm10,%xmm15
-	movdqa	32(%r11),%xmm7
-	movdqa	%xmm6,%xmm9
-	psrlq	$2,%xmm6
-	movdqa	%xmm2,%xmm10
-	psrlq	$2,%xmm2
-	pxor	%xmm4,%xmm6
-	pxor	%xmm1,%xmm2
-	pand	%xmm8,%xmm6
-	pand	%xmm8,%xmm2
-	pxor	%xmm6,%xmm4
-	psllq	$2,%xmm6
-	pxor	%xmm2,%xmm1
-	psllq	$2,%xmm2
-	pxor	%xmm9,%xmm6
-	pxor	%xmm10,%xmm2
-	movdqa	%xmm0,%xmm9
-	psrlq	$2,%xmm0
-	movdqa	%xmm15,%xmm10
-	psrlq	$2,%xmm15
-	pxor	%xmm5,%xmm0
-	pxor	%xmm3,%xmm15
-	pand	%xmm8,%xmm0
-	pand	%xmm8,%xmm15
-	pxor	%xmm0,%xmm5
-	psllq	$2,%xmm0
-	pxor	%xmm15,%xmm3
-	psllq	$2,%xmm15
-	pxor	%xmm9,%xmm0
-	pxor	%xmm10,%xmm15
-	movdqa	%xmm5,%xmm9
-	psrlq	$4,%xmm5
-	movdqa	%xmm3,%xmm10
-	psrlq	$4,%xmm3
-	pxor	%xmm4,%xmm5
-	pxor	%xmm1,%xmm3
-	pand	%xmm7,%xmm5
-	pand	%xmm7,%xmm3
-	pxor	%xmm5,%xmm4
-	psllq	$4,%xmm5
-	pxor	%xmm3,%xmm1
-	psllq	$4,%xmm3
-	pxor	%xmm9,%xmm5
-	pxor	%xmm10,%xmm3
-	movdqa	%xmm0,%xmm9
-	psrlq	$4,%xmm0
-	movdqa	%xmm15,%xmm10
-	psrlq	$4,%xmm15
-	pxor	%xmm6,%xmm0
-	pxor	%xmm2,%xmm15
-	pand	%xmm7,%xmm0
-	pand	%xmm7,%xmm15
-	pxor	%xmm0,%xmm6
-	psllq	$4,%xmm0
-	pxor	%xmm15,%xmm2
-	psllq	$4,%xmm15
-	pxor	%xmm9,%xmm0
-	pxor	%xmm10,%xmm15
-	movdqa	(%rax),%xmm7
-	pxor	%xmm7,%xmm3
-	pxor	%xmm7,%xmm5
-	pxor	%xmm7,%xmm2
-	pxor	%xmm7,%xmm6
-	pxor	%xmm7,%xmm1
-	pxor	%xmm7,%xmm4
-	pxor	%xmm7,%xmm15
-	pxor	%xmm7,%xmm0
-	.byte	0xf3,0xc3
-.cfi_endproc	
-.size	_bsaes_encrypt8,.-_bsaes_encrypt8
-
-.type	_bsaes_decrypt8,@function
-.align	64
-_bsaes_decrypt8:
-.cfi_startproc	
-	leaq	.LBS0(%rip),%r11
-
-	movdqa	(%rax),%xmm8
-	leaq	16(%rax),%rax
-	movdqa	-48(%r11),%xmm7
-	pxor	%xmm8,%xmm15
-	pxor	%xmm8,%xmm0
-	pxor	%xmm8,%xmm1
-	pxor	%xmm8,%xmm2
-.byte	102,68,15,56,0,255
-.byte	102,15,56,0,199
-	pxor	%xmm8,%xmm3
-	pxor	%xmm8,%xmm4
-.byte	102,15,56,0,207
-.byte	102,15,56,0,215
-	pxor	%xmm8,%xmm5
-	pxor	%xmm8,%xmm6
-.byte	102,15,56,0,223
-.byte	102,15,56,0,231
-.byte	102,15,56,0,239
-.byte	102,15,56,0,247
-	movdqa	0(%r11),%xmm7
-	movdqa	16(%r11),%xmm8
-	movdqa	%xmm5,%xmm9
-	psrlq	$1,%xmm5
-	movdqa	%xmm3,%xmm10
-	psrlq	$1,%xmm3
-	pxor	%xmm6,%xmm5
-	pxor	%xmm4,%xmm3
-	pand	%xmm7,%xmm5
-	pand	%xmm7,%xmm3
-	pxor	%xmm5,%xmm6
-	psllq	$1,%xmm5
-	pxor	%xmm3,%xmm4
-	psllq	$1,%xmm3
-	pxor	%xmm9,%xmm5
-	pxor	%xmm10,%xmm3
-	movdqa	%xmm1,%xmm9
-	psrlq	$1,%xmm1
-	movdqa	%xmm15,%xmm10
-	psrlq	$1,%xmm15
-	pxor	%xmm2,%xmm1
-	pxor	%xmm0,%xmm15
-	pand	%xmm7,%xmm1
-	pand	%xmm7,%xmm15
-	pxor	%xmm1,%xmm2
-	psllq	$1,%xmm1
-	pxor	%xmm15,%xmm0
-	psllq	$1,%xmm15
-	pxor	%xmm9,%xmm1
-	pxor	%xmm10,%xmm15
-	movdqa	32(%r11),%xmm7
-	movdqa	%xmm4,%xmm9
-	psrlq	$2,%xmm4
-	movdqa	%xmm3,%xmm10
-	psrlq	$2,%xmm3
-	pxor	%xmm6,%xmm4
-	pxor	%xmm5,%xmm3
-	pand	%xmm8,%xmm4
-	pand	%xmm8,%xmm3
-	pxor	%xmm4,%xmm6
-	psllq	$2,%xmm4
-	pxor	%xmm3,%xmm5
-	psllq	$2,%xmm3
-	pxor	%xmm9,%xmm4
-	pxor	%xmm10,%xmm3
-	movdqa	%xmm0,%xmm9
-	psrlq	$2,%xmm0
-	movdqa	%xmm15,%xmm10
-	psrlq	$2,%xmm15
-	pxor	%xmm2,%xmm0
-	pxor	%xmm1,%xmm15
-	pand	%xmm8,%xmm0
-	pand	%xmm8,%xmm15
-	pxor	%xmm0,%xmm2
-	psllq	$2,%xmm0
-	pxor	%xmm15,%xmm1
-	psllq	$2,%xmm15
-	pxor	%xmm9,%xmm0
-	pxor	%xmm10,%xmm15
-	movdqa	%xmm2,%xmm9
-	psrlq	$4,%xmm2
-	movdqa	%xmm1,%xmm10
-	psrlq	$4,%xmm1
-	pxor	%xmm6,%xmm2
-	pxor	%xmm5,%xmm1
-	pand	%xmm7,%xmm2
-	pand	%xmm7,%xmm1
-	pxor	%xmm2,%xmm6
-	psllq	$4,%xmm2
-	pxor	%xmm1,%xmm5
-	psllq	$4,%xmm1
-	pxor	%xmm9,%xmm2
-	pxor	%xmm10,%xmm1
-	movdqa	%xmm0,%xmm9
-	psrlq	$4,%xmm0
-	movdqa	%xmm15,%xmm10
-	psrlq	$4,%xmm15
-	pxor	%xmm4,%xmm0
-	pxor	%xmm3,%xmm15
-	pand	%xmm7,%xmm0
-	pand	%xmm7,%xmm15
-	pxor	%xmm0,%xmm4
-	psllq	$4,%xmm0
-	pxor	%xmm15,%xmm3
-	psllq	$4,%xmm15
-	pxor	%xmm9,%xmm0
-	pxor	%xmm10,%xmm15
-	decl	%r10d
-	jmp	.Ldec_sbox
-.align	16
-.Ldec_loop:
-	pxor	0(%rax),%xmm15
-	pxor	16(%rax),%xmm0
-	pxor	32(%rax),%xmm1
-	pxor	48(%rax),%xmm2
-.byte	102,68,15,56,0,255
-.byte	102,15,56,0,199
-	pxor	64(%rax),%xmm3
-	pxor	80(%rax),%xmm4
-.byte	102,15,56,0,207
-.byte	102,15,56,0,215
-	pxor	96(%rax),%xmm5
-	pxor	112(%rax),%xmm6
-.byte	102,15,56,0,223
-.byte	102,15,56,0,231
-.byte	102,15,56,0,239
-.byte	102,15,56,0,247
-	leaq	128(%rax),%rax
-.Ldec_sbox:
-	pxor	%xmm3,%xmm2
-
-	pxor	%xmm6,%xmm3
-	pxor	%xmm6,%xmm1
-	pxor	%xmm3,%xmm5
-	pxor	%xmm5,%xmm6
-	pxor	%xmm6,%xmm0
-
-	pxor	%xmm0,%xmm15
-	pxor	%xmm4,%xmm1
-	pxor	%xmm15,%xmm2
-	pxor	%xmm15,%xmm4
-	pxor	%xmm2,%xmm0
-	movdqa	%xmm2,%xmm10
-	movdqa	%xmm6,%xmm9
-	movdqa	%xmm0,%xmm8
-	movdqa	%xmm3,%xmm12
-	movdqa	%xmm4,%xmm11
-
-	pxor	%xmm15,%xmm10
-	pxor	%xmm3,%xmm9
-	pxor	%xmm5,%xmm8
-	movdqa	%xmm10,%xmm13
-	pxor	%xmm15,%xmm12
-	movdqa	%xmm9,%xmm7
-	pxor	%xmm1,%xmm11
-	movdqa	%xmm10,%xmm14
-
-	por	%xmm8,%xmm9
-	por	%xmm11,%xmm10
-	pxor	%xmm7,%xmm14
-	pand	%xmm11,%xmm13
-	pxor	%xmm8,%xmm11
-	pand	%xmm8,%xmm7
-	pand	%xmm11,%xmm14
-	movdqa	%xmm5,%xmm11
-	pxor	%xmm1,%xmm11
-	pand	%xmm11,%xmm12
-	pxor	%xmm12,%xmm10
-	pxor	%xmm12,%xmm9
-	movdqa	%xmm2,%xmm12
-	movdqa	%xmm0,%xmm11
-	pxor	%xmm6,%xmm12
-	pxor	%xmm4,%xmm11
-	movdqa	%xmm12,%xmm8
-	pand	%xmm11,%xmm12
-	por	%xmm11,%xmm8
-	pxor	%xmm12,%xmm7
-	pxor	%xmm14,%xmm10
-	pxor	%xmm13,%xmm9
-	pxor	%xmm14,%xmm8
-	movdqa	%xmm3,%xmm11
-	pxor	%xmm13,%xmm7
-	movdqa	%xmm15,%xmm12
-	pxor	%xmm13,%xmm8
-	movdqa	%xmm6,%xmm13
-	pand	%xmm5,%xmm11
-	movdqa	%xmm2,%xmm14
-	pand	%xmm1,%xmm12
-	pand	%xmm0,%xmm13
-	por	%xmm4,%xmm14
-	pxor	%xmm11,%xmm10
-	pxor	%xmm12,%xmm9
-	pxor	%xmm13,%xmm8
-	pxor	%xmm14,%xmm7
-
-
-
-
-
-	movdqa	%xmm10,%xmm11
-	pand	%xmm8,%xmm10
-	pxor	%xmm9,%xmm11
-
-	movdqa	%xmm7,%xmm13
-	movdqa	%xmm11,%xmm14
-	pxor	%xmm10,%xmm13
-	pand	%xmm13,%xmm14
-
-	movdqa	%xmm8,%xmm12
-	pxor	%xmm9,%xmm14
-	pxor	%xmm7,%xmm12
-
-	pxor	%xmm9,%xmm10
-
-	pand	%xmm10,%xmm12
-
-	movdqa	%xmm13,%xmm9
-	pxor	%xmm7,%xmm12
-
-	pxor	%xmm12,%xmm9
-	pxor	%xmm12,%xmm8
-
-	pand	%xmm7,%xmm9
-
-	pxor	%xmm9,%xmm13
-	pxor	%xmm9,%xmm8
-
-	pand	%xmm14,%xmm13
-
-	pxor	%xmm11,%xmm13
-	movdqa	%xmm4,%xmm11
-	movdqa	%xmm0,%xmm7
-	movdqa	%xmm14,%xmm9
-	pxor	%xmm13,%xmm9
-	pand	%xmm4,%xmm9
-	pxor	%xmm0,%xmm4
-	pand	%xmm14,%xmm0
-	pand	%xmm13,%xmm4
-	pxor	%xmm0,%xmm4
-	pxor	%xmm9,%xmm0
-	pxor	%xmm1,%xmm11
-	pxor	%xmm5,%xmm7
-	pxor	%xmm12,%xmm14
-	pxor	%xmm8,%xmm13
-	movdqa	%xmm14,%xmm10
-	movdqa	%xmm12,%xmm9
-	pxor	%xmm13,%xmm10
-	pxor	%xmm8,%xmm9
-	pand	%xmm11,%xmm10
-	pand	%xmm1,%xmm9
-	pxor	%xmm7,%xmm11
-	pxor	%xmm5,%xmm1
-	pand	%xmm14,%xmm7
-	pand	%xmm12,%xmm5
-	pand	%xmm13,%xmm11
-	pand	%xmm8,%xmm1
-	pxor	%xmm11,%xmm7
-	pxor	%xmm5,%xmm1
-	pxor	%xmm10,%xmm11
-	pxor	%xmm9,%xmm5
-	pxor	%xmm11,%xmm4
-	pxor	%xmm11,%xmm1
-	pxor	%xmm7,%xmm0
-	pxor	%xmm7,%xmm5
-
-	movdqa	%xmm2,%xmm11
-	movdqa	%xmm6,%xmm7
-	pxor	%xmm15,%xmm11
-	pxor	%xmm3,%xmm7
-	movdqa	%xmm14,%xmm10
-	movdqa	%xmm12,%xmm9
-	pxor	%xmm13,%xmm10
-	pxor	%xmm8,%xmm9
-	pand	%xmm11,%xmm10
-	pand	%xmm15,%xmm9
-	pxor	%xmm7,%xmm11
-	pxor	%xmm3,%xmm15
-	pand	%xmm14,%xmm7
-	pand	%xmm12,%xmm3
-	pand	%xmm13,%xmm11
-	pand	%xmm8,%xmm15
-	pxor	%xmm11,%xmm7
-	pxor	%xmm3,%xmm15
-	pxor	%xmm10,%xmm11
-	pxor	%xmm9,%xmm3
-	pxor	%xmm12,%xmm14
-	pxor	%xmm8,%xmm13
-	movdqa	%xmm14,%xmm10
-	pxor	%xmm13,%xmm10
-	pand	%xmm2,%xmm10
-	pxor	%xmm6,%xmm2
-	pand	%xmm14,%xmm6
-	pand	%xmm13,%xmm2
-	pxor	%xmm6,%xmm2
-	pxor	%xmm10,%xmm6
-	pxor	%xmm11,%xmm2
-	pxor	%xmm11,%xmm15
-	pxor	%xmm7,%xmm6
-	pxor	%xmm7,%xmm3
-	pxor	%xmm6,%xmm0
-	pxor	%xmm4,%xmm5
-
-	pxor	%xmm0,%xmm3
-	pxor	%xmm6,%xmm1
-	pxor	%xmm6,%xmm4
-	pxor	%xmm1,%xmm3
-	pxor	%xmm15,%xmm6
-	pxor	%xmm4,%xmm3
-	pxor	%xmm5,%xmm2
-	pxor	%xmm0,%xmm5
-	pxor	%xmm3,%xmm2
-
-	pxor	%xmm15,%xmm3
-	pxor	%xmm2,%xmm6
-	decl	%r10d
-	jl	.Ldec_done
-
-	pshufd	$0x4E,%xmm15,%xmm7
-	pshufd	$0x4E,%xmm2,%xmm13
-	pxor	%xmm15,%xmm7
-	pshufd	$0x4E,%xmm4,%xmm14
-	pxor	%xmm2,%xmm13
-	pshufd	$0x4E,%xmm0,%xmm8
-	pxor	%xmm4,%xmm14
-	pshufd	$0x4E,%xmm5,%xmm9
-	pxor	%xmm0,%xmm8
-	pshufd	$0x4E,%xmm3,%xmm10
-	pxor	%xmm5,%xmm9
-	pxor	%xmm13,%xmm15
-	pxor	%xmm13,%xmm0
-	pshufd	$0x4E,%xmm1,%xmm11
-	pxor	%xmm3,%xmm10
-	pxor	%xmm7,%xmm5
-	pxor	%xmm8,%xmm3
-	pshufd	$0x4E,%xmm6,%xmm12
-	pxor	%xmm1,%xmm11
-	pxor	%xmm14,%xmm0
-	pxor	%xmm9,%xmm1
-	pxor	%xmm6,%xmm12
-
-	pxor	%xmm14,%xmm5
-	pxor	%xmm13,%xmm3
-	pxor	%xmm13,%xmm1
-	pxor	%xmm10,%xmm6
-	pxor	%xmm11,%xmm2
-	pxor	%xmm14,%xmm1
-	pxor	%xmm14,%xmm6
-	pxor	%xmm12,%xmm4
-	pshufd	$0x93,%xmm15,%xmm7
-	pshufd	$0x93,%xmm0,%xmm8
-	pxor	%xmm7,%xmm15
-	pshufd	$0x93,%xmm5,%xmm9
-	pxor	%xmm8,%xmm0
-	pshufd	$0x93,%xmm3,%xmm10
-	pxor	%xmm9,%xmm5
-	pshufd	$0x93,%xmm1,%xmm11
-	pxor	%xmm10,%xmm3
-	pshufd	$0x93,%xmm6,%xmm12
-	pxor	%xmm11,%xmm1
-	pshufd	$0x93,%xmm2,%xmm13
-	pxor	%xmm12,%xmm6
-	pshufd	$0x93,%xmm4,%xmm14
-	pxor	%xmm13,%xmm2
-	pxor	%xmm14,%xmm4
-
-	pxor	%xmm15,%xmm8
-	pxor	%xmm4,%xmm7
-	pxor	%xmm4,%xmm8
-	pshufd	$0x4E,%xmm15,%xmm15
-	pxor	%xmm0,%xmm9
-	pshufd	$0x4E,%xmm0,%xmm0
-	pxor	%xmm1,%xmm12
-	pxor	%xmm7,%xmm15
-	pxor	%xmm6,%xmm13
-	pxor	%xmm8,%xmm0
-	pxor	%xmm3,%xmm11
-	pshufd	$0x4E,%xmm1,%xmm7
-	pxor	%xmm2,%xmm14
-	pshufd	$0x4E,%xmm6,%xmm8
-	pxor	%xmm5,%xmm10
-	pshufd	$0x4E,%xmm3,%xmm1
-	pxor	%xmm4,%xmm10
-	pshufd	$0x4E,%xmm4,%xmm6
-	pxor	%xmm4,%xmm11
-	pshufd	$0x4E,%xmm2,%xmm3
-	pxor	%xmm11,%xmm7
-	pshufd	$0x4E,%xmm5,%xmm2
-	pxor	%xmm12,%xmm8
-	pxor	%xmm1,%xmm10
-	pxor	%xmm14,%xmm6
-	pxor	%xmm3,%xmm13
-	movdqa	%xmm7,%xmm3
-	pxor	%xmm9,%xmm2
-	movdqa	%xmm13,%xmm5
-	movdqa	%xmm8,%xmm4
-	movdqa	%xmm2,%xmm1
-	movdqa	%xmm10,%xmm2
-	movdqa	-16(%r11),%xmm7
-	jnz	.Ldec_loop
-	movdqa	-32(%r11),%xmm7
-	jmp	.Ldec_loop
-.align	16
-.Ldec_done:
-	movdqa	0(%r11),%xmm7
-	movdqa	16(%r11),%xmm8
-	movdqa	%xmm2,%xmm9
-	psrlq	$1,%xmm2
-	movdqa	%xmm1,%xmm10
-	psrlq	$1,%xmm1
-	pxor	%xmm4,%xmm2
-	pxor	%xmm6,%xmm1
-	pand	%xmm7,%xmm2
-	pand	%xmm7,%xmm1
-	pxor	%xmm2,%xmm4
-	psllq	$1,%xmm2
-	pxor	%xmm1,%xmm6
-	psllq	$1,%xmm1
-	pxor	%xmm9,%xmm2
-	pxor	%xmm10,%xmm1
-	movdqa	%xmm5,%xmm9
-	psrlq	$1,%xmm5
-	movdqa	%xmm15,%xmm10
-	psrlq	$1,%xmm15
-	pxor	%xmm3,%xmm5
-	pxor	%xmm0,%xmm15
-	pand	%xmm7,%xmm5
-	pand	%xmm7,%xmm15
-	pxor	%xmm5,%xmm3
-	psllq	$1,%xmm5
-	pxor	%xmm15,%xmm0
-	psllq	$1,%xmm15
-	pxor	%xmm9,%xmm5
-	pxor	%xmm10,%xmm15
-	movdqa	32(%r11),%xmm7
-	movdqa	%xmm6,%xmm9
-	psrlq	$2,%xmm6
-	movdqa	%xmm1,%xmm10
-	psrlq	$2,%xmm1
-	pxor	%xmm4,%xmm6
-	pxor	%xmm2,%xmm1
-	pand	%xmm8,%xmm6
-	pand	%xmm8,%xmm1
-	pxor	%xmm6,%xmm4
-	psllq	$2,%xmm6
-	pxor	%xmm1,%xmm2
-	psllq	$2,%xmm1
-	pxor	%xmm9,%xmm6
-	pxor	%xmm10,%xmm1
-	movdqa	%xmm0,%xmm9
-	psrlq	$2,%xmm0
-	movdqa	%xmm15,%xmm10
-	psrlq	$2,%xmm15
-	pxor	%xmm3,%xmm0
-	pxor	%xmm5,%xmm15
-	pand	%xmm8,%xmm0
-	pand	%xmm8,%xmm15
-	pxor	%xmm0,%xmm3
-	psllq	$2,%xmm0
-	pxor	%xmm15,%xmm5
-	psllq	$2,%xmm15
-	pxor	%xmm9,%xmm0
-	pxor	%xmm10,%xmm15
-	movdqa	%xmm3,%xmm9
-	psrlq	$4,%xmm3
-	movdqa	%xmm5,%xmm10
-	psrlq	$4,%xmm5
-	pxor	%xmm4,%xmm3
-	pxor	%xmm2,%xmm5
-	pand	%xmm7,%xmm3
-	pand	%xmm7,%xmm5
-	pxor	%xmm3,%xmm4
-	psllq	$4,%xmm3
-	pxor	%xmm5,%xmm2
-	psllq	$4,%xmm5
-	pxor	%xmm9,%xmm3
-	pxor	%xmm10,%xmm5
-	movdqa	%xmm0,%xmm9
-	psrlq	$4,%xmm0
-	movdqa	%xmm15,%xmm10
-	psrlq	$4,%xmm15
-	pxor	%xmm6,%xmm0
-	pxor	%xmm1,%xmm15
-	pand	%xmm7,%xmm0
-	pand	%xmm7,%xmm15
-	pxor	%xmm0,%xmm6
-	psllq	$4,%xmm0
-	pxor	%xmm15,%xmm1
-	psllq	$4,%xmm15
-	pxor	%xmm9,%xmm0
-	pxor	%xmm10,%xmm15
-	movdqa	(%rax),%xmm7
-	pxor	%xmm7,%xmm5
-	pxor	%xmm7,%xmm3
-	pxor	%xmm7,%xmm1
-	pxor	%xmm7,%xmm6
-	pxor	%xmm7,%xmm2
-	pxor	%xmm7,%xmm4
-	pxor	%xmm7,%xmm15
-	pxor	%xmm7,%xmm0
-	.byte	0xf3,0xc3
-.cfi_endproc	
-.size	_bsaes_decrypt8,.-_bsaes_decrypt8
-.type	_bsaes_key_convert,@function
-.align	16
-_bsaes_key_convert:
-.cfi_startproc	
-	leaq	.Lmasks(%rip),%r11
-	movdqu	(%rcx),%xmm7
-	leaq	16(%rcx),%rcx
-	movdqa	0(%r11),%xmm0
-	movdqa	16(%r11),%xmm1
-	movdqa	32(%r11),%xmm2
-	movdqa	48(%r11),%xmm3
-	movdqa	64(%r11),%xmm4
-	pcmpeqd	%xmm5,%xmm5
-
-	movdqu	(%rcx),%xmm6
-	movdqa	%xmm7,(%rax)
-	leaq	16(%rax),%rax
-	decl	%r10d
-	jmp	.Lkey_loop
-.align	16
-.Lkey_loop:
-.byte	102,15,56,0,244
-
-	movdqa	%xmm0,%xmm8
-	movdqa	%xmm1,%xmm9
-
-	pand	%xmm6,%xmm8
-	pand	%xmm6,%xmm9
-	movdqa	%xmm2,%xmm10
-	pcmpeqb	%xmm0,%xmm8
-	psllq	$4,%xmm0
-	movdqa	%xmm3,%xmm11
-	pcmpeqb	%xmm1,%xmm9
-	psllq	$4,%xmm1
-
-	pand	%xmm6,%xmm10
-	pand	%xmm6,%xmm11
-	movdqa	%xmm0,%xmm12
-	pcmpeqb	%xmm2,%xmm10
-	psllq	$4,%xmm2
-	movdqa	%xmm1,%xmm13
-	pcmpeqb	%xmm3,%xmm11
-	psllq	$4,%xmm3
-
-	movdqa	%xmm2,%xmm14
-	movdqa	%xmm3,%xmm15
-	pxor	%xmm5,%xmm8
-	pxor	%xmm5,%xmm9
-
-	pand	%xmm6,%xmm12
-	pand	%xmm6,%xmm13
-	movdqa	%xmm8,0(%rax)
-	pcmpeqb	%xmm0,%xmm12
-	psrlq	$4,%xmm0
-	movdqa	%xmm9,16(%rax)
-	pcmpeqb	%xmm1,%xmm13
-	psrlq	$4,%xmm1
-	leaq	16(%rcx),%rcx
-
-	pand	%xmm6,%xmm14
-	pand	%xmm6,%xmm15
-	movdqa	%xmm10,32(%rax)
-	pcmpeqb	%xmm2,%xmm14
-	psrlq	$4,%xmm2
-	movdqa	%xmm11,48(%rax)
-	pcmpeqb	%xmm3,%xmm15
-	psrlq	$4,%xmm3
-	movdqu	(%rcx),%xmm6
-
-	pxor	%xmm5,%xmm13
-	pxor	%xmm5,%xmm14
-	movdqa	%xmm12,64(%rax)
-	movdqa	%xmm13,80(%rax)
-	movdqa	%xmm14,96(%rax)
-	movdqa	%xmm15,112(%rax)
-	leaq	128(%rax),%rax
-	decl	%r10d
-	jnz	.Lkey_loop
-
-	movdqa	80(%r11),%xmm7
-
-	.byte	0xf3,0xc3
-.cfi_endproc	
-.size	_bsaes_key_convert,.-_bsaes_key_convert
-
-.globl	bsaes_cbc_encrypt
-.type	bsaes_cbc_encrypt,@function
-.align	16
-bsaes_cbc_encrypt:
-.cfi_startproc	
-	cmpl	$0,%r9d
-	jne	asm_AES_cbc_encrypt
-	cmpq	$128,%rdx
-	jb	asm_AES_cbc_encrypt
-
-	movq	%rsp,%rax
-.Lcbc_dec_prologue:
-	pushq	%rbp
-.cfi_adjust_cfa_offset	8
-.cfi_offset	%rbp,-16
-	pushq	%rbx
-.cfi_adjust_cfa_offset	8
-.cfi_offset	%rbx,-24
-	pushq	%r12
-.cfi_adjust_cfa_offset	8
-.cfi_offset	%r12,-32
-	pushq	%r13
-.cfi_adjust_cfa_offset	8
-.cfi_offset	%r13,-40
-	pushq	%r14
-.cfi_adjust_cfa_offset	8
-.cfi_offset	%r14,-48
-	pushq	%r15
-.cfi_adjust_cfa_offset	8
-.cfi_offset	%r15,-56
-	leaq	-72(%rsp),%rsp
-.cfi_adjust_cfa_offset	0x48
-	movq	%rsp,%rbp
-.cfi_def_cfa_register	%rbp
-	movl	240(%rcx),%eax
-	movq	%rdi,%r12
-	movq	%rsi,%r13
-	movq	%rdx,%r14
-	movq	%rcx,%r15
-	movq	%r8,%rbx
-	shrq	$4,%r14
-
-	movl	%eax,%edx
-	shlq	$7,%rax
-	subq	$96,%rax
-	subq	%rax,%rsp
-
-	movq	%rsp,%rax
-	movq	%r15,%rcx
-	movl	%edx,%r10d
-	call	_bsaes_key_convert
-	pxor	(%rsp),%xmm7
-	movdqa	%xmm6,(%rax)
-	movdqa	%xmm7,(%rsp)
-
-	movdqu	(%rbx),%xmm14
-	subq	$8,%r14
-.Lcbc_dec_loop:
-	movdqu	0(%r12),%xmm15
-	movdqu	16(%r12),%xmm0
-	movdqu	32(%r12),%xmm1
-	movdqu	48(%r12),%xmm2
-	movdqu	64(%r12),%xmm3
-	movdqu	80(%r12),%xmm4
-	movq	%rsp,%rax
-	movdqu	96(%r12),%xmm5
-	movl	%edx,%r10d
-	movdqu	112(%r12),%xmm6
-	movdqa	%xmm14,32(%rbp)
-
-	call	_bsaes_decrypt8
-
-	pxor	32(%rbp),%xmm15
-	movdqu	0(%r12),%xmm7
-	movdqu	16(%r12),%xmm8
-	pxor	%xmm7,%xmm0
-	movdqu	32(%r12),%xmm9
-	pxor	%xmm8,%xmm5
-	movdqu	48(%r12),%xmm10
-	pxor	%xmm9,%xmm3
-	movdqu	64(%r12),%xmm11
-	pxor	%xmm10,%xmm1
-	movdqu	80(%r12),%xmm12
-	pxor	%xmm11,%xmm6
-	movdqu	96(%r12),%xmm13
-	pxor	%xmm12,%xmm2
-	movdqu	112(%r12),%xmm14
-	pxor	%xmm13,%xmm4
-	movdqu	%xmm15,0(%r13)
-	leaq	128(%r12),%r12
-	movdqu	%xmm0,16(%r13)
-	movdqu	%xmm5,32(%r13)
-	movdqu	%xmm3,48(%r13)
-	movdqu	%xmm1,64(%r13)
-	movdqu	%xmm6,80(%r13)
-	movdqu	%xmm2,96(%r13)
-	movdqu	%xmm4,112(%r13)
-	leaq	128(%r13),%r13
-	subq	$8,%r14
-	jnc	.Lcbc_dec_loop
-
-	addq	$8,%r14
-	jz	.Lcbc_dec_done
-
-	movdqu	0(%r12),%xmm15
-	movq	%rsp,%rax
-	movl	%edx,%r10d
-	cmpq	$2,%r14
-	jb	.Lcbc_dec_one
-	movdqu	16(%r12),%xmm0
-	je	.Lcbc_dec_two
-	movdqu	32(%r12),%xmm1
-	cmpq	$4,%r14
-	jb	.Lcbc_dec_three
-	movdqu	48(%r12),%xmm2
-	je	.Lcbc_dec_four
-	movdqu	64(%r12),%xmm3
-	cmpq	$6,%r14
-	jb	.Lcbc_dec_five
-	movdqu	80(%r12),%xmm4
-	je	.Lcbc_dec_six
-	movdqu	96(%r12),%xmm5
-	movdqa	%xmm14,32(%rbp)
-	call	_bsaes_decrypt8
-	pxor	32(%rbp),%xmm15
-	movdqu	0(%r12),%xmm7
-	movdqu	16(%r12),%xmm8
-	pxor	%xmm7,%xmm0
-	movdqu	32(%r12),%xmm9
-	pxor	%xmm8,%xmm5
-	movdqu	48(%r12),%xmm10
-	pxor	%xmm9,%xmm3
-	movdqu	64(%r12),%xmm11
-	pxor	%xmm10,%xmm1
-	movdqu	80(%r12),%xmm12
-	pxor	%xmm11,%xmm6
-	movdqu	96(%r12),%xmm14
-	pxor	%xmm12,%xmm2
-	movdqu	%xmm15,0(%r13)
-	movdqu	%xmm0,16(%r13)
-	movdqu	%xmm5,32(%r13)
-	movdqu	%xmm3,48(%r13)
-	movdqu	%xmm1,64(%r13)
-	movdqu	%xmm6,80(%r13)
-	movdqu	%xmm2,96(%r13)
-	jmp	.Lcbc_dec_done
-.align	16
-.Lcbc_dec_six:
-	movdqa	%xmm14,32(%rbp)
-	call	_bsaes_decrypt8
-	pxor	32(%rbp),%xmm15
-	movdqu	0(%r12),%xmm7
-	movdqu	16(%r12),%xmm8
-	pxor	%xmm7,%xmm0
-	movdqu	32(%r12),%xmm9
-	pxor	%xmm8,%xmm5
-	movdqu	48(%r12),%xmm10
-	pxor	%xmm9,%xmm3
-	movdqu	64(%r12),%xmm11
-	pxor	%xmm10,%xmm1
-	movdqu	80(%r12),%xmm14
-	pxor	%xmm11,%xmm6
-	movdqu	%xmm15,0(%r13)
-	movdqu	%xmm0,16(%r13)
-	movdqu	%xmm5,32(%r13)
-	movdqu	%xmm3,48(%r13)
-	movdqu	%xmm1,64(%r13)
-	movdqu	%xmm6,80(%r13)
-	jmp	.Lcbc_dec_done
-.align	16
-.Lcbc_dec_five:
-	movdqa	%xmm14,32(%rbp)
-	call	_bsaes_decrypt8
-	pxor	32(%rbp),%xmm15
-	movdqu	0(%r12),%xmm7
-	movdqu	16(%r12),%xmm8
-	pxor	%xmm7,%xmm0
-	movdqu	32(%r12),%xmm9
-	pxor	%xmm8,%xmm5
-	movdqu	48(%r12),%xmm10
-	pxor	%xmm9,%xmm3
-	movdqu	64(%r12),%xmm14
-	pxor	%xmm10,%xmm1
-	movdqu	%xmm15,0(%r13)
-	movdqu	%xmm0,16(%r13)
-	movdqu	%xmm5,32(%r13)
-	movdqu	%xmm3,48(%r13)
-	movdqu	%xmm1,64(%r13)
-	jmp	.Lcbc_dec_done
-.align	16
-.Lcbc_dec_four:
-	movdqa	%xmm14,32(%rbp)
-	call	_bsaes_decrypt8
-	pxor	32(%rbp),%xmm15
-	movdqu	0(%r12),%xmm7
-	movdqu	16(%r12),%xmm8
-	pxor	%xmm7,%xmm0
-	movdqu	32(%r12),%xmm9
-	pxor	%xmm8,%xmm5
-	movdqu	48(%r12),%xmm14
-	pxor	%xmm9,%xmm3
-	movdqu	%xmm15,0(%r13)
-	movdqu	%xmm0,16(%r13)
-	movdqu	%xmm5,32(%r13)
-	movdqu	%xmm3,48(%r13)
-	jmp	.Lcbc_dec_done
-.align	16
-.Lcbc_dec_three:
-	movdqa	%xmm14,32(%rbp)
-	call	_bsaes_decrypt8
-	pxor	32(%rbp),%xmm15
-	movdqu	0(%r12),%xmm7
-	movdqu	16(%r12),%xmm8
-	pxor	%xmm7,%xmm0
-	movdqu	32(%r12),%xmm14
-	pxor	%xmm8,%xmm5
-	movdqu	%xmm15,0(%r13)
-	movdqu	%xmm0,16(%r13)
-	movdqu	%xmm5,32(%r13)
-	jmp	.Lcbc_dec_done
-.align	16
-.Lcbc_dec_two:
-	movdqa	%xmm14,32(%rbp)
-	call	_bsaes_decrypt8
-	pxor	32(%rbp),%xmm15
-	movdqu	0(%r12),%xmm7
-	movdqu	16(%r12),%xmm14
-	pxor	%xmm7,%xmm0
-	movdqu	%xmm15,0(%r13)
-	movdqu	%xmm0,16(%r13)
-	jmp	.Lcbc_dec_done
-.align	16
-.Lcbc_dec_one:
-	leaq	(%r12),%rdi
-	leaq	32(%rbp),%rsi
-	leaq	(%r15),%rdx
-	call	asm_AES_decrypt
-	pxor	32(%rbp),%xmm14
-	movdqu	%xmm14,(%r13)
-	movdqa	%xmm15,%xmm14
-
-.Lcbc_dec_done:
-	movdqu	%xmm14,(%rbx)
-	leaq	(%rsp),%rax
-	pxor	%xmm0,%xmm0
-.Lcbc_dec_bzero:
-	movdqa	%xmm0,0(%rax)
-	movdqa	%xmm0,16(%rax)
-	leaq	32(%rax),%rax
-	cmpq	%rax,%rbp
-	ja	.Lcbc_dec_bzero
-
-	leaq	120(%rbp),%rax
-.cfi_def_cfa	%rax,8
-	movq	-48(%rax),%r15
-.cfi_restore	%r15
-	movq	-40(%rax),%r14
-.cfi_restore	%r14
-	movq	-32(%rax),%r13
-.cfi_restore	%r13
-	movq	-24(%rax),%r12
-.cfi_restore	%r12
-	movq	-16(%rax),%rbx
-.cfi_restore	%rbx
-	movq	-8(%rax),%rbp
-.cfi_restore	%rbp
-	leaq	(%rax),%rsp
-.cfi_def_cfa_register	%rsp
-.Lcbc_dec_epilogue:
-	.byte	0xf3,0xc3
-.cfi_endproc	
-.size	bsaes_cbc_encrypt,.-bsaes_cbc_encrypt
-
-.globl	bsaes_ctr32_encrypt_blocks
-.type	bsaes_ctr32_encrypt_blocks,@function
-.align	16
-bsaes_ctr32_encrypt_blocks:
-.cfi_startproc	
-	movq	%rsp,%rax
-.Lctr_enc_prologue:
-	pushq	%rbp
-.cfi_adjust_cfa_offset	8
-.cfi_offset	%rbp,-16
-	pushq	%rbx
-.cfi_adjust_cfa_offset	8
-.cfi_offset	%rbx,-24
-	pushq	%r12
-.cfi_adjust_cfa_offset	8
-.cfi_offset	%r12,-32
-	pushq	%r13
-.cfi_adjust_cfa_offset	8
-.cfi_offset	%r13,-40
-	pushq	%r14
-.cfi_adjust_cfa_offset	8
-.cfi_offset	%r14,-48
-	pushq	%r15
-.cfi_adjust_cfa_offset	8
-.cfi_offset	%r15,-56
-	leaq	-72(%rsp),%rsp
-.cfi_adjust_cfa_offset	0x48
-	movq	%rsp,%rbp
-.cfi_def_cfa_register	%rbp
-	movdqu	(%r8),%xmm0
-	movl	240(%rcx),%eax
-	movq	%rdi,%r12
-	movq	%rsi,%r13
-	movq	%rdx,%r14
-	movq	%rcx,%r15
-	movdqa	%xmm0,32(%rbp)
-	cmpq	$8,%rdx
-	jb	.Lctr_enc_short
-
-	movl	%eax,%ebx
-	shlq	$7,%rax
-	subq	$96,%rax
-	subq	%rax,%rsp
-
-	movq	%rsp,%rax
-	movq	%r15,%rcx
-	movl	%ebx,%r10d
-	call	_bsaes_key_convert
-	pxor	%xmm6,%xmm7
-	movdqa	%xmm7,(%rax)
-
-	movdqa	(%rsp),%xmm8
-	leaq	.LADD1(%rip),%r11
-	movdqa	32(%rbp),%xmm15
-	movdqa	-32(%r11),%xmm7
-.byte	102,68,15,56,0,199
-.byte	102,68,15,56,0,255
-	movdqa	%xmm8,(%rsp)
-	jmp	.Lctr_enc_loop
-.align	16
-.Lctr_enc_loop:
-	movdqa	%xmm15,32(%rbp)
-	movdqa	%xmm15,%xmm0
-	movdqa	%xmm15,%xmm1
-	paddd	0(%r11),%xmm0
-	movdqa	%xmm15,%xmm2
-	paddd	16(%r11),%xmm1
-	movdqa	%xmm15,%xmm3
-	paddd	32(%r11),%xmm2
-	movdqa	%xmm15,%xmm4
-	paddd	48(%r11),%xmm3
-	movdqa	%xmm15,%xmm5
-	paddd	64(%r11),%xmm4
-	movdqa	%xmm15,%xmm6
-	paddd	80(%r11),%xmm5
-	paddd	96(%r11),%xmm6
-
-
-
-	movdqa	(%rsp),%xmm8
-	leaq	16(%rsp),%rax
-	movdqa	-16(%r11),%xmm7
-	pxor	%xmm8,%xmm15
-	pxor	%xmm8,%xmm0
-	pxor	%xmm8,%xmm1
-	pxor	%xmm8,%xmm2
-.byte	102,68,15,56,0,255
-.byte	102,15,56,0,199
-	pxor	%xmm8,%xmm3
-	pxor	%xmm8,%xmm4
-.byte	102,15,56,0,207
-.byte	102,15,56,0,215
-	pxor	%xmm8,%xmm5
-	pxor	%xmm8,%xmm6
-.byte	102,15,56,0,223
-.byte	102,15,56,0,231
-.byte	102,15,56,0,239
-.byte	102,15,56,0,247
-	leaq	.LBS0(%rip),%r11
-	movl	%ebx,%r10d
-
-	call	_bsaes_encrypt8_bitslice
-
-	subq	$8,%r14
-	jc	.Lctr_enc_loop_done
-
-	movdqu	0(%r12),%xmm7
-	movdqu	16(%r12),%xmm8
-	movdqu	32(%r12),%xmm9
-	movdqu	48(%r12),%xmm10
-	movdqu	64(%r12),%xmm11
-	movdqu	80(%r12),%xmm12
-	movdqu	96(%r12),%xmm13
-	movdqu	112(%r12),%xmm14
-	leaq	128(%r12),%r12
-	pxor	%xmm15,%xmm7
-	movdqa	32(%rbp),%xmm15
-	pxor	%xmm8,%xmm0
-	movdqu	%xmm7,0(%r13)
-	pxor	%xmm9,%xmm3
-	movdqu	%xmm0,16(%r13)
-	pxor	%xmm10,%xmm5
-	movdqu	%xmm3,32(%r13)
-	pxor	%xmm11,%xmm2
-	movdqu	%xmm5,48(%r13)
-	pxor	%xmm12,%xmm6
-	movdqu	%xmm2,64(%r13)
-	pxor	%xmm13,%xmm1
-	movdqu	%xmm6,80(%r13)
-	pxor	%xmm14,%xmm4
-	movdqu	%xmm1,96(%r13)
-	leaq	.LADD1(%rip),%r11
-	movdqu	%xmm4,112(%r13)
-	leaq	128(%r13),%r13
-	paddd	112(%r11),%xmm15
-	jnz	.Lctr_enc_loop
-
-	jmp	.Lctr_enc_done
-.align	16
-.Lctr_enc_loop_done:
-	addq	$8,%r14
-	movdqu	0(%r12),%xmm7
-	pxor	%xmm7,%xmm15
-	movdqu	%xmm15,0(%r13)
-	cmpq	$2,%r14
-	jb	.Lctr_enc_done
-	movdqu	16(%r12),%xmm8
-	pxor	%xmm8,%xmm0
-	movdqu	%xmm0,16(%r13)
-	je	.Lctr_enc_done
-	movdqu	32(%r12),%xmm9
-	pxor	%xmm9,%xmm3
-	movdqu	%xmm3,32(%r13)
-	cmpq	$4,%r14
-	jb	.Lctr_enc_done
-	movdqu	48(%r12),%xmm10
-	pxor	%xmm10,%xmm5
-	movdqu	%xmm5,48(%r13)
-	je	.Lctr_enc_done
-	movdqu	64(%r12),%xmm11
-	pxor	%xmm11,%xmm2
-	movdqu	%xmm2,64(%r13)
-	cmpq	$6,%r14
-	jb	.Lctr_enc_done
-	movdqu	80(%r12),%xmm12
-	pxor	%xmm12,%xmm6
-	movdqu	%xmm6,80(%r13)
-	je	.Lctr_enc_done
-	movdqu	96(%r12),%xmm13
-	pxor	%xmm13,%xmm1
-	movdqu	%xmm1,96(%r13)
-	jmp	.Lctr_enc_done
-
-.align	16
-.Lctr_enc_short:
-	leaq	32(%rbp),%rdi
-	leaq	48(%rbp),%rsi
-	leaq	(%r15),%rdx
-	call	asm_AES_encrypt
-	movdqu	(%r12),%xmm0
-	leaq	16(%r12),%r12
-	movl	44(%rbp),%eax
-	bswapl	%eax
-	pxor	48(%rbp),%xmm0
-	incl	%eax
-	movdqu	%xmm0,(%r13)
-	bswapl	%eax
-	leaq	16(%r13),%r13
-	movl	%eax,44(%rsp)
-	decq	%r14
-	jnz	.Lctr_enc_short
-
-.Lctr_enc_done:
-	leaq	(%rsp),%rax
-	pxor	%xmm0,%xmm0
-.Lctr_enc_bzero:
-	movdqa	%xmm0,0(%rax)
-	movdqa	%xmm0,16(%rax)
-	leaq	32(%rax),%rax
-	cmpq	%rax,%rbp
-	ja	.Lctr_enc_bzero
-
-	leaq	120(%rbp),%rax
-.cfi_def_cfa	%rax,8
-	movq	-48(%rax),%r15
-.cfi_restore	%r15
-	movq	-40(%rax),%r14
-.cfi_restore	%r14
-	movq	-32(%rax),%r13
-.cfi_restore	%r13
-	movq	-24(%rax),%r12
-.cfi_restore	%r12
-	movq	-16(%rax),%rbx
-.cfi_restore	%rbx
-	movq	-8(%rax),%rbp
-.cfi_restore	%rbp
-	leaq	(%rax),%rsp
-.cfi_def_cfa_register	%rsp
-.Lctr_enc_epilogue:
-	.byte	0xf3,0xc3
-.cfi_endproc	
-.size	bsaes_ctr32_encrypt_blocks,.-bsaes_ctr32_encrypt_blocks
-.globl	bsaes_xts_encrypt
-.type	bsaes_xts_encrypt,@function
-.align	16
-bsaes_xts_encrypt:
-.cfi_startproc	
-	movq	%rsp,%rax
-.Lxts_enc_prologue:
-	pushq	%rbp
-.cfi_adjust_cfa_offset	8
-.cfi_offset	%rbp,-16
-	pushq	%rbx
-.cfi_adjust_cfa_offset	8
-.cfi_offset	%rbx,-24
-	pushq	%r12
-.cfi_adjust_cfa_offset	8
-.cfi_offset	%r12,-32
-	pushq	%r13
-.cfi_adjust_cfa_offset	8
-.cfi_offset	%r13,-40
-	pushq	%r14
-.cfi_adjust_cfa_offset	8
-.cfi_offset	%r14,-48
-	pushq	%r15
-.cfi_adjust_cfa_offset	8
-.cfi_offset	%r15,-56
-	leaq	-72(%rsp),%rsp
-.cfi_adjust_cfa_offset	0x48
-	movq	%rsp,%rbp
-.cfi_def_cfa_register	%rbp
-	movq	%rdi,%r12
-	movq	%rsi,%r13
-	movq	%rdx,%r14
-	movq	%rcx,%r15
-
-	leaq	(%r9),%rdi
-	leaq	32(%rbp),%rsi
-	leaq	(%r8),%rdx
-	call	asm_AES_encrypt
-
-	movl	240(%r15),%eax
-	movq	%r14,%rbx
-
-	movl	%eax,%edx
-	shlq	$7,%rax
-	subq	$96,%rax
-	subq	%rax,%rsp
-
-	movq	%rsp,%rax
-	movq	%r15,%rcx
-	movl	%edx,%r10d
-	call	_bsaes_key_convert
-	pxor	%xmm6,%xmm7
-	movdqa	%xmm7,(%rax)
-
-	andq	$-16,%r14
-	subq	$0x80,%rsp
-	movdqa	32(%rbp),%xmm6
-
-	pxor	%xmm14,%xmm14
-	movdqa	.Lxts_magic(%rip),%xmm12
-	pcmpgtd	%xmm6,%xmm14
-
-	subq	$0x80,%r14
-	jc	.Lxts_enc_short
-	jmp	.Lxts_enc_loop
-
-.align	16
-.Lxts_enc_loop:
-	pshufd	$0x13,%xmm14,%xmm13
-	pxor	%xmm14,%xmm14
-	movdqa	%xmm6,%xmm15
-	movdqa	%xmm6,0(%rsp)
-	paddq	%xmm6,%xmm6
-	pand	%xmm12,%xmm13
-	pcmpgtd	%xmm6,%xmm14
-	pxor	%xmm13,%xmm6
-	pshufd	$0x13,%xmm14,%xmm13
-	pxor	%xmm14,%xmm14
-	movdqa	%xmm6,%xmm0
-	movdqa	%xmm6,16(%rsp)
-	paddq	%xmm6,%xmm6
-	pand	%xmm12,%xmm13
-	pcmpgtd	%xmm6,%xmm14
-	pxor	%xmm13,%xmm6
-	movdqu	0(%r12),%xmm7
-	pshufd	$0x13,%xmm14,%xmm13
-	pxor	%xmm14,%xmm14
-	movdqa	%xmm6,%xmm1
-	movdqa	%xmm6,32(%rsp)
-	paddq	%xmm6,%xmm6
-	pand	%xmm12,%xmm13
-	pcmpgtd	%xmm6,%xmm14
-	pxor	%xmm13,%xmm6
-	movdqu	16(%r12),%xmm8
-	pxor	%xmm7,%xmm15
-	pshufd	$0x13,%xmm14,%xmm13
-	pxor	%xmm14,%xmm14
-	movdqa	%xmm6,%xmm2
-	movdqa	%xmm6,48(%rsp)
-	paddq	%xmm6,%xmm6
-	pand	%xmm12,%xmm13
-	pcmpgtd	%xmm6,%xmm14
-	pxor	%xmm13,%xmm6
-	movdqu	32(%r12),%xmm9
-	pxor	%xmm8,%xmm0
-	pshufd	$0x13,%xmm14,%xmm13
-	pxor	%xmm14,%xmm14
-	movdqa	%xmm6,%xmm3
-	movdqa	%xmm6,64(%rsp)
-	paddq	%xmm6,%xmm6
-	pand	%xmm12,%xmm13
-	pcmpgtd	%xmm6,%xmm14
-	pxor	%xmm13,%xmm6
-	movdqu	48(%r12),%xmm10
-	pxor	%xmm9,%xmm1
-	pshufd	$0x13,%xmm14,%xmm13
-	pxor	%xmm14,%xmm14
-	movdqa	%xmm6,%xmm4
-	movdqa	%xmm6,80(%rsp)
-	paddq	%xmm6,%xmm6
-	pand	%xmm12,%xmm13
-	pcmpgtd	%xmm6,%xmm14
-	pxor	%xmm13,%xmm6
-	movdqu	64(%r12),%xmm11
-	pxor	%xmm10,%xmm2
-	pshufd	$0x13,%xmm14,%xmm13
-	pxor	%xmm14,%xmm14
-	movdqa	%xmm6,%xmm5
-	movdqa	%xmm6,96(%rsp)
-	paddq	%xmm6,%xmm6
-	pand	%xmm12,%xmm13
-	pcmpgtd	%xmm6,%xmm14
-	pxor	%xmm13,%xmm6
-	movdqu	80(%r12),%xmm12
-	pxor	%xmm11,%xmm3
-	movdqu	96(%r12),%xmm13
-	pxor	%xmm12,%xmm4
-	movdqu	112(%r12),%xmm14
-	leaq	128(%r12),%r12
-	movdqa	%xmm6,112(%rsp)
-	pxor	%xmm13,%xmm5
-	leaq	128(%rsp),%rax
-	pxor	%xmm14,%xmm6
-	movl	%edx,%r10d
-
-	call	_bsaes_encrypt8
-
-	pxor	0(%rsp),%xmm15
-	pxor	16(%rsp),%xmm0
-	movdqu	%xmm15,0(%r13)
-	pxor	32(%rsp),%xmm3
-	movdqu	%xmm0,16(%r13)
-	pxor	48(%rsp),%xmm5
-	movdqu	%xmm3,32(%r13)
-	pxor	64(%rsp),%xmm2
-	movdqu	%xmm5,48(%r13)
-	pxor	80(%rsp),%xmm6
-	movdqu	%xmm2,64(%r13)
-	pxor	96(%rsp),%xmm1
-	movdqu	%xmm6,80(%r13)
-	pxor	112(%rsp),%xmm4
-	movdqu	%xmm1,96(%r13)
-	movdqu	%xmm4,112(%r13)
-	leaq	128(%r13),%r13
-
-	movdqa	112(%rsp),%xmm6
-	pxor	%xmm14,%xmm14
-	movdqa	.Lxts_magic(%rip),%xmm12
-	pcmpgtd	%xmm6,%xmm14
-	pshufd	$0x13,%xmm14,%xmm13
-	pxor	%xmm14,%xmm14
-	paddq	%xmm6,%xmm6
-	pand	%xmm12,%xmm13
-	pcmpgtd	%xmm6,%xmm14
-	pxor	%xmm13,%xmm6
-
-	subq	$0x80,%r14
-	jnc	.Lxts_enc_loop
-
-.Lxts_enc_short:
-	addq	$0x80,%r14
-	jz	.Lxts_enc_done
-	pshufd	$0x13,%xmm14,%xmm13
-	pxor	%xmm14,%xmm14
-	movdqa	%xmm6,%xmm15
-	movdqa	%xmm6,0(%rsp)
-	paddq	%xmm6,%xmm6
-	pand	%xmm12,%xmm13
-	pcmpgtd	%xmm6,%xmm14
-	pxor	%xmm13,%xmm6
-	pshufd	$0x13,%xmm14,%xmm13
-	pxor	%xmm14,%xmm14
-	movdqa	%xmm6,%xmm0
-	movdqa	%xmm6,16(%rsp)
-	paddq	%xmm6,%xmm6
-	pand	%xmm12,%xmm13
-	pcmpgtd	%xmm6,%xmm14
-	pxor	%xmm13,%xmm6
-	movdqu	0(%r12),%xmm7
-	cmpq	$16,%r14
-	je	.Lxts_enc_1
-	pshufd	$0x13,%xmm14,%xmm13
-	pxor	%xmm14,%xmm14
-	movdqa	%xmm6,%xmm1
-	movdqa	%xmm6,32(%rsp)
-	paddq	%xmm6,%xmm6
-	pand	%xmm12,%xmm13
-	pcmpgtd	%xmm6,%xmm14
-	pxor	%xmm13,%xmm6
-	movdqu	16(%r12),%xmm8
-	cmpq	$32,%r14
-	je	.Lxts_enc_2
-	pxor	%xmm7,%xmm15
-	pshufd	$0x13,%xmm14,%xmm13
-	pxor	%xmm14,%xmm14
-	movdqa	%xmm6,%xmm2
-	movdqa	%xmm6,48(%rsp)
-	paddq	%xmm6,%xmm6
-	pand	%xmm12,%xmm13
-	pcmpgtd	%xmm6,%xmm14
-	pxor	%xmm13,%xmm6
-	movdqu	32(%r12),%xmm9
-	cmpq	$48,%r14
-	je	.Lxts_enc_3
-	pxor	%xmm8,%xmm0
-	pshufd	$0x13,%xmm14,%xmm13
-	pxor	%xmm14,%xmm14
-	movdqa	%xmm6,%xmm3
-	movdqa	%xmm6,64(%rsp)
-	paddq	%xmm6,%xmm6
-	pand	%xmm12,%xmm13
-	pcmpgtd	%xmm6,%xmm14
-	pxor	%xmm13,%xmm6
-	movdqu	48(%r12),%xmm10
-	cmpq	$64,%r14
-	je	.Lxts_enc_4
-	pxor	%xmm9,%xmm1
-	pshufd	$0x13,%xmm14,%xmm13
-	pxor	%xmm14,%xmm14
-	movdqa	%xmm6,%xmm4
-	movdqa	%xmm6,80(%rsp)
-	paddq	%xmm6,%xmm6
-	pand	%xmm12,%xmm13
-	pcmpgtd	%xmm6,%xmm14
-	pxor	%xmm13,%xmm6
-	movdqu	64(%r12),%xmm11
-	cmpq	$80,%r14
-	je	.Lxts_enc_5
-	pxor	%xmm10,%xmm2
-	pshufd	$0x13,%xmm14,%xmm13
-	pxor	%xmm14,%xmm14
-	movdqa	%xmm6,%xmm5
-	movdqa	%xmm6,96(%rsp)
-	paddq	%xmm6,%xmm6
-	pand	%xmm12,%xmm13
-	pcmpgtd	%xmm6,%xmm14
-	pxor	%xmm13,%xmm6
-	movdqu	80(%r12),%xmm12
-	cmpq	$96,%r14
-	je	.Lxts_enc_6
-	pxor	%xmm11,%xmm3
-	movdqu	96(%r12),%xmm13
-	pxor	%xmm12,%xmm4
-	movdqa	%xmm6,112(%rsp)
-	leaq	112(%r12),%r12
-	pxor	%xmm13,%xmm5
-	leaq	128(%rsp),%rax
-	movl	%edx,%r10d
-
-	call	_bsaes_encrypt8
-
-	pxor	0(%rsp),%xmm15
-	pxor	16(%rsp),%xmm0
-	movdqu	%xmm15,0(%r13)
-	pxor	32(%rsp),%xmm3
-	movdqu	%xmm0,16(%r13)
-	pxor	48(%rsp),%xmm5
-	movdqu	%xmm3,32(%r13)
-	pxor	64(%rsp),%xmm2
-	movdqu	%xmm5,48(%r13)
-	pxor	80(%rsp),%xmm6
-	movdqu	%xmm2,64(%r13)
-	pxor	96(%rsp),%xmm1
-	movdqu	%xmm6,80(%r13)
-	movdqu	%xmm1,96(%r13)
-	leaq	112(%r13),%r13
-
-	movdqa	112(%rsp),%xmm6
-	jmp	.Lxts_enc_done
-.align	16
-.Lxts_enc_6:
-	pxor	%xmm11,%xmm3
-	leaq	96(%r12),%r12
-	pxor	%xmm12,%xmm4
-	leaq	128(%rsp),%rax
-	movl	%edx,%r10d
-
-	call	_bsaes_encrypt8
-
-	pxor	0(%rsp),%xmm15
-	pxor	16(%rsp),%xmm0
-	movdqu	%xmm15,0(%r13)
-	pxor	32(%rsp),%xmm3
-	movdqu	%xmm0,16(%r13)
-	pxor	48(%rsp),%xmm5
-	movdqu	%xmm3,32(%r13)
-	pxor	64(%rsp),%xmm2
-	movdqu	%xmm5,48(%r13)
-	pxor	80(%rsp),%xmm6
-	movdqu	%xmm2,64(%r13)
-	movdqu	%xmm6,80(%r13)
-	leaq	96(%r13),%r13
-
-	movdqa	96(%rsp),%xmm6
-	jmp	.Lxts_enc_done
-.align	16
-.Lxts_enc_5:
-	pxor	%xmm10,%xmm2
-	leaq	80(%r12),%r12
-	pxor	%xmm11,%xmm3
-	leaq	128(%rsp),%rax
-	movl	%edx,%r10d
-
-	call	_bsaes_encrypt8
-
-	pxor	0(%rsp),%xmm15
-	pxor	16(%rsp),%xmm0
-	movdqu	%xmm15,0(%r13)
-	pxor	32(%rsp),%xmm3
-	movdqu	%xmm0,16(%r13)
-	pxor	48(%rsp),%xmm5
-	movdqu	%xmm3,32(%r13)
-	pxor	64(%rsp),%xmm2
-	movdqu	%xmm5,48(%r13)
-	movdqu	%xmm2,64(%r13)
-	leaq	80(%r13),%r13
-
-	movdqa	80(%rsp),%xmm6
-	jmp	.Lxts_enc_done
-.align	16
-.Lxts_enc_4:
-	pxor	%xmm9,%xmm1
-	leaq	64(%r12),%r12
-	pxor	%xmm10,%xmm2
-	leaq	128(%rsp),%rax
-	movl	%edx,%r10d
-
-	call	_bsaes_encrypt8
-
-	pxor	0(%rsp),%xmm15
-	pxor	16(%rsp),%xmm0
-	movdqu	%xmm15,0(%r13)
-	pxor	32(%rsp),%xmm3
-	movdqu	%xmm0,16(%r13)
-	pxor	48(%rsp),%xmm5
-	movdqu	%xmm3,32(%r13)
-	movdqu	%xmm5,48(%r13)
-	leaq	64(%r13),%r13
-
-	movdqa	64(%rsp),%xmm6
-	jmp	.Lxts_enc_done
-.align	16
-.Lxts_enc_3:
-	pxor	%xmm8,%xmm0
-	leaq	48(%r12),%r12
-	pxor	%xmm9,%xmm1
-	leaq	128(%rsp),%rax
-	movl	%edx,%r10d
-
-	call	_bsaes_encrypt8
-
-	pxor	0(%rsp),%xmm15
-	pxor	16(%rsp),%xmm0
-	movdqu	%xmm15,0(%r13)
-	pxor	32(%rsp),%xmm3
-	movdqu	%xmm0,16(%r13)
-	movdqu	%xmm3,32(%r13)
-	leaq	48(%r13),%r13
-
-	movdqa	48(%rsp),%xmm6
-	jmp	.Lxts_enc_done
-.align	16
-.Lxts_enc_2:
-	pxor	%xmm7,%xmm15
-	leaq	32(%r12),%r12
-	pxor	%xmm8,%xmm0
-	leaq	128(%rsp),%rax
-	movl	%edx,%r10d
-
-	call	_bsaes_encrypt8
-
-	pxor	0(%rsp),%xmm15
-	pxor	16(%rsp),%xmm0
-	movdqu	%xmm15,0(%r13)
-	movdqu	%xmm0,16(%r13)
-	leaq	32(%r13),%r13
-
-	movdqa	32(%rsp),%xmm6
-	jmp	.Lxts_enc_done
-.align	16
-.Lxts_enc_1:
-	pxor	%xmm15,%xmm7
-	leaq	16(%r12),%r12
-	movdqa	%xmm7,32(%rbp)
-	leaq	32(%rbp),%rdi
-	leaq	32(%rbp),%rsi
-	leaq	(%r15),%rdx
-	call	asm_AES_encrypt
-	pxor	32(%rbp),%xmm15
-
-
-
-
-
-	movdqu	%xmm15,0(%r13)
-	leaq	16(%r13),%r13
-
-	movdqa	16(%rsp),%xmm6
-
-.Lxts_enc_done:
-	andl	$15,%ebx
-	jz	.Lxts_enc_ret
-	movq	%r13,%rdx
-
-.Lxts_enc_steal:
-	movzbl	(%r12),%eax
-	movzbl	-16(%rdx),%ecx
-	leaq	1(%r12),%r12
-	movb	%al,-16(%rdx)
-	movb	%cl,0(%rdx)
-	leaq	1(%rdx),%rdx
-	subl	$1,%ebx
-	jnz	.Lxts_enc_steal
-
-	movdqu	-16(%r13),%xmm15
-	leaq	32(%rbp),%rdi
-	pxor	%xmm6,%xmm15
-	leaq	32(%rbp),%rsi
-	movdqa	%xmm15,32(%rbp)
-	leaq	(%r15),%rdx
-	call	asm_AES_encrypt
-	pxor	32(%rbp),%xmm6
-	movdqu	%xmm6,-16(%r13)
-
-.Lxts_enc_ret:
-	leaq	(%rsp),%rax
-	pxor	%xmm0,%xmm0
-.Lxts_enc_bzero:
-	movdqa	%xmm0,0(%rax)
-	movdqa	%xmm0,16(%rax)
-	leaq	32(%rax),%rax
-	cmpq	%rax,%rbp
-	ja	.Lxts_enc_bzero
-
-	leaq	120(%rbp),%rax
-.cfi_def_cfa	%rax,8
-	movq	-48(%rax),%r15
-.cfi_restore	%r15
-	movq	-40(%rax),%r14
-.cfi_restore	%r14
-	movq	-32(%rax),%r13
-.cfi_restore	%r13
-	movq	-24(%rax),%r12
-.cfi_restore	%r12
-	movq	-16(%rax),%rbx
-.cfi_restore	%rbx
-	movq	-8(%rax),%rbp
-.cfi_restore	%rbp
-	leaq	(%rax),%rsp
-.cfi_def_cfa_register	%rsp
-.Lxts_enc_epilogue:
-	.byte	0xf3,0xc3
-.cfi_endproc	
-.size	bsaes_xts_encrypt,.-bsaes_xts_encrypt
-
-.globl	bsaes_xts_decrypt
-.type	bsaes_xts_decrypt,@function
-.align	16
-bsaes_xts_decrypt:
-.cfi_startproc	
-	movq	%rsp,%rax
-.Lxts_dec_prologue:
-	pushq	%rbp
-.cfi_adjust_cfa_offset	8
-.cfi_offset	%rbp,-16
-	pushq	%rbx
-.cfi_adjust_cfa_offset	8
-.cfi_offset	%rbx,-24
-	pushq	%r12
-.cfi_adjust_cfa_offset	8
-.cfi_offset	%r12,-32
-	pushq	%r13
-.cfi_adjust_cfa_offset	8
-.cfi_offset	%r13,-40
-	pushq	%r14
-.cfi_adjust_cfa_offset	8
-.cfi_offset	%r14,-48
-	pushq	%r15
-.cfi_adjust_cfa_offset	8
-.cfi_offset	%r15,-56
-	leaq	-72(%rsp),%rsp
-.cfi_adjust_cfa_offset	0x48
-	movq	%rsp,%rbp
-	movq	%rdi,%r12
-	movq	%rsi,%r13
-	movq	%rdx,%r14
-	movq	%rcx,%r15
-
-	leaq	(%r9),%rdi
-	leaq	32(%rbp),%rsi
-	leaq	(%r8),%rdx
-	call	asm_AES_encrypt
-
-	movl	240(%r15),%eax
-	movq	%r14,%rbx
-
-	movl	%eax,%edx
-	shlq	$7,%rax
-	subq	$96,%rax
-	subq	%rax,%rsp
-
-	movq	%rsp,%rax
-	movq	%r15,%rcx
-	movl	%edx,%r10d
-	call	_bsaes_key_convert
-	pxor	(%rsp),%xmm7
-	movdqa	%xmm6,(%rax)
-	movdqa	%xmm7,(%rsp)
-
-	xorl	%eax,%eax
-	andq	$-16,%r14
-	testl	$15,%ebx
-	setnz	%al
-	shlq	$4,%rax
-	subq	%rax,%r14
-
-	subq	$0x80,%rsp
-	movdqa	32(%rbp),%xmm6
-
-	pxor	%xmm14,%xmm14
-	movdqa	.Lxts_magic(%rip),%xmm12
-	pcmpgtd	%xmm6,%xmm14
-
-	subq	$0x80,%r14
-	jc	.Lxts_dec_short
-	jmp	.Lxts_dec_loop
-
-.align	16
-.Lxts_dec_loop:
-	pshufd	$0x13,%xmm14,%xmm13
-	pxor	%xmm14,%xmm14
-	movdqa	%xmm6,%xmm15
-	movdqa	%xmm6,0(%rsp)
-	paddq	%xmm6,%xmm6
-	pand	%xmm12,%xmm13
-	pcmpgtd	%xmm6,%xmm14
-	pxor	%xmm13,%xmm6
-	pshufd	$0x13,%xmm14,%xmm13
-	pxor	%xmm14,%xmm14
-	movdqa	%xmm6,%xmm0
-	movdqa	%xmm6,16(%rsp)
-	paddq	%xmm6,%xmm6
-	pand	%xmm12,%xmm13
-	pcmpgtd	%xmm6,%xmm14
-	pxor	%xmm13,%xmm6
-	movdqu	0(%r12),%xmm7
-	pshufd	$0x13,%xmm14,%xmm13
-	pxor	%xmm14,%xmm14
-	movdqa	%xmm6,%xmm1
-	movdqa	%xmm6,32(%rsp)
-	paddq	%xmm6,%xmm6
-	pand	%xmm12,%xmm13
-	pcmpgtd	%xmm6,%xmm14
-	pxor	%xmm13,%xmm6
-	movdqu	16(%r12),%xmm8
-	pxor	%xmm7,%xmm15
-	pshufd	$0x13,%xmm14,%xmm13
-	pxor	%xmm14,%xmm14
-	movdqa	%xmm6,%xmm2
-	movdqa	%xmm6,48(%rsp)
-	paddq	%xmm6,%xmm6
-	pand	%xmm12,%xmm13
-	pcmpgtd	%xmm6,%xmm14
-	pxor	%xmm13,%xmm6
-	movdqu	32(%r12),%xmm9
-	pxor	%xmm8,%xmm0
-	pshufd	$0x13,%xmm14,%xmm13
-	pxor	%xmm14,%xmm14
-	movdqa	%xmm6,%xmm3
-	movdqa	%xmm6,64(%rsp)
-	paddq	%xmm6,%xmm6
-	pand	%xmm12,%xmm13
-	pcmpgtd	%xmm6,%xmm14
-	pxor	%xmm13,%xmm6
-	movdqu	48(%r12),%xmm10
-	pxor	%xmm9,%xmm1
-	pshufd	$0x13,%xmm14,%xmm13
-	pxor	%xmm14,%xmm14
-	movdqa	%xmm6,%xmm4
-	movdqa	%xmm6,80(%rsp)
-	paddq	%xmm6,%xmm6
-	pand	%xmm12,%xmm13
-	pcmpgtd	%xmm6,%xmm14
-	pxor	%xmm13,%xmm6
-	movdqu	64(%r12),%xmm11
-	pxor	%xmm10,%xmm2
-	pshufd	$0x13,%xmm14,%xmm13
-	pxor	%xmm14,%xmm14
-	movdqa	%xmm6,%xmm5
-	movdqa	%xmm6,96(%rsp)
-	paddq	%xmm6,%xmm6
-	pand	%xmm12,%xmm13
-	pcmpgtd	%xmm6,%xmm14
-	pxor	%xmm13,%xmm6
-	movdqu	80(%r12),%xmm12
-	pxor	%xmm11,%xmm3
-	movdqu	96(%r12),%xmm13
-	pxor	%xmm12,%xmm4
-	movdqu	112(%r12),%xmm14
-	leaq	128(%r12),%r12
-	movdqa	%xmm6,112(%rsp)
-	pxor	%xmm13,%xmm5
-	leaq	128(%rsp),%rax
-	pxor	%xmm14,%xmm6
-	movl	%edx,%r10d
-
-	call	_bsaes_decrypt8
-
-	pxor	0(%rsp),%xmm15
-	pxor	16(%rsp),%xmm0
-	movdqu	%xmm15,0(%r13)
-	pxor	32(%rsp),%xmm5
-	movdqu	%xmm0,16(%r13)
-	pxor	48(%rsp),%xmm3
-	movdqu	%xmm5,32(%r13)
-	pxor	64(%rsp),%xmm1
-	movdqu	%xmm3,48(%r13)
-	pxor	80(%rsp),%xmm6
-	movdqu	%xmm1,64(%r13)
-	pxor	96(%rsp),%xmm2
-	movdqu	%xmm6,80(%r13)
-	pxor	112(%rsp),%xmm4
-	movdqu	%xmm2,96(%r13)
-	movdqu	%xmm4,112(%r13)
-	leaq	128(%r13),%r13
-
-	movdqa	112(%rsp),%xmm6
-	pxor	%xmm14,%xmm14
-	movdqa	.Lxts_magic(%rip),%xmm12
-	pcmpgtd	%xmm6,%xmm14
-	pshufd	$0x13,%xmm14,%xmm13
-	pxor	%xmm14,%xmm14
-	paddq	%xmm6,%xmm6
-	pand	%xmm12,%xmm13
-	pcmpgtd	%xmm6,%xmm14
-	pxor	%xmm13,%xmm6
-
-	subq	$0x80,%r14
-	jnc	.Lxts_dec_loop
-
-.Lxts_dec_short:
-	addq	$0x80,%r14
-	jz	.Lxts_dec_done
-	pshufd	$0x13,%xmm14,%xmm13
-	pxor	%xmm14,%xmm14
-	movdqa	%xmm6,%xmm15
-	movdqa	%xmm6,0(%rsp)
-	paddq	%xmm6,%xmm6
-	pand	%xmm12,%xmm13
-	pcmpgtd	%xmm6,%xmm14
-	pxor	%xmm13,%xmm6
-	pshufd	$0x13,%xmm14,%xmm13
-	pxor	%xmm14,%xmm14
-	movdqa	%xmm6,%xmm0
-	movdqa	%xmm6,16(%rsp)
-	paddq	%xmm6,%xmm6
-	pand	%xmm12,%xmm13
-	pcmpgtd	%xmm6,%xmm14
-	pxor	%xmm13,%xmm6
-	movdqu	0(%r12),%xmm7
-	cmpq	$16,%r14
-	je	.Lxts_dec_1
-	pshufd	$0x13,%xmm14,%xmm13
-	pxor	%xmm14,%xmm14
-	movdqa	%xmm6,%xmm1
-	movdqa	%xmm6,32(%rsp)
-	paddq	%xmm6,%xmm6
-	pand	%xmm12,%xmm13
-	pcmpgtd	%xmm6,%xmm14
-	pxor	%xmm13,%xmm6
-	movdqu	16(%r12),%xmm8
-	cmpq	$32,%r14
-	je	.Lxts_dec_2
-	pxor	%xmm7,%xmm15
-	pshufd	$0x13,%xmm14,%xmm13
-	pxor	%xmm14,%xmm14
-	movdqa	%xmm6,%xmm2
-	movdqa	%xmm6,48(%rsp)
-	paddq	%xmm6,%xmm6
-	pand	%xmm12,%xmm13
-	pcmpgtd	%xmm6,%xmm14
-	pxor	%xmm13,%xmm6
-	movdqu	32(%r12),%xmm9
-	cmpq	$48,%r14
-	je	.Lxts_dec_3
-	pxor	%xmm8,%xmm0
-	pshufd	$0x13,%xmm14,%xmm13
-	pxor	%xmm14,%xmm14
-	movdqa	%xmm6,%xmm3
-	movdqa	%xmm6,64(%rsp)
-	paddq	%xmm6,%xmm6
-	pand	%xmm12,%xmm13
-	pcmpgtd	%xmm6,%xmm14
-	pxor	%xmm13,%xmm6
-	movdqu	48(%r12),%xmm10
-	cmpq	$64,%r14
-	je	.Lxts_dec_4
-	pxor	%xmm9,%xmm1
-	pshufd	$0x13,%xmm14,%xmm13
-	pxor	%xmm14,%xmm14
-	movdqa	%xmm6,%xmm4
-	movdqa	%xmm6,80(%rsp)
-	paddq	%xmm6,%xmm6
-	pand	%xmm12,%xmm13
-	pcmpgtd	%xmm6,%xmm14
-	pxor	%xmm13,%xmm6
-	movdqu	64(%r12),%xmm11
-	cmpq	$80,%r14
-	je	.Lxts_dec_5
-	pxor	%xmm10,%xmm2
-	pshufd	$0x13,%xmm14,%xmm13
-	pxor	%xmm14,%xmm14
-	movdqa	%xmm6,%xmm5
-	movdqa	%xmm6,96(%rsp)
-	paddq	%xmm6,%xmm6
-	pand	%xmm12,%xmm13
-	pcmpgtd	%xmm6,%xmm14
-	pxor	%xmm13,%xmm6
-	movdqu	80(%r12),%xmm12
-	cmpq	$96,%r14
-	je	.Lxts_dec_6
-	pxor	%xmm11,%xmm3
-	movdqu	96(%r12),%xmm13
-	pxor	%xmm12,%xmm4
-	movdqa	%xmm6,112(%rsp)
-	leaq	112(%r12),%r12
-	pxor	%xmm13,%xmm5
-	leaq	128(%rsp),%rax
-	movl	%edx,%r10d
-
-	call	_bsaes_decrypt8
-
-	pxor	0(%rsp),%xmm15
-	pxor	16(%rsp),%xmm0
-	movdqu	%xmm15,0(%r13)
-	pxor	32(%rsp),%xmm5
-	movdqu	%xmm0,16(%r13)
-	pxor	48(%rsp),%xmm3
-	movdqu	%xmm5,32(%r13)
-	pxor	64(%rsp),%xmm1
-	movdqu	%xmm3,48(%r13)
-	pxor	80(%rsp),%xmm6
-	movdqu	%xmm1,64(%r13)
-	pxor	96(%rsp),%xmm2
-	movdqu	%xmm6,80(%r13)
-	movdqu	%xmm2,96(%r13)
-	leaq	112(%r13),%r13
-
-	movdqa	112(%rsp),%xmm6
-	jmp	.Lxts_dec_done
-.align	16
-.Lxts_dec_6:
-	pxor	%xmm11,%xmm3
-	leaq	96(%r12),%r12
-	pxor	%xmm12,%xmm4
-	leaq	128(%rsp),%rax
-	movl	%edx,%r10d
-
-	call	_bsaes_decrypt8
-
-	pxor	0(%rsp),%xmm15
-	pxor	16(%rsp),%xmm0
-	movdqu	%xmm15,0(%r13)
-	pxor	32(%rsp),%xmm5
-	movdqu	%xmm0,16(%r13)
-	pxor	48(%rsp),%xmm3
-	movdqu	%xmm5,32(%r13)
-	pxor	64(%rsp),%xmm1
-	movdqu	%xmm3,48(%r13)
-	pxor	80(%rsp),%xmm6
-	movdqu	%xmm1,64(%r13)
-	movdqu	%xmm6,80(%r13)
-	leaq	96(%r13),%r13
-
-	movdqa	96(%rsp),%xmm6
-	jmp	.Lxts_dec_done
-.align	16
-.Lxts_dec_5:
-	pxor	%xmm10,%xmm2
-	leaq	80(%r12),%r12
-	pxor	%xmm11,%xmm3
-	leaq	128(%rsp),%rax
-	movl	%edx,%r10d
-
-	call	_bsaes_decrypt8
-
-	pxor	0(%rsp),%xmm15
-	pxor	16(%rsp),%xmm0
-	movdqu	%xmm15,0(%r13)
-	pxor	32(%rsp),%xmm5
-	movdqu	%xmm0,16(%r13)
-	pxor	48(%rsp),%xmm3
-	movdqu	%xmm5,32(%r13)
-	pxor	64(%rsp),%xmm1
-	movdqu	%xmm3,48(%r13)
-	movdqu	%xmm1,64(%r13)
-	leaq	80(%r13),%r13
-
-	movdqa	80(%rsp),%xmm6
-	jmp	.Lxts_dec_done
-.align	16
-.Lxts_dec_4:
-	pxor	%xmm9,%xmm1
-	leaq	64(%r12),%r12
-	pxor	%xmm10,%xmm2
-	leaq	128(%rsp),%rax
-	movl	%edx,%r10d
-
-	call	_bsaes_decrypt8
-
-	pxor	0(%rsp),%xmm15
-	pxor	16(%rsp),%xmm0
-	movdqu	%xmm15,0(%r13)
-	pxor	32(%rsp),%xmm5
-	movdqu	%xmm0,16(%r13)
-	pxor	48(%rsp),%xmm3
-	movdqu	%xmm5,32(%r13)
-	movdqu	%xmm3,48(%r13)
-	leaq	64(%r13),%r13
-
-	movdqa	64(%rsp),%xmm6
-	jmp	.Lxts_dec_done
-.align	16
-.Lxts_dec_3:
-	pxor	%xmm8,%xmm0
-	leaq	48(%r12),%r12
-	pxor	%xmm9,%xmm1
-	leaq	128(%rsp),%rax
-	movl	%edx,%r10d
-
-	call	_bsaes_decrypt8
-
-	pxor	0(%rsp),%xmm15
-	pxor	16(%rsp),%xmm0
-	movdqu	%xmm15,0(%r13)
-	pxor	32(%rsp),%xmm5
-	movdqu	%xmm0,16(%r13)
-	movdqu	%xmm5,32(%r13)
-	leaq	48(%r13),%r13
-
-	movdqa	48(%rsp),%xmm6
-	jmp	.Lxts_dec_done
-.align	16
-.Lxts_dec_2:
-	pxor	%xmm7,%xmm15
-	leaq	32(%r12),%r12
-	pxor	%xmm8,%xmm0
-	leaq	128(%rsp),%rax
-	movl	%edx,%r10d
-
-	call	_bsaes_decrypt8
-
-	pxor	0(%rsp),%xmm15
-	pxor	16(%rsp),%xmm0
-	movdqu	%xmm15,0(%r13)
-	movdqu	%xmm0,16(%r13)
-	leaq	32(%r13),%r13
-
-	movdqa	32(%rsp),%xmm6
-	jmp	.Lxts_dec_done
-.align	16
-.Lxts_dec_1:
-	pxor	%xmm15,%xmm7
-	leaq	16(%r12),%r12
-	movdqa	%xmm7,32(%rbp)
-	leaq	32(%rbp),%rdi
-	leaq	32(%rbp),%rsi
-	leaq	(%r15),%rdx
-	call	asm_AES_decrypt
-	pxor	32(%rbp),%xmm15
-
-
-
-
-
-	movdqu	%xmm15,0(%r13)
-	leaq	16(%r13),%r13
-
-	movdqa	16(%rsp),%xmm6
-
-.Lxts_dec_done:
-	andl	$15,%ebx
-	jz	.Lxts_dec_ret
-
-	pxor	%xmm14,%xmm14
-	movdqa	.Lxts_magic(%rip),%xmm12
-	pcmpgtd	%xmm6,%xmm14
-	pshufd	$0x13,%xmm14,%xmm13
-	movdqa	%xmm6,%xmm5
-	paddq	%xmm6,%xmm6
-	pand	%xmm12,%xmm13
-	movdqu	(%r12),%xmm15
-	pxor	%xmm13,%xmm6
-
-	leaq	32(%rbp),%rdi
-	pxor	%xmm6,%xmm15
-	leaq	32(%rbp),%rsi
-	movdqa	%xmm15,32(%rbp)
-	leaq	(%r15),%rdx
-	call	asm_AES_decrypt
-	pxor	32(%rbp),%xmm6
-	movq	%r13,%rdx
-	movdqu	%xmm6,(%r13)
-
-.Lxts_dec_steal:
-	movzbl	16(%r12),%eax
-	movzbl	(%rdx),%ecx
-	leaq	1(%r12),%r12
-	movb	%al,(%rdx)
-	movb	%cl,16(%rdx)
-	leaq	1(%rdx),%rdx
-	subl	$1,%ebx
-	jnz	.Lxts_dec_steal
-
-	movdqu	(%r13),%xmm15
-	leaq	32(%rbp),%rdi
-	pxor	%xmm5,%xmm15
-	leaq	32(%rbp),%rsi
-	movdqa	%xmm15,32(%rbp)
-	leaq	(%r15),%rdx
-	call	asm_AES_decrypt
-	pxor	32(%rbp),%xmm5
-	movdqu	%xmm5,(%r13)
-
-.Lxts_dec_ret:
-	leaq	(%rsp),%rax
-	pxor	%xmm0,%xmm0
-.Lxts_dec_bzero:
-	movdqa	%xmm0,0(%rax)
-	movdqa	%xmm0,16(%rax)
-	leaq	32(%rax),%rax
-	cmpq	%rax,%rbp
-	ja	.Lxts_dec_bzero
-
-	leaq	120(%rbp),%rax
-.cfi_def_cfa	%rax,8
-	movq	-48(%rax),%r15
-.cfi_restore	%r15
-	movq	-40(%rax),%r14
-.cfi_restore	%r14
-	movq	-32(%rax),%r13
-.cfi_restore	%r13
-	movq	-24(%rax),%r12
-.cfi_restore	%r12
-	movq	-16(%rax),%rbx
-.cfi_restore	%rbx
-	movq	-8(%rax),%rbp
-.cfi_restore	%rbp
-	leaq	(%rax),%rsp
-.cfi_def_cfa_register	%rsp
-.Lxts_dec_epilogue:
-	.byte	0xf3,0xc3
-.cfi_endproc	
-.size	bsaes_xts_decrypt,.-bsaes_xts_decrypt
-.type	_bsaes_const,@object
-.align	64
-_bsaes_const:
-.LM0ISR:
-.quad	0x0a0e0206070b0f03, 0x0004080c0d010509
-.LISRM0:
-.quad	0x01040b0e0205080f, 0x0306090c00070a0d
-.LISR:
-.quad	0x0504070602010003, 0x0f0e0d0c080b0a09
-.LBS0:
-.quad	0x5555555555555555, 0x5555555555555555
-.LBS1:
-.quad	0x3333333333333333, 0x3333333333333333
-.LBS2:
-.quad	0x0f0f0f0f0f0f0f0f, 0x0f0f0f0f0f0f0f0f
-.LSR:
-.quad	0x0504070600030201, 0x0f0e0d0c0a09080b
-.LSRM0:
-.quad	0x0304090e00050a0f, 0x01060b0c0207080d
-.LM0SR:
-.quad	0x0a0e02060f03070b, 0x0004080c05090d01
-.LSWPUP:
-.quad	0x0706050403020100, 0x0c0d0e0f0b0a0908
-.LSWPUPM0SR:
-.quad	0x0a0d02060c03070b, 0x0004080f05090e01
-.LADD1:
-.quad	0x0000000000000000, 0x0000000100000000
-.LADD2:
-.quad	0x0000000000000000, 0x0000000200000000
-.LADD3:
-.quad	0x0000000000000000, 0x0000000300000000
-.LADD4:
-.quad	0x0000000000000000, 0x0000000400000000
-.LADD5:
-.quad	0x0000000000000000, 0x0000000500000000
-.LADD6:
-.quad	0x0000000000000000, 0x0000000600000000
-.LADD7:
-.quad	0x0000000000000000, 0x0000000700000000
-.LADD8:
-.quad	0x0000000000000000, 0x0000000800000000
-.Lxts_magic:
-.long	0x87,0,1,0
-.Lmasks:
-.quad	0x0101010101010101, 0x0101010101010101
-.quad	0x0202020202020202, 0x0202020202020202
-.quad	0x0404040404040404, 0x0404040404040404
-.quad	0x0808080808080808, 0x0808080808080808
-.LM0:
-.quad	0x02060a0e03070b0f, 0x0004080c0105090d
-.L63:
-.quad	0x6363636363636363, 0x6363636363636363
-.byte	66,105,116,45,115,108,105,99,101,100,32,65,69,83,32,102,111,114,32,120,56,54,95,54,52,47,83,83,83,69,51,44,32,69,109,105,108,105,97,32,75,195,164,115,112,101,114,44,32,80,101,116,101,114,32,83,99,104,119,97,98,101,44,32,65,110,100,121,32,80,111,108,121,97,107,111,118,0
-.align	64
-.size	_bsaes_const,.-_bsaes_const
diff --git a/deps/openssl/config/archs/linux-x86_64/asm/crypto/bn/rsaz-x86_64.s b/deps/openssl/config/archs/linux-x86_64/asm/crypto/bn/rsaz-x86_64.s
index f8e4a80588..7876e0b8f9 100644
--- a/deps/openssl/config/archs/linux-x86_64/asm/crypto/bn/rsaz-x86_64.s
+++ b/deps/openssl/config/archs/linux-x86_64/asm/crypto/bn/rsaz-x86_64.s
@@ -29,7 +29,7 @@ rsaz_512_sqr:
 	subq	$128+24,%rsp
 .cfi_adjust_cfa_offset	128+24
 .Lsqr_body:
-	movq	%rdx,%rbp
+.byte	102,72,15,110,202
 	movq	(%rsi),%rdx
 	movq	8(%rsi),%rax
 	movq	%rcx,128(%rsp)
@@ -44,6 +44,7 @@ rsaz_512_sqr:
 	movl	%r8d,128+8(%rsp)
 
 	movq	%rdx,%rbx
+	movq	%rax,%rbp
 	mulq	%rdx
 	movq	%rax,%r8
 	movq	16(%rsi),%rax
@@ -82,31 +83,29 @@ rsaz_512_sqr:
 	mulq	%rbx
 	addq	%rax,%r14
 	movq	%rbx,%rax
-	movq	%rdx,%r15
-	adcq	$0,%r15
+	adcq	$0,%rdx
 
+	xorq	%rcx,%rcx
 	addq	%r8,%r8
-	movq	%r9,%rcx
-	adcq	%r9,%r9
+	movq	%rdx,%r15
+	adcq	$0,%rcx
 
 	mulq	%rax
-	movq	%rax,(%rsp)
-	addq	%rdx,%r8
-	adcq	$0,%r9
+	addq	%r8,%rdx
+	adcq	$0,%rcx
 
-	movq	%r8,8(%rsp)
-	shrq	$63,%rcx
+	movq	%rax,(%rsp)
+	movq	%rdx,8(%rsp)
 
 
-	movq	8(%rsi),%r8
 	movq	16(%rsi),%rax
-	mulq	%r8
+	mulq	%rbp
 	addq	%rax,%r10
 	movq	24(%rsi),%rax
 	movq	%rdx,%rbx
 	adcq	$0,%rbx
 
-	mulq	%r8
+	mulq	%rbp
 	addq	%rax,%r11
 	movq	32(%rsi),%rax
 	adcq	$0,%rdx
@@ -114,7 +113,7 @@ rsaz_512_sqr:
 	movq	%rdx,%rbx
 	adcq	$0,%rbx
 
-	mulq	%r8
+	mulq	%rbp
 	addq	%rax,%r12
 	movq	40(%rsi),%rax
 	adcq	$0,%rdx
@@ -122,7 +121,7 @@ rsaz_512_sqr:
 	movq	%rdx,%rbx
 	adcq	$0,%rbx
 
-	mulq	%r8
+	mulq	%rbp
 	addq	%rax,%r13
 	movq	48(%rsi),%rax
 	adcq	$0,%rdx
@@ -130,7 +129,7 @@ rsaz_512_sqr:
 	movq	%rdx,%rbx
 	adcq	$0,%rbx
 
-	mulq	%r8
+	mulq	%rbp
 	addq	%rax,%r14
 	movq	56(%rsi),%rax
 	adcq	$0,%rdx
@@ -138,39 +137,39 @@ rsaz_512_sqr:
 	movq	%rdx,%rbx
 	adcq	$0,%rbx
 
-	mulq	%r8
+	mulq	%rbp
 	addq	%rax,%r15
-	movq	%r8,%rax
+	movq	%rbp,%rax
 	adcq	$0,%rdx
 	addq	%rbx,%r15
-	movq	%rdx,%r8
-	movq	%r10,%rdx
-	adcq	$0,%r8
+	adcq	$0,%rdx
 
-	addq	%rdx,%rdx
-	leaq	(%rcx,%r10,2),%r10
-	movq	%r11,%rbx
-	adcq	%r11,%r11
+	xorq	%rbx,%rbx
+	addq	%r9,%r9
+	movq	%rdx,%r8
+	adcq	%r10,%r10
+	adcq	$0,%rbx
 
 	mulq	%rax
+
+	addq	%rcx,%rax
+	movq	16(%rsi),%rbp
 	addq	%rax,%r9
+	movq	24(%rsi),%rax
 	adcq	%rdx,%r10
-	adcq	$0,%r11
+	adcq	$0,%rbx
 
 	movq	%r9,16(%rsp)
 	movq	%r10,24(%rsp)
-	shrq	$63,%rbx
 
 
-	movq	16(%rsi),%r9
-	movq	24(%rsi),%rax
-	mulq	%r9
+	mulq	%rbp
 	addq	%rax,%r12
 	movq	32(%rsi),%rax
 	movq	%rdx,%rcx
 	adcq	$0,%rcx
 
-	mulq	%r9
+	mulq	%rbp
 	addq	%rax,%r13
 	movq	40(%rsi),%rax
 	adcq	$0,%rdx
@@ -178,7 +177,7 @@ rsaz_512_sqr:
 	movq	%rdx,%rcx
 	adcq	$0,%rcx
 
-	mulq	%r9
+	mulq	%rbp
 	addq	%rax,%r14
 	movq	48(%rsi),%rax
 	adcq	$0,%rdx
@@ -186,9 +185,7 @@ rsaz_512_sqr:
 	movq	%rdx,%rcx
 	adcq	$0,%rcx
 
-	mulq	%r9
-	movq	%r12,%r10
-	leaq	(%rbx,%r12,2),%r12
+	mulq	%rbp
 	addq	%rax,%r15
 	movq	56(%rsi),%rax
 	adcq	$0,%rdx
@@ -196,36 +193,40 @@ rsaz_512_sqr:
 	movq	%rdx,%rcx
 	adcq	$0,%rcx
 
-	mulq	%r9
-	shrq	$63,%r10
+	mulq	%rbp
 	addq	%rax,%r8
-	movq	%r9,%rax
+	movq	%rbp,%rax
 	adcq	$0,%rdx
 	addq	%rcx,%r8
-	movq	%rdx,%r9
-	adcq	$0,%r9
+	adcq	$0,%rdx
 
-	movq	%r13,%rcx
-	leaq	(%r10,%r13,2),%r13
+	xorq	%rcx,%rcx
+	addq	%r11,%r11
+	movq	%rdx,%r9
+	adcq	%r12,%r12
+	adcq	$0,%rcx
 
 	mulq	%rax
+
+	addq	%rbx,%rax
+	movq	24(%rsi),%r10
 	addq	%rax,%r11
+	movq	32(%rsi),%rax
 	adcq	%rdx,%r12
-	adcq	$0,%r13
+	adcq	$0,%rcx
 
 	movq	%r11,32(%rsp)
 	movq	%r12,40(%rsp)
-	shrq	$63,%rcx
 
 
-	movq	24(%rsi),%r10
-	movq	32(%rsi),%rax
+	movq	%rax,%r11
 	mulq	%r10
 	addq	%rax,%r14
 	movq	40(%rsi),%rax
 	movq	%rdx,%rbx
 	adcq	$0,%rbx
 
+	movq	%rax,%r12
 	mulq	%r10
 	addq	%rax,%r15
 	movq	48(%rsi),%rax
@@ -234,9 +235,8 @@ rsaz_512_sqr:
 	movq	%rdx,%rbx
 	adcq	$0,%rbx
 
+	movq	%rax,%rbp
 	mulq	%r10
-	movq	%r14,%r12
-	leaq	(%rcx,%r14,2),%r14
 	addq	%rax,%r8
 	movq	56(%rsi),%rax
 	adcq	$0,%rdx
@@ -245,32 +245,33 @@ rsaz_512_sqr:
 	adcq	$0,%rbx
 
 	mulq	%r10
-	shrq	$63,%r12
 	addq	%rax,%r9
 	movq	%r10,%rax
 	adcq	$0,%rdx
 	addq	%rbx,%r9
-	movq	%rdx,%r10
-	adcq	$0,%r10
+	adcq	$0,%rdx
 
-	movq	%r15,%rbx
-	leaq	(%r12,%r15,2),%r15
+	xorq	%rbx,%rbx
+	addq	%r13,%r13
+	movq	%rdx,%r10
+	adcq	%r14,%r14
+	adcq	$0,%rbx
 
 	mulq	%rax
+
+	addq	%rcx,%rax
 	addq	%rax,%r13
+	movq	%r12,%rax
 	adcq	%rdx,%r14
-	adcq	$0,%r15
+	adcq	$0,%rbx
 
 	movq	%r13,48(%rsp)
 	movq	%r14,56(%rsp)
-	shrq	$63,%rbx
 
 
-	movq	32(%rsi),%r11
-	movq	40(%rsi),%rax
 	mulq	%r11
 	addq	%rax,%r8
-	movq	48(%rsi),%rax
+	movq	%rbp,%rax
 	movq	%rdx,%rcx
 	adcq	$0,%rcx
 
@@ -278,97 +279,99 @@ rsaz_512_sqr:
 	addq	%rax,%r9
 	movq	56(%rsi),%rax
 	adcq	$0,%rdx
-	movq	%r8,%r12
-	leaq	(%rbx,%r8,2),%r8
 	addq	%rcx,%r9
 	movq	%rdx,%rcx
 	adcq	$0,%rcx
 
+	movq	%rax,%r14
 	mulq	%r11
-	shrq	$63,%r12
 	addq	%rax,%r10
 	movq	%r11,%rax
 	adcq	$0,%rdx
 	addq	%rcx,%r10
-	movq	%rdx,%r11
-	adcq	$0,%r11
+	adcq	$0,%rdx
 
-	movq	%r9,%rcx
-	leaq	(%r12,%r9,2),%r9
+	xorq	%rcx,%rcx
+	addq	%r15,%r15
+	movq	%rdx,%r11
+	adcq	%r8,%r8
+	adcq	$0,%rcx
 
 	mulq	%rax
+
+	addq	%rbx,%rax
 	addq	%rax,%r15
+	movq	%rbp,%rax
 	adcq	%rdx,%r8
-	adcq	$0,%r9
+	adcq	$0,%rcx
 
 	movq	%r15,64(%rsp)
 	movq	%r8,72(%rsp)
-	shrq	$63,%rcx
 
 
-	movq	40(%rsi),%r12
-	movq	48(%rsi),%rax
 	mulq	%r12
 	addq	%rax,%r10
-	movq	56(%rsi),%rax
+	movq	%r14,%rax
 	movq	%rdx,%rbx
 	adcq	$0,%rbx
 
 	mulq	%r12
 	addq	%rax,%r11
 	movq	%r12,%rax
-	movq	%r10,%r15
-	leaq	(%rcx,%r10,2),%r10
 	adcq	$0,%rdx
-	shrq	$63,%r15
 	addq	%rbx,%r11
-	movq	%rdx,%r12
-	adcq	$0,%r12
+	adcq	$0,%rdx
 
-	movq	%r11,%rbx
-	leaq	(%r15,%r11,2),%r11
+	xorq	%rbx,%rbx
+	addq	%r9,%r9
+	movq	%rdx,%r12
+	adcq	%r10,%r10
+	adcq	$0,%rbx
 
 	mulq	%rax
+
+	addq	%rcx,%rax
 	addq	%rax,%r9
+	movq	%r14,%rax
 	adcq	%rdx,%r10
-	adcq	$0,%r11
+	adcq	$0,%rbx
 
 	movq	%r9,80(%rsp)
 	movq	%r10,88(%rsp)
 
 
-	movq	48(%rsi),%r13
-	movq	56(%rsi),%rax
-	mulq	%r13
+	mulq	%rbp
 	addq	%rax,%r12
-	movq	%r13,%rax
-	movq	%rdx,%r13
-	adcq	$0,%r13
+	movq	%rbp,%rax
+	adcq	$0,%rdx
 
-	xorq	%r14,%r14
-	shlq	$1,%rbx
+	xorq	%rcx,%rcx
+	addq	%r11,%r11
+	movq	%rdx,%r13
 	adcq	%r12,%r12
-	adcq	%r13,%r13
-	adcq	%r14,%r14
+	adcq	$0,%rcx
 
 	mulq	%rax
+
+	addq	%rbx,%rax
 	addq	%rax,%r11
+	movq	%r14,%rax
 	adcq	%rdx,%r12
-	adcq	$0,%r13
+	adcq	$0,%rcx
 
 	movq	%r11,96(%rsp)
 	movq	%r12,104(%rsp)
 
 
-	movq	56(%rsi),%rax
-	mulq	%rax
-	addq	%rax,%r13
-	adcq	$0,%rdx
+	xorq	%rbx,%rbx
+	addq	%r13,%r13
+	adcq	$0,%rbx
 
-	addq	%rdx,%r14
+	mulq	%rax
 
-	movq	%r13,112(%rsp)
-	movq	%r14,120(%rsp)
+	addq	%rcx,%rax
+	addq	%r13,%rax
+	adcq	%rbx,%rdx
 
 	movq	(%rsp),%r8
 	movq	8(%rsp),%r9
@@ -378,6 +381,10 @@ rsaz_512_sqr:
 	movq	40(%rsp),%r13
 	movq	48(%rsp),%r14
 	movq	56(%rsp),%r15
+.byte	102,72,15,126,205
+
+	movq	%rax,112(%rsp)
+	movq	%rdx,120(%rsp)
 
 	call	__rsaz_512_reduce
 
@@ -406,9 +413,9 @@ rsaz_512_sqr:
 .Loop_sqrx:
 	movl	%r8d,128+8(%rsp)
 .byte	102,72,15,110,199
-.byte	102,72,15,110,205
 
 	mulxq	%rax,%r8,%r9
+	movq	%rax,%rbx
 
 	mulxq	16(%rsi),%rcx,%r10
 	xorq	%rbp,%rbp
@@ -416,40 +423,39 @@ rsaz_512_sqr:
 	mulxq	24(%rsi),%rax,%r11
 	adcxq	%rcx,%r9
 
-	mulxq	32(%rsi),%rcx,%r12
+.byte	0xc4,0x62,0xf3,0xf6,0xa6,0x20,0x00,0x00,0x00
 	adcxq	%rax,%r10
 
-	mulxq	40(%rsi),%rax,%r13
+.byte	0xc4,0x62,0xfb,0xf6,0xae,0x28,0x00,0x00,0x00
 	adcxq	%rcx,%r11
 
-.byte	0xc4,0x62,0xf3,0xf6,0xb6,0x30,0x00,0x00,0x00
+	mulxq	48(%rsi),%rcx,%r14
 	adcxq	%rax,%r12
 	adcxq	%rcx,%r13
 
-.byte	0xc4,0x62,0xfb,0xf6,0xbe,0x38,0x00,0x00,0x00
+	mulxq	56(%rsi),%rax,%r15
 	adcxq	%rax,%r14
 	adcxq	%rbp,%r15
 
-	movq	%r9,%rcx
-	shldq	$1,%r8,%r9
-	shlq	$1,%r8
-
-	xorl	%ebp,%ebp
-	mulxq	%rdx,%rax,%rdx
-	adcxq	%rdx,%r8
-	movq	8(%rsi),%rdx
-	adcxq	%rbp,%r9
+	mulxq	%rdx,%rax,%rdi
+	movq	%rbx,%rdx
+	xorq	%rcx,%rcx
+	adoxq	%r8,%r8
+	adcxq	%rdi,%r8
+	adoxq	%rbp,%rcx
+	adcxq	%rbp,%rcx
 
 	movq	%rax,(%rsp)
 	movq	%r8,8(%rsp)
 
 
-	mulxq	16(%rsi),%rax,%rbx
+.byte	0xc4,0xe2,0xfb,0xf6,0x9e,0x10,0x00,0x00,0x00
 	adoxq	%rax,%r10
 	adcxq	%rbx,%r11
 
-.byte	0xc4,0x62,0xc3,0xf6,0x86,0x18,0x00,0x00,0x00
+	mulxq	24(%rsi),%rdi,%r8
 	adoxq	%rdi,%r11
+.byte	0x66
 	adcxq	%r8,%r12
 
 	mulxq	32(%rsi),%rax,%rbx
@@ -467,24 +473,25 @@ rsaz_512_sqr:
 .byte	0xc4,0x62,0xc3,0xf6,0x86,0x38,0x00,0x00,0x00
 	adoxq	%rdi,%r15
 	adcxq	%rbp,%r8
+	mulxq	%rdx,%rax,%rdi
 	adoxq	%rbp,%r8
+.byte	0x48,0x8b,0x96,0x10,0x00,0x00,0x00
 
-	movq	%r11,%rbx
-	shldq	$1,%r10,%r11
-	shldq	$1,%rcx,%r10
+	xorq	%rbx,%rbx
+	adoxq	%r9,%r9
 
-	xorl	%ebp,%ebp
-	mulxq	%rdx,%rax,%rcx
-	movq	16(%rsi),%rdx
+	adcxq	%rcx,%rax
+	adoxq	%r10,%r10
 	adcxq	%rax,%r9
-	adcxq	%rcx,%r10
-	adcxq	%rbp,%r11
+	adoxq	%rbp,%rbx
+	adcxq	%rdi,%r10
+	adcxq	%rbp,%rbx
 
 	movq	%r9,16(%rsp)
 .byte	0x4c,0x89,0x94,0x24,0x18,0x00,0x00,0x00
 
 
-.byte	0xc4,0x62,0xc3,0xf6,0x8e,0x18,0x00,0x00,0x00
+	mulxq	24(%rsi),%rdi,%r9
 	adoxq	%rdi,%r12
 	adcxq	%r9,%r13
 
@@ -492,7 +499,7 @@ rsaz_512_sqr:
 	adoxq	%rax,%r13
 	adcxq	%rcx,%r14
 
-	mulxq	40(%rsi),%rdi,%r9
+.byte	0xc4,0x62,0xc3,0xf6,0x8e,0x28,0x00,0x00,0x00
 	adoxq	%rdi,%r14
 	adcxq	%r9,%r15
 
@@ -500,27 +507,28 @@ rsaz_512_sqr:
 	adoxq	%rax,%r15
 	adcxq	%rcx,%r8
 
-.byte	0xc4,0x62,0xc3,0xf6,0x8e,0x38,0x00,0x00,0x00
+	mulxq	56(%rsi),%rdi,%r9
 	adoxq	%rdi,%r8
 	adcxq	%rbp,%r9
+	mulxq	%rdx,%rax,%rdi
 	adoxq	%rbp,%r9
+	movq	24(%rsi),%rdx
 
-	movq	%r13,%rcx
-	shldq	$1,%r12,%r13
-	shldq	$1,%rbx,%r12
+	xorq	%rcx,%rcx
+	adoxq	%r11,%r11
 
-	xorl	%ebp,%ebp
-	mulxq	%rdx,%rax,%rdx
+	adcxq	%rbx,%rax
+	adoxq	%r12,%r12
 	adcxq	%rax,%r11
-	adcxq	%rdx,%r12
-	movq	24(%rsi),%rdx
-	adcxq	%rbp,%r13
+	adoxq	%rbp,%rcx
+	adcxq	%rdi,%r12
+	adcxq	%rbp,%rcx
 
 	movq	%r11,32(%rsp)
-.byte	0x4c,0x89,0xa4,0x24,0x28,0x00,0x00,0x00
+	movq	%r12,40(%rsp)
 
 
-.byte	0xc4,0xe2,0xfb,0xf6,0x9e,0x20,0x00,0x00,0x00
+	mulxq	32(%rsi),%rax,%rbx
 	adoxq	%rax,%r14
 	adcxq	%rbx,%r15
 
@@ -535,25 +543,25 @@ rsaz_512_sqr:
 	mulxq	56(%rsi),%rdi,%r10
 	adoxq	%rdi,%r9
 	adcxq	%rbp,%r10
+	mulxq	%rdx,%rax,%rdi
 	adoxq	%rbp,%r10
+	movq	32(%rsi),%rdx
 
-.byte	0x66
-	movq	%r15,%rbx
-	shldq	$1,%r14,%r15
-	shldq	$1,%rcx,%r14
+	xorq	%rbx,%rbx
+	adoxq	%r13,%r13
 
-	xorl	%ebp,%ebp
-	mulxq	%rdx,%rax,%rdx
+	adcxq	%rcx,%rax
+	adoxq	%r14,%r14
 	adcxq	%rax,%r13
-	adcxq	%rdx,%r14
-	movq	32(%rsi),%rdx
-	adcxq	%rbp,%r15
+	adoxq	%rbp,%rbx
+	adcxq	%rdi,%r14
+	adcxq	%rbp,%rbx
 
 	movq	%r13,48(%rsp)
 	movq	%r14,56(%rsp)
 
 
-.byte	0xc4,0x62,0xc3,0xf6,0x9e,0x28,0x00,0x00,0x00
+	mulxq	40(%rsi),%rdi,%r11
 	adoxq	%rdi,%r8
 	adcxq	%r11,%r9
 
@@ -564,18 +572,19 @@ rsaz_512_sqr:
 	mulxq	56(%rsi),%rdi,%r11
 	adoxq	%rdi,%r10
 	adcxq	%rbp,%r11
+	mulxq	%rdx,%rax,%rdi
+	movq	40(%rsi),%rdx
 	adoxq	%rbp,%r11
 
-	movq	%r9,%rcx
-	shldq	$1,%r8,%r9
-	shldq	$1,%rbx,%r8
+	xorq	%rcx,%rcx
+	adoxq	%r15,%r15
 
-	xorl	%ebp,%ebp
-	mulxq	%rdx,%rax,%rdx
+	adcxq	%rbx,%rax
+	adoxq	%r8,%r8
 	adcxq	%rax,%r15
-	adcxq	%rdx,%r8
-	movq	40(%rsi),%rdx
-	adcxq	%rbp,%r9
+	adoxq	%rbp,%rcx
+	adcxq	%rdi,%r8
+	adcxq	%rbp,%rcx
 
 	movq	%r15,64(%rsp)
 	movq	%r8,72(%rsp)
@@ -588,18 +597,19 @@ rsaz_512_sqr:
 .byte	0xc4,0x62,0xc3,0xf6,0xa6,0x38,0x00,0x00,0x00
 	adoxq	%rdi,%r11
 	adcxq	%rbp,%r12
+	mulxq	%rdx,%rax,%rdi
 	adoxq	%rbp,%r12
+	movq	48(%rsi),%rdx
 
-	movq	%r11,%rbx
-	shldq	$1,%r10,%r11
-	shldq	$1,%rcx,%r10
+	xorq	%rbx,%rbx
+	adoxq	%r9,%r9
 
-	xorl	%ebp,%ebp
-	mulxq	%rdx,%rax,%rdx
+	adcxq	%rcx,%rax
+	adoxq	%r10,%r10
 	adcxq	%rax,%r9
-	adcxq	%rdx,%r10
-	movq	48(%rsi),%rdx
-	adcxq	%rbp,%r11
+	adcxq	%rdi,%r10
+	adoxq	%rbp,%rbx
+	adcxq	%rbp,%rbx
 
 	movq	%r9,80(%rsp)
 	movq	%r10,88(%rsp)
@@ -609,31 +619,31 @@ rsaz_512_sqr:
 	adoxq	%rax,%r12
 	adoxq	%rbp,%r13
 
-	xorq	%r14,%r14
-	shldq	$1,%r13,%r14
-	shldq	$1,%r12,%r13
-	shldq	$1,%rbx,%r12
+	mulxq	%rdx,%rax,%rdi
+	xorq	%rcx,%rcx
+	movq	56(%rsi),%rdx
+	adoxq	%r11,%r11
 
-	xorl	%ebp,%ebp
-	mulxq	%rdx,%rax,%rdx
+	adcxq	%rbx,%rax
+	adoxq	%r12,%r12
 	adcxq	%rax,%r11
-	adcxq	%rdx,%r12
-	movq	56(%rsi),%rdx
-	adcxq	%rbp,%r13
+	adoxq	%rbp,%rcx
+	adcxq	%rdi,%r12
+	adcxq	%rbp,%rcx
 
 .byte	0x4c,0x89,0x9c,0x24,0x60,0x00,0x00,0x00
 .byte	0x4c,0x89,0xa4,0x24,0x68,0x00,0x00,0x00
 
 
 	mulxq	%rdx,%rax,%rdx
-	adoxq	%rax,%r13
-	adoxq	%rbp,%rdx
+	xorq	%rbx,%rbx
+	adoxq	%r13,%r13
 
-.byte	0x66
-	addq	%rdx,%r14
+	adcxq	%rcx,%rax
+	adoxq	%rbp,%rbx
+	adcxq	%r13,%rax
+	adcxq	%rdx,%rbx
 
-	movq	%r13,112(%rsp)
-	movq	%r14,120(%rsp)
 .byte	102,72,15,126,199
 .byte	102,72,15,126,205
 
@@ -647,6 +657,9 @@ rsaz_512_sqr:
 	movq	48(%rsp),%r14
 	movq	56(%rsp),%r15
 
+	movq	%rax,112(%rsp)
+	movq	%rbx,120(%rsp)
+
 	call	__rsaz_512_reducex
 
 	addq	64(%rsp),%r8
@@ -1440,6 +1453,7 @@ rsaz_512_mul_by_one:
 .type	__rsaz_512_reduce,@function
 .align	32
 __rsaz_512_reduce:
+.cfi_startproc
 	movq	%r8,%rbx
 	imulq	128+8(%rsp),%rbx
 	movq	0(%rbp),%rax
@@ -1519,10 +1533,12 @@ __rsaz_512_reduce:
 	jne	.Lreduction_loop
 
 	.byte	0xf3,0xc3
+.cfi_endproc
 .size	__rsaz_512_reduce,.-__rsaz_512_reduce
 .type	__rsaz_512_reducex,@function
 .align	32
 __rsaz_512_reducex:
+.cfi_startproc
 
 	imulq	%r8,%rdx
 	xorq	%rsi,%rsi
@@ -1575,10 +1591,12 @@ __rsaz_512_reducex:
 	jne	.Lreduction_loopx
 
 	.byte	0xf3,0xc3
+.cfi_endproc
 .size	__rsaz_512_reducex,.-__rsaz_512_reducex
 .type	__rsaz_512_subtract,@function
 .align	32
 __rsaz_512_subtract:
+.cfi_startproc
 	movq	%r8,(%rdi)
 	movq	%r9,8(%rdi)
 	movq	%r10,16(%rdi)
@@ -1632,10 +1650,12 @@ __rsaz_512_subtract:
 	movq	%r15,56(%rdi)
 
 	.byte	0xf3,0xc3
+.cfi_endproc
 .size	__rsaz_512_subtract,.-__rsaz_512_subtract
 .type	__rsaz_512_mul,@function
 .align	32
 __rsaz_512_mul:
+.cfi_startproc
 	leaq	8(%rsp),%rdi
 
 	movq	(%rsi),%rax
@@ -1774,10 +1794,12 @@ __rsaz_512_mul:
 	movq	%r15,56(%rdi)
 
 	.byte	0xf3,0xc3
+.cfi_endproc
 .size	__rsaz_512_mul,.-__rsaz_512_mul
 .type	__rsaz_512_mulx,@function
 .align	32
 __rsaz_512_mulx:
+.cfi_startproc
 	mulxq	(%rsi),%rbx,%r8
 	movq	$-6,%rcx
 
@@ -1894,11 +1916,13 @@ __rsaz_512_mulx:
 	movq	%r15,8+64+56(%rsp)
 
 	.byte	0xf3,0xc3
+.cfi_endproc
 .size	__rsaz_512_mulx,.-__rsaz_512_mulx
 .globl	rsaz_512_scatter4
 .type	rsaz_512_scatter4,@function
 .align	16
 rsaz_512_scatter4:
+.cfi_startproc
 	leaq	(%rdi,%rdx,8),%rdi
 	movl	$8,%r9d
 	jmp	.Loop_scatter
@@ -1911,12 +1935,14 @@ rsaz_512_scatter4:
 	decl	%r9d
 	jnz	.Loop_scatter
 	.byte	0xf3,0xc3
+.cfi_endproc
 .size	rsaz_512_scatter4,.-rsaz_512_scatter4
 
 .globl	rsaz_512_gather4
 .type	rsaz_512_gather4,@function
 .align	16
 rsaz_512_gather4:
+.cfi_startproc
 	movd	%edx,%xmm8
 	movdqa	.Linc+16(%rip),%xmm1
 	movdqa	.Linc(%rip),%xmm0
@@ -1980,6 +2006,7 @@ rsaz_512_gather4:
 	jnz	.Loop_gather
 	.byte	0xf3,0xc3
 .LSEH_end_rsaz_512_gather4:
+.cfi_endproc
 .size	rsaz_512_gather4,.-rsaz_512_gather4
 
 .align	64
diff --git a/deps/openssl/config/archs/linux-x86_64/asm/crypto/bn/x86_64-mont5.s b/deps/openssl/config/archs/linux-x86_64/asm/crypto/bn/x86_64-mont5.s
index df4b6610a0..40a60a3c8f 100644
--- a/deps/openssl/config/archs/linux-x86_64/asm/crypto/bn/x86_64-mont5.s
+++ b/deps/openssl/config/archs/linux-x86_64/asm/crypto/bn/x86_64-mont5.s
@@ -550,6 +550,7 @@ bn_mul4x_mont_gather5:
 .type	mul4x_internal,@function
 .align	32
 mul4x_internal:
+.cfi_startproc
 	shlq	$5,%r9
 	movd	8(%rax),%xmm5
 	leaq	.Linc(%rip),%rax
@@ -1071,6 +1072,7 @@ mul4x_internal:
 	movq	16(%rbp),%r14
 	movq	24(%rbp),%r15
 	jmp	.Lsqr4x_sub_entry
+.cfi_endproc
 .size	mul4x_internal,.-mul4x_internal
 .globl	bn_power5
 .type	bn_power5,@function
@@ -1213,6 +1215,7 @@ bn_power5:
 .align	32
 bn_sqr8x_internal:
 __bn_sqr8x_internal:
+.cfi_startproc
 
 
 
@@ -1987,10 +1990,12 @@ __bn_sqr8x_reduction:
 	cmpq	%rdx,%rdi
 	jb	.L8x_reduction_loop
 	.byte	0xf3,0xc3
+.cfi_endproc
 .size	bn_sqr8x_internal,.-bn_sqr8x_internal
 .type	__bn_post4x_internal,@function
 .align	32
 __bn_post4x_internal:
+.cfi_startproc
 	movq	0(%rbp),%r12
 	leaq	(%rdi,%r9,1),%rbx
 	movq	%r9,%rcx
@@ -2041,15 +2046,18 @@ __bn_post4x_internal:
 	movq	%r9,%r10
 	negq	%r9
 	.byte	0xf3,0xc3
+.cfi_endproc
 .size	__bn_post4x_internal,.-__bn_post4x_internal
 .globl	bn_from_montgomery
 .type	bn_from_montgomery,@function
 .align	32
 bn_from_montgomery:
+.cfi_startproc
 	testl	$7,%r9d
 	jz	bn_from_mont8x
 	xorl	%eax,%eax
 	.byte	0xf3,0xc3
+.cfi_endproc
 .size	bn_from_montgomery,.-bn_from_montgomery
 
 .type	bn_from_mont8x,@function
@@ -2333,6 +2341,7 @@ bn_mulx4x_mont_gather5:
 .type	mulx4x_internal,@function
 .align	32
 mulx4x_internal:
+.cfi_startproc
 	movq	%r9,8(%rsp)
 	movq	%r9,%r10
 	negq	%r9
@@ -2751,6 +2760,7 @@ mulx4x_internal:
 	movq	16(%rbp),%r14
 	movq	24(%rbp),%r15
 	jmp	.Lsqrx4x_sub_entry
+.cfi_endproc
 .size	mulx4x_internal,.-mulx4x_internal
 .type	bn_powerx5,@function
 .align	32
@@ -3509,6 +3519,7 @@ __bn_sqrx8x_reduction:
 .size	bn_sqrx8x_internal,.-bn_sqrx8x_internal
 .align	32
 __bn_postx4x_internal:
+.cfi_startproc
 	movq	0(%rbp),%r12
 	movq	%rcx,%r10
 	movq	%rcx,%r9
@@ -3556,11 +3567,13 @@ __bn_postx4x_internal:
 	negq	%r9
 
 	.byte	0xf3,0xc3
+.cfi_endproc
 .size	__bn_postx4x_internal,.-__bn_postx4x_internal
 .globl	bn_get_bits5
 .type	bn_get_bits5,@function
 .align	16
 bn_get_bits5:
+.cfi_startproc
 	leaq	0(%rdi),%r10
 	leaq	1(%rdi),%r11
 	movl	%esi,%ecx
@@ -3574,12 +3587,14 @@ bn_get_bits5:
 	shrl	%cl,%eax
 	andl	$31,%eax
 	.byte	0xf3,0xc3
+.cfi_endproc
 .size	bn_get_bits5,.-bn_get_bits5
 
 .globl	bn_scatter5
 .type	bn_scatter5,@function
 .align	16
 bn_scatter5:
+.cfi_startproc
 	cmpl	$0,%esi
 	jz	.Lscatter_epilogue
 	leaq	(%rdx,%rcx,8),%rdx
@@ -3592,6 +3607,7 @@ bn_scatter5:
 	jnz	.Lscatter
 .Lscatter_epilogue:
 	.byte	0xf3,0xc3
+.cfi_endproc
 .size	bn_scatter5,.-bn_scatter5
 
 .globl	bn_gather5
@@ -3599,6 +3615,7 @@ bn_scatter5:
 .align	32
 bn_gather5:
 .LSEH_begin_bn_gather5:
+.cfi_startproc
 
 .byte	0x4c,0x8d,0x14,0x24
 .byte	0x48,0x81,0xec,0x08,0x01,0x00,0x00
@@ -3756,6 +3773,7 @@ bn_gather5:
 	leaq	(%r10),%rsp
 	.byte	0xf3,0xc3
 .LSEH_end_bn_gather5:
+.cfi_endproc
 .size	bn_gather5,.-bn_gather5
 .align	64
 .Linc:
diff --git a/deps/openssl/config/archs/linux-x86_64/asm/crypto/buildinf.h b/deps/openssl/config/archs/linux-x86_64/asm/crypto/buildinf.h
index 17e8991485..83d6c611ca 100644
--- a/deps/openssl/config/archs/linux-x86_64/asm/crypto/buildinf.h
+++ b/deps/openssl/config/archs/linux-x86_64/asm/crypto/buildinf.h
@@ -11,7 +11,7 @@
  */
 
 #define PLATFORM "platform: linux-x86_64"
-#define DATE "built on: Fri Sep 13 16:00:16 2019 UTC"
+#define DATE "built on: Wed Mar 18 21:07:06 2020 UTC"
 
 /*
  * Generate compiler_flags as an array of individual characters. This is a
@@ -37,10 +37,10 @@ static const char compiler_flags[] = {
     ' ','-','D','S','H','A','5','1','2','_','A','S','M',' ','-','D',
     'K','E','C','C','A','K','1','6','0','0','_','A','S','M',' ','-',
     'D','R','C','4','_','A','S','M',' ','-','D','M','D','5','_','A',
-    'S','M',' ','-','D','V','P','A','E','S','_','A','S','M',' ','-',
-    'D','G','H','A','S','H','_','A','S','M',' ','-','D','E','C','P',
-    '_','N','I','S','T','Z','2','5','6','_','A','S','M',' ','-','D',
-    'X','2','5','5','1','9','_','A','S','M',' ','-','D','P','O','L',
-    'Y','1','3','0','5','_','A','S','M',' ','-','D','N','D','E','B',
-    'U','G','\0'
+    'S','M',' ','-','D','A','E','S','N','I','_','A','S','M',' ','-',
+    'D','V','P','A','E','S','_','A','S','M',' ','-','D','G','H','A',
+    'S','H','_','A','S','M',' ','-','D','E','C','P','_','N','I','S',
+    'T','Z','2','5','6','_','A','S','M',' ','-','D','X','2','5','5',
+    '1','9','_','A','S','M',' ','-','D','P','O','L','Y','1','3','0',
+    '5','_','A','S','M',' ','-','D','N','D','E','B','U','G','\0'
 };
diff --git a/deps/openssl/config/archs/linux-x86_64/asm/crypto/camellia/cmll-x86_64.s b/deps/openssl/config/archs/linux-x86_64/asm/crypto/camellia/cmll-x86_64.s
index 405566b01c..eeb20dd229 100644
--- a/deps/openssl/config/archs/linux-x86_64/asm/crypto/camellia/cmll-x86_64.s
+++ b/deps/openssl/config/archs/linux-x86_64/asm/crypto/camellia/cmll-x86_64.s
@@ -5,11 +5,13 @@
 .type	Camellia_EncryptBlock,@function
 .align	16
 Camellia_EncryptBlock:
+.cfi_startproc
 	movl	$128,%eax
 	subl	%edi,%eax
 	movl	$3,%edi
 	adcl	$0,%edi
 	jmp	.Lenc_rounds
+.cfi_endproc
 .size	Camellia_EncryptBlock,.-Camellia_EncryptBlock
 
 .globl	Camellia_EncryptBlock_Rounds
@@ -83,6 +85,7 @@ Camellia_EncryptBlock_Rounds:
 .type	_x86_64_Camellia_encrypt,@function
 .align	16
 _x86_64_Camellia_encrypt:
+.cfi_startproc
 	xorl	0(%r14),%r9d
 	xorl	4(%r14),%r8d
 	xorl	8(%r14),%r11d
@@ -285,6 +288,7 @@ _x86_64_Camellia_encrypt:
 	movl	%edx,%r11d
 
 .byte	0xf3,0xc3
+.cfi_endproc
 .size	_x86_64_Camellia_encrypt,.-_x86_64_Camellia_encrypt
 
 
@@ -292,11 +296,13 @@ _x86_64_Camellia_encrypt:
 .type	Camellia_DecryptBlock,@function
 .align	16
 Camellia_DecryptBlock:
+.cfi_startproc
 	movl	$128,%eax
 	subl	%edi,%eax
 	movl	$3,%edi
 	adcl	$0,%edi
 	jmp	.Ldec_rounds
+.cfi_endproc
 .size	Camellia_DecryptBlock,.-Camellia_DecryptBlock
 
 .globl	Camellia_DecryptBlock_Rounds
@@ -370,6 +376,7 @@ Camellia_DecryptBlock_Rounds:
 .type	_x86_64_Camellia_decrypt,@function
 .align	16
 _x86_64_Camellia_decrypt:
+.cfi_startproc
 	xorl	0(%r14),%r9d
 	xorl	4(%r14),%r8d
 	xorl	8(%r14),%r11d
@@ -573,6 +580,7 @@ _x86_64_Camellia_decrypt:
 	movl	%ebx,%r11d
 
 .byte	0xf3,0xc3
+.cfi_endproc
 .size	_x86_64_Camellia_decrypt,.-_x86_64_Camellia_decrypt
 .globl	Camellia_Ekeygen
 .type	Camellia_Ekeygen,@function
diff --git a/deps/openssl/config/archs/linux-x86_64/asm/crypto/ec/ecp_nistz256-x86_64.s b/deps/openssl/config/archs/linux-x86_64/asm/crypto/ec/ecp_nistz256-x86_64.s
index 62b9ac6616..5c9e405041 100644
--- a/deps/openssl/config/archs/linux-x86_64/asm/crypto/ec/ecp_nistz256-x86_64.s
+++ b/deps/openssl/config/archs/linux-x86_64/asm/crypto/ec/ecp_nistz256-x86_64.s
@@ -3874,10 +3874,12 @@ ecp_nistz256_ord_sqr_montx:
 .type	ecp_nistz256_to_mont,@function
 .align	32
 ecp_nistz256_to_mont:
+.cfi_startproc
 	movl	$0x80100,%ecx
 	andl	OPENSSL_ia32cap_P+8(%rip),%ecx
 	leaq	.LRR(%rip),%rdx
 	jmp	.Lmul_mont
+.cfi_endproc
 .size	ecp_nistz256_to_mont,.-ecp_nistz256_to_mont
 
 
@@ -4821,6 +4823,7 @@ ecp_nistz256_from_mont:
 .type	ecp_nistz256_scatter_w5,@function
 .align	32
 ecp_nistz256_scatter_w5:
+.cfi_startproc
 	leal	-3(%rdx,%rdx,2),%edx
 	movdqa	0(%rsi),%xmm0
 	shll	$5,%edx
@@ -4837,6 +4840,7 @@ ecp_nistz256_scatter_w5:
 	movdqa	%xmm5,80(%rdi,%rdx,1)
 
 	.byte	0xf3,0xc3
+.cfi_endproc
 .size	ecp_nistz256_scatter_w5,.-ecp_nistz256_scatter_w5
 
 
@@ -4910,6 +4914,7 @@ ecp_nistz256_gather_w5:
 .type	ecp_nistz256_scatter_w7,@function
 .align	32
 ecp_nistz256_scatter_w7:
+.cfi_startproc
 	movdqu	0(%rsi),%xmm0
 	shll	$6,%edx
 	movdqu	16(%rsi),%xmm1
@@ -4921,6 +4926,7 @@ ecp_nistz256_scatter_w7:
 	movdqa	%xmm3,48(%rdi,%rdx,1)
 
 	.byte	0xf3,0xc3
+.cfi_endproc
 .size	ecp_nistz256_scatter_w7,.-ecp_nistz256_scatter_w7
 
 
@@ -5655,26 +5661,16 @@ ecp_nistz256_point_add:
 	orq	%r8,%r12
 	orq	%r9,%r12
 
-.byte	0x3e
-	jnz	.Ladd_proceedq
 .byte	102,73,15,126,208
 .byte	102,73,15,126,217
-	testq	%r8,%r8
-	jnz	.Ladd_proceedq
-	testq	%r9,%r9
-	jz	.Ladd_doubleq
 
-.byte	102,72,15,126,199
-	pxor	%xmm0,%xmm0
-	movdqu	%xmm0,0(%rdi)
-	movdqu	%xmm0,16(%rdi)
-	movdqu	%xmm0,32(%rdi)
-	movdqu	%xmm0,48(%rdi)
-	movdqu	%xmm0,64(%rdi)
-	movdqu	%xmm0,80(%rdi)
-	jmp	.Ladd_doneq
+	orq	%r8,%r12
+	orq	%r9,%r12
+
+
+.byte	0x3e
+	jnz	.Ladd_proceedq
 
-.align	32
 .Ladd_doubleq:
 .byte	102,72,15,126,206
 .byte	102,72,15,126,199
@@ -6774,26 +6770,16 @@ ecp_nistz256_point_addx:
 	orq	%r8,%r12
 	orq	%r9,%r12
 
-.byte	0x3e
-	jnz	.Ladd_proceedx
 .byte	102,73,15,126,208
 .byte	102,73,15,126,217
-	testq	%r8,%r8
-	jnz	.Ladd_proceedx
-	testq	%r9,%r9
-	jz	.Ladd_doublex
 
-.byte	102,72,15,126,199
-	pxor	%xmm0,%xmm0
-	movdqu	%xmm0,0(%rdi)
-	movdqu	%xmm0,16(%rdi)
-	movdqu	%xmm0,32(%rdi)
-	movdqu	%xmm0,48(%rdi)
-	movdqu	%xmm0,64(%rdi)
-	movdqu	%xmm0,80(%rdi)
-	jmp	.Ladd_donex
+	orq	%r8,%r12
+	orq	%r9,%r12
+
+
+.byte	0x3e
+	jnz	.Ladd_proceedx
 
-.align	32
 .Ladd_doublex:
 .byte	102,72,15,126,206
 .byte	102,72,15,126,199
diff --git a/deps/openssl/config/archs/linux-x86_64/asm/crypto/ec/x25519-x86_64.s b/deps/openssl/config/archs/linux-x86_64/asm/crypto/ec/x25519-x86_64.s
index 2a18eaee28..1788e568cd 100644
--- a/deps/openssl/config/archs/linux-x86_64/asm/crypto/ec/x25519-x86_64.s
+++ b/deps/openssl/config/archs/linux-x86_64/asm/crypto/ec/x25519-x86_64.s
@@ -400,12 +400,14 @@ x25519_fe51_mul121666:
 .type	x25519_fe64_eligible,@function
 .align	32
 x25519_fe64_eligible:
+.cfi_startproc
 	movl	OPENSSL_ia32cap_P+8(%rip),%ecx
 	xorl	%eax,%eax
 	andl	$0x80100,%ecx
 	cmpl	$0x80100,%ecx
 	cmovel	%ecx,%eax
 	.byte	0xf3,0xc3
+.cfi_endproc
 .size	x25519_fe64_eligible,.-x25519_fe64_eligible
 
 .globl	x25519_fe64_mul
@@ -648,6 +650,7 @@ x25519_fe64_sqr:
 .align	32
 x25519_fe64_mul121666:
 .Lfe64_mul121666_body:
+.cfi_startproc
 	movl	$121666,%edx
 	mulxq	0(%rsi),%r8,%rcx
 	mulxq	8(%rsi),%r9,%rax
@@ -676,6 +679,7 @@ x25519_fe64_mul121666:
 
 .Lfe64_mul121666_epilogue:
 	.byte	0xf3,0xc3
+.cfi_endproc
 .size	x25519_fe64_mul121666,.-x25519_fe64_mul121666
 
 .globl	x25519_fe64_add
@@ -683,6 +687,7 @@ x25519_fe64_mul121666:
 .align	32
 x25519_fe64_add:
 .Lfe64_add_body:
+.cfi_startproc
 	movq	0(%rsi),%r8
 	movq	8(%rsi),%r9
 	movq	16(%rsi),%r10
@@ -711,6 +716,7 @@ x25519_fe64_add:
 
 .Lfe64_add_epilogue:
 	.byte	0xf3,0xc3
+.cfi_endproc
 .size	x25519_fe64_add,.-x25519_fe64_add
 
 .globl	x25519_fe64_sub
@@ -718,6 +724,7 @@ x25519_fe64_add:
 .align	32
 x25519_fe64_sub:
 .Lfe64_sub_body:
+.cfi_startproc
 	movq	0(%rsi),%r8
 	movq	8(%rsi),%r9
 	movq	16(%rsi),%r10
@@ -746,6 +753,7 @@ x25519_fe64_sub:
 
 .Lfe64_sub_epilogue:
 	.byte	0xf3,0xc3
+.cfi_endproc
 .size	x25519_fe64_sub,.-x25519_fe64_sub
 
 .globl	x25519_fe64_tobytes
@@ -753,6 +761,7 @@ x25519_fe64_sub:
 .align	32
 x25519_fe64_tobytes:
 .Lfe64_to_body:
+.cfi_startproc
 	movq	0(%rsi),%r8
 	movq	8(%rsi),%r9
 	movq	16(%rsi),%r10
@@ -788,5 +797,6 @@ x25519_fe64_tobytes:
 
 .Lfe64_to_epilogue:
 	.byte	0xf3,0xc3
+.cfi_endproc
 .size	x25519_fe64_tobytes,.-x25519_fe64_tobytes
 .byte	88,50,53,53,49,57,32,112,114,105,109,105,116,105,118,101,115,32,102,111,114,32,120,56,54,95,54,52,44,32,67,82,89,80,84,79,71,65,77,83,32,98,121,32,60,97,112,112,114,111,64,111,112,101,110,115,115,108,46,111,114,103,62,0
diff --git a/deps/openssl/config/archs/linux-x86_64/asm/crypto/include/internal/bn_conf.h b/deps/openssl/config/archs/linux-x86_64/asm/crypto/include/internal/bn_conf.h
index 34bd8b78b4..5312ef5a7a 100644
--- a/deps/openssl/config/archs/linux-x86_64/asm/crypto/include/internal/bn_conf.h
+++ b/deps/openssl/config/archs/linux-x86_64/asm/crypto/include/internal/bn_conf.h
@@ -1,5 +1,5 @@
 /* WARNING: do not edit! */
-/* Generated by Makefile from crypto/include/internal/bn_conf.h.in */
+/* Generated by Makefile from include/crypto/bn_conf.h.in */
 /*
  * Copyright 2016 The OpenSSL Project Authors. All Rights Reserved.
  *
@@ -9,8 +9,8 @@
  * https://www.openssl.org/source/license.html
  */
 
-#ifndef HEADER_BN_CONF_H
-# define HEADER_BN_CONF_H
+#ifndef OSSL_CRYPTO_BN_CONF_H
+# define OSSL_CRYPTO_BN_CONF_H
 
 /*
  * The contents of this file are not used in the UEFI build, as
diff --git a/deps/openssl/config/archs/linux-x86_64/asm/crypto/include/internal/dso_conf.h b/deps/openssl/config/archs/linux-x86_64/asm/crypto/include/internal/dso_conf.h
index 252266ec2a..4b1167c3d8 100644
--- a/deps/openssl/config/archs/linux-x86_64/asm/crypto/include/internal/dso_conf.h
+++ b/deps/openssl/config/archs/linux-x86_64/asm/crypto/include/internal/dso_conf.h
@@ -1,5 +1,5 @@
 /* WARNING: do not edit! */
-/* Generated by Makefile from crypto/include/internal/dso_conf.h.in */
+/* Generated by Makefile from include/crypto/dso_conf.h.in */
 /*
  * Copyright 2016-2019 The OpenSSL Project Authors. All Rights Reserved.
  *
@@ -9,8 +9,8 @@
  * https://www.openssl.org/source/license.html
  */
 
-#ifndef HEADER_DSO_CONF_H
-# define HEADER_DSO_CONF_H
+#ifndef OSSL_CRYPTO_DSO_CONF_H
+# define OSSL_CRYPTO_DSO_CONF_H
 # define DSO_DLFCN
 # define HAVE_DLFCN_H
 # define DSO_EXTENSION ".so"
diff --git a/deps/openssl/config/archs/linux-x86_64/asm/crypto/modes/aesni-gcm-x86_64.s b/deps/openssl/config/archs/linux-x86_64/asm/crypto/modes/aesni-gcm-x86_64.s
index 6a7a9577c7..01d89630a4 100644
--- a/deps/openssl/config/archs/linux-x86_64/asm/crypto/modes/aesni-gcm-x86_64.s
+++ b/deps/openssl/config/archs/linux-x86_64/asm/crypto/modes/aesni-gcm-x86_64.s
@@ -3,6 +3,7 @@
 .type	_aesni_ctr32_ghash_6x,@function
 .align	32
 _aesni_ctr32_ghash_6x:
+.cfi_startproc
 	vmovdqu	32(%r11),%xmm2
 	subq	$6,%rdx
 	vpxor	%xmm4,%xmm4,%xmm4
@@ -310,6 +311,7 @@ _aesni_ctr32_ghash_6x:
 	vpxor	%xmm4,%xmm8,%xmm8
 
 	.byte	0xf3,0xc3
+.cfi_endproc
 .size	_aesni_ctr32_ghash_6x,.-_aesni_ctr32_ghash_6x
 .globl	aesni_gcm_decrypt
 .type	aesni_gcm_decrypt,@function
@@ -416,6 +418,7 @@ aesni_gcm_decrypt:
 .type	_aesni_ctr32_6x,@function
 .align	32
 _aesni_ctr32_6x:
+.cfi_startproc
 	vmovdqu	0-128(%rcx),%xmm4
 	vmovdqu	32(%r11),%xmm2
 	leaq	-1(%rbp),%r13
@@ -502,6 +505,7 @@ _aesni_ctr32_6x:
 	vpshufb	%xmm0,%xmm1,%xmm1
 	vpxor	%xmm4,%xmm14,%xmm14
 	jmp	.Loop_ctr32
+.cfi_endproc
 .size	_aesni_ctr32_6x,.-_aesni_ctr32_6x
 
 .globl	aesni_gcm_encrypt
diff --git a/deps/openssl/config/archs/linux-x86_64/asm/crypto/poly1305/poly1305-x86_64.s b/deps/openssl/config/archs/linux-x86_64/asm/crypto/poly1305/poly1305-x86_64.s
index deb4f74bfb..987a65aab3 100644
--- a/deps/openssl/config/archs/linux-x86_64/asm/crypto/poly1305/poly1305-x86_64.s
+++ b/deps/openssl/config/archs/linux-x86_64/asm/crypto/poly1305/poly1305-x86_64.s
@@ -12,6 +12,7 @@
 .type	poly1305_init,@function
 .align	32
 poly1305_init:
+.cfi_startproc
 	xorq	%rax,%rax
 	movq	%rax,0(%rdi)
 	movq	%rax,8(%rdi)
@@ -47,6 +48,7 @@ poly1305_init:
 	movl	$1,%eax
 .Lno_key:
 	.byte	0xf3,0xc3
+.cfi_endproc
 .size	poly1305_init,.-poly1305_init
 
 .type	poly1305_blocks,@function
@@ -167,6 +169,7 @@ poly1305_blocks:
 .type	poly1305_emit,@function
 .align	32
 poly1305_emit:
+.cfi_startproc
 .Lemit:
 	movq	0(%rdi),%r8
 	movq	8(%rdi),%r9
@@ -187,10 +190,12 @@ poly1305_emit:
 	movq	%rcx,8(%rsi)
 
 	.byte	0xf3,0xc3
+.cfi_endproc
 .size	poly1305_emit,.-poly1305_emit
 .type	__poly1305_block,@function
 .align	32
 __poly1305_block:
+.cfi_startproc
 	mulq	%r14
 	movq	%rax,%r9
 	movq	%r11,%rax
@@ -230,11 +235,13 @@ __poly1305_block:
 	adcq	$0,%rbx
 	adcq	$0,%rbp
 	.byte	0xf3,0xc3
+.cfi_endproc
 .size	__poly1305_block,.-__poly1305_block
 
 .type	__poly1305_init_avx,@function
 .align	32
 __poly1305_init_avx:
+.cfi_startproc
 	movq	%r11,%r14
 	movq	%r12,%rbx
 	xorq	%rbp,%rbp
@@ -392,6 +399,7 @@ __poly1305_init_avx:
 
 	leaq	-48-64(%rdi),%rdi
 	.byte	0xf3,0xc3
+.cfi_endproc
 .size	__poly1305_init_avx,.-__poly1305_init_avx
 
 .type	poly1305_blocks_avx,@function
@@ -1232,6 +1240,7 @@ poly1305_blocks_avx:
 .type	poly1305_emit_avx,@function
 .align	32
 poly1305_emit_avx:
+.cfi_startproc
 	cmpl	$0,20(%rdi)
 	je	.Lemit
 
@@ -1282,6 +1291,7 @@ poly1305_emit_avx:
 	movq	%rcx,8(%rsi)
 
 	.byte	0xf3,0xc3
+.cfi_endproc
 .size	poly1305_emit_avx,.-poly1305_emit_avx
 .type	poly1305_blocks_avx2,@function
 .align	32
@@ -2478,6 +2488,7 @@ poly1305_blocks_avx512:
 .type	poly1305_init_base2_44,@function
 .align	32
 poly1305_init_base2_44:
+.cfi_startproc
 	xorq	%rax,%rax
 	movq	%rax,0(%rdi)
 	movq	%rax,8(%rdi)
@@ -2511,10 +2522,12 @@ poly1305_init_base2_44:
 	movq	%r11,8(%rdx)
 	movl	$1,%eax
 	.byte	0xf3,0xc3
+.cfi_endproc
 .size	poly1305_init_base2_44,.-poly1305_init_base2_44
 .type	poly1305_blocks_vpmadd52,@function
 .align	32
 poly1305_blocks_vpmadd52:
+.cfi_startproc
 	shrq	$4,%rdx
 	jz	.Lno_data_vpmadd52
 
@@ -2621,10 +2634,12 @@ poly1305_blocks_vpmadd52:
 
 .Lno_data_vpmadd52:
 	.byte	0xf3,0xc3
+.cfi_endproc
 .size	poly1305_blocks_vpmadd52,.-poly1305_blocks_vpmadd52
 .type	poly1305_blocks_vpmadd52_4x,@function
 .align	32
 poly1305_blocks_vpmadd52_4x:
+.cfi_startproc
 	shrq	$4,%rdx
 	jz	.Lno_data_vpmadd52_4x
 
@@ -3049,10 +3064,12 @@ poly1305_blocks_vpmadd52_4x:
 
 .Lno_data_vpmadd52_4x:
 	.byte	0xf3,0xc3
+.cfi_endproc
 .size	poly1305_blocks_vpmadd52_4x,.-poly1305_blocks_vpmadd52_4x
 .type	poly1305_blocks_vpmadd52_8x,@function
 .align	32
 poly1305_blocks_vpmadd52_8x:
+.cfi_startproc
 	shrq	$4,%rdx
 	jz	.Lno_data_vpmadd52_8x
 
@@ -3393,10 +3410,12 @@ poly1305_blocks_vpmadd52_8x:
 
 .Lno_data_vpmadd52_8x:
 	.byte	0xf3,0xc3
+.cfi_endproc
 .size	poly1305_blocks_vpmadd52_8x,.-poly1305_blocks_vpmadd52_8x
 .type	poly1305_emit_base2_44,@function
 .align	32
 poly1305_emit_base2_44:
+.cfi_startproc
 	movq	0(%rdi),%r8
 	movq	8(%rdi),%r9
 	movq	16(%rdi),%r10
@@ -3427,6 +3446,7 @@ poly1305_emit_base2_44:
 	movq	%rcx,8(%rsi)
 
 	.byte	0xf3,0xc3
+.cfi_endproc
 .size	poly1305_emit_base2_44,.-poly1305_emit_base2_44
 .align	64
 .Lconst:
@@ -3465,6 +3485,7 @@ poly1305_emit_base2_44:
 .type	xor128_encrypt_n_pad,@function
 .align	16
 xor128_encrypt_n_pad:
+.cfi_startproc
 	subq	%rdx,%rsi
 	subq	%rdx,%rdi
 	movq	%rcx,%r10
@@ -3506,12 +3527,14 @@ xor128_encrypt_n_pad:
 .Ldone_enc:
 	movq	%rdx,%rax
 	.byte	0xf3,0xc3
+.cfi_endproc
 .size	xor128_encrypt_n_pad,.-xor128_encrypt_n_pad
 
 .globl	xor128_decrypt_n_pad
 .type	xor128_decrypt_n_pad,@function
 .align	16
 xor128_decrypt_n_pad:
+.cfi_startproc
 	subq	%rdx,%rsi
 	subq	%rdx,%rdi
 	movq	%rcx,%r10
@@ -3557,4 +3580,5 @@ xor128_decrypt_n_pad:
 .Ldone_dec:
 	movq	%rdx,%rax
 	.byte	0xf3,0xc3
+.cfi_endproc
 .size	xor128_decrypt_n_pad,.-xor128_decrypt_n_pad
diff --git a/deps/openssl/config/archs/linux-x86_64/asm/crypto/rc4/rc4-x86_64.s b/deps/openssl/config/archs/linux-x86_64/asm/crypto/rc4/rc4-x86_64.s
index fba70351d4..b97c757550 100644
--- a/deps/openssl/config/archs/linux-x86_64/asm/crypto/rc4/rc4-x86_64.s
+++ b/deps/openssl/config/archs/linux-x86_64/asm/crypto/rc4/rc4-x86_64.s
@@ -4,11 +4,12 @@
 .globl	RC4
 .type	RC4,@function
 .align	16
-RC4:	orq	%rsi,%rsi
+RC4:
+.cfi_startproc
+	orq	%rsi,%rsi
 	jne	.Lentry
 	.byte	0xf3,0xc3
 .Lentry:
-.cfi_startproc	
 	pushq	%rbx
 .cfi_adjust_cfa_offset	8
 .cfi_offset	%rbx,-16
@@ -533,6 +534,7 @@ RC4:	orq	%rsi,%rsi
 .type	RC4_set_key,@function
 .align	16
 RC4_set_key:
+.cfi_startproc
 	leaq	8(%rdi),%rdi
 	leaq	(%rdx,%rsi,1),%rdx
 	negq	%rsi
@@ -599,12 +601,14 @@ RC4_set_key:
 	movl	%eax,-8(%rdi)
 	movl	%eax,-4(%rdi)
 	.byte	0xf3,0xc3
+.cfi_endproc
 .size	RC4_set_key,.-RC4_set_key
 
 .globl	RC4_options
 .type	RC4_options,@function
 .align	16
 RC4_options:
+.cfi_startproc
 	leaq	.Lopts(%rip),%rax
 	movl	OPENSSL_ia32cap_P(%rip),%edx
 	btl	$20,%edx
@@ -617,6 +621,7 @@ RC4_options:
 	addq	$12,%rax
 .Ldone:
 	.byte	0xf3,0xc3
+.cfi_endproc
 .align	64
 .Lopts:
 .byte	114,99,52,40,56,120,44,105,110,116,41,0
diff --git a/deps/openssl/config/archs/linux-x86_64/asm/crypto/sha/keccak1600-x86_64.s b/deps/openssl/config/archs/linux-x86_64/asm/crypto/sha/keccak1600-x86_64.s
index e511f25035..09617d014b 100644
--- a/deps/openssl/config/archs/linux-x86_64/asm/crypto/sha/keccak1600-x86_64.s
+++ b/deps/openssl/config/archs/linux-x86_64/asm/crypto/sha/keccak1600-x86_64.s
@@ -3,6 +3,7 @@
 .type	__KeccakF1600,@function
 .align	32
 __KeccakF1600:
+.cfi_startproc
 	movq	60(%rdi),%rax
 	movq	68(%rdi),%rbx
 	movq	76(%rdi),%rcx
@@ -255,6 +256,7 @@ __KeccakF1600:
 
 	leaq	-192(%r15),%r15
 	.byte	0xf3,0xc3
+.cfi_endproc
 .size	__KeccakF1600,.-__KeccakF1600
 
 .type	KeccakF1600,@function
diff --git a/deps/openssl/config/archs/linux-x86_64/asm/crypto/sha/sha1-x86_64.s b/deps/openssl/config/archs/linux-x86_64/asm/crypto/sha/sha1-x86_64.s
index e436521a04..98541727e5 100644
--- a/deps/openssl/config/archs/linux-x86_64/asm/crypto/sha/sha1-x86_64.s
+++ b/deps/openssl/config/archs/linux-x86_64/asm/crypto/sha/sha1-x86_64.s
@@ -1421,8 +1421,8 @@ _shaext_shortcut:
 	pshufd	$27,%xmm1,%xmm1
 	movdqu	%xmm0,(%rdi)
 	movd	%xmm1,16(%rdi)
-.cfi_endproc	
 	.byte	0xf3,0xc3
+.cfi_endproc
 .size	sha1_block_data_order_shaext,.-sha1_block_data_order_shaext
 .type	sha1_block_data_order_ssse3,@function
 .align	16
diff --git a/deps/openssl/config/archs/linux-x86_64/asm/crypto/sha/sha256-x86_64.s b/deps/openssl/config/archs/linux-x86_64/asm/crypto/sha/sha256-x86_64.s
index 42b24df18e..9357385da3 100644
--- a/deps/openssl/config/archs/linux-x86_64/asm/crypto/sha/sha256-x86_64.s
+++ b/deps/openssl/config/archs/linux-x86_64/asm/crypto/sha/sha256-x86_64.s
@@ -1775,6 +1775,7 @@ K256:
 .align	64
 sha256_block_data_order_shaext:
 _shaext_shortcut:
+.cfi_startproc
 	leaq	K256+128(%rip),%rcx
 	movdqu	(%rdi),%xmm1
 	movdqu	16(%rdi),%xmm2
@@ -1977,6 +1978,7 @@ _shaext_shortcut:
 	movdqu	%xmm1,(%rdi)
 	movdqu	%xmm2,16(%rdi)
 	.byte	0xf3,0xc3
+.cfi_endproc
 .size	sha256_block_data_order_shaext,.-sha256_block_data_order_shaext
 .type	sha256_block_data_order_ssse3,@function
 .align	64
@@ -4238,7 +4240,15 @@ sha256_block_data_order_avx2:
 	vmovdqa	%ymm4,0(%rsp)
 	xorl	%r14d,%r14d
 	vmovdqa	%ymm5,32(%rsp)
+
+	movq	88(%rsp),%rdi
+.cfi_def_cfa	%rdi,8
 	leaq	-64(%rsp),%rsp
+
+
+
+	movq	%rdi,-8(%rsp)
+.cfi_escape	0x0f,0x05,0x77,0x78,0x06,0x23,0x08
 	movl	%ebx,%edi
 	vmovdqa	%ymm6,0(%rsp)
 	xorl	%ecx,%edi
@@ -4250,6 +4260,12 @@ sha256_block_data_order_avx2:
 .align	16
 .Lavx2_00_47:
 	leaq	-64(%rsp),%rsp
+.cfi_escape	0x0f,0x05,0x77,0x38,0x06,0x23,0x08
+
+	pushq	64-8(%rsp)
+.cfi_escape	0x0f,0x05,0x77,0x00,0x06,0x23,0x08
+	leaq	8(%rsp),%rsp
+.cfi_escape	0x0f,0x05,0x77,0x78,0x06,0x23,0x08
 	vpalignr	$4,%ymm0,%ymm1,%ymm4
 	addl	0+128(%rsp),%r11d
 	andl	%r8d,%r12d
@@ -4505,6 +4521,12 @@ sha256_block_data_order_avx2:
 	movl	%r9d,%r12d
 	vmovdqa	%ymm6,32(%rsp)
 	leaq	-64(%rsp),%rsp
+.cfi_escape	0x0f,0x05,0x77,0x38,0x06,0x23,0x08
+
+	pushq	64-8(%rsp)
+.cfi_escape	0x0f,0x05,0x77,0x00,0x06,0x23,0x08
+	leaq	8(%rsp),%rsp
+.cfi_escape	0x0f,0x05,0x77,0x78,0x06,0x23,0x08
 	vpalignr	$4,%ymm2,%ymm3,%ymm4
 	addl	0+128(%rsp),%r11d
 	andl	%r8d,%r12d
@@ -5380,6 +5402,8 @@ sha256_block_data_order_avx2:
 
 	leaq	448(%rsp),%rsp
 
+.cfi_escape	0x0f,0x06,0x77,0xd8,0x00,0x06,0x23,0x08
+
 	addl	0(%rdi),%eax
 	addl	4(%rdi),%ebx
 	addl	8(%rdi),%ecx
@@ -5405,9 +5429,11 @@ sha256_block_data_order_avx2:
 	jbe	.Loop_avx2
 	leaq	(%rsp),%rbp
 
+
+.cfi_escape	0x0f,0x06,0x76,0xd8,0x00,0x06,0x23,0x08
+
 .Ldone_avx2:
-	leaq	(%rbp),%rsp
-	movq	88(%rsp),%rsi
+	movq	88(%rbp),%rsi
 .cfi_def_cfa	%rsi,8
 	vzeroupper
 	movq	-48(%rsi),%r15
diff --git a/deps/openssl/config/archs/linux-x86_64/asm/crypto/sha/sha512-x86_64.s b/deps/openssl/config/archs/linux-x86_64/asm/crypto/sha/sha512-x86_64.s
index 5931a2a932..939f1ca71c 100644
--- a/deps/openssl/config/archs/linux-x86_64/asm/crypto/sha/sha512-x86_64.s
+++ b/deps/openssl/config/archs/linux-x86_64/asm/crypto/sha/sha512-x86_64.s
@@ -4165,7 +4165,15 @@ sha512_block_data_order_avx2:
 	vmovdqa	%ymm10,64(%rsp)
 	vpaddq	64(%rbp),%ymm6,%ymm10
 	vmovdqa	%ymm11,96(%rsp)
+
+	movq	152(%rsp),%rdi
+.cfi_def_cfa	%rdi,8
 	leaq	-128(%rsp),%rsp
+
+
+
+	movq	%rdi,-8(%rsp)
+.cfi_escape	0x0f,0x05,0x77,0x78,0x06,0x23,0x08
 	vpaddq	96(%rbp),%ymm7,%ymm11
 	vmovdqa	%ymm8,0(%rsp)
 	xorq	%r14,%r14
@@ -4181,6 +4189,12 @@ sha512_block_data_order_avx2:
 .align	16
 .Lavx2_00_47:
 	leaq	-128(%rsp),%rsp
+.cfi_escape	0x0f,0x06,0x77,0xf8,0x00,0x06,0x23,0x08
+
+	pushq	128-8(%rsp)
+.cfi_escape	0x0f,0x05,0x77,0x00,0x06,0x23,0x08
+	leaq	8(%rsp),%rsp
+.cfi_escape	0x0f,0x05,0x77,0x78,0x06,0x23,0x08
 	vpalignr	$8,%ymm0,%ymm1,%ymm8
 	addq	0+256(%rsp),%r11
 	andq	%r8,%r12
@@ -4474,6 +4488,12 @@ sha512_block_data_order_avx2:
 	movq	%r9,%r12
 	vmovdqa	%ymm10,96(%rsp)
 	leaq	-128(%rsp),%rsp
+.cfi_escape	0x0f,0x06,0x77,0xf8,0x00,0x06,0x23,0x08
+
+	pushq	128-8(%rsp)
+.cfi_escape	0x0f,0x05,0x77,0x00,0x06,0x23,0x08
+	leaq	8(%rsp),%rsp
+.cfi_escape	0x0f,0x05,0x77,0x78,0x06,0x23,0x08
 	vpalignr	$8,%ymm4,%ymm5,%ymm8
 	addq	0+256(%rsp),%r11
 	andq	%r8,%r12
@@ -5387,6 +5407,8 @@ sha512_block_data_order_avx2:
 
 	leaq	1152(%rsp),%rsp
 
+.cfi_escape	0x0f,0x06,0x77,0x98,0x01,0x06,0x23,0x08
+
 	addq	0(%rdi),%rax
 	addq	8(%rdi),%rbx
 	addq	16(%rdi),%rcx
@@ -5412,9 +5434,11 @@ sha512_block_data_order_avx2:
 	jbe	.Loop_avx2
 	leaq	(%rsp),%rbp
 
+
+.cfi_escape	0x0f,0x06,0x76,0x98,0x01,0x06,0x23,0x08
+
 .Ldone_avx2:
-	leaq	(%rbp),%rsp
-	movq	152(%rsp),%rsi
+	movq	152(%rbp),%rsi
 .cfi_def_cfa	%rsi,8
 	vzeroupper
 	movq	-48(%rsi),%r15
diff --git a/deps/openssl/config/archs/linux-x86_64/asm/crypto/x86_64cpuid.s b/deps/openssl/config/archs/linux-x86_64/asm/crypto/x86_64cpuid.s
index fd17eaaba4..9268ce8c9a 100644
--- a/deps/openssl/config/archs/linux-x86_64/asm/crypto/x86_64cpuid.s
+++ b/deps/openssl/config/archs/linux-x86_64/asm/crypto/x86_64cpuid.s
@@ -12,6 +12,7 @@
 .type	OPENSSL_atomic_add,@function
 .align	16
 OPENSSL_atomic_add:
+.cfi_startproc
 	movl	(%rdi),%eax
 .Lspin:	leaq	(%rsi,%rax,1),%r8
 .byte	0xf0
@@ -20,16 +21,19 @@ OPENSSL_atomic_add:
 	movl	%r8d,%eax
 .byte	0x48,0x98
 	.byte	0xf3,0xc3
+.cfi_endproc
 .size	OPENSSL_atomic_add,.-OPENSSL_atomic_add
 
 .globl	OPENSSL_rdtsc
 .type	OPENSSL_rdtsc,@function
 .align	16
 OPENSSL_rdtsc:
+.cfi_startproc
 	rdtsc
 	shlq	$32,%rdx
 	orq	%rdx,%rax
 	.byte	0xf3,0xc3
+.cfi_endproc
 .size	OPENSSL_rdtsc,.-OPENSSL_rdtsc
 
 .globl	OPENSSL_ia32_cpuid
@@ -205,6 +209,7 @@ OPENSSL_ia32_cpuid:
 .type	OPENSSL_cleanse,@function
 .align	16
 OPENSSL_cleanse:
+.cfi_startproc
 	xorq	%rax,%rax
 	cmpq	$15,%rsi
 	jae	.Lot
@@ -234,12 +239,14 @@ OPENSSL_cleanse:
 	cmpq	$0,%rsi
 	jne	.Little
 	.byte	0xf3,0xc3
+.cfi_endproc
 .size	OPENSSL_cleanse,.-OPENSSL_cleanse
 
 .globl	CRYPTO_memcmp
 .type	CRYPTO_memcmp,@function
 .align	16
 CRYPTO_memcmp:
+.cfi_startproc
 	xorq	%rax,%rax
 	xorq	%r10,%r10
 	cmpq	$0,%rdx
@@ -268,11 +275,13 @@ CRYPTO_memcmp:
 	shrq	$63,%rax
 .Lno_data:
 	.byte	0xf3,0xc3
+.cfi_endproc
 .size	CRYPTO_memcmp,.-CRYPTO_memcmp
 .globl	OPENSSL_wipe_cpu
 .type	OPENSSL_wipe_cpu,@function
 .align	16
 OPENSSL_wipe_cpu:
+.cfi_startproc
 	pxor	%xmm0,%xmm0
 	pxor	%xmm1,%xmm1
 	pxor	%xmm2,%xmm2
@@ -299,11 +308,13 @@ OPENSSL_wipe_cpu:
 	xorq	%r11,%r11
 	leaq	8(%rsp),%rax
 	.byte	0xf3,0xc3
+.cfi_endproc
 .size	OPENSSL_wipe_cpu,.-OPENSSL_wipe_cpu
 .globl	OPENSSL_instrument_bus
 .type	OPENSSL_instrument_bus,@function
 .align	16
 OPENSSL_instrument_bus:
+.cfi_startproc
 	movq	%rdi,%r10
 	movq	%rsi,%rcx
 	movq	%rsi,%r11
@@ -330,12 +341,14 @@ OPENSSL_instrument_bus:
 
 	movq	%r11,%rax
 	.byte	0xf3,0xc3
+.cfi_endproc
 .size	OPENSSL_instrument_bus,.-OPENSSL_instrument_bus
 
 .globl	OPENSSL_instrument_bus2
 .type	OPENSSL_instrument_bus2,@function
 .align	16
 OPENSSL_instrument_bus2:
+.cfi_startproc
 	movq	%rdi,%r10
 	movq	%rsi,%rcx
 	movq	%rdx,%r11
@@ -378,11 +391,13 @@ OPENSSL_instrument_bus2:
 	movq	8(%rsp),%rax
 	subq	%rcx,%rax
 	.byte	0xf3,0xc3
+.cfi_endproc
 .size	OPENSSL_instrument_bus2,.-OPENSSL_instrument_bus2
 .globl	OPENSSL_ia32_rdrand_bytes
 .type	OPENSSL_ia32_rdrand_bytes,@function
 .align	16
 OPENSSL_ia32_rdrand_bytes:
+.cfi_startproc
 	xorq	%rax,%rax
 	cmpq	$0,%rsi
 	je	.Ldone_rdrand_bytes
@@ -419,11 +434,13 @@ OPENSSL_ia32_rdrand_bytes:
 .Ldone_rdrand_bytes:
 	xorq	%r10,%r10
 	.byte	0xf3,0xc3
+.cfi_endproc
 .size	OPENSSL_ia32_rdrand_bytes,.-OPENSSL_ia32_rdrand_bytes
 .globl	OPENSSL_ia32_rdseed_bytes
 .type	OPENSSL_ia32_rdseed_bytes,@function
 .align	16
 OPENSSL_ia32_rdseed_bytes:
+.cfi_startproc
 	xorq	%rax,%rax
 	cmpq	$0,%rsi
 	je	.Ldone_rdseed_bytes
@@ -460,4 +477,5 @@ OPENSSL_ia32_rdseed_bytes:
 .Ldone_rdseed_bytes:
 	xorq	%r10,%r10
 	.byte	0xf3,0xc3
+.cfi_endproc
 .size	OPENSSL_ia32_rdseed_bytes,.-OPENSSL_ia32_rdseed_bytes
diff --git a/deps/openssl/config/archs/linux-x86_64/asm/include/openssl/opensslconf.h b/deps/openssl/config/archs/linux-x86_64/asm/include/openssl/opensslconf.h
index 913bb95a5a..14050a4534 100644
--- a/deps/openssl/config/archs/linux-x86_64/asm/include/openssl/opensslconf.h
+++ b/deps/openssl/config/archs/linux-x86_64/asm/include/openssl/opensslconf.h
@@ -96,9 +96,6 @@ extern "C" {
 #ifndef OPENSSL_NO_DYNAMIC_ENGINE
 # define OPENSSL_NO_DYNAMIC_ENGINE
 #endif
-#ifndef OPENSSL_NO_AFALGENG
-# define OPENSSL_NO_AFALGENG
-#endif
 
 
 /*
diff --git a/deps/openssl/config/archs/linux-x86_64/asm/include/progs.h b/deps/openssl/config/archs/linux-x86_64/asm/include/progs.h
index 9b3d270e20..308c65601b 100644
--- a/deps/openssl/config/archs/linux-x86_64/asm/include/progs.h
+++ b/deps/openssl/config/archs/linux-x86_64/asm/include/progs.h
@@ -2,7 +2,7 @@
  * WARNING: do not edit!
  * Generated by apps/progs.pl
  *
- * Copyright 1995-2019 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 1995-2020 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
diff --git a/deps/openssl/config/archs/linux-x86_64/asm/openssl-cl.gypi b/deps/openssl/config/archs/linux-x86_64/asm/openssl-cl.gypi
index b134d72e7d..04e53d9f2a 100644
--- a/deps/openssl/config/archs/linux-x86_64/asm/openssl-cl.gypi
+++ b/deps/openssl/config/archs/linux-x86_64/asm/openssl-cl.gypi
@@ -16,6 +16,7 @@
       'KECCAK1600_ASM',
       'RC4_ASM',
       'MD5_ASM',
+      'AESNI_ASM',
       'VPAES_ASM',
       'GHASH_ASM',
       'ECP_NISTZ256_ASM',
diff --git a/deps/openssl/config/archs/linux-x86_64/asm/openssl.gypi b/deps/openssl/config/archs/linux-x86_64/asm/openssl.gypi
index 92491dbd9f..dd7045e3ac 100644
--- a/deps/openssl/config/archs/linux-x86_64/asm/openssl.gypi
+++ b/deps/openssl/config/archs/linux-x86_64/asm/openssl.gypi
@@ -723,6 +723,7 @@
       'KECCAK1600_ASM',
       'RC4_ASM',
       'MD5_ASM',
+      'AESNI_ASM',
       'VPAES_ASM',
       'GHASH_ASM',
       'ECP_NISTZ256_ASM',
diff --git a/deps/openssl/config/archs/linux-x86_64/asm_avx2/configdata.pm b/deps/openssl/config/archs/linux-x86_64/asm_avx2/configdata.pm
index b2a66729eb..4c4db242e4 100644
--- a/deps/openssl/config/archs/linux-x86_64/asm_avx2/configdata.pm
+++ b/deps/openssl/config/archs/linux-x86_64/asm_avx2/configdata.pm
@@ -49,14 +49,14 @@ our %config = (
   export_var_as_fn => "0",
   includes => [  ],
   lflags => [  ],
-  lib_defines => [ "OPENSSL_PIC", "OPENSSL_CPUID_OBJ", "OPENSSL_IA32_SSE2", "OPENSSL_BN_ASM_MONT", "OPENSSL_BN_ASM_MONT5", "OPENSSL_BN_ASM_GF2m", "SHA1_ASM", "SHA256_ASM", "SHA512_ASM", "KECCAK1600_ASM", "RC4_ASM", "MD5_ASM", "VPAES_ASM", "GHASH_ASM", "ECP_NISTZ256_ASM", "X25519_ASM", "POLY1305_ASM" ],
+  lib_defines => [ "OPENSSL_PIC", "OPENSSL_CPUID_OBJ", "OPENSSL_IA32_SSE2", "OPENSSL_BN_ASM_MONT", "OPENSSL_BN_ASM_MONT5", "OPENSSL_BN_ASM_GF2m", "SHA1_ASM", "SHA256_ASM", "SHA512_ASM", "KECCAK1600_ASM", "RC4_ASM", "MD5_ASM", "AESNI_ASM", "VPAES_ASM", "GHASH_ASM", "ECP_NISTZ256_ASM", "X25519_ASM", "POLY1305_ASM" ],
   libdir => "",
   major => "1",
   makedepprog => "\$(CROSS_COMPILE)../config/fake_gcc.pl",
   minor => "1.1",
   openssl_algorithm_defines => [ "OPENSSL_NO_COMP", "OPENSSL_NO_MD2", "OPENSSL_NO_RC5" ],
   openssl_api_defines => [  ],
-  openssl_other_defines => [ "OPENSSL_RAND_SEED_OS", "OPENSSL_NO_AFALGENG", "OPENSSL_NO_ASAN", "OPENSSL_NO_CRYPTO_MDEBUG", "OPENSSL_NO_CRYPTO_MDEBUG_BACKTRACE", "OPENSSL_NO_DEVCRYPTOENG", "OPENSSL_NO_EC_NISTP_64_GCC_128", "OPENSSL_NO_EGD", "OPENSSL_NO_EXTERNAL_TESTS", "OPENSSL_NO_FUZZ_AFL", "OPENSSL_NO_FUZZ_LIBFUZZER", "OPENSSL_NO_HEARTBEATS", "OPENSSL_NO_MSAN", "OPENSSL_NO_SCTP", "OPENSSL_NO_SSL3", "OPENSSL_NO_SSL3_METHOD", "OPENSSL_NO_UBSAN", "OPENSSL_NO_UNIT_TEST", "OPENSSL_NO_WEAK_SSL_CIPHERS", "OPENSSL_NO_DYNAMIC_ENGINE", "OPENSSL_NO_AFALGENG" ],
+  openssl_other_defines => [ "OPENSSL_RAND_SEED_OS", "OPENSSL_NO_AFALGENG", "OPENSSL_NO_ASAN", "OPENSSL_NO_CRYPTO_MDEBUG", "OPENSSL_NO_CRYPTO_MDEBUG_BACKTRACE", "OPENSSL_NO_DEVCRYPTOENG", "OPENSSL_NO_EC_NISTP_64_GCC_128", "OPENSSL_NO_EGD", "OPENSSL_NO_EXTERNAL_TESTS", "OPENSSL_NO_FUZZ_AFL", "OPENSSL_NO_FUZZ_LIBFUZZER", "OPENSSL_NO_HEARTBEATS", "OPENSSL_NO_MSAN", "OPENSSL_NO_SCTP", "OPENSSL_NO_SSL3", "OPENSSL_NO_SSL3_METHOD", "OPENSSL_NO_UBSAN", "OPENSSL_NO_UNIT_TEST", "OPENSSL_NO_WEAK_SSL_CIPHERS", "OPENSSL_NO_DYNAMIC_ENGINE" ],
   openssl_sys_defines => [  ],
   openssl_thread_defines => [ "OPENSSL_THREADS" ],
   openssldir => "",
@@ -112,8 +112,8 @@ our %config = (
   sourcedir => ".",
   target => "linux-x86_64",
   tdirs => [ "ossl_shim" ],
-  version => "1.1.1d",
-  version_num => "0x1010104fL",
+  version => "1.1.1e",
+  version_num => "0x1010105fL",
 );
 
 our %target = (
@@ -241,6 +241,7 @@ our @disablables = (
   "dgram",
   "dh",
   "dsa",
+  "dso",
   "dtls",
   "dynamic-engine",
   "ec",
@@ -358,8 +359,8 @@ our %unified_info = (
         {
             "" =>
                 [
-                    "crypto/include/internal/bn_conf.h",
-                    "crypto/include/internal/dso_conf.h",
+                    "include/crypto/bn_conf.h",
+                    "include/crypto/dso_conf.h",
                     "include/openssl/opensslconf.h",
                 ],
             "apps/asn1pars.o" =>
@@ -627,14 +628,6 @@ our %unified_info = (
                     "crypto/perlasm/cbc.pl",
                     "crypto/perlasm/x86asm.pl",
                 ],
-            "crypto/include/internal/bn_conf.h" =>
-                [
-                    "configdata.pm",
-                ],
-            "crypto/include/internal/dso_conf.h" =>
-                [
-                    "configdata.pm",
-                ],
             "crypto/rc4/rc4-586.s" =>
                 [
                     "crypto/perlasm/x86asm.pl",
@@ -710,6 +703,14 @@ our %unified_info = (
                 [
                     "libcrypto",
                 ],
+            "include/crypto/bn_conf.h" =>
+                [
+                    "configdata.pm",
+                ],
+            "include/crypto/dso_conf.h" =>
+                [
+                    "configdata.pm",
+                ],
             "include/openssl/opensslconf.h" =>
                 [
                     "configdata.pm",
@@ -1507,6 +1508,12 @@ our %unified_info = (
                     "libcrypto",
                     "test/libtestutil.a",
                 ],
+            "test/ssl_ctx_test" =>
+                [
+                    "libcrypto",
+                    "libssl",
+                    "test/libtestutil.a",
+                ],
             "test/ssl_test" =>
                 [
                     "libcrypto",
@@ -3261,7 +3268,6 @@ our %unified_info = (
                             "test/testutil/cb.o",
                             "test/testutil/driver.o",
                             "test/testutil/format_output.o",
-                            "test/testutil/init.o",
                             "test/testutil/main.o",
                             "test/testutil/output_helpers.o",
                             "test/testutil/random.o",
@@ -3269,6 +3275,7 @@ our %unified_info = (
                             "test/testutil/tap_bio.o",
                             "test/testutil/test_cleanup.o",
                             "test/testutil/tests.o",
+                            "test/testutil/testutil_init.o",
                         ],
                     "products" =>
                         {
@@ -3767,14 +3774,6 @@ our %unified_info = (
                 [
                     "crypto/ia64cpuid.S",
                 ],
-            "crypto/include/internal/bn_conf.h" =>
-                [
-                    "crypto/include/internal/bn_conf.h.in",
-                ],
-            "crypto/include/internal/dso_conf.h" =>
-                [
-                    "crypto/include/internal/dso_conf.h.in",
-                ],
             "crypto/md5/md5-586.s" =>
                 [
                     "crypto/md5/asm/md5-586.pl",
@@ -4215,6 +4214,14 @@ our %unified_info = (
                     "engines/asm/e_padlock-x86_64.pl",
                     "\$(PERLASM_SCHEME)",
                 ],
+            "include/crypto/bn_conf.h" =>
+                [
+                    "include/crypto/bn_conf.h.in",
+                ],
+            "include/crypto/dso_conf.h" =>
+                [
+                    "include/crypto/dso_conf.h.in",
+                ],
             "include/openssl/opensslconf.h" =>
                 [
                     "include/openssl/opensslconf.h.in",
@@ -4909,49 +4916,41 @@ our %unified_info = (
             "crypto/aes/aes_cbc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/aes/aes_cfb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/aes/aes_core.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/aes/aes_ecb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/aes/aes_ige.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/aes/aes_misc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/aes/aes_ofb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/aes/aes_wrap.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/aes/aesfx-sparcv9.o" =>
@@ -4961,25 +4960,21 @@ our %unified_info = (
             "crypto/aes/aesni-mb-x86_64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/aes/aesni-sha1-x86_64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/aes/aesni-sha256-x86_64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/aes/aesni-x86_64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/aes/aest4-sparcv9.o" =>
@@ -4997,13 +4992,11 @@ our %unified_info = (
             "crypto/aes/vpaes-x86_64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/aria/aria.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/arm64cpuid.o" =>
@@ -5017,613 +5010,511 @@ our %unified_info = (
             "crypto/asn1/a_bitstr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_d2i_fp.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_digest.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_dup.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_gentm.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_i2d_fp.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_int.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_mbstr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_object.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_octet.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_print.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_sign.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_strex.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_strnid.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_time.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_type.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_utctm.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_utf8.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_verify.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/ameth_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/asn1_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/asn1_gen.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/asn1_item_list.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/asn1_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/asn1_par.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/asn_mime.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/asn_moid.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/asn_mstbl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/asn_pack.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/bio_asn1.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/bio_ndef.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/d2i_pr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/d2i_pu.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/evp_asn1.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/f_int.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/f_string.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/i2d_pr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/i2d_pu.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/n_pkey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/nsseq.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/p5_pbe.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/p5_pbev2.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/p5_scrypt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/p8_pkey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/t_bitst.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/t_pkey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/t_spki.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/tasn_dec.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/tasn_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/tasn_fre.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/tasn_new.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/tasn_prn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/tasn_scn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/tasn_typ.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/tasn_utl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/x_algor.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/x_bignum.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/x_info.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/x_int64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/x_long.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/x_pkey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/x_sig.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/x_spki.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/x_val.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/async/arch/async_null.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/async/arch/async_posix.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/async/arch/async_win.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/async/async.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/async/async_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/async/async_wait.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bf/bf_cfb64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bf/bf_ecb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bf/bf_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bf/bf_ofb64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bf/bf_skey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/b_addr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/b_dump.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/b_print.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/b_sock.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/b_sock2.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bf_buff.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bf_lbuf.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bf_nbio.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bf_null.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bio_cb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bio_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bio_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bio_meth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bss_acpt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bss_bio.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bss_conn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bss_dgram.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bss_fd.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bss_file.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bss_log.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bss_mem.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bss_null.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bss_sock.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/blake2/blake2b.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/blake2/blake2s.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/blake2/m_blake2b.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/blake2/m_blake2s.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/armv4-gf2m.o" =>
@@ -5637,7 +5528,6 @@ our %unified_info = (
             "crypto/bn/asm/x86_64-gcc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn-mips.o" =>
@@ -5647,182 +5537,152 @@ our %unified_info = (
             "crypto/bn/bn_add.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_blind.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_const.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_ctx.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_depr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_dh.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_div.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_exp.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto",
                 ],
             "crypto/bn/bn_exp2.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_gcd.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_gf2m.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_intern.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_kron.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_mod.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_mont.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_mpi.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_mul.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_nist.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_prime.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_print.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_rand.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_recp.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_shift.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_sqr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_sqrt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_srp.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_word.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_x931p.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/mips-mont.o" =>
@@ -5832,19 +5692,16 @@ our %unified_info = (
             "crypto/bn/rsaz-avx2.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/rsaz-x86_64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/rsaz_exp.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/sparct4-mont.o" =>
@@ -5870,31 +5727,26 @@ our %unified_info = (
             "crypto/bn/x86_64-gf2m.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/x86_64-mont.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/x86_64-mont5.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/buffer/buf_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/buffer/buffer.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/buildinf.h" =>
@@ -5904,37 +5756,31 @@ our %unified_info = (
             "crypto/camellia/cmll-x86_64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/camellia/cmll_cfb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/camellia/cmll_ctr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/camellia/cmll_ecb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/camellia/cmll_misc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/camellia/cmll_ofb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/camellia/cmllt4-sparcv9.o" =>
@@ -5944,31 +5790,26 @@ our %unified_info = (
             "crypto/cast/c_cfb64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cast/c_ecb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cast/c_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cast/c_ofb64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cast/c_skey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/chacha/chacha-armv4.o" =>
@@ -5986,278 +5827,232 @@ our %unified_info = (
             "crypto/chacha/chacha-x86_64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cmac/cm_ameth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cmac/cm_pmeth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cmac/cmac.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_asn1.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_att.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_cd.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_dd.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_env.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_ess.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_io.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_kari.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_pwri.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_sd.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_smime.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/conf/conf_api.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/conf/conf_def.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/conf/conf_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/conf/conf_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/conf/conf_mall.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/conf/conf_mod.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/conf/conf_sap.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/conf/conf_ssl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cpt_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cryptlib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ct/ct_b64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ct/ct_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ct/ct_log.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ct/ct_oct.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ct/ct_policy.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ct/ct_prn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ct/ct_sct.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ct/ct_sct_ctx.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ct/ct_vfy.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ct/ct_x509v3.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ctype.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cversion.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto",
                 ],
             "crypto/des/cbc_cksm.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/cbc_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/cfb64ede.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/cfb64enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/cfb_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/des_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/dest4-sparcv9.o" =>
@@ -6267,301 +6062,251 @@ our %unified_info = (
             "crypto/des/ecb3_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/ecb_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/fcrypt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/fcrypt_b.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/ofb64ede.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/ofb64enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/ofb_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/pcbc_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/qud_cksm.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/rand_key.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/set_key.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/str2key.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/xcbc_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_ameth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_asn1.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_check.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_depr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_gen.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_kdf.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_key.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_meth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_pmeth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_prn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_rfc5114.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_rfc7919.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dsa/dsa_ameth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dsa/dsa_asn1.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dsa/dsa_depr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dsa/dsa_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dsa/dsa_gen.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dsa/dsa_key.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dsa/dsa_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dsa/dsa_meth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dsa/dsa_ossl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dsa/dsa_pmeth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dsa/dsa_prn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dsa/dsa_sign.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dsa/dsa_vrf.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dso/dso_dl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dso/dso_dlfcn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dso/dso_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dso/dso_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dso/dso_openssl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dso/dso_vms.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dso/dso_win32.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ebcdic.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/curve25519.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/curve448/arch_32/f_impl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto/ec/curve448/arch_32",
                     "crypto/ec/curve448",
@@ -6569,7 +6314,6 @@ our %unified_info = (
             "crypto/ec/curve448/curve448.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto/ec/curve448/arch_32",
                     "crypto/ec/curve448",
@@ -6577,7 +6321,6 @@ our %unified_info = (
             "crypto/ec/curve448/curve448_tables.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto/ec/curve448/arch_32",
                     "crypto/ec/curve448",
@@ -6585,7 +6328,6 @@ our %unified_info = (
             "crypto/ec/curve448/eddsa.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto/ec/curve448/arch_32",
                     "crypto/ec/curve448",
@@ -6593,7 +6335,6 @@ our %unified_info = (
             "crypto/ec/curve448/f_generic.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto/ec/curve448/arch_32",
                     "crypto/ec/curve448",
@@ -6601,7 +6342,6 @@ our %unified_info = (
             "crypto/ec/curve448/scalar.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto/ec/curve448/arch_32",
                     "crypto/ec/curve448",
@@ -6609,163 +6349,136 @@ our %unified_info = (
             "crypto/ec/ec2_oct.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec2_smpl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec_ameth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec_asn1.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec_check.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec_curve.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec_cvt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec_key.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec_kmeth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec_mult.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec_oct.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec_pmeth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec_print.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecdh_kdf.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecdh_ossl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecdsa_ossl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecdsa_sign.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecdsa_vrf.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/eck_prn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecp_mont.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecp_nist.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecp_nistp224.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecp_nistp256.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecp_nistp521.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecp_nistputil.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecp_nistz256-armv4.o" =>
@@ -6783,241 +6496,201 @@ our %unified_info = (
             "crypto/ec/ecp_nistz256-x86_64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecp_nistz256.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecp_oct.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecp_smpl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecx_meth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/x25519-x86_64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/eng_all.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/eng_cnf.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/eng_ctrl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/eng_dyn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/eng_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/eng_fat.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/eng_init.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/eng_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/eng_list.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/eng_openssl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/eng_pkey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/eng_rdrand.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/eng_table.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/tb_asnmth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/tb_cipher.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/tb_dh.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/tb_digest.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/tb_dsa.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/tb_eckey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/tb_pkmeth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/tb_rand.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/tb_rsa.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/err/err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/err/err_all.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/err/err_prn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/bio_b64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/bio_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/bio_md.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/bio_ok.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/c_allc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/c_alld.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/cmeth_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/digest.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/e_aes.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto",
                     "crypto/modes",
@@ -7025,21 +6698,18 @@ our %unified_info = (
             "crypto/evp/e_aes_cbc_hmac_sha1.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto/modes",
                 ],
             "crypto/evp/e_aes_cbc_hmac_sha256.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto/modes",
                 ],
             "crypto/evp/e_aria.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto",
                     "crypto/modes",
@@ -7047,13 +6717,11 @@ our %unified_info = (
             "crypto/evp/e_bf.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/e_camellia.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto",
                     "crypto/modes",
@@ -7061,81 +6729,68 @@ our %unified_info = (
             "crypto/evp/e_cast.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/e_chacha20_poly1305.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/e_des.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto",
                 ],
             "crypto/evp/e_des3.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto",
                 ],
             "crypto/evp/e_idea.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/e_null.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/e_old.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/e_rc2.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/e_rc4.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/e_rc4_hmac_md5.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/e_rc5.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/e_seed.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/e_sm4.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto",
                     "crypto/modes",
@@ -7143,328 +6798,267 @@ our %unified_info = (
             "crypto/evp/e_xcbc_d.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/encode.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/evp_cnf.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/evp_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/evp_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/evp_key.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/evp_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/evp_pbe.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/evp_pkey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/m_md2.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/m_md4.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/m_md5.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/m_md5_sha1.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/m_mdc2.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/m_null.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/m_ripemd.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/m_sha1.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/m_sha3.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto",
                 ],
             "crypto/evp/m_sigver.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/m_wp.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/names.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/p5_crpt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/p5_crpt2.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/p_dec.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/p_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/p_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/p_open.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/p_seal.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/p_sign.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/p_verify.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/pbe_scrypt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/pmeth_fn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/pmeth_gn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/pmeth_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ex_data.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/getenv.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/hmac/hm_ameth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/hmac/hm_pmeth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/hmac/hmac.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/idea/i_cbc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/idea/i_cfb64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/idea/i_ecb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/idea/i_ofb64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/idea/i_skey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
-            "crypto/include/internal/bn_conf.h" =>
-                [
-                    ".",
-                ],
-            "crypto/include/internal/dso_conf.h" =>
-                [
-                    ".",
-                ],
             "crypto/init.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/kdf/hkdf.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/kdf/kdf_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/kdf/scrypt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/kdf/tls1_prf.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/lhash/lh_stats.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/lhash/lhash.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/md4/md4_dgst.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/md4/md4_one.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/md5/md5-sparcv9.o" =>
@@ -7474,91 +7068,76 @@ our %unified_info = (
             "crypto/md5/md5-x86_64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/md5/md5_dgst.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/md5/md5_one.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/mdc2/mdc2_one.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/mdc2/mdc2dgst.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/mem.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/mem_dbg.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/mem_sec.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/modes/aesni-gcm-x86_64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/modes/cbc128.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/modes/ccm128.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/modes/cfb128.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/modes/ctr128.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/modes/cts128.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/modes/gcm128.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto",
                 ],
@@ -7577,7 +7156,6 @@ our %unified_info = (
             "crypto/modes/ghash-x86_64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/modes/ghashv8-armx.o" =>
@@ -7587,361 +7165,301 @@ our %unified_info = (
             "crypto/modes/ocb128.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/modes/ofb128.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/modes/wrap128.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/modes/xts128.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/o_dir.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/o_fips.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/o_fopen.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/o_init.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/o_str.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/o_time.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/objects/o_names.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/objects/obj_dat.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/objects/obj_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/objects/obj_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/objects/obj_xref.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ocsp/ocsp_asn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ocsp/ocsp_cl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ocsp/ocsp_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ocsp/ocsp_ext.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ocsp/ocsp_ht.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ocsp/ocsp_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ocsp/ocsp_prn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ocsp/ocsp_srv.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ocsp/ocsp_vfy.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ocsp/v3_ocsp.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pem/pem_all.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pem/pem_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pem/pem_info.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pem/pem_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pem/pem_oth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pem/pem_pk8.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pem/pem_pkey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pem/pem_sign.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pem/pem_x509.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pem/pem_xaux.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pem/pvkfmt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_add.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_asn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_attr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_crpt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_crt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_decr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_init.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_key.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_kiss.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_mutl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_npas.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_p8d.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_p8e.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_sbag.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_utl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/pk12err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs7/bio_pk7.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs7/pk7_asn1.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs7/pk7_attr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs7/pk7_doit.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs7/pk7_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs7/pk7_mime.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs7/pk7_smime.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs7/pkcs7err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/poly1305/poly1305-armv4.o" =>
@@ -7963,265 +7481,221 @@ our %unified_info = (
             "crypto/poly1305/poly1305-x86_64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/poly1305/poly1305.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/poly1305/poly1305_ameth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/poly1305/poly1305_pmeth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rand/drbg_ctr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rand/drbg_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rand/rand_egd.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rand/rand_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rand/rand_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rand/rand_unix.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rand/rand_vms.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rand/rand_win.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rand/randfile.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rc2/rc2_cbc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rc2/rc2_ecb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rc2/rc2_skey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rc2/rc2cfb64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rc2/rc2ofb64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rc4/rc4-md5-x86_64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rc4/rc4-x86_64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ripemd/rmd_dgst.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ripemd/rmd_one.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_ameth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_asn1.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_chk.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_crpt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_depr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_gen.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_meth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_mp.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_none.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_oaep.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_ossl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_pk1.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_pmeth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_prn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_pss.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_saos.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_sign.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_ssl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_x931.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_x931g.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/s390xcpuid.o" =>
@@ -8231,31 +7705,26 @@ our %unified_info = (
             "crypto/seed/seed.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/seed/seed_cbc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/seed/seed_cfb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/seed/seed_ecb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/seed/seed_ofb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sha/keccak1600-armv4.o" =>
@@ -8265,7 +7734,6 @@ our %unified_info = (
             "crypto/sha/keccak1600-x86_64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sha/sha1-armv4-large.o" =>
@@ -8279,7 +7747,6 @@ our %unified_info = (
             "crypto/sha/sha1-mb-x86_64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sha/sha1-mips.o" =>
@@ -8297,19 +7764,16 @@ our %unified_info = (
             "crypto/sha/sha1-x86_64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sha/sha1_one.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sha/sha1dgst.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sha/sha256-armv4.o" =>
@@ -8323,7 +7787,6 @@ our %unified_info = (
             "crypto/sha/sha256-mb-x86_64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sha/sha256-mips.o" =>
@@ -8341,13 +7804,11 @@ our %unified_info = (
             "crypto/sha/sha256-x86_64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sha/sha256.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sha/sha512-armv4.o" =>
@@ -8373,727 +7834,606 @@ our %unified_info = (
             "crypto/sha/sha512-x86_64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sha/sha512.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/siphash/siphash.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/siphash/siphash_ameth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/siphash/siphash_pmeth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sm2/sm2_crypt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sm2/sm2_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sm2/sm2_pmeth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sm2/sm2_sign.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sm3/m_sm3.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sm3/sm3.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sm4/sm4.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/srp/srp_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/srp/srp_vfy.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/stack/stack.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/store/loader_file.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/store/store_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/store/store_init.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/store/store_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/store/store_register.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/store/store_strings.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/threads_none.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/threads_pthread.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/threads_win.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ts/ts_asn1.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ts/ts_conf.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ts/ts_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ts/ts_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ts/ts_req_print.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ts/ts_req_utils.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ts/ts_rsp_print.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ts/ts_rsp_sign.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ts/ts_rsp_utils.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ts/ts_rsp_verify.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ts/ts_verify_ctx.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/txt_db/txt_db.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ui/ui_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ui/ui_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ui/ui_null.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ui/ui_openssl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ui/ui_util.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/uid.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/whrlpool/wp-x86_64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/whrlpool/wp_dgst.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/by_dir.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/by_file.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/t_crl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/t_req.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/t_x509.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_att.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_cmp.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_d2.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_def.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_ext.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_lu.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_meth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_obj.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_r2x.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_req.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_set.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_trs.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_txt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_v3.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_vfy.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_vpm.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509cset.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509name.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509rset.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509spki.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509type.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x_all.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x_attrib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x_crl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x_exten.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x_name.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x_pubkey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x_req.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x_x509.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x_x509a.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/pcy_cache.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/pcy_data.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/pcy_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/pcy_map.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/pcy_node.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/pcy_tree.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_addr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_admis.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_akey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_akeya.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_alt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_asid.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_bcons.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_bitst.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_conf.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_cpols.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_crld.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_enum.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_extku.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_genn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_ia5.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_info.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_int.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_ncons.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_pci.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_pcia.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_pcons.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_pku.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_pmaps.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_prn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_purp.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_skey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_sxnet.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_tlsf.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_utl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x86_64cpuid.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "engines/e_capi.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "engines/e_padlock-x86_64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "engines/e_padlock.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "fuzz/asn1.o" =>
@@ -9144,6 +8484,14 @@ our %unified_info = (
                 [
                     "include",
                 ],
+            "include/crypto/bn_conf.h" =>
+                [
+                    ".",
+                ],
+            "include/crypto/dso_conf.h" =>
+                [
+                    ".",
+                ],
             "include/openssl/opensslconf.h" =>
                 [
                     ".",
@@ -9388,7 +8736,6 @@ our %unified_info = (
                 [
                     ".",
                     "include",
-                    "crypto/include",
                 ],
             "test/asn1_string_table_test.o" =>
                 [
@@ -9714,7 +9061,6 @@ our %unified_info = (
                 [
                     ".",
                     "include",
-                    "crypto/include",
                 ],
             "test/cipher_overhead_test.o" =>
                 [
@@ -9760,7 +9106,6 @@ our %unified_info = (
             "test/ctype_internal_test.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "test/curve448_internal_test.o" =>
@@ -9826,7 +9171,6 @@ our %unified_info = (
                 [
                     "include",
                     "crypto/ec",
-                    "crypto/include",
                 ],
             "test/ecdsatest.o" =>
                 [
@@ -9851,7 +9195,6 @@ our %unified_info = (
             "test/evp_extra_test.o" =>
                 [
                     "include",
-                    "crypto/include",
                 ],
             "test/evp_test.o" =>
                 [
@@ -9949,7 +9292,6 @@ our %unified_info = (
                 [
                     ".",
                     "include",
-                    "crypto/include",
                 ],
             "test/rc2test.o" =>
                 [
@@ -9999,18 +9341,15 @@ our %unified_info = (
                 [
                     ".",
                     "include",
-                    "crypto/include",
                 ],
             "test/sm2_internal_test.o" =>
                 [
                     "include",
-                    "crypto/include",
                 ],
             "test/sm4_internal_test.o" =>
                 [
                     ".",
                     "include",
-                    "crypto/include",
                 ],
             "test/srptest.o" =>
                 [
@@ -10021,6 +9360,10 @@ our %unified_info = (
                     ".",
                     "include",
                 ],
+            "test/ssl_ctx_test.o" =>
+                [
+                    "include",
+                ],
             "test/ssl_test.o" =>
                 [
                     "include",
@@ -10084,10 +9427,6 @@ our %unified_info = (
                 [
                     "include",
                 ],
-            "test/testutil/init.o" =>
-                [
-                    "include",
-                ],
             "test/testutil/main.o" =>
                 [
                     "include",
@@ -10116,6 +9455,10 @@ our %unified_info = (
                 [
                     "include",
                 ],
+            "test/testutil/testutil_init.o" =>
+                [
+                    "include",
+                ],
             "test/threadstest.o" =>
                 [
                     "include",
@@ -10380,6 +9723,7 @@ our %unified_info = (
             "test/sm4_internal_test",
             "test/srptest",
             "test/ssl_cert_table_internal_test",
+            "test/ssl_ctx_test",
             "test/ssl_test",
             "test/ssl_test_ctx_test",
             "test/sslapitest",
@@ -15385,7 +14729,6 @@ our %unified_info = (
                     "test/testutil/cb.o",
                     "test/testutil/driver.o",
                     "test/testutil/format_output.o",
-                    "test/testutil/init.o",
                     "test/testutil/main.o",
                     "test/testutil/output_helpers.o",
                     "test/testutil/random.o",
@@ -15393,6 +14736,7 @@ our %unified_info = (
                     "test/testutil/tap_bio.o",
                     "test/testutil/test_cleanup.o",
                     "test/testutil/tests.o",
+                    "test/testutil/testutil_init.o",
                 ],
             "test/md2test" =>
                 [
@@ -15620,6 +14964,14 @@ our %unified_info = (
                 [
                     "test/ssl_cert_table_internal_test.c",
                 ],
+            "test/ssl_ctx_test" =>
+                [
+                    "test/ssl_ctx_test.o",
+                ],
+            "test/ssl_ctx_test.o" =>
+                [
+                    "test/ssl_ctx_test.c",
+                ],
             "test/ssl_test" =>
                 [
                     "test/handshake_helper.o",
@@ -15722,10 +15074,6 @@ our %unified_info = (
                 [
                     "test/testutil/format_output.c",
                 ],
-            "test/testutil/init.o" =>
-                [
-                    "test/testutil/init.c",
-                ],
             "test/testutil/main.o" =>
                 [
                     "test/testutil/main.c",
@@ -15754,6 +15102,10 @@ our %unified_info = (
                 [
                     "test/testutil/tests.c",
                 ],
+            "test/testutil/testutil_init.o" =>
+                [
+                    "test/testutil/testutil_init.c",
+                ],
             "test/threadstest" =>
                 [
                     "test/threadstest.o",
diff --git a/deps/openssl/config/archs/linux-x86_64/asm_avx2/crypto/aes/aes-x86_64.s b/deps/openssl/config/archs/linux-x86_64/asm_avx2/crypto/aes/aes-x86_64.s
deleted file mode 100644
index f0c1685fb9..0000000000
--- a/deps/openssl/config/archs/linux-x86_64/asm_avx2/crypto/aes/aes-x86_64.s
+++ /dev/null
@@ -1,2649 +0,0 @@
-.text	
-.type	_x86_64_AES_encrypt,@function
-.align	16
-_x86_64_AES_encrypt:
-	xorl	0(%r15),%eax
-	xorl	4(%r15),%ebx
-	xorl	8(%r15),%ecx
-	xorl	12(%r15),%edx
-
-	movl	240(%r15),%r13d
-	subl	$1,%r13d
-	jmp	.Lenc_loop
-.align	16
-.Lenc_loop:
-
-	movzbl	%al,%esi
-	movzbl	%bl,%edi
-	movzbl	%cl,%ebp
-	movl	0(%r14,%rsi,8),%r10d
-	movl	0(%r14,%rdi,8),%r11d
-	movl	0(%r14,%rbp,8),%r12d
-
-	movzbl	%bh,%esi
-	movzbl	%ch,%edi
-	movzbl	%dl,%ebp
-	xorl	3(%r14,%rsi,8),%r10d
-	xorl	3(%r14,%rdi,8),%r11d
-	movl	0(%r14,%rbp,8),%r8d
-
-	movzbl	%dh,%esi
-	shrl	$16,%ecx
-	movzbl	%ah,%ebp
-	xorl	3(%r14,%rsi,8),%r12d
-	shrl	$16,%edx
-	xorl	3(%r14,%rbp,8),%r8d
-
-	shrl	$16,%ebx
-	leaq	16(%r15),%r15
-	shrl	$16,%eax
-
-	movzbl	%cl,%esi
-	movzbl	%dl,%edi
-	movzbl	%al,%ebp
-	xorl	2(%r14,%rsi,8),%r10d
-	xorl	2(%r14,%rdi,8),%r11d
-	xorl	2(%r14,%rbp,8),%r12d
-
-	movzbl	%dh,%esi
-	movzbl	%ah,%edi
-	movzbl	%bl,%ebp
-	xorl	1(%r14,%rsi,8),%r10d
-	xorl	1(%r14,%rdi,8),%r11d
-	xorl	2(%r14,%rbp,8),%r8d
-
-	movl	12(%r15),%edx
-	movzbl	%bh,%edi
-	movzbl	%ch,%ebp
-	movl	0(%r15),%eax
-	xorl	1(%r14,%rdi,8),%r12d
-	xorl	1(%r14,%rbp,8),%r8d
-
-	movl	4(%r15),%ebx
-	movl	8(%r15),%ecx
-	xorl	%r10d,%eax
-	xorl	%r11d,%ebx
-	xorl	%r12d,%ecx
-	xorl	%r8d,%edx
-	subl	$1,%r13d
-	jnz	.Lenc_loop
-	movzbl	%al,%esi
-	movzbl	%bl,%edi
-	movzbl	%cl,%ebp
-	movzbl	2(%r14,%rsi,8),%r10d
-	movzbl	2(%r14,%rdi,8),%r11d
-	movzbl	2(%r14,%rbp,8),%r12d
-
-	movzbl	%dl,%esi
-	movzbl	%bh,%edi
-	movzbl	%ch,%ebp
-	movzbl	2(%r14,%rsi,8),%r8d
-	movl	0(%r14,%rdi,8),%edi
-	movl	0(%r14,%rbp,8),%ebp
-
-	andl	$0x0000ff00,%edi
-	andl	$0x0000ff00,%ebp
-
-	xorl	%edi,%r10d
-	xorl	%ebp,%r11d
-	shrl	$16,%ecx
-
-	movzbl	%dh,%esi
-	movzbl	%ah,%edi
-	shrl	$16,%edx
-	movl	0(%r14,%rsi,8),%esi
-	movl	0(%r14,%rdi,8),%edi
-
-	andl	$0x0000ff00,%esi
-	andl	$0x0000ff00,%edi
-	shrl	$16,%ebx
-	xorl	%esi,%r12d
-	xorl	%edi,%r8d
-	shrl	$16,%eax
-
-	movzbl	%cl,%esi
-	movzbl	%dl,%edi
-	movzbl	%al,%ebp
-	movl	0(%r14,%rsi,8),%esi
-	movl	0(%r14,%rdi,8),%edi
-	movl	0(%r14,%rbp,8),%ebp
-
-	andl	$0x00ff0000,%esi
-	andl	$0x00ff0000,%edi
-	andl	$0x00ff0000,%ebp
-
-	xorl	%esi,%r10d
-	xorl	%edi,%r11d
-	xorl	%ebp,%r12d
-
-	movzbl	%bl,%esi
-	movzbl	%dh,%edi
-	movzbl	%ah,%ebp
-	movl	0(%r14,%rsi,8),%esi
-	movl	2(%r14,%rdi,8),%edi
-	movl	2(%r14,%rbp,8),%ebp
-
-	andl	$0x00ff0000,%esi
-	andl	$0xff000000,%edi
-	andl	$0xff000000,%ebp
-
-	xorl	%esi,%r8d
-	xorl	%edi,%r10d
-	xorl	%ebp,%r11d
-
-	movzbl	%bh,%esi
-	movzbl	%ch,%edi
-	movl	16+12(%r15),%edx
-	movl	2(%r14,%rsi,8),%esi
-	movl	2(%r14,%rdi,8),%edi
-	movl	16+0(%r15),%eax
-
-	andl	$0xff000000,%esi
-	andl	$0xff000000,%edi
-
-	xorl	%esi,%r12d
-	xorl	%edi,%r8d
-
-	movl	16+4(%r15),%ebx
-	movl	16+8(%r15),%ecx
-	xorl	%r10d,%eax
-	xorl	%r11d,%ebx
-	xorl	%r12d,%ecx
-	xorl	%r8d,%edx
-.byte	0xf3,0xc3
-.size	_x86_64_AES_encrypt,.-_x86_64_AES_encrypt
-.type	_x86_64_AES_encrypt_compact,@function
-.align	16
-_x86_64_AES_encrypt_compact:
-.cfi_startproc	
-	leaq	128(%r14),%r8
-	movl	0-128(%r8),%edi
-	movl	32-128(%r8),%ebp
-	movl	64-128(%r8),%r10d
-	movl	96-128(%r8),%r11d
-	movl	128-128(%r8),%edi
-	movl	160-128(%r8),%ebp
-	movl	192-128(%r8),%r10d
-	movl	224-128(%r8),%r11d
-	jmp	.Lenc_loop_compact
-.align	16
-.Lenc_loop_compact:
-	xorl	0(%r15),%eax
-	xorl	4(%r15),%ebx
-	xorl	8(%r15),%ecx
-	xorl	12(%r15),%edx
-	leaq	16(%r15),%r15
-	movzbl	%al,%r10d
-	movzbl	%bl,%r11d
-	movzbl	%cl,%r12d
-	movzbl	%dl,%r8d
-	movzbl	%bh,%esi
-	movzbl	%ch,%edi
-	shrl	$16,%ecx
-	movzbl	%dh,%ebp
-	movzbl	(%r14,%r10,1),%r10d
-	movzbl	(%r14,%r11,1),%r11d
-	movzbl	(%r14,%r12,1),%r12d
-	movzbl	(%r14,%r8,1),%r8d
-
-	movzbl	(%r14,%rsi,1),%r9d
-	movzbl	%ah,%esi
-	movzbl	(%r14,%rdi,1),%r13d
-	movzbl	%cl,%edi
-	movzbl	(%r14,%rbp,1),%ebp
-	movzbl	(%r14,%rsi,1),%esi
-
-	shll	$8,%r9d
-	shrl	$16,%edx
-	shll	$8,%r13d
-	xorl	%r9d,%r10d
-	shrl	$16,%eax
-	movzbl	%dl,%r9d
-	shrl	$16,%ebx
-	xorl	%r13d,%r11d
-	shll	$8,%ebp
-	movzbl	%al,%r13d
-	movzbl	(%r14,%rdi,1),%edi
-	xorl	%ebp,%r12d
-
-	shll	$8,%esi
-	movzbl	%bl,%ebp
-	shll	$16,%edi
-	xorl	%esi,%r8d
-	movzbl	(%r14,%r9,1),%r9d
-	movzbl	%dh,%esi
-	movzbl	(%r14,%r13,1),%r13d
-	xorl	%edi,%r10d
-
-	shrl	$8,%ecx
-	movzbl	%ah,%edi
-	shll	$16,%r9d
-	shrl	$8,%ebx
-	shll	$16,%r13d
-	xorl	%r9d,%r11d
-	movzbl	(%r14,%rbp,1),%ebp
-	movzbl	(%r14,%rsi,1),%esi
-	movzbl	(%r14,%rdi,1),%edi
-	movzbl	(%r14,%rcx,1),%edx
-	movzbl	(%r14,%rbx,1),%ecx
-
-	shll	$16,%ebp
-	xorl	%r13d,%r12d
-	shll	$24,%esi
-	xorl	%ebp,%r8d
-	shll	$24,%edi
-	xorl	%esi,%r10d
-	shll	$24,%edx
-	xorl	%edi,%r11d
-	shll	$24,%ecx
-	movl	%r10d,%eax
-	movl	%r11d,%ebx
-	xorl	%r12d,%ecx
-	xorl	%r8d,%edx
-	cmpq	16(%rsp),%r15
-	je	.Lenc_compact_done
-	movl	$0x80808080,%r10d
-	movl	$0x80808080,%r11d
-	andl	%eax,%r10d
-	andl	%ebx,%r11d
-	movl	%r10d,%esi
-	movl	%r11d,%edi
-	shrl	$7,%r10d
-	leal	(%rax,%rax,1),%r8d
-	shrl	$7,%r11d
-	leal	(%rbx,%rbx,1),%r9d
-	subl	%r10d,%esi
-	subl	%r11d,%edi
-	andl	$0xfefefefe,%r8d
-	andl	$0xfefefefe,%r9d
-	andl	$0x1b1b1b1b,%esi
-	andl	$0x1b1b1b1b,%edi
-	movl	%eax,%r10d
-	movl	%ebx,%r11d
-	xorl	%esi,%r8d
-	xorl	%edi,%r9d
-
-	xorl	%r8d,%eax
-	xorl	%r9d,%ebx
-	movl	$0x80808080,%r12d
-	roll	$24,%eax
-	movl	$0x80808080,%ebp
-	roll	$24,%ebx
-	andl	%ecx,%r12d
-	andl	%edx,%ebp
-	xorl	%r8d,%eax
-	xorl	%r9d,%ebx
-	movl	%r12d,%esi
-	rorl	$16,%r10d
-	movl	%ebp,%edi
-	rorl	$16,%r11d
-	leal	(%rcx,%rcx,1),%r8d
-	shrl	$7,%r12d
-	xorl	%r10d,%eax
-	shrl	$7,%ebp
-	xorl	%r11d,%ebx
-	rorl	$8,%r10d
-	leal	(%rdx,%rdx,1),%r9d
-	rorl	$8,%r11d
-	subl	%r12d,%esi
-	subl	%ebp,%edi
-	xorl	%r10d,%eax
-	xorl	%r11d,%ebx
-
-	andl	$0xfefefefe,%r8d
-	andl	$0xfefefefe,%r9d
-	andl	$0x1b1b1b1b,%esi
-	andl	$0x1b1b1b1b,%edi
-	movl	%ecx,%r12d
-	movl	%edx,%ebp
-	xorl	%esi,%r8d
-	xorl	%edi,%r9d
-
-	rorl	$16,%r12d
-	xorl	%r8d,%ecx
-	rorl	$16,%ebp
-	xorl	%r9d,%edx
-	roll	$24,%ecx
-	movl	0(%r14),%esi
-	roll	$24,%edx
-	xorl	%r8d,%ecx
-	movl	64(%r14),%edi
-	xorl	%r9d,%edx
-	movl	128(%r14),%r8d
-	xorl	%r12d,%ecx
-	rorl	$8,%r12d
-	xorl	%ebp,%edx
-	rorl	$8,%ebp
-	xorl	%r12d,%ecx
-	movl	192(%r14),%r9d
-	xorl	%ebp,%edx
-	jmp	.Lenc_loop_compact
-.align	16
-.Lenc_compact_done:
-	xorl	0(%r15),%eax
-	xorl	4(%r15),%ebx
-	xorl	8(%r15),%ecx
-	xorl	12(%r15),%edx
-.byte	0xf3,0xc3
-.cfi_endproc	
-.size	_x86_64_AES_encrypt_compact,.-_x86_64_AES_encrypt_compact
-.globl	AES_encrypt
-.type	AES_encrypt,@function
-.align	16
-.globl	asm_AES_encrypt
-.hidden	asm_AES_encrypt
-asm_AES_encrypt:
-AES_encrypt:
-.cfi_startproc	
-	movq	%rsp,%rax
-.cfi_def_cfa_register	%rax
-	pushq	%rbx
-.cfi_offset	%rbx,-16
-	pushq	%rbp
-.cfi_offset	%rbp,-24
-	pushq	%r12
-.cfi_offset	%r12,-32
-	pushq	%r13
-.cfi_offset	%r13,-40
-	pushq	%r14
-.cfi_offset	%r14,-48
-	pushq	%r15
-.cfi_offset	%r15,-56
-
-
-	leaq	-63(%rdx),%rcx
-	andq	$-64,%rsp
-	subq	%rsp,%rcx
-	negq	%rcx
-	andq	$0x3c0,%rcx
-	subq	%rcx,%rsp
-	subq	$32,%rsp
-
-	movq	%rsi,16(%rsp)
-	movq	%rax,24(%rsp)
-.cfi_escape	0x0f,0x05,0x77,0x18,0x06,0x23,0x08
-.Lenc_prologue:
-
-	movq	%rdx,%r15
-	movl	240(%r15),%r13d
-
-	movl	0(%rdi),%eax
-	movl	4(%rdi),%ebx
-	movl	8(%rdi),%ecx
-	movl	12(%rdi),%edx
-
-	shll	$4,%r13d
-	leaq	(%r15,%r13,1),%rbp
-	movq	%r15,(%rsp)
-	movq	%rbp,8(%rsp)
-
-
-	leaq	.LAES_Te+2048(%rip),%r14
-	leaq	768(%rsp),%rbp
-	subq	%r14,%rbp
-	andq	$0x300,%rbp
-	leaq	(%r14,%rbp,1),%r14
-
-	call	_x86_64_AES_encrypt_compact
-
-	movq	16(%rsp),%r9
-	movq	24(%rsp),%rsi
-.cfi_def_cfa	%rsi,8
-	movl	%eax,0(%r9)
-	movl	%ebx,4(%r9)
-	movl	%ecx,8(%r9)
-	movl	%edx,12(%r9)
-
-	movq	-48(%rsi),%r15
-.cfi_restore	%r15
-	movq	-40(%rsi),%r14
-.cfi_restore	%r14
-	movq	-32(%rsi),%r13
-.cfi_restore	%r13
-	movq	-24(%rsi),%r12
-.cfi_restore	%r12
-	movq	-16(%rsi),%rbp
-.cfi_restore	%rbp
-	movq	-8(%rsi),%rbx
-.cfi_restore	%rbx
-	leaq	(%rsi),%rsp
-.cfi_def_cfa_register	%rsp
-.Lenc_epilogue:
-	.byte	0xf3,0xc3
-.cfi_endproc	
-.size	AES_encrypt,.-AES_encrypt
-.type	_x86_64_AES_decrypt,@function
-.align	16
-_x86_64_AES_decrypt:
-	xorl	0(%r15),%eax
-	xorl	4(%r15),%ebx
-	xorl	8(%r15),%ecx
-	xorl	12(%r15),%edx
-
-	movl	240(%r15),%r13d
-	subl	$1,%r13d
-	jmp	.Ldec_loop
-.align	16
-.Ldec_loop:
-
-	movzbl	%al,%esi
-	movzbl	%bl,%edi
-	movzbl	%cl,%ebp
-	movl	0(%r14,%rsi,8),%r10d
-	movl	0(%r14,%rdi,8),%r11d
-	movl	0(%r14,%rbp,8),%r12d
-
-	movzbl	%dh,%esi
-	movzbl	%ah,%edi
-	movzbl	%dl,%ebp
-	xorl	3(%r14,%rsi,8),%r10d
-	xorl	3(%r14,%rdi,8),%r11d
-	movl	0(%r14,%rbp,8),%r8d
-
-	movzbl	%bh,%esi
-	shrl	$16,%eax
-	movzbl	%ch,%ebp
-	xorl	3(%r14,%rsi,8),%r12d
-	shrl	$16,%edx
-	xorl	3(%r14,%rbp,8),%r8d
-
-	shrl	$16,%ebx
-	leaq	16(%r15),%r15
-	shrl	$16,%ecx
-
-	movzbl	%cl,%esi
-	movzbl	%dl,%edi
-	movzbl	%al,%ebp
-	xorl	2(%r14,%rsi,8),%r10d
-	xorl	2(%r14,%rdi,8),%r11d
-	xorl	2(%r14,%rbp,8),%r12d
-
-	movzbl	%bh,%esi
-	movzbl	%ch,%edi
-	movzbl	%bl,%ebp
-	xorl	1(%r14,%rsi,8),%r10d
-	xorl	1(%r14,%rdi,8),%r11d
-	xorl	2(%r14,%rbp,8),%r8d
-
-	movzbl	%dh,%esi
-	movl	12(%r15),%edx
-	movzbl	%ah,%ebp
-	xorl	1(%r14,%rsi,8),%r12d
-	movl	0(%r15),%eax
-	xorl	1(%r14,%rbp,8),%r8d
-
-	xorl	%r10d,%eax
-	movl	4(%r15),%ebx
-	movl	8(%r15),%ecx
-	xorl	%r12d,%ecx
-	xorl	%r11d,%ebx
-	xorl	%r8d,%edx
-	subl	$1,%r13d
-	jnz	.Ldec_loop
-	leaq	2048(%r14),%r14
-	movzbl	%al,%esi
-	movzbl	%bl,%edi
-	movzbl	%cl,%ebp
-	movzbl	(%r14,%rsi,1),%r10d
-	movzbl	(%r14,%rdi,1),%r11d
-	movzbl	(%r14,%rbp,1),%r12d
-
-	movzbl	%dl,%esi
-	movzbl	%dh,%edi
-	movzbl	%ah,%ebp
-	movzbl	(%r14,%rsi,1),%r8d
-	movzbl	(%r14,%rdi,1),%edi
-	movzbl	(%r14,%rbp,1),%ebp
-
-	shll	$8,%edi
-	shll	$8,%ebp
-
-	xorl	%edi,%r10d
-	xorl	%ebp,%r11d
-	shrl	$16,%edx
-
-	movzbl	%bh,%esi
-	movzbl	%ch,%edi
-	shrl	$16,%eax
-	movzbl	(%r14,%rsi,1),%esi
-	movzbl	(%r14,%rdi,1),%edi
-
-	shll	$8,%esi
-	shll	$8,%edi
-	shrl	$16,%ebx
-	xorl	%esi,%r12d
-	xorl	%edi,%r8d
-	shrl	$16,%ecx
-
-	movzbl	%cl,%esi
-	movzbl	%dl,%edi
-	movzbl	%al,%ebp
-	movzbl	(%r14,%rsi,1),%esi
-	movzbl	(%r14,%rdi,1),%edi
-	movzbl	(%r14,%rbp,1),%ebp
-
-	shll	$16,%esi
-	shll	$16,%edi
-	shll	$16,%ebp
-
-	xorl	%esi,%r10d
-	xorl	%edi,%r11d
-	xorl	%ebp,%r12d
-
-	movzbl	%bl,%esi
-	movzbl	%bh,%edi
-	movzbl	%ch,%ebp
-	movzbl	(%r14,%rsi,1),%esi
-	movzbl	(%r14,%rdi,1),%edi
-	movzbl	(%r14,%rbp,1),%ebp
-
-	shll	$16,%esi
-	shll	$24,%edi
-	shll	$24,%ebp
-
-	xorl	%esi,%r8d
-	xorl	%edi,%r10d
-	xorl	%ebp,%r11d
-
-	movzbl	%dh,%esi
-	movzbl	%ah,%edi
-	movl	16+12(%r15),%edx
-	movzbl	(%r14,%rsi,1),%esi
-	movzbl	(%r14,%rdi,1),%edi
-	movl	16+0(%r15),%eax
-
-	shll	$24,%esi
-	shll	$24,%edi
-
-	xorl	%esi,%r12d
-	xorl	%edi,%r8d
-
-	movl	16+4(%r15),%ebx
-	movl	16+8(%r15),%ecx
-	leaq	-2048(%r14),%r14
-	xorl	%r10d,%eax
-	xorl	%r11d,%ebx
-	xorl	%r12d,%ecx
-	xorl	%r8d,%edx
-.byte	0xf3,0xc3
-.size	_x86_64_AES_decrypt,.-_x86_64_AES_decrypt
-.type	_x86_64_AES_decrypt_compact,@function
-.align	16
-_x86_64_AES_decrypt_compact:
-.cfi_startproc	
-	leaq	128(%r14),%r8
-	movl	0-128(%r8),%edi
-	movl	32-128(%r8),%ebp
-	movl	64-128(%r8),%r10d
-	movl	96-128(%r8),%r11d
-	movl	128-128(%r8),%edi
-	movl	160-128(%r8),%ebp
-	movl	192-128(%r8),%r10d
-	movl	224-128(%r8),%r11d
-	jmp	.Ldec_loop_compact
-
-.align	16
-.Ldec_loop_compact:
-	xorl	0(%r15),%eax
-	xorl	4(%r15),%ebx
-	xorl	8(%r15),%ecx
-	xorl	12(%r15),%edx
-	leaq	16(%r15),%r15
-	movzbl	%al,%r10d
-	movzbl	%bl,%r11d
-	movzbl	%cl,%r12d
-	movzbl	%dl,%r8d
-	movzbl	%dh,%esi
-	movzbl	%ah,%edi
-	shrl	$16,%edx
-	movzbl	%bh,%ebp
-	movzbl	(%r14,%r10,1),%r10d
-	movzbl	(%r14,%r11,1),%r11d
-	movzbl	(%r14,%r12,1),%r12d
-	movzbl	(%r14,%r8,1),%r8d
-
-	movzbl	(%r14,%rsi,1),%r9d
-	movzbl	%ch,%esi
-	movzbl	(%r14,%rdi,1),%r13d
-	movzbl	(%r14,%rbp,1),%ebp
-	movzbl	(%r14,%rsi,1),%esi
-
-	shrl	$16,%ecx
-	shll	$8,%r13d
-	shll	$8,%r9d
-	movzbl	%cl,%edi
-	shrl	$16,%eax
-	xorl	%r9d,%r10d
-	shrl	$16,%ebx
-	movzbl	%dl,%r9d
-
-	shll	$8,%ebp
-	xorl	%r13d,%r11d
-	shll	$8,%esi
-	movzbl	%al,%r13d
-	movzbl	(%r14,%rdi,1),%edi
-	xorl	%ebp,%r12d
-	movzbl	%bl,%ebp
-
-	shll	$16,%edi
-	xorl	%esi,%r8d
-	movzbl	(%r14,%r9,1),%r9d
-	movzbl	%bh,%esi
-	movzbl	(%r14,%rbp,1),%ebp
-	xorl	%edi,%r10d
-	movzbl	(%r14,%r13,1),%r13d
-	movzbl	%ch,%edi
-
-	shll	$16,%ebp
-	shll	$16,%r9d
-	shll	$16,%r13d
-	xorl	%ebp,%r8d
-	movzbl	%dh,%ebp
-	xorl	%r9d,%r11d
-	shrl	$8,%eax
-	xorl	%r13d,%r12d
-
-	movzbl	(%r14,%rsi,1),%esi
-	movzbl	(%r14,%rdi,1),%ebx
-	movzbl	(%r14,%rbp,1),%ecx
-	movzbl	(%r14,%rax,1),%edx
-
-	movl	%r10d,%eax
-	shll	$24,%esi
-	shll	$24,%ebx
-	shll	$24,%ecx
-	xorl	%esi,%eax
-	shll	$24,%edx
-	xorl	%r11d,%ebx
-	xorl	%r12d,%ecx
-	xorl	%r8d,%edx
-	cmpq	16(%rsp),%r15
-	je	.Ldec_compact_done
-
-	movq	256+0(%r14),%rsi
-	shlq	$32,%rbx
-	shlq	$32,%rdx
-	movq	256+8(%r14),%rdi
-	orq	%rbx,%rax
-	orq	%rdx,%rcx
-	movq	256+16(%r14),%rbp
-	movq	%rsi,%r9
-	movq	%rsi,%r12
-	andq	%rax,%r9
-	andq	%rcx,%r12
-	movq	%r9,%rbx
-	movq	%r12,%rdx
-	shrq	$7,%r9
-	leaq	(%rax,%rax,1),%r8
-	shrq	$7,%r12
-	leaq	(%rcx,%rcx,1),%r11
-	subq	%r9,%rbx
-	subq	%r12,%rdx
-	andq	%rdi,%r8
-	andq	%rdi,%r11
-	andq	%rbp,%rbx
-	andq	%rbp,%rdx
-	xorq	%rbx,%r8
-	xorq	%rdx,%r11
-	movq	%rsi,%r10
-	movq	%rsi,%r13
-
-	andq	%r8,%r10
-	andq	%r11,%r13
-	movq	%r10,%rbx
-	movq	%r13,%rdx
-	shrq	$7,%r10
-	leaq	(%r8,%r8,1),%r9
-	shrq	$7,%r13
-	leaq	(%r11,%r11,1),%r12
-	subq	%r10,%rbx
-	subq	%r13,%rdx
-	andq	%rdi,%r9
-	andq	%rdi,%r12
-	andq	%rbp,%rbx
-	andq	%rbp,%rdx
-	xorq	%rbx,%r9
-	xorq	%rdx,%r12
-	movq	%rsi,%r10
-	movq	%rsi,%r13
-
-	andq	%r9,%r10
-	andq	%r12,%r13
-	movq	%r10,%rbx
-	movq	%r13,%rdx
-	shrq	$7,%r10
-	xorq	%rax,%r8
-	shrq	$7,%r13
-	xorq	%rcx,%r11
-	subq	%r10,%rbx
-	subq	%r13,%rdx
-	leaq	(%r9,%r9,1),%r10
-	leaq	(%r12,%r12,1),%r13
-	xorq	%rax,%r9
-	xorq	%rcx,%r12
-	andq	%rdi,%r10
-	andq	%rdi,%r13
-	andq	%rbp,%rbx
-	andq	%rbp,%rdx
-	xorq	%rbx,%r10
-	xorq	%rdx,%r13
-
-	xorq	%r10,%rax
-	xorq	%r13,%rcx
-	xorq	%r10,%r8
-	xorq	%r13,%r11
-	movq	%rax,%rbx
-	movq	%rcx,%rdx
-	xorq	%r10,%r9
-	shrq	$32,%rbx
-	xorq	%r13,%r12
-	shrq	$32,%rdx
-	xorq	%r8,%r10
-	roll	$8,%eax
-	xorq	%r11,%r13
-	roll	$8,%ecx
-	xorq	%r9,%r10
-	roll	$8,%ebx
-	xorq	%r12,%r13
-
-	roll	$8,%edx
-	xorl	%r10d,%eax
-	shrq	$32,%r10
-	xorl	%r13d,%ecx
-	shrq	$32,%r13
-	xorl	%r10d,%ebx
-	xorl	%r13d,%edx
-
-	movq	%r8,%r10
-	roll	$24,%r8d
-	movq	%r11,%r13
-	roll	$24,%r11d
-	shrq	$32,%r10
-	xorl	%r8d,%eax
-	shrq	$32,%r13
-	xorl	%r11d,%ecx
-	roll	$24,%r10d
-	movq	%r9,%r8
-	roll	$24,%r13d
-	movq	%r12,%r11
-	shrq	$32,%r8
-	xorl	%r10d,%ebx
-	shrq	$32,%r11
-	xorl	%r13d,%edx
-
-	movq	0(%r14),%rsi
-	roll	$16,%r9d
-	movq	64(%r14),%rdi
-	roll	$16,%r12d
-	movq	128(%r14),%rbp
-	roll	$16,%r8d
-	movq	192(%r14),%r10
-	xorl	%r9d,%eax
-	roll	$16,%r11d
-	xorl	%r12d,%ecx
-	movq	256(%r14),%r13
-	xorl	%r8d,%ebx
-	xorl	%r11d,%edx
-	jmp	.Ldec_loop_compact
-.align	16
-.Ldec_compact_done:
-	xorl	0(%r15),%eax
-	xorl	4(%r15),%ebx
-	xorl	8(%r15),%ecx
-	xorl	12(%r15),%edx
-.byte	0xf3,0xc3
-.cfi_endproc	
-.size	_x86_64_AES_decrypt_compact,.-_x86_64_AES_decrypt_compact
-.globl	AES_decrypt
-.type	AES_decrypt,@function
-.align	16
-.globl	asm_AES_decrypt
-.hidden	asm_AES_decrypt
-asm_AES_decrypt:
-AES_decrypt:
-.cfi_startproc	
-	movq	%rsp,%rax
-.cfi_def_cfa_register	%rax
-	pushq	%rbx
-.cfi_offset	%rbx,-16
-	pushq	%rbp
-.cfi_offset	%rbp,-24
-	pushq	%r12
-.cfi_offset	%r12,-32
-	pushq	%r13
-.cfi_offset	%r13,-40
-	pushq	%r14
-.cfi_offset	%r14,-48
-	pushq	%r15
-.cfi_offset	%r15,-56
-
-
-	leaq	-63(%rdx),%rcx
-	andq	$-64,%rsp
-	subq	%rsp,%rcx
-	negq	%rcx
-	andq	$0x3c0,%rcx
-	subq	%rcx,%rsp
-	subq	$32,%rsp
-
-	movq	%rsi,16(%rsp)
-	movq	%rax,24(%rsp)
-.cfi_escape	0x0f,0x05,0x77,0x18,0x06,0x23,0x08
-.Ldec_prologue:
-
-	movq	%rdx,%r15
-	movl	240(%r15),%r13d
-
-	movl	0(%rdi),%eax
-	movl	4(%rdi),%ebx
-	movl	8(%rdi),%ecx
-	movl	12(%rdi),%edx
-
-	shll	$4,%r13d
-	leaq	(%r15,%r13,1),%rbp
-	movq	%r15,(%rsp)
-	movq	%rbp,8(%rsp)
-
-
-	leaq	.LAES_Td+2048(%rip),%r14
-	leaq	768(%rsp),%rbp
-	subq	%r14,%rbp
-	andq	$0x300,%rbp
-	leaq	(%r14,%rbp,1),%r14
-	shrq	$3,%rbp
-	addq	%rbp,%r14
-
-	call	_x86_64_AES_decrypt_compact
-
-	movq	16(%rsp),%r9
-	movq	24(%rsp),%rsi
-.cfi_def_cfa	%rsi,8
-	movl	%eax,0(%r9)
-	movl	%ebx,4(%r9)
-	movl	%ecx,8(%r9)
-	movl	%edx,12(%r9)
-
-	movq	-48(%rsi),%r15
-.cfi_restore	%r15
-	movq	-40(%rsi),%r14
-.cfi_restore	%r14
-	movq	-32(%rsi),%r13
-.cfi_restore	%r13
-	movq	-24(%rsi),%r12
-.cfi_restore	%r12
-	movq	-16(%rsi),%rbp
-.cfi_restore	%rbp
-	movq	-8(%rsi),%rbx
-.cfi_restore	%rbx
-	leaq	(%rsi),%rsp
-.cfi_def_cfa_register	%rsp
-.Ldec_epilogue:
-	.byte	0xf3,0xc3
-.cfi_endproc	
-.size	AES_decrypt,.-AES_decrypt
-.globl	AES_set_encrypt_key
-.type	AES_set_encrypt_key,@function
-.align	16
-AES_set_encrypt_key:
-.cfi_startproc	
-	pushq	%rbx
-.cfi_adjust_cfa_offset	8
-.cfi_offset	%rbx,-16
-	pushq	%rbp
-.cfi_adjust_cfa_offset	8
-.cfi_offset	%rbp,-24
-	pushq	%r12
-.cfi_adjust_cfa_offset	8
-.cfi_offset	%r12,-32
-	pushq	%r13
-.cfi_adjust_cfa_offset	8
-.cfi_offset	%r13,-40
-	pushq	%r14
-.cfi_adjust_cfa_offset	8
-.cfi_offset	%r14,-48
-	pushq	%r15
-.cfi_adjust_cfa_offset	8
-.cfi_offset	%r15,-56
-	subq	$8,%rsp
-.cfi_adjust_cfa_offset	8
-.Lenc_key_prologue:
-
-	call	_x86_64_AES_set_encrypt_key
-
-	movq	40(%rsp),%rbp
-.cfi_restore	%rbp
-	movq	48(%rsp),%rbx
-.cfi_restore	%rbx
-	addq	$56,%rsp
-.cfi_adjust_cfa_offset	-56
-.Lenc_key_epilogue:
-	.byte	0xf3,0xc3
-.cfi_endproc	
-.size	AES_set_encrypt_key,.-AES_set_encrypt_key
-
-.type	_x86_64_AES_set_encrypt_key,@function
-.align	16
-_x86_64_AES_set_encrypt_key:
-.cfi_startproc	
-	movl	%esi,%ecx
-	movq	%rdi,%rsi
-	movq	%rdx,%rdi
-
-	testq	$-1,%rsi
-	jz	.Lbadpointer
-	testq	$-1,%rdi
-	jz	.Lbadpointer
-
-	leaq	.LAES_Te(%rip),%rbp
-	leaq	2048+128(%rbp),%rbp
-
-
-	movl	0-128(%rbp),%eax
-	movl	32-128(%rbp),%ebx
-	movl	64-128(%rbp),%r8d
-	movl	96-128(%rbp),%edx
-	movl	128-128(%rbp),%eax
-	movl	160-128(%rbp),%ebx
-	movl	192-128(%rbp),%r8d
-	movl	224-128(%rbp),%edx
-
-	cmpl	$128,%ecx
-	je	.L10rounds
-	cmpl	$192,%ecx
-	je	.L12rounds
-	cmpl	$256,%ecx
-	je	.L14rounds
-	movq	$-2,%rax
-	jmp	.Lexit
-
-.L10rounds:
-	movq	0(%rsi),%rax
-	movq	8(%rsi),%rdx
-	movq	%rax,0(%rdi)
-	movq	%rdx,8(%rdi)
-
-	shrq	$32,%rdx
-	xorl	%ecx,%ecx
-	jmp	.L10shortcut
-.align	4
-.L10loop:
-	movl	0(%rdi),%eax
-	movl	12(%rdi),%edx
-.L10shortcut:
-	movzbl	%dl,%esi
-	movzbl	-128(%rbp,%rsi,1),%ebx
-	movzbl	%dh,%esi
-	shll	$24,%ebx
-	xorl	%ebx,%eax
-
-	movzbl	-128(%rbp,%rsi,1),%ebx
-	shrl	$16,%edx
-	movzbl	%dl,%esi
-	xorl	%ebx,%eax
-
-	movzbl	-128(%rbp,%rsi,1),%ebx
-	movzbl	%dh,%esi
-	shll	$8,%ebx
-	xorl	%ebx,%eax
-
-	movzbl	-128(%rbp,%rsi,1),%ebx
-	shll	$16,%ebx
-	xorl	%ebx,%eax
-
-	xorl	1024-128(%rbp,%rcx,4),%eax
-	movl	%eax,16(%rdi)
-	xorl	4(%rdi),%eax
-	movl	%eax,20(%rdi)
-	xorl	8(%rdi),%eax
-	movl	%eax,24(%rdi)
-	xorl	12(%rdi),%eax
-	movl	%eax,28(%rdi)
-	addl	$1,%ecx
-	leaq	16(%rdi),%rdi
-	cmpl	$10,%ecx
-	jl	.L10loop
-
-	movl	$10,80(%rdi)
-	xorq	%rax,%rax
-	jmp	.Lexit
-
-.L12rounds:
-	movq	0(%rsi),%rax
-	movq	8(%rsi),%rbx
-	movq	16(%rsi),%rdx
-	movq	%rax,0(%rdi)
-	movq	%rbx,8(%rdi)
-	movq	%rdx,16(%rdi)
-
-	shrq	$32,%rdx
-	xorl	%ecx,%ecx
-	jmp	.L12shortcut
-.align	4
-.L12loop:
-	movl	0(%rdi),%eax
-	movl	20(%rdi),%edx
-.L12shortcut:
-	movzbl	%dl,%esi
-	movzbl	-128(%rbp,%rsi,1),%ebx
-	movzbl	%dh,%esi
-	shll	$24,%ebx
-	xorl	%ebx,%eax
-
-	movzbl	-128(%rbp,%rsi,1),%ebx
-	shrl	$16,%edx
-	movzbl	%dl,%esi
-	xorl	%ebx,%eax
-
-	movzbl	-128(%rbp,%rsi,1),%ebx
-	movzbl	%dh,%esi
-	shll	$8,%ebx
-	xorl	%ebx,%eax
-
-	movzbl	-128(%rbp,%rsi,1),%ebx
-	shll	$16,%ebx
-	xorl	%ebx,%eax
-
-	xorl	1024-128(%rbp,%rcx,4),%eax
-	movl	%eax,24(%rdi)
-	xorl	4(%rdi),%eax
-	movl	%eax,28(%rdi)
-	xorl	8(%rdi),%eax
-	movl	%eax,32(%rdi)
-	xorl	12(%rdi),%eax
-	movl	%eax,36(%rdi)
-
-	cmpl	$7,%ecx
-	je	.L12break
-	addl	$1,%ecx
-
-	xorl	16(%rdi),%eax
-	movl	%eax,40(%rdi)
-	xorl	20(%rdi),%eax
-	movl	%eax,44(%rdi)
-
-	leaq	24(%rdi),%rdi
-	jmp	.L12loop
-.L12break:
-	movl	$12,72(%rdi)
-	xorq	%rax,%rax
-	jmp	.Lexit
-
-.L14rounds:
-	movq	0(%rsi),%rax
-	movq	8(%rsi),%rbx
-	movq	16(%rsi),%rcx
-	movq	24(%rsi),%rdx
-	movq	%rax,0(%rdi)
-	movq	%rbx,8(%rdi)
-	movq	%rcx,16(%rdi)
-	movq	%rdx,24(%rdi)
-
-	shrq	$32,%rdx
-	xorl	%ecx,%ecx
-	jmp	.L14shortcut
-.align	4
-.L14loop:
-	movl	0(%rdi),%eax
-	movl	28(%rdi),%edx
-.L14shortcut:
-	movzbl	%dl,%esi
-	movzbl	-128(%rbp,%rsi,1),%ebx
-	movzbl	%dh,%esi
-	shll	$24,%ebx
-	xorl	%ebx,%eax
-
-	movzbl	-128(%rbp,%rsi,1),%ebx
-	shrl	$16,%edx
-	movzbl	%dl,%esi
-	xorl	%ebx,%eax
-
-	movzbl	-128(%rbp,%rsi,1),%ebx
-	movzbl	%dh,%esi
-	shll	$8,%ebx
-	xorl	%ebx,%eax
-
-	movzbl	-128(%rbp,%rsi,1),%ebx
-	shll	$16,%ebx
-	xorl	%ebx,%eax
-
-	xorl	1024-128(%rbp,%rcx,4),%eax
-	movl	%eax,32(%rdi)
-	xorl	4(%rdi),%eax
-	movl	%eax,36(%rdi)
-	xorl	8(%rdi),%eax
-	movl	%eax,40(%rdi)
-	xorl	12(%rdi),%eax
-	movl	%eax,44(%rdi)
-
-	cmpl	$6,%ecx
-	je	.L14break
-	addl	$1,%ecx
-
-	movl	%eax,%edx
-	movl	16(%rdi),%eax
-	movzbl	%dl,%esi
-	movzbl	-128(%rbp,%rsi,1),%ebx
-	movzbl	%dh,%esi
-	xorl	%ebx,%eax
-
-	movzbl	-128(%rbp,%rsi,1),%ebx
-	shrl	$16,%edx
-	shll	$8,%ebx
-	movzbl	%dl,%esi
-	xorl	%ebx,%eax
-
-	movzbl	-128(%rbp,%rsi,1),%ebx
-	movzbl	%dh,%esi
-	shll	$16,%ebx
-	xorl	%ebx,%eax
-
-	movzbl	-128(%rbp,%rsi,1),%ebx
-	shll	$24,%ebx
-	xorl	%ebx,%eax
-
-	movl	%eax,48(%rdi)
-	xorl	20(%rdi),%eax
-	movl	%eax,52(%rdi)
-	xorl	24(%rdi),%eax
-	movl	%eax,56(%rdi)
-	xorl	28(%rdi),%eax
-	movl	%eax,60(%rdi)
-
-	leaq	32(%rdi),%rdi
-	jmp	.L14loop
-.L14break:
-	movl	$14,48(%rdi)
-	xorq	%rax,%rax
-	jmp	.Lexit
-
-.Lbadpointer:
-	movq	$-1,%rax
-.Lexit:
-.byte	0xf3,0xc3
-.cfi_endproc	
-.size	_x86_64_AES_set_encrypt_key,.-_x86_64_AES_set_encrypt_key
-.globl	AES_set_decrypt_key
-.type	AES_set_decrypt_key,@function
-.align	16
-AES_set_decrypt_key:
-.cfi_startproc	
-	pushq	%rbx
-.cfi_adjust_cfa_offset	8
-.cfi_offset	%rbx,-16
-	pushq	%rbp
-.cfi_adjust_cfa_offset	8
-.cfi_offset	%rbp,-24
-	pushq	%r12
-.cfi_adjust_cfa_offset	8
-.cfi_offset	%r12,-32
-	pushq	%r13
-.cfi_adjust_cfa_offset	8
-.cfi_offset	%r13,-40
-	pushq	%r14
-.cfi_adjust_cfa_offset	8
-.cfi_offset	%r14,-48
-	pushq	%r15
-.cfi_adjust_cfa_offset	8
-.cfi_offset	%r15,-56
-	pushq	%rdx
-.cfi_adjust_cfa_offset	8
-.Ldec_key_prologue:
-
-	call	_x86_64_AES_set_encrypt_key
-	movq	(%rsp),%r8
-	cmpl	$0,%eax
-	jne	.Labort
-
-	movl	240(%r8),%r14d
-	xorq	%rdi,%rdi
-	leaq	(%rdi,%r14,4),%rcx
-	movq	%r8,%rsi
-	leaq	(%r8,%rcx,4),%rdi
-.align	4
-.Linvert:
-	movq	0(%rsi),%rax
-	movq	8(%rsi),%rbx
-	movq	0(%rdi),%rcx
-	movq	8(%rdi),%rdx
-	movq	%rax,0(%rdi)
-	movq	%rbx,8(%rdi)
-	movq	%rcx,0(%rsi)
-	movq	%rdx,8(%rsi)
-	leaq	16(%rsi),%rsi
-	leaq	-16(%rdi),%rdi
-	cmpq	%rsi,%rdi
-	jne	.Linvert
-
-	leaq	.LAES_Te+2048+1024(%rip),%rax
-
-	movq	40(%rax),%rsi
-	movq	48(%rax),%rdi
-	movq	56(%rax),%rbp
-
-	movq	%r8,%r15
-	subl	$1,%r14d
-.align	4
-.Lpermute:
-	leaq	16(%r15),%r15
-	movq	0(%r15),%rax
-	movq	8(%r15),%rcx
-	movq	%rsi,%r9
-	movq	%rsi,%r12
-	andq	%rax,%r9
-	andq	%rcx,%r12
-	movq	%r9,%rbx
-	movq	%r12,%rdx
-	shrq	$7,%r9
-	leaq	(%rax,%rax,1),%r8
-	shrq	$7,%r12
-	leaq	(%rcx,%rcx,1),%r11
-	subq	%r9,%rbx
-	subq	%r12,%rdx
-	andq	%rdi,%r8
-	andq	%rdi,%r11
-	andq	%rbp,%rbx
-	andq	%rbp,%rdx
-	xorq	%rbx,%r8
-	xorq	%rdx,%r11
-	movq	%rsi,%r10
-	movq	%rsi,%r13
-
-	andq	%r8,%r10
-	andq	%r11,%r13
-	movq	%r10,%rbx
-	movq	%r13,%rdx
-	shrq	$7,%r10
-	leaq	(%r8,%r8,1),%r9
-	shrq	$7,%r13
-	leaq	(%r11,%r11,1),%r12
-	subq	%r10,%rbx
-	subq	%r13,%rdx
-	andq	%rdi,%r9
-	andq	%rdi,%r12
-	andq	%rbp,%rbx
-	andq	%rbp,%rdx
-	xorq	%rbx,%r9
-	xorq	%rdx,%r12
-	movq	%rsi,%r10
-	movq	%rsi,%r13
-
-	andq	%r9,%r10
-	andq	%r12,%r13
-	movq	%r10,%rbx
-	movq	%r13,%rdx
-	shrq	$7,%r10
-	xorq	%rax,%r8
-	shrq	$7,%r13
-	xorq	%rcx,%r11
-	subq	%r10,%rbx
-	subq	%r13,%rdx
-	leaq	(%r9,%r9,1),%r10
-	leaq	(%r12,%r12,1),%r13
-	xorq	%rax,%r9
-	xorq	%rcx,%r12
-	andq	%rdi,%r10
-	andq	%rdi,%r13
-	andq	%rbp,%rbx
-	andq	%rbp,%rdx
-	xorq	%rbx,%r10
-	xorq	%rdx,%r13
-
-	xorq	%r10,%rax
-	xorq	%r13,%rcx
-	xorq	%r10,%r8
-	xorq	%r13,%r11
-	movq	%rax,%rbx
-	movq	%rcx,%rdx
-	xorq	%r10,%r9
-	shrq	$32,%rbx
-	xorq	%r13,%r12
-	shrq	$32,%rdx
-	xorq	%r8,%r10
-	roll	$8,%eax
-	xorq	%r11,%r13
-	roll	$8,%ecx
-	xorq	%r9,%r10
-	roll	$8,%ebx
-	xorq	%r12,%r13
-
-	roll	$8,%edx
-	xorl	%r10d,%eax
-	shrq	$32,%r10
-	xorl	%r13d,%ecx
-	shrq	$32,%r13
-	xorl	%r10d,%ebx
-	xorl	%r13d,%edx
-
-	movq	%r8,%r10
-	roll	$24,%r8d
-	movq	%r11,%r13
-	roll	$24,%r11d
-	shrq	$32,%r10
-	xorl	%r8d,%eax
-	shrq	$32,%r13
-	xorl	%r11d,%ecx
-	roll	$24,%r10d
-	movq	%r9,%r8
-	roll	$24,%r13d
-	movq	%r12,%r11
-	shrq	$32,%r8
-	xorl	%r10d,%ebx
-	shrq	$32,%r11
-	xorl	%r13d,%edx
-
-
-	roll	$16,%r9d
-
-	roll	$16,%r12d
-
-	roll	$16,%r8d
-
-	xorl	%r9d,%eax
-	roll	$16,%r11d
-	xorl	%r12d,%ecx
-
-	xorl	%r8d,%ebx
-	xorl	%r11d,%edx
-	movl	%eax,0(%r15)
-	movl	%ebx,4(%r15)
-	movl	%ecx,8(%r15)
-	movl	%edx,12(%r15)
-	subl	$1,%r14d
-	jnz	.Lpermute
-
-	xorq	%rax,%rax
-.Labort:
-	movq	8(%rsp),%r15
-.cfi_restore	%r15
-	movq	16(%rsp),%r14
-.cfi_restore	%r14
-	movq	24(%rsp),%r13
-.cfi_restore	%r13
-	movq	32(%rsp),%r12
-.cfi_restore	%r12
-	movq	40(%rsp),%rbp
-.cfi_restore	%rbp
-	movq	48(%rsp),%rbx
-.cfi_restore	%rbx
-	addq	$56,%rsp
-.cfi_adjust_cfa_offset	-56
-.Ldec_key_epilogue:
-	.byte	0xf3,0xc3
-.cfi_endproc	
-.size	AES_set_decrypt_key,.-AES_set_decrypt_key
-.globl	AES_cbc_encrypt
-.type	AES_cbc_encrypt,@function
-.align	16
-
-.globl	asm_AES_cbc_encrypt
-.hidden	asm_AES_cbc_encrypt
-asm_AES_cbc_encrypt:
-AES_cbc_encrypt:
-.cfi_startproc	
-	cmpq	$0,%rdx
-	je	.Lcbc_epilogue
-	pushfq
-
-
-.cfi_adjust_cfa_offset	8
-	pushq	%rbx
-.cfi_adjust_cfa_offset	8
-.cfi_offset	%rbx,-24
-	pushq	%rbp
-.cfi_adjust_cfa_offset	8
-.cfi_offset	%rbp,-32
-	pushq	%r12
-.cfi_adjust_cfa_offset	8
-.cfi_offset	%r12,-40
-	pushq	%r13
-.cfi_adjust_cfa_offset	8
-.cfi_offset	%r13,-48
-	pushq	%r14
-.cfi_adjust_cfa_offset	8
-.cfi_offset	%r14,-56
-	pushq	%r15
-.cfi_adjust_cfa_offset	8
-.cfi_offset	%r15,-64
-.Lcbc_prologue:
-
-	cld
-	movl	%r9d,%r9d
-
-	leaq	.LAES_Te(%rip),%r14
-	leaq	.LAES_Td(%rip),%r10
-	cmpq	$0,%r9
-	cmoveq	%r10,%r14
-
-.cfi_remember_state	
-	movl	OPENSSL_ia32cap_P(%rip),%r10d
-	cmpq	$512,%rdx
-	jb	.Lcbc_slow_prologue
-	testq	$15,%rdx
-	jnz	.Lcbc_slow_prologue
-	btl	$28,%r10d
-	jc	.Lcbc_slow_prologue
-
-
-	leaq	-88-248(%rsp),%r15
-	andq	$-64,%r15
-
-
-	movq	%r14,%r10
-	leaq	2304(%r14),%r11
-	movq	%r15,%r12
-	andq	$0xFFF,%r10
-	andq	$0xFFF,%r11
-	andq	$0xFFF,%r12
-
-	cmpq	%r11,%r12
-	jb	.Lcbc_te_break_out
-	subq	%r11,%r12
-	subq	%r12,%r15
-	jmp	.Lcbc_te_ok
-.Lcbc_te_break_out:
-	subq	%r10,%r12
-	andq	$0xFFF,%r12
-	addq	$320,%r12
-	subq	%r12,%r15
-.align	4
-.Lcbc_te_ok:
-
-	xchgq	%rsp,%r15
-.cfi_def_cfa_register	%r15
-
-	movq	%r15,16(%rsp)
-.cfi_escape	0x0f,0x05,0x77,0x10,0x06,0x23,0x40
-.Lcbc_fast_body:
-	movq	%rdi,24(%rsp)
-	movq	%rsi,32(%rsp)
-	movq	%rdx,40(%rsp)
-	movq	%rcx,48(%rsp)
-	movq	%r8,56(%rsp)
-	movl	$0,80+240(%rsp)
-	movq	%r8,%rbp
-	movq	%r9,%rbx
-	movq	%rsi,%r9
-	movq	%rdi,%r8
-	movq	%rcx,%r15
-
-	movl	240(%r15),%eax
-
-	movq	%r15,%r10
-	subq	%r14,%r10
-	andq	$0xfff,%r10
-	cmpq	$2304,%r10
-	jb	.Lcbc_do_ecopy
-	cmpq	$4096-248,%r10
-	jb	.Lcbc_skip_ecopy
-.align	4
-.Lcbc_do_ecopy:
-	movq	%r15,%rsi
-	leaq	80(%rsp),%rdi
-	leaq	80(%rsp),%r15
-	movl	$30,%ecx
-.long	0x90A548F3
-	movl	%eax,(%rdi)
-.Lcbc_skip_ecopy:
-	movq	%r15,0(%rsp)
-
-	movl	$18,%ecx
-.align	4
-.Lcbc_prefetch_te:
-	movq	0(%r14),%r10
-	movq	32(%r14),%r11
-	movq	64(%r14),%r12
-	movq	96(%r14),%r13
-	leaq	128(%r14),%r14
-	subl	$1,%ecx
-	jnz	.Lcbc_prefetch_te
-	leaq	-2304(%r14),%r14
-
-	cmpq	$0,%rbx
-	je	.LFAST_DECRYPT
-
-
-	movl	0(%rbp),%eax
-	movl	4(%rbp),%ebx
-	movl	8(%rbp),%ecx
-	movl	12(%rbp),%edx
-
-.align	4
-.Lcbc_fast_enc_loop:
-	xorl	0(%r8),%eax
-	xorl	4(%r8),%ebx
-	xorl	8(%r8),%ecx
-	xorl	12(%r8),%edx
-	movq	0(%rsp),%r15
-	movq	%r8,24(%rsp)
-
-	call	_x86_64_AES_encrypt
-
-	movq	24(%rsp),%r8
-	movq	40(%rsp),%r10
-	movl	%eax,0(%r9)
-	movl	%ebx,4(%r9)
-	movl	%ecx,8(%r9)
-	movl	%edx,12(%r9)
-
-	leaq	16(%r8),%r8
-	leaq	16(%r9),%r9
-	subq	$16,%r10
-	testq	$-16,%r10
-	movq	%r10,40(%rsp)
-	jnz	.Lcbc_fast_enc_loop
-	movq	56(%rsp),%rbp
-	movl	%eax,0(%rbp)
-	movl	%ebx,4(%rbp)
-	movl	%ecx,8(%rbp)
-	movl	%edx,12(%rbp)
-
-	jmp	.Lcbc_fast_cleanup
-
-
-.align	16
-.LFAST_DECRYPT:
-	cmpq	%r8,%r9
-	je	.Lcbc_fast_dec_in_place
-
-	movq	%rbp,64(%rsp)
-.align	4
-.Lcbc_fast_dec_loop:
-	movl	0(%r8),%eax
-	movl	4(%r8),%ebx
-	movl	8(%r8),%ecx
-	movl	12(%r8),%edx
-	movq	0(%rsp),%r15
-	movq	%r8,24(%rsp)
-
-	call	_x86_64_AES_decrypt
-
-	movq	64(%rsp),%rbp
-	movq	24(%rsp),%r8
-	movq	40(%rsp),%r10
-	xorl	0(%rbp),%eax
-	xorl	4(%rbp),%ebx
-	xorl	8(%rbp),%ecx
-	xorl	12(%rbp),%edx
-	movq	%r8,%rbp
-
-	subq	$16,%r10
-	movq	%r10,40(%rsp)
-	movq	%rbp,64(%rsp)
-
-	movl	%eax,0(%r9)
-	movl	%ebx,4(%r9)
-	movl	%ecx,8(%r9)
-	movl	%edx,12(%r9)
-
-	leaq	16(%r8),%r8
-	leaq	16(%r9),%r9
-	jnz	.Lcbc_fast_dec_loop
-	movq	56(%rsp),%r12
-	movq	0(%rbp),%r10
-	movq	8(%rbp),%r11
-	movq	%r10,0(%r12)
-	movq	%r11,8(%r12)
-	jmp	.Lcbc_fast_cleanup
-
-.align	16
-.Lcbc_fast_dec_in_place:
-	movq	0(%rbp),%r10
-	movq	8(%rbp),%r11
-	movq	%r10,0+64(%rsp)
-	movq	%r11,8+64(%rsp)
-.align	4
-.Lcbc_fast_dec_in_place_loop:
-	movl	0(%r8),%eax
-	movl	4(%r8),%ebx
-	movl	8(%r8),%ecx
-	movl	12(%r8),%edx
-	movq	0(%rsp),%r15
-	movq	%r8,24(%rsp)
-
-	call	_x86_64_AES_decrypt
-
-	movq	24(%rsp),%r8
-	movq	40(%rsp),%r10
-	xorl	0+64(%rsp),%eax
-	xorl	4+64(%rsp),%ebx
-	xorl	8+64(%rsp),%ecx
-	xorl	12+64(%rsp),%edx
-
-	movq	0(%r8),%r11
-	movq	8(%r8),%r12
-	subq	$16,%r10
-	jz	.Lcbc_fast_dec_in_place_done
-
-	movq	%r11,0+64(%rsp)
-	movq	%r12,8+64(%rsp)
-
-	movl	%eax,0(%r9)
-	movl	%ebx,4(%r9)
-	movl	%ecx,8(%r9)
-	movl	%edx,12(%r9)
-
-	leaq	16(%r8),%r8
-	leaq	16(%r9),%r9
-	movq	%r10,40(%rsp)
-	jmp	.Lcbc_fast_dec_in_place_loop
-.Lcbc_fast_dec_in_place_done:
-	movq	56(%rsp),%rdi
-	movq	%r11,0(%rdi)
-	movq	%r12,8(%rdi)
-
-	movl	%eax,0(%r9)
-	movl	%ebx,4(%r9)
-	movl	%ecx,8(%r9)
-	movl	%edx,12(%r9)
-
-.align	4
-.Lcbc_fast_cleanup:
-	cmpl	$0,80+240(%rsp)
-	leaq	80(%rsp),%rdi
-	je	.Lcbc_exit
-	movl	$30,%ecx
-	xorq	%rax,%rax
-.long	0x90AB48F3
-
-	jmp	.Lcbc_exit
-
-
-.align	16
-.Lcbc_slow_prologue:
-.cfi_restore_state	
-
-	leaq	-88(%rsp),%rbp
-	andq	$-64,%rbp
-
-	leaq	-88-63(%rcx),%r10
-	subq	%rbp,%r10
-	negq	%r10
-	andq	$0x3c0,%r10
-	subq	%r10,%rbp
-
-	xchgq	%rsp,%rbp
-.cfi_def_cfa_register	%rbp
-
-	movq	%rbp,16(%rsp)
-.cfi_escape	0x0f,0x05,0x77,0x10,0x06,0x23,0x40
-.Lcbc_slow_body:
-
-
-
-
-	movq	%r8,56(%rsp)
-	movq	%r8,%rbp
-	movq	%r9,%rbx
-	movq	%rsi,%r9
-	movq	%rdi,%r8
-	movq	%rcx,%r15
-	movq	%rdx,%r10
-
-	movl	240(%r15),%eax
-	movq	%r15,0(%rsp)
-	shll	$4,%eax
-	leaq	(%r15,%rax,1),%rax
-	movq	%rax,8(%rsp)
-
-
-	leaq	2048(%r14),%r14
-	leaq	768-8(%rsp),%rax
-	subq	%r14,%rax
-	andq	$0x300,%rax
-	leaq	(%r14,%rax,1),%r14
-
-	cmpq	$0,%rbx
-	je	.LSLOW_DECRYPT
-
-
-	testq	$-16,%r10
-	movl	0(%rbp),%eax
-	movl	4(%rbp),%ebx
-	movl	8(%rbp),%ecx
-	movl	12(%rbp),%edx
-	jz	.Lcbc_slow_enc_tail
-
-.align	4
-.Lcbc_slow_enc_loop:
-	xorl	0(%r8),%eax
-	xorl	4(%r8),%ebx
-	xorl	8(%r8),%ecx
-	xorl	12(%r8),%edx
-	movq	0(%rsp),%r15
-	movq	%r8,24(%rsp)
-	movq	%r9,32(%rsp)
-	movq	%r10,40(%rsp)
-
-	call	_x86_64_AES_encrypt_compact
-
-	movq	24(%rsp),%r8
-	movq	32(%rsp),%r9
-	movq	40(%rsp),%r10
-	movl	%eax,0(%r9)
-	movl	%ebx,4(%r9)
-	movl	%ecx,8(%r9)
-	movl	%edx,12(%r9)
-
-	leaq	16(%r8),%r8
-	leaq	16(%r9),%r9
-	subq	$16,%r10
-	testq	$-16,%r10
-	jnz	.Lcbc_slow_enc_loop
-	testq	$15,%r10
-	jnz	.Lcbc_slow_enc_tail
-	movq	56(%rsp),%rbp
-	movl	%eax,0(%rbp)
-	movl	%ebx,4(%rbp)
-	movl	%ecx,8(%rbp)
-	movl	%edx,12(%rbp)
-
-	jmp	.Lcbc_exit
-
-.align	4
-.Lcbc_slow_enc_tail:
-	movq	%rax,%r11
-	movq	%rcx,%r12
-	movq	%r10,%rcx
-	movq	%r8,%rsi
-	movq	%r9,%rdi
-.long	0x9066A4F3
-	movq	$16,%rcx
-	subq	%r10,%rcx
-	xorq	%rax,%rax
-.long	0x9066AAF3
-	movq	%r9,%r8
-	movq	$16,%r10
-	movq	%r11,%rax
-	movq	%r12,%rcx
-	jmp	.Lcbc_slow_enc_loop
-
-.align	16
-.LSLOW_DECRYPT:
-	shrq	$3,%rax
-	addq	%rax,%r14
-
-	movq	0(%rbp),%r11
-	movq	8(%rbp),%r12
-	movq	%r11,0+64(%rsp)
-	movq	%r12,8+64(%rsp)
-
-.align	4
-.Lcbc_slow_dec_loop:
-	movl	0(%r8),%eax
-	movl	4(%r8),%ebx
-	movl	8(%r8),%ecx
-	movl	12(%r8),%edx
-	movq	0(%rsp),%r15
-	movq	%r8,24(%rsp)
-	movq	%r9,32(%rsp)
-	movq	%r10,40(%rsp)
-
-	call	_x86_64_AES_decrypt_compact
-
-	movq	24(%rsp),%r8
-	movq	32(%rsp),%r9
-	movq	40(%rsp),%r10
-	xorl	0+64(%rsp),%eax
-	xorl	4+64(%rsp),%ebx
-	xorl	8+64(%rsp),%ecx
-	xorl	12+64(%rsp),%edx
-
-	movq	0(%r8),%r11
-	movq	8(%r8),%r12
-	subq	$16,%r10
-	jc	.Lcbc_slow_dec_partial
-	jz	.Lcbc_slow_dec_done
-
-	movq	%r11,0+64(%rsp)
-	movq	%r12,8+64(%rsp)
-
-	movl	%eax,0(%r9)
-	movl	%ebx,4(%r9)
-	movl	%ecx,8(%r9)
-	movl	%edx,12(%r9)
-
-	leaq	16(%r8),%r8
-	leaq	16(%r9),%r9
-	jmp	.Lcbc_slow_dec_loop
-.Lcbc_slow_dec_done:
-	movq	56(%rsp),%rdi
-	movq	%r11,0(%rdi)
-	movq	%r12,8(%rdi)
-
-	movl	%eax,0(%r9)
-	movl	%ebx,4(%r9)
-	movl	%ecx,8(%r9)
-	movl	%edx,12(%r9)
-
-	jmp	.Lcbc_exit
-
-.align	4
-.Lcbc_slow_dec_partial:
-	movq	56(%rsp),%rdi
-	movq	%r11,0(%rdi)
-	movq	%r12,8(%rdi)
-
-	movl	%eax,0+64(%rsp)
-	movl	%ebx,4+64(%rsp)
-	movl	%ecx,8+64(%rsp)
-	movl	%edx,12+64(%rsp)
-
-	movq	%r9,%rdi
-	leaq	64(%rsp),%rsi
-	leaq	16(%r10),%rcx
-.long	0x9066A4F3
-	jmp	.Lcbc_exit
-
-.align	16
-.Lcbc_exit:
-	movq	16(%rsp),%rsi
-.cfi_def_cfa	%rsi,64
-	movq	(%rsi),%r15
-.cfi_restore	%r15
-	movq	8(%rsi),%r14
-.cfi_restore	%r14
-	movq	16(%rsi),%r13
-.cfi_restore	%r13
-	movq	24(%rsi),%r12
-.cfi_restore	%r12
-	movq	32(%rsi),%rbp
-.cfi_restore	%rbp
-	movq	40(%rsi),%rbx
-.cfi_restore	%rbx
-	leaq	48(%rsi),%rsp
-.cfi_def_cfa	%rsp,16
-.Lcbc_popfq:
-	popfq
-
-
-.cfi_adjust_cfa_offset	-8
-.Lcbc_epilogue:
-	.byte	0xf3,0xc3
-.cfi_endproc	
-.size	AES_cbc_encrypt,.-AES_cbc_encrypt
-.align	64
-.LAES_Te:
-.long	0xa56363c6,0xa56363c6
-.long	0x847c7cf8,0x847c7cf8
-.long	0x997777ee,0x997777ee
-.long	0x8d7b7bf6,0x8d7b7bf6
-.long	0x0df2f2ff,0x0df2f2ff
-.long	0xbd6b6bd6,0xbd6b6bd6
-.long	0xb16f6fde,0xb16f6fde
-.long	0x54c5c591,0x54c5c591
-.long	0x50303060,0x50303060
-.long	0x03010102,0x03010102
-.long	0xa96767ce,0xa96767ce
-.long	0x7d2b2b56,0x7d2b2b56
-.long	0x19fefee7,0x19fefee7
-.long	0x62d7d7b5,0x62d7d7b5
-.long	0xe6abab4d,0xe6abab4d
-.long	0x9a7676ec,0x9a7676ec
-.long	0x45caca8f,0x45caca8f
-.long	0x9d82821f,0x9d82821f
-.long	0x40c9c989,0x40c9c989
-.long	0x877d7dfa,0x877d7dfa
-.long	0x15fafaef,0x15fafaef
-.long	0xeb5959b2,0xeb5959b2
-.long	0xc947478e,0xc947478e
-.long	0x0bf0f0fb,0x0bf0f0fb
-.long	0xecadad41,0xecadad41
-.long	0x67d4d4b3,0x67d4d4b3
-.long	0xfda2a25f,0xfda2a25f
-.long	0xeaafaf45,0xeaafaf45
-.long	0xbf9c9c23,0xbf9c9c23
-.long	0xf7a4a453,0xf7a4a453
-.long	0x967272e4,0x967272e4
-.long	0x5bc0c09b,0x5bc0c09b
-.long	0xc2b7b775,0xc2b7b775
-.long	0x1cfdfde1,0x1cfdfde1
-.long	0xae93933d,0xae93933d
-.long	0x6a26264c,0x6a26264c
-.long	0x5a36366c,0x5a36366c
-.long	0x413f3f7e,0x413f3f7e
-.long	0x02f7f7f5,0x02f7f7f5
-.long	0x4fcccc83,0x4fcccc83
-.long	0x5c343468,0x5c343468
-.long	0xf4a5a551,0xf4a5a551
-.long	0x34e5e5d1,0x34e5e5d1
-.long	0x08f1f1f9,0x08f1f1f9
-.long	0x937171e2,0x937171e2
-.long	0x73d8d8ab,0x73d8d8ab
-.long	0x53313162,0x53313162
-.long	0x3f15152a,0x3f15152a
-.long	0x0c040408,0x0c040408
-.long	0x52c7c795,0x52c7c795
-.long	0x65232346,0x65232346
-.long	0x5ec3c39d,0x5ec3c39d
-.long	0x28181830,0x28181830
-.long	0xa1969637,0xa1969637
-.long	0x0f05050a,0x0f05050a
-.long	0xb59a9a2f,0xb59a9a2f
-.long	0x0907070e,0x0907070e
-.long	0x36121224,0x36121224
-.long	0x9b80801b,0x9b80801b
-.long	0x3de2e2df,0x3de2e2df
-.long	0x26ebebcd,0x26ebebcd
-.long	0x6927274e,0x6927274e
-.long	0xcdb2b27f,0xcdb2b27f
-.long	0x9f7575ea,0x9f7575ea
-.long	0x1b090912,0x1b090912
-.long	0x9e83831d,0x9e83831d
-.long	0x742c2c58,0x742c2c58
-.long	0x2e1a1a34,0x2e1a1a34
-.long	0x2d1b1b36,0x2d1b1b36
-.long	0xb26e6edc,0xb26e6edc
-.long	0xee5a5ab4,0xee5a5ab4
-.long	0xfba0a05b,0xfba0a05b
-.long	0xf65252a4,0xf65252a4
-.long	0x4d3b3b76,0x4d3b3b76
-.long	0x61d6d6b7,0x61d6d6b7
-.long	0xceb3b37d,0xceb3b37d
-.long	0x7b292952,0x7b292952
-.long	0x3ee3e3dd,0x3ee3e3dd
-.long	0x712f2f5e,0x712f2f5e
-.long	0x97848413,0x97848413
-.long	0xf55353a6,0xf55353a6
-.long	0x68d1d1b9,0x68d1d1b9
-.long	0x00000000,0x00000000
-.long	0x2cededc1,0x2cededc1
-.long	0x60202040,0x60202040
-.long	0x1ffcfce3,0x1ffcfce3
-.long	0xc8b1b179,0xc8b1b179
-.long	0xed5b5bb6,0xed5b5bb6
-.long	0xbe6a6ad4,0xbe6a6ad4
-.long	0x46cbcb8d,0x46cbcb8d
-.long	0xd9bebe67,0xd9bebe67
-.long	0x4b393972,0x4b393972
-.long	0xde4a4a94,0xde4a4a94
-.long	0xd44c4c98,0xd44c4c98
-.long	0xe85858b0,0xe85858b0
-.long	0x4acfcf85,0x4acfcf85
-.long	0x6bd0d0bb,0x6bd0d0bb
-.long	0x2aefefc5,0x2aefefc5
-.long	0xe5aaaa4f,0xe5aaaa4f
-.long	0x16fbfbed,0x16fbfbed
-.long	0xc5434386,0xc5434386
-.long	0xd74d4d9a,0xd74d4d9a
-.long	0x55333366,0x55333366
-.long	0x94858511,0x94858511
-.long	0xcf45458a,0xcf45458a
-.long	0x10f9f9e9,0x10f9f9e9
-.long	0x06020204,0x06020204
-.long	0x817f7ffe,0x817f7ffe
-.long	0xf05050a0,0xf05050a0
-.long	0x443c3c78,0x443c3c78
-.long	0xba9f9f25,0xba9f9f25
-.long	0xe3a8a84b,0xe3a8a84b
-.long	0xf35151a2,0xf35151a2
-.long	0xfea3a35d,0xfea3a35d
-.long	0xc0404080,0xc0404080
-.long	0x8a8f8f05,0x8a8f8f05
-.long	0xad92923f,0xad92923f
-.long	0xbc9d9d21,0xbc9d9d21
-.long	0x48383870,0x48383870
-.long	0x04f5f5f1,0x04f5f5f1
-.long	0xdfbcbc63,0xdfbcbc63
-.long	0xc1b6b677,0xc1b6b677
-.long	0x75dadaaf,0x75dadaaf
-.long	0x63212142,0x63212142
-.long	0x30101020,0x30101020
-.long	0x1affffe5,0x1affffe5
-.long	0x0ef3f3fd,0x0ef3f3fd
-.long	0x6dd2d2bf,0x6dd2d2bf
-.long	0x4ccdcd81,0x4ccdcd81
-.long	0x140c0c18,0x140c0c18
-.long	0x35131326,0x35131326
-.long	0x2fececc3,0x2fececc3
-.long	0xe15f5fbe,0xe15f5fbe
-.long	0xa2979735,0xa2979735
-.long	0xcc444488,0xcc444488
-.long	0x3917172e,0x3917172e
-.long	0x57c4c493,0x57c4c493
-.long	0xf2a7a755,0xf2a7a755
-.long	0x827e7efc,0x827e7efc
-.long	0x473d3d7a,0x473d3d7a
-.long	0xac6464c8,0xac6464c8
-.long	0xe75d5dba,0xe75d5dba
-.long	0x2b191932,0x2b191932
-.long	0x957373e6,0x957373e6
-.long	0xa06060c0,0xa06060c0
-.long	0x98818119,0x98818119
-.long	0xd14f4f9e,0xd14f4f9e
-.long	0x7fdcdca3,0x7fdcdca3
-.long	0x66222244,0x66222244
-.long	0x7e2a2a54,0x7e2a2a54
-.long	0xab90903b,0xab90903b
-.long	0x8388880b,0x8388880b
-.long	0xca46468c,0xca46468c
-.long	0x29eeeec7,0x29eeeec7
-.long	0xd3b8b86b,0xd3b8b86b
-.long	0x3c141428,0x3c141428
-.long	0x79dedea7,0x79dedea7
-.long	0xe25e5ebc,0xe25e5ebc
-.long	0x1d0b0b16,0x1d0b0b16
-.long	0x76dbdbad,0x76dbdbad
-.long	0x3be0e0db,0x3be0e0db
-.long	0x56323264,0x56323264
-.long	0x4e3a3a74,0x4e3a3a74
-.long	0x1e0a0a14,0x1e0a0a14
-.long	0xdb494992,0xdb494992
-.long	0x0a06060c,0x0a06060c
-.long	0x6c242448,0x6c242448
-.long	0xe45c5cb8,0xe45c5cb8
-.long	0x5dc2c29f,0x5dc2c29f
-.long	0x6ed3d3bd,0x6ed3d3bd
-.long	0xefacac43,0xefacac43
-.long	0xa66262c4,0xa66262c4
-.long	0xa8919139,0xa8919139
-.long	0xa4959531,0xa4959531
-.long	0x37e4e4d3,0x37e4e4d3
-.long	0x8b7979f2,0x8b7979f2
-.long	0x32e7e7d5,0x32e7e7d5
-.long	0x43c8c88b,0x43c8c88b
-.long	0x5937376e,0x5937376e
-.long	0xb76d6dda,0xb76d6dda
-.long	0x8c8d8d01,0x8c8d8d01
-.long	0x64d5d5b1,0x64d5d5b1
-.long	0xd24e4e9c,0xd24e4e9c
-.long	0xe0a9a949,0xe0a9a949
-.long	0xb46c6cd8,0xb46c6cd8
-.long	0xfa5656ac,0xfa5656ac
-.long	0x07f4f4f3,0x07f4f4f3
-.long	0x25eaeacf,0x25eaeacf
-.long	0xaf6565ca,0xaf6565ca
-.long	0x8e7a7af4,0x8e7a7af4
-.long	0xe9aeae47,0xe9aeae47
-.long	0x18080810,0x18080810
-.long	0xd5baba6f,0xd5baba6f
-.long	0x887878f0,0x887878f0
-.long	0x6f25254a,0x6f25254a
-.long	0x722e2e5c,0x722e2e5c
-.long	0x241c1c38,0x241c1c38
-.long	0xf1a6a657,0xf1a6a657
-.long	0xc7b4b473,0xc7b4b473
-.long	0x51c6c697,0x51c6c697
-.long	0x23e8e8cb,0x23e8e8cb
-.long	0x7cdddda1,0x7cdddda1
-.long	0x9c7474e8,0x9c7474e8
-.long	0x211f1f3e,0x211f1f3e
-.long	0xdd4b4b96,0xdd4b4b96
-.long	0xdcbdbd61,0xdcbdbd61
-.long	0x868b8b0d,0x868b8b0d
-.long	0x858a8a0f,0x858a8a0f
-.long	0x907070e0,0x907070e0
-.long	0x423e3e7c,0x423e3e7c
-.long	0xc4b5b571,0xc4b5b571
-.long	0xaa6666cc,0xaa6666cc
-.long	0xd8484890,0xd8484890
-.long	0x05030306,0x05030306
-.long	0x01f6f6f7,0x01f6f6f7
-.long	0x120e0e1c,0x120e0e1c
-.long	0xa36161c2,0xa36161c2
-.long	0x5f35356a,0x5f35356a
-.long	0xf95757ae,0xf95757ae
-.long	0xd0b9b969,0xd0b9b969
-.long	0x91868617,0x91868617
-.long	0x58c1c199,0x58c1c199
-.long	0x271d1d3a,0x271d1d3a
-.long	0xb99e9e27,0xb99e9e27
-.long	0x38e1e1d9,0x38e1e1d9
-.long	0x13f8f8eb,0x13f8f8eb
-.long	0xb398982b,0xb398982b
-.long	0x33111122,0x33111122
-.long	0xbb6969d2,0xbb6969d2
-.long	0x70d9d9a9,0x70d9d9a9
-.long	0x898e8e07,0x898e8e07
-.long	0xa7949433,0xa7949433
-.long	0xb69b9b2d,0xb69b9b2d
-.long	0x221e1e3c,0x221e1e3c
-.long	0x92878715,0x92878715
-.long	0x20e9e9c9,0x20e9e9c9
-.long	0x49cece87,0x49cece87
-.long	0xff5555aa,0xff5555aa
-.long	0x78282850,0x78282850
-.long	0x7adfdfa5,0x7adfdfa5
-.long	0x8f8c8c03,0x8f8c8c03
-.long	0xf8a1a159,0xf8a1a159
-.long	0x80898909,0x80898909
-.long	0x170d0d1a,0x170d0d1a
-.long	0xdabfbf65,0xdabfbf65
-.long	0x31e6e6d7,0x31e6e6d7
-.long	0xc6424284,0xc6424284
-.long	0xb86868d0,0xb86868d0
-.long	0xc3414182,0xc3414182
-.long	0xb0999929,0xb0999929
-.long	0x772d2d5a,0x772d2d5a
-.long	0x110f0f1e,0x110f0f1e
-.long	0xcbb0b07b,0xcbb0b07b
-.long	0xfc5454a8,0xfc5454a8
-.long	0xd6bbbb6d,0xd6bbbb6d
-.long	0x3a16162c,0x3a16162c
-.byte	0x63,0x7c,0x77,0x7b,0xf2,0x6b,0x6f,0xc5
-.byte	0x30,0x01,0x67,0x2b,0xfe,0xd7,0xab,0x76
-.byte	0xca,0x82,0xc9,0x7d,0xfa,0x59,0x47,0xf0
-.byte	0xad,0xd4,0xa2,0xaf,0x9c,0xa4,0x72,0xc0
-.byte	0xb7,0xfd,0x93,0x26,0x36,0x3f,0xf7,0xcc
-.byte	0x34,0xa5,0xe5,0xf1,0x71,0xd8,0x31,0x15
-.byte	0x04,0xc7,0x23,0xc3,0x18,0x96,0x05,0x9a
-.byte	0x07,0x12,0x80,0xe2,0xeb,0x27,0xb2,0x75
-.byte	0x09,0x83,0x2c,0x1a,0x1b,0x6e,0x5a,0xa0
-.byte	0x52,0x3b,0xd6,0xb3,0x29,0xe3,0x2f,0x84
-.byte	0x53,0xd1,0x00,0xed,0x20,0xfc,0xb1,0x5b
-.byte	0x6a,0xcb,0xbe,0x39,0x4a,0x4c,0x58,0xcf
-.byte	0xd0,0xef,0xaa,0xfb,0x43,0x4d,0x33,0x85
-.byte	0x45,0xf9,0x02,0x7f,0x50,0x3c,0x9f,0xa8
-.byte	0x51,0xa3,0x40,0x8f,0x92,0x9d,0x38,0xf5
-.byte	0xbc,0xb6,0xda,0x21,0x10,0xff,0xf3,0xd2
-.byte	0xcd,0x0c,0x13,0xec,0x5f,0x97,0x44,0x17
-.byte	0xc4,0xa7,0x7e,0x3d,0x64,0x5d,0x19,0x73
-.byte	0x60,0x81,0x4f,0xdc,0x22,0x2a,0x90,0x88
-.byte	0x46,0xee,0xb8,0x14,0xde,0x5e,0x0b,0xdb
-.byte	0xe0,0x32,0x3a,0x0a,0x49,0x06,0x24,0x5c
-.byte	0xc2,0xd3,0xac,0x62,0x91,0x95,0xe4,0x79
-.byte	0xe7,0xc8,0x37,0x6d,0x8d,0xd5,0x4e,0xa9
-.byte	0x6c,0x56,0xf4,0xea,0x65,0x7a,0xae,0x08
-.byte	0xba,0x78,0x25,0x2e,0x1c,0xa6,0xb4,0xc6
-.byte	0xe8,0xdd,0x74,0x1f,0x4b,0xbd,0x8b,0x8a
-.byte	0x70,0x3e,0xb5,0x66,0x48,0x03,0xf6,0x0e
-.byte	0x61,0x35,0x57,0xb9,0x86,0xc1,0x1d,0x9e
-.byte	0xe1,0xf8,0x98,0x11,0x69,0xd9,0x8e,0x94
-.byte	0x9b,0x1e,0x87,0xe9,0xce,0x55,0x28,0xdf
-.byte	0x8c,0xa1,0x89,0x0d,0xbf,0xe6,0x42,0x68
-.byte	0x41,0x99,0x2d,0x0f,0xb0,0x54,0xbb,0x16
-.byte	0x63,0x7c,0x77,0x7b,0xf2,0x6b,0x6f,0xc5
-.byte	0x30,0x01,0x67,0x2b,0xfe,0xd7,0xab,0x76
-.byte	0xca,0x82,0xc9,0x7d,0xfa,0x59,0x47,0xf0
-.byte	0xad,0xd4,0xa2,0xaf,0x9c,0xa4,0x72,0xc0
-.byte	0xb7,0xfd,0x93,0x26,0x36,0x3f,0xf7,0xcc
-.byte	0x34,0xa5,0xe5,0xf1,0x71,0xd8,0x31,0x15
-.byte	0x04,0xc7,0x23,0xc3,0x18,0x96,0x05,0x9a
-.byte	0x07,0x12,0x80,0xe2,0xeb,0x27,0xb2,0x75
-.byte	0x09,0x83,0x2c,0x1a,0x1b,0x6e,0x5a,0xa0
-.byte	0x52,0x3b,0xd6,0xb3,0x29,0xe3,0x2f,0x84
-.byte	0x53,0xd1,0x00,0xed,0x20,0xfc,0xb1,0x5b
-.byte	0x6a,0xcb,0xbe,0x39,0x4a,0x4c,0x58,0xcf
-.byte	0xd0,0xef,0xaa,0xfb,0x43,0x4d,0x33,0x85
-.byte	0x45,0xf9,0x02,0x7f,0x50,0x3c,0x9f,0xa8
-.byte	0x51,0xa3,0x40,0x8f,0x92,0x9d,0x38,0xf5
-.byte	0xbc,0xb6,0xda,0x21,0x10,0xff,0xf3,0xd2
-.byte	0xcd,0x0c,0x13,0xec,0x5f,0x97,0x44,0x17
-.byte	0xc4,0xa7,0x7e,0x3d,0x64,0x5d,0x19,0x73
-.byte	0x60,0x81,0x4f,0xdc,0x22,0x2a,0x90,0x88
-.byte	0x46,0xee,0xb8,0x14,0xde,0x5e,0x0b,0xdb
-.byte	0xe0,0x32,0x3a,0x0a,0x49,0x06,0x24,0x5c
-.byte	0xc2,0xd3,0xac,0x62,0x91,0x95,0xe4,0x79
-.byte	0xe7,0xc8,0x37,0x6d,0x8d,0xd5,0x4e,0xa9
-.byte	0x6c,0x56,0xf4,0xea,0x65,0x7a,0xae,0x08
-.byte	0xba,0x78,0x25,0x2e,0x1c,0xa6,0xb4,0xc6
-.byte	0xe8,0xdd,0x74,0x1f,0x4b,0xbd,0x8b,0x8a
-.byte	0x70,0x3e,0xb5,0x66,0x48,0x03,0xf6,0x0e
-.byte	0x61,0x35,0x57,0xb9,0x86,0xc1,0x1d,0x9e
-.byte	0xe1,0xf8,0x98,0x11,0x69,0xd9,0x8e,0x94
-.byte	0x9b,0x1e,0x87,0xe9,0xce,0x55,0x28,0xdf
-.byte	0x8c,0xa1,0x89,0x0d,0xbf,0xe6,0x42,0x68
-.byte	0x41,0x99,0x2d,0x0f,0xb0,0x54,0xbb,0x16
-.byte	0x63,0x7c,0x77,0x7b,0xf2,0x6b,0x6f,0xc5
-.byte	0x30,0x01,0x67,0x2b,0xfe,0xd7,0xab,0x76
-.byte	0xca,0x82,0xc9,0x7d,0xfa,0x59,0x47,0xf0
-.byte	0xad,0xd4,0xa2,0xaf,0x9c,0xa4,0x72,0xc0
-.byte	0xb7,0xfd,0x93,0x26,0x36,0x3f,0xf7,0xcc
-.byte	0x34,0xa5,0xe5,0xf1,0x71,0xd8,0x31,0x15
-.byte	0x04,0xc7,0x23,0xc3,0x18,0x96,0x05,0x9a
-.byte	0x07,0x12,0x80,0xe2,0xeb,0x27,0xb2,0x75
-.byte	0x09,0x83,0x2c,0x1a,0x1b,0x6e,0x5a,0xa0
-.byte	0x52,0x3b,0xd6,0xb3,0x29,0xe3,0x2f,0x84
-.byte	0x53,0xd1,0x00,0xed,0x20,0xfc,0xb1,0x5b
-.byte	0x6a,0xcb,0xbe,0x39,0x4a,0x4c,0x58,0xcf
-.byte	0xd0,0xef,0xaa,0xfb,0x43,0x4d,0x33,0x85
-.byte	0x45,0xf9,0x02,0x7f,0x50,0x3c,0x9f,0xa8
-.byte	0x51,0xa3,0x40,0x8f,0x92,0x9d,0x38,0xf5
-.byte	0xbc,0xb6,0xda,0x21,0x10,0xff,0xf3,0xd2
-.byte	0xcd,0x0c,0x13,0xec,0x5f,0x97,0x44,0x17
-.byte	0xc4,0xa7,0x7e,0x3d,0x64,0x5d,0x19,0x73
-.byte	0x60,0x81,0x4f,0xdc,0x22,0x2a,0x90,0x88
-.byte	0x46,0xee,0xb8,0x14,0xde,0x5e,0x0b,0xdb
-.byte	0xe0,0x32,0x3a,0x0a,0x49,0x06,0x24,0x5c
-.byte	0xc2,0xd3,0xac,0x62,0x91,0x95,0xe4,0x79
-.byte	0xe7,0xc8,0x37,0x6d,0x8d,0xd5,0x4e,0xa9
-.byte	0x6c,0x56,0xf4,0xea,0x65,0x7a,0xae,0x08
-.byte	0xba,0x78,0x25,0x2e,0x1c,0xa6,0xb4,0xc6
-.byte	0xe8,0xdd,0x74,0x1f,0x4b,0xbd,0x8b,0x8a
-.byte	0x70,0x3e,0xb5,0x66,0x48,0x03,0xf6,0x0e
-.byte	0x61,0x35,0x57,0xb9,0x86,0xc1,0x1d,0x9e
-.byte	0xe1,0xf8,0x98,0x11,0x69,0xd9,0x8e,0x94
-.byte	0x9b,0x1e,0x87,0xe9,0xce,0x55,0x28,0xdf
-.byte	0x8c,0xa1,0x89,0x0d,0xbf,0xe6,0x42,0x68
-.byte	0x41,0x99,0x2d,0x0f,0xb0,0x54,0xbb,0x16
-.byte	0x63,0x7c,0x77,0x7b,0xf2,0x6b,0x6f,0xc5
-.byte	0x30,0x01,0x67,0x2b,0xfe,0xd7,0xab,0x76
-.byte	0xca,0x82,0xc9,0x7d,0xfa,0x59,0x47,0xf0
-.byte	0xad,0xd4,0xa2,0xaf,0x9c,0xa4,0x72,0xc0
-.byte	0xb7,0xfd,0x93,0x26,0x36,0x3f,0xf7,0xcc
-.byte	0x34,0xa5,0xe5,0xf1,0x71,0xd8,0x31,0x15
-.byte	0x04,0xc7,0x23,0xc3,0x18,0x96,0x05,0x9a
-.byte	0x07,0x12,0x80,0xe2,0xeb,0x27,0xb2,0x75
-.byte	0x09,0x83,0x2c,0x1a,0x1b,0x6e,0x5a,0xa0
-.byte	0x52,0x3b,0xd6,0xb3,0x29,0xe3,0x2f,0x84
-.byte	0x53,0xd1,0x00,0xed,0x20,0xfc,0xb1,0x5b
-.byte	0x6a,0xcb,0xbe,0x39,0x4a,0x4c,0x58,0xcf
-.byte	0xd0,0xef,0xaa,0xfb,0x43,0x4d,0x33,0x85
-.byte	0x45,0xf9,0x02,0x7f,0x50,0x3c,0x9f,0xa8
-.byte	0x51,0xa3,0x40,0x8f,0x92,0x9d,0x38,0xf5
-.byte	0xbc,0xb6,0xda,0x21,0x10,0xff,0xf3,0xd2
-.byte	0xcd,0x0c,0x13,0xec,0x5f,0x97,0x44,0x17
-.byte	0xc4,0xa7,0x7e,0x3d,0x64,0x5d,0x19,0x73
-.byte	0x60,0x81,0x4f,0xdc,0x22,0x2a,0x90,0x88
-.byte	0x46,0xee,0xb8,0x14,0xde,0x5e,0x0b,0xdb
-.byte	0xe0,0x32,0x3a,0x0a,0x49,0x06,0x24,0x5c
-.byte	0xc2,0xd3,0xac,0x62,0x91,0x95,0xe4,0x79
-.byte	0xe7,0xc8,0x37,0x6d,0x8d,0xd5,0x4e,0xa9
-.byte	0x6c,0x56,0xf4,0xea,0x65,0x7a,0xae,0x08
-.byte	0xba,0x78,0x25,0x2e,0x1c,0xa6,0xb4,0xc6
-.byte	0xe8,0xdd,0x74,0x1f,0x4b,0xbd,0x8b,0x8a
-.byte	0x70,0x3e,0xb5,0x66,0x48,0x03,0xf6,0x0e
-.byte	0x61,0x35,0x57,0xb9,0x86,0xc1,0x1d,0x9e
-.byte	0xe1,0xf8,0x98,0x11,0x69,0xd9,0x8e,0x94
-.byte	0x9b,0x1e,0x87,0xe9,0xce,0x55,0x28,0xdf
-.byte	0x8c,0xa1,0x89,0x0d,0xbf,0xe6,0x42,0x68
-.byte	0x41,0x99,0x2d,0x0f,0xb0,0x54,0xbb,0x16
-.long	0x00000001, 0x00000002, 0x00000004, 0x00000008
-.long	0x00000010, 0x00000020, 0x00000040, 0x00000080
-.long	0x0000001b, 0x00000036, 0x80808080, 0x80808080
-.long	0xfefefefe, 0xfefefefe, 0x1b1b1b1b, 0x1b1b1b1b
-.align	64
-.LAES_Td:
-.long	0x50a7f451,0x50a7f451
-.long	0x5365417e,0x5365417e
-.long	0xc3a4171a,0xc3a4171a
-.long	0x965e273a,0x965e273a
-.long	0xcb6bab3b,0xcb6bab3b
-.long	0xf1459d1f,0xf1459d1f
-.long	0xab58faac,0xab58faac
-.long	0x9303e34b,0x9303e34b
-.long	0x55fa3020,0x55fa3020
-.long	0xf66d76ad,0xf66d76ad
-.long	0x9176cc88,0x9176cc88
-.long	0x254c02f5,0x254c02f5
-.long	0xfcd7e54f,0xfcd7e54f
-.long	0xd7cb2ac5,0xd7cb2ac5
-.long	0x80443526,0x80443526
-.long	0x8fa362b5,0x8fa362b5
-.long	0x495ab1de,0x495ab1de
-.long	0x671bba25,0x671bba25
-.long	0x980eea45,0x980eea45
-.long	0xe1c0fe5d,0xe1c0fe5d
-.long	0x02752fc3,0x02752fc3
-.long	0x12f04c81,0x12f04c81
-.long	0xa397468d,0xa397468d
-.long	0xc6f9d36b,0xc6f9d36b
-.long	0xe75f8f03,0xe75f8f03
-.long	0x959c9215,0x959c9215
-.long	0xeb7a6dbf,0xeb7a6dbf
-.long	0xda595295,0xda595295
-.long	0x2d83bed4,0x2d83bed4
-.long	0xd3217458,0xd3217458
-.long	0x2969e049,0x2969e049
-.long	0x44c8c98e,0x44c8c98e
-.long	0x6a89c275,0x6a89c275
-.long	0x78798ef4,0x78798ef4
-.long	0x6b3e5899,0x6b3e5899
-.long	0xdd71b927,0xdd71b927
-.long	0xb64fe1be,0xb64fe1be
-.long	0x17ad88f0,0x17ad88f0
-.long	0x66ac20c9,0x66ac20c9
-.long	0xb43ace7d,0xb43ace7d
-.long	0x184adf63,0x184adf63
-.long	0x82311ae5,0x82311ae5
-.long	0x60335197,0x60335197
-.long	0x457f5362,0x457f5362
-.long	0xe07764b1,0xe07764b1
-.long	0x84ae6bbb,0x84ae6bbb
-.long	0x1ca081fe,0x1ca081fe
-.long	0x942b08f9,0x942b08f9
-.long	0x58684870,0x58684870
-.long	0x19fd458f,0x19fd458f
-.long	0x876cde94,0x876cde94
-.long	0xb7f87b52,0xb7f87b52
-.long	0x23d373ab,0x23d373ab
-.long	0xe2024b72,0xe2024b72
-.long	0x578f1fe3,0x578f1fe3
-.long	0x2aab5566,0x2aab5566
-.long	0x0728ebb2,0x0728ebb2
-.long	0x03c2b52f,0x03c2b52f
-.long	0x9a7bc586,0x9a7bc586
-.long	0xa50837d3,0xa50837d3
-.long	0xf2872830,0xf2872830
-.long	0xb2a5bf23,0xb2a5bf23
-.long	0xba6a0302,0xba6a0302
-.long	0x5c8216ed,0x5c8216ed
-.long	0x2b1ccf8a,0x2b1ccf8a
-.long	0x92b479a7,0x92b479a7
-.long	0xf0f207f3,0xf0f207f3
-.long	0xa1e2694e,0xa1e2694e
-.long	0xcdf4da65,0xcdf4da65
-.long	0xd5be0506,0xd5be0506
-.long	0x1f6234d1,0x1f6234d1
-.long	0x8afea6c4,0x8afea6c4
-.long	0x9d532e34,0x9d532e34
-.long	0xa055f3a2,0xa055f3a2
-.long	0x32e18a05,0x32e18a05
-.long	0x75ebf6a4,0x75ebf6a4
-.long	0x39ec830b,0x39ec830b
-.long	0xaaef6040,0xaaef6040
-.long	0x069f715e,0x069f715e
-.long	0x51106ebd,0x51106ebd
-.long	0xf98a213e,0xf98a213e
-.long	0x3d06dd96,0x3d06dd96
-.long	0xae053edd,0xae053edd
-.long	0x46bde64d,0x46bde64d
-.long	0xb58d5491,0xb58d5491
-.long	0x055dc471,0x055dc471
-.long	0x6fd40604,0x6fd40604
-.long	0xff155060,0xff155060
-.long	0x24fb9819,0x24fb9819
-.long	0x97e9bdd6,0x97e9bdd6
-.long	0xcc434089,0xcc434089
-.long	0x779ed967,0x779ed967
-.long	0xbd42e8b0,0xbd42e8b0
-.long	0x888b8907,0x888b8907
-.long	0x385b19e7,0x385b19e7
-.long	0xdbeec879,0xdbeec879
-.long	0x470a7ca1,0x470a7ca1
-.long	0xe90f427c,0xe90f427c
-.long	0xc91e84f8,0xc91e84f8
-.long	0x00000000,0x00000000
-.long	0x83868009,0x83868009
-.long	0x48ed2b32,0x48ed2b32
-.long	0xac70111e,0xac70111e
-.long	0x4e725a6c,0x4e725a6c
-.long	0xfbff0efd,0xfbff0efd
-.long	0x5638850f,0x5638850f
-.long	0x1ed5ae3d,0x1ed5ae3d
-.long	0x27392d36,0x27392d36
-.long	0x64d90f0a,0x64d90f0a
-.long	0x21a65c68,0x21a65c68
-.long	0xd1545b9b,0xd1545b9b
-.long	0x3a2e3624,0x3a2e3624
-.long	0xb1670a0c,0xb1670a0c
-.long	0x0fe75793,0x0fe75793
-.long	0xd296eeb4,0xd296eeb4
-.long	0x9e919b1b,0x9e919b1b
-.long	0x4fc5c080,0x4fc5c080
-.long	0xa220dc61,0xa220dc61
-.long	0x694b775a,0x694b775a
-.long	0x161a121c,0x161a121c
-.long	0x0aba93e2,0x0aba93e2
-.long	0xe52aa0c0,0xe52aa0c0
-.long	0x43e0223c,0x43e0223c
-.long	0x1d171b12,0x1d171b12
-.long	0x0b0d090e,0x0b0d090e
-.long	0xadc78bf2,0xadc78bf2
-.long	0xb9a8b62d,0xb9a8b62d
-.long	0xc8a91e14,0xc8a91e14
-.long	0x8519f157,0x8519f157
-.long	0x4c0775af,0x4c0775af
-.long	0xbbdd99ee,0xbbdd99ee
-.long	0xfd607fa3,0xfd607fa3
-.long	0x9f2601f7,0x9f2601f7
-.long	0xbcf5725c,0xbcf5725c
-.long	0xc53b6644,0xc53b6644
-.long	0x347efb5b,0x347efb5b
-.long	0x7629438b,0x7629438b
-.long	0xdcc623cb,0xdcc623cb
-.long	0x68fcedb6,0x68fcedb6
-.long	0x63f1e4b8,0x63f1e4b8
-.long	0xcadc31d7,0xcadc31d7
-.long	0x10856342,0x10856342
-.long	0x40229713,0x40229713
-.long	0x2011c684,0x2011c684
-.long	0x7d244a85,0x7d244a85
-.long	0xf83dbbd2,0xf83dbbd2
-.long	0x1132f9ae,0x1132f9ae
-.long	0x6da129c7,0x6da129c7
-.long	0x4b2f9e1d,0x4b2f9e1d
-.long	0xf330b2dc,0xf330b2dc
-.long	0xec52860d,0xec52860d
-.long	0xd0e3c177,0xd0e3c177
-.long	0x6c16b32b,0x6c16b32b
-.long	0x99b970a9,0x99b970a9
-.long	0xfa489411,0xfa489411
-.long	0x2264e947,0x2264e947
-.long	0xc48cfca8,0xc48cfca8
-.long	0x1a3ff0a0,0x1a3ff0a0
-.long	0xd82c7d56,0xd82c7d56
-.long	0xef903322,0xef903322
-.long	0xc74e4987,0xc74e4987
-.long	0xc1d138d9,0xc1d138d9
-.long	0xfea2ca8c,0xfea2ca8c
-.long	0x360bd498,0x360bd498
-.long	0xcf81f5a6,0xcf81f5a6
-.long	0x28de7aa5,0x28de7aa5
-.long	0x268eb7da,0x268eb7da
-.long	0xa4bfad3f,0xa4bfad3f
-.long	0xe49d3a2c,0xe49d3a2c
-.long	0x0d927850,0x0d927850
-.long	0x9bcc5f6a,0x9bcc5f6a
-.long	0x62467e54,0x62467e54
-.long	0xc2138df6,0xc2138df6
-.long	0xe8b8d890,0xe8b8d890
-.long	0x5ef7392e,0x5ef7392e
-.long	0xf5afc382,0xf5afc382
-.long	0xbe805d9f,0xbe805d9f
-.long	0x7c93d069,0x7c93d069
-.long	0xa92dd56f,0xa92dd56f
-.long	0xb31225cf,0xb31225cf
-.long	0x3b99acc8,0x3b99acc8
-.long	0xa77d1810,0xa77d1810
-.long	0x6e639ce8,0x6e639ce8
-.long	0x7bbb3bdb,0x7bbb3bdb
-.long	0x097826cd,0x097826cd
-.long	0xf418596e,0xf418596e
-.long	0x01b79aec,0x01b79aec
-.long	0xa89a4f83,0xa89a4f83
-.long	0x656e95e6,0x656e95e6
-.long	0x7ee6ffaa,0x7ee6ffaa
-.long	0x08cfbc21,0x08cfbc21
-.long	0xe6e815ef,0xe6e815ef
-.long	0xd99be7ba,0xd99be7ba
-.long	0xce366f4a,0xce366f4a
-.long	0xd4099fea,0xd4099fea
-.long	0xd67cb029,0xd67cb029
-.long	0xafb2a431,0xafb2a431
-.long	0x31233f2a,0x31233f2a
-.long	0x3094a5c6,0x3094a5c6
-.long	0xc066a235,0xc066a235
-.long	0x37bc4e74,0x37bc4e74
-.long	0xa6ca82fc,0xa6ca82fc
-.long	0xb0d090e0,0xb0d090e0
-.long	0x15d8a733,0x15d8a733
-.long	0x4a9804f1,0x4a9804f1
-.long	0xf7daec41,0xf7daec41
-.long	0x0e50cd7f,0x0e50cd7f
-.long	0x2ff69117,0x2ff69117
-.long	0x8dd64d76,0x8dd64d76
-.long	0x4db0ef43,0x4db0ef43
-.long	0x544daacc,0x544daacc
-.long	0xdf0496e4,0xdf0496e4
-.long	0xe3b5d19e,0xe3b5d19e
-.long	0x1b886a4c,0x1b886a4c
-.long	0xb81f2cc1,0xb81f2cc1
-.long	0x7f516546,0x7f516546
-.long	0x04ea5e9d,0x04ea5e9d
-.long	0x5d358c01,0x5d358c01
-.long	0x737487fa,0x737487fa
-.long	0x2e410bfb,0x2e410bfb
-.long	0x5a1d67b3,0x5a1d67b3
-.long	0x52d2db92,0x52d2db92
-.long	0x335610e9,0x335610e9
-.long	0x1347d66d,0x1347d66d
-.long	0x8c61d79a,0x8c61d79a
-.long	0x7a0ca137,0x7a0ca137
-.long	0x8e14f859,0x8e14f859
-.long	0x893c13eb,0x893c13eb
-.long	0xee27a9ce,0xee27a9ce
-.long	0x35c961b7,0x35c961b7
-.long	0xede51ce1,0xede51ce1
-.long	0x3cb1477a,0x3cb1477a
-.long	0x59dfd29c,0x59dfd29c
-.long	0x3f73f255,0x3f73f255
-.long	0x79ce1418,0x79ce1418
-.long	0xbf37c773,0xbf37c773
-.long	0xeacdf753,0xeacdf753
-.long	0x5baafd5f,0x5baafd5f
-.long	0x146f3ddf,0x146f3ddf
-.long	0x86db4478,0x86db4478
-.long	0x81f3afca,0x81f3afca
-.long	0x3ec468b9,0x3ec468b9
-.long	0x2c342438,0x2c342438
-.long	0x5f40a3c2,0x5f40a3c2
-.long	0x72c31d16,0x72c31d16
-.long	0x0c25e2bc,0x0c25e2bc
-.long	0x8b493c28,0x8b493c28
-.long	0x41950dff,0x41950dff
-.long	0x7101a839,0x7101a839
-.long	0xdeb30c08,0xdeb30c08
-.long	0x9ce4b4d8,0x9ce4b4d8
-.long	0x90c15664,0x90c15664
-.long	0x6184cb7b,0x6184cb7b
-.long	0x70b632d5,0x70b632d5
-.long	0x745c6c48,0x745c6c48
-.long	0x4257b8d0,0x4257b8d0
-.byte	0x52,0x09,0x6a,0xd5,0x30,0x36,0xa5,0x38
-.byte	0xbf,0x40,0xa3,0x9e,0x81,0xf3,0xd7,0xfb
-.byte	0x7c,0xe3,0x39,0x82,0x9b,0x2f,0xff,0x87
-.byte	0x34,0x8e,0x43,0x44,0xc4,0xde,0xe9,0xcb
-.byte	0x54,0x7b,0x94,0x32,0xa6,0xc2,0x23,0x3d
-.byte	0xee,0x4c,0x95,0x0b,0x42,0xfa,0xc3,0x4e
-.byte	0x08,0x2e,0xa1,0x66,0x28,0xd9,0x24,0xb2
-.byte	0x76,0x5b,0xa2,0x49,0x6d,0x8b,0xd1,0x25
-.byte	0x72,0xf8,0xf6,0x64,0x86,0x68,0x98,0x16
-.byte	0xd4,0xa4,0x5c,0xcc,0x5d,0x65,0xb6,0x92
-.byte	0x6c,0x70,0x48,0x50,0xfd,0xed,0xb9,0xda
-.byte	0x5e,0x15,0x46,0x57,0xa7,0x8d,0x9d,0x84
-.byte	0x90,0xd8,0xab,0x00,0x8c,0xbc,0xd3,0x0a
-.byte	0xf7,0xe4,0x58,0x05,0xb8,0xb3,0x45,0x06
-.byte	0xd0,0x2c,0x1e,0x8f,0xca,0x3f,0x0f,0x02
-.byte	0xc1,0xaf,0xbd,0x03,0x01,0x13,0x8a,0x6b
-.byte	0x3a,0x91,0x11,0x41,0x4f,0x67,0xdc,0xea
-.byte	0x97,0xf2,0xcf,0xce,0xf0,0xb4,0xe6,0x73
-.byte	0x96,0xac,0x74,0x22,0xe7,0xad,0x35,0x85
-.byte	0xe2,0xf9,0x37,0xe8,0x1c,0x75,0xdf,0x6e
-.byte	0x47,0xf1,0x1a,0x71,0x1d,0x29,0xc5,0x89
-.byte	0x6f,0xb7,0x62,0x0e,0xaa,0x18,0xbe,0x1b
-.byte	0xfc,0x56,0x3e,0x4b,0xc6,0xd2,0x79,0x20
-.byte	0x9a,0xdb,0xc0,0xfe,0x78,0xcd,0x5a,0xf4
-.byte	0x1f,0xdd,0xa8,0x33,0x88,0x07,0xc7,0x31
-.byte	0xb1,0x12,0x10,0x59,0x27,0x80,0xec,0x5f
-.byte	0x60,0x51,0x7f,0xa9,0x19,0xb5,0x4a,0x0d
-.byte	0x2d,0xe5,0x7a,0x9f,0x93,0xc9,0x9c,0xef
-.byte	0xa0,0xe0,0x3b,0x4d,0xae,0x2a,0xf5,0xb0
-.byte	0xc8,0xeb,0xbb,0x3c,0x83,0x53,0x99,0x61
-.byte	0x17,0x2b,0x04,0x7e,0xba,0x77,0xd6,0x26
-.byte	0xe1,0x69,0x14,0x63,0x55,0x21,0x0c,0x7d
-.long	0x80808080, 0x80808080, 0xfefefefe, 0xfefefefe
-.long	0x1b1b1b1b, 0x1b1b1b1b, 0, 0
-.byte	0x52,0x09,0x6a,0xd5,0x30,0x36,0xa5,0x38
-.byte	0xbf,0x40,0xa3,0x9e,0x81,0xf3,0xd7,0xfb
-.byte	0x7c,0xe3,0x39,0x82,0x9b,0x2f,0xff,0x87
-.byte	0x34,0x8e,0x43,0x44,0xc4,0xde,0xe9,0xcb
-.byte	0x54,0x7b,0x94,0x32,0xa6,0xc2,0x23,0x3d
-.byte	0xee,0x4c,0x95,0x0b,0x42,0xfa,0xc3,0x4e
-.byte	0x08,0x2e,0xa1,0x66,0x28,0xd9,0x24,0xb2
-.byte	0x76,0x5b,0xa2,0x49,0x6d,0x8b,0xd1,0x25
-.byte	0x72,0xf8,0xf6,0x64,0x86,0x68,0x98,0x16
-.byte	0xd4,0xa4,0x5c,0xcc,0x5d,0x65,0xb6,0x92
-.byte	0x6c,0x70,0x48,0x50,0xfd,0xed,0xb9,0xda
-.byte	0x5e,0x15,0x46,0x57,0xa7,0x8d,0x9d,0x84
-.byte	0x90,0xd8,0xab,0x00,0x8c,0xbc,0xd3,0x0a
-.byte	0xf7,0xe4,0x58,0x05,0xb8,0xb3,0x45,0x06
-.byte	0xd0,0x2c,0x1e,0x8f,0xca,0x3f,0x0f,0x02
-.byte	0xc1,0xaf,0xbd,0x03,0x01,0x13,0x8a,0x6b
-.byte	0x3a,0x91,0x11,0x41,0x4f,0x67,0xdc,0xea
-.byte	0x97,0xf2,0xcf,0xce,0xf0,0xb4,0xe6,0x73
-.byte	0x96,0xac,0x74,0x22,0xe7,0xad,0x35,0x85
-.byte	0xe2,0xf9,0x37,0xe8,0x1c,0x75,0xdf,0x6e
-.byte	0x47,0xf1,0x1a,0x71,0x1d,0x29,0xc5,0x89
-.byte	0x6f,0xb7,0x62,0x0e,0xaa,0x18,0xbe,0x1b
-.byte	0xfc,0x56,0x3e,0x4b,0xc6,0xd2,0x79,0x20
-.byte	0x9a,0xdb,0xc0,0xfe,0x78,0xcd,0x5a,0xf4
-.byte	0x1f,0xdd,0xa8,0x33,0x88,0x07,0xc7,0x31
-.byte	0xb1,0x12,0x10,0x59,0x27,0x80,0xec,0x5f
-.byte	0x60,0x51,0x7f,0xa9,0x19,0xb5,0x4a,0x0d
-.byte	0x2d,0xe5,0x7a,0x9f,0x93,0xc9,0x9c,0xef
-.byte	0xa0,0xe0,0x3b,0x4d,0xae,0x2a,0xf5,0xb0
-.byte	0xc8,0xeb,0xbb,0x3c,0x83,0x53,0x99,0x61
-.byte	0x17,0x2b,0x04,0x7e,0xba,0x77,0xd6,0x26
-.byte	0xe1,0x69,0x14,0x63,0x55,0x21,0x0c,0x7d
-.long	0x80808080, 0x80808080, 0xfefefefe, 0xfefefefe
-.long	0x1b1b1b1b, 0x1b1b1b1b, 0, 0
-.byte	0x52,0x09,0x6a,0xd5,0x30,0x36,0xa5,0x38
-.byte	0xbf,0x40,0xa3,0x9e,0x81,0xf3,0xd7,0xfb
-.byte	0x7c,0xe3,0x39,0x82,0x9b,0x2f,0xff,0x87
-.byte	0x34,0x8e,0x43,0x44,0xc4,0xde,0xe9,0xcb
-.byte	0x54,0x7b,0x94,0x32,0xa6,0xc2,0x23,0x3d
-.byte	0xee,0x4c,0x95,0x0b,0x42,0xfa,0xc3,0x4e
-.byte	0x08,0x2e,0xa1,0x66,0x28,0xd9,0x24,0xb2
-.byte	0x76,0x5b,0xa2,0x49,0x6d,0x8b,0xd1,0x25
-.byte	0x72,0xf8,0xf6,0x64,0x86,0x68,0x98,0x16
-.byte	0xd4,0xa4,0x5c,0xcc,0x5d,0x65,0xb6,0x92
-.byte	0x6c,0x70,0x48,0x50,0xfd,0xed,0xb9,0xda
-.byte	0x5e,0x15,0x46,0x57,0xa7,0x8d,0x9d,0x84
-.byte	0x90,0xd8,0xab,0x00,0x8c,0xbc,0xd3,0x0a
-.byte	0xf7,0xe4,0x58,0x05,0xb8,0xb3,0x45,0x06
-.byte	0xd0,0x2c,0x1e,0x8f,0xca,0x3f,0x0f,0x02
-.byte	0xc1,0xaf,0xbd,0x03,0x01,0x13,0x8a,0x6b
-.byte	0x3a,0x91,0x11,0x41,0x4f,0x67,0xdc,0xea
-.byte	0x97,0xf2,0xcf,0xce,0xf0,0xb4,0xe6,0x73
-.byte	0x96,0xac,0x74,0x22,0xe7,0xad,0x35,0x85
-.byte	0xe2,0xf9,0x37,0xe8,0x1c,0x75,0xdf,0x6e
-.byte	0x47,0xf1,0x1a,0x71,0x1d,0x29,0xc5,0x89
-.byte	0x6f,0xb7,0x62,0x0e,0xaa,0x18,0xbe,0x1b
-.byte	0xfc,0x56,0x3e,0x4b,0xc6,0xd2,0x79,0x20
-.byte	0x9a,0xdb,0xc0,0xfe,0x78,0xcd,0x5a,0xf4
-.byte	0x1f,0xdd,0xa8,0x33,0x88,0x07,0xc7,0x31
-.byte	0xb1,0x12,0x10,0x59,0x27,0x80,0xec,0x5f
-.byte	0x60,0x51,0x7f,0xa9,0x19,0xb5,0x4a,0x0d
-.byte	0x2d,0xe5,0x7a,0x9f,0x93,0xc9,0x9c,0xef
-.byte	0xa0,0xe0,0x3b,0x4d,0xae,0x2a,0xf5,0xb0
-.byte	0xc8,0xeb,0xbb,0x3c,0x83,0x53,0x99,0x61
-.byte	0x17,0x2b,0x04,0x7e,0xba,0x77,0xd6,0x26
-.byte	0xe1,0x69,0x14,0x63,0x55,0x21,0x0c,0x7d
-.long	0x80808080, 0x80808080, 0xfefefefe, 0xfefefefe
-.long	0x1b1b1b1b, 0x1b1b1b1b, 0, 0
-.byte	0x52,0x09,0x6a,0xd5,0x30,0x36,0xa5,0x38
-.byte	0xbf,0x40,0xa3,0x9e,0x81,0xf3,0xd7,0xfb
-.byte	0x7c,0xe3,0x39,0x82,0x9b,0x2f,0xff,0x87
-.byte	0x34,0x8e,0x43,0x44,0xc4,0xde,0xe9,0xcb
-.byte	0x54,0x7b,0x94,0x32,0xa6,0xc2,0x23,0x3d
-.byte	0xee,0x4c,0x95,0x0b,0x42,0xfa,0xc3,0x4e
-.byte	0x08,0x2e,0xa1,0x66,0x28,0xd9,0x24,0xb2
-.byte	0x76,0x5b,0xa2,0x49,0x6d,0x8b,0xd1,0x25
-.byte	0x72,0xf8,0xf6,0x64,0x86,0x68,0x98,0x16
-.byte	0xd4,0xa4,0x5c,0xcc,0x5d,0x65,0xb6,0x92
-.byte	0x6c,0x70,0x48,0x50,0xfd,0xed,0xb9,0xda
-.byte	0x5e,0x15,0x46,0x57,0xa7,0x8d,0x9d,0x84
-.byte	0x90,0xd8,0xab,0x00,0x8c,0xbc,0xd3,0x0a
-.byte	0xf7,0xe4,0x58,0x05,0xb8,0xb3,0x45,0x06
-.byte	0xd0,0x2c,0x1e,0x8f,0xca,0x3f,0x0f,0x02
-.byte	0xc1,0xaf,0xbd,0x03,0x01,0x13,0x8a,0x6b
-.byte	0x3a,0x91,0x11,0x41,0x4f,0x67,0xdc,0xea
-.byte	0x97,0xf2,0xcf,0xce,0xf0,0xb4,0xe6,0x73
-.byte	0x96,0xac,0x74,0x22,0xe7,0xad,0x35,0x85
-.byte	0xe2,0xf9,0x37,0xe8,0x1c,0x75,0xdf,0x6e
-.byte	0x47,0xf1,0x1a,0x71,0x1d,0x29,0xc5,0x89
-.byte	0x6f,0xb7,0x62,0x0e,0xaa,0x18,0xbe,0x1b
-.byte	0xfc,0x56,0x3e,0x4b,0xc6,0xd2,0x79,0x20
-.byte	0x9a,0xdb,0xc0,0xfe,0x78,0xcd,0x5a,0xf4
-.byte	0x1f,0xdd,0xa8,0x33,0x88,0x07,0xc7,0x31
-.byte	0xb1,0x12,0x10,0x59,0x27,0x80,0xec,0x5f
-.byte	0x60,0x51,0x7f,0xa9,0x19,0xb5,0x4a,0x0d
-.byte	0x2d,0xe5,0x7a,0x9f,0x93,0xc9,0x9c,0xef
-.byte	0xa0,0xe0,0x3b,0x4d,0xae,0x2a,0xf5,0xb0
-.byte	0xc8,0xeb,0xbb,0x3c,0x83,0x53,0x99,0x61
-.byte	0x17,0x2b,0x04,0x7e,0xba,0x77,0xd6,0x26
-.byte	0xe1,0x69,0x14,0x63,0x55,0x21,0x0c,0x7d
-.long	0x80808080, 0x80808080, 0xfefefefe, 0xfefefefe
-.long	0x1b1b1b1b, 0x1b1b1b1b, 0, 0
-.byte	65,69,83,32,102,111,114,32,120,56,54,95,54,52,44,32,67,82,89,80,84,79,71,65,77,83,32,98,121,32,60,97,112,112,114,111,64,111,112,101,110,115,115,108,46,111,114,103,62,0
-.align	64
diff --git a/deps/openssl/config/archs/linux-x86_64/asm_avx2/crypto/aes/aesni-sha1-x86_64.s b/deps/openssl/config/archs/linux-x86_64/asm_avx2/crypto/aes/aesni-sha1-x86_64.s
index 4d2dfe4489..978bd2b623 100644
--- a/deps/openssl/config/archs/linux-x86_64/asm_avx2/crypto/aes/aesni-sha1-x86_64.s
+++ b/deps/openssl/config/archs/linux-x86_64/asm_avx2/crypto/aes/aesni-sha1-x86_64.s
@@ -5,6 +5,7 @@
 .type	aesni_cbc_sha1_enc,@function
 .align	32
 aesni_cbc_sha1_enc:
+.cfi_startproc
 
 	movl	OPENSSL_ia32cap_P+0(%rip),%r10d
 	movq	OPENSSL_ia32cap_P+4(%rip),%r11
@@ -17,6 +18,7 @@ aesni_cbc_sha1_enc:
 	je	aesni_cbc_sha1_enc_avx
 	jmp	aesni_cbc_sha1_enc_ssse3
 	.byte	0xf3,0xc3
+.cfi_endproc
 .size	aesni_cbc_sha1_enc,.-aesni_cbc_sha1_enc
 .type	aesni_cbc_sha1_enc_ssse3,@function
 .align	32
@@ -2730,6 +2732,7 @@ K_XX_XX:
 .type	aesni_cbc_sha1_enc_shaext,@function
 .align	32
 aesni_cbc_sha1_enc_shaext:
+.cfi_startproc
 	movq	8(%rsp),%r10
 	movdqu	(%r9),%xmm8
 	movd	16(%r9),%xmm9
@@ -3028,4 +3031,5 @@ aesni_cbc_sha1_enc_shaext:
 	movdqu	%xmm8,(%r9)
 	movd	%xmm9,16(%r9)
 	.byte	0xf3,0xc3
+.cfi_endproc
 .size	aesni_cbc_sha1_enc_shaext,.-aesni_cbc_sha1_enc_shaext
diff --git a/deps/openssl/config/archs/linux-x86_64/asm_avx2/crypto/aes/aesni-sha256-x86_64.s b/deps/openssl/config/archs/linux-x86_64/asm_avx2/crypto/aes/aesni-sha256-x86_64.s
index 5a47b3ee51..dd09f1b290 100644
--- a/deps/openssl/config/archs/linux-x86_64/asm_avx2/crypto/aes/aesni-sha256-x86_64.s
+++ b/deps/openssl/config/archs/linux-x86_64/asm_avx2/crypto/aes/aesni-sha256-x86_64.s
@@ -5,6 +5,7 @@
 .type	aesni_cbc_sha256_enc,@function
 .align	16
 aesni_cbc_sha256_enc:
+.cfi_startproc
 	leaq	OPENSSL_ia32cap_P(%rip),%r11
 	movl	$1,%eax
 	cmpq	$0,%rdi
@@ -30,6 +31,7 @@ aesni_cbc_sha256_enc:
 	ud2
 .Lprobe:
 	.byte	0xf3,0xc3
+.cfi_endproc
 .size	aesni_cbc_sha256_enc,.-aesni_cbc_sha256_enc
 
 .align	64
@@ -2528,7 +2530,15 @@ aesni_cbc_sha256_enc_avx2:
 	vmovdqa	%ymm4,0(%rsp)
 	xorl	%r14d,%r14d
 	vmovdqa	%ymm5,32(%rsp)
+
+	movq	120(%rsp),%rsi
+.cfi_def_cfa	%rsi,8
 	leaq	-64(%rsp),%rsp
+
+
+
+	movq	%rsi,-8(%rsp)
+.cfi_escape	0x0f,0x05,0x77,0x78,0x06,0x23,0x08
 	movl	%ebx,%esi
 	vmovdqa	%ymm6,0(%rsp)
 	xorl	%ecx,%esi
@@ -2542,6 +2552,12 @@ aesni_cbc_sha256_enc_avx2:
 	vmovdqu	(%r13),%xmm9
 	vpinsrq	$0,%r13,%xmm15,%xmm15
 	leaq	-64(%rsp),%rsp
+.cfi_escape	0x0f,0x05,0x77,0x38,0x06,0x23,0x08
+
+	pushq	64-8(%rsp)
+.cfi_escape	0x0f,0x05,0x77,0x00,0x06,0x23,0x08
+	leaq	8(%rsp),%rsp
+.cfi_escape	0x0f,0x05,0x77,0x78,0x06,0x23,0x08
 	vpalignr	$4,%ymm0,%ymm1,%ymm4
 	addl	0+128(%rsp),%r11d
 	andl	%r8d,%r12d
@@ -2816,6 +2832,12 @@ aesni_cbc_sha256_enc_avx2:
 	movl	%r9d,%r12d
 	vmovdqa	%ymm6,32(%rsp)
 	leaq	-64(%rsp),%rsp
+.cfi_escape	0x0f,0x05,0x77,0x38,0x06,0x23,0x08
+
+	pushq	64-8(%rsp)
+.cfi_escape	0x0f,0x05,0x77,0x00,0x06,0x23,0x08
+	leaq	8(%rsp),%rsp
+.cfi_escape	0x0f,0x05,0x77,0x78,0x06,0x23,0x08
 	vpalignr	$4,%ymm2,%ymm3,%ymm4
 	addl	0+128(%rsp),%r11d
 	andl	%r8d,%r12d
@@ -4029,10 +4051,12 @@ aesni_cbc_sha256_enc_avx2:
 	jbe	.Loop_avx2
 	leaq	(%rsp),%rbp
 
+
+.cfi_escape	0x0f,0x06,0x76,0xf8,0x00,0x06,0x23,0x08
+
 .Ldone_avx2:
-	leaq	(%rbp),%rsp
-	movq	64+32(%rsp),%r8
-	movq	120(%rsp),%rsi
+	movq	64+32(%rbp),%r8
+	movq	64+56(%rbp),%rsi
 .cfi_def_cfa	%rsi,8
 	vmovdqu	%xmm8,(%r8)
 	vzeroall
@@ -4057,6 +4081,7 @@ aesni_cbc_sha256_enc_avx2:
 .type	aesni_cbc_sha256_enc_shaext,@function
 .align	32
 aesni_cbc_sha256_enc_shaext:
+.cfi_startproc
 	movq	8(%rsp),%r10
 	leaq	K256+128(%rip),%rax
 	movdqu	(%r9),%xmm1
@@ -4406,4 +4431,5 @@ aesni_cbc_sha256_enc_shaext:
 	movdqu	%xmm1,(%r9)
 	movdqu	%xmm2,16(%r9)
 	.byte	0xf3,0xc3
+.cfi_endproc
 .size	aesni_cbc_sha256_enc_shaext,.-aesni_cbc_sha256_enc_shaext
diff --git a/deps/openssl/config/archs/linux-x86_64/asm_avx2/crypto/aes/aesni-x86_64.s b/deps/openssl/config/archs/linux-x86_64/asm_avx2/crypto/aes/aesni-x86_64.s
index 2986a647c1..c1e791eff5 100644
--- a/deps/openssl/config/archs/linux-x86_64/asm_avx2/crypto/aes/aesni-x86_64.s
+++ b/deps/openssl/config/archs/linux-x86_64/asm_avx2/crypto/aes/aesni-x86_64.s
@@ -861,6 +861,7 @@ aesni_ecb_encrypt:
 .type	aesni_ccm64_encrypt_blocks,@function
 .align	16
 aesni_ccm64_encrypt_blocks:
+.cfi_startproc
 	movl	240(%rcx),%eax
 	movdqu	(%r8),%xmm6
 	movdqa	.Lincrement64(%rip),%xmm9
@@ -919,11 +920,13 @@ aesni_ccm64_encrypt_blocks:
 	pxor	%xmm8,%xmm8
 	pxor	%xmm6,%xmm6
 	.byte	0xf3,0xc3
+.cfi_endproc
 .size	aesni_ccm64_encrypt_blocks,.-aesni_ccm64_encrypt_blocks
 .globl	aesni_ccm64_decrypt_blocks
 .type	aesni_ccm64_decrypt_blocks,@function
 .align	16
 aesni_ccm64_decrypt_blocks:
+.cfi_startproc
 	movl	240(%rcx),%eax
 	movups	(%r8),%xmm6
 	movdqu	(%r9),%xmm3
@@ -1016,6 +1019,7 @@ aesni_ccm64_decrypt_blocks:
 	pxor	%xmm8,%xmm8
 	pxor	%xmm6,%xmm6
 	.byte	0xf3,0xc3
+.cfi_endproc
 .size	aesni_ccm64_decrypt_blocks,.-aesni_ccm64_decrypt_blocks
 .globl	aesni_ctr32_encrypt_blocks
 .type	aesni_ctr32_encrypt_blocks,@function
@@ -2790,6 +2794,7 @@ aesni_ocb_encrypt:
 .type	__ocb_encrypt6,@function
 .align	32
 __ocb_encrypt6:
+.cfi_startproc
 	pxor	%xmm9,%xmm15
 	movdqu	(%rbx,%r12,1),%xmm11
 	movdqa	%xmm10,%xmm12
@@ -2887,11 +2892,13 @@ __ocb_encrypt6:
 .byte	102,65,15,56,221,246
 .byte	102,65,15,56,221,255
 	.byte	0xf3,0xc3
+.cfi_endproc
 .size	__ocb_encrypt6,.-__ocb_encrypt6
 
 .type	__ocb_encrypt4,@function
 .align	32
 __ocb_encrypt4:
+.cfi_startproc
 	pxor	%xmm9,%xmm15
 	movdqu	(%rbx,%r12,1),%xmm11
 	movdqa	%xmm10,%xmm12
@@ -2956,11 +2963,13 @@ __ocb_encrypt4:
 .byte	102,65,15,56,221,228
 .byte	102,65,15,56,221,237
 	.byte	0xf3,0xc3
+.cfi_endproc
 .size	__ocb_encrypt4,.-__ocb_encrypt4
 
 .type	__ocb_encrypt1,@function
 .align	32
 __ocb_encrypt1:
+.cfi_startproc
 	pxor	%xmm15,%xmm7
 	pxor	%xmm9,%xmm7
 	pxor	%xmm2,%xmm8
@@ -2991,6 +3000,7 @@ __ocb_encrypt1:
 
 .byte	102,15,56,221,215
 	.byte	0xf3,0xc3
+.cfi_endproc
 .size	__ocb_encrypt1,.-__ocb_encrypt1
 
 .globl	aesni_ocb_decrypt
@@ -3233,6 +3243,7 @@ aesni_ocb_decrypt:
 .type	__ocb_decrypt6,@function
 .align	32
 __ocb_decrypt6:
+.cfi_startproc
 	pxor	%xmm9,%xmm15
 	movdqu	(%rbx,%r12,1),%xmm11
 	movdqa	%xmm10,%xmm12
@@ -3324,11 +3335,13 @@ __ocb_decrypt6:
 .byte	102,65,15,56,223,246
 .byte	102,65,15,56,223,255
 	.byte	0xf3,0xc3
+.cfi_endproc
 .size	__ocb_decrypt6,.-__ocb_decrypt6
 
 .type	__ocb_decrypt4,@function
 .align	32
 __ocb_decrypt4:
+.cfi_startproc
 	pxor	%xmm9,%xmm15
 	movdqu	(%rbx,%r12,1),%xmm11
 	movdqa	%xmm10,%xmm12
@@ -3389,11 +3402,13 @@ __ocb_decrypt4:
 .byte	102,65,15,56,223,228
 .byte	102,65,15,56,223,237
 	.byte	0xf3,0xc3
+.cfi_endproc
 .size	__ocb_decrypt4,.-__ocb_decrypt4
 
 .type	__ocb_decrypt1,@function
 .align	32
 __ocb_decrypt1:
+.cfi_startproc
 	pxor	%xmm15,%xmm7
 	pxor	%xmm9,%xmm7
 	pxor	%xmm7,%xmm2
@@ -3423,6 +3438,7 @@ __ocb_decrypt1:
 
 .byte	102,15,56,223,215
 	.byte	0xf3,0xc3
+.cfi_endproc
 .size	__ocb_decrypt1,.-__ocb_decrypt1
 .globl	aesni_cbc_encrypt
 .type	aesni_cbc_encrypt,@function
@@ -4361,7 +4377,6 @@ __aesni_set_encrypt_key:
 	addq	$8,%rsp
 .cfi_adjust_cfa_offset	-8
 	.byte	0xf3,0xc3
-.cfi_endproc	
 .LSEH_end_set_encrypt_key:
 
 .align	16
@@ -4432,6 +4447,7 @@ __aesni_set_encrypt_key:
 	shufps	$170,%xmm1,%xmm1
 	xorps	%xmm1,%xmm2
 	.byte	0xf3,0xc3
+.cfi_endproc
 .size	aesni_set_encrypt_key,.-aesni_set_encrypt_key
 .size	__aesni_set_encrypt_key,.-__aesni_set_encrypt_key
 .align	64
diff --git a/deps/openssl/config/archs/linux-x86_64/asm_avx2/crypto/aes/bsaes-x86_64.s b/deps/openssl/config/archs/linux-x86_64/asm_avx2/crypto/aes/bsaes-x86_64.s
deleted file mode 100644
index e1f3abadbc..0000000000
--- a/deps/openssl/config/archs/linux-x86_64/asm_avx2/crypto/aes/bsaes-x86_64.s
+++ /dev/null
@@ -1,2595 +0,0 @@
-.text	
-
-
-
-
-.type	_bsaes_encrypt8,@function
-.align	64
-_bsaes_encrypt8:
-.cfi_startproc	
-	leaq	.LBS0(%rip),%r11
-
-	movdqa	(%rax),%xmm8
-	leaq	16(%rax),%rax
-	movdqa	80(%r11),%xmm7
-	pxor	%xmm8,%xmm15
-	pxor	%xmm8,%xmm0
-	pxor	%xmm8,%xmm1
-	pxor	%xmm8,%xmm2
-.byte	102,68,15,56,0,255
-.byte	102,15,56,0,199
-	pxor	%xmm8,%xmm3
-	pxor	%xmm8,%xmm4
-.byte	102,15,56,0,207
-.byte	102,15,56,0,215
-	pxor	%xmm8,%xmm5
-	pxor	%xmm8,%xmm6
-.byte	102,15,56,0,223
-.byte	102,15,56,0,231
-.byte	102,15,56,0,239
-.byte	102,15,56,0,247
-_bsaes_encrypt8_bitslice:
-	movdqa	0(%r11),%xmm7
-	movdqa	16(%r11),%xmm8
-	movdqa	%xmm5,%xmm9
-	psrlq	$1,%xmm5
-	movdqa	%xmm3,%xmm10
-	psrlq	$1,%xmm3
-	pxor	%xmm6,%xmm5
-	pxor	%xmm4,%xmm3
-	pand	%xmm7,%xmm5
-	pand	%xmm7,%xmm3
-	pxor	%xmm5,%xmm6
-	psllq	$1,%xmm5
-	pxor	%xmm3,%xmm4
-	psllq	$1,%xmm3
-	pxor	%xmm9,%xmm5
-	pxor	%xmm10,%xmm3
-	movdqa	%xmm1,%xmm9
-	psrlq	$1,%xmm1
-	movdqa	%xmm15,%xmm10
-	psrlq	$1,%xmm15
-	pxor	%xmm2,%xmm1
-	pxor	%xmm0,%xmm15
-	pand	%xmm7,%xmm1
-	pand	%xmm7,%xmm15
-	pxor	%xmm1,%xmm2
-	psllq	$1,%xmm1
-	pxor	%xmm15,%xmm0
-	psllq	$1,%xmm15
-	pxor	%xmm9,%xmm1
-	pxor	%xmm10,%xmm15
-	movdqa	32(%r11),%xmm7
-	movdqa	%xmm4,%xmm9
-	psrlq	$2,%xmm4
-	movdqa	%xmm3,%xmm10
-	psrlq	$2,%xmm3
-	pxor	%xmm6,%xmm4
-	pxor	%xmm5,%xmm3
-	pand	%xmm8,%xmm4
-	pand	%xmm8,%xmm3
-	pxor	%xmm4,%xmm6
-	psllq	$2,%xmm4
-	pxor	%xmm3,%xmm5
-	psllq	$2,%xmm3
-	pxor	%xmm9,%xmm4
-	pxor	%xmm10,%xmm3
-	movdqa	%xmm0,%xmm9
-	psrlq	$2,%xmm0
-	movdqa	%xmm15,%xmm10
-	psrlq	$2,%xmm15
-	pxor	%xmm2,%xmm0
-	pxor	%xmm1,%xmm15
-	pand	%xmm8,%xmm0
-	pand	%xmm8,%xmm15
-	pxor	%xmm0,%xmm2
-	psllq	$2,%xmm0
-	pxor	%xmm15,%xmm1
-	psllq	$2,%xmm15
-	pxor	%xmm9,%xmm0
-	pxor	%xmm10,%xmm15
-	movdqa	%xmm2,%xmm9
-	psrlq	$4,%xmm2
-	movdqa	%xmm1,%xmm10
-	psrlq	$4,%xmm1
-	pxor	%xmm6,%xmm2
-	pxor	%xmm5,%xmm1
-	pand	%xmm7,%xmm2
-	pand	%xmm7,%xmm1
-	pxor	%xmm2,%xmm6
-	psllq	$4,%xmm2
-	pxor	%xmm1,%xmm5
-	psllq	$4,%xmm1
-	pxor	%xmm9,%xmm2
-	pxor	%xmm10,%xmm1
-	movdqa	%xmm0,%xmm9
-	psrlq	$4,%xmm0
-	movdqa	%xmm15,%xmm10
-	psrlq	$4,%xmm15
-	pxor	%xmm4,%xmm0
-	pxor	%xmm3,%xmm15
-	pand	%xmm7,%xmm0
-	pand	%xmm7,%xmm15
-	pxor	%xmm0,%xmm4
-	psllq	$4,%xmm0
-	pxor	%xmm15,%xmm3
-	psllq	$4,%xmm15
-	pxor	%xmm9,%xmm0
-	pxor	%xmm10,%xmm15
-	decl	%r10d
-	jmp	.Lenc_sbox
-.align	16
-.Lenc_loop:
-	pxor	0(%rax),%xmm15
-	pxor	16(%rax),%xmm0
-	pxor	32(%rax),%xmm1
-	pxor	48(%rax),%xmm2
-.byte	102,68,15,56,0,255
-.byte	102,15,56,0,199
-	pxor	64(%rax),%xmm3
-	pxor	80(%rax),%xmm4
-.byte	102,15,56,0,207
-.byte	102,15,56,0,215
-	pxor	96(%rax),%xmm5
-	pxor	112(%rax),%xmm6
-.byte	102,15,56,0,223
-.byte	102,15,56,0,231
-.byte	102,15,56,0,239
-.byte	102,15,56,0,247
-	leaq	128(%rax),%rax
-.Lenc_sbox:
-	pxor	%xmm5,%xmm4
-	pxor	%xmm0,%xmm1
-	pxor	%xmm15,%xmm2
-	pxor	%xmm1,%xmm5
-	pxor	%xmm15,%xmm4
-
-	pxor	%xmm2,%xmm5
-	pxor	%xmm6,%xmm2
-	pxor	%xmm4,%xmm6
-	pxor	%xmm3,%xmm2
-	pxor	%xmm4,%xmm3
-	pxor	%xmm0,%xmm2
-
-	pxor	%xmm6,%xmm1
-	pxor	%xmm4,%xmm0
-	movdqa	%xmm6,%xmm10
-	movdqa	%xmm0,%xmm9
-	movdqa	%xmm4,%xmm8
-	movdqa	%xmm1,%xmm12
-	movdqa	%xmm5,%xmm11
-
-	pxor	%xmm3,%xmm10
-	pxor	%xmm1,%xmm9
-	pxor	%xmm2,%xmm8
-	movdqa	%xmm10,%xmm13
-	pxor	%xmm3,%xmm12
-	movdqa	%xmm9,%xmm7
-	pxor	%xmm15,%xmm11
-	movdqa	%xmm10,%xmm14
-
-	por	%xmm8,%xmm9
-	por	%xmm11,%xmm10
-	pxor	%xmm7,%xmm14
-	pand	%xmm11,%xmm13
-	pxor	%xmm8,%xmm11
-	pand	%xmm8,%xmm7
-	pand	%xmm11,%xmm14
-	movdqa	%xmm2,%xmm11
-	pxor	%xmm15,%xmm11
-	pand	%xmm11,%xmm12
-	pxor	%xmm12,%xmm10
-	pxor	%xmm12,%xmm9
-	movdqa	%xmm6,%xmm12
-	movdqa	%xmm4,%xmm11
-	pxor	%xmm0,%xmm12
-	pxor	%xmm5,%xmm11
-	movdqa	%xmm12,%xmm8
-	pand	%xmm11,%xmm12
-	por	%xmm11,%xmm8
-	pxor	%xmm12,%xmm7
-	pxor	%xmm14,%xmm10
-	pxor	%xmm13,%xmm9
-	pxor	%xmm14,%xmm8
-	movdqa	%xmm1,%xmm11
-	pxor	%xmm13,%xmm7
-	movdqa	%xmm3,%xmm12
-	pxor	%xmm13,%xmm8
-	movdqa	%xmm0,%xmm13
-	pand	%xmm2,%xmm11
-	movdqa	%xmm6,%xmm14
-	pand	%xmm15,%xmm12
-	pand	%xmm4,%xmm13
-	por	%xmm5,%xmm14
-	pxor	%xmm11,%xmm10
-	pxor	%xmm12,%xmm9
-	pxor	%xmm13,%xmm8
-	pxor	%xmm14,%xmm7
-
-
-
-
-
-	movdqa	%xmm10,%xmm11
-	pand	%xmm8,%xmm10
-	pxor	%xmm9,%xmm11
-
-	movdqa	%xmm7,%xmm13
-	movdqa	%xmm11,%xmm14
-	pxor	%xmm10,%xmm13
-	pand	%xmm13,%xmm14
-
-	movdqa	%xmm8,%xmm12
-	pxor	%xmm9,%xmm14
-	pxor	%xmm7,%xmm12
-
-	pxor	%xmm9,%xmm10
-
-	pand	%xmm10,%xmm12
-
-	movdqa	%xmm13,%xmm9
-	pxor	%xmm7,%xmm12
-
-	pxor	%xmm12,%xmm9
-	pxor	%xmm12,%xmm8
-
-	pand	%xmm7,%xmm9
-
-	pxor	%xmm9,%xmm13
-	pxor	%xmm9,%xmm8
-
-	pand	%xmm14,%xmm13
-
-	pxor	%xmm11,%xmm13
-	movdqa	%xmm5,%xmm11
-	movdqa	%xmm4,%xmm7
-	movdqa	%xmm14,%xmm9
-	pxor	%xmm13,%xmm9
-	pand	%xmm5,%xmm9
-	pxor	%xmm4,%xmm5
-	pand	%xmm14,%xmm4
-	pand	%xmm13,%xmm5
-	pxor	%xmm4,%xmm5
-	pxor	%xmm9,%xmm4
-	pxor	%xmm15,%xmm11
-	pxor	%xmm2,%xmm7
-	pxor	%xmm12,%xmm14
-	pxor	%xmm8,%xmm13
-	movdqa	%xmm14,%xmm10
-	movdqa	%xmm12,%xmm9
-	pxor	%xmm13,%xmm10
-	pxor	%xmm8,%xmm9
-	pand	%xmm11,%xmm10
-	pand	%xmm15,%xmm9
-	pxor	%xmm7,%xmm11
-	pxor	%xmm2,%xmm15
-	pand	%xmm14,%xmm7
-	pand	%xmm12,%xmm2
-	pand	%xmm13,%xmm11
-	pand	%xmm8,%xmm15
-	pxor	%xmm11,%xmm7
-	pxor	%xmm2,%xmm15
-	pxor	%xmm10,%xmm11
-	pxor	%xmm9,%xmm2
-	pxor	%xmm11,%xmm5
-	pxor	%xmm11,%xmm15
-	pxor	%xmm7,%xmm4
-	pxor	%xmm7,%xmm2
-
-	movdqa	%xmm6,%xmm11
-	movdqa	%xmm0,%xmm7
-	pxor	%xmm3,%xmm11
-	pxor	%xmm1,%xmm7
-	movdqa	%xmm14,%xmm10
-	movdqa	%xmm12,%xmm9
-	pxor	%xmm13,%xmm10
-	pxor	%xmm8,%xmm9
-	pand	%xmm11,%xmm10
-	pand	%xmm3,%xmm9
-	pxor	%xmm7,%xmm11
-	pxor	%xmm1,%xmm3
-	pand	%xmm14,%xmm7
-	pand	%xmm12,%xmm1
-	pand	%xmm13,%xmm11
-	pand	%xmm8,%xmm3
-	pxor	%xmm11,%xmm7
-	pxor	%xmm1,%xmm3
-	pxor	%xmm10,%xmm11
-	pxor	%xmm9,%xmm1
-	pxor	%xmm12,%xmm14
-	pxor	%xmm8,%xmm13
-	movdqa	%xmm14,%xmm10
-	pxor	%xmm13,%xmm10
-	pand	%xmm6,%xmm10
-	pxor	%xmm0,%xmm6
-	pand	%xmm14,%xmm0
-	pand	%xmm13,%xmm6
-	pxor	%xmm0,%xmm6
-	pxor	%xmm10,%xmm0
-	pxor	%xmm11,%xmm6
-	pxor	%xmm11,%xmm3
-	pxor	%xmm7,%xmm0
-	pxor	%xmm7,%xmm1
-	pxor	%xmm15,%xmm6
-	pxor	%xmm5,%xmm0
-	pxor	%xmm6,%xmm3
-	pxor	%xmm15,%xmm5
-	pxor	%xmm0,%xmm15
-
-	pxor	%xmm4,%xmm0
-	pxor	%xmm1,%xmm4
-	pxor	%xmm2,%xmm1
-	pxor	%xmm4,%xmm2
-	pxor	%xmm4,%xmm3
-
-	pxor	%xmm2,%xmm5
-	decl	%r10d
-	jl	.Lenc_done
-	pshufd	$0x93,%xmm15,%xmm7
-	pshufd	$0x93,%xmm0,%xmm8
-	pxor	%xmm7,%xmm15
-	pshufd	$0x93,%xmm3,%xmm9
-	pxor	%xmm8,%xmm0
-	pshufd	$0x93,%xmm5,%xmm10
-	pxor	%xmm9,%xmm3
-	pshufd	$0x93,%xmm2,%xmm11
-	pxor	%xmm10,%xmm5
-	pshufd	$0x93,%xmm6,%xmm12
-	pxor	%xmm11,%xmm2
-	pshufd	$0x93,%xmm1,%xmm13
-	pxor	%xmm12,%xmm6
-	pshufd	$0x93,%xmm4,%xmm14
-	pxor	%xmm13,%xmm1
-	pxor	%xmm14,%xmm4
-
-	pxor	%xmm15,%xmm8
-	pxor	%xmm4,%xmm7
-	pxor	%xmm4,%xmm8
-	pshufd	$0x4E,%xmm15,%xmm15
-	pxor	%xmm0,%xmm9
-	pshufd	$0x4E,%xmm0,%xmm0
-	pxor	%xmm2,%xmm12
-	pxor	%xmm7,%xmm15
-	pxor	%xmm6,%xmm13
-	pxor	%xmm8,%xmm0
-	pxor	%xmm5,%xmm11
-	pshufd	$0x4E,%xmm2,%xmm7
-	pxor	%xmm1,%xmm14
-	pshufd	$0x4E,%xmm6,%xmm8
-	pxor	%xmm3,%xmm10
-	pshufd	$0x4E,%xmm5,%xmm2
-	pxor	%xmm4,%xmm10
-	pshufd	$0x4E,%xmm4,%xmm6
-	pxor	%xmm4,%xmm11
-	pshufd	$0x4E,%xmm1,%xmm5
-	pxor	%xmm11,%xmm7
-	pshufd	$0x4E,%xmm3,%xmm1
-	pxor	%xmm12,%xmm8
-	pxor	%xmm10,%xmm2
-	pxor	%xmm14,%xmm6
-	pxor	%xmm13,%xmm5
-	movdqa	%xmm7,%xmm3
-	pxor	%xmm9,%xmm1
-	movdqa	%xmm8,%xmm4
-	movdqa	48(%r11),%xmm7
-	jnz	.Lenc_loop
-	movdqa	64(%r11),%xmm7
-	jmp	.Lenc_loop
-.align	16
-.Lenc_done:
-	movdqa	0(%r11),%xmm7
-	movdqa	16(%r11),%xmm8
-	movdqa	%xmm1,%xmm9
-	psrlq	$1,%xmm1
-	movdqa	%xmm2,%xmm10
-	psrlq	$1,%xmm2
-	pxor	%xmm4,%xmm1
-	pxor	%xmm6,%xmm2
-	pand	%xmm7,%xmm1
-	pand	%xmm7,%xmm2
-	pxor	%xmm1,%xmm4
-	psllq	$1,%xmm1
-	pxor	%xmm2,%xmm6
-	psllq	$1,%xmm2
-	pxor	%xmm9,%xmm1
-	pxor	%xmm10,%xmm2
-	movdqa	%xmm3,%xmm9
-	psrlq	$1,%xmm3
-	movdqa	%xmm15,%xmm10
-	psrlq	$1,%xmm15
-	pxor	%xmm5,%xmm3
-	pxor	%xmm0,%xmm15
-	pand	%xmm7,%xmm3
-	pand	%xmm7,%xmm15
-	pxor	%xmm3,%xmm5
-	psllq	$1,%xmm3
-	pxor	%xmm15,%xmm0
-	psllq	$1,%xmm15
-	pxor	%xmm9,%xmm3
-	pxor	%xmm10,%xmm15
-	movdqa	32(%r11),%xmm7
-	movdqa	%xmm6,%xmm9
-	psrlq	$2,%xmm6
-	movdqa	%xmm2,%xmm10
-	psrlq	$2,%xmm2
-	pxor	%xmm4,%xmm6
-	pxor	%xmm1,%xmm2
-	pand	%xmm8,%xmm6
-	pand	%xmm8,%xmm2
-	pxor	%xmm6,%xmm4
-	psllq	$2,%xmm6
-	pxor	%xmm2,%xmm1
-	psllq	$2,%xmm2
-	pxor	%xmm9,%xmm6
-	pxor	%xmm10,%xmm2
-	movdqa	%xmm0,%xmm9
-	psrlq	$2,%xmm0
-	movdqa	%xmm15,%xmm10
-	psrlq	$2,%xmm15
-	pxor	%xmm5,%xmm0
-	pxor	%xmm3,%xmm15
-	pand	%xmm8,%xmm0
-	pand	%xmm8,%xmm15
-	pxor	%xmm0,%xmm5
-	psllq	$2,%xmm0
-	pxor	%xmm15,%xmm3
-	psllq	$2,%xmm15
-	pxor	%xmm9,%xmm0
-	pxor	%xmm10,%xmm15
-	movdqa	%xmm5,%xmm9
-	psrlq	$4,%xmm5
-	movdqa	%xmm3,%xmm10
-	psrlq	$4,%xmm3
-	pxor	%xmm4,%xmm5
-	pxor	%xmm1,%xmm3
-	pand	%xmm7,%xmm5
-	pand	%xmm7,%xmm3
-	pxor	%xmm5,%xmm4
-	psllq	$4,%xmm5
-	pxor	%xmm3,%xmm1
-	psllq	$4,%xmm3
-	pxor	%xmm9,%xmm5
-	pxor	%xmm10,%xmm3
-	movdqa	%xmm0,%xmm9
-	psrlq	$4,%xmm0
-	movdqa	%xmm15,%xmm10
-	psrlq	$4,%xmm15
-	pxor	%xmm6,%xmm0
-	pxor	%xmm2,%xmm15
-	pand	%xmm7,%xmm0
-	pand	%xmm7,%xmm15
-	pxor	%xmm0,%xmm6
-	psllq	$4,%xmm0
-	pxor	%xmm15,%xmm2
-	psllq	$4,%xmm15
-	pxor	%xmm9,%xmm0
-	pxor	%xmm10,%xmm15
-	movdqa	(%rax),%xmm7
-	pxor	%xmm7,%xmm3
-	pxor	%xmm7,%xmm5
-	pxor	%xmm7,%xmm2
-	pxor	%xmm7,%xmm6
-	pxor	%xmm7,%xmm1
-	pxor	%xmm7,%xmm4
-	pxor	%xmm7,%xmm15
-	pxor	%xmm7,%xmm0
-	.byte	0xf3,0xc3
-.cfi_endproc	
-.size	_bsaes_encrypt8,.-_bsaes_encrypt8
-
-.type	_bsaes_decrypt8,@function
-.align	64
-_bsaes_decrypt8:
-.cfi_startproc	
-	leaq	.LBS0(%rip),%r11
-
-	movdqa	(%rax),%xmm8
-	leaq	16(%rax),%rax
-	movdqa	-48(%r11),%xmm7
-	pxor	%xmm8,%xmm15
-	pxor	%xmm8,%xmm0
-	pxor	%xmm8,%xmm1
-	pxor	%xmm8,%xmm2
-.byte	102,68,15,56,0,255
-.byte	102,15,56,0,199
-	pxor	%xmm8,%xmm3
-	pxor	%xmm8,%xmm4
-.byte	102,15,56,0,207
-.byte	102,15,56,0,215
-	pxor	%xmm8,%xmm5
-	pxor	%xmm8,%xmm6
-.byte	102,15,56,0,223
-.byte	102,15,56,0,231
-.byte	102,15,56,0,239
-.byte	102,15,56,0,247
-	movdqa	0(%r11),%xmm7
-	movdqa	16(%r11),%xmm8
-	movdqa	%xmm5,%xmm9
-	psrlq	$1,%xmm5
-	movdqa	%xmm3,%xmm10
-	psrlq	$1,%xmm3
-	pxor	%xmm6,%xmm5
-	pxor	%xmm4,%xmm3
-	pand	%xmm7,%xmm5
-	pand	%xmm7,%xmm3
-	pxor	%xmm5,%xmm6
-	psllq	$1,%xmm5
-	pxor	%xmm3,%xmm4
-	psllq	$1,%xmm3
-	pxor	%xmm9,%xmm5
-	pxor	%xmm10,%xmm3
-	movdqa	%xmm1,%xmm9
-	psrlq	$1,%xmm1
-	movdqa	%xmm15,%xmm10
-	psrlq	$1,%xmm15
-	pxor	%xmm2,%xmm1
-	pxor	%xmm0,%xmm15
-	pand	%xmm7,%xmm1
-	pand	%xmm7,%xmm15
-	pxor	%xmm1,%xmm2
-	psllq	$1,%xmm1
-	pxor	%xmm15,%xmm0
-	psllq	$1,%xmm15
-	pxor	%xmm9,%xmm1
-	pxor	%xmm10,%xmm15
-	movdqa	32(%r11),%xmm7
-	movdqa	%xmm4,%xmm9
-	psrlq	$2,%xmm4
-	movdqa	%xmm3,%xmm10
-	psrlq	$2,%xmm3
-	pxor	%xmm6,%xmm4
-	pxor	%xmm5,%xmm3
-	pand	%xmm8,%xmm4
-	pand	%xmm8,%xmm3
-	pxor	%xmm4,%xmm6
-	psllq	$2,%xmm4
-	pxor	%xmm3,%xmm5
-	psllq	$2,%xmm3
-	pxor	%xmm9,%xmm4
-	pxor	%xmm10,%xmm3
-	movdqa	%xmm0,%xmm9
-	psrlq	$2,%xmm0
-	movdqa	%xmm15,%xmm10
-	psrlq	$2,%xmm15
-	pxor	%xmm2,%xmm0
-	pxor	%xmm1,%xmm15
-	pand	%xmm8,%xmm0
-	pand	%xmm8,%xmm15
-	pxor	%xmm0,%xmm2
-	psllq	$2,%xmm0
-	pxor	%xmm15,%xmm1
-	psllq	$2,%xmm15
-	pxor	%xmm9,%xmm0
-	pxor	%xmm10,%xmm15
-	movdqa	%xmm2,%xmm9
-	psrlq	$4,%xmm2
-	movdqa	%xmm1,%xmm10
-	psrlq	$4,%xmm1
-	pxor	%xmm6,%xmm2
-	pxor	%xmm5,%xmm1
-	pand	%xmm7,%xmm2
-	pand	%xmm7,%xmm1
-	pxor	%xmm2,%xmm6
-	psllq	$4,%xmm2
-	pxor	%xmm1,%xmm5
-	psllq	$4,%xmm1
-	pxor	%xmm9,%xmm2
-	pxor	%xmm10,%xmm1
-	movdqa	%xmm0,%xmm9
-	psrlq	$4,%xmm0
-	movdqa	%xmm15,%xmm10
-	psrlq	$4,%xmm15
-	pxor	%xmm4,%xmm0
-	pxor	%xmm3,%xmm15
-	pand	%xmm7,%xmm0
-	pand	%xmm7,%xmm15
-	pxor	%xmm0,%xmm4
-	psllq	$4,%xmm0
-	pxor	%xmm15,%xmm3
-	psllq	$4,%xmm15
-	pxor	%xmm9,%xmm0
-	pxor	%xmm10,%xmm15
-	decl	%r10d
-	jmp	.Ldec_sbox
-.align	16
-.Ldec_loop:
-	pxor	0(%rax),%xmm15
-	pxor	16(%rax),%xmm0
-	pxor	32(%rax),%xmm1
-	pxor	48(%rax),%xmm2
-.byte	102,68,15,56,0,255
-.byte	102,15,56,0,199
-	pxor	64(%rax),%xmm3
-	pxor	80(%rax),%xmm4
-.byte	102,15,56,0,207
-.byte	102,15,56,0,215
-	pxor	96(%rax),%xmm5
-	pxor	112(%rax),%xmm6
-.byte	102,15,56,0,223
-.byte	102,15,56,0,231
-.byte	102,15,56,0,239
-.byte	102,15,56,0,247
-	leaq	128(%rax),%rax
-.Ldec_sbox:
-	pxor	%xmm3,%xmm2
-
-	pxor	%xmm6,%xmm3
-	pxor	%xmm6,%xmm1
-	pxor	%xmm3,%xmm5
-	pxor	%xmm5,%xmm6
-	pxor	%xmm6,%xmm0
-
-	pxor	%xmm0,%xmm15
-	pxor	%xmm4,%xmm1
-	pxor	%xmm15,%xmm2
-	pxor	%xmm15,%xmm4
-	pxor	%xmm2,%xmm0
-	movdqa	%xmm2,%xmm10
-	movdqa	%xmm6,%xmm9
-	movdqa	%xmm0,%xmm8
-	movdqa	%xmm3,%xmm12
-	movdqa	%xmm4,%xmm11
-
-	pxor	%xmm15,%xmm10
-	pxor	%xmm3,%xmm9
-	pxor	%xmm5,%xmm8
-	movdqa	%xmm10,%xmm13
-	pxor	%xmm15,%xmm12
-	movdqa	%xmm9,%xmm7
-	pxor	%xmm1,%xmm11
-	movdqa	%xmm10,%xmm14
-
-	por	%xmm8,%xmm9
-	por	%xmm11,%xmm10
-	pxor	%xmm7,%xmm14
-	pand	%xmm11,%xmm13
-	pxor	%xmm8,%xmm11
-	pand	%xmm8,%xmm7
-	pand	%xmm11,%xmm14
-	movdqa	%xmm5,%xmm11
-	pxor	%xmm1,%xmm11
-	pand	%xmm11,%xmm12
-	pxor	%xmm12,%xmm10
-	pxor	%xmm12,%xmm9
-	movdqa	%xmm2,%xmm12
-	movdqa	%xmm0,%xmm11
-	pxor	%xmm6,%xmm12
-	pxor	%xmm4,%xmm11
-	movdqa	%xmm12,%xmm8
-	pand	%xmm11,%xmm12
-	por	%xmm11,%xmm8
-	pxor	%xmm12,%xmm7
-	pxor	%xmm14,%xmm10
-	pxor	%xmm13,%xmm9
-	pxor	%xmm14,%xmm8
-	movdqa	%xmm3,%xmm11
-	pxor	%xmm13,%xmm7
-	movdqa	%xmm15,%xmm12
-	pxor	%xmm13,%xmm8
-	movdqa	%xmm6,%xmm13
-	pand	%xmm5,%xmm11
-	movdqa	%xmm2,%xmm14
-	pand	%xmm1,%xmm12
-	pand	%xmm0,%xmm13
-	por	%xmm4,%xmm14
-	pxor	%xmm11,%xmm10
-	pxor	%xmm12,%xmm9
-	pxor	%xmm13,%xmm8
-	pxor	%xmm14,%xmm7
-
-
-
-
-
-	movdqa	%xmm10,%xmm11
-	pand	%xmm8,%xmm10
-	pxor	%xmm9,%xmm11
-
-	movdqa	%xmm7,%xmm13
-	movdqa	%xmm11,%xmm14
-	pxor	%xmm10,%xmm13
-	pand	%xmm13,%xmm14
-
-	movdqa	%xmm8,%xmm12
-	pxor	%xmm9,%xmm14
-	pxor	%xmm7,%xmm12
-
-	pxor	%xmm9,%xmm10
-
-	pand	%xmm10,%xmm12
-
-	movdqa	%xmm13,%xmm9
-	pxor	%xmm7,%xmm12
-
-	pxor	%xmm12,%xmm9
-	pxor	%xmm12,%xmm8
-
-	pand	%xmm7,%xmm9
-
-	pxor	%xmm9,%xmm13
-	pxor	%xmm9,%xmm8
-
-	pand	%xmm14,%xmm13
-
-	pxor	%xmm11,%xmm13
-	movdqa	%xmm4,%xmm11
-	movdqa	%xmm0,%xmm7
-	movdqa	%xmm14,%xmm9
-	pxor	%xmm13,%xmm9
-	pand	%xmm4,%xmm9
-	pxor	%xmm0,%xmm4
-	pand	%xmm14,%xmm0
-	pand	%xmm13,%xmm4
-	pxor	%xmm0,%xmm4
-	pxor	%xmm9,%xmm0
-	pxor	%xmm1,%xmm11
-	pxor	%xmm5,%xmm7
-	pxor	%xmm12,%xmm14
-	pxor	%xmm8,%xmm13
-	movdqa	%xmm14,%xmm10
-	movdqa	%xmm12,%xmm9
-	pxor	%xmm13,%xmm10
-	pxor	%xmm8,%xmm9
-	pand	%xmm11,%xmm10
-	pand	%xmm1,%xmm9
-	pxor	%xmm7,%xmm11
-	pxor	%xmm5,%xmm1
-	pand	%xmm14,%xmm7
-	pand	%xmm12,%xmm5
-	pand	%xmm13,%xmm11
-	pand	%xmm8,%xmm1
-	pxor	%xmm11,%xmm7
-	pxor	%xmm5,%xmm1
-	pxor	%xmm10,%xmm11
-	pxor	%xmm9,%xmm5
-	pxor	%xmm11,%xmm4
-	pxor	%xmm11,%xmm1
-	pxor	%xmm7,%xmm0
-	pxor	%xmm7,%xmm5
-
-	movdqa	%xmm2,%xmm11
-	movdqa	%xmm6,%xmm7
-	pxor	%xmm15,%xmm11
-	pxor	%xmm3,%xmm7
-	movdqa	%xmm14,%xmm10
-	movdqa	%xmm12,%xmm9
-	pxor	%xmm13,%xmm10
-	pxor	%xmm8,%xmm9
-	pand	%xmm11,%xmm10
-	pand	%xmm15,%xmm9
-	pxor	%xmm7,%xmm11
-	pxor	%xmm3,%xmm15
-	pand	%xmm14,%xmm7
-	pand	%xmm12,%xmm3
-	pand	%xmm13,%xmm11
-	pand	%xmm8,%xmm15
-	pxor	%xmm11,%xmm7
-	pxor	%xmm3,%xmm15
-	pxor	%xmm10,%xmm11
-	pxor	%xmm9,%xmm3
-	pxor	%xmm12,%xmm14
-	pxor	%xmm8,%xmm13
-	movdqa	%xmm14,%xmm10
-	pxor	%xmm13,%xmm10
-	pand	%xmm2,%xmm10
-	pxor	%xmm6,%xmm2
-	pand	%xmm14,%xmm6
-	pand	%xmm13,%xmm2
-	pxor	%xmm6,%xmm2
-	pxor	%xmm10,%xmm6
-	pxor	%xmm11,%xmm2
-	pxor	%xmm11,%xmm15
-	pxor	%xmm7,%xmm6
-	pxor	%xmm7,%xmm3
-	pxor	%xmm6,%xmm0
-	pxor	%xmm4,%xmm5
-
-	pxor	%xmm0,%xmm3
-	pxor	%xmm6,%xmm1
-	pxor	%xmm6,%xmm4
-	pxor	%xmm1,%xmm3
-	pxor	%xmm15,%xmm6
-	pxor	%xmm4,%xmm3
-	pxor	%xmm5,%xmm2
-	pxor	%xmm0,%xmm5
-	pxor	%xmm3,%xmm2
-
-	pxor	%xmm15,%xmm3
-	pxor	%xmm2,%xmm6
-	decl	%r10d
-	jl	.Ldec_done
-
-	pshufd	$0x4E,%xmm15,%xmm7
-	pshufd	$0x4E,%xmm2,%xmm13
-	pxor	%xmm15,%xmm7
-	pshufd	$0x4E,%xmm4,%xmm14
-	pxor	%xmm2,%xmm13
-	pshufd	$0x4E,%xmm0,%xmm8
-	pxor	%xmm4,%xmm14
-	pshufd	$0x4E,%xmm5,%xmm9
-	pxor	%xmm0,%xmm8
-	pshufd	$0x4E,%xmm3,%xmm10
-	pxor	%xmm5,%xmm9
-	pxor	%xmm13,%xmm15
-	pxor	%xmm13,%xmm0
-	pshufd	$0x4E,%xmm1,%xmm11
-	pxor	%xmm3,%xmm10
-	pxor	%xmm7,%xmm5
-	pxor	%xmm8,%xmm3
-	pshufd	$0x4E,%xmm6,%xmm12
-	pxor	%xmm1,%xmm11
-	pxor	%xmm14,%xmm0
-	pxor	%xmm9,%xmm1
-	pxor	%xmm6,%xmm12
-
-	pxor	%xmm14,%xmm5
-	pxor	%xmm13,%xmm3
-	pxor	%xmm13,%xmm1
-	pxor	%xmm10,%xmm6
-	pxor	%xmm11,%xmm2
-	pxor	%xmm14,%xmm1
-	pxor	%xmm14,%xmm6
-	pxor	%xmm12,%xmm4
-	pshufd	$0x93,%xmm15,%xmm7
-	pshufd	$0x93,%xmm0,%xmm8
-	pxor	%xmm7,%xmm15
-	pshufd	$0x93,%xmm5,%xmm9
-	pxor	%xmm8,%xmm0
-	pshufd	$0x93,%xmm3,%xmm10
-	pxor	%xmm9,%xmm5
-	pshufd	$0x93,%xmm1,%xmm11
-	pxor	%xmm10,%xmm3
-	pshufd	$0x93,%xmm6,%xmm12
-	pxor	%xmm11,%xmm1
-	pshufd	$0x93,%xmm2,%xmm13
-	pxor	%xmm12,%xmm6
-	pshufd	$0x93,%xmm4,%xmm14
-	pxor	%xmm13,%xmm2
-	pxor	%xmm14,%xmm4
-
-	pxor	%xmm15,%xmm8
-	pxor	%xmm4,%xmm7
-	pxor	%xmm4,%xmm8
-	pshufd	$0x4E,%xmm15,%xmm15
-	pxor	%xmm0,%xmm9
-	pshufd	$0x4E,%xmm0,%xmm0
-	pxor	%xmm1,%xmm12
-	pxor	%xmm7,%xmm15
-	pxor	%xmm6,%xmm13
-	pxor	%xmm8,%xmm0
-	pxor	%xmm3,%xmm11
-	pshufd	$0x4E,%xmm1,%xmm7
-	pxor	%xmm2,%xmm14
-	pshufd	$0x4E,%xmm6,%xmm8
-	pxor	%xmm5,%xmm10
-	pshufd	$0x4E,%xmm3,%xmm1
-	pxor	%xmm4,%xmm10
-	pshufd	$0x4E,%xmm4,%xmm6
-	pxor	%xmm4,%xmm11
-	pshufd	$0x4E,%xmm2,%xmm3
-	pxor	%xmm11,%xmm7
-	pshufd	$0x4E,%xmm5,%xmm2
-	pxor	%xmm12,%xmm8
-	pxor	%xmm1,%xmm10
-	pxor	%xmm14,%xmm6
-	pxor	%xmm3,%xmm13
-	movdqa	%xmm7,%xmm3
-	pxor	%xmm9,%xmm2
-	movdqa	%xmm13,%xmm5
-	movdqa	%xmm8,%xmm4
-	movdqa	%xmm2,%xmm1
-	movdqa	%xmm10,%xmm2
-	movdqa	-16(%r11),%xmm7
-	jnz	.Ldec_loop
-	movdqa	-32(%r11),%xmm7
-	jmp	.Ldec_loop
-.align	16
-.Ldec_done:
-	movdqa	0(%r11),%xmm7
-	movdqa	16(%r11),%xmm8
-	movdqa	%xmm2,%xmm9
-	psrlq	$1,%xmm2
-	movdqa	%xmm1,%xmm10
-	psrlq	$1,%xmm1
-	pxor	%xmm4,%xmm2
-	pxor	%xmm6,%xmm1
-	pand	%xmm7,%xmm2
-	pand	%xmm7,%xmm1
-	pxor	%xmm2,%xmm4
-	psllq	$1,%xmm2
-	pxor	%xmm1,%xmm6
-	psllq	$1,%xmm1
-	pxor	%xmm9,%xmm2
-	pxor	%xmm10,%xmm1
-	movdqa	%xmm5,%xmm9
-	psrlq	$1,%xmm5
-	movdqa	%xmm15,%xmm10
-	psrlq	$1,%xmm15
-	pxor	%xmm3,%xmm5
-	pxor	%xmm0,%xmm15
-	pand	%xmm7,%xmm5
-	pand	%xmm7,%xmm15
-	pxor	%xmm5,%xmm3
-	psllq	$1,%xmm5
-	pxor	%xmm15,%xmm0
-	psllq	$1,%xmm15
-	pxor	%xmm9,%xmm5
-	pxor	%xmm10,%xmm15
-	movdqa	32(%r11),%xmm7
-	movdqa	%xmm6,%xmm9
-	psrlq	$2,%xmm6
-	movdqa	%xmm1,%xmm10
-	psrlq	$2,%xmm1
-	pxor	%xmm4,%xmm6
-	pxor	%xmm2,%xmm1
-	pand	%xmm8,%xmm6
-	pand	%xmm8,%xmm1
-	pxor	%xmm6,%xmm4
-	psllq	$2,%xmm6
-	pxor	%xmm1,%xmm2
-	psllq	$2,%xmm1
-	pxor	%xmm9,%xmm6
-	pxor	%xmm10,%xmm1
-	movdqa	%xmm0,%xmm9
-	psrlq	$2,%xmm0
-	movdqa	%xmm15,%xmm10
-	psrlq	$2,%xmm15
-	pxor	%xmm3,%xmm0
-	pxor	%xmm5,%xmm15
-	pand	%xmm8,%xmm0
-	pand	%xmm8,%xmm15
-	pxor	%xmm0,%xmm3
-	psllq	$2,%xmm0
-	pxor	%xmm15,%xmm5
-	psllq	$2,%xmm15
-	pxor	%xmm9,%xmm0
-	pxor	%xmm10,%xmm15
-	movdqa	%xmm3,%xmm9
-	psrlq	$4,%xmm3
-	movdqa	%xmm5,%xmm10
-	psrlq	$4,%xmm5
-	pxor	%xmm4,%xmm3
-	pxor	%xmm2,%xmm5
-	pand	%xmm7,%xmm3
-	pand	%xmm7,%xmm5
-	pxor	%xmm3,%xmm4
-	psllq	$4,%xmm3
-	pxor	%xmm5,%xmm2
-	psllq	$4,%xmm5
-	pxor	%xmm9,%xmm3
-	pxor	%xmm10,%xmm5
-	movdqa	%xmm0,%xmm9
-	psrlq	$4,%xmm0
-	movdqa	%xmm15,%xmm10
-	psrlq	$4,%xmm15
-	pxor	%xmm6,%xmm0
-	pxor	%xmm1,%xmm15
-	pand	%xmm7,%xmm0
-	pand	%xmm7,%xmm15
-	pxor	%xmm0,%xmm6
-	psllq	$4,%xmm0
-	pxor	%xmm15,%xmm1
-	psllq	$4,%xmm15
-	pxor	%xmm9,%xmm0
-	pxor	%xmm10,%xmm15
-	movdqa	(%rax),%xmm7
-	pxor	%xmm7,%xmm5
-	pxor	%xmm7,%xmm3
-	pxor	%xmm7,%xmm1
-	pxor	%xmm7,%xmm6
-	pxor	%xmm7,%xmm2
-	pxor	%xmm7,%xmm4
-	pxor	%xmm7,%xmm15
-	pxor	%xmm7,%xmm0
-	.byte	0xf3,0xc3
-.cfi_endproc	
-.size	_bsaes_decrypt8,.-_bsaes_decrypt8
-.type	_bsaes_key_convert,@function
-.align	16
-_bsaes_key_convert:
-.cfi_startproc	
-	leaq	.Lmasks(%rip),%r11
-	movdqu	(%rcx),%xmm7
-	leaq	16(%rcx),%rcx
-	movdqa	0(%r11),%xmm0
-	movdqa	16(%r11),%xmm1
-	movdqa	32(%r11),%xmm2
-	movdqa	48(%r11),%xmm3
-	movdqa	64(%r11),%xmm4
-	pcmpeqd	%xmm5,%xmm5
-
-	movdqu	(%rcx),%xmm6
-	movdqa	%xmm7,(%rax)
-	leaq	16(%rax),%rax
-	decl	%r10d
-	jmp	.Lkey_loop
-.align	16
-.Lkey_loop:
-.byte	102,15,56,0,244
-
-	movdqa	%xmm0,%xmm8
-	movdqa	%xmm1,%xmm9
-
-	pand	%xmm6,%xmm8
-	pand	%xmm6,%xmm9
-	movdqa	%xmm2,%xmm10
-	pcmpeqb	%xmm0,%xmm8
-	psllq	$4,%xmm0
-	movdqa	%xmm3,%xmm11
-	pcmpeqb	%xmm1,%xmm9
-	psllq	$4,%xmm1
-
-	pand	%xmm6,%xmm10
-	pand	%xmm6,%xmm11
-	movdqa	%xmm0,%xmm12
-	pcmpeqb	%xmm2,%xmm10
-	psllq	$4,%xmm2
-	movdqa	%xmm1,%xmm13
-	pcmpeqb	%xmm3,%xmm11
-	psllq	$4,%xmm3
-
-	movdqa	%xmm2,%xmm14
-	movdqa	%xmm3,%xmm15
-	pxor	%xmm5,%xmm8
-	pxor	%xmm5,%xmm9
-
-	pand	%xmm6,%xmm12
-	pand	%xmm6,%xmm13
-	movdqa	%xmm8,0(%rax)
-	pcmpeqb	%xmm0,%xmm12
-	psrlq	$4,%xmm0
-	movdqa	%xmm9,16(%rax)
-	pcmpeqb	%xmm1,%xmm13
-	psrlq	$4,%xmm1
-	leaq	16(%rcx),%rcx
-
-	pand	%xmm6,%xmm14
-	pand	%xmm6,%xmm15
-	movdqa	%xmm10,32(%rax)
-	pcmpeqb	%xmm2,%xmm14
-	psrlq	$4,%xmm2
-	movdqa	%xmm11,48(%rax)
-	pcmpeqb	%xmm3,%xmm15
-	psrlq	$4,%xmm3
-	movdqu	(%rcx),%xmm6
-
-	pxor	%xmm5,%xmm13
-	pxor	%xmm5,%xmm14
-	movdqa	%xmm12,64(%rax)
-	movdqa	%xmm13,80(%rax)
-	movdqa	%xmm14,96(%rax)
-	movdqa	%xmm15,112(%rax)
-	leaq	128(%rax),%rax
-	decl	%r10d
-	jnz	.Lkey_loop
-
-	movdqa	80(%r11),%xmm7
-
-	.byte	0xf3,0xc3
-.cfi_endproc	
-.size	_bsaes_key_convert,.-_bsaes_key_convert
-
-.globl	bsaes_cbc_encrypt
-.type	bsaes_cbc_encrypt,@function
-.align	16
-bsaes_cbc_encrypt:
-.cfi_startproc	
-	cmpl	$0,%r9d
-	jne	asm_AES_cbc_encrypt
-	cmpq	$128,%rdx
-	jb	asm_AES_cbc_encrypt
-
-	movq	%rsp,%rax
-.Lcbc_dec_prologue:
-	pushq	%rbp
-.cfi_adjust_cfa_offset	8
-.cfi_offset	%rbp,-16
-	pushq	%rbx
-.cfi_adjust_cfa_offset	8
-.cfi_offset	%rbx,-24
-	pushq	%r12
-.cfi_adjust_cfa_offset	8
-.cfi_offset	%r12,-32
-	pushq	%r13
-.cfi_adjust_cfa_offset	8
-.cfi_offset	%r13,-40
-	pushq	%r14
-.cfi_adjust_cfa_offset	8
-.cfi_offset	%r14,-48
-	pushq	%r15
-.cfi_adjust_cfa_offset	8
-.cfi_offset	%r15,-56
-	leaq	-72(%rsp),%rsp
-.cfi_adjust_cfa_offset	0x48
-	movq	%rsp,%rbp
-.cfi_def_cfa_register	%rbp
-	movl	240(%rcx),%eax
-	movq	%rdi,%r12
-	movq	%rsi,%r13
-	movq	%rdx,%r14
-	movq	%rcx,%r15
-	movq	%r8,%rbx
-	shrq	$4,%r14
-
-	movl	%eax,%edx
-	shlq	$7,%rax
-	subq	$96,%rax
-	subq	%rax,%rsp
-
-	movq	%rsp,%rax
-	movq	%r15,%rcx
-	movl	%edx,%r10d
-	call	_bsaes_key_convert
-	pxor	(%rsp),%xmm7
-	movdqa	%xmm6,(%rax)
-	movdqa	%xmm7,(%rsp)
-
-	movdqu	(%rbx),%xmm14
-	subq	$8,%r14
-.Lcbc_dec_loop:
-	movdqu	0(%r12),%xmm15
-	movdqu	16(%r12),%xmm0
-	movdqu	32(%r12),%xmm1
-	movdqu	48(%r12),%xmm2
-	movdqu	64(%r12),%xmm3
-	movdqu	80(%r12),%xmm4
-	movq	%rsp,%rax
-	movdqu	96(%r12),%xmm5
-	movl	%edx,%r10d
-	movdqu	112(%r12),%xmm6
-	movdqa	%xmm14,32(%rbp)
-
-	call	_bsaes_decrypt8
-
-	pxor	32(%rbp),%xmm15
-	movdqu	0(%r12),%xmm7
-	movdqu	16(%r12),%xmm8
-	pxor	%xmm7,%xmm0
-	movdqu	32(%r12),%xmm9
-	pxor	%xmm8,%xmm5
-	movdqu	48(%r12),%xmm10
-	pxor	%xmm9,%xmm3
-	movdqu	64(%r12),%xmm11
-	pxor	%xmm10,%xmm1
-	movdqu	80(%r12),%xmm12
-	pxor	%xmm11,%xmm6
-	movdqu	96(%r12),%xmm13
-	pxor	%xmm12,%xmm2
-	movdqu	112(%r12),%xmm14
-	pxor	%xmm13,%xmm4
-	movdqu	%xmm15,0(%r13)
-	leaq	128(%r12),%r12
-	movdqu	%xmm0,16(%r13)
-	movdqu	%xmm5,32(%r13)
-	movdqu	%xmm3,48(%r13)
-	movdqu	%xmm1,64(%r13)
-	movdqu	%xmm6,80(%r13)
-	movdqu	%xmm2,96(%r13)
-	movdqu	%xmm4,112(%r13)
-	leaq	128(%r13),%r13
-	subq	$8,%r14
-	jnc	.Lcbc_dec_loop
-
-	addq	$8,%r14
-	jz	.Lcbc_dec_done
-
-	movdqu	0(%r12),%xmm15
-	movq	%rsp,%rax
-	movl	%edx,%r10d
-	cmpq	$2,%r14
-	jb	.Lcbc_dec_one
-	movdqu	16(%r12),%xmm0
-	je	.Lcbc_dec_two
-	movdqu	32(%r12),%xmm1
-	cmpq	$4,%r14
-	jb	.Lcbc_dec_three
-	movdqu	48(%r12),%xmm2
-	je	.Lcbc_dec_four
-	movdqu	64(%r12),%xmm3
-	cmpq	$6,%r14
-	jb	.Lcbc_dec_five
-	movdqu	80(%r12),%xmm4
-	je	.Lcbc_dec_six
-	movdqu	96(%r12),%xmm5
-	movdqa	%xmm14,32(%rbp)
-	call	_bsaes_decrypt8
-	pxor	32(%rbp),%xmm15
-	movdqu	0(%r12),%xmm7
-	movdqu	16(%r12),%xmm8
-	pxor	%xmm7,%xmm0
-	movdqu	32(%r12),%xmm9
-	pxor	%xmm8,%xmm5
-	movdqu	48(%r12),%xmm10
-	pxor	%xmm9,%xmm3
-	movdqu	64(%r12),%xmm11
-	pxor	%xmm10,%xmm1
-	movdqu	80(%r12),%xmm12
-	pxor	%xmm11,%xmm6
-	movdqu	96(%r12),%xmm14
-	pxor	%xmm12,%xmm2
-	movdqu	%xmm15,0(%r13)
-	movdqu	%xmm0,16(%r13)
-	movdqu	%xmm5,32(%r13)
-	movdqu	%xmm3,48(%r13)
-	movdqu	%xmm1,64(%r13)
-	movdqu	%xmm6,80(%r13)
-	movdqu	%xmm2,96(%r13)
-	jmp	.Lcbc_dec_done
-.align	16
-.Lcbc_dec_six:
-	movdqa	%xmm14,32(%rbp)
-	call	_bsaes_decrypt8
-	pxor	32(%rbp),%xmm15
-	movdqu	0(%r12),%xmm7
-	movdqu	16(%r12),%xmm8
-	pxor	%xmm7,%xmm0
-	movdqu	32(%r12),%xmm9
-	pxor	%xmm8,%xmm5
-	movdqu	48(%r12),%xmm10
-	pxor	%xmm9,%xmm3
-	movdqu	64(%r12),%xmm11
-	pxor	%xmm10,%xmm1
-	movdqu	80(%r12),%xmm14
-	pxor	%xmm11,%xmm6
-	movdqu	%xmm15,0(%r13)
-	movdqu	%xmm0,16(%r13)
-	movdqu	%xmm5,32(%r13)
-	movdqu	%xmm3,48(%r13)
-	movdqu	%xmm1,64(%r13)
-	movdqu	%xmm6,80(%r13)
-	jmp	.Lcbc_dec_done
-.align	16
-.Lcbc_dec_five:
-	movdqa	%xmm14,32(%rbp)
-	call	_bsaes_decrypt8
-	pxor	32(%rbp),%xmm15
-	movdqu	0(%r12),%xmm7
-	movdqu	16(%r12),%xmm8
-	pxor	%xmm7,%xmm0
-	movdqu	32(%r12),%xmm9
-	pxor	%xmm8,%xmm5
-	movdqu	48(%r12),%xmm10
-	pxor	%xmm9,%xmm3
-	movdqu	64(%r12),%xmm14
-	pxor	%xmm10,%xmm1
-	movdqu	%xmm15,0(%r13)
-	movdqu	%xmm0,16(%r13)
-	movdqu	%xmm5,32(%r13)
-	movdqu	%xmm3,48(%r13)
-	movdqu	%xmm1,64(%r13)
-	jmp	.Lcbc_dec_done
-.align	16
-.Lcbc_dec_four:
-	movdqa	%xmm14,32(%rbp)
-	call	_bsaes_decrypt8
-	pxor	32(%rbp),%xmm15
-	movdqu	0(%r12),%xmm7
-	movdqu	16(%r12),%xmm8
-	pxor	%xmm7,%xmm0
-	movdqu	32(%r12),%xmm9
-	pxor	%xmm8,%xmm5
-	movdqu	48(%r12),%xmm14
-	pxor	%xmm9,%xmm3
-	movdqu	%xmm15,0(%r13)
-	movdqu	%xmm0,16(%r13)
-	movdqu	%xmm5,32(%r13)
-	movdqu	%xmm3,48(%r13)
-	jmp	.Lcbc_dec_done
-.align	16
-.Lcbc_dec_three:
-	movdqa	%xmm14,32(%rbp)
-	call	_bsaes_decrypt8
-	pxor	32(%rbp),%xmm15
-	movdqu	0(%r12),%xmm7
-	movdqu	16(%r12),%xmm8
-	pxor	%xmm7,%xmm0
-	movdqu	32(%r12),%xmm14
-	pxor	%xmm8,%xmm5
-	movdqu	%xmm15,0(%r13)
-	movdqu	%xmm0,16(%r13)
-	movdqu	%xmm5,32(%r13)
-	jmp	.Lcbc_dec_done
-.align	16
-.Lcbc_dec_two:
-	movdqa	%xmm14,32(%rbp)
-	call	_bsaes_decrypt8
-	pxor	32(%rbp),%xmm15
-	movdqu	0(%r12),%xmm7
-	movdqu	16(%r12),%xmm14
-	pxor	%xmm7,%xmm0
-	movdqu	%xmm15,0(%r13)
-	movdqu	%xmm0,16(%r13)
-	jmp	.Lcbc_dec_done
-.align	16
-.Lcbc_dec_one:
-	leaq	(%r12),%rdi
-	leaq	32(%rbp),%rsi
-	leaq	(%r15),%rdx
-	call	asm_AES_decrypt
-	pxor	32(%rbp),%xmm14
-	movdqu	%xmm14,(%r13)
-	movdqa	%xmm15,%xmm14
-
-.Lcbc_dec_done:
-	movdqu	%xmm14,(%rbx)
-	leaq	(%rsp),%rax
-	pxor	%xmm0,%xmm0
-.Lcbc_dec_bzero:
-	movdqa	%xmm0,0(%rax)
-	movdqa	%xmm0,16(%rax)
-	leaq	32(%rax),%rax
-	cmpq	%rax,%rbp
-	ja	.Lcbc_dec_bzero
-
-	leaq	120(%rbp),%rax
-.cfi_def_cfa	%rax,8
-	movq	-48(%rax),%r15
-.cfi_restore	%r15
-	movq	-40(%rax),%r14
-.cfi_restore	%r14
-	movq	-32(%rax),%r13
-.cfi_restore	%r13
-	movq	-24(%rax),%r12
-.cfi_restore	%r12
-	movq	-16(%rax),%rbx
-.cfi_restore	%rbx
-	movq	-8(%rax),%rbp
-.cfi_restore	%rbp
-	leaq	(%rax),%rsp
-.cfi_def_cfa_register	%rsp
-.Lcbc_dec_epilogue:
-	.byte	0xf3,0xc3
-.cfi_endproc	
-.size	bsaes_cbc_encrypt,.-bsaes_cbc_encrypt
-
-.globl	bsaes_ctr32_encrypt_blocks
-.type	bsaes_ctr32_encrypt_blocks,@function
-.align	16
-bsaes_ctr32_encrypt_blocks:
-.cfi_startproc	
-	movq	%rsp,%rax
-.Lctr_enc_prologue:
-	pushq	%rbp
-.cfi_adjust_cfa_offset	8
-.cfi_offset	%rbp,-16
-	pushq	%rbx
-.cfi_adjust_cfa_offset	8
-.cfi_offset	%rbx,-24
-	pushq	%r12
-.cfi_adjust_cfa_offset	8
-.cfi_offset	%r12,-32
-	pushq	%r13
-.cfi_adjust_cfa_offset	8
-.cfi_offset	%r13,-40
-	pushq	%r14
-.cfi_adjust_cfa_offset	8
-.cfi_offset	%r14,-48
-	pushq	%r15
-.cfi_adjust_cfa_offset	8
-.cfi_offset	%r15,-56
-	leaq	-72(%rsp),%rsp
-.cfi_adjust_cfa_offset	0x48
-	movq	%rsp,%rbp
-.cfi_def_cfa_register	%rbp
-	movdqu	(%r8),%xmm0
-	movl	240(%rcx),%eax
-	movq	%rdi,%r12
-	movq	%rsi,%r13
-	movq	%rdx,%r14
-	movq	%rcx,%r15
-	movdqa	%xmm0,32(%rbp)
-	cmpq	$8,%rdx
-	jb	.Lctr_enc_short
-
-	movl	%eax,%ebx
-	shlq	$7,%rax
-	subq	$96,%rax
-	subq	%rax,%rsp
-
-	movq	%rsp,%rax
-	movq	%r15,%rcx
-	movl	%ebx,%r10d
-	call	_bsaes_key_convert
-	pxor	%xmm6,%xmm7
-	movdqa	%xmm7,(%rax)
-
-	movdqa	(%rsp),%xmm8
-	leaq	.LADD1(%rip),%r11
-	movdqa	32(%rbp),%xmm15
-	movdqa	-32(%r11),%xmm7
-.byte	102,68,15,56,0,199
-.byte	102,68,15,56,0,255
-	movdqa	%xmm8,(%rsp)
-	jmp	.Lctr_enc_loop
-.align	16
-.Lctr_enc_loop:
-	movdqa	%xmm15,32(%rbp)
-	movdqa	%xmm15,%xmm0
-	movdqa	%xmm15,%xmm1
-	paddd	0(%r11),%xmm0
-	movdqa	%xmm15,%xmm2
-	paddd	16(%r11),%xmm1
-	movdqa	%xmm15,%xmm3
-	paddd	32(%r11),%xmm2
-	movdqa	%xmm15,%xmm4
-	paddd	48(%r11),%xmm3
-	movdqa	%xmm15,%xmm5
-	paddd	64(%r11),%xmm4
-	movdqa	%xmm15,%xmm6
-	paddd	80(%r11),%xmm5
-	paddd	96(%r11),%xmm6
-
-
-
-	movdqa	(%rsp),%xmm8
-	leaq	16(%rsp),%rax
-	movdqa	-16(%r11),%xmm7
-	pxor	%xmm8,%xmm15
-	pxor	%xmm8,%xmm0
-	pxor	%xmm8,%xmm1
-	pxor	%xmm8,%xmm2
-.byte	102,68,15,56,0,255
-.byte	102,15,56,0,199
-	pxor	%xmm8,%xmm3
-	pxor	%xmm8,%xmm4
-.byte	102,15,56,0,207
-.byte	102,15,56,0,215
-	pxor	%xmm8,%xmm5
-	pxor	%xmm8,%xmm6
-.byte	102,15,56,0,223
-.byte	102,15,56,0,231
-.byte	102,15,56,0,239
-.byte	102,15,56,0,247
-	leaq	.LBS0(%rip),%r11
-	movl	%ebx,%r10d
-
-	call	_bsaes_encrypt8_bitslice
-
-	subq	$8,%r14
-	jc	.Lctr_enc_loop_done
-
-	movdqu	0(%r12),%xmm7
-	movdqu	16(%r12),%xmm8
-	movdqu	32(%r12),%xmm9
-	movdqu	48(%r12),%xmm10
-	movdqu	64(%r12),%xmm11
-	movdqu	80(%r12),%xmm12
-	movdqu	96(%r12),%xmm13
-	movdqu	112(%r12),%xmm14
-	leaq	128(%r12),%r12
-	pxor	%xmm15,%xmm7
-	movdqa	32(%rbp),%xmm15
-	pxor	%xmm8,%xmm0
-	movdqu	%xmm7,0(%r13)
-	pxor	%xmm9,%xmm3
-	movdqu	%xmm0,16(%r13)
-	pxor	%xmm10,%xmm5
-	movdqu	%xmm3,32(%r13)
-	pxor	%xmm11,%xmm2
-	movdqu	%xmm5,48(%r13)
-	pxor	%xmm12,%xmm6
-	movdqu	%xmm2,64(%r13)
-	pxor	%xmm13,%xmm1
-	movdqu	%xmm6,80(%r13)
-	pxor	%xmm14,%xmm4
-	movdqu	%xmm1,96(%r13)
-	leaq	.LADD1(%rip),%r11
-	movdqu	%xmm4,112(%r13)
-	leaq	128(%r13),%r13
-	paddd	112(%r11),%xmm15
-	jnz	.Lctr_enc_loop
-
-	jmp	.Lctr_enc_done
-.align	16
-.Lctr_enc_loop_done:
-	addq	$8,%r14
-	movdqu	0(%r12),%xmm7
-	pxor	%xmm7,%xmm15
-	movdqu	%xmm15,0(%r13)
-	cmpq	$2,%r14
-	jb	.Lctr_enc_done
-	movdqu	16(%r12),%xmm8
-	pxor	%xmm8,%xmm0
-	movdqu	%xmm0,16(%r13)
-	je	.Lctr_enc_done
-	movdqu	32(%r12),%xmm9
-	pxor	%xmm9,%xmm3
-	movdqu	%xmm3,32(%r13)
-	cmpq	$4,%r14
-	jb	.Lctr_enc_done
-	movdqu	48(%r12),%xmm10
-	pxor	%xmm10,%xmm5
-	movdqu	%xmm5,48(%r13)
-	je	.Lctr_enc_done
-	movdqu	64(%r12),%xmm11
-	pxor	%xmm11,%xmm2
-	movdqu	%xmm2,64(%r13)
-	cmpq	$6,%r14
-	jb	.Lctr_enc_done
-	movdqu	80(%r12),%xmm12
-	pxor	%xmm12,%xmm6
-	movdqu	%xmm6,80(%r13)
-	je	.Lctr_enc_done
-	movdqu	96(%r12),%xmm13
-	pxor	%xmm13,%xmm1
-	movdqu	%xmm1,96(%r13)
-	jmp	.Lctr_enc_done
-
-.align	16
-.Lctr_enc_short:
-	leaq	32(%rbp),%rdi
-	leaq	48(%rbp),%rsi
-	leaq	(%r15),%rdx
-	call	asm_AES_encrypt
-	movdqu	(%r12),%xmm0
-	leaq	16(%r12),%r12
-	movl	44(%rbp),%eax
-	bswapl	%eax
-	pxor	48(%rbp),%xmm0
-	incl	%eax
-	movdqu	%xmm0,(%r13)
-	bswapl	%eax
-	leaq	16(%r13),%r13
-	movl	%eax,44(%rsp)
-	decq	%r14
-	jnz	.Lctr_enc_short
-
-.Lctr_enc_done:
-	leaq	(%rsp),%rax
-	pxor	%xmm0,%xmm0
-.Lctr_enc_bzero:
-	movdqa	%xmm0,0(%rax)
-	movdqa	%xmm0,16(%rax)
-	leaq	32(%rax),%rax
-	cmpq	%rax,%rbp
-	ja	.Lctr_enc_bzero
-
-	leaq	120(%rbp),%rax
-.cfi_def_cfa	%rax,8
-	movq	-48(%rax),%r15
-.cfi_restore	%r15
-	movq	-40(%rax),%r14
-.cfi_restore	%r14
-	movq	-32(%rax),%r13
-.cfi_restore	%r13
-	movq	-24(%rax),%r12
-.cfi_restore	%r12
-	movq	-16(%rax),%rbx
-.cfi_restore	%rbx
-	movq	-8(%rax),%rbp
-.cfi_restore	%rbp
-	leaq	(%rax),%rsp
-.cfi_def_cfa_register	%rsp
-.Lctr_enc_epilogue:
-	.byte	0xf3,0xc3
-.cfi_endproc	
-.size	bsaes_ctr32_encrypt_blocks,.-bsaes_ctr32_encrypt_blocks
-.globl	bsaes_xts_encrypt
-.type	bsaes_xts_encrypt,@function
-.align	16
-bsaes_xts_encrypt:
-.cfi_startproc	
-	movq	%rsp,%rax
-.Lxts_enc_prologue:
-	pushq	%rbp
-.cfi_adjust_cfa_offset	8
-.cfi_offset	%rbp,-16
-	pushq	%rbx
-.cfi_adjust_cfa_offset	8
-.cfi_offset	%rbx,-24
-	pushq	%r12
-.cfi_adjust_cfa_offset	8
-.cfi_offset	%r12,-32
-	pushq	%r13
-.cfi_adjust_cfa_offset	8
-.cfi_offset	%r13,-40
-	pushq	%r14
-.cfi_adjust_cfa_offset	8
-.cfi_offset	%r14,-48
-	pushq	%r15
-.cfi_adjust_cfa_offset	8
-.cfi_offset	%r15,-56
-	leaq	-72(%rsp),%rsp
-.cfi_adjust_cfa_offset	0x48
-	movq	%rsp,%rbp
-.cfi_def_cfa_register	%rbp
-	movq	%rdi,%r12
-	movq	%rsi,%r13
-	movq	%rdx,%r14
-	movq	%rcx,%r15
-
-	leaq	(%r9),%rdi
-	leaq	32(%rbp),%rsi
-	leaq	(%r8),%rdx
-	call	asm_AES_encrypt
-
-	movl	240(%r15),%eax
-	movq	%r14,%rbx
-
-	movl	%eax,%edx
-	shlq	$7,%rax
-	subq	$96,%rax
-	subq	%rax,%rsp
-
-	movq	%rsp,%rax
-	movq	%r15,%rcx
-	movl	%edx,%r10d
-	call	_bsaes_key_convert
-	pxor	%xmm6,%xmm7
-	movdqa	%xmm7,(%rax)
-
-	andq	$-16,%r14
-	subq	$0x80,%rsp
-	movdqa	32(%rbp),%xmm6
-
-	pxor	%xmm14,%xmm14
-	movdqa	.Lxts_magic(%rip),%xmm12
-	pcmpgtd	%xmm6,%xmm14
-
-	subq	$0x80,%r14
-	jc	.Lxts_enc_short
-	jmp	.Lxts_enc_loop
-
-.align	16
-.Lxts_enc_loop:
-	pshufd	$0x13,%xmm14,%xmm13
-	pxor	%xmm14,%xmm14
-	movdqa	%xmm6,%xmm15
-	movdqa	%xmm6,0(%rsp)
-	paddq	%xmm6,%xmm6
-	pand	%xmm12,%xmm13
-	pcmpgtd	%xmm6,%xmm14
-	pxor	%xmm13,%xmm6
-	pshufd	$0x13,%xmm14,%xmm13
-	pxor	%xmm14,%xmm14
-	movdqa	%xmm6,%xmm0
-	movdqa	%xmm6,16(%rsp)
-	paddq	%xmm6,%xmm6
-	pand	%xmm12,%xmm13
-	pcmpgtd	%xmm6,%xmm14
-	pxor	%xmm13,%xmm6
-	movdqu	0(%r12),%xmm7
-	pshufd	$0x13,%xmm14,%xmm13
-	pxor	%xmm14,%xmm14
-	movdqa	%xmm6,%xmm1
-	movdqa	%xmm6,32(%rsp)
-	paddq	%xmm6,%xmm6
-	pand	%xmm12,%xmm13
-	pcmpgtd	%xmm6,%xmm14
-	pxor	%xmm13,%xmm6
-	movdqu	16(%r12),%xmm8
-	pxor	%xmm7,%xmm15
-	pshufd	$0x13,%xmm14,%xmm13
-	pxor	%xmm14,%xmm14
-	movdqa	%xmm6,%xmm2
-	movdqa	%xmm6,48(%rsp)
-	paddq	%xmm6,%xmm6
-	pand	%xmm12,%xmm13
-	pcmpgtd	%xmm6,%xmm14
-	pxor	%xmm13,%xmm6
-	movdqu	32(%r12),%xmm9
-	pxor	%xmm8,%xmm0
-	pshufd	$0x13,%xmm14,%xmm13
-	pxor	%xmm14,%xmm14
-	movdqa	%xmm6,%xmm3
-	movdqa	%xmm6,64(%rsp)
-	paddq	%xmm6,%xmm6
-	pand	%xmm12,%xmm13
-	pcmpgtd	%xmm6,%xmm14
-	pxor	%xmm13,%xmm6
-	movdqu	48(%r12),%xmm10
-	pxor	%xmm9,%xmm1
-	pshufd	$0x13,%xmm14,%xmm13
-	pxor	%xmm14,%xmm14
-	movdqa	%xmm6,%xmm4
-	movdqa	%xmm6,80(%rsp)
-	paddq	%xmm6,%xmm6
-	pand	%xmm12,%xmm13
-	pcmpgtd	%xmm6,%xmm14
-	pxor	%xmm13,%xmm6
-	movdqu	64(%r12),%xmm11
-	pxor	%xmm10,%xmm2
-	pshufd	$0x13,%xmm14,%xmm13
-	pxor	%xmm14,%xmm14
-	movdqa	%xmm6,%xmm5
-	movdqa	%xmm6,96(%rsp)
-	paddq	%xmm6,%xmm6
-	pand	%xmm12,%xmm13
-	pcmpgtd	%xmm6,%xmm14
-	pxor	%xmm13,%xmm6
-	movdqu	80(%r12),%xmm12
-	pxor	%xmm11,%xmm3
-	movdqu	96(%r12),%xmm13
-	pxor	%xmm12,%xmm4
-	movdqu	112(%r12),%xmm14
-	leaq	128(%r12),%r12
-	movdqa	%xmm6,112(%rsp)
-	pxor	%xmm13,%xmm5
-	leaq	128(%rsp),%rax
-	pxor	%xmm14,%xmm6
-	movl	%edx,%r10d
-
-	call	_bsaes_encrypt8
-
-	pxor	0(%rsp),%xmm15
-	pxor	16(%rsp),%xmm0
-	movdqu	%xmm15,0(%r13)
-	pxor	32(%rsp),%xmm3
-	movdqu	%xmm0,16(%r13)
-	pxor	48(%rsp),%xmm5
-	movdqu	%xmm3,32(%r13)
-	pxor	64(%rsp),%xmm2
-	movdqu	%xmm5,48(%r13)
-	pxor	80(%rsp),%xmm6
-	movdqu	%xmm2,64(%r13)
-	pxor	96(%rsp),%xmm1
-	movdqu	%xmm6,80(%r13)
-	pxor	112(%rsp),%xmm4
-	movdqu	%xmm1,96(%r13)
-	movdqu	%xmm4,112(%r13)
-	leaq	128(%r13),%r13
-
-	movdqa	112(%rsp),%xmm6
-	pxor	%xmm14,%xmm14
-	movdqa	.Lxts_magic(%rip),%xmm12
-	pcmpgtd	%xmm6,%xmm14
-	pshufd	$0x13,%xmm14,%xmm13
-	pxor	%xmm14,%xmm14
-	paddq	%xmm6,%xmm6
-	pand	%xmm12,%xmm13
-	pcmpgtd	%xmm6,%xmm14
-	pxor	%xmm13,%xmm6
-
-	subq	$0x80,%r14
-	jnc	.Lxts_enc_loop
-
-.Lxts_enc_short:
-	addq	$0x80,%r14
-	jz	.Lxts_enc_done
-	pshufd	$0x13,%xmm14,%xmm13
-	pxor	%xmm14,%xmm14
-	movdqa	%xmm6,%xmm15
-	movdqa	%xmm6,0(%rsp)
-	paddq	%xmm6,%xmm6
-	pand	%xmm12,%xmm13
-	pcmpgtd	%xmm6,%xmm14
-	pxor	%xmm13,%xmm6
-	pshufd	$0x13,%xmm14,%xmm13
-	pxor	%xmm14,%xmm14
-	movdqa	%xmm6,%xmm0
-	movdqa	%xmm6,16(%rsp)
-	paddq	%xmm6,%xmm6
-	pand	%xmm12,%xmm13
-	pcmpgtd	%xmm6,%xmm14
-	pxor	%xmm13,%xmm6
-	movdqu	0(%r12),%xmm7
-	cmpq	$16,%r14
-	je	.Lxts_enc_1
-	pshufd	$0x13,%xmm14,%xmm13
-	pxor	%xmm14,%xmm14
-	movdqa	%xmm6,%xmm1
-	movdqa	%xmm6,32(%rsp)
-	paddq	%xmm6,%xmm6
-	pand	%xmm12,%xmm13
-	pcmpgtd	%xmm6,%xmm14
-	pxor	%xmm13,%xmm6
-	movdqu	16(%r12),%xmm8
-	cmpq	$32,%r14
-	je	.Lxts_enc_2
-	pxor	%xmm7,%xmm15
-	pshufd	$0x13,%xmm14,%xmm13
-	pxor	%xmm14,%xmm14
-	movdqa	%xmm6,%xmm2
-	movdqa	%xmm6,48(%rsp)
-	paddq	%xmm6,%xmm6
-	pand	%xmm12,%xmm13
-	pcmpgtd	%xmm6,%xmm14
-	pxor	%xmm13,%xmm6
-	movdqu	32(%r12),%xmm9
-	cmpq	$48,%r14
-	je	.Lxts_enc_3
-	pxor	%xmm8,%xmm0
-	pshufd	$0x13,%xmm14,%xmm13
-	pxor	%xmm14,%xmm14
-	movdqa	%xmm6,%xmm3
-	movdqa	%xmm6,64(%rsp)
-	paddq	%xmm6,%xmm6
-	pand	%xmm12,%xmm13
-	pcmpgtd	%xmm6,%xmm14
-	pxor	%xmm13,%xmm6
-	movdqu	48(%r12),%xmm10
-	cmpq	$64,%r14
-	je	.Lxts_enc_4
-	pxor	%xmm9,%xmm1
-	pshufd	$0x13,%xmm14,%xmm13
-	pxor	%xmm14,%xmm14
-	movdqa	%xmm6,%xmm4
-	movdqa	%xmm6,80(%rsp)
-	paddq	%xmm6,%xmm6
-	pand	%xmm12,%xmm13
-	pcmpgtd	%xmm6,%xmm14
-	pxor	%xmm13,%xmm6
-	movdqu	64(%r12),%xmm11
-	cmpq	$80,%r14
-	je	.Lxts_enc_5
-	pxor	%xmm10,%xmm2
-	pshufd	$0x13,%xmm14,%xmm13
-	pxor	%xmm14,%xmm14
-	movdqa	%xmm6,%xmm5
-	movdqa	%xmm6,96(%rsp)
-	paddq	%xmm6,%xmm6
-	pand	%xmm12,%xmm13
-	pcmpgtd	%xmm6,%xmm14
-	pxor	%xmm13,%xmm6
-	movdqu	80(%r12),%xmm12
-	cmpq	$96,%r14
-	je	.Lxts_enc_6
-	pxor	%xmm11,%xmm3
-	movdqu	96(%r12),%xmm13
-	pxor	%xmm12,%xmm4
-	movdqa	%xmm6,112(%rsp)
-	leaq	112(%r12),%r12
-	pxor	%xmm13,%xmm5
-	leaq	128(%rsp),%rax
-	movl	%edx,%r10d
-
-	call	_bsaes_encrypt8
-
-	pxor	0(%rsp),%xmm15
-	pxor	16(%rsp),%xmm0
-	movdqu	%xmm15,0(%r13)
-	pxor	32(%rsp),%xmm3
-	movdqu	%xmm0,16(%r13)
-	pxor	48(%rsp),%xmm5
-	movdqu	%xmm3,32(%r13)
-	pxor	64(%rsp),%xmm2
-	movdqu	%xmm5,48(%r13)
-	pxor	80(%rsp),%xmm6
-	movdqu	%xmm2,64(%r13)
-	pxor	96(%rsp),%xmm1
-	movdqu	%xmm6,80(%r13)
-	movdqu	%xmm1,96(%r13)
-	leaq	112(%r13),%r13
-
-	movdqa	112(%rsp),%xmm6
-	jmp	.Lxts_enc_done
-.align	16
-.Lxts_enc_6:
-	pxor	%xmm11,%xmm3
-	leaq	96(%r12),%r12
-	pxor	%xmm12,%xmm4
-	leaq	128(%rsp),%rax
-	movl	%edx,%r10d
-
-	call	_bsaes_encrypt8
-
-	pxor	0(%rsp),%xmm15
-	pxor	16(%rsp),%xmm0
-	movdqu	%xmm15,0(%r13)
-	pxor	32(%rsp),%xmm3
-	movdqu	%xmm0,16(%r13)
-	pxor	48(%rsp),%xmm5
-	movdqu	%xmm3,32(%r13)
-	pxor	64(%rsp),%xmm2
-	movdqu	%xmm5,48(%r13)
-	pxor	80(%rsp),%xmm6
-	movdqu	%xmm2,64(%r13)
-	movdqu	%xmm6,80(%r13)
-	leaq	96(%r13),%r13
-
-	movdqa	96(%rsp),%xmm6
-	jmp	.Lxts_enc_done
-.align	16
-.Lxts_enc_5:
-	pxor	%xmm10,%xmm2
-	leaq	80(%r12),%r12
-	pxor	%xmm11,%xmm3
-	leaq	128(%rsp),%rax
-	movl	%edx,%r10d
-
-	call	_bsaes_encrypt8
-
-	pxor	0(%rsp),%xmm15
-	pxor	16(%rsp),%xmm0
-	movdqu	%xmm15,0(%r13)
-	pxor	32(%rsp),%xmm3
-	movdqu	%xmm0,16(%r13)
-	pxor	48(%rsp),%xmm5
-	movdqu	%xmm3,32(%r13)
-	pxor	64(%rsp),%xmm2
-	movdqu	%xmm5,48(%r13)
-	movdqu	%xmm2,64(%r13)
-	leaq	80(%r13),%r13
-
-	movdqa	80(%rsp),%xmm6
-	jmp	.Lxts_enc_done
-.align	16
-.Lxts_enc_4:
-	pxor	%xmm9,%xmm1
-	leaq	64(%r12),%r12
-	pxor	%xmm10,%xmm2
-	leaq	128(%rsp),%rax
-	movl	%edx,%r10d
-
-	call	_bsaes_encrypt8
-
-	pxor	0(%rsp),%xmm15
-	pxor	16(%rsp),%xmm0
-	movdqu	%xmm15,0(%r13)
-	pxor	32(%rsp),%xmm3
-	movdqu	%xmm0,16(%r13)
-	pxor	48(%rsp),%xmm5
-	movdqu	%xmm3,32(%r13)
-	movdqu	%xmm5,48(%r13)
-	leaq	64(%r13),%r13
-
-	movdqa	64(%rsp),%xmm6
-	jmp	.Lxts_enc_done
-.align	16
-.Lxts_enc_3:
-	pxor	%xmm8,%xmm0
-	leaq	48(%r12),%r12
-	pxor	%xmm9,%xmm1
-	leaq	128(%rsp),%rax
-	movl	%edx,%r10d
-
-	call	_bsaes_encrypt8
-
-	pxor	0(%rsp),%xmm15
-	pxor	16(%rsp),%xmm0
-	movdqu	%xmm15,0(%r13)
-	pxor	32(%rsp),%xmm3
-	movdqu	%xmm0,16(%r13)
-	movdqu	%xmm3,32(%r13)
-	leaq	48(%r13),%r13
-
-	movdqa	48(%rsp),%xmm6
-	jmp	.Lxts_enc_done
-.align	16
-.Lxts_enc_2:
-	pxor	%xmm7,%xmm15
-	leaq	32(%r12),%r12
-	pxor	%xmm8,%xmm0
-	leaq	128(%rsp),%rax
-	movl	%edx,%r10d
-
-	call	_bsaes_encrypt8
-
-	pxor	0(%rsp),%xmm15
-	pxor	16(%rsp),%xmm0
-	movdqu	%xmm15,0(%r13)
-	movdqu	%xmm0,16(%r13)
-	leaq	32(%r13),%r13
-
-	movdqa	32(%rsp),%xmm6
-	jmp	.Lxts_enc_done
-.align	16
-.Lxts_enc_1:
-	pxor	%xmm15,%xmm7
-	leaq	16(%r12),%r12
-	movdqa	%xmm7,32(%rbp)
-	leaq	32(%rbp),%rdi
-	leaq	32(%rbp),%rsi
-	leaq	(%r15),%rdx
-	call	asm_AES_encrypt
-	pxor	32(%rbp),%xmm15
-
-
-
-
-
-	movdqu	%xmm15,0(%r13)
-	leaq	16(%r13),%r13
-
-	movdqa	16(%rsp),%xmm6
-
-.Lxts_enc_done:
-	andl	$15,%ebx
-	jz	.Lxts_enc_ret
-	movq	%r13,%rdx
-
-.Lxts_enc_steal:
-	movzbl	(%r12),%eax
-	movzbl	-16(%rdx),%ecx
-	leaq	1(%r12),%r12
-	movb	%al,-16(%rdx)
-	movb	%cl,0(%rdx)
-	leaq	1(%rdx),%rdx
-	subl	$1,%ebx
-	jnz	.Lxts_enc_steal
-
-	movdqu	-16(%r13),%xmm15
-	leaq	32(%rbp),%rdi
-	pxor	%xmm6,%xmm15
-	leaq	32(%rbp),%rsi
-	movdqa	%xmm15,32(%rbp)
-	leaq	(%r15),%rdx
-	call	asm_AES_encrypt
-	pxor	32(%rbp),%xmm6
-	movdqu	%xmm6,-16(%r13)
-
-.Lxts_enc_ret:
-	leaq	(%rsp),%rax
-	pxor	%xmm0,%xmm0
-.Lxts_enc_bzero:
-	movdqa	%xmm0,0(%rax)
-	movdqa	%xmm0,16(%rax)
-	leaq	32(%rax),%rax
-	cmpq	%rax,%rbp
-	ja	.Lxts_enc_bzero
-
-	leaq	120(%rbp),%rax
-.cfi_def_cfa	%rax,8
-	movq	-48(%rax),%r15
-.cfi_restore	%r15
-	movq	-40(%rax),%r14
-.cfi_restore	%r14
-	movq	-32(%rax),%r13
-.cfi_restore	%r13
-	movq	-24(%rax),%r12
-.cfi_restore	%r12
-	movq	-16(%rax),%rbx
-.cfi_restore	%rbx
-	movq	-8(%rax),%rbp
-.cfi_restore	%rbp
-	leaq	(%rax),%rsp
-.cfi_def_cfa_register	%rsp
-.Lxts_enc_epilogue:
-	.byte	0xf3,0xc3
-.cfi_endproc	
-.size	bsaes_xts_encrypt,.-bsaes_xts_encrypt
-
-.globl	bsaes_xts_decrypt
-.type	bsaes_xts_decrypt,@function
-.align	16
-bsaes_xts_decrypt:
-.cfi_startproc	
-	movq	%rsp,%rax
-.Lxts_dec_prologue:
-	pushq	%rbp
-.cfi_adjust_cfa_offset	8
-.cfi_offset	%rbp,-16
-	pushq	%rbx
-.cfi_adjust_cfa_offset	8
-.cfi_offset	%rbx,-24
-	pushq	%r12
-.cfi_adjust_cfa_offset	8
-.cfi_offset	%r12,-32
-	pushq	%r13
-.cfi_adjust_cfa_offset	8
-.cfi_offset	%r13,-40
-	pushq	%r14
-.cfi_adjust_cfa_offset	8
-.cfi_offset	%r14,-48
-	pushq	%r15
-.cfi_adjust_cfa_offset	8
-.cfi_offset	%r15,-56
-	leaq	-72(%rsp),%rsp
-.cfi_adjust_cfa_offset	0x48
-	movq	%rsp,%rbp
-	movq	%rdi,%r12
-	movq	%rsi,%r13
-	movq	%rdx,%r14
-	movq	%rcx,%r15
-
-	leaq	(%r9),%rdi
-	leaq	32(%rbp),%rsi
-	leaq	(%r8),%rdx
-	call	asm_AES_encrypt
-
-	movl	240(%r15),%eax
-	movq	%r14,%rbx
-
-	movl	%eax,%edx
-	shlq	$7,%rax
-	subq	$96,%rax
-	subq	%rax,%rsp
-
-	movq	%rsp,%rax
-	movq	%r15,%rcx
-	movl	%edx,%r10d
-	call	_bsaes_key_convert
-	pxor	(%rsp),%xmm7
-	movdqa	%xmm6,(%rax)
-	movdqa	%xmm7,(%rsp)
-
-	xorl	%eax,%eax
-	andq	$-16,%r14
-	testl	$15,%ebx
-	setnz	%al
-	shlq	$4,%rax
-	subq	%rax,%r14
-
-	subq	$0x80,%rsp
-	movdqa	32(%rbp),%xmm6
-
-	pxor	%xmm14,%xmm14
-	movdqa	.Lxts_magic(%rip),%xmm12
-	pcmpgtd	%xmm6,%xmm14
-
-	subq	$0x80,%r14
-	jc	.Lxts_dec_short
-	jmp	.Lxts_dec_loop
-
-.align	16
-.Lxts_dec_loop:
-	pshufd	$0x13,%xmm14,%xmm13
-	pxor	%xmm14,%xmm14
-	movdqa	%xmm6,%xmm15
-	movdqa	%xmm6,0(%rsp)
-	paddq	%xmm6,%xmm6
-	pand	%xmm12,%xmm13
-	pcmpgtd	%xmm6,%xmm14
-	pxor	%xmm13,%xmm6
-	pshufd	$0x13,%xmm14,%xmm13
-	pxor	%xmm14,%xmm14
-	movdqa	%xmm6,%xmm0
-	movdqa	%xmm6,16(%rsp)
-	paddq	%xmm6,%xmm6
-	pand	%xmm12,%xmm13
-	pcmpgtd	%xmm6,%xmm14
-	pxor	%xmm13,%xmm6
-	movdqu	0(%r12),%xmm7
-	pshufd	$0x13,%xmm14,%xmm13
-	pxor	%xmm14,%xmm14
-	movdqa	%xmm6,%xmm1
-	movdqa	%xmm6,32(%rsp)
-	paddq	%xmm6,%xmm6
-	pand	%xmm12,%xmm13
-	pcmpgtd	%xmm6,%xmm14
-	pxor	%xmm13,%xmm6
-	movdqu	16(%r12),%xmm8
-	pxor	%xmm7,%xmm15
-	pshufd	$0x13,%xmm14,%xmm13
-	pxor	%xmm14,%xmm14
-	movdqa	%xmm6,%xmm2
-	movdqa	%xmm6,48(%rsp)
-	paddq	%xmm6,%xmm6
-	pand	%xmm12,%xmm13
-	pcmpgtd	%xmm6,%xmm14
-	pxor	%xmm13,%xmm6
-	movdqu	32(%r12),%xmm9
-	pxor	%xmm8,%xmm0
-	pshufd	$0x13,%xmm14,%xmm13
-	pxor	%xmm14,%xmm14
-	movdqa	%xmm6,%xmm3
-	movdqa	%xmm6,64(%rsp)
-	paddq	%xmm6,%xmm6
-	pand	%xmm12,%xmm13
-	pcmpgtd	%xmm6,%xmm14
-	pxor	%xmm13,%xmm6
-	movdqu	48(%r12),%xmm10
-	pxor	%xmm9,%xmm1
-	pshufd	$0x13,%xmm14,%xmm13
-	pxor	%xmm14,%xmm14
-	movdqa	%xmm6,%xmm4
-	movdqa	%xmm6,80(%rsp)
-	paddq	%xmm6,%xmm6
-	pand	%xmm12,%xmm13
-	pcmpgtd	%xmm6,%xmm14
-	pxor	%xmm13,%xmm6
-	movdqu	64(%r12),%xmm11
-	pxor	%xmm10,%xmm2
-	pshufd	$0x13,%xmm14,%xmm13
-	pxor	%xmm14,%xmm14
-	movdqa	%xmm6,%xmm5
-	movdqa	%xmm6,96(%rsp)
-	paddq	%xmm6,%xmm6
-	pand	%xmm12,%xmm13
-	pcmpgtd	%xmm6,%xmm14
-	pxor	%xmm13,%xmm6
-	movdqu	80(%r12),%xmm12
-	pxor	%xmm11,%xmm3
-	movdqu	96(%r12),%xmm13
-	pxor	%xmm12,%xmm4
-	movdqu	112(%r12),%xmm14
-	leaq	128(%r12),%r12
-	movdqa	%xmm6,112(%rsp)
-	pxor	%xmm13,%xmm5
-	leaq	128(%rsp),%rax
-	pxor	%xmm14,%xmm6
-	movl	%edx,%r10d
-
-	call	_bsaes_decrypt8
-
-	pxor	0(%rsp),%xmm15
-	pxor	16(%rsp),%xmm0
-	movdqu	%xmm15,0(%r13)
-	pxor	32(%rsp),%xmm5
-	movdqu	%xmm0,16(%r13)
-	pxor	48(%rsp),%xmm3
-	movdqu	%xmm5,32(%r13)
-	pxor	64(%rsp),%xmm1
-	movdqu	%xmm3,48(%r13)
-	pxor	80(%rsp),%xmm6
-	movdqu	%xmm1,64(%r13)
-	pxor	96(%rsp),%xmm2
-	movdqu	%xmm6,80(%r13)
-	pxor	112(%rsp),%xmm4
-	movdqu	%xmm2,96(%r13)
-	movdqu	%xmm4,112(%r13)
-	leaq	128(%r13),%r13
-
-	movdqa	112(%rsp),%xmm6
-	pxor	%xmm14,%xmm14
-	movdqa	.Lxts_magic(%rip),%xmm12
-	pcmpgtd	%xmm6,%xmm14
-	pshufd	$0x13,%xmm14,%xmm13
-	pxor	%xmm14,%xmm14
-	paddq	%xmm6,%xmm6
-	pand	%xmm12,%xmm13
-	pcmpgtd	%xmm6,%xmm14
-	pxor	%xmm13,%xmm6
-
-	subq	$0x80,%r14
-	jnc	.Lxts_dec_loop
-
-.Lxts_dec_short:
-	addq	$0x80,%r14
-	jz	.Lxts_dec_done
-	pshufd	$0x13,%xmm14,%xmm13
-	pxor	%xmm14,%xmm14
-	movdqa	%xmm6,%xmm15
-	movdqa	%xmm6,0(%rsp)
-	paddq	%xmm6,%xmm6
-	pand	%xmm12,%xmm13
-	pcmpgtd	%xmm6,%xmm14
-	pxor	%xmm13,%xmm6
-	pshufd	$0x13,%xmm14,%xmm13
-	pxor	%xmm14,%xmm14
-	movdqa	%xmm6,%xmm0
-	movdqa	%xmm6,16(%rsp)
-	paddq	%xmm6,%xmm6
-	pand	%xmm12,%xmm13
-	pcmpgtd	%xmm6,%xmm14
-	pxor	%xmm13,%xmm6
-	movdqu	0(%r12),%xmm7
-	cmpq	$16,%r14
-	je	.Lxts_dec_1
-	pshufd	$0x13,%xmm14,%xmm13
-	pxor	%xmm14,%xmm14
-	movdqa	%xmm6,%xmm1
-	movdqa	%xmm6,32(%rsp)
-	paddq	%xmm6,%xmm6
-	pand	%xmm12,%xmm13
-	pcmpgtd	%xmm6,%xmm14
-	pxor	%xmm13,%xmm6
-	movdqu	16(%r12),%xmm8
-	cmpq	$32,%r14
-	je	.Lxts_dec_2
-	pxor	%xmm7,%xmm15
-	pshufd	$0x13,%xmm14,%xmm13
-	pxor	%xmm14,%xmm14
-	movdqa	%xmm6,%xmm2
-	movdqa	%xmm6,48(%rsp)
-	paddq	%xmm6,%xmm6
-	pand	%xmm12,%xmm13
-	pcmpgtd	%xmm6,%xmm14
-	pxor	%xmm13,%xmm6
-	movdqu	32(%r12),%xmm9
-	cmpq	$48,%r14
-	je	.Lxts_dec_3
-	pxor	%xmm8,%xmm0
-	pshufd	$0x13,%xmm14,%xmm13
-	pxor	%xmm14,%xmm14
-	movdqa	%xmm6,%xmm3
-	movdqa	%xmm6,64(%rsp)
-	paddq	%xmm6,%xmm6
-	pand	%xmm12,%xmm13
-	pcmpgtd	%xmm6,%xmm14
-	pxor	%xmm13,%xmm6
-	movdqu	48(%r12),%xmm10
-	cmpq	$64,%r14
-	je	.Lxts_dec_4
-	pxor	%xmm9,%xmm1
-	pshufd	$0x13,%xmm14,%xmm13
-	pxor	%xmm14,%xmm14
-	movdqa	%xmm6,%xmm4
-	movdqa	%xmm6,80(%rsp)
-	paddq	%xmm6,%xmm6
-	pand	%xmm12,%xmm13
-	pcmpgtd	%xmm6,%xmm14
-	pxor	%xmm13,%xmm6
-	movdqu	64(%r12),%xmm11
-	cmpq	$80,%r14
-	je	.Lxts_dec_5
-	pxor	%xmm10,%xmm2
-	pshufd	$0x13,%xmm14,%xmm13
-	pxor	%xmm14,%xmm14
-	movdqa	%xmm6,%xmm5
-	movdqa	%xmm6,96(%rsp)
-	paddq	%xmm6,%xmm6
-	pand	%xmm12,%xmm13
-	pcmpgtd	%xmm6,%xmm14
-	pxor	%xmm13,%xmm6
-	movdqu	80(%r12),%xmm12
-	cmpq	$96,%r14
-	je	.Lxts_dec_6
-	pxor	%xmm11,%xmm3
-	movdqu	96(%r12),%xmm13
-	pxor	%xmm12,%xmm4
-	movdqa	%xmm6,112(%rsp)
-	leaq	112(%r12),%r12
-	pxor	%xmm13,%xmm5
-	leaq	128(%rsp),%rax
-	movl	%edx,%r10d
-
-	call	_bsaes_decrypt8
-
-	pxor	0(%rsp),%xmm15
-	pxor	16(%rsp),%xmm0
-	movdqu	%xmm15,0(%r13)
-	pxor	32(%rsp),%xmm5
-	movdqu	%xmm0,16(%r13)
-	pxor	48(%rsp),%xmm3
-	movdqu	%xmm5,32(%r13)
-	pxor	64(%rsp),%xmm1
-	movdqu	%xmm3,48(%r13)
-	pxor	80(%rsp),%xmm6
-	movdqu	%xmm1,64(%r13)
-	pxor	96(%rsp),%xmm2
-	movdqu	%xmm6,80(%r13)
-	movdqu	%xmm2,96(%r13)
-	leaq	112(%r13),%r13
-
-	movdqa	112(%rsp),%xmm6
-	jmp	.Lxts_dec_done
-.align	16
-.Lxts_dec_6:
-	pxor	%xmm11,%xmm3
-	leaq	96(%r12),%r12
-	pxor	%xmm12,%xmm4
-	leaq	128(%rsp),%rax
-	movl	%edx,%r10d
-
-	call	_bsaes_decrypt8
-
-	pxor	0(%rsp),%xmm15
-	pxor	16(%rsp),%xmm0
-	movdqu	%xmm15,0(%r13)
-	pxor	32(%rsp),%xmm5
-	movdqu	%xmm0,16(%r13)
-	pxor	48(%rsp),%xmm3
-	movdqu	%xmm5,32(%r13)
-	pxor	64(%rsp),%xmm1
-	movdqu	%xmm3,48(%r13)
-	pxor	80(%rsp),%xmm6
-	movdqu	%xmm1,64(%r13)
-	movdqu	%xmm6,80(%r13)
-	leaq	96(%r13),%r13
-
-	movdqa	96(%rsp),%xmm6
-	jmp	.Lxts_dec_done
-.align	16
-.Lxts_dec_5:
-	pxor	%xmm10,%xmm2
-	leaq	80(%r12),%r12
-	pxor	%xmm11,%xmm3
-	leaq	128(%rsp),%rax
-	movl	%edx,%r10d
-
-	call	_bsaes_decrypt8
-
-	pxor	0(%rsp),%xmm15
-	pxor	16(%rsp),%xmm0
-	movdqu	%xmm15,0(%r13)
-	pxor	32(%rsp),%xmm5
-	movdqu	%xmm0,16(%r13)
-	pxor	48(%rsp),%xmm3
-	movdqu	%xmm5,32(%r13)
-	pxor	64(%rsp),%xmm1
-	movdqu	%xmm3,48(%r13)
-	movdqu	%xmm1,64(%r13)
-	leaq	80(%r13),%r13
-
-	movdqa	80(%rsp),%xmm6
-	jmp	.Lxts_dec_done
-.align	16
-.Lxts_dec_4:
-	pxor	%xmm9,%xmm1
-	leaq	64(%r12),%r12
-	pxor	%xmm10,%xmm2
-	leaq	128(%rsp),%rax
-	movl	%edx,%r10d
-
-	call	_bsaes_decrypt8
-
-	pxor	0(%rsp),%xmm15
-	pxor	16(%rsp),%xmm0
-	movdqu	%xmm15,0(%r13)
-	pxor	32(%rsp),%xmm5
-	movdqu	%xmm0,16(%r13)
-	pxor	48(%rsp),%xmm3
-	movdqu	%xmm5,32(%r13)
-	movdqu	%xmm3,48(%r13)
-	leaq	64(%r13),%r13
-
-	movdqa	64(%rsp),%xmm6
-	jmp	.Lxts_dec_done
-.align	16
-.Lxts_dec_3:
-	pxor	%xmm8,%xmm0
-	leaq	48(%r12),%r12
-	pxor	%xmm9,%xmm1
-	leaq	128(%rsp),%rax
-	movl	%edx,%r10d
-
-	call	_bsaes_decrypt8
-
-	pxor	0(%rsp),%xmm15
-	pxor	16(%rsp),%xmm0
-	movdqu	%xmm15,0(%r13)
-	pxor	32(%rsp),%xmm5
-	movdqu	%xmm0,16(%r13)
-	movdqu	%xmm5,32(%r13)
-	leaq	48(%r13),%r13
-
-	movdqa	48(%rsp),%xmm6
-	jmp	.Lxts_dec_done
-.align	16
-.Lxts_dec_2:
-	pxor	%xmm7,%xmm15
-	leaq	32(%r12),%r12
-	pxor	%xmm8,%xmm0
-	leaq	128(%rsp),%rax
-	movl	%edx,%r10d
-
-	call	_bsaes_decrypt8
-
-	pxor	0(%rsp),%xmm15
-	pxor	16(%rsp),%xmm0
-	movdqu	%xmm15,0(%r13)
-	movdqu	%xmm0,16(%r13)
-	leaq	32(%r13),%r13
-
-	movdqa	32(%rsp),%xmm6
-	jmp	.Lxts_dec_done
-.align	16
-.Lxts_dec_1:
-	pxor	%xmm15,%xmm7
-	leaq	16(%r12),%r12
-	movdqa	%xmm7,32(%rbp)
-	leaq	32(%rbp),%rdi
-	leaq	32(%rbp),%rsi
-	leaq	(%r15),%rdx
-	call	asm_AES_decrypt
-	pxor	32(%rbp),%xmm15
-
-
-
-
-
-	movdqu	%xmm15,0(%r13)
-	leaq	16(%r13),%r13
-
-	movdqa	16(%rsp),%xmm6
-
-.Lxts_dec_done:
-	andl	$15,%ebx
-	jz	.Lxts_dec_ret
-
-	pxor	%xmm14,%xmm14
-	movdqa	.Lxts_magic(%rip),%xmm12
-	pcmpgtd	%xmm6,%xmm14
-	pshufd	$0x13,%xmm14,%xmm13
-	movdqa	%xmm6,%xmm5
-	paddq	%xmm6,%xmm6
-	pand	%xmm12,%xmm13
-	movdqu	(%r12),%xmm15
-	pxor	%xmm13,%xmm6
-
-	leaq	32(%rbp),%rdi
-	pxor	%xmm6,%xmm15
-	leaq	32(%rbp),%rsi
-	movdqa	%xmm15,32(%rbp)
-	leaq	(%r15),%rdx
-	call	asm_AES_decrypt
-	pxor	32(%rbp),%xmm6
-	movq	%r13,%rdx
-	movdqu	%xmm6,(%r13)
-
-.Lxts_dec_steal:
-	movzbl	16(%r12),%eax
-	movzbl	(%rdx),%ecx
-	leaq	1(%r12),%r12
-	movb	%al,(%rdx)
-	movb	%cl,16(%rdx)
-	leaq	1(%rdx),%rdx
-	subl	$1,%ebx
-	jnz	.Lxts_dec_steal
-
-	movdqu	(%r13),%xmm15
-	leaq	32(%rbp),%rdi
-	pxor	%xmm5,%xmm15
-	leaq	32(%rbp),%rsi
-	movdqa	%xmm15,32(%rbp)
-	leaq	(%r15),%rdx
-	call	asm_AES_decrypt
-	pxor	32(%rbp),%xmm5
-	movdqu	%xmm5,(%r13)
-
-.Lxts_dec_ret:
-	leaq	(%rsp),%rax
-	pxor	%xmm0,%xmm0
-.Lxts_dec_bzero:
-	movdqa	%xmm0,0(%rax)
-	movdqa	%xmm0,16(%rax)
-	leaq	32(%rax),%rax
-	cmpq	%rax,%rbp
-	ja	.Lxts_dec_bzero
-
-	leaq	120(%rbp),%rax
-.cfi_def_cfa	%rax,8
-	movq	-48(%rax),%r15
-.cfi_restore	%r15
-	movq	-40(%rax),%r14
-.cfi_restore	%r14
-	movq	-32(%rax),%r13
-.cfi_restore	%r13
-	movq	-24(%rax),%r12
-.cfi_restore	%r12
-	movq	-16(%rax),%rbx
-.cfi_restore	%rbx
-	movq	-8(%rax),%rbp
-.cfi_restore	%rbp
-	leaq	(%rax),%rsp
-.cfi_def_cfa_register	%rsp
-.Lxts_dec_epilogue:
-	.byte	0xf3,0xc3
-.cfi_endproc	
-.size	bsaes_xts_decrypt,.-bsaes_xts_decrypt
-.type	_bsaes_const,@object
-.align	64
-_bsaes_const:
-.LM0ISR:
-.quad	0x0a0e0206070b0f03, 0x0004080c0d010509
-.LISRM0:
-.quad	0x01040b0e0205080f, 0x0306090c00070a0d
-.LISR:
-.quad	0x0504070602010003, 0x0f0e0d0c080b0a09
-.LBS0:
-.quad	0x5555555555555555, 0x5555555555555555
-.LBS1:
-.quad	0x3333333333333333, 0x3333333333333333
-.LBS2:
-.quad	0x0f0f0f0f0f0f0f0f, 0x0f0f0f0f0f0f0f0f
-.LSR:
-.quad	0x0504070600030201, 0x0f0e0d0c0a09080b
-.LSRM0:
-.quad	0x0304090e00050a0f, 0x01060b0c0207080d
-.LM0SR:
-.quad	0x0a0e02060f03070b, 0x0004080c05090d01
-.LSWPUP:
-.quad	0x0706050403020100, 0x0c0d0e0f0b0a0908
-.LSWPUPM0SR:
-.quad	0x0a0d02060c03070b, 0x0004080f05090e01
-.LADD1:
-.quad	0x0000000000000000, 0x0000000100000000
-.LADD2:
-.quad	0x0000000000000000, 0x0000000200000000
-.LADD3:
-.quad	0x0000000000000000, 0x0000000300000000
-.LADD4:
-.quad	0x0000000000000000, 0x0000000400000000
-.LADD5:
-.quad	0x0000000000000000, 0x0000000500000000
-.LADD6:
-.quad	0x0000000000000000, 0x0000000600000000
-.LADD7:
-.quad	0x0000000000000000, 0x0000000700000000
-.LADD8:
-.quad	0x0000000000000000, 0x0000000800000000
-.Lxts_magic:
-.long	0x87,0,1,0
-.Lmasks:
-.quad	0x0101010101010101, 0x0101010101010101
-.quad	0x0202020202020202, 0x0202020202020202
-.quad	0x0404040404040404, 0x0404040404040404
-.quad	0x0808080808080808, 0x0808080808080808
-.LM0:
-.quad	0x02060a0e03070b0f, 0x0004080c0105090d
-.L63:
-.quad	0x6363636363636363, 0x6363636363636363
-.byte	66,105,116,45,115,108,105,99,101,100,32,65,69,83,32,102,111,114,32,120,56,54,95,54,52,47,83,83,83,69,51,44,32,69,109,105,108,105,97,32,75,195,164,115,112,101,114,44,32,80,101,116,101,114,32,83,99,104,119,97,98,101,44,32,65,110,100,121,32,80,111,108,121,97,107,111,118,0
-.align	64
-.size	_bsaes_const,.-_bsaes_const
diff --git a/deps/openssl/config/archs/linux-x86_64/asm_avx2/crypto/bn/rsaz-x86_64.s b/deps/openssl/config/archs/linux-x86_64/asm_avx2/crypto/bn/rsaz-x86_64.s
index f8e4a80588..7876e0b8f9 100644
--- a/deps/openssl/config/archs/linux-x86_64/asm_avx2/crypto/bn/rsaz-x86_64.s
+++ b/deps/openssl/config/archs/linux-x86_64/asm_avx2/crypto/bn/rsaz-x86_64.s
@@ -29,7 +29,7 @@ rsaz_512_sqr:
 	subq	$128+24,%rsp
 .cfi_adjust_cfa_offset	128+24
 .Lsqr_body:
-	movq	%rdx,%rbp
+.byte	102,72,15,110,202
 	movq	(%rsi),%rdx
 	movq	8(%rsi),%rax
 	movq	%rcx,128(%rsp)
@@ -44,6 +44,7 @@ rsaz_512_sqr:
 	movl	%r8d,128+8(%rsp)
 
 	movq	%rdx,%rbx
+	movq	%rax,%rbp
 	mulq	%rdx
 	movq	%rax,%r8
 	movq	16(%rsi),%rax
@@ -82,31 +83,29 @@ rsaz_512_sqr:
 	mulq	%rbx
 	addq	%rax,%r14
 	movq	%rbx,%rax
-	movq	%rdx,%r15
-	adcq	$0,%r15
+	adcq	$0,%rdx
 
+	xorq	%rcx,%rcx
 	addq	%r8,%r8
-	movq	%r9,%rcx
-	adcq	%r9,%r9
+	movq	%rdx,%r15
+	adcq	$0,%rcx
 
 	mulq	%rax
-	movq	%rax,(%rsp)
-	addq	%rdx,%r8
-	adcq	$0,%r9
+	addq	%r8,%rdx
+	adcq	$0,%rcx
 
-	movq	%r8,8(%rsp)
-	shrq	$63,%rcx
+	movq	%rax,(%rsp)
+	movq	%rdx,8(%rsp)
 
 
-	movq	8(%rsi),%r8
 	movq	16(%rsi),%rax
-	mulq	%r8
+	mulq	%rbp
 	addq	%rax,%r10
 	movq	24(%rsi),%rax
 	movq	%rdx,%rbx
 	adcq	$0,%rbx
 
-	mulq	%r8
+	mulq	%rbp
 	addq	%rax,%r11
 	movq	32(%rsi),%rax
 	adcq	$0,%rdx
@@ -114,7 +113,7 @@ rsaz_512_sqr:
 	movq	%rdx,%rbx
 	adcq	$0,%rbx
 
-	mulq	%r8
+	mulq	%rbp
 	addq	%rax,%r12
 	movq	40(%rsi),%rax
 	adcq	$0,%rdx
@@ -122,7 +121,7 @@ rsaz_512_sqr:
 	movq	%rdx,%rbx
 	adcq	$0,%rbx
 
-	mulq	%r8
+	mulq	%rbp
 	addq	%rax,%r13
 	movq	48(%rsi),%rax
 	adcq	$0,%rdx
@@ -130,7 +129,7 @@ rsaz_512_sqr:
 	movq	%rdx,%rbx
 	adcq	$0,%rbx
 
-	mulq	%r8
+	mulq	%rbp
 	addq	%rax,%r14
 	movq	56(%rsi),%rax
 	adcq	$0,%rdx
@@ -138,39 +137,39 @@ rsaz_512_sqr:
 	movq	%rdx,%rbx
 	adcq	$0,%rbx
 
-	mulq	%r8
+	mulq	%rbp
 	addq	%rax,%r15
-	movq	%r8,%rax
+	movq	%rbp,%rax
 	adcq	$0,%rdx
 	addq	%rbx,%r15
-	movq	%rdx,%r8
-	movq	%r10,%rdx
-	adcq	$0,%r8
+	adcq	$0,%rdx
 
-	addq	%rdx,%rdx
-	leaq	(%rcx,%r10,2),%r10
-	movq	%r11,%rbx
-	adcq	%r11,%r11
+	xorq	%rbx,%rbx
+	addq	%r9,%r9
+	movq	%rdx,%r8
+	adcq	%r10,%r10
+	adcq	$0,%rbx
 
 	mulq	%rax
+
+	addq	%rcx,%rax
+	movq	16(%rsi),%rbp
 	addq	%rax,%r9
+	movq	24(%rsi),%rax
 	adcq	%rdx,%r10
-	adcq	$0,%r11
+	adcq	$0,%rbx
 
 	movq	%r9,16(%rsp)
 	movq	%r10,24(%rsp)
-	shrq	$63,%rbx
 
 
-	movq	16(%rsi),%r9
-	movq	24(%rsi),%rax
-	mulq	%r9
+	mulq	%rbp
 	addq	%rax,%r12
 	movq	32(%rsi),%rax
 	movq	%rdx,%rcx
 	adcq	$0,%rcx
 
-	mulq	%r9
+	mulq	%rbp
 	addq	%rax,%r13
 	movq	40(%rsi),%rax
 	adcq	$0,%rdx
@@ -178,7 +177,7 @@ rsaz_512_sqr:
 	movq	%rdx,%rcx
 	adcq	$0,%rcx
 
-	mulq	%r9
+	mulq	%rbp
 	addq	%rax,%r14
 	movq	48(%rsi),%rax
 	adcq	$0,%rdx
@@ -186,9 +185,7 @@ rsaz_512_sqr:
 	movq	%rdx,%rcx
 	adcq	$0,%rcx
 
-	mulq	%r9
-	movq	%r12,%r10
-	leaq	(%rbx,%r12,2),%r12
+	mulq	%rbp
 	addq	%rax,%r15
 	movq	56(%rsi),%rax
 	adcq	$0,%rdx
@@ -196,36 +193,40 @@ rsaz_512_sqr:
 	movq	%rdx,%rcx
 	adcq	$0,%rcx
 
-	mulq	%r9
-	shrq	$63,%r10
+	mulq	%rbp
 	addq	%rax,%r8
-	movq	%r9,%rax
+	movq	%rbp,%rax
 	adcq	$0,%rdx
 	addq	%rcx,%r8
-	movq	%rdx,%r9
-	adcq	$0,%r9
+	adcq	$0,%rdx
 
-	movq	%r13,%rcx
-	leaq	(%r10,%r13,2),%r13
+	xorq	%rcx,%rcx
+	addq	%r11,%r11
+	movq	%rdx,%r9
+	adcq	%r12,%r12
+	adcq	$0,%rcx
 
 	mulq	%rax
+
+	addq	%rbx,%rax
+	movq	24(%rsi),%r10
 	addq	%rax,%r11
+	movq	32(%rsi),%rax
 	adcq	%rdx,%r12
-	adcq	$0,%r13
+	adcq	$0,%rcx
 
 	movq	%r11,32(%rsp)
 	movq	%r12,40(%rsp)
-	shrq	$63,%rcx
 
 
-	movq	24(%rsi),%r10
-	movq	32(%rsi),%rax
+	movq	%rax,%r11
 	mulq	%r10
 	addq	%rax,%r14
 	movq	40(%rsi),%rax
 	movq	%rdx,%rbx
 	adcq	$0,%rbx
 
+	movq	%rax,%r12
 	mulq	%r10
 	addq	%rax,%r15
 	movq	48(%rsi),%rax
@@ -234,9 +235,8 @@ rsaz_512_sqr:
 	movq	%rdx,%rbx
 	adcq	$0,%rbx
 
+	movq	%rax,%rbp
 	mulq	%r10
-	movq	%r14,%r12
-	leaq	(%rcx,%r14,2),%r14
 	addq	%rax,%r8
 	movq	56(%rsi),%rax
 	adcq	$0,%rdx
@@ -245,32 +245,33 @@ rsaz_512_sqr:
 	adcq	$0,%rbx
 
 	mulq	%r10
-	shrq	$63,%r12
 	addq	%rax,%r9
 	movq	%r10,%rax
 	adcq	$0,%rdx
 	addq	%rbx,%r9
-	movq	%rdx,%r10
-	adcq	$0,%r10
+	adcq	$0,%rdx
 
-	movq	%r15,%rbx
-	leaq	(%r12,%r15,2),%r15
+	xorq	%rbx,%rbx
+	addq	%r13,%r13
+	movq	%rdx,%r10
+	adcq	%r14,%r14
+	adcq	$0,%rbx
 
 	mulq	%rax
+
+	addq	%rcx,%rax
 	addq	%rax,%r13
+	movq	%r12,%rax
 	adcq	%rdx,%r14
-	adcq	$0,%r15
+	adcq	$0,%rbx
 
 	movq	%r13,48(%rsp)
 	movq	%r14,56(%rsp)
-	shrq	$63,%rbx
 
 
-	movq	32(%rsi),%r11
-	movq	40(%rsi),%rax
 	mulq	%r11
 	addq	%rax,%r8
-	movq	48(%rsi),%rax
+	movq	%rbp,%rax
 	movq	%rdx,%rcx
 	adcq	$0,%rcx
 
@@ -278,97 +279,99 @@ rsaz_512_sqr:
 	addq	%rax,%r9
 	movq	56(%rsi),%rax
 	adcq	$0,%rdx
-	movq	%r8,%r12
-	leaq	(%rbx,%r8,2),%r8
 	addq	%rcx,%r9
 	movq	%rdx,%rcx
 	adcq	$0,%rcx
 
+	movq	%rax,%r14
 	mulq	%r11
-	shrq	$63,%r12
 	addq	%rax,%r10
 	movq	%r11,%rax
 	adcq	$0,%rdx
 	addq	%rcx,%r10
-	movq	%rdx,%r11
-	adcq	$0,%r11
+	adcq	$0,%rdx
 
-	movq	%r9,%rcx
-	leaq	(%r12,%r9,2),%r9
+	xorq	%rcx,%rcx
+	addq	%r15,%r15
+	movq	%rdx,%r11
+	adcq	%r8,%r8
+	adcq	$0,%rcx
 
 	mulq	%rax
+
+	addq	%rbx,%rax
 	addq	%rax,%r15
+	movq	%rbp,%rax
 	adcq	%rdx,%r8
-	adcq	$0,%r9
+	adcq	$0,%rcx
 
 	movq	%r15,64(%rsp)
 	movq	%r8,72(%rsp)
-	shrq	$63,%rcx
 
 
-	movq	40(%rsi),%r12
-	movq	48(%rsi),%rax
 	mulq	%r12
 	addq	%rax,%r10
-	movq	56(%rsi),%rax
+	movq	%r14,%rax
 	movq	%rdx,%rbx
 	adcq	$0,%rbx
 
 	mulq	%r12
 	addq	%rax,%r11
 	movq	%r12,%rax
-	movq	%r10,%r15
-	leaq	(%rcx,%r10,2),%r10
 	adcq	$0,%rdx
-	shrq	$63,%r15
 	addq	%rbx,%r11
-	movq	%rdx,%r12
-	adcq	$0,%r12
+	adcq	$0,%rdx
 
-	movq	%r11,%rbx
-	leaq	(%r15,%r11,2),%r11
+	xorq	%rbx,%rbx
+	addq	%r9,%r9
+	movq	%rdx,%r12
+	adcq	%r10,%r10
+	adcq	$0,%rbx
 
 	mulq	%rax
+
+	addq	%rcx,%rax
 	addq	%rax,%r9
+	movq	%r14,%rax
 	adcq	%rdx,%r10
-	adcq	$0,%r11
+	adcq	$0,%rbx
 
 	movq	%r9,80(%rsp)
 	movq	%r10,88(%rsp)
 
 
-	movq	48(%rsi),%r13
-	movq	56(%rsi),%rax
-	mulq	%r13
+	mulq	%rbp
 	addq	%rax,%r12
-	movq	%r13,%rax
-	movq	%rdx,%r13
-	adcq	$0,%r13
+	movq	%rbp,%rax
+	adcq	$0,%rdx
 
-	xorq	%r14,%r14
-	shlq	$1,%rbx
+	xorq	%rcx,%rcx
+	addq	%r11,%r11
+	movq	%rdx,%r13
 	adcq	%r12,%r12
-	adcq	%r13,%r13
-	adcq	%r14,%r14
+	adcq	$0,%rcx
 
 	mulq	%rax
+
+	addq	%rbx,%rax
 	addq	%rax,%r11
+	movq	%r14,%rax
 	adcq	%rdx,%r12
-	adcq	$0,%r13
+	adcq	$0,%rcx
 
 	movq	%r11,96(%rsp)
 	movq	%r12,104(%rsp)
 
 
-	movq	56(%rsi),%rax
-	mulq	%rax
-	addq	%rax,%r13
-	adcq	$0,%rdx
+	xorq	%rbx,%rbx
+	addq	%r13,%r13
+	adcq	$0,%rbx
 
-	addq	%rdx,%r14
+	mulq	%rax
 
-	movq	%r13,112(%rsp)
-	movq	%r14,120(%rsp)
+	addq	%rcx,%rax
+	addq	%r13,%rax
+	adcq	%rbx,%rdx
 
 	movq	(%rsp),%r8
 	movq	8(%rsp),%r9
@@ -378,6 +381,10 @@ rsaz_512_sqr:
 	movq	40(%rsp),%r13
 	movq	48(%rsp),%r14
 	movq	56(%rsp),%r15
+.byte	102,72,15,126,205
+
+	movq	%rax,112(%rsp)
+	movq	%rdx,120(%rsp)
 
 	call	__rsaz_512_reduce
 
@@ -406,9 +413,9 @@ rsaz_512_sqr:
 .Loop_sqrx:
 	movl	%r8d,128+8(%rsp)
 .byte	102,72,15,110,199
-.byte	102,72,15,110,205
 
 	mulxq	%rax,%r8,%r9
+	movq	%rax,%rbx
 
 	mulxq	16(%rsi),%rcx,%r10
 	xorq	%rbp,%rbp
@@ -416,40 +423,39 @@ rsaz_512_sqr:
 	mulxq	24(%rsi),%rax,%r11
 	adcxq	%rcx,%r9
 
-	mulxq	32(%rsi),%rcx,%r12
+.byte	0xc4,0x62,0xf3,0xf6,0xa6,0x20,0x00,0x00,0x00
 	adcxq	%rax,%r10
 
-	mulxq	40(%rsi),%rax,%r13
+.byte	0xc4,0x62,0xfb,0xf6,0xae,0x28,0x00,0x00,0x00
 	adcxq	%rcx,%r11
 
-.byte	0xc4,0x62,0xf3,0xf6,0xb6,0x30,0x00,0x00,0x00
+	mulxq	48(%rsi),%rcx,%r14
 	adcxq	%rax,%r12
 	adcxq	%rcx,%r13
 
-.byte	0xc4,0x62,0xfb,0xf6,0xbe,0x38,0x00,0x00,0x00
+	mulxq	56(%rsi),%rax,%r15
 	adcxq	%rax,%r14
 	adcxq	%rbp,%r15
 
-	movq	%r9,%rcx
-	shldq	$1,%r8,%r9
-	shlq	$1,%r8
-
-	xorl	%ebp,%ebp
-	mulxq	%rdx,%rax,%rdx
-	adcxq	%rdx,%r8
-	movq	8(%rsi),%rdx
-	adcxq	%rbp,%r9
+	mulxq	%rdx,%rax,%rdi
+	movq	%rbx,%rdx
+	xorq	%rcx,%rcx
+	adoxq	%r8,%r8
+	adcxq	%rdi,%r8
+	adoxq	%rbp,%rcx
+	adcxq	%rbp,%rcx
 
 	movq	%rax,(%rsp)
 	movq	%r8,8(%rsp)
 
 
-	mulxq	16(%rsi),%rax,%rbx
+.byte	0xc4,0xe2,0xfb,0xf6,0x9e,0x10,0x00,0x00,0x00
 	adoxq	%rax,%r10
 	adcxq	%rbx,%r11
 
-.byte	0xc4,0x62,0xc3,0xf6,0x86,0x18,0x00,0x00,0x00
+	mulxq	24(%rsi),%rdi,%r8
 	adoxq	%rdi,%r11
+.byte	0x66
 	adcxq	%r8,%r12
 
 	mulxq	32(%rsi),%rax,%rbx
@@ -467,24 +473,25 @@ rsaz_512_sqr:
 .byte	0xc4,0x62,0xc3,0xf6,0x86,0x38,0x00,0x00,0x00
 	adoxq	%rdi,%r15
 	adcxq	%rbp,%r8
+	mulxq	%rdx,%rax,%rdi
 	adoxq	%rbp,%r8
+.byte	0x48,0x8b,0x96,0x10,0x00,0x00,0x00
 
-	movq	%r11,%rbx
-	shldq	$1,%r10,%r11
-	shldq	$1,%rcx,%r10
+	xorq	%rbx,%rbx
+	adoxq	%r9,%r9
 
-	xorl	%ebp,%ebp
-	mulxq	%rdx,%rax,%rcx
-	movq	16(%rsi),%rdx
+	adcxq	%rcx,%rax
+	adoxq	%r10,%r10
 	adcxq	%rax,%r9
-	adcxq	%rcx,%r10
-	adcxq	%rbp,%r11
+	adoxq	%rbp,%rbx
+	adcxq	%rdi,%r10
+	adcxq	%rbp,%rbx
 
 	movq	%r9,16(%rsp)
 .byte	0x4c,0x89,0x94,0x24,0x18,0x00,0x00,0x00
 
 
-.byte	0xc4,0x62,0xc3,0xf6,0x8e,0x18,0x00,0x00,0x00
+	mulxq	24(%rsi),%rdi,%r9
 	adoxq	%rdi,%r12
 	adcxq	%r9,%r13
 
@@ -492,7 +499,7 @@ rsaz_512_sqr:
 	adoxq	%rax,%r13
 	adcxq	%rcx,%r14
 
-	mulxq	40(%rsi),%rdi,%r9
+.byte	0xc4,0x62,0xc3,0xf6,0x8e,0x28,0x00,0x00,0x00
 	adoxq	%rdi,%r14
 	adcxq	%r9,%r15
 
@@ -500,27 +507,28 @@ rsaz_512_sqr:
 	adoxq	%rax,%r15
 	adcxq	%rcx,%r8
 
-.byte	0xc4,0x62,0xc3,0xf6,0x8e,0x38,0x00,0x00,0x00
+	mulxq	56(%rsi),%rdi,%r9
 	adoxq	%rdi,%r8
 	adcxq	%rbp,%r9
+	mulxq	%rdx,%rax,%rdi
 	adoxq	%rbp,%r9
+	movq	24(%rsi),%rdx
 
-	movq	%r13,%rcx
-	shldq	$1,%r12,%r13
-	shldq	$1,%rbx,%r12
+	xorq	%rcx,%rcx
+	adoxq	%r11,%r11
 
-	xorl	%ebp,%ebp
-	mulxq	%rdx,%rax,%rdx
+	adcxq	%rbx,%rax
+	adoxq	%r12,%r12
 	adcxq	%rax,%r11
-	adcxq	%rdx,%r12
-	movq	24(%rsi),%rdx
-	adcxq	%rbp,%r13
+	adoxq	%rbp,%rcx
+	adcxq	%rdi,%r12
+	adcxq	%rbp,%rcx
 
 	movq	%r11,32(%rsp)
-.byte	0x4c,0x89,0xa4,0x24,0x28,0x00,0x00,0x00
+	movq	%r12,40(%rsp)
 
 
-.byte	0xc4,0xe2,0xfb,0xf6,0x9e,0x20,0x00,0x00,0x00
+	mulxq	32(%rsi),%rax,%rbx
 	adoxq	%rax,%r14
 	adcxq	%rbx,%r15
 
@@ -535,25 +543,25 @@ rsaz_512_sqr:
 	mulxq	56(%rsi),%rdi,%r10
 	adoxq	%rdi,%r9
 	adcxq	%rbp,%r10
+	mulxq	%rdx,%rax,%rdi
 	adoxq	%rbp,%r10
+	movq	32(%rsi),%rdx
 
-.byte	0x66
-	movq	%r15,%rbx
-	shldq	$1,%r14,%r15
-	shldq	$1,%rcx,%r14
+	xorq	%rbx,%rbx
+	adoxq	%r13,%r13
 
-	xorl	%ebp,%ebp
-	mulxq	%rdx,%rax,%rdx
+	adcxq	%rcx,%rax
+	adoxq	%r14,%r14
 	adcxq	%rax,%r13
-	adcxq	%rdx,%r14
-	movq	32(%rsi),%rdx
-	adcxq	%rbp,%r15
+	adoxq	%rbp,%rbx
+	adcxq	%rdi,%r14
+	adcxq	%rbp,%rbx
 
 	movq	%r13,48(%rsp)
 	movq	%r14,56(%rsp)
 
 
-.byte	0xc4,0x62,0xc3,0xf6,0x9e,0x28,0x00,0x00,0x00
+	mulxq	40(%rsi),%rdi,%r11
 	adoxq	%rdi,%r8
 	adcxq	%r11,%r9
 
@@ -564,18 +572,19 @@ rsaz_512_sqr:
 	mulxq	56(%rsi),%rdi,%r11
 	adoxq	%rdi,%r10
 	adcxq	%rbp,%r11
+	mulxq	%rdx,%rax,%rdi
+	movq	40(%rsi),%rdx
 	adoxq	%rbp,%r11
 
-	movq	%r9,%rcx
-	shldq	$1,%r8,%r9
-	shldq	$1,%rbx,%r8
+	xorq	%rcx,%rcx
+	adoxq	%r15,%r15
 
-	xorl	%ebp,%ebp
-	mulxq	%rdx,%rax,%rdx
+	adcxq	%rbx,%rax
+	adoxq	%r8,%r8
 	adcxq	%rax,%r15
-	adcxq	%rdx,%r8
-	movq	40(%rsi),%rdx
-	adcxq	%rbp,%r9
+	adoxq	%rbp,%rcx
+	adcxq	%rdi,%r8
+	adcxq	%rbp,%rcx
 
 	movq	%r15,64(%rsp)
 	movq	%r8,72(%rsp)
@@ -588,18 +597,19 @@ rsaz_512_sqr:
 .byte	0xc4,0x62,0xc3,0xf6,0xa6,0x38,0x00,0x00,0x00
 	adoxq	%rdi,%r11
 	adcxq	%rbp,%r12
+	mulxq	%rdx,%rax,%rdi
 	adoxq	%rbp,%r12
+	movq	48(%rsi),%rdx
 
-	movq	%r11,%rbx
-	shldq	$1,%r10,%r11
-	shldq	$1,%rcx,%r10
+	xorq	%rbx,%rbx
+	adoxq	%r9,%r9
 
-	xorl	%ebp,%ebp
-	mulxq	%rdx,%rax,%rdx
+	adcxq	%rcx,%rax
+	adoxq	%r10,%r10
 	adcxq	%rax,%r9
-	adcxq	%rdx,%r10
-	movq	48(%rsi),%rdx
-	adcxq	%rbp,%r11
+	adcxq	%rdi,%r10
+	adoxq	%rbp,%rbx
+	adcxq	%rbp,%rbx
 
 	movq	%r9,80(%rsp)
 	movq	%r10,88(%rsp)
@@ -609,31 +619,31 @@ rsaz_512_sqr:
 	adoxq	%rax,%r12
 	adoxq	%rbp,%r13
 
-	xorq	%r14,%r14
-	shldq	$1,%r13,%r14
-	shldq	$1,%r12,%r13
-	shldq	$1,%rbx,%r12
+	mulxq	%rdx,%rax,%rdi
+	xorq	%rcx,%rcx
+	movq	56(%rsi),%rdx
+	adoxq	%r11,%r11
 
-	xorl	%ebp,%ebp
-	mulxq	%rdx,%rax,%rdx
+	adcxq	%rbx,%rax
+	adoxq	%r12,%r12
 	adcxq	%rax,%r11
-	adcxq	%rdx,%r12
-	movq	56(%rsi),%rdx
-	adcxq	%rbp,%r13
+	adoxq	%rbp,%rcx
+	adcxq	%rdi,%r12
+	adcxq	%rbp,%rcx
 
 .byte	0x4c,0x89,0x9c,0x24,0x60,0x00,0x00,0x00
 .byte	0x4c,0x89,0xa4,0x24,0x68,0x00,0x00,0x00
 
 
 	mulxq	%rdx,%rax,%rdx
-	adoxq	%rax,%r13
-	adoxq	%rbp,%rdx
+	xorq	%rbx,%rbx
+	adoxq	%r13,%r13
 
-.byte	0x66
-	addq	%rdx,%r14
+	adcxq	%rcx,%rax
+	adoxq	%rbp,%rbx
+	adcxq	%r13,%rax
+	adcxq	%rdx,%rbx
 
-	movq	%r13,112(%rsp)
-	movq	%r14,120(%rsp)
 .byte	102,72,15,126,199
 .byte	102,72,15,126,205
 
@@ -647,6 +657,9 @@ rsaz_512_sqr:
 	movq	48(%rsp),%r14
 	movq	56(%rsp),%r15
 
+	movq	%rax,112(%rsp)
+	movq	%rbx,120(%rsp)
+
 	call	__rsaz_512_reducex
 
 	addq	64(%rsp),%r8
@@ -1440,6 +1453,7 @@ rsaz_512_mul_by_one:
 .type	__rsaz_512_reduce,@function
 .align	32
 __rsaz_512_reduce:
+.cfi_startproc
 	movq	%r8,%rbx
 	imulq	128+8(%rsp),%rbx
 	movq	0(%rbp),%rax
@@ -1519,10 +1533,12 @@ __rsaz_512_reduce:
 	jne	.Lreduction_loop
 
 	.byte	0xf3,0xc3
+.cfi_endproc
 .size	__rsaz_512_reduce,.-__rsaz_512_reduce
 .type	__rsaz_512_reducex,@function
 .align	32
 __rsaz_512_reducex:
+.cfi_startproc
 
 	imulq	%r8,%rdx
 	xorq	%rsi,%rsi
@@ -1575,10 +1591,12 @@ __rsaz_512_reducex:
 	jne	.Lreduction_loopx
 
 	.byte	0xf3,0xc3
+.cfi_endproc
 .size	__rsaz_512_reducex,.-__rsaz_512_reducex
 .type	__rsaz_512_subtract,@function
 .align	32
 __rsaz_512_subtract:
+.cfi_startproc
 	movq	%r8,(%rdi)
 	movq	%r9,8(%rdi)
 	movq	%r10,16(%rdi)
@@ -1632,10 +1650,12 @@ __rsaz_512_subtract:
 	movq	%r15,56(%rdi)
 
 	.byte	0xf3,0xc3
+.cfi_endproc
 .size	__rsaz_512_subtract,.-__rsaz_512_subtract
 .type	__rsaz_512_mul,@function
 .align	32
 __rsaz_512_mul:
+.cfi_startproc
 	leaq	8(%rsp),%rdi
 
 	movq	(%rsi),%rax
@@ -1774,10 +1794,12 @@ __rsaz_512_mul:
 	movq	%r15,56(%rdi)
 
 	.byte	0xf3,0xc3
+.cfi_endproc
 .size	__rsaz_512_mul,.-__rsaz_512_mul
 .type	__rsaz_512_mulx,@function
 .align	32
 __rsaz_512_mulx:
+.cfi_startproc
 	mulxq	(%rsi),%rbx,%r8
 	movq	$-6,%rcx
 
@@ -1894,11 +1916,13 @@ __rsaz_512_mulx:
 	movq	%r15,8+64+56(%rsp)
 
 	.byte	0xf3,0xc3
+.cfi_endproc
 .size	__rsaz_512_mulx,.-__rsaz_512_mulx
 .globl	rsaz_512_scatter4
 .type	rsaz_512_scatter4,@function
 .align	16
 rsaz_512_scatter4:
+.cfi_startproc
 	leaq	(%rdi,%rdx,8),%rdi
 	movl	$8,%r9d
 	jmp	.Loop_scatter
@@ -1911,12 +1935,14 @@ rsaz_512_scatter4:
 	decl	%r9d
 	jnz	.Loop_scatter
 	.byte	0xf3,0xc3
+.cfi_endproc
 .size	rsaz_512_scatter4,.-rsaz_512_scatter4
 
 .globl	rsaz_512_gather4
 .type	rsaz_512_gather4,@function
 .align	16
 rsaz_512_gather4:
+.cfi_startproc
 	movd	%edx,%xmm8
 	movdqa	.Linc+16(%rip),%xmm1
 	movdqa	.Linc(%rip),%xmm0
@@ -1980,6 +2006,7 @@ rsaz_512_gather4:
 	jnz	.Loop_gather
 	.byte	0xf3,0xc3
 .LSEH_end_rsaz_512_gather4:
+.cfi_endproc
 .size	rsaz_512_gather4,.-rsaz_512_gather4
 
 .align	64
diff --git a/deps/openssl/config/archs/linux-x86_64/asm_avx2/crypto/bn/x86_64-mont5.s b/deps/openssl/config/archs/linux-x86_64/asm_avx2/crypto/bn/x86_64-mont5.s
index df4b6610a0..40a60a3c8f 100644
--- a/deps/openssl/config/archs/linux-x86_64/asm_avx2/crypto/bn/x86_64-mont5.s
+++ b/deps/openssl/config/archs/linux-x86_64/asm_avx2/crypto/bn/x86_64-mont5.s
@@ -550,6 +550,7 @@ bn_mul4x_mont_gather5:
 .type	mul4x_internal,@function
 .align	32
 mul4x_internal:
+.cfi_startproc
 	shlq	$5,%r9
 	movd	8(%rax),%xmm5
 	leaq	.Linc(%rip),%rax
@@ -1071,6 +1072,7 @@ mul4x_internal:
 	movq	16(%rbp),%r14
 	movq	24(%rbp),%r15
 	jmp	.Lsqr4x_sub_entry
+.cfi_endproc
 .size	mul4x_internal,.-mul4x_internal
 .globl	bn_power5
 .type	bn_power5,@function
@@ -1213,6 +1215,7 @@ bn_power5:
 .align	32
 bn_sqr8x_internal:
 __bn_sqr8x_internal:
+.cfi_startproc
 
 
 
@@ -1987,10 +1990,12 @@ __bn_sqr8x_reduction:
 	cmpq	%rdx,%rdi
 	jb	.L8x_reduction_loop
 	.byte	0xf3,0xc3
+.cfi_endproc
 .size	bn_sqr8x_internal,.-bn_sqr8x_internal
 .type	__bn_post4x_internal,@function
 .align	32
 __bn_post4x_internal:
+.cfi_startproc
 	movq	0(%rbp),%r12
 	leaq	(%rdi,%r9,1),%rbx
 	movq	%r9,%rcx
@@ -2041,15 +2046,18 @@ __bn_post4x_internal:
 	movq	%r9,%r10
 	negq	%r9
 	.byte	0xf3,0xc3
+.cfi_endproc
 .size	__bn_post4x_internal,.-__bn_post4x_internal
 .globl	bn_from_montgomery
 .type	bn_from_montgomery,@function
 .align	32
 bn_from_montgomery:
+.cfi_startproc
 	testl	$7,%r9d
 	jz	bn_from_mont8x
 	xorl	%eax,%eax
 	.byte	0xf3,0xc3
+.cfi_endproc
 .size	bn_from_montgomery,.-bn_from_montgomery
 
 .type	bn_from_mont8x,@function
@@ -2333,6 +2341,7 @@ bn_mulx4x_mont_gather5:
 .type	mulx4x_internal,@function
 .align	32
 mulx4x_internal:
+.cfi_startproc
 	movq	%r9,8(%rsp)
 	movq	%r9,%r10
 	negq	%r9
@@ -2751,6 +2760,7 @@ mulx4x_internal:
 	movq	16(%rbp),%r14
 	movq	24(%rbp),%r15
 	jmp	.Lsqrx4x_sub_entry
+.cfi_endproc
 .size	mulx4x_internal,.-mulx4x_internal
 .type	bn_powerx5,@function
 .align	32
@@ -3509,6 +3519,7 @@ __bn_sqrx8x_reduction:
 .size	bn_sqrx8x_internal,.-bn_sqrx8x_internal
 .align	32
 __bn_postx4x_internal:
+.cfi_startproc
 	movq	0(%rbp),%r12
 	movq	%rcx,%r10
 	movq	%rcx,%r9
@@ -3556,11 +3567,13 @@ __bn_postx4x_internal:
 	negq	%r9
 
 	.byte	0xf3,0xc3
+.cfi_endproc
 .size	__bn_postx4x_internal,.-__bn_postx4x_internal
 .globl	bn_get_bits5
 .type	bn_get_bits5,@function
 .align	16
 bn_get_bits5:
+.cfi_startproc
 	leaq	0(%rdi),%r10
 	leaq	1(%rdi),%r11
 	movl	%esi,%ecx
@@ -3574,12 +3587,14 @@ bn_get_bits5:
 	shrl	%cl,%eax
 	andl	$31,%eax
 	.byte	0xf3,0xc3
+.cfi_endproc
 .size	bn_get_bits5,.-bn_get_bits5
 
 .globl	bn_scatter5
 .type	bn_scatter5,@function
 .align	16
 bn_scatter5:
+.cfi_startproc
 	cmpl	$0,%esi
 	jz	.Lscatter_epilogue
 	leaq	(%rdx,%rcx,8),%rdx
@@ -3592,6 +3607,7 @@ bn_scatter5:
 	jnz	.Lscatter
 .Lscatter_epilogue:
 	.byte	0xf3,0xc3
+.cfi_endproc
 .size	bn_scatter5,.-bn_scatter5
 
 .globl	bn_gather5
@@ -3599,6 +3615,7 @@ bn_scatter5:
 .align	32
 bn_gather5:
 .LSEH_begin_bn_gather5:
+.cfi_startproc
 
 .byte	0x4c,0x8d,0x14,0x24
 .byte	0x48,0x81,0xec,0x08,0x01,0x00,0x00
@@ -3756,6 +3773,7 @@ bn_gather5:
 	leaq	(%r10),%rsp
 	.byte	0xf3,0xc3
 .LSEH_end_bn_gather5:
+.cfi_endproc
 .size	bn_gather5,.-bn_gather5
 .align	64
 .Linc:
diff --git a/deps/openssl/config/archs/linux-x86_64/asm_avx2/crypto/buildinf.h b/deps/openssl/config/archs/linux-x86_64/asm_avx2/crypto/buildinf.h
index 51e776d7cb..62ab79d821 100644
--- a/deps/openssl/config/archs/linux-x86_64/asm_avx2/crypto/buildinf.h
+++ b/deps/openssl/config/archs/linux-x86_64/asm_avx2/crypto/buildinf.h
@@ -11,7 +11,7 @@
  */
 
 #define PLATFORM "platform: linux-x86_64"
-#define DATE "built on: Fri Sep 13 16:00:30 2019 UTC"
+#define DATE "built on: Wed Mar 18 21:07:18 2020 UTC"
 
 /*
  * Generate compiler_flags as an array of individual characters. This is a
@@ -38,10 +38,10 @@ static const char compiler_flags[] = {
     'S','M',' ','-','D','S','H','A','5','1','2','_','A','S','M',' ',
     '-','D','K','E','C','C','A','K','1','6','0','0','_','A','S','M',
     ' ','-','D','R','C','4','_','A','S','M',' ','-','D','M','D','5',
-    '_','A','S','M',' ','-','D','V','P','A','E','S','_','A','S','M',
-    ' ','-','D','G','H','A','S','H','_','A','S','M',' ','-','D','E',
-    'C','P','_','N','I','S','T','Z','2','5','6','_','A','S','M',' ',
-    '-','D','X','2','5','5','1','9','_','A','S','M',' ','-','D','P',
-    'O','L','Y','1','3','0','5','_','A','S','M',' ','-','D','N','D',
-    'E','B','U','G','\0'
+    '_','A','S','M',' ','-','D','A','E','S','N','I','_','A','S','M',
+    ' ','-','D','V','P','A','E','S','_','A','S','M',' ','-','D','G',
+    'H','A','S','H','_','A','S','M',' ','-','D','E','C','P','_','N',
+    'I','S','T','Z','2','5','6','_','A','S','M',' ','-','D','X','2',
+    '5','5','1','9','_','A','S','M',' ','-','D','P','O','L','Y','1',
+    '3','0','5','_','A','S','M',' ','-','D','N','D','E','B','U','G','\0'
 };
diff --git a/deps/openssl/config/archs/linux-x86_64/asm_avx2/crypto/camellia/cmll-x86_64.s b/deps/openssl/config/archs/linux-x86_64/asm_avx2/crypto/camellia/cmll-x86_64.s
index 405566b01c..eeb20dd229 100644
--- a/deps/openssl/config/archs/linux-x86_64/asm_avx2/crypto/camellia/cmll-x86_64.s
+++ b/deps/openssl/config/archs/linux-x86_64/asm_avx2/crypto/camellia/cmll-x86_64.s
@@ -5,11 +5,13 @@
 .type	Camellia_EncryptBlock,@function
 .align	16
 Camellia_EncryptBlock:
+.cfi_startproc
 	movl	$128,%eax
 	subl	%edi,%eax
 	movl	$3,%edi
 	adcl	$0,%edi
 	jmp	.Lenc_rounds
+.cfi_endproc
 .size	Camellia_EncryptBlock,.-Camellia_EncryptBlock
 
 .globl	Camellia_EncryptBlock_Rounds
@@ -83,6 +85,7 @@ Camellia_EncryptBlock_Rounds:
 .type	_x86_64_Camellia_encrypt,@function
 .align	16
 _x86_64_Camellia_encrypt:
+.cfi_startproc
 	xorl	0(%r14),%r9d
 	xorl	4(%r14),%r8d
 	xorl	8(%r14),%r11d
@@ -285,6 +288,7 @@ _x86_64_Camellia_encrypt:
 	movl	%edx,%r11d
 
 .byte	0xf3,0xc3
+.cfi_endproc
 .size	_x86_64_Camellia_encrypt,.-_x86_64_Camellia_encrypt
 
 
@@ -292,11 +296,13 @@ _x86_64_Camellia_encrypt:
 .type	Camellia_DecryptBlock,@function
 .align	16
 Camellia_DecryptBlock:
+.cfi_startproc
 	movl	$128,%eax
 	subl	%edi,%eax
 	movl	$3,%edi
 	adcl	$0,%edi
 	jmp	.Ldec_rounds
+.cfi_endproc
 .size	Camellia_DecryptBlock,.-Camellia_DecryptBlock
 
 .globl	Camellia_DecryptBlock_Rounds
@@ -370,6 +376,7 @@ Camellia_DecryptBlock_Rounds:
 .type	_x86_64_Camellia_decrypt,@function
 .align	16
 _x86_64_Camellia_decrypt:
+.cfi_startproc
 	xorl	0(%r14),%r9d
 	xorl	4(%r14),%r8d
 	xorl	8(%r14),%r11d
@@ -573,6 +580,7 @@ _x86_64_Camellia_decrypt:
 	movl	%ebx,%r11d
 
 .byte	0xf3,0xc3
+.cfi_endproc
 .size	_x86_64_Camellia_decrypt,.-_x86_64_Camellia_decrypt
 .globl	Camellia_Ekeygen
 .type	Camellia_Ekeygen,@function
diff --git a/deps/openssl/config/archs/linux-x86_64/asm_avx2/crypto/ec/ecp_nistz256-x86_64.s b/deps/openssl/config/archs/linux-x86_64/asm_avx2/crypto/ec/ecp_nistz256-x86_64.s
index 62b9ac6616..5c9e405041 100644
--- a/deps/openssl/config/archs/linux-x86_64/asm_avx2/crypto/ec/ecp_nistz256-x86_64.s
+++ b/deps/openssl/config/archs/linux-x86_64/asm_avx2/crypto/ec/ecp_nistz256-x86_64.s
@@ -3874,10 +3874,12 @@ ecp_nistz256_ord_sqr_montx:
 .type	ecp_nistz256_to_mont,@function
 .align	32
 ecp_nistz256_to_mont:
+.cfi_startproc
 	movl	$0x80100,%ecx
 	andl	OPENSSL_ia32cap_P+8(%rip),%ecx
 	leaq	.LRR(%rip),%rdx
 	jmp	.Lmul_mont
+.cfi_endproc
 .size	ecp_nistz256_to_mont,.-ecp_nistz256_to_mont
 
 
@@ -4821,6 +4823,7 @@ ecp_nistz256_from_mont:
 .type	ecp_nistz256_scatter_w5,@function
 .align	32
 ecp_nistz256_scatter_w5:
+.cfi_startproc
 	leal	-3(%rdx,%rdx,2),%edx
 	movdqa	0(%rsi),%xmm0
 	shll	$5,%edx
@@ -4837,6 +4840,7 @@ ecp_nistz256_scatter_w5:
 	movdqa	%xmm5,80(%rdi,%rdx,1)
 
 	.byte	0xf3,0xc3
+.cfi_endproc
 .size	ecp_nistz256_scatter_w5,.-ecp_nistz256_scatter_w5
 
 
@@ -4910,6 +4914,7 @@ ecp_nistz256_gather_w5:
 .type	ecp_nistz256_scatter_w7,@function
 .align	32
 ecp_nistz256_scatter_w7:
+.cfi_startproc
 	movdqu	0(%rsi),%xmm0
 	shll	$6,%edx
 	movdqu	16(%rsi),%xmm1
@@ -4921,6 +4926,7 @@ ecp_nistz256_scatter_w7:
 	movdqa	%xmm3,48(%rdi,%rdx,1)
 
 	.byte	0xf3,0xc3
+.cfi_endproc
 .size	ecp_nistz256_scatter_w7,.-ecp_nistz256_scatter_w7
 
 
@@ -5655,26 +5661,16 @@ ecp_nistz256_point_add:
 	orq	%r8,%r12
 	orq	%r9,%r12
 
-.byte	0x3e
-	jnz	.Ladd_proceedq
 .byte	102,73,15,126,208
 .byte	102,73,15,126,217
-	testq	%r8,%r8
-	jnz	.Ladd_proceedq
-	testq	%r9,%r9
-	jz	.Ladd_doubleq
 
-.byte	102,72,15,126,199
-	pxor	%xmm0,%xmm0
-	movdqu	%xmm0,0(%rdi)
-	movdqu	%xmm0,16(%rdi)
-	movdqu	%xmm0,32(%rdi)
-	movdqu	%xmm0,48(%rdi)
-	movdqu	%xmm0,64(%rdi)
-	movdqu	%xmm0,80(%rdi)
-	jmp	.Ladd_doneq
+	orq	%r8,%r12
+	orq	%r9,%r12
+
+
+.byte	0x3e
+	jnz	.Ladd_proceedq
 
-.align	32
 .Ladd_doubleq:
 .byte	102,72,15,126,206
 .byte	102,72,15,126,199
@@ -6774,26 +6770,16 @@ ecp_nistz256_point_addx:
 	orq	%r8,%r12
 	orq	%r9,%r12
 
-.byte	0x3e
-	jnz	.Ladd_proceedx
 .byte	102,73,15,126,208
 .byte	102,73,15,126,217
-	testq	%r8,%r8
-	jnz	.Ladd_proceedx
-	testq	%r9,%r9
-	jz	.Ladd_doublex
 
-.byte	102,72,15,126,199
-	pxor	%xmm0,%xmm0
-	movdqu	%xmm0,0(%rdi)
-	movdqu	%xmm0,16(%rdi)
-	movdqu	%xmm0,32(%rdi)
-	movdqu	%xmm0,48(%rdi)
-	movdqu	%xmm0,64(%rdi)
-	movdqu	%xmm0,80(%rdi)
-	jmp	.Ladd_donex
+	orq	%r8,%r12
+	orq	%r9,%r12
+
+
+.byte	0x3e
+	jnz	.Ladd_proceedx
 
-.align	32
 .Ladd_doublex:
 .byte	102,72,15,126,206
 .byte	102,72,15,126,199
diff --git a/deps/openssl/config/archs/linux-x86_64/asm_avx2/crypto/ec/x25519-x86_64.s b/deps/openssl/config/archs/linux-x86_64/asm_avx2/crypto/ec/x25519-x86_64.s
index 2a18eaee28..1788e568cd 100644
--- a/deps/openssl/config/archs/linux-x86_64/asm_avx2/crypto/ec/x25519-x86_64.s
+++ b/deps/openssl/config/archs/linux-x86_64/asm_avx2/crypto/ec/x25519-x86_64.s
@@ -400,12 +400,14 @@ x25519_fe51_mul121666:
 .type	x25519_fe64_eligible,@function
 .align	32
 x25519_fe64_eligible:
+.cfi_startproc
 	movl	OPENSSL_ia32cap_P+8(%rip),%ecx
 	xorl	%eax,%eax
 	andl	$0x80100,%ecx
 	cmpl	$0x80100,%ecx
 	cmovel	%ecx,%eax
 	.byte	0xf3,0xc3
+.cfi_endproc
 .size	x25519_fe64_eligible,.-x25519_fe64_eligible
 
 .globl	x25519_fe64_mul
@@ -648,6 +650,7 @@ x25519_fe64_sqr:
 .align	32
 x25519_fe64_mul121666:
 .Lfe64_mul121666_body:
+.cfi_startproc
 	movl	$121666,%edx
 	mulxq	0(%rsi),%r8,%rcx
 	mulxq	8(%rsi),%r9,%rax
@@ -676,6 +679,7 @@ x25519_fe64_mul121666:
 
 .Lfe64_mul121666_epilogue:
 	.byte	0xf3,0xc3
+.cfi_endproc
 .size	x25519_fe64_mul121666,.-x25519_fe64_mul121666
 
 .globl	x25519_fe64_add
@@ -683,6 +687,7 @@ x25519_fe64_mul121666:
 .align	32
 x25519_fe64_add:
 .Lfe64_add_body:
+.cfi_startproc
 	movq	0(%rsi),%r8
 	movq	8(%rsi),%r9
 	movq	16(%rsi),%r10
@@ -711,6 +716,7 @@ x25519_fe64_add:
 
 .Lfe64_add_epilogue:
 	.byte	0xf3,0xc3
+.cfi_endproc
 .size	x25519_fe64_add,.-x25519_fe64_add
 
 .globl	x25519_fe64_sub
@@ -718,6 +724,7 @@ x25519_fe64_add:
 .align	32
 x25519_fe64_sub:
 .Lfe64_sub_body:
+.cfi_startproc
 	movq	0(%rsi),%r8
 	movq	8(%rsi),%r9
 	movq	16(%rsi),%r10
@@ -746,6 +753,7 @@ x25519_fe64_sub:
 
 .Lfe64_sub_epilogue:
 	.byte	0xf3,0xc3
+.cfi_endproc
 .size	x25519_fe64_sub,.-x25519_fe64_sub
 
 .globl	x25519_fe64_tobytes
@@ -753,6 +761,7 @@ x25519_fe64_sub:
 .align	32
 x25519_fe64_tobytes:
 .Lfe64_to_body:
+.cfi_startproc
 	movq	0(%rsi),%r8
 	movq	8(%rsi),%r9
 	movq	16(%rsi),%r10
@@ -788,5 +797,6 @@ x25519_fe64_tobytes:
 
 .Lfe64_to_epilogue:
 	.byte	0xf3,0xc3
+.cfi_endproc
 .size	x25519_fe64_tobytes,.-x25519_fe64_tobytes
 .byte	88,50,53,53,49,57,32,112,114,105,109,105,116,105,118,101,115,32,102,111,114,32,120,56,54,95,54,52,44,32,67,82,89,80,84,79,71,65,77,83,32,98,121,32,60,97,112,112,114,111,64,111,112,101,110,115,115,108,46,111,114,103,62,0
diff --git a/deps/openssl/config/archs/linux-x86_64/asm_avx2/crypto/include/internal/bn_conf.h b/deps/openssl/config/archs/linux-x86_64/asm_avx2/crypto/include/internal/bn_conf.h
index 34bd8b78b4..5312ef5a7a 100644
--- a/deps/openssl/config/archs/linux-x86_64/asm_avx2/crypto/include/internal/bn_conf.h
+++ b/deps/openssl/config/archs/linux-x86_64/asm_avx2/crypto/include/internal/bn_conf.h
@@ -1,5 +1,5 @@
 /* WARNING: do not edit! */
-/* Generated by Makefile from crypto/include/internal/bn_conf.h.in */
+/* Generated by Makefile from include/crypto/bn_conf.h.in */
 /*
  * Copyright 2016 The OpenSSL Project Authors. All Rights Reserved.
  *
@@ -9,8 +9,8 @@
  * https://www.openssl.org/source/license.html
  */
 
-#ifndef HEADER_BN_CONF_H
-# define HEADER_BN_CONF_H
+#ifndef OSSL_CRYPTO_BN_CONF_H
+# define OSSL_CRYPTO_BN_CONF_H
 
 /*
  * The contents of this file are not used in the UEFI build, as
diff --git a/deps/openssl/config/archs/linux-x86_64/asm_avx2/crypto/include/internal/dso_conf.h b/deps/openssl/config/archs/linux-x86_64/asm_avx2/crypto/include/internal/dso_conf.h
index 252266ec2a..4b1167c3d8 100644
--- a/deps/openssl/config/archs/linux-x86_64/asm_avx2/crypto/include/internal/dso_conf.h
+++ b/deps/openssl/config/archs/linux-x86_64/asm_avx2/crypto/include/internal/dso_conf.h
@@ -1,5 +1,5 @@
 /* WARNING: do not edit! */
-/* Generated by Makefile from crypto/include/internal/dso_conf.h.in */
+/* Generated by Makefile from include/crypto/dso_conf.h.in */
 /*
  * Copyright 2016-2019 The OpenSSL Project Authors. All Rights Reserved.
  *
@@ -9,8 +9,8 @@
  * https://www.openssl.org/source/license.html
  */
 
-#ifndef HEADER_DSO_CONF_H
-# define HEADER_DSO_CONF_H
+#ifndef OSSL_CRYPTO_DSO_CONF_H
+# define OSSL_CRYPTO_DSO_CONF_H
 # define DSO_DLFCN
 # define HAVE_DLFCN_H
 # define DSO_EXTENSION ".so"
diff --git a/deps/openssl/config/archs/linux-x86_64/asm_avx2/crypto/modes/aesni-gcm-x86_64.s b/deps/openssl/config/archs/linux-x86_64/asm_avx2/crypto/modes/aesni-gcm-x86_64.s
index 6a7a9577c7..01d89630a4 100644
--- a/deps/openssl/config/archs/linux-x86_64/asm_avx2/crypto/modes/aesni-gcm-x86_64.s
+++ b/deps/openssl/config/archs/linux-x86_64/asm_avx2/crypto/modes/aesni-gcm-x86_64.s
@@ -3,6 +3,7 @@
 .type	_aesni_ctr32_ghash_6x,@function
 .align	32
 _aesni_ctr32_ghash_6x:
+.cfi_startproc
 	vmovdqu	32(%r11),%xmm2
 	subq	$6,%rdx
 	vpxor	%xmm4,%xmm4,%xmm4
@@ -310,6 +311,7 @@ _aesni_ctr32_ghash_6x:
 	vpxor	%xmm4,%xmm8,%xmm8
 
 	.byte	0xf3,0xc3
+.cfi_endproc
 .size	_aesni_ctr32_ghash_6x,.-_aesni_ctr32_ghash_6x
 .globl	aesni_gcm_decrypt
 .type	aesni_gcm_decrypt,@function
@@ -416,6 +418,7 @@ aesni_gcm_decrypt:
 .type	_aesni_ctr32_6x,@function
 .align	32
 _aesni_ctr32_6x:
+.cfi_startproc
 	vmovdqu	0-128(%rcx),%xmm4
 	vmovdqu	32(%r11),%xmm2
 	leaq	-1(%rbp),%r13
@@ -502,6 +505,7 @@ _aesni_ctr32_6x:
 	vpshufb	%xmm0,%xmm1,%xmm1
 	vpxor	%xmm4,%xmm14,%xmm14
 	jmp	.Loop_ctr32
+.cfi_endproc
 .size	_aesni_ctr32_6x,.-_aesni_ctr32_6x
 
 .globl	aesni_gcm_encrypt
diff --git a/deps/openssl/config/archs/linux-x86_64/asm_avx2/crypto/poly1305/poly1305-x86_64.s b/deps/openssl/config/archs/linux-x86_64/asm_avx2/crypto/poly1305/poly1305-x86_64.s
index 6f4cac8d39..2636c52bbe 100644
--- a/deps/openssl/config/archs/linux-x86_64/asm_avx2/crypto/poly1305/poly1305-x86_64.s
+++ b/deps/openssl/config/archs/linux-x86_64/asm_avx2/crypto/poly1305/poly1305-x86_64.s
@@ -12,6 +12,7 @@
 .type	poly1305_init,@function
 .align	32
 poly1305_init:
+.cfi_startproc
 	xorq	%rax,%rax
 	movq	%rax,0(%rdi)
 	movq	%rax,8(%rdi)
@@ -42,6 +43,7 @@ poly1305_init:
 	movl	$1,%eax
 .Lno_key:
 	.byte	0xf3,0xc3
+.cfi_endproc
 .size	poly1305_init,.-poly1305_init
 
 .type	poly1305_blocks,@function
@@ -162,6 +164,7 @@ poly1305_blocks:
 .type	poly1305_emit,@function
 .align	32
 poly1305_emit:
+.cfi_startproc
 .Lemit:
 	movq	0(%rdi),%r8
 	movq	8(%rdi),%r9
@@ -182,10 +185,12 @@ poly1305_emit:
 	movq	%rcx,8(%rsi)
 
 	.byte	0xf3,0xc3
+.cfi_endproc
 .size	poly1305_emit,.-poly1305_emit
 .type	__poly1305_block,@function
 .align	32
 __poly1305_block:
+.cfi_startproc
 	mulq	%r14
 	movq	%rax,%r9
 	movq	%r11,%rax
@@ -225,11 +230,13 @@ __poly1305_block:
 	adcq	$0,%rbx
 	adcq	$0,%rbp
 	.byte	0xf3,0xc3
+.cfi_endproc
 .size	__poly1305_block,.-__poly1305_block
 
 .type	__poly1305_init_avx,@function
 .align	32
 __poly1305_init_avx:
+.cfi_startproc
 	movq	%r11,%r14
 	movq	%r12,%rbx
 	xorq	%rbp,%rbp
@@ -387,6 +394,7 @@ __poly1305_init_avx:
 
 	leaq	-48-64(%rdi),%rdi
 	.byte	0xf3,0xc3
+.cfi_endproc
 .size	__poly1305_init_avx,.-__poly1305_init_avx
 
 .type	poly1305_blocks_avx,@function
@@ -1227,6 +1235,7 @@ poly1305_blocks_avx:
 .type	poly1305_emit_avx,@function
 .align	32
 poly1305_emit_avx:
+.cfi_startproc
 	cmpl	$0,20(%rdi)
 	je	.Lemit
 
@@ -1277,6 +1286,7 @@ poly1305_emit_avx:
 	movq	%rcx,8(%rsi)
 
 	.byte	0xf3,0xc3
+.cfi_endproc
 .size	poly1305_emit_avx,.-poly1305_emit_avx
 .type	poly1305_blocks_avx2,@function
 .align	32
@@ -1959,6 +1969,7 @@ poly1305_blocks_avx2:
 .type	xor128_encrypt_n_pad,@function
 .align	16
 xor128_encrypt_n_pad:
+.cfi_startproc
 	subq	%rdx,%rsi
 	subq	%rdx,%rdi
 	movq	%rcx,%r10
@@ -2000,12 +2011,14 @@ xor128_encrypt_n_pad:
 .Ldone_enc:
 	movq	%rdx,%rax
 	.byte	0xf3,0xc3
+.cfi_endproc
 .size	xor128_encrypt_n_pad,.-xor128_encrypt_n_pad
 
 .globl	xor128_decrypt_n_pad
 .type	xor128_decrypt_n_pad,@function
 .align	16
 xor128_decrypt_n_pad:
+.cfi_startproc
 	subq	%rdx,%rsi
 	subq	%rdx,%rdi
 	movq	%rcx,%r10
@@ -2051,4 +2064,5 @@ xor128_decrypt_n_pad:
 .Ldone_dec:
 	movq	%rdx,%rax
 	.byte	0xf3,0xc3
+.cfi_endproc
 .size	xor128_decrypt_n_pad,.-xor128_decrypt_n_pad
diff --git a/deps/openssl/config/archs/linux-x86_64/asm_avx2/crypto/rc4/rc4-x86_64.s b/deps/openssl/config/archs/linux-x86_64/asm_avx2/crypto/rc4/rc4-x86_64.s
index fba70351d4..b97c757550 100644
--- a/deps/openssl/config/archs/linux-x86_64/asm_avx2/crypto/rc4/rc4-x86_64.s
+++ b/deps/openssl/config/archs/linux-x86_64/asm_avx2/crypto/rc4/rc4-x86_64.s
@@ -4,11 +4,12 @@
 .globl	RC4
 .type	RC4,@function
 .align	16
-RC4:	orq	%rsi,%rsi
+RC4:
+.cfi_startproc
+	orq	%rsi,%rsi
 	jne	.Lentry
 	.byte	0xf3,0xc3
 .Lentry:
-.cfi_startproc	
 	pushq	%rbx
 .cfi_adjust_cfa_offset	8
 .cfi_offset	%rbx,-16
@@ -533,6 +534,7 @@ RC4:	orq	%rsi,%rsi
 .type	RC4_set_key,@function
 .align	16
 RC4_set_key:
+.cfi_startproc
 	leaq	8(%rdi),%rdi
 	leaq	(%rdx,%rsi,1),%rdx
 	negq	%rsi
@@ -599,12 +601,14 @@ RC4_set_key:
 	movl	%eax,-8(%rdi)
 	movl	%eax,-4(%rdi)
 	.byte	0xf3,0xc3
+.cfi_endproc
 .size	RC4_set_key,.-RC4_set_key
 
 .globl	RC4_options
 .type	RC4_options,@function
 .align	16
 RC4_options:
+.cfi_startproc
 	leaq	.Lopts(%rip),%rax
 	movl	OPENSSL_ia32cap_P(%rip),%edx
 	btl	$20,%edx
@@ -617,6 +621,7 @@ RC4_options:
 	addq	$12,%rax
 .Ldone:
 	.byte	0xf3,0xc3
+.cfi_endproc
 .align	64
 .Lopts:
 .byte	114,99,52,40,56,120,44,105,110,116,41,0
diff --git a/deps/openssl/config/archs/linux-x86_64/asm_avx2/crypto/sha/keccak1600-x86_64.s b/deps/openssl/config/archs/linux-x86_64/asm_avx2/crypto/sha/keccak1600-x86_64.s
index e511f25035..09617d014b 100644
--- a/deps/openssl/config/archs/linux-x86_64/asm_avx2/crypto/sha/keccak1600-x86_64.s
+++ b/deps/openssl/config/archs/linux-x86_64/asm_avx2/crypto/sha/keccak1600-x86_64.s
@@ -3,6 +3,7 @@
 .type	__KeccakF1600,@function
 .align	32
 __KeccakF1600:
+.cfi_startproc
 	movq	60(%rdi),%rax
 	movq	68(%rdi),%rbx
 	movq	76(%rdi),%rcx
@@ -255,6 +256,7 @@ __KeccakF1600:
 
 	leaq	-192(%r15),%r15
 	.byte	0xf3,0xc3
+.cfi_endproc
 .size	__KeccakF1600,.-__KeccakF1600
 
 .type	KeccakF1600,@function
diff --git a/deps/openssl/config/archs/linux-x86_64/asm_avx2/crypto/sha/sha1-x86_64.s b/deps/openssl/config/archs/linux-x86_64/asm_avx2/crypto/sha/sha1-x86_64.s
index e436521a04..98541727e5 100644
--- a/deps/openssl/config/archs/linux-x86_64/asm_avx2/crypto/sha/sha1-x86_64.s
+++ b/deps/openssl/config/archs/linux-x86_64/asm_avx2/crypto/sha/sha1-x86_64.s
@@ -1421,8 +1421,8 @@ _shaext_shortcut:
 	pshufd	$27,%xmm1,%xmm1
 	movdqu	%xmm0,(%rdi)
 	movd	%xmm1,16(%rdi)
-.cfi_endproc	
 	.byte	0xf3,0xc3
+.cfi_endproc
 .size	sha1_block_data_order_shaext,.-sha1_block_data_order_shaext
 .type	sha1_block_data_order_ssse3,@function
 .align	16
diff --git a/deps/openssl/config/archs/linux-x86_64/asm_avx2/crypto/sha/sha256-x86_64.s b/deps/openssl/config/archs/linux-x86_64/asm_avx2/crypto/sha/sha256-x86_64.s
index 42b24df18e..9357385da3 100644
--- a/deps/openssl/config/archs/linux-x86_64/asm_avx2/crypto/sha/sha256-x86_64.s
+++ b/deps/openssl/config/archs/linux-x86_64/asm_avx2/crypto/sha/sha256-x86_64.s
@@ -1775,6 +1775,7 @@ K256:
 .align	64
 sha256_block_data_order_shaext:
 _shaext_shortcut:
+.cfi_startproc
 	leaq	K256+128(%rip),%rcx
 	movdqu	(%rdi),%xmm1
 	movdqu	16(%rdi),%xmm2
@@ -1977,6 +1978,7 @@ _shaext_shortcut:
 	movdqu	%xmm1,(%rdi)
 	movdqu	%xmm2,16(%rdi)
 	.byte	0xf3,0xc3
+.cfi_endproc
 .size	sha256_block_data_order_shaext,.-sha256_block_data_order_shaext
 .type	sha256_block_data_order_ssse3,@function
 .align	64
@@ -4238,7 +4240,15 @@ sha256_block_data_order_avx2:
 	vmovdqa	%ymm4,0(%rsp)
 	xorl	%r14d,%r14d
 	vmovdqa	%ymm5,32(%rsp)
+
+	movq	88(%rsp),%rdi
+.cfi_def_cfa	%rdi,8
 	leaq	-64(%rsp),%rsp
+
+
+
+	movq	%rdi,-8(%rsp)
+.cfi_escape	0x0f,0x05,0x77,0x78,0x06,0x23,0x08
 	movl	%ebx,%edi
 	vmovdqa	%ymm6,0(%rsp)
 	xorl	%ecx,%edi
@@ -4250,6 +4260,12 @@ sha256_block_data_order_avx2:
 .align	16
 .Lavx2_00_47:
 	leaq	-64(%rsp),%rsp
+.cfi_escape	0x0f,0x05,0x77,0x38,0x06,0x23,0x08
+
+	pushq	64-8(%rsp)
+.cfi_escape	0x0f,0x05,0x77,0x00,0x06,0x23,0x08
+	leaq	8(%rsp),%rsp
+.cfi_escape	0x0f,0x05,0x77,0x78,0x06,0x23,0x08
 	vpalignr	$4,%ymm0,%ymm1,%ymm4
 	addl	0+128(%rsp),%r11d
 	andl	%r8d,%r12d
@@ -4505,6 +4521,12 @@ sha256_block_data_order_avx2:
 	movl	%r9d,%r12d
 	vmovdqa	%ymm6,32(%rsp)
 	leaq	-64(%rsp),%rsp
+.cfi_escape	0x0f,0x05,0x77,0x38,0x06,0x23,0x08
+
+	pushq	64-8(%rsp)
+.cfi_escape	0x0f,0x05,0x77,0x00,0x06,0x23,0x08
+	leaq	8(%rsp),%rsp
+.cfi_escape	0x0f,0x05,0x77,0x78,0x06,0x23,0x08
 	vpalignr	$4,%ymm2,%ymm3,%ymm4
 	addl	0+128(%rsp),%r11d
 	andl	%r8d,%r12d
@@ -5380,6 +5402,8 @@ sha256_block_data_order_avx2:
 
 	leaq	448(%rsp),%rsp
 
+.cfi_escape	0x0f,0x06,0x77,0xd8,0x00,0x06,0x23,0x08
+
 	addl	0(%rdi),%eax
 	addl	4(%rdi),%ebx
 	addl	8(%rdi),%ecx
@@ -5405,9 +5429,11 @@ sha256_block_data_order_avx2:
 	jbe	.Loop_avx2
 	leaq	(%rsp),%rbp
 
+
+.cfi_escape	0x0f,0x06,0x76,0xd8,0x00,0x06,0x23,0x08
+
 .Ldone_avx2:
-	leaq	(%rbp),%rsp
-	movq	88(%rsp),%rsi
+	movq	88(%rbp),%rsi
 .cfi_def_cfa	%rsi,8
 	vzeroupper
 	movq	-48(%rsi),%r15
diff --git a/deps/openssl/config/archs/linux-x86_64/asm_avx2/crypto/sha/sha512-x86_64.s b/deps/openssl/config/archs/linux-x86_64/asm_avx2/crypto/sha/sha512-x86_64.s
index 5931a2a932..939f1ca71c 100644
--- a/deps/openssl/config/archs/linux-x86_64/asm_avx2/crypto/sha/sha512-x86_64.s
+++ b/deps/openssl/config/archs/linux-x86_64/asm_avx2/crypto/sha/sha512-x86_64.s
@@ -4165,7 +4165,15 @@ sha512_block_data_order_avx2:
 	vmovdqa	%ymm10,64(%rsp)
 	vpaddq	64(%rbp),%ymm6,%ymm10
 	vmovdqa	%ymm11,96(%rsp)
+
+	movq	152(%rsp),%rdi
+.cfi_def_cfa	%rdi,8
 	leaq	-128(%rsp),%rsp
+
+
+
+	movq	%rdi,-8(%rsp)
+.cfi_escape	0x0f,0x05,0x77,0x78,0x06,0x23,0x08
 	vpaddq	96(%rbp),%ymm7,%ymm11
 	vmovdqa	%ymm8,0(%rsp)
 	xorq	%r14,%r14
@@ -4181,6 +4189,12 @@ sha512_block_data_order_avx2:
 .align	16
 .Lavx2_00_47:
 	leaq	-128(%rsp),%rsp
+.cfi_escape	0x0f,0x06,0x77,0xf8,0x00,0x06,0x23,0x08
+
+	pushq	128-8(%rsp)
+.cfi_escape	0x0f,0x05,0x77,0x00,0x06,0x23,0x08
+	leaq	8(%rsp),%rsp
+.cfi_escape	0x0f,0x05,0x77,0x78,0x06,0x23,0x08
 	vpalignr	$8,%ymm0,%ymm1,%ymm8
 	addq	0+256(%rsp),%r11
 	andq	%r8,%r12
@@ -4474,6 +4488,12 @@ sha512_block_data_order_avx2:
 	movq	%r9,%r12
 	vmovdqa	%ymm10,96(%rsp)
 	leaq	-128(%rsp),%rsp
+.cfi_escape	0x0f,0x06,0x77,0xf8,0x00,0x06,0x23,0x08
+
+	pushq	128-8(%rsp)
+.cfi_escape	0x0f,0x05,0x77,0x00,0x06,0x23,0x08
+	leaq	8(%rsp),%rsp
+.cfi_escape	0x0f,0x05,0x77,0x78,0x06,0x23,0x08
 	vpalignr	$8,%ymm4,%ymm5,%ymm8
 	addq	0+256(%rsp),%r11
 	andq	%r8,%r12
@@ -5387,6 +5407,8 @@ sha512_block_data_order_avx2:
 
 	leaq	1152(%rsp),%rsp
 
+.cfi_escape	0x0f,0x06,0x77,0x98,0x01,0x06,0x23,0x08
+
 	addq	0(%rdi),%rax
 	addq	8(%rdi),%rbx
 	addq	16(%rdi),%rcx
@@ -5412,9 +5434,11 @@ sha512_block_data_order_avx2:
 	jbe	.Loop_avx2
 	leaq	(%rsp),%rbp
 
+
+.cfi_escape	0x0f,0x06,0x76,0x98,0x01,0x06,0x23,0x08
+
 .Ldone_avx2:
-	leaq	(%rbp),%rsp
-	movq	152(%rsp),%rsi
+	movq	152(%rbp),%rsi
 .cfi_def_cfa	%rsi,8
 	vzeroupper
 	movq	-48(%rsi),%r15
diff --git a/deps/openssl/config/archs/linux-x86_64/asm_avx2/crypto/x86_64cpuid.s b/deps/openssl/config/archs/linux-x86_64/asm_avx2/crypto/x86_64cpuid.s
index fd17eaaba4..9268ce8c9a 100644
--- a/deps/openssl/config/archs/linux-x86_64/asm_avx2/crypto/x86_64cpuid.s
+++ b/deps/openssl/config/archs/linux-x86_64/asm_avx2/crypto/x86_64cpuid.s
@@ -12,6 +12,7 @@
 .type	OPENSSL_atomic_add,@function
 .align	16
 OPENSSL_atomic_add:
+.cfi_startproc
 	movl	(%rdi),%eax
 .Lspin:	leaq	(%rsi,%rax,1),%r8
 .byte	0xf0
@@ -20,16 +21,19 @@ OPENSSL_atomic_add:
 	movl	%r8d,%eax
 .byte	0x48,0x98
 	.byte	0xf3,0xc3
+.cfi_endproc
 .size	OPENSSL_atomic_add,.-OPENSSL_atomic_add
 
 .globl	OPENSSL_rdtsc
 .type	OPENSSL_rdtsc,@function
 .align	16
 OPENSSL_rdtsc:
+.cfi_startproc
 	rdtsc
 	shlq	$32,%rdx
 	orq	%rdx,%rax
 	.byte	0xf3,0xc3
+.cfi_endproc
 .size	OPENSSL_rdtsc,.-OPENSSL_rdtsc
 
 .globl	OPENSSL_ia32_cpuid
@@ -205,6 +209,7 @@ OPENSSL_ia32_cpuid:
 .type	OPENSSL_cleanse,@function
 .align	16
 OPENSSL_cleanse:
+.cfi_startproc
 	xorq	%rax,%rax
 	cmpq	$15,%rsi
 	jae	.Lot
@@ -234,12 +239,14 @@ OPENSSL_cleanse:
 	cmpq	$0,%rsi
 	jne	.Little
 	.byte	0xf3,0xc3
+.cfi_endproc
 .size	OPENSSL_cleanse,.-OPENSSL_cleanse
 
 .globl	CRYPTO_memcmp
 .type	CRYPTO_memcmp,@function
 .align	16
 CRYPTO_memcmp:
+.cfi_startproc
 	xorq	%rax,%rax
 	xorq	%r10,%r10
 	cmpq	$0,%rdx
@@ -268,11 +275,13 @@ CRYPTO_memcmp:
 	shrq	$63,%rax
 .Lno_data:
 	.byte	0xf3,0xc3
+.cfi_endproc
 .size	CRYPTO_memcmp,.-CRYPTO_memcmp
 .globl	OPENSSL_wipe_cpu
 .type	OPENSSL_wipe_cpu,@function
 .align	16
 OPENSSL_wipe_cpu:
+.cfi_startproc
 	pxor	%xmm0,%xmm0
 	pxor	%xmm1,%xmm1
 	pxor	%xmm2,%xmm2
@@ -299,11 +308,13 @@ OPENSSL_wipe_cpu:
 	xorq	%r11,%r11
 	leaq	8(%rsp),%rax
 	.byte	0xf3,0xc3
+.cfi_endproc
 .size	OPENSSL_wipe_cpu,.-OPENSSL_wipe_cpu
 .globl	OPENSSL_instrument_bus
 .type	OPENSSL_instrument_bus,@function
 .align	16
 OPENSSL_instrument_bus:
+.cfi_startproc
 	movq	%rdi,%r10
 	movq	%rsi,%rcx
 	movq	%rsi,%r11
@@ -330,12 +341,14 @@ OPENSSL_instrument_bus:
 
 	movq	%r11,%rax
 	.byte	0xf3,0xc3
+.cfi_endproc
 .size	OPENSSL_instrument_bus,.-OPENSSL_instrument_bus
 
 .globl	OPENSSL_instrument_bus2
 .type	OPENSSL_instrument_bus2,@function
 .align	16
 OPENSSL_instrument_bus2:
+.cfi_startproc
 	movq	%rdi,%r10
 	movq	%rsi,%rcx
 	movq	%rdx,%r11
@@ -378,11 +391,13 @@ OPENSSL_instrument_bus2:
 	movq	8(%rsp),%rax
 	subq	%rcx,%rax
 	.byte	0xf3,0xc3
+.cfi_endproc
 .size	OPENSSL_instrument_bus2,.-OPENSSL_instrument_bus2
 .globl	OPENSSL_ia32_rdrand_bytes
 .type	OPENSSL_ia32_rdrand_bytes,@function
 .align	16
 OPENSSL_ia32_rdrand_bytes:
+.cfi_startproc
 	xorq	%rax,%rax
 	cmpq	$0,%rsi
 	je	.Ldone_rdrand_bytes
@@ -419,11 +434,13 @@ OPENSSL_ia32_rdrand_bytes:
 .Ldone_rdrand_bytes:
 	xorq	%r10,%r10
 	.byte	0xf3,0xc3
+.cfi_endproc
 .size	OPENSSL_ia32_rdrand_bytes,.-OPENSSL_ia32_rdrand_bytes
 .globl	OPENSSL_ia32_rdseed_bytes
 .type	OPENSSL_ia32_rdseed_bytes,@function
 .align	16
 OPENSSL_ia32_rdseed_bytes:
+.cfi_startproc
 	xorq	%rax,%rax
 	cmpq	$0,%rsi
 	je	.Ldone_rdseed_bytes
@@ -460,4 +477,5 @@ OPENSSL_ia32_rdseed_bytes:
 .Ldone_rdseed_bytes:
 	xorq	%r10,%r10
 	.byte	0xf3,0xc3
+.cfi_endproc
 .size	OPENSSL_ia32_rdseed_bytes,.-OPENSSL_ia32_rdseed_bytes
diff --git a/deps/openssl/config/archs/linux-x86_64/asm_avx2/include/openssl/opensslconf.h b/deps/openssl/config/archs/linux-x86_64/asm_avx2/include/openssl/opensslconf.h
index 913bb95a5a..14050a4534 100644
--- a/deps/openssl/config/archs/linux-x86_64/asm_avx2/include/openssl/opensslconf.h
+++ b/deps/openssl/config/archs/linux-x86_64/asm_avx2/include/openssl/opensslconf.h
@@ -96,9 +96,6 @@ extern "C" {
 #ifndef OPENSSL_NO_DYNAMIC_ENGINE
 # define OPENSSL_NO_DYNAMIC_ENGINE
 #endif
-#ifndef OPENSSL_NO_AFALGENG
-# define OPENSSL_NO_AFALGENG
-#endif
 
 
 /*
diff --git a/deps/openssl/config/archs/linux-x86_64/asm_avx2/include/progs.h b/deps/openssl/config/archs/linux-x86_64/asm_avx2/include/progs.h
index 9b3d270e20..308c65601b 100644
--- a/deps/openssl/config/archs/linux-x86_64/asm_avx2/include/progs.h
+++ b/deps/openssl/config/archs/linux-x86_64/asm_avx2/include/progs.h
@@ -2,7 +2,7 @@
  * WARNING: do not edit!
  * Generated by apps/progs.pl
  *
- * Copyright 1995-2019 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 1995-2020 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
diff --git a/deps/openssl/config/archs/linux-x86_64/asm_avx2/openssl-cl.gypi b/deps/openssl/config/archs/linux-x86_64/asm_avx2/openssl-cl.gypi
index b134d72e7d..04e53d9f2a 100644
--- a/deps/openssl/config/archs/linux-x86_64/asm_avx2/openssl-cl.gypi
+++ b/deps/openssl/config/archs/linux-x86_64/asm_avx2/openssl-cl.gypi
@@ -16,6 +16,7 @@
       'KECCAK1600_ASM',
       'RC4_ASM',
       'MD5_ASM',
+      'AESNI_ASM',
       'VPAES_ASM',
       'GHASH_ASM',
       'ECP_NISTZ256_ASM',
diff --git a/deps/openssl/config/archs/linux-x86_64/asm_avx2/openssl.gypi b/deps/openssl/config/archs/linux-x86_64/asm_avx2/openssl.gypi
index 05ee0df141..c69de8024d 100644
--- a/deps/openssl/config/archs/linux-x86_64/asm_avx2/openssl.gypi
+++ b/deps/openssl/config/archs/linux-x86_64/asm_avx2/openssl.gypi
@@ -723,6 +723,7 @@
       'KECCAK1600_ASM',
       'RC4_ASM',
       'MD5_ASM',
+      'AESNI_ASM',
       'VPAES_ASM',
       'GHASH_ASM',
       'ECP_NISTZ256_ASM',
diff --git a/deps/openssl/config/archs/linux-x86_64/no-asm/configdata.pm b/deps/openssl/config/archs/linux-x86_64/no-asm/configdata.pm
index 93da6e9690..e9a7a8ce9f 100644
--- a/deps/openssl/config/archs/linux-x86_64/no-asm/configdata.pm
+++ b/deps/openssl/config/archs/linux-x86_64/no-asm/configdata.pm
@@ -55,7 +55,7 @@ our %config = (
   minor => "1.1",
   openssl_algorithm_defines => [ "OPENSSL_NO_COMP", "OPENSSL_NO_MD2", "OPENSSL_NO_RC5" ],
   openssl_api_defines => [  ],
-  openssl_other_defines => [ "OPENSSL_RAND_SEED_OS", "OPENSSL_NO_AFALGENG", "OPENSSL_NO_ASAN", "OPENSSL_NO_ASM", "OPENSSL_NO_CRYPTO_MDEBUG", "OPENSSL_NO_CRYPTO_MDEBUG_BACKTRACE", "OPENSSL_NO_DEVCRYPTOENG", "OPENSSL_NO_EC_NISTP_64_GCC_128", "OPENSSL_NO_EGD", "OPENSSL_NO_EXTERNAL_TESTS", "OPENSSL_NO_FUZZ_AFL", "OPENSSL_NO_FUZZ_LIBFUZZER", "OPENSSL_NO_HEARTBEATS", "OPENSSL_NO_MSAN", "OPENSSL_NO_SCTP", "OPENSSL_NO_SSL3", "OPENSSL_NO_SSL3_METHOD", "OPENSSL_NO_UBSAN", "OPENSSL_NO_UNIT_TEST", "OPENSSL_NO_WEAK_SSL_CIPHERS", "OPENSSL_NO_DYNAMIC_ENGINE", "OPENSSL_NO_AFALGENG" ],
+  openssl_other_defines => [ "OPENSSL_RAND_SEED_OS", "OPENSSL_NO_AFALGENG", "OPENSSL_NO_ASAN", "OPENSSL_NO_ASM", "OPENSSL_NO_CRYPTO_MDEBUG", "OPENSSL_NO_CRYPTO_MDEBUG_BACKTRACE", "OPENSSL_NO_DEVCRYPTOENG", "OPENSSL_NO_EC_NISTP_64_GCC_128", "OPENSSL_NO_EGD", "OPENSSL_NO_EXTERNAL_TESTS", "OPENSSL_NO_FUZZ_AFL", "OPENSSL_NO_FUZZ_LIBFUZZER", "OPENSSL_NO_HEARTBEATS", "OPENSSL_NO_MSAN", "OPENSSL_NO_SCTP", "OPENSSL_NO_SSL3", "OPENSSL_NO_SSL3_METHOD", "OPENSSL_NO_UBSAN", "OPENSSL_NO_UNIT_TEST", "OPENSSL_NO_WEAK_SSL_CIPHERS", "OPENSSL_NO_DYNAMIC_ENGINE" ],
   openssl_sys_defines => [  ],
   openssl_thread_defines => [ "OPENSSL_THREADS" ],
   openssldir => "",
@@ -111,8 +111,8 @@ our %config = (
   sourcedir => ".",
   target => "linux-x86_64",
   tdirs => [ "ossl_shim" ],
-  version => "1.1.1d",
-  version_num => "0x1010104fL",
+  version => "1.1.1e",
+  version_num => "0x1010105fL",
 );
 
 our %target = (
@@ -238,6 +238,7 @@ our @disablables = (
   "dgram",
   "dh",
   "dsa",
+  "dso",
   "dtls",
   "dynamic-engine",
   "ec",
@@ -356,8 +357,8 @@ our %unified_info = (
         {
             "" =>
                 [
-                    "crypto/include/internal/bn_conf.h",
-                    "crypto/include/internal/dso_conf.h",
+                    "include/crypto/bn_conf.h",
+                    "include/crypto/dso_conf.h",
                     "include/openssl/opensslconf.h",
                 ],
             "apps/asn1pars.o" =>
@@ -625,14 +626,6 @@ our %unified_info = (
                     "crypto/perlasm/cbc.pl",
                     "crypto/perlasm/x86asm.pl",
                 ],
-            "crypto/include/internal/bn_conf.h" =>
-                [
-                    "configdata.pm",
-                ],
-            "crypto/include/internal/dso_conf.h" =>
-                [
-                    "configdata.pm",
-                ],
             "crypto/rc4/rc4-586.s" =>
                 [
                     "crypto/perlasm/x86asm.pl",
@@ -708,6 +701,14 @@ our %unified_info = (
                 [
                     "libcrypto",
                 ],
+            "include/crypto/bn_conf.h" =>
+                [
+                    "configdata.pm",
+                ],
+            "include/crypto/dso_conf.h" =>
+                [
+                    "configdata.pm",
+                ],
             "include/openssl/opensslconf.h" =>
                 [
                     "configdata.pm",
@@ -1505,6 +1506,12 @@ our %unified_info = (
                     "libcrypto",
                     "test/libtestutil.a",
                 ],
+            "test/ssl_ctx_test" =>
+                [
+                    "libcrypto",
+                    "libssl",
+                    "test/libtestutil.a",
+                ],
             "test/ssl_test" =>
                 [
                     "libcrypto",
@@ -3223,7 +3230,6 @@ our %unified_info = (
                             "test/testutil/cb.o",
                             "test/testutil/driver.o",
                             "test/testutil/format_output.o",
-                            "test/testutil/init.o",
                             "test/testutil/main.o",
                             "test/testutil/output_helpers.o",
                             "test/testutil/random.o",
@@ -3231,6 +3237,7 @@ our %unified_info = (
                             "test/testutil/tap_bio.o",
                             "test/testutil/test_cleanup.o",
                             "test/testutil/tests.o",
+                            "test/testutil/testutil_init.o",
                         ],
                     "products" =>
                         {
@@ -3729,14 +3736,6 @@ our %unified_info = (
                 [
                     "crypto/ia64cpuid.S",
                 ],
-            "crypto/include/internal/bn_conf.h" =>
-                [
-                    "crypto/include/internal/bn_conf.h.in",
-                ],
-            "crypto/include/internal/dso_conf.h" =>
-                [
-                    "crypto/include/internal/dso_conf.h.in",
-                ],
             "crypto/md5/md5-586.s" =>
                 [
                     "crypto/md5/asm/md5-586.pl",
@@ -4177,6 +4176,14 @@ our %unified_info = (
                     "engines/asm/e_padlock-x86_64.pl",
                     "\$(PERLASM_SCHEME)",
                 ],
+            "include/crypto/bn_conf.h" =>
+                [
+                    "include/crypto/bn_conf.h.in",
+                ],
+            "include/crypto/dso_conf.h" =>
+                [
+                    "include/crypto/dso_conf.h.in",
+                ],
             "include/openssl/opensslconf.h" =>
                 [
                     "include/openssl/opensslconf.h.in",
@@ -4871,49 +4878,41 @@ our %unified_info = (
             "crypto/aes/aes_cbc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/aes/aes_cfb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/aes/aes_core.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/aes/aes_ecb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/aes/aes_ige.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/aes/aes_misc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/aes/aes_ofb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/aes/aes_wrap.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/aes/aesfx-sparcv9.o" =>
@@ -4935,7 +4934,6 @@ our %unified_info = (
             "crypto/aria/aria.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/arm64cpuid.o" =>
@@ -4949,613 +4947,511 @@ our %unified_info = (
             "crypto/asn1/a_bitstr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_d2i_fp.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_digest.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_dup.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_gentm.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_i2d_fp.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_int.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_mbstr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_object.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_octet.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_print.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_sign.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_strex.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_strnid.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_time.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_type.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_utctm.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_utf8.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_verify.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/ameth_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/asn1_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/asn1_gen.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/asn1_item_list.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/asn1_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/asn1_par.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/asn_mime.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/asn_moid.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/asn_mstbl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/asn_pack.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/bio_asn1.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/bio_ndef.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/d2i_pr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/d2i_pu.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/evp_asn1.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/f_int.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/f_string.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/i2d_pr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/i2d_pu.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/n_pkey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/nsseq.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/p5_pbe.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/p5_pbev2.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/p5_scrypt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/p8_pkey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/t_bitst.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/t_pkey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/t_spki.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/tasn_dec.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/tasn_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/tasn_fre.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/tasn_new.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/tasn_prn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/tasn_scn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/tasn_typ.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/tasn_utl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/x_algor.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/x_bignum.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/x_info.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/x_int64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/x_long.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/x_pkey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/x_sig.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/x_spki.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/x_val.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/async/arch/async_null.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/async/arch/async_posix.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/async/arch/async_win.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/async/async.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/async/async_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/async/async_wait.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bf/bf_cfb64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bf/bf_ecb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bf/bf_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bf/bf_ofb64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bf/bf_skey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/b_addr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/b_dump.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/b_print.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/b_sock.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/b_sock2.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bf_buff.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bf_lbuf.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bf_nbio.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bf_null.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bio_cb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bio_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bio_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bio_meth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bss_acpt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bss_bio.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bss_conn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bss_dgram.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bss_fd.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bss_file.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bss_log.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bss_mem.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bss_null.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bss_sock.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/blake2/blake2b.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/blake2/blake2s.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/blake2/m_blake2b.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/blake2/m_blake2s.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/armv4-gf2m.o" =>
@@ -5573,188 +5469,157 @@ our %unified_info = (
             "crypto/bn/bn_add.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_asm.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_blind.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_const.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_ctx.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_depr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_dh.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_div.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_exp.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto",
                 ],
             "crypto/bn/bn_exp2.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_gcd.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_gf2m.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_intern.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_kron.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_mod.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_mont.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_mpi.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_mul.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_nist.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_prime.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_print.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_rand.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_recp.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_shift.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_sqr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_sqrt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_srp.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_word.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_x931p.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/mips-mont.o" =>
@@ -5784,13 +5649,11 @@ our %unified_info = (
             "crypto/buffer/buf_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/buffer/buffer.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/buildinf.h" =>
@@ -5800,43 +5663,36 @@ our %unified_info = (
             "crypto/camellia/camellia.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/camellia/cmll_cbc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/camellia/cmll_cfb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/camellia/cmll_ctr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/camellia/cmll_ecb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/camellia/cmll_misc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/camellia/cmll_ofb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/camellia/cmllt4-sparcv9.o" =>
@@ -5846,31 +5702,26 @@ our %unified_info = (
             "crypto/cast/c_cfb64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cast/c_ecb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cast/c_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cast/c_ofb64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cast/c_skey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/chacha/chacha-armv4.o" =>
@@ -5888,278 +5739,232 @@ our %unified_info = (
             "crypto/chacha/chacha_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cmac/cm_ameth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cmac/cm_pmeth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cmac/cmac.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_asn1.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_att.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_cd.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_dd.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_env.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_ess.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_io.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_kari.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_pwri.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_sd.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_smime.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/conf/conf_api.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/conf/conf_def.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/conf/conf_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/conf/conf_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/conf/conf_mall.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/conf/conf_mod.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/conf/conf_sap.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/conf/conf_ssl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cpt_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cryptlib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ct/ct_b64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ct/ct_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ct/ct_log.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ct/ct_oct.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ct/ct_policy.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ct/ct_prn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ct/ct_sct.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ct/ct_sct_ctx.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ct/ct_vfy.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ct/ct_x509v3.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ctype.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cversion.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto",
                 ],
             "crypto/des/cbc_cksm.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/cbc_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/cfb64ede.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/cfb64enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/cfb_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/des_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/dest4-sparcv9.o" =>
@@ -6169,301 +5974,251 @@ our %unified_info = (
             "crypto/des/ecb3_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/ecb_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/fcrypt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/fcrypt_b.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/ofb64ede.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/ofb64enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/ofb_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/pcbc_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/qud_cksm.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/rand_key.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/set_key.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/str2key.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/xcbc_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_ameth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_asn1.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_check.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_depr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_gen.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_kdf.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_key.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_meth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_pmeth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_prn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_rfc5114.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_rfc7919.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dsa/dsa_ameth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dsa/dsa_asn1.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dsa/dsa_depr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dsa/dsa_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dsa/dsa_gen.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dsa/dsa_key.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dsa/dsa_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dsa/dsa_meth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dsa/dsa_ossl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dsa/dsa_pmeth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dsa/dsa_prn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dsa/dsa_sign.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dsa/dsa_vrf.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dso/dso_dl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dso/dso_dlfcn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dso/dso_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dso/dso_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dso/dso_openssl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dso/dso_vms.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dso/dso_win32.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ebcdic.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/curve25519.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/curve448/arch_32/f_impl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto/ec/curve448/arch_32",
                     "crypto/ec/curve448",
@@ -6471,7 +6226,6 @@ our %unified_info = (
             "crypto/ec/curve448/curve448.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto/ec/curve448/arch_32",
                     "crypto/ec/curve448",
@@ -6479,7 +6233,6 @@ our %unified_info = (
             "crypto/ec/curve448/curve448_tables.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto/ec/curve448/arch_32",
                     "crypto/ec/curve448",
@@ -6487,7 +6240,6 @@ our %unified_info = (
             "crypto/ec/curve448/eddsa.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto/ec/curve448/arch_32",
                     "crypto/ec/curve448",
@@ -6495,7 +6247,6 @@ our %unified_info = (
             "crypto/ec/curve448/f_generic.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto/ec/curve448/arch_32",
                     "crypto/ec/curve448",
@@ -6503,7 +6254,6 @@ our %unified_info = (
             "crypto/ec/curve448/scalar.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto/ec/curve448/arch_32",
                     "crypto/ec/curve448",
@@ -6511,163 +6261,136 @@ our %unified_info = (
             "crypto/ec/ec2_oct.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec2_smpl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec_ameth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec_asn1.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec_check.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec_curve.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec_cvt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec_key.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec_kmeth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec_mult.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec_oct.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec_pmeth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec_print.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecdh_kdf.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecdh_ossl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecdsa_ossl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecdsa_sign.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecdsa_vrf.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/eck_prn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecp_mont.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecp_nist.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecp_nistp224.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecp_nistp256.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecp_nistp521.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecp_nistputil.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecp_nistz256-armv4.o" =>
@@ -6685,223 +6408,186 @@ our %unified_info = (
             "crypto/ec/ecp_oct.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecp_smpl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecx_meth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/eng_all.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/eng_cnf.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/eng_ctrl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/eng_dyn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/eng_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/eng_fat.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/eng_init.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/eng_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/eng_list.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/eng_openssl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/eng_pkey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/eng_rdrand.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/eng_table.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/tb_asnmth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/tb_cipher.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/tb_dh.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/tb_digest.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/tb_dsa.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/tb_eckey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/tb_pkmeth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/tb_rand.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/tb_rsa.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/err/err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/err/err_all.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/err/err_prn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/bio_b64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/bio_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/bio_md.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/bio_ok.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/c_allc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/c_alld.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/cmeth_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/digest.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/e_aes.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto",
                     "crypto/modes",
@@ -6909,21 +6595,18 @@ our %unified_info = (
             "crypto/evp/e_aes_cbc_hmac_sha1.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto/modes",
                 ],
             "crypto/evp/e_aes_cbc_hmac_sha256.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto/modes",
                 ],
             "crypto/evp/e_aria.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto",
                     "crypto/modes",
@@ -6931,13 +6614,11 @@ our %unified_info = (
             "crypto/evp/e_bf.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/e_camellia.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto",
                     "crypto/modes",
@@ -6945,81 +6626,68 @@ our %unified_info = (
             "crypto/evp/e_cast.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/e_chacha20_poly1305.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/e_des.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto",
                 ],
             "crypto/evp/e_des3.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto",
                 ],
             "crypto/evp/e_idea.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/e_null.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/e_old.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/e_rc2.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/e_rc4.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/e_rc4_hmac_md5.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/e_rc5.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/e_seed.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/e_sm4.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto",
                     "crypto/modes",
@@ -7027,328 +6695,267 @@ our %unified_info = (
             "crypto/evp/e_xcbc_d.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/encode.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/evp_cnf.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/evp_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/evp_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/evp_key.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/evp_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/evp_pbe.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/evp_pkey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/m_md2.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/m_md4.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/m_md5.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/m_md5_sha1.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/m_mdc2.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/m_null.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/m_ripemd.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/m_sha1.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/m_sha3.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto",
                 ],
             "crypto/evp/m_sigver.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/m_wp.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/names.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/p5_crpt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/p5_crpt2.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/p_dec.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/p_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/p_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/p_open.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/p_seal.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/p_sign.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/p_verify.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/pbe_scrypt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/pmeth_fn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/pmeth_gn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/pmeth_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ex_data.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/getenv.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/hmac/hm_ameth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/hmac/hm_pmeth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/hmac/hmac.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/idea/i_cbc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/idea/i_cfb64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/idea/i_ecb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/idea/i_ofb64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/idea/i_skey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
-            "crypto/include/internal/bn_conf.h" =>
-                [
-                    ".",
-                ],
-            "crypto/include/internal/dso_conf.h" =>
-                [
-                    ".",
-                ],
             "crypto/init.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/kdf/hkdf.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/kdf/kdf_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/kdf/scrypt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/kdf/tls1_prf.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/lhash/lh_stats.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/lhash/lhash.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/md4/md4_dgst.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/md4/md4_one.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/md5/md5-sparcv9.o" =>
@@ -7358,85 +6965,71 @@ our %unified_info = (
             "crypto/md5/md5_dgst.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/md5/md5_one.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/mdc2/mdc2_one.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/mdc2/mdc2dgst.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/mem.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/mem_clr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/mem_dbg.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/mem_sec.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/modes/cbc128.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/modes/ccm128.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/modes/cfb128.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/modes/ctr128.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/modes/cts128.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/modes/gcm128.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto",
                 ],
@@ -7459,361 +7052,301 @@ our %unified_info = (
             "crypto/modes/ocb128.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/modes/ofb128.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/modes/wrap128.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/modes/xts128.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/o_dir.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/o_fips.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/o_fopen.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/o_init.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/o_str.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/o_time.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/objects/o_names.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/objects/obj_dat.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/objects/obj_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/objects/obj_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/objects/obj_xref.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ocsp/ocsp_asn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ocsp/ocsp_cl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ocsp/ocsp_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ocsp/ocsp_ext.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ocsp/ocsp_ht.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ocsp/ocsp_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ocsp/ocsp_prn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ocsp/ocsp_srv.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ocsp/ocsp_vfy.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ocsp/v3_ocsp.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pem/pem_all.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pem/pem_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pem/pem_info.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pem/pem_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pem/pem_oth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pem/pem_pk8.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pem/pem_pkey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pem/pem_sign.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pem/pem_x509.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pem/pem_xaux.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pem/pvkfmt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_add.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_asn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_attr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_crpt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_crt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_decr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_init.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_key.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_kiss.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_mutl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_npas.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_p8d.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_p8e.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_sbag.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_utl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/pk12err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs7/bio_pk7.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs7/pk7_asn1.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs7/pk7_attr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs7/pk7_doit.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs7/pk7_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs7/pk7_mime.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs7/pk7_smime.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs7/pkcs7err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/poly1305/poly1305-armv4.o" =>
@@ -7835,259 +7368,216 @@ our %unified_info = (
             "crypto/poly1305/poly1305.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/poly1305/poly1305_ameth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/poly1305/poly1305_pmeth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rand/drbg_ctr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rand/drbg_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rand/rand_egd.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rand/rand_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rand/rand_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rand/rand_unix.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rand/rand_vms.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rand/rand_win.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rand/randfile.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rc2/rc2_cbc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rc2/rc2_ecb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rc2/rc2_skey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rc2/rc2cfb64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rc2/rc2ofb64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rc4/rc4_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rc4/rc4_skey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ripemd/rmd_dgst.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ripemd/rmd_one.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_ameth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_asn1.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_chk.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_crpt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_depr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_gen.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_meth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_mp.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_none.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_oaep.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_ossl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_pk1.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_pmeth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_prn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_pss.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_saos.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_sign.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_ssl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_x931.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_x931g.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/s390xcpuid.o" =>
@@ -8097,31 +7587,26 @@ our %unified_info = (
             "crypto/seed/seed.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/seed/seed_cbc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/seed/seed_cfb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/seed/seed_ecb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/seed/seed_ofb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sha/keccak1600-armv4.o" =>
@@ -8131,7 +7616,6 @@ our %unified_info = (
             "crypto/sha/keccak1600.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sha/sha1-armv4-large.o" =>
@@ -8157,13 +7641,11 @@ our %unified_info = (
             "crypto/sha/sha1_one.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sha/sha1dgst.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sha/sha256-armv4.o" =>
@@ -8189,7 +7671,6 @@ our %unified_info = (
             "crypto/sha/sha256.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sha/sha512-armv4.o" =>
@@ -8215,709 +7696,591 @@ our %unified_info = (
             "crypto/sha/sha512.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/siphash/siphash.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/siphash/siphash_ameth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/siphash/siphash_pmeth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sm2/sm2_crypt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sm2/sm2_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sm2/sm2_pmeth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sm2/sm2_sign.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sm3/m_sm3.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sm3/sm3.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sm4/sm4.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/srp/srp_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/srp/srp_vfy.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/stack/stack.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/store/loader_file.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/store/store_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/store/store_init.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/store/store_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/store/store_register.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/store/store_strings.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/threads_none.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/threads_pthread.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/threads_win.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ts/ts_asn1.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ts/ts_conf.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ts/ts_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ts/ts_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ts/ts_req_print.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ts/ts_req_utils.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ts/ts_rsp_print.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ts/ts_rsp_sign.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ts/ts_rsp_utils.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ts/ts_rsp_verify.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ts/ts_verify_ctx.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/txt_db/txt_db.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ui/ui_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ui/ui_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ui/ui_null.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ui/ui_openssl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ui/ui_util.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/uid.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/whrlpool/wp_block.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/whrlpool/wp_dgst.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/by_dir.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/by_file.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/t_crl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/t_req.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/t_x509.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_att.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_cmp.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_d2.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_def.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_ext.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_lu.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_meth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_obj.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_r2x.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_req.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_set.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_trs.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_txt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_v3.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_vfy.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_vpm.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509cset.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509name.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509rset.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509spki.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509type.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x_all.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x_attrib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x_crl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x_exten.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x_name.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x_pubkey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x_req.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x_x509.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x_x509a.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/pcy_cache.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/pcy_data.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/pcy_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/pcy_map.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/pcy_node.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/pcy_tree.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_addr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_admis.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_akey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_akeya.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_alt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_asid.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_bcons.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_bitst.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_conf.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_cpols.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_crld.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_enum.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_extku.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_genn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_ia5.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_info.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_int.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_ncons.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_pci.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_pcia.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_pcons.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_pku.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_pmaps.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_prn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_purp.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_skey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_sxnet.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_tlsf.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_utl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "engines/e_capi.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "engines/e_padlock.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "fuzz/asn1.o" =>
@@ -8968,6 +8331,14 @@ our %unified_info = (
                 [
                     "include",
                 ],
+            "include/crypto/bn_conf.h" =>
+                [
+                    ".",
+                ],
+            "include/crypto/dso_conf.h" =>
+                [
+                    ".",
+                ],
             "include/openssl/opensslconf.h" =>
                 [
                     ".",
@@ -9212,7 +8583,6 @@ our %unified_info = (
                 [
                     ".",
                     "include",
-                    "crypto/include",
                 ],
             "test/asn1_string_table_test.o" =>
                 [
@@ -9538,7 +8908,6 @@ our %unified_info = (
                 [
                     ".",
                     "include",
-                    "crypto/include",
                 ],
             "test/cipher_overhead_test.o" =>
                 [
@@ -9584,7 +8953,6 @@ our %unified_info = (
             "test/ctype_internal_test.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "test/curve448_internal_test.o" =>
@@ -9650,7 +9018,6 @@ our %unified_info = (
                 [
                     "include",
                     "crypto/ec",
-                    "crypto/include",
                 ],
             "test/ecdsatest.o" =>
                 [
@@ -9675,7 +9042,6 @@ our %unified_info = (
             "test/evp_extra_test.o" =>
                 [
                     "include",
-                    "crypto/include",
                 ],
             "test/evp_test.o" =>
                 [
@@ -9773,7 +9139,6 @@ our %unified_info = (
                 [
                     ".",
                     "include",
-                    "crypto/include",
                 ],
             "test/rc2test.o" =>
                 [
@@ -9823,18 +9188,15 @@ our %unified_info = (
                 [
                     ".",
                     "include",
-                    "crypto/include",
                 ],
             "test/sm2_internal_test.o" =>
                 [
                     "include",
-                    "crypto/include",
                 ],
             "test/sm4_internal_test.o" =>
                 [
                     ".",
                     "include",
-                    "crypto/include",
                 ],
             "test/srptest.o" =>
                 [
@@ -9845,6 +9207,10 @@ our %unified_info = (
                     ".",
                     "include",
                 ],
+            "test/ssl_ctx_test.o" =>
+                [
+                    "include",
+                ],
             "test/ssl_test.o" =>
                 [
                     "include",
@@ -9908,10 +9274,6 @@ our %unified_info = (
                 [
                     "include",
                 ],
-            "test/testutil/init.o" =>
-                [
-                    "include",
-                ],
             "test/testutil/main.o" =>
                 [
                     "include",
@@ -9940,6 +9302,10 @@ our %unified_info = (
                 [
                     "include",
                 ],
+            "test/testutil/testutil_init.o" =>
+                [
+                    "include",
+                ],
             "test/threadstest.o" =>
                 [
                     "include",
@@ -10204,6 +9570,7 @@ our %unified_info = (
             "test/sm4_internal_test",
             "test/srptest",
             "test/ssl_cert_table_internal_test",
+            "test/ssl_ctx_test",
             "test/ssl_test",
             "test/ssl_test_ctx_test",
             "test/sslapitest",
@@ -15094,7 +14461,6 @@ our %unified_info = (
                     "test/testutil/cb.o",
                     "test/testutil/driver.o",
                     "test/testutil/format_output.o",
-                    "test/testutil/init.o",
                     "test/testutil/main.o",
                     "test/testutil/output_helpers.o",
                     "test/testutil/random.o",
@@ -15102,6 +14468,7 @@ our %unified_info = (
                     "test/testutil/tap_bio.o",
                     "test/testutil/test_cleanup.o",
                     "test/testutil/tests.o",
+                    "test/testutil/testutil_init.o",
                 ],
             "test/md2test" =>
                 [
@@ -15329,6 +14696,14 @@ our %unified_info = (
                 [
                     "test/ssl_cert_table_internal_test.c",
                 ],
+            "test/ssl_ctx_test" =>
+                [
+                    "test/ssl_ctx_test.o",
+                ],
+            "test/ssl_ctx_test.o" =>
+                [
+                    "test/ssl_ctx_test.c",
+                ],
             "test/ssl_test" =>
                 [
                     "test/handshake_helper.o",
@@ -15431,10 +14806,6 @@ our %unified_info = (
                 [
                     "test/testutil/format_output.c",
                 ],
-            "test/testutil/init.o" =>
-                [
-                    "test/testutil/init.c",
-                ],
             "test/testutil/main.o" =>
                 [
                     "test/testutil/main.c",
@@ -15463,6 +14834,10 @@ our %unified_info = (
                 [
                     "test/testutil/tests.c",
                 ],
+            "test/testutil/testutil_init.o" =>
+                [
+                    "test/testutil/testutil_init.c",
+                ],
             "test/threadstest" =>
                 [
                     "test/threadstest.o",
diff --git a/deps/openssl/config/archs/linux-x86_64/no-asm/crypto/buildinf.h b/deps/openssl/config/archs/linux-x86_64/no-asm/crypto/buildinf.h
index df3083b539..208c6e0e31 100644
--- a/deps/openssl/config/archs/linux-x86_64/no-asm/crypto/buildinf.h
+++ b/deps/openssl/config/archs/linux-x86_64/no-asm/crypto/buildinf.h
@@ -11,7 +11,7 @@
  */
 
 #define PLATFORM "platform: linux-x86_64"
-#define DATE "built on: Fri Sep 13 16:00:45 2019 UTC"
+#define DATE "built on: Wed Mar 18 21:07:36 2020 UTC"
 
 /*
  * Generate compiler_flags as an array of individual characters. This is a
diff --git a/deps/openssl/config/archs/linux-x86_64/no-asm/crypto/include/internal/bn_conf.h b/deps/openssl/config/archs/linux-x86_64/no-asm/crypto/include/internal/bn_conf.h
index 34bd8b78b4..5312ef5a7a 100644
--- a/deps/openssl/config/archs/linux-x86_64/no-asm/crypto/include/internal/bn_conf.h
+++ b/deps/openssl/config/archs/linux-x86_64/no-asm/crypto/include/internal/bn_conf.h
@@ -1,5 +1,5 @@
 /* WARNING: do not edit! */
-/* Generated by Makefile from crypto/include/internal/bn_conf.h.in */
+/* Generated by Makefile from include/crypto/bn_conf.h.in */
 /*
  * Copyright 2016 The OpenSSL Project Authors. All Rights Reserved.
  *
@@ -9,8 +9,8 @@
  * https://www.openssl.org/source/license.html
  */
 
-#ifndef HEADER_BN_CONF_H
-# define HEADER_BN_CONF_H
+#ifndef OSSL_CRYPTO_BN_CONF_H
+# define OSSL_CRYPTO_BN_CONF_H
 
 /*
  * The contents of this file are not used in the UEFI build, as
diff --git a/deps/openssl/config/archs/linux-x86_64/no-asm/crypto/include/internal/dso_conf.h b/deps/openssl/config/archs/linux-x86_64/no-asm/crypto/include/internal/dso_conf.h
index 252266ec2a..4b1167c3d8 100644
--- a/deps/openssl/config/archs/linux-x86_64/no-asm/crypto/include/internal/dso_conf.h
+++ b/deps/openssl/config/archs/linux-x86_64/no-asm/crypto/include/internal/dso_conf.h
@@ -1,5 +1,5 @@
 /* WARNING: do not edit! */
-/* Generated by Makefile from crypto/include/internal/dso_conf.h.in */
+/* Generated by Makefile from include/crypto/dso_conf.h.in */
 /*
  * Copyright 2016-2019 The OpenSSL Project Authors. All Rights Reserved.
  *
@@ -9,8 +9,8 @@
  * https://www.openssl.org/source/license.html
  */
 
-#ifndef HEADER_DSO_CONF_H
-# define HEADER_DSO_CONF_H
+#ifndef OSSL_CRYPTO_DSO_CONF_H
+# define OSSL_CRYPTO_DSO_CONF_H
 # define DSO_DLFCN
 # define HAVE_DLFCN_H
 # define DSO_EXTENSION ".so"
diff --git a/deps/openssl/config/archs/linux-x86_64/no-asm/include/openssl/opensslconf.h b/deps/openssl/config/archs/linux-x86_64/no-asm/include/openssl/opensslconf.h
index 22c5ea87c4..31bdb87ddb 100644
--- a/deps/openssl/config/archs/linux-x86_64/no-asm/include/openssl/opensslconf.h
+++ b/deps/openssl/config/archs/linux-x86_64/no-asm/include/openssl/opensslconf.h
@@ -99,9 +99,6 @@ extern "C" {
 #ifndef OPENSSL_NO_DYNAMIC_ENGINE
 # define OPENSSL_NO_DYNAMIC_ENGINE
 #endif
-#ifndef OPENSSL_NO_AFALGENG
-# define OPENSSL_NO_AFALGENG
-#endif
 
 
 /*
diff --git a/deps/openssl/config/archs/linux-x86_64/no-asm/include/progs.h b/deps/openssl/config/archs/linux-x86_64/no-asm/include/progs.h
index 9b3d270e20..308c65601b 100644
--- a/deps/openssl/config/archs/linux-x86_64/no-asm/include/progs.h
+++ b/deps/openssl/config/archs/linux-x86_64/no-asm/include/progs.h
@@ -2,7 +2,7 @@
  * WARNING: do not edit!
  * Generated by apps/progs.pl
  *
- * Copyright 1995-2019 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 1995-2020 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
diff --git a/deps/openssl/config/archs/linux32-s390x/asm/configdata.pm b/deps/openssl/config/archs/linux32-s390x/asm/configdata.pm
index 02768931a0..3efb27cfc6 100644
--- a/deps/openssl/config/archs/linux32-s390x/asm/configdata.pm
+++ b/deps/openssl/config/archs/linux32-s390x/asm/configdata.pm
@@ -55,7 +55,7 @@ our %config = (
   minor => "1.1",
   openssl_algorithm_defines => [ "OPENSSL_NO_COMP", "OPENSSL_NO_MD2", "OPENSSL_NO_RC5" ],
   openssl_api_defines => [  ],
-  openssl_other_defines => [ "OPENSSL_RAND_SEED_OS", "OPENSSL_NO_AFALGENG", "OPENSSL_NO_ASAN", "OPENSSL_NO_CRYPTO_MDEBUG", "OPENSSL_NO_CRYPTO_MDEBUG_BACKTRACE", "OPENSSL_NO_DEVCRYPTOENG", "OPENSSL_NO_EC_NISTP_64_GCC_128", "OPENSSL_NO_EGD", "OPENSSL_NO_EXTERNAL_TESTS", "OPENSSL_NO_FUZZ_AFL", "OPENSSL_NO_FUZZ_LIBFUZZER", "OPENSSL_NO_HEARTBEATS", "OPENSSL_NO_MSAN", "OPENSSL_NO_SCTP", "OPENSSL_NO_SSL3", "OPENSSL_NO_SSL3_METHOD", "OPENSSL_NO_UBSAN", "OPENSSL_NO_UNIT_TEST", "OPENSSL_NO_WEAK_SSL_CIPHERS", "OPENSSL_NO_DYNAMIC_ENGINE", "OPENSSL_NO_AFALGENG" ],
+  openssl_other_defines => [ "OPENSSL_RAND_SEED_OS", "OPENSSL_NO_AFALGENG", "OPENSSL_NO_ASAN", "OPENSSL_NO_CRYPTO_MDEBUG", "OPENSSL_NO_CRYPTO_MDEBUG_BACKTRACE", "OPENSSL_NO_DEVCRYPTOENG", "OPENSSL_NO_EC_NISTP_64_GCC_128", "OPENSSL_NO_EGD", "OPENSSL_NO_EXTERNAL_TESTS", "OPENSSL_NO_FUZZ_AFL", "OPENSSL_NO_FUZZ_LIBFUZZER", "OPENSSL_NO_HEARTBEATS", "OPENSSL_NO_MSAN", "OPENSSL_NO_SCTP", "OPENSSL_NO_SSL3", "OPENSSL_NO_SSL3_METHOD", "OPENSSL_NO_UBSAN", "OPENSSL_NO_UNIT_TEST", "OPENSSL_NO_WEAK_SSL_CIPHERS", "OPENSSL_NO_DYNAMIC_ENGINE" ],
   openssl_sys_defines => [  ],
   openssl_thread_defines => [ "OPENSSL_THREADS" ],
   openssldir => "",
@@ -111,8 +111,8 @@ our %config = (
   sourcedir => ".",
   target => "linux32-s390x",
   tdirs => [ "ossl_shim" ],
-  version => "1.1.1d",
-  version_num => "0x1010104fL",
+  version => "1.1.1e",
+  version_num => "0x1010105fL",
 );
 
 our %target = (
@@ -240,6 +240,7 @@ our @disablables = (
   "dgram",
   "dh",
   "dsa",
+  "dso",
   "dtls",
   "dynamic-engine",
   "ec",
@@ -357,8 +358,8 @@ our %unified_info = (
         {
             "" =>
                 [
-                    "crypto/include/internal/bn_conf.h",
-                    "crypto/include/internal/dso_conf.h",
+                    "include/crypto/bn_conf.h",
+                    "include/crypto/dso_conf.h",
                     "include/openssl/opensslconf.h",
                 ],
             "apps/asn1pars.o" =>
@@ -626,14 +627,6 @@ our %unified_info = (
                     "crypto/perlasm/cbc.pl",
                     "crypto/perlasm/x86asm.pl",
                 ],
-            "crypto/include/internal/bn_conf.h" =>
-                [
-                    "configdata.pm",
-                ],
-            "crypto/include/internal/dso_conf.h" =>
-                [
-                    "configdata.pm",
-                ],
             "crypto/rc4/rc4-586.s" =>
                 [
                     "crypto/perlasm/x86asm.pl",
@@ -709,6 +702,14 @@ our %unified_info = (
                 [
                     "libcrypto",
                 ],
+            "include/crypto/bn_conf.h" =>
+                [
+                    "configdata.pm",
+                ],
+            "include/crypto/dso_conf.h" =>
+                [
+                    "configdata.pm",
+                ],
             "include/openssl/opensslconf.h" =>
                 [
                     "configdata.pm",
@@ -1506,6 +1507,12 @@ our %unified_info = (
                     "libcrypto",
                     "test/libtestutil.a",
                 ],
+            "test/ssl_ctx_test" =>
+                [
+                    "libcrypto",
+                    "libssl",
+                    "test/libtestutil.a",
+                ],
             "test/ssl_test" =>
                 [
                     "libcrypto",
@@ -3230,7 +3237,6 @@ our %unified_info = (
                             "test/testutil/cb.o",
                             "test/testutil/driver.o",
                             "test/testutil/format_output.o",
-                            "test/testutil/init.o",
                             "test/testutil/main.o",
                             "test/testutil/output_helpers.o",
                             "test/testutil/random.o",
@@ -3238,6 +3244,7 @@ our %unified_info = (
                             "test/testutil/tap_bio.o",
                             "test/testutil/test_cleanup.o",
                             "test/testutil/tests.o",
+                            "test/testutil/testutil_init.o",
                         ],
                     "products" =>
                         {
@@ -3736,14 +3743,6 @@ our %unified_info = (
                 [
                     "crypto/ia64cpuid.S",
                 ],
-            "crypto/include/internal/bn_conf.h" =>
-                [
-                    "crypto/include/internal/bn_conf.h.in",
-                ],
-            "crypto/include/internal/dso_conf.h" =>
-                [
-                    "crypto/include/internal/dso_conf.h.in",
-                ],
             "crypto/md5/md5-586.s" =>
                 [
                     "crypto/md5/asm/md5-586.pl",
@@ -4184,6 +4183,14 @@ our %unified_info = (
                     "engines/asm/e_padlock-x86_64.pl",
                     "\$(PERLASM_SCHEME)",
                 ],
+            "include/crypto/bn_conf.h" =>
+                [
+                    "include/crypto/bn_conf.h.in",
+                ],
+            "include/crypto/dso_conf.h" =>
+                [
+                    "include/crypto/dso_conf.h.in",
+                ],
             "include/openssl/opensslconf.h" =>
                 [
                     "include/openssl/opensslconf.h.in",
@@ -4870,7 +4877,6 @@ our %unified_info = (
             "crypto/aes/aes-s390x.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto",
                 ],
@@ -4881,37 +4887,31 @@ our %unified_info = (
             "crypto/aes/aes_cfb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/aes/aes_ecb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/aes/aes_ige.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/aes/aes_misc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/aes/aes_ofb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/aes/aes_wrap.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/aes/aesfx-sparcv9.o" =>
@@ -4933,7 +4933,6 @@ our %unified_info = (
             "crypto/aria/aria.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/arm64cpuid.o" =>
@@ -4947,613 +4946,511 @@ our %unified_info = (
             "crypto/asn1/a_bitstr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_d2i_fp.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_digest.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_dup.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_gentm.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_i2d_fp.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_int.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_mbstr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_object.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_octet.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_print.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_sign.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_strex.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_strnid.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_time.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_type.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_utctm.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_utf8.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_verify.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/ameth_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/asn1_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/asn1_gen.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/asn1_item_list.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/asn1_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/asn1_par.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/asn_mime.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/asn_moid.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/asn_mstbl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/asn_pack.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/bio_asn1.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/bio_ndef.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/d2i_pr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/d2i_pu.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/evp_asn1.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/f_int.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/f_string.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/i2d_pr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/i2d_pu.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/n_pkey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/nsseq.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/p5_pbe.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/p5_pbev2.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/p5_scrypt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/p8_pkey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/t_bitst.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/t_pkey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/t_spki.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/tasn_dec.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/tasn_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/tasn_fre.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/tasn_new.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/tasn_prn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/tasn_scn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/tasn_typ.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/tasn_utl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/x_algor.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/x_bignum.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/x_info.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/x_int64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/x_long.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/x_pkey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/x_sig.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/x_spki.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/x_val.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/async/arch/async_null.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/async/arch/async_posix.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/async/arch/async_win.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/async/async.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/async/async_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/async/async_wait.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bf/bf_cfb64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bf/bf_ecb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bf/bf_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bf/bf_ofb64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bf/bf_skey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/b_addr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/b_dump.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/b_print.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/b_sock.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/b_sock2.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bf_buff.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bf_lbuf.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bf_nbio.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bf_null.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bio_cb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bio_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bio_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bio_meth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bss_acpt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bss_bio.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bss_conn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bss_dgram.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bss_fd.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bss_file.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bss_log.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bss_mem.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bss_null.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bss_sock.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/blake2/blake2b.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/blake2/blake2s.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/blake2/m_blake2b.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/blake2/m_blake2s.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/armv4-gf2m.o" =>
@@ -5571,188 +5468,157 @@ our %unified_info = (
             "crypto/bn/bn_add.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_asm.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_blind.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_const.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_ctx.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_depr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_dh.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_div.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_exp.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto",
                 ],
             "crypto/bn/bn_exp2.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_gcd.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_gf2m.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_intern.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_kron.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_mod.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_mont.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_mpi.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_mul.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_nist.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_prime.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_print.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_rand.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_recp.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_shift.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_sqr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_sqrt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_srp.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_word.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_x931p.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/mips-mont.o" =>
@@ -5762,13 +5628,11 @@ our %unified_info = (
             "crypto/bn/s390x-gf2m.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/s390x-mont.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/sparct4-mont.o" =>
@@ -5794,13 +5658,11 @@ our %unified_info = (
             "crypto/buffer/buf_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/buffer/buffer.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/buildinf.h" =>
@@ -5810,43 +5672,36 @@ our %unified_info = (
             "crypto/camellia/camellia.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/camellia/cmll_cbc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/camellia/cmll_cfb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/camellia/cmll_ctr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/camellia/cmll_ecb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/camellia/cmll_misc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/camellia/cmll_ofb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/camellia/cmllt4-sparcv9.o" =>
@@ -5856,31 +5711,26 @@ our %unified_info = (
             "crypto/cast/c_cfb64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cast/c_ecb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cast/c_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cast/c_ofb64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cast/c_skey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/chacha/chacha-armv4.o" =>
@@ -5894,279 +5744,233 @@ our %unified_info = (
             "crypto/chacha/chacha-s390x.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto",
                 ],
             "crypto/cmac/cm_ameth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cmac/cm_pmeth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cmac/cmac.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_asn1.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_att.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_cd.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_dd.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_env.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_ess.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_io.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_kari.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_pwri.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_sd.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_smime.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/conf/conf_api.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/conf/conf_def.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/conf/conf_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/conf/conf_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/conf/conf_mall.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/conf/conf_mod.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/conf/conf_sap.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/conf/conf_ssl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cpt_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cryptlib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ct/ct_b64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ct/ct_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ct/ct_log.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ct/ct_oct.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ct/ct_policy.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ct/ct_prn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ct/ct_sct.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ct/ct_sct_ctx.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ct/ct_vfy.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ct/ct_x509v3.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ctype.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cversion.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto",
                 ],
             "crypto/des/cbc_cksm.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/cbc_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/cfb64ede.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/cfb64enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/cfb_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/des_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/dest4-sparcv9.o" =>
@@ -6176,301 +5980,251 @@ our %unified_info = (
             "crypto/des/ecb3_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/ecb_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/fcrypt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/fcrypt_b.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/ofb64ede.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/ofb64enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/ofb_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/pcbc_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/qud_cksm.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/rand_key.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/set_key.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/str2key.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/xcbc_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_ameth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_asn1.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_check.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_depr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_gen.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_kdf.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_key.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_meth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_pmeth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_prn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_rfc5114.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_rfc7919.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dsa/dsa_ameth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dsa/dsa_asn1.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dsa/dsa_depr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dsa/dsa_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dsa/dsa_gen.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dsa/dsa_key.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dsa/dsa_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dsa/dsa_meth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dsa/dsa_ossl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dsa/dsa_pmeth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dsa/dsa_prn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dsa/dsa_sign.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dsa/dsa_vrf.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dso/dso_dl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dso/dso_dlfcn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dso/dso_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dso/dso_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dso/dso_openssl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dso/dso_vms.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dso/dso_win32.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ebcdic.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/curve25519.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/curve448/arch_32/f_impl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto/ec/curve448/arch_32",
                     "crypto/ec/curve448",
@@ -6478,7 +6232,6 @@ our %unified_info = (
             "crypto/ec/curve448/curve448.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto/ec/curve448/arch_32",
                     "crypto/ec/curve448",
@@ -6486,7 +6239,6 @@ our %unified_info = (
             "crypto/ec/curve448/curve448_tables.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto/ec/curve448/arch_32",
                     "crypto/ec/curve448",
@@ -6494,7 +6246,6 @@ our %unified_info = (
             "crypto/ec/curve448/eddsa.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto/ec/curve448/arch_32",
                     "crypto/ec/curve448",
@@ -6502,7 +6253,6 @@ our %unified_info = (
             "crypto/ec/curve448/f_generic.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto/ec/curve448/arch_32",
                     "crypto/ec/curve448",
@@ -6510,7 +6260,6 @@ our %unified_info = (
             "crypto/ec/curve448/scalar.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto/ec/curve448/arch_32",
                     "crypto/ec/curve448",
@@ -6518,163 +6267,136 @@ our %unified_info = (
             "crypto/ec/ec2_oct.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec2_smpl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec_ameth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec_asn1.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec_check.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec_curve.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec_cvt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec_key.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec_kmeth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec_mult.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec_oct.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec_pmeth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec_print.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecdh_kdf.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecdh_ossl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecdsa_ossl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecdsa_sign.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecdsa_vrf.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/eck_prn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecp_mont.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecp_nist.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecp_nistp224.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecp_nistp256.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecp_nistp521.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecp_nistputil.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecp_nistz256-armv4.o" =>
@@ -6692,223 +6414,186 @@ our %unified_info = (
             "crypto/ec/ecp_oct.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecp_smpl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecx_meth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/eng_all.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/eng_cnf.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/eng_ctrl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/eng_dyn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/eng_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/eng_fat.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/eng_init.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/eng_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/eng_list.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/eng_openssl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/eng_pkey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/eng_rdrand.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/eng_table.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/tb_asnmth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/tb_cipher.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/tb_dh.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/tb_digest.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/tb_dsa.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/tb_eckey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/tb_pkmeth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/tb_rand.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/tb_rsa.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/err/err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/err/err_all.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/err/err_prn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/bio_b64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/bio_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/bio_md.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/bio_ok.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/c_allc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/c_alld.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/cmeth_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/digest.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/e_aes.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto",
                     "crypto/modes",
@@ -6916,21 +6601,18 @@ our %unified_info = (
             "crypto/evp/e_aes_cbc_hmac_sha1.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto/modes",
                 ],
             "crypto/evp/e_aes_cbc_hmac_sha256.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto/modes",
                 ],
             "crypto/evp/e_aria.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto",
                     "crypto/modes",
@@ -6938,13 +6620,11 @@ our %unified_info = (
             "crypto/evp/e_bf.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/e_camellia.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto",
                     "crypto/modes",
@@ -6952,81 +6632,68 @@ our %unified_info = (
             "crypto/evp/e_cast.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/e_chacha20_poly1305.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/e_des.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto",
                 ],
             "crypto/evp/e_des3.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto",
                 ],
             "crypto/evp/e_idea.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/e_null.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/e_old.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/e_rc2.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/e_rc4.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/e_rc4_hmac_md5.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/e_rc5.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/e_seed.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/e_sm4.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto",
                     "crypto/modes",
@@ -7034,328 +6701,267 @@ our %unified_info = (
             "crypto/evp/e_xcbc_d.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/encode.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/evp_cnf.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/evp_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/evp_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/evp_key.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/evp_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/evp_pbe.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/evp_pkey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/m_md2.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/m_md4.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/m_md5.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/m_md5_sha1.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/m_mdc2.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/m_null.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/m_ripemd.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/m_sha1.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/m_sha3.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto",
                 ],
             "crypto/evp/m_sigver.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/m_wp.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/names.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/p5_crpt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/p5_crpt2.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/p_dec.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/p_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/p_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/p_open.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/p_seal.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/p_sign.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/p_verify.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/pbe_scrypt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/pmeth_fn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/pmeth_gn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/pmeth_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ex_data.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/getenv.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/hmac/hm_ameth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/hmac/hm_pmeth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/hmac/hmac.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/idea/i_cbc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/idea/i_cfb64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/idea/i_ecb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/idea/i_ofb64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/idea/i_skey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
-            "crypto/include/internal/bn_conf.h" =>
-                [
-                    ".",
-                ],
-            "crypto/include/internal/dso_conf.h" =>
-                [
-                    ".",
-                ],
             "crypto/init.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/kdf/hkdf.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/kdf/kdf_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/kdf/scrypt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/kdf/tls1_prf.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/lhash/lh_stats.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/lhash/lhash.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/md4/md4_dgst.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/md4/md4_one.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/md5/md5-sparcv9.o" =>
@@ -7365,79 +6971,66 @@ our %unified_info = (
             "crypto/md5/md5_dgst.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/md5/md5_one.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/mdc2/mdc2_one.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/mdc2/mdc2dgst.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/mem.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/mem_dbg.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/mem_sec.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/modes/cbc128.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/modes/ccm128.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/modes/cfb128.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/modes/ctr128.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/modes/cts128.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/modes/gcm128.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto",
                 ],
@@ -7448,7 +7041,6 @@ our %unified_info = (
             "crypto/modes/ghash-s390x.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto",
                 ],
@@ -7463,361 +7055,301 @@ our %unified_info = (
             "crypto/modes/ocb128.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/modes/ofb128.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/modes/wrap128.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/modes/xts128.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/o_dir.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/o_fips.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/o_fopen.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/o_init.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/o_str.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/o_time.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/objects/o_names.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/objects/obj_dat.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/objects/obj_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/objects/obj_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/objects/obj_xref.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ocsp/ocsp_asn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ocsp/ocsp_cl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ocsp/ocsp_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ocsp/ocsp_ext.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ocsp/ocsp_ht.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ocsp/ocsp_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ocsp/ocsp_prn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ocsp/ocsp_srv.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ocsp/ocsp_vfy.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ocsp/v3_ocsp.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pem/pem_all.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pem/pem_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pem/pem_info.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pem/pem_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pem/pem_oth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pem/pem_pk8.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pem/pem_pkey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pem/pem_sign.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pem/pem_x509.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pem/pem_xaux.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pem/pvkfmt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_add.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_asn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_attr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_crpt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_crt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_decr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_init.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_key.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_kiss.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_mutl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_npas.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_p8d.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_p8e.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_sbag.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_utl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/pk12err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs7/bio_pk7.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs7/pk7_asn1.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs7/pk7_attr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs7/pk7_doit.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs7/pk7_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs7/pk7_mime.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs7/pk7_smime.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs7/pkcs7err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/poly1305/poly1305-armv4.o" =>
@@ -7835,7 +7367,6 @@ our %unified_info = (
             "crypto/poly1305/poly1305-s390x.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/poly1305/poly1305-sparcv9.o" =>
@@ -7845,296 +7376,247 @@ our %unified_info = (
             "crypto/poly1305/poly1305.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/poly1305/poly1305_ameth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/poly1305/poly1305_pmeth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rand/drbg_ctr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rand/drbg_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rand/rand_egd.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rand/rand_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rand/rand_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rand/rand_unix.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rand/rand_vms.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rand/rand_win.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rand/randfile.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rc2/rc2_cbc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rc2/rc2_ecb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rc2/rc2_skey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rc2/rc2cfb64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rc2/rc2ofb64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rc4/rc4-s390x.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ripemd/rmd_dgst.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ripemd/rmd_one.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_ameth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_asn1.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_chk.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_crpt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_depr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_gen.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_meth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_mp.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_none.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_oaep.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_ossl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_pk1.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_pmeth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_prn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_pss.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_saos.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_sign.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_ssl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_x931.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_x931g.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/s390xcap.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/s390xcpuid.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto",
                 ],
             "crypto/seed/seed.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/seed/seed_cbc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/seed/seed_cfb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/seed/seed_ecb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/seed/seed_ofb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sha/keccak1600-armv4.o" =>
@@ -8144,7 +7626,6 @@ our %unified_info = (
             "crypto/sha/keccak1600-s390x.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sha/sha1-armv4-large.o" =>
@@ -8162,7 +7643,6 @@ our %unified_info = (
             "crypto/sha/sha1-s390x.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto",
                 ],
@@ -8173,13 +7653,11 @@ our %unified_info = (
             "crypto/sha/sha1_one.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sha/sha1dgst.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sha/sha256-armv4.o" =>
@@ -8197,7 +7675,6 @@ our %unified_info = (
             "crypto/sha/sha256-s390x.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto",
                 ],
@@ -8208,7 +7685,6 @@ our %unified_info = (
             "crypto/sha/sha256.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sha/sha512-armv4.o" =>
@@ -8226,7 +7702,6 @@ our %unified_info = (
             "crypto/sha/sha512-s390x.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto",
                 ],
@@ -8237,709 +7712,591 @@ our %unified_info = (
             "crypto/sha/sha512.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/siphash/siphash.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/siphash/siphash_ameth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/siphash/siphash_pmeth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sm2/sm2_crypt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sm2/sm2_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sm2/sm2_pmeth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sm2/sm2_sign.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sm3/m_sm3.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sm3/sm3.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sm4/sm4.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/srp/srp_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/srp/srp_vfy.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/stack/stack.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/store/loader_file.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/store/store_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/store/store_init.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/store/store_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/store/store_register.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/store/store_strings.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/threads_none.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/threads_pthread.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/threads_win.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ts/ts_asn1.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ts/ts_conf.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ts/ts_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ts/ts_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ts/ts_req_print.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ts/ts_req_utils.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ts/ts_rsp_print.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ts/ts_rsp_sign.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ts/ts_rsp_utils.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ts/ts_rsp_verify.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ts/ts_verify_ctx.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/txt_db/txt_db.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ui/ui_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ui/ui_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ui/ui_null.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ui/ui_openssl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ui/ui_util.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/uid.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/whrlpool/wp_block.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/whrlpool/wp_dgst.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/by_dir.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/by_file.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/t_crl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/t_req.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/t_x509.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_att.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_cmp.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_d2.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_def.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_ext.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_lu.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_meth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_obj.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_r2x.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_req.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_set.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_trs.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_txt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_v3.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_vfy.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_vpm.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509cset.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509name.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509rset.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509spki.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509type.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x_all.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x_attrib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x_crl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x_exten.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x_name.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x_pubkey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x_req.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x_x509.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x_x509a.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/pcy_cache.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/pcy_data.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/pcy_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/pcy_map.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/pcy_node.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/pcy_tree.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_addr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_admis.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_akey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_akeya.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_alt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_asid.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_bcons.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_bitst.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_conf.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_cpols.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_crld.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_enum.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_extku.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_genn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_ia5.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_info.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_int.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_ncons.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_pci.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_pcia.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_pcons.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_pku.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_pmaps.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_prn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_purp.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_skey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_sxnet.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_tlsf.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_utl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "engines/e_capi.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "engines/e_padlock.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "fuzz/asn1.o" =>
@@ -8990,6 +8347,14 @@ our %unified_info = (
                 [
                     "include",
                 ],
+            "include/crypto/bn_conf.h" =>
+                [
+                    ".",
+                ],
+            "include/crypto/dso_conf.h" =>
+                [
+                    ".",
+                ],
             "include/openssl/opensslconf.h" =>
                 [
                     ".",
@@ -9234,7 +8599,6 @@ our %unified_info = (
                 [
                     ".",
                     "include",
-                    "crypto/include",
                 ],
             "test/asn1_string_table_test.o" =>
                 [
@@ -9560,7 +8924,6 @@ our %unified_info = (
                 [
                     ".",
                     "include",
-                    "crypto/include",
                 ],
             "test/cipher_overhead_test.o" =>
                 [
@@ -9606,7 +8969,6 @@ our %unified_info = (
             "test/ctype_internal_test.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "test/curve448_internal_test.o" =>
@@ -9672,7 +9034,6 @@ our %unified_info = (
                 [
                     "include",
                     "crypto/ec",
-                    "crypto/include",
                 ],
             "test/ecdsatest.o" =>
                 [
@@ -9697,7 +9058,6 @@ our %unified_info = (
             "test/evp_extra_test.o" =>
                 [
                     "include",
-                    "crypto/include",
                 ],
             "test/evp_test.o" =>
                 [
@@ -9795,7 +9155,6 @@ our %unified_info = (
                 [
                     ".",
                     "include",
-                    "crypto/include",
                 ],
             "test/rc2test.o" =>
                 [
@@ -9845,18 +9204,15 @@ our %unified_info = (
                 [
                     ".",
                     "include",
-                    "crypto/include",
                 ],
             "test/sm2_internal_test.o" =>
                 [
                     "include",
-                    "crypto/include",
                 ],
             "test/sm4_internal_test.o" =>
                 [
                     ".",
                     "include",
-                    "crypto/include",
                 ],
             "test/srptest.o" =>
                 [
@@ -9867,6 +9223,10 @@ our %unified_info = (
                     ".",
                     "include",
                 ],
+            "test/ssl_ctx_test.o" =>
+                [
+                    "include",
+                ],
             "test/ssl_test.o" =>
                 [
                     "include",
@@ -9930,10 +9290,6 @@ our %unified_info = (
                 [
                     "include",
                 ],
-            "test/testutil/init.o" =>
-                [
-                    "include",
-                ],
             "test/testutil/main.o" =>
                 [
                     "include",
@@ -9962,6 +9318,10 @@ our %unified_info = (
                 [
                     "include",
                 ],
+            "test/testutil/testutil_init.o" =>
+                [
+                    "include",
+                ],
             "test/threadstest.o" =>
                 [
                     "include",
@@ -10226,6 +9586,7 @@ our %unified_info = (
             "test/sm4_internal_test",
             "test/srptest",
             "test/ssl_cert_table_internal_test",
+            "test/ssl_ctx_test",
             "test/ssl_test",
             "test/ssl_test_ctx_test",
             "test/sslapitest",
@@ -15146,7 +14507,6 @@ our %unified_info = (
                     "test/testutil/cb.o",
                     "test/testutil/driver.o",
                     "test/testutil/format_output.o",
-                    "test/testutil/init.o",
                     "test/testutil/main.o",
                     "test/testutil/output_helpers.o",
                     "test/testutil/random.o",
@@ -15154,6 +14514,7 @@ our %unified_info = (
                     "test/testutil/tap_bio.o",
                     "test/testutil/test_cleanup.o",
                     "test/testutil/tests.o",
+                    "test/testutil/testutil_init.o",
                 ],
             "test/md2test" =>
                 [
@@ -15381,6 +14742,14 @@ our %unified_info = (
                 [
                     "test/ssl_cert_table_internal_test.c",
                 ],
+            "test/ssl_ctx_test" =>
+                [
+                    "test/ssl_ctx_test.o",
+                ],
+            "test/ssl_ctx_test.o" =>
+                [
+                    "test/ssl_ctx_test.c",
+                ],
             "test/ssl_test" =>
                 [
                     "test/handshake_helper.o",
@@ -15483,10 +14852,6 @@ our %unified_info = (
                 [
                     "test/testutil/format_output.c",
                 ],
-            "test/testutil/init.o" =>
-                [
-                    "test/testutil/init.c",
-                ],
             "test/testutil/main.o" =>
                 [
                     "test/testutil/main.c",
@@ -15515,6 +14880,10 @@ our %unified_info = (
                 [
                     "test/testutil/tests.c",
                 ],
+            "test/testutil/testutil_init.o" =>
+                [
+                    "test/testutil/testutil_init.c",
+                ],
             "test/threadstest" =>
                 [
                     "test/threadstest.o",
diff --git a/deps/openssl/config/archs/linux32-s390x/asm/crypto/aes/aes-s390x.S b/deps/openssl/config/archs/linux32-s390x/asm/crypto/aes/aes-s390x.S
index 31e9aa9aee..83260ee4bc 100644
--- a/deps/openssl/config/archs/linux32-s390x/asm/crypto/aes/aes-s390x.S
+++ b/deps/openssl/config/archs/linux32-s390x/asm/crypto/aes/aes-s390x.S
@@ -2094,7 +2094,7 @@ AES_xts_encrypt:
 
 .Lxts_enc_done:
 	stg	%r15,80+0(%r15)	# wipe tweak
-	stg	%r15,+8(%r15)
+	stg	%r15,80+8(%r15)
 	lm	%r6,%r14,6*4(%r15)
 	br	%r14
 .size	AES_xts_encrypt,.-AES_xts_encrypt
@@ -2360,7 +2360,7 @@ AES_xts_decrypt:
 	stg	%r15,80-16+8(%r15)
 .Lxts_dec_done:
 	stg	%r15,80+0(%r15)	# wipe tweak
-	stg	%r15,+8(%r15)
+	stg	%r15,80+8(%r15)
 	lm	%r6,%r14,6*4(%r15)
 	br	%r14
 .size	AES_xts_decrypt,.-AES_xts_decrypt
diff --git a/deps/openssl/config/archs/linux32-s390x/asm/crypto/bn/s390x-mont.S b/deps/openssl/config/archs/linux32-s390x/asm/crypto/bn/s390x-mont.S
index 0a6c67545a..4f5f4e4e96 100644
--- a/deps/openssl/config/archs/linux32-s390x/asm/crypto/bn/s390x-mont.S
+++ b/deps/openssl/config/archs/linux32-s390x/asm/crypto/bn/s390x-mont.S
@@ -45,7 +45,7 @@ bn_mul_mont:
 	lghi	%r13,0
 	alcgr	%r13,%r10
 
-	la	%r7,8(%r0)	# j=1
+	la	%r7,8		# j=1
 	lr	%r14,%r1
 
 .align	16
@@ -97,7 +97,7 @@ bn_mul_mont:
 	lghi	%r13,0
 	alcgr	%r13,%r10
 
-	la	%r7,8(%r0)	# j=1
+	la	%r7,8		# j=1
 	lr	%r14,%r1
 
 .align	16
@@ -141,7 +141,7 @@ bn_mul_mont:
 	la	%r3,96(%r15)
 	ahi	%r1,1		# restore %r1, incidentally clears "borrow"
 
-	la	%r7,0(%r0)
+	la	%r7,0
 	lr	%r14,%r1
 .Lsub:	lg	%r9,0(%r7,%r3)
 	lg	%r11,0(%r7,%r5)
@@ -155,7 +155,7 @@ bn_mul_mont:
 	lghi	%r13,-1
 	xgr	%r13,%r12
 
-	la	%r7,0(%r0)
+	la	%r7,0
 	lgr	%r14,%r1
 .Lcopy:	lg	%r8,96(%r7,%r15)	# conditional copy
 	lg	%r9,0(%r7,%r2)
diff --git a/deps/openssl/config/archs/linux32-s390x/asm/crypto/buildinf.h b/deps/openssl/config/archs/linux32-s390x/asm/crypto/buildinf.h
index e5da8365c7..9d017d1778 100644
--- a/deps/openssl/config/archs/linux32-s390x/asm/crypto/buildinf.h
+++ b/deps/openssl/config/archs/linux32-s390x/asm/crypto/buildinf.h
@@ -11,7 +11,7 @@
  */
 
 #define PLATFORM "platform: linux32-s390x"
-#define DATE "built on: Fri Sep 13 16:01:33 2019 UTC"
+#define DATE "built on: Wed Mar 18 21:08:58 2020 UTC"
 
 /*
  * Generate compiler_flags as an array of individual characters. This is a
diff --git a/deps/openssl/config/archs/linux32-s390x/asm/crypto/include/internal/bn_conf.h b/deps/openssl/config/archs/linux32-s390x/asm/crypto/include/internal/bn_conf.h
index fb52156bd0..459055c96f 100644
--- a/deps/openssl/config/archs/linux32-s390x/asm/crypto/include/internal/bn_conf.h
+++ b/deps/openssl/config/archs/linux32-s390x/asm/crypto/include/internal/bn_conf.h
@@ -1,5 +1,5 @@
 /* WARNING: do not edit! */
-/* Generated by Makefile from crypto/include/internal/bn_conf.h.in */
+/* Generated by Makefile from include/crypto/bn_conf.h.in */
 /*
  * Copyright 2016 The OpenSSL Project Authors. All Rights Reserved.
  *
@@ -9,8 +9,8 @@
  * https://www.openssl.org/source/license.html
  */
 
-#ifndef HEADER_BN_CONF_H
-# define HEADER_BN_CONF_H
+#ifndef OSSL_CRYPTO_BN_CONF_H
+# define OSSL_CRYPTO_BN_CONF_H
 
 /*
  * The contents of this file are not used in the UEFI build, as
diff --git a/deps/openssl/config/archs/linux32-s390x/asm/crypto/include/internal/dso_conf.h b/deps/openssl/config/archs/linux32-s390x/asm/crypto/include/internal/dso_conf.h
index 252266ec2a..4b1167c3d8 100644
--- a/deps/openssl/config/archs/linux32-s390x/asm/crypto/include/internal/dso_conf.h
+++ b/deps/openssl/config/archs/linux32-s390x/asm/crypto/include/internal/dso_conf.h
@@ -1,5 +1,5 @@
 /* WARNING: do not edit! */
-/* Generated by Makefile from crypto/include/internal/dso_conf.h.in */
+/* Generated by Makefile from include/crypto/dso_conf.h.in */
 /*
  * Copyright 2016-2019 The OpenSSL Project Authors. All Rights Reserved.
  *
@@ -9,8 +9,8 @@
  * https://www.openssl.org/source/license.html
  */
 
-#ifndef HEADER_DSO_CONF_H
-# define HEADER_DSO_CONF_H
+#ifndef OSSL_CRYPTO_DSO_CONF_H
+# define OSSL_CRYPTO_DSO_CONF_H
 # define DSO_DLFCN
 # define HAVE_DLFCN_H
 # define DSO_EXTENSION ".so"
diff --git a/deps/openssl/config/archs/linux32-s390x/asm/crypto/rc4/rc4-s390x.s b/deps/openssl/config/archs/linux32-s390x/asm/crypto/rc4/rc4-s390x.s
index 1b06f9a8c4..c37d5fb2f9 100644
--- a/deps/openssl/config/archs/linux32-s390x/asm/crypto/rc4/rc4-s390x.s
+++ b/deps/openssl/config/archs/linux32-s390x/asm/crypto/rc4/rc4-s390x.s
@@ -193,7 +193,7 @@ RC4:
 RC4_set_key:
 	stm	%r6,%r8,6*4(%r15)
 	lhi	%r0,256
-	la	%r1,0(%r0)
+	la	%r1,0
 	sth	%r1,0(%r2)
 .align	4
 .L1stloop:
@@ -203,8 +203,8 @@ RC4_set_key:
 
 	lghi	%r7,-256
 	lr	%r0,%r3
-	la	%r8,0(%r0)
-	la	%r1,0(%r0)
+	la	%r8,0
+	la	%r1,0
 .align	16
 .L2ndloop:
 	llgc	%r5,2+256(%r7,%r2)
@@ -221,7 +221,7 @@ RC4_set_key:
 	jz	.Ldone
 	brct	%r0,.L2ndloop
 	lr	%r0,%r3
-	la	%r8,0(%r0)
+	la	%r8,0
 	j	.L2ndloop
 .Ldone:
 	lm	%r6,%r8,6*4(%r15)
diff --git a/deps/openssl/config/archs/linux32-s390x/asm/include/openssl/opensslconf.h b/deps/openssl/config/archs/linux32-s390x/asm/include/openssl/opensslconf.h
index 1a2b31bdc7..71c4fecc40 100644
--- a/deps/openssl/config/archs/linux32-s390x/asm/include/openssl/opensslconf.h
+++ b/deps/openssl/config/archs/linux32-s390x/asm/include/openssl/opensslconf.h
@@ -96,9 +96,6 @@ extern "C" {
 #ifndef OPENSSL_NO_DYNAMIC_ENGINE
 # define OPENSSL_NO_DYNAMIC_ENGINE
 #endif
-#ifndef OPENSSL_NO_AFALGENG
-# define OPENSSL_NO_AFALGENG
-#endif
 
 
 /*
diff --git a/deps/openssl/config/archs/linux32-s390x/asm/include/progs.h b/deps/openssl/config/archs/linux32-s390x/asm/include/progs.h
index 9b3d270e20..308c65601b 100644
--- a/deps/openssl/config/archs/linux32-s390x/asm/include/progs.h
+++ b/deps/openssl/config/archs/linux32-s390x/asm/include/progs.h
@@ -2,7 +2,7 @@
  * WARNING: do not edit!
  * Generated by apps/progs.pl
  *
- * Copyright 1995-2019 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 1995-2020 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
diff --git a/deps/openssl/config/archs/linux32-s390x/asm_avx2/configdata.pm b/deps/openssl/config/archs/linux32-s390x/asm_avx2/configdata.pm
index 96ab247e83..d8384829df 100644
--- a/deps/openssl/config/archs/linux32-s390x/asm_avx2/configdata.pm
+++ b/deps/openssl/config/archs/linux32-s390x/asm_avx2/configdata.pm
@@ -55,7 +55,7 @@ our %config = (
   minor => "1.1",
   openssl_algorithm_defines => [ "OPENSSL_NO_COMP", "OPENSSL_NO_MD2", "OPENSSL_NO_RC5" ],
   openssl_api_defines => [  ],
-  openssl_other_defines => [ "OPENSSL_RAND_SEED_OS", "OPENSSL_NO_AFALGENG", "OPENSSL_NO_ASAN", "OPENSSL_NO_CRYPTO_MDEBUG", "OPENSSL_NO_CRYPTO_MDEBUG_BACKTRACE", "OPENSSL_NO_DEVCRYPTOENG", "OPENSSL_NO_EC_NISTP_64_GCC_128", "OPENSSL_NO_EGD", "OPENSSL_NO_EXTERNAL_TESTS", "OPENSSL_NO_FUZZ_AFL", "OPENSSL_NO_FUZZ_LIBFUZZER", "OPENSSL_NO_HEARTBEATS", "OPENSSL_NO_MSAN", "OPENSSL_NO_SCTP", "OPENSSL_NO_SSL3", "OPENSSL_NO_SSL3_METHOD", "OPENSSL_NO_UBSAN", "OPENSSL_NO_UNIT_TEST", "OPENSSL_NO_WEAK_SSL_CIPHERS", "OPENSSL_NO_DYNAMIC_ENGINE", "OPENSSL_NO_AFALGENG" ],
+  openssl_other_defines => [ "OPENSSL_RAND_SEED_OS", "OPENSSL_NO_AFALGENG", "OPENSSL_NO_ASAN", "OPENSSL_NO_CRYPTO_MDEBUG", "OPENSSL_NO_CRYPTO_MDEBUG_BACKTRACE", "OPENSSL_NO_DEVCRYPTOENG", "OPENSSL_NO_EC_NISTP_64_GCC_128", "OPENSSL_NO_EGD", "OPENSSL_NO_EXTERNAL_TESTS", "OPENSSL_NO_FUZZ_AFL", "OPENSSL_NO_FUZZ_LIBFUZZER", "OPENSSL_NO_HEARTBEATS", "OPENSSL_NO_MSAN", "OPENSSL_NO_SCTP", "OPENSSL_NO_SSL3", "OPENSSL_NO_SSL3_METHOD", "OPENSSL_NO_UBSAN", "OPENSSL_NO_UNIT_TEST", "OPENSSL_NO_WEAK_SSL_CIPHERS", "OPENSSL_NO_DYNAMIC_ENGINE" ],
   openssl_sys_defines => [  ],
   openssl_thread_defines => [ "OPENSSL_THREADS" ],
   openssldir => "",
@@ -111,8 +111,8 @@ our %config = (
   sourcedir => ".",
   target => "linux32-s390x",
   tdirs => [ "ossl_shim" ],
-  version => "1.1.1d",
-  version_num => "0x1010104fL",
+  version => "1.1.1e",
+  version_num => "0x1010105fL",
 );
 
 our %target = (
@@ -240,6 +240,7 @@ our @disablables = (
   "dgram",
   "dh",
   "dsa",
+  "dso",
   "dtls",
   "dynamic-engine",
   "ec",
@@ -357,8 +358,8 @@ our %unified_info = (
         {
             "" =>
                 [
-                    "crypto/include/internal/bn_conf.h",
-                    "crypto/include/internal/dso_conf.h",
+                    "include/crypto/bn_conf.h",
+                    "include/crypto/dso_conf.h",
                     "include/openssl/opensslconf.h",
                 ],
             "apps/asn1pars.o" =>
@@ -626,14 +627,6 @@ our %unified_info = (
                     "crypto/perlasm/cbc.pl",
                     "crypto/perlasm/x86asm.pl",
                 ],
-            "crypto/include/internal/bn_conf.h" =>
-                [
-                    "configdata.pm",
-                ],
-            "crypto/include/internal/dso_conf.h" =>
-                [
-                    "configdata.pm",
-                ],
             "crypto/rc4/rc4-586.s" =>
                 [
                     "crypto/perlasm/x86asm.pl",
@@ -709,6 +702,14 @@ our %unified_info = (
                 [
                     "libcrypto",
                 ],
+            "include/crypto/bn_conf.h" =>
+                [
+                    "configdata.pm",
+                ],
+            "include/crypto/dso_conf.h" =>
+                [
+                    "configdata.pm",
+                ],
             "include/openssl/opensslconf.h" =>
                 [
                     "configdata.pm",
@@ -1506,6 +1507,12 @@ our %unified_info = (
                     "libcrypto",
                     "test/libtestutil.a",
                 ],
+            "test/ssl_ctx_test" =>
+                [
+                    "libcrypto",
+                    "libssl",
+                    "test/libtestutil.a",
+                ],
             "test/ssl_test" =>
                 [
                     "libcrypto",
@@ -3230,7 +3237,6 @@ our %unified_info = (
                             "test/testutil/cb.o",
                             "test/testutil/driver.o",
                             "test/testutil/format_output.o",
-                            "test/testutil/init.o",
                             "test/testutil/main.o",
                             "test/testutil/output_helpers.o",
                             "test/testutil/random.o",
@@ -3238,6 +3244,7 @@ our %unified_info = (
                             "test/testutil/tap_bio.o",
                             "test/testutil/test_cleanup.o",
                             "test/testutil/tests.o",
+                            "test/testutil/testutil_init.o",
                         ],
                     "products" =>
                         {
@@ -3736,14 +3743,6 @@ our %unified_info = (
                 [
                     "crypto/ia64cpuid.S",
                 ],
-            "crypto/include/internal/bn_conf.h" =>
-                [
-                    "crypto/include/internal/bn_conf.h.in",
-                ],
-            "crypto/include/internal/dso_conf.h" =>
-                [
-                    "crypto/include/internal/dso_conf.h.in",
-                ],
             "crypto/md5/md5-586.s" =>
                 [
                     "crypto/md5/asm/md5-586.pl",
@@ -4184,6 +4183,14 @@ our %unified_info = (
                     "engines/asm/e_padlock-x86_64.pl",
                     "\$(PERLASM_SCHEME)",
                 ],
+            "include/crypto/bn_conf.h" =>
+                [
+                    "include/crypto/bn_conf.h.in",
+                ],
+            "include/crypto/dso_conf.h" =>
+                [
+                    "include/crypto/dso_conf.h.in",
+                ],
             "include/openssl/opensslconf.h" =>
                 [
                     "include/openssl/opensslconf.h.in",
@@ -4870,7 +4877,6 @@ our %unified_info = (
             "crypto/aes/aes-s390x.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto",
                 ],
@@ -4881,37 +4887,31 @@ our %unified_info = (
             "crypto/aes/aes_cfb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/aes/aes_ecb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/aes/aes_ige.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/aes/aes_misc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/aes/aes_ofb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/aes/aes_wrap.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/aes/aesfx-sparcv9.o" =>
@@ -4933,7 +4933,6 @@ our %unified_info = (
             "crypto/aria/aria.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/arm64cpuid.o" =>
@@ -4947,613 +4946,511 @@ our %unified_info = (
             "crypto/asn1/a_bitstr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_d2i_fp.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_digest.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_dup.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_gentm.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_i2d_fp.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_int.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_mbstr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_object.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_octet.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_print.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_sign.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_strex.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_strnid.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_time.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_type.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_utctm.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_utf8.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_verify.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/ameth_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/asn1_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/asn1_gen.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/asn1_item_list.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/asn1_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/asn1_par.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/asn_mime.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/asn_moid.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/asn_mstbl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/asn_pack.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/bio_asn1.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/bio_ndef.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/d2i_pr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/d2i_pu.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/evp_asn1.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/f_int.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/f_string.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/i2d_pr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/i2d_pu.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/n_pkey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/nsseq.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/p5_pbe.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/p5_pbev2.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/p5_scrypt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/p8_pkey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/t_bitst.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/t_pkey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/t_spki.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/tasn_dec.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/tasn_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/tasn_fre.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/tasn_new.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/tasn_prn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/tasn_scn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/tasn_typ.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/tasn_utl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/x_algor.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/x_bignum.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/x_info.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/x_int64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/x_long.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/x_pkey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/x_sig.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/x_spki.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/x_val.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/async/arch/async_null.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/async/arch/async_posix.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/async/arch/async_win.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/async/async.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/async/async_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/async/async_wait.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bf/bf_cfb64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bf/bf_ecb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bf/bf_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bf/bf_ofb64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bf/bf_skey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/b_addr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/b_dump.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/b_print.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/b_sock.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/b_sock2.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bf_buff.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bf_lbuf.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bf_nbio.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bf_null.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bio_cb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bio_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bio_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bio_meth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bss_acpt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bss_bio.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bss_conn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bss_dgram.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bss_fd.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bss_file.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bss_log.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bss_mem.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bss_null.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bss_sock.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/blake2/blake2b.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/blake2/blake2s.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/blake2/m_blake2b.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/blake2/m_blake2s.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/armv4-gf2m.o" =>
@@ -5571,188 +5468,157 @@ our %unified_info = (
             "crypto/bn/bn_add.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_asm.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_blind.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_const.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_ctx.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_depr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_dh.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_div.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_exp.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto",
                 ],
             "crypto/bn/bn_exp2.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_gcd.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_gf2m.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_intern.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_kron.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_mod.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_mont.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_mpi.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_mul.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_nist.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_prime.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_print.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_rand.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_recp.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_shift.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_sqr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_sqrt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_srp.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_word.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_x931p.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/mips-mont.o" =>
@@ -5762,13 +5628,11 @@ our %unified_info = (
             "crypto/bn/s390x-gf2m.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/s390x-mont.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/sparct4-mont.o" =>
@@ -5794,13 +5658,11 @@ our %unified_info = (
             "crypto/buffer/buf_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/buffer/buffer.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/buildinf.h" =>
@@ -5810,43 +5672,36 @@ our %unified_info = (
             "crypto/camellia/camellia.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/camellia/cmll_cbc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/camellia/cmll_cfb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/camellia/cmll_ctr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/camellia/cmll_ecb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/camellia/cmll_misc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/camellia/cmll_ofb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/camellia/cmllt4-sparcv9.o" =>
@@ -5856,31 +5711,26 @@ our %unified_info = (
             "crypto/cast/c_cfb64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cast/c_ecb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cast/c_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cast/c_ofb64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cast/c_skey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/chacha/chacha-armv4.o" =>
@@ -5894,279 +5744,233 @@ our %unified_info = (
             "crypto/chacha/chacha-s390x.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto",
                 ],
             "crypto/cmac/cm_ameth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cmac/cm_pmeth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cmac/cmac.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_asn1.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_att.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_cd.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_dd.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_env.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_ess.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_io.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_kari.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_pwri.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_sd.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_smime.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/conf/conf_api.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/conf/conf_def.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/conf/conf_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/conf/conf_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/conf/conf_mall.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/conf/conf_mod.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/conf/conf_sap.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/conf/conf_ssl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cpt_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cryptlib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ct/ct_b64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ct/ct_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ct/ct_log.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ct/ct_oct.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ct/ct_policy.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ct/ct_prn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ct/ct_sct.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ct/ct_sct_ctx.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ct/ct_vfy.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ct/ct_x509v3.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ctype.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cversion.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto",
                 ],
             "crypto/des/cbc_cksm.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/cbc_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/cfb64ede.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/cfb64enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/cfb_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/des_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/dest4-sparcv9.o" =>
@@ -6176,301 +5980,251 @@ our %unified_info = (
             "crypto/des/ecb3_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/ecb_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/fcrypt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/fcrypt_b.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/ofb64ede.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/ofb64enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/ofb_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/pcbc_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/qud_cksm.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/rand_key.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/set_key.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/str2key.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/xcbc_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_ameth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_asn1.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_check.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_depr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_gen.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_kdf.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_key.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_meth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_pmeth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_prn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_rfc5114.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_rfc7919.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dsa/dsa_ameth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dsa/dsa_asn1.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dsa/dsa_depr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dsa/dsa_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dsa/dsa_gen.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dsa/dsa_key.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dsa/dsa_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dsa/dsa_meth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dsa/dsa_ossl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dsa/dsa_pmeth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dsa/dsa_prn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dsa/dsa_sign.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dsa/dsa_vrf.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dso/dso_dl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dso/dso_dlfcn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dso/dso_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dso/dso_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dso/dso_openssl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dso/dso_vms.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dso/dso_win32.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ebcdic.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/curve25519.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/curve448/arch_32/f_impl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto/ec/curve448/arch_32",
                     "crypto/ec/curve448",
@@ -6478,7 +6232,6 @@ our %unified_info = (
             "crypto/ec/curve448/curve448.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto/ec/curve448/arch_32",
                     "crypto/ec/curve448",
@@ -6486,7 +6239,6 @@ our %unified_info = (
             "crypto/ec/curve448/curve448_tables.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto/ec/curve448/arch_32",
                     "crypto/ec/curve448",
@@ -6494,7 +6246,6 @@ our %unified_info = (
             "crypto/ec/curve448/eddsa.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto/ec/curve448/arch_32",
                     "crypto/ec/curve448",
@@ -6502,7 +6253,6 @@ our %unified_info = (
             "crypto/ec/curve448/f_generic.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto/ec/curve448/arch_32",
                     "crypto/ec/curve448",
@@ -6510,7 +6260,6 @@ our %unified_info = (
             "crypto/ec/curve448/scalar.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto/ec/curve448/arch_32",
                     "crypto/ec/curve448",
@@ -6518,163 +6267,136 @@ our %unified_info = (
             "crypto/ec/ec2_oct.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec2_smpl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec_ameth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec_asn1.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec_check.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec_curve.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec_cvt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec_key.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec_kmeth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec_mult.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec_oct.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec_pmeth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec_print.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecdh_kdf.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecdh_ossl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecdsa_ossl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecdsa_sign.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecdsa_vrf.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/eck_prn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecp_mont.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecp_nist.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecp_nistp224.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecp_nistp256.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecp_nistp521.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecp_nistputil.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecp_nistz256-armv4.o" =>
@@ -6692,223 +6414,186 @@ our %unified_info = (
             "crypto/ec/ecp_oct.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecp_smpl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecx_meth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/eng_all.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/eng_cnf.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/eng_ctrl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/eng_dyn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/eng_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/eng_fat.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/eng_init.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/eng_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/eng_list.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/eng_openssl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/eng_pkey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/eng_rdrand.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/eng_table.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/tb_asnmth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/tb_cipher.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/tb_dh.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/tb_digest.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/tb_dsa.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/tb_eckey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/tb_pkmeth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/tb_rand.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/tb_rsa.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/err/err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/err/err_all.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/err/err_prn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/bio_b64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/bio_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/bio_md.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/bio_ok.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/c_allc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/c_alld.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/cmeth_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/digest.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/e_aes.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto",
                     "crypto/modes",
@@ -6916,21 +6601,18 @@ our %unified_info = (
             "crypto/evp/e_aes_cbc_hmac_sha1.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto/modes",
                 ],
             "crypto/evp/e_aes_cbc_hmac_sha256.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto/modes",
                 ],
             "crypto/evp/e_aria.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto",
                     "crypto/modes",
@@ -6938,13 +6620,11 @@ our %unified_info = (
             "crypto/evp/e_bf.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/e_camellia.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto",
                     "crypto/modes",
@@ -6952,81 +6632,68 @@ our %unified_info = (
             "crypto/evp/e_cast.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/e_chacha20_poly1305.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/e_des.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto",
                 ],
             "crypto/evp/e_des3.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto",
                 ],
             "crypto/evp/e_idea.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/e_null.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/e_old.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/e_rc2.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/e_rc4.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/e_rc4_hmac_md5.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/e_rc5.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/e_seed.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/e_sm4.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto",
                     "crypto/modes",
@@ -7034,328 +6701,267 @@ our %unified_info = (
             "crypto/evp/e_xcbc_d.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/encode.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/evp_cnf.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/evp_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/evp_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/evp_key.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/evp_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/evp_pbe.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/evp_pkey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/m_md2.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/m_md4.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/m_md5.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/m_md5_sha1.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/m_mdc2.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/m_null.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/m_ripemd.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/m_sha1.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/m_sha3.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto",
                 ],
             "crypto/evp/m_sigver.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/m_wp.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/names.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/p5_crpt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/p5_crpt2.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/p_dec.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/p_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/p_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/p_open.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/p_seal.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/p_sign.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/p_verify.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/pbe_scrypt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/pmeth_fn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/pmeth_gn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/pmeth_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ex_data.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/getenv.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/hmac/hm_ameth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/hmac/hm_pmeth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/hmac/hmac.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/idea/i_cbc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/idea/i_cfb64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/idea/i_ecb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/idea/i_ofb64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/idea/i_skey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
-            "crypto/include/internal/bn_conf.h" =>
-                [
-                    ".",
-                ],
-            "crypto/include/internal/dso_conf.h" =>
-                [
-                    ".",
-                ],
             "crypto/init.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/kdf/hkdf.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/kdf/kdf_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/kdf/scrypt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/kdf/tls1_prf.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/lhash/lh_stats.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/lhash/lhash.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/md4/md4_dgst.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/md4/md4_one.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/md5/md5-sparcv9.o" =>
@@ -7365,79 +6971,66 @@ our %unified_info = (
             "crypto/md5/md5_dgst.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/md5/md5_one.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/mdc2/mdc2_one.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/mdc2/mdc2dgst.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/mem.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/mem_dbg.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/mem_sec.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/modes/cbc128.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/modes/ccm128.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/modes/cfb128.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/modes/ctr128.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/modes/cts128.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/modes/gcm128.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto",
                 ],
@@ -7448,7 +7041,6 @@ our %unified_info = (
             "crypto/modes/ghash-s390x.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto",
                 ],
@@ -7463,361 +7055,301 @@ our %unified_info = (
             "crypto/modes/ocb128.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/modes/ofb128.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/modes/wrap128.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/modes/xts128.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/o_dir.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/o_fips.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/o_fopen.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/o_init.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/o_str.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/o_time.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/objects/o_names.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/objects/obj_dat.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/objects/obj_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/objects/obj_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/objects/obj_xref.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ocsp/ocsp_asn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ocsp/ocsp_cl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ocsp/ocsp_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ocsp/ocsp_ext.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ocsp/ocsp_ht.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ocsp/ocsp_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ocsp/ocsp_prn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ocsp/ocsp_srv.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ocsp/ocsp_vfy.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ocsp/v3_ocsp.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pem/pem_all.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pem/pem_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pem/pem_info.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pem/pem_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pem/pem_oth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pem/pem_pk8.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pem/pem_pkey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pem/pem_sign.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pem/pem_x509.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pem/pem_xaux.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pem/pvkfmt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_add.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_asn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_attr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_crpt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_crt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_decr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_init.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_key.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_kiss.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_mutl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_npas.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_p8d.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_p8e.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_sbag.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_utl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/pk12err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs7/bio_pk7.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs7/pk7_asn1.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs7/pk7_attr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs7/pk7_doit.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs7/pk7_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs7/pk7_mime.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs7/pk7_smime.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs7/pkcs7err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/poly1305/poly1305-armv4.o" =>
@@ -7835,7 +7367,6 @@ our %unified_info = (
             "crypto/poly1305/poly1305-s390x.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/poly1305/poly1305-sparcv9.o" =>
@@ -7845,296 +7376,247 @@ our %unified_info = (
             "crypto/poly1305/poly1305.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/poly1305/poly1305_ameth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/poly1305/poly1305_pmeth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rand/drbg_ctr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rand/drbg_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rand/rand_egd.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rand/rand_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rand/rand_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rand/rand_unix.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rand/rand_vms.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rand/rand_win.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rand/randfile.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rc2/rc2_cbc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rc2/rc2_ecb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rc2/rc2_skey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rc2/rc2cfb64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rc2/rc2ofb64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rc4/rc4-s390x.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ripemd/rmd_dgst.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ripemd/rmd_one.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_ameth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_asn1.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_chk.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_crpt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_depr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_gen.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_meth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_mp.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_none.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_oaep.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_ossl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_pk1.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_pmeth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_prn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_pss.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_saos.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_sign.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_ssl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_x931.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_x931g.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/s390xcap.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/s390xcpuid.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto",
                 ],
             "crypto/seed/seed.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/seed/seed_cbc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/seed/seed_cfb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/seed/seed_ecb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/seed/seed_ofb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sha/keccak1600-armv4.o" =>
@@ -8144,7 +7626,6 @@ our %unified_info = (
             "crypto/sha/keccak1600-s390x.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sha/sha1-armv4-large.o" =>
@@ -8162,7 +7643,6 @@ our %unified_info = (
             "crypto/sha/sha1-s390x.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto",
                 ],
@@ -8173,13 +7653,11 @@ our %unified_info = (
             "crypto/sha/sha1_one.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sha/sha1dgst.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sha/sha256-armv4.o" =>
@@ -8197,7 +7675,6 @@ our %unified_info = (
             "crypto/sha/sha256-s390x.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto",
                 ],
@@ -8208,7 +7685,6 @@ our %unified_info = (
             "crypto/sha/sha256.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sha/sha512-armv4.o" =>
@@ -8226,7 +7702,6 @@ our %unified_info = (
             "crypto/sha/sha512-s390x.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto",
                 ],
@@ -8237,709 +7712,591 @@ our %unified_info = (
             "crypto/sha/sha512.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/siphash/siphash.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/siphash/siphash_ameth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/siphash/siphash_pmeth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sm2/sm2_crypt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sm2/sm2_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sm2/sm2_pmeth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sm2/sm2_sign.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sm3/m_sm3.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sm3/sm3.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sm4/sm4.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/srp/srp_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/srp/srp_vfy.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/stack/stack.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/store/loader_file.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/store/store_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/store/store_init.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/store/store_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/store/store_register.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/store/store_strings.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/threads_none.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/threads_pthread.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/threads_win.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ts/ts_asn1.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ts/ts_conf.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ts/ts_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ts/ts_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ts/ts_req_print.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ts/ts_req_utils.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ts/ts_rsp_print.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ts/ts_rsp_sign.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ts/ts_rsp_utils.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ts/ts_rsp_verify.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ts/ts_verify_ctx.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/txt_db/txt_db.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ui/ui_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ui/ui_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ui/ui_null.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ui/ui_openssl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ui/ui_util.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/uid.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/whrlpool/wp_block.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/whrlpool/wp_dgst.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/by_dir.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/by_file.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/t_crl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/t_req.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/t_x509.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_att.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_cmp.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_d2.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_def.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_ext.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_lu.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_meth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_obj.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_r2x.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_req.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_set.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_trs.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_txt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_v3.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_vfy.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_vpm.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509cset.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509name.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509rset.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509spki.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509type.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x_all.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x_attrib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x_crl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x_exten.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x_name.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x_pubkey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x_req.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x_x509.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x_x509a.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/pcy_cache.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/pcy_data.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/pcy_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/pcy_map.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/pcy_node.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/pcy_tree.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_addr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_admis.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_akey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_akeya.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_alt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_asid.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_bcons.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_bitst.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_conf.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_cpols.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_crld.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_enum.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_extku.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_genn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_ia5.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_info.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_int.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_ncons.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_pci.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_pcia.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_pcons.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_pku.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_pmaps.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_prn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_purp.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_skey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_sxnet.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_tlsf.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_utl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "engines/e_capi.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "engines/e_padlock.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "fuzz/asn1.o" =>
@@ -8990,6 +8347,14 @@ our %unified_info = (
                 [
                     "include",
                 ],
+            "include/crypto/bn_conf.h" =>
+                [
+                    ".",
+                ],
+            "include/crypto/dso_conf.h" =>
+                [
+                    ".",
+                ],
             "include/openssl/opensslconf.h" =>
                 [
                     ".",
@@ -9234,7 +8599,6 @@ our %unified_info = (
                 [
                     ".",
                     "include",
-                    "crypto/include",
                 ],
             "test/asn1_string_table_test.o" =>
                 [
@@ -9560,7 +8924,6 @@ our %unified_info = (
                 [
                     ".",
                     "include",
-                    "crypto/include",
                 ],
             "test/cipher_overhead_test.o" =>
                 [
@@ -9606,7 +8969,6 @@ our %unified_info = (
             "test/ctype_internal_test.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "test/curve448_internal_test.o" =>
@@ -9672,7 +9034,6 @@ our %unified_info = (
                 [
                     "include",
                     "crypto/ec",
-                    "crypto/include",
                 ],
             "test/ecdsatest.o" =>
                 [
@@ -9697,7 +9058,6 @@ our %unified_info = (
             "test/evp_extra_test.o" =>
                 [
                     "include",
-                    "crypto/include",
                 ],
             "test/evp_test.o" =>
                 [
@@ -9795,7 +9155,6 @@ our %unified_info = (
                 [
                     ".",
                     "include",
-                    "crypto/include",
                 ],
             "test/rc2test.o" =>
                 [
@@ -9845,18 +9204,15 @@ our %unified_info = (
                 [
                     ".",
                     "include",
-                    "crypto/include",
                 ],
             "test/sm2_internal_test.o" =>
                 [
                     "include",
-                    "crypto/include",
                 ],
             "test/sm4_internal_test.o" =>
                 [
                     ".",
                     "include",
-                    "crypto/include",
                 ],
             "test/srptest.o" =>
                 [
@@ -9867,6 +9223,10 @@ our %unified_info = (
                     ".",
                     "include",
                 ],
+            "test/ssl_ctx_test.o" =>
+                [
+                    "include",
+                ],
             "test/ssl_test.o" =>
                 [
                     "include",
@@ -9930,10 +9290,6 @@ our %unified_info = (
                 [
                     "include",
                 ],
-            "test/testutil/init.o" =>
-                [
-                    "include",
-                ],
             "test/testutil/main.o" =>
                 [
                     "include",
@@ -9962,6 +9318,10 @@ our %unified_info = (
                 [
                     "include",
                 ],
+            "test/testutil/testutil_init.o" =>
+                [
+                    "include",
+                ],
             "test/threadstest.o" =>
                 [
                     "include",
@@ -10226,6 +9586,7 @@ our %unified_info = (
             "test/sm4_internal_test",
             "test/srptest",
             "test/ssl_cert_table_internal_test",
+            "test/ssl_ctx_test",
             "test/ssl_test",
             "test/ssl_test_ctx_test",
             "test/sslapitest",
@@ -15146,7 +14507,6 @@ our %unified_info = (
                     "test/testutil/cb.o",
                     "test/testutil/driver.o",
                     "test/testutil/format_output.o",
-                    "test/testutil/init.o",
                     "test/testutil/main.o",
                     "test/testutil/output_helpers.o",
                     "test/testutil/random.o",
@@ -15154,6 +14514,7 @@ our %unified_info = (
                     "test/testutil/tap_bio.o",
                     "test/testutil/test_cleanup.o",
                     "test/testutil/tests.o",
+                    "test/testutil/testutil_init.o",
                 ],
             "test/md2test" =>
                 [
@@ -15381,6 +14742,14 @@ our %unified_info = (
                 [
                     "test/ssl_cert_table_internal_test.c",
                 ],
+            "test/ssl_ctx_test" =>
+                [
+                    "test/ssl_ctx_test.o",
+                ],
+            "test/ssl_ctx_test.o" =>
+                [
+                    "test/ssl_ctx_test.c",
+                ],
             "test/ssl_test" =>
                 [
                     "test/handshake_helper.o",
@@ -15483,10 +14852,6 @@ our %unified_info = (
                 [
                     "test/testutil/format_output.c",
                 ],
-            "test/testutil/init.o" =>
-                [
-                    "test/testutil/init.c",
-                ],
             "test/testutil/main.o" =>
                 [
                     "test/testutil/main.c",
@@ -15515,6 +14880,10 @@ our %unified_info = (
                 [
                     "test/testutil/tests.c",
                 ],
+            "test/testutil/testutil_init.o" =>
+                [
+                    "test/testutil/testutil_init.c",
+                ],
             "test/threadstest" =>
                 [
                     "test/threadstest.o",
diff --git a/deps/openssl/config/archs/linux32-s390x/asm_avx2/crypto/aes/aes-s390x.S b/deps/openssl/config/archs/linux32-s390x/asm_avx2/crypto/aes/aes-s390x.S
index 31e9aa9aee..83260ee4bc 100644
--- a/deps/openssl/config/archs/linux32-s390x/asm_avx2/crypto/aes/aes-s390x.S
+++ b/deps/openssl/config/archs/linux32-s390x/asm_avx2/crypto/aes/aes-s390x.S
@@ -2094,7 +2094,7 @@ AES_xts_encrypt:
 
 .Lxts_enc_done:
 	stg	%r15,80+0(%r15)	# wipe tweak
-	stg	%r15,+8(%r15)
+	stg	%r15,80+8(%r15)
 	lm	%r6,%r14,6*4(%r15)
 	br	%r14
 .size	AES_xts_encrypt,.-AES_xts_encrypt
@@ -2360,7 +2360,7 @@ AES_xts_decrypt:
 	stg	%r15,80-16+8(%r15)
 .Lxts_dec_done:
 	stg	%r15,80+0(%r15)	# wipe tweak
-	stg	%r15,+8(%r15)
+	stg	%r15,80+8(%r15)
 	lm	%r6,%r14,6*4(%r15)
 	br	%r14
 .size	AES_xts_decrypt,.-AES_xts_decrypt
diff --git a/deps/openssl/config/archs/linux32-s390x/asm_avx2/crypto/bn/s390x-mont.S b/deps/openssl/config/archs/linux32-s390x/asm_avx2/crypto/bn/s390x-mont.S
index 0a6c67545a..4f5f4e4e96 100644
--- a/deps/openssl/config/archs/linux32-s390x/asm_avx2/crypto/bn/s390x-mont.S
+++ b/deps/openssl/config/archs/linux32-s390x/asm_avx2/crypto/bn/s390x-mont.S
@@ -45,7 +45,7 @@ bn_mul_mont:
 	lghi	%r13,0
 	alcgr	%r13,%r10
 
-	la	%r7,8(%r0)	# j=1
+	la	%r7,8		# j=1
 	lr	%r14,%r1
 
 .align	16
@@ -97,7 +97,7 @@ bn_mul_mont:
 	lghi	%r13,0
 	alcgr	%r13,%r10
 
-	la	%r7,8(%r0)	# j=1
+	la	%r7,8		# j=1
 	lr	%r14,%r1
 
 .align	16
@@ -141,7 +141,7 @@ bn_mul_mont:
 	la	%r3,96(%r15)
 	ahi	%r1,1		# restore %r1, incidentally clears "borrow"
 
-	la	%r7,0(%r0)
+	la	%r7,0
 	lr	%r14,%r1
 .Lsub:	lg	%r9,0(%r7,%r3)
 	lg	%r11,0(%r7,%r5)
@@ -155,7 +155,7 @@ bn_mul_mont:
 	lghi	%r13,-1
 	xgr	%r13,%r12
 
-	la	%r7,0(%r0)
+	la	%r7,0
 	lgr	%r14,%r1
 .Lcopy:	lg	%r8,96(%r7,%r15)	# conditional copy
 	lg	%r9,0(%r7,%r2)
diff --git a/deps/openssl/config/archs/linux32-s390x/asm_avx2/crypto/buildinf.h b/deps/openssl/config/archs/linux32-s390x/asm_avx2/crypto/buildinf.h
index 71628ed04c..e7fee2eb3e 100644
--- a/deps/openssl/config/archs/linux32-s390x/asm_avx2/crypto/buildinf.h
+++ b/deps/openssl/config/archs/linux32-s390x/asm_avx2/crypto/buildinf.h
@@ -11,7 +11,7 @@
  */
 
 #define PLATFORM "platform: linux32-s390x"
-#define DATE "built on: Fri Sep 13 16:01:37 2019 UTC"
+#define DATE "built on: Wed Mar 18 21:09:02 2020 UTC"
 
 /*
  * Generate compiler_flags as an array of individual characters. This is a
diff --git a/deps/openssl/config/archs/linux32-s390x/asm_avx2/crypto/include/internal/bn_conf.h b/deps/openssl/config/archs/linux32-s390x/asm_avx2/crypto/include/internal/bn_conf.h
index fb52156bd0..459055c96f 100644
--- a/deps/openssl/config/archs/linux32-s390x/asm_avx2/crypto/include/internal/bn_conf.h
+++ b/deps/openssl/config/archs/linux32-s390x/asm_avx2/crypto/include/internal/bn_conf.h
@@ -1,5 +1,5 @@
 /* WARNING: do not edit! */
-/* Generated by Makefile from crypto/include/internal/bn_conf.h.in */
+/* Generated by Makefile from include/crypto/bn_conf.h.in */
 /*
  * Copyright 2016 The OpenSSL Project Authors. All Rights Reserved.
  *
@@ -9,8 +9,8 @@
  * https://www.openssl.org/source/license.html
  */
 
-#ifndef HEADER_BN_CONF_H
-# define HEADER_BN_CONF_H
+#ifndef OSSL_CRYPTO_BN_CONF_H
+# define OSSL_CRYPTO_BN_CONF_H
 
 /*
  * The contents of this file are not used in the UEFI build, as
diff --git a/deps/openssl/config/archs/linux32-s390x/asm_avx2/crypto/include/internal/dso_conf.h b/deps/openssl/config/archs/linux32-s390x/asm_avx2/crypto/include/internal/dso_conf.h
index 252266ec2a..4b1167c3d8 100644
--- a/deps/openssl/config/archs/linux32-s390x/asm_avx2/crypto/include/internal/dso_conf.h
+++ b/deps/openssl/config/archs/linux32-s390x/asm_avx2/crypto/include/internal/dso_conf.h
@@ -1,5 +1,5 @@
 /* WARNING: do not edit! */
-/* Generated by Makefile from crypto/include/internal/dso_conf.h.in */
+/* Generated by Makefile from include/crypto/dso_conf.h.in */
 /*
  * Copyright 2016-2019 The OpenSSL Project Authors. All Rights Reserved.
  *
@@ -9,8 +9,8 @@
  * https://www.openssl.org/source/license.html
  */
 
-#ifndef HEADER_DSO_CONF_H
-# define HEADER_DSO_CONF_H
+#ifndef OSSL_CRYPTO_DSO_CONF_H
+# define OSSL_CRYPTO_DSO_CONF_H
 # define DSO_DLFCN
 # define HAVE_DLFCN_H
 # define DSO_EXTENSION ".so"
diff --git a/deps/openssl/config/archs/linux32-s390x/asm_avx2/crypto/rc4/rc4-s390x.s b/deps/openssl/config/archs/linux32-s390x/asm_avx2/crypto/rc4/rc4-s390x.s
index 1b06f9a8c4..c37d5fb2f9 100644
--- a/deps/openssl/config/archs/linux32-s390x/asm_avx2/crypto/rc4/rc4-s390x.s
+++ b/deps/openssl/config/archs/linux32-s390x/asm_avx2/crypto/rc4/rc4-s390x.s
@@ -193,7 +193,7 @@ RC4:
 RC4_set_key:
 	stm	%r6,%r8,6*4(%r15)
 	lhi	%r0,256
-	la	%r1,0(%r0)
+	la	%r1,0
 	sth	%r1,0(%r2)
 .align	4
 .L1stloop:
@@ -203,8 +203,8 @@ RC4_set_key:
 
 	lghi	%r7,-256
 	lr	%r0,%r3
-	la	%r8,0(%r0)
-	la	%r1,0(%r0)
+	la	%r8,0
+	la	%r1,0
 .align	16
 .L2ndloop:
 	llgc	%r5,2+256(%r7,%r2)
@@ -221,7 +221,7 @@ RC4_set_key:
 	jz	.Ldone
 	brct	%r0,.L2ndloop
 	lr	%r0,%r3
-	la	%r8,0(%r0)
+	la	%r8,0
 	j	.L2ndloop
 .Ldone:
 	lm	%r6,%r8,6*4(%r15)
diff --git a/deps/openssl/config/archs/linux32-s390x/asm_avx2/include/openssl/opensslconf.h b/deps/openssl/config/archs/linux32-s390x/asm_avx2/include/openssl/opensslconf.h
index 1a2b31bdc7..71c4fecc40 100644
--- a/deps/openssl/config/archs/linux32-s390x/asm_avx2/include/openssl/opensslconf.h
+++ b/deps/openssl/config/archs/linux32-s390x/asm_avx2/include/openssl/opensslconf.h
@@ -96,9 +96,6 @@ extern "C" {
 #ifndef OPENSSL_NO_DYNAMIC_ENGINE
 # define OPENSSL_NO_DYNAMIC_ENGINE
 #endif
-#ifndef OPENSSL_NO_AFALGENG
-# define OPENSSL_NO_AFALGENG
-#endif
 
 
 /*
diff --git a/deps/openssl/config/archs/linux32-s390x/asm_avx2/include/progs.h b/deps/openssl/config/archs/linux32-s390x/asm_avx2/include/progs.h
index 9b3d270e20..308c65601b 100644
--- a/deps/openssl/config/archs/linux32-s390x/asm_avx2/include/progs.h
+++ b/deps/openssl/config/archs/linux32-s390x/asm_avx2/include/progs.h
@@ -2,7 +2,7 @@
  * WARNING: do not edit!
  * Generated by apps/progs.pl
  *
- * Copyright 1995-2019 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 1995-2020 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
diff --git a/deps/openssl/config/archs/linux32-s390x/no-asm/configdata.pm b/deps/openssl/config/archs/linux32-s390x/no-asm/configdata.pm
index 1fcc3a092d..ba39c8551f 100644
--- a/deps/openssl/config/archs/linux32-s390x/no-asm/configdata.pm
+++ b/deps/openssl/config/archs/linux32-s390x/no-asm/configdata.pm
@@ -55,7 +55,7 @@ our %config = (
   minor => "1.1",
   openssl_algorithm_defines => [ "OPENSSL_NO_COMP", "OPENSSL_NO_MD2", "OPENSSL_NO_RC5" ],
   openssl_api_defines => [  ],
-  openssl_other_defines => [ "OPENSSL_RAND_SEED_OS", "OPENSSL_NO_AFALGENG", "OPENSSL_NO_ASAN", "OPENSSL_NO_ASM", "OPENSSL_NO_CRYPTO_MDEBUG", "OPENSSL_NO_CRYPTO_MDEBUG_BACKTRACE", "OPENSSL_NO_DEVCRYPTOENG", "OPENSSL_NO_EC_NISTP_64_GCC_128", "OPENSSL_NO_EGD", "OPENSSL_NO_EXTERNAL_TESTS", "OPENSSL_NO_FUZZ_AFL", "OPENSSL_NO_FUZZ_LIBFUZZER", "OPENSSL_NO_HEARTBEATS", "OPENSSL_NO_MSAN", "OPENSSL_NO_SCTP", "OPENSSL_NO_SSL3", "OPENSSL_NO_SSL3_METHOD", "OPENSSL_NO_UBSAN", "OPENSSL_NO_UNIT_TEST", "OPENSSL_NO_WEAK_SSL_CIPHERS", "OPENSSL_NO_DYNAMIC_ENGINE", "OPENSSL_NO_AFALGENG" ],
+  openssl_other_defines => [ "OPENSSL_RAND_SEED_OS", "OPENSSL_NO_AFALGENG", "OPENSSL_NO_ASAN", "OPENSSL_NO_ASM", "OPENSSL_NO_CRYPTO_MDEBUG", "OPENSSL_NO_CRYPTO_MDEBUG_BACKTRACE", "OPENSSL_NO_DEVCRYPTOENG", "OPENSSL_NO_EC_NISTP_64_GCC_128", "OPENSSL_NO_EGD", "OPENSSL_NO_EXTERNAL_TESTS", "OPENSSL_NO_FUZZ_AFL", "OPENSSL_NO_FUZZ_LIBFUZZER", "OPENSSL_NO_HEARTBEATS", "OPENSSL_NO_MSAN", "OPENSSL_NO_SCTP", "OPENSSL_NO_SSL3", "OPENSSL_NO_SSL3_METHOD", "OPENSSL_NO_UBSAN", "OPENSSL_NO_UNIT_TEST", "OPENSSL_NO_WEAK_SSL_CIPHERS", "OPENSSL_NO_DYNAMIC_ENGINE" ],
   openssl_sys_defines => [  ],
   openssl_thread_defines => [ "OPENSSL_THREADS" ],
   openssldir => "",
@@ -111,8 +111,8 @@ our %config = (
   sourcedir => ".",
   target => "linux32-s390x",
   tdirs => [ "ossl_shim" ],
-  version => "1.1.1d",
-  version_num => "0x1010104fL",
+  version => "1.1.1e",
+  version_num => "0x1010105fL",
 );
 
 our %target = (
@@ -238,6 +238,7 @@ our @disablables = (
   "dgram",
   "dh",
   "dsa",
+  "dso",
   "dtls",
   "dynamic-engine",
   "ec",
@@ -356,8 +357,8 @@ our %unified_info = (
         {
             "" =>
                 [
-                    "crypto/include/internal/bn_conf.h",
-                    "crypto/include/internal/dso_conf.h",
+                    "include/crypto/bn_conf.h",
+                    "include/crypto/dso_conf.h",
                     "include/openssl/opensslconf.h",
                 ],
             "apps/asn1pars.o" =>
@@ -625,14 +626,6 @@ our %unified_info = (
                     "crypto/perlasm/cbc.pl",
                     "crypto/perlasm/x86asm.pl",
                 ],
-            "crypto/include/internal/bn_conf.h" =>
-                [
-                    "configdata.pm",
-                ],
-            "crypto/include/internal/dso_conf.h" =>
-                [
-                    "configdata.pm",
-                ],
             "crypto/rc4/rc4-586.s" =>
                 [
                     "crypto/perlasm/x86asm.pl",
@@ -708,6 +701,14 @@ our %unified_info = (
                 [
                     "libcrypto",
                 ],
+            "include/crypto/bn_conf.h" =>
+                [
+                    "configdata.pm",
+                ],
+            "include/crypto/dso_conf.h" =>
+                [
+                    "configdata.pm",
+                ],
             "include/openssl/opensslconf.h" =>
                 [
                     "configdata.pm",
@@ -1505,6 +1506,12 @@ our %unified_info = (
                     "libcrypto",
                     "test/libtestutil.a",
                 ],
+            "test/ssl_ctx_test" =>
+                [
+                    "libcrypto",
+                    "libssl",
+                    "test/libtestutil.a",
+                ],
             "test/ssl_test" =>
                 [
                     "libcrypto",
@@ -3222,7 +3229,6 @@ our %unified_info = (
                             "test/testutil/cb.o",
                             "test/testutil/driver.o",
                             "test/testutil/format_output.o",
-                            "test/testutil/init.o",
                             "test/testutil/main.o",
                             "test/testutil/output_helpers.o",
                             "test/testutil/random.o",
@@ -3230,6 +3236,7 @@ our %unified_info = (
                             "test/testutil/tap_bio.o",
                             "test/testutil/test_cleanup.o",
                             "test/testutil/tests.o",
+                            "test/testutil/testutil_init.o",
                         ],
                     "products" =>
                         {
@@ -3728,14 +3735,6 @@ our %unified_info = (
                 [
                     "crypto/ia64cpuid.S",
                 ],
-            "crypto/include/internal/bn_conf.h" =>
-                [
-                    "crypto/include/internal/bn_conf.h.in",
-                ],
-            "crypto/include/internal/dso_conf.h" =>
-                [
-                    "crypto/include/internal/dso_conf.h.in",
-                ],
             "crypto/md5/md5-586.s" =>
                 [
                     "crypto/md5/asm/md5-586.pl",
@@ -4176,6 +4175,14 @@ our %unified_info = (
                     "engines/asm/e_padlock-x86_64.pl",
                     "\$(PERLASM_SCHEME)",
                 ],
+            "include/crypto/bn_conf.h" =>
+                [
+                    "include/crypto/bn_conf.h.in",
+                ],
+            "include/crypto/dso_conf.h" =>
+                [
+                    "include/crypto/dso_conf.h.in",
+                ],
             "include/openssl/opensslconf.h" =>
                 [
                     "include/openssl/opensslconf.h.in",
@@ -4870,49 +4877,41 @@ our %unified_info = (
             "crypto/aes/aes_cbc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/aes/aes_cfb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/aes/aes_core.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/aes/aes_ecb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/aes/aes_ige.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/aes/aes_misc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/aes/aes_ofb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/aes/aes_wrap.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/aes/aesfx-sparcv9.o" =>
@@ -4934,7 +4933,6 @@ our %unified_info = (
             "crypto/aria/aria.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/arm64cpuid.o" =>
@@ -4948,613 +4946,511 @@ our %unified_info = (
             "crypto/asn1/a_bitstr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_d2i_fp.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_digest.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_dup.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_gentm.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_i2d_fp.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_int.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_mbstr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_object.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_octet.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_print.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_sign.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_strex.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_strnid.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_time.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_type.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_utctm.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_utf8.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_verify.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/ameth_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/asn1_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/asn1_gen.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/asn1_item_list.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/asn1_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/asn1_par.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/asn_mime.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/asn_moid.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/asn_mstbl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/asn_pack.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/bio_asn1.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/bio_ndef.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/d2i_pr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/d2i_pu.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/evp_asn1.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/f_int.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/f_string.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/i2d_pr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/i2d_pu.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/n_pkey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/nsseq.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/p5_pbe.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/p5_pbev2.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/p5_scrypt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/p8_pkey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/t_bitst.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/t_pkey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/t_spki.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/tasn_dec.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/tasn_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/tasn_fre.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/tasn_new.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/tasn_prn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/tasn_scn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/tasn_typ.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/tasn_utl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/x_algor.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/x_bignum.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/x_info.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/x_int64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/x_long.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/x_pkey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/x_sig.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/x_spki.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/x_val.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/async/arch/async_null.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/async/arch/async_posix.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/async/arch/async_win.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/async/async.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/async/async_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/async/async_wait.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bf/bf_cfb64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bf/bf_ecb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bf/bf_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bf/bf_ofb64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bf/bf_skey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/b_addr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/b_dump.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/b_print.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/b_sock.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/b_sock2.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bf_buff.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bf_lbuf.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bf_nbio.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bf_null.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bio_cb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bio_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bio_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bio_meth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bss_acpt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bss_bio.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bss_conn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bss_dgram.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bss_fd.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bss_file.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bss_log.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bss_mem.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bss_null.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bss_sock.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/blake2/blake2b.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/blake2/blake2s.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/blake2/m_blake2b.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/blake2/m_blake2s.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/armv4-gf2m.o" =>
@@ -5572,182 +5468,152 @@ our %unified_info = (
             "crypto/bn/bn_add.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_blind.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_const.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_ctx.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_depr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_dh.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_div.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_exp.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto",
                 ],
             "crypto/bn/bn_exp2.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_gcd.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_gf2m.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_intern.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_kron.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_mod.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_mont.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_mpi.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_mul.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_nist.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_prime.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_print.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_rand.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_recp.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_shift.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_sqr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_sqrt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_srp.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_word.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_x931p.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/mips-mont.o" =>
@@ -5777,13 +5643,11 @@ our %unified_info = (
             "crypto/buffer/buf_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/buffer/buffer.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/buildinf.h" =>
@@ -5793,43 +5657,36 @@ our %unified_info = (
             "crypto/camellia/camellia.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/camellia/cmll_cbc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/camellia/cmll_cfb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/camellia/cmll_ctr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/camellia/cmll_ecb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/camellia/cmll_misc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/camellia/cmll_ofb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/camellia/cmllt4-sparcv9.o" =>
@@ -5839,31 +5696,26 @@ our %unified_info = (
             "crypto/cast/c_cfb64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cast/c_ecb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cast/c_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cast/c_ofb64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cast/c_skey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/chacha/chacha-armv4.o" =>
@@ -5881,278 +5733,232 @@ our %unified_info = (
             "crypto/chacha/chacha_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cmac/cm_ameth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cmac/cm_pmeth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cmac/cmac.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_asn1.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_att.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_cd.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_dd.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_env.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_ess.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_io.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_kari.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_pwri.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_sd.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_smime.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/conf/conf_api.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/conf/conf_def.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/conf/conf_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/conf/conf_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/conf/conf_mall.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/conf/conf_mod.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/conf/conf_sap.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/conf/conf_ssl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cpt_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cryptlib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ct/ct_b64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ct/ct_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ct/ct_log.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ct/ct_oct.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ct/ct_policy.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ct/ct_prn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ct/ct_sct.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ct/ct_sct_ctx.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ct/ct_vfy.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ct/ct_x509v3.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ctype.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cversion.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto",
                 ],
             "crypto/des/cbc_cksm.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/cbc_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/cfb64ede.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/cfb64enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/cfb_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/des_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/dest4-sparcv9.o" =>
@@ -6162,301 +5968,251 @@ our %unified_info = (
             "crypto/des/ecb3_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/ecb_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/fcrypt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/fcrypt_b.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/ofb64ede.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/ofb64enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/ofb_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/pcbc_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/qud_cksm.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/rand_key.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/set_key.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/str2key.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/xcbc_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_ameth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_asn1.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_check.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_depr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_gen.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_kdf.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_key.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_meth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_pmeth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_prn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_rfc5114.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_rfc7919.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dsa/dsa_ameth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dsa/dsa_asn1.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dsa/dsa_depr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dsa/dsa_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dsa/dsa_gen.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dsa/dsa_key.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dsa/dsa_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dsa/dsa_meth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dsa/dsa_ossl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dsa/dsa_pmeth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dsa/dsa_prn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dsa/dsa_sign.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dsa/dsa_vrf.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dso/dso_dl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dso/dso_dlfcn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dso/dso_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dso/dso_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dso/dso_openssl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dso/dso_vms.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dso/dso_win32.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ebcdic.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/curve25519.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/curve448/arch_32/f_impl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto/ec/curve448/arch_32",
                     "crypto/ec/curve448",
@@ -6464,7 +6220,6 @@ our %unified_info = (
             "crypto/ec/curve448/curve448.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto/ec/curve448/arch_32",
                     "crypto/ec/curve448",
@@ -6472,7 +6227,6 @@ our %unified_info = (
             "crypto/ec/curve448/curve448_tables.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto/ec/curve448/arch_32",
                     "crypto/ec/curve448",
@@ -6480,7 +6234,6 @@ our %unified_info = (
             "crypto/ec/curve448/eddsa.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto/ec/curve448/arch_32",
                     "crypto/ec/curve448",
@@ -6488,7 +6241,6 @@ our %unified_info = (
             "crypto/ec/curve448/f_generic.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto/ec/curve448/arch_32",
                     "crypto/ec/curve448",
@@ -6496,7 +6248,6 @@ our %unified_info = (
             "crypto/ec/curve448/scalar.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto/ec/curve448/arch_32",
                     "crypto/ec/curve448",
@@ -6504,163 +6255,136 @@ our %unified_info = (
             "crypto/ec/ec2_oct.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec2_smpl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec_ameth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec_asn1.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec_check.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec_curve.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec_cvt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec_key.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec_kmeth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec_mult.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec_oct.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec_pmeth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec_print.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecdh_kdf.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecdh_ossl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecdsa_ossl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecdsa_sign.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecdsa_vrf.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/eck_prn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecp_mont.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecp_nist.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecp_nistp224.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecp_nistp256.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecp_nistp521.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecp_nistputil.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecp_nistz256-armv4.o" =>
@@ -6678,223 +6402,186 @@ our %unified_info = (
             "crypto/ec/ecp_oct.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecp_smpl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecx_meth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/eng_all.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/eng_cnf.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/eng_ctrl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/eng_dyn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/eng_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/eng_fat.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/eng_init.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/eng_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/eng_list.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/eng_openssl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/eng_pkey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/eng_rdrand.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/eng_table.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/tb_asnmth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/tb_cipher.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/tb_dh.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/tb_digest.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/tb_dsa.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/tb_eckey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/tb_pkmeth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/tb_rand.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/tb_rsa.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/err/err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/err/err_all.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/err/err_prn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/bio_b64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/bio_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/bio_md.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/bio_ok.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/c_allc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/c_alld.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/cmeth_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/digest.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/e_aes.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto",
                     "crypto/modes",
@@ -6902,21 +6589,18 @@ our %unified_info = (
             "crypto/evp/e_aes_cbc_hmac_sha1.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto/modes",
                 ],
             "crypto/evp/e_aes_cbc_hmac_sha256.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto/modes",
                 ],
             "crypto/evp/e_aria.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto",
                     "crypto/modes",
@@ -6924,13 +6608,11 @@ our %unified_info = (
             "crypto/evp/e_bf.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/e_camellia.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto",
                     "crypto/modes",
@@ -6938,81 +6620,68 @@ our %unified_info = (
             "crypto/evp/e_cast.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/e_chacha20_poly1305.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/e_des.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto",
                 ],
             "crypto/evp/e_des3.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto",
                 ],
             "crypto/evp/e_idea.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/e_null.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/e_old.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/e_rc2.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/e_rc4.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/e_rc4_hmac_md5.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/e_rc5.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/e_seed.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/e_sm4.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto",
                     "crypto/modes",
@@ -7020,328 +6689,267 @@ our %unified_info = (
             "crypto/evp/e_xcbc_d.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/encode.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/evp_cnf.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/evp_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/evp_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/evp_key.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/evp_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/evp_pbe.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/evp_pkey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/m_md2.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/m_md4.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/m_md5.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/m_md5_sha1.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/m_mdc2.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/m_null.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/m_ripemd.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/m_sha1.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/m_sha3.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto",
                 ],
             "crypto/evp/m_sigver.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/m_wp.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/names.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/p5_crpt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/p5_crpt2.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/p_dec.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/p_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/p_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/p_open.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/p_seal.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/p_sign.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/p_verify.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/pbe_scrypt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/pmeth_fn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/pmeth_gn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/pmeth_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ex_data.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/getenv.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/hmac/hm_ameth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/hmac/hm_pmeth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/hmac/hmac.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/idea/i_cbc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/idea/i_cfb64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/idea/i_ecb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/idea/i_ofb64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/idea/i_skey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
-            "crypto/include/internal/bn_conf.h" =>
-                [
-                    ".",
-                ],
-            "crypto/include/internal/dso_conf.h" =>
-                [
-                    ".",
-                ],
             "crypto/init.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/kdf/hkdf.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/kdf/kdf_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/kdf/scrypt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/kdf/tls1_prf.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/lhash/lh_stats.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/lhash/lhash.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/md4/md4_dgst.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/md4/md4_one.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/md5/md5-sparcv9.o" =>
@@ -7351,85 +6959,71 @@ our %unified_info = (
             "crypto/md5/md5_dgst.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/md5/md5_one.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/mdc2/mdc2_one.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/mdc2/mdc2dgst.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/mem.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/mem_clr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/mem_dbg.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/mem_sec.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/modes/cbc128.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/modes/ccm128.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/modes/cfb128.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/modes/ctr128.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/modes/cts128.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/modes/gcm128.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto",
                 ],
@@ -7452,361 +7046,301 @@ our %unified_info = (
             "crypto/modes/ocb128.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/modes/ofb128.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/modes/wrap128.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/modes/xts128.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/o_dir.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/o_fips.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/o_fopen.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/o_init.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/o_str.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/o_time.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/objects/o_names.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/objects/obj_dat.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/objects/obj_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/objects/obj_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/objects/obj_xref.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ocsp/ocsp_asn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ocsp/ocsp_cl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ocsp/ocsp_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ocsp/ocsp_ext.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ocsp/ocsp_ht.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ocsp/ocsp_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ocsp/ocsp_prn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ocsp/ocsp_srv.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ocsp/ocsp_vfy.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ocsp/v3_ocsp.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pem/pem_all.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pem/pem_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pem/pem_info.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pem/pem_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pem/pem_oth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pem/pem_pk8.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pem/pem_pkey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pem/pem_sign.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pem/pem_x509.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pem/pem_xaux.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pem/pvkfmt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_add.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_asn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_attr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_crpt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_crt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_decr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_init.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_key.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_kiss.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_mutl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_npas.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_p8d.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_p8e.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_sbag.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_utl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/pk12err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs7/bio_pk7.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs7/pk7_asn1.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs7/pk7_attr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs7/pk7_doit.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs7/pk7_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs7/pk7_mime.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs7/pk7_smime.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs7/pkcs7err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/poly1305/poly1305-armv4.o" =>
@@ -7828,259 +7362,216 @@ our %unified_info = (
             "crypto/poly1305/poly1305.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/poly1305/poly1305_ameth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/poly1305/poly1305_pmeth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rand/drbg_ctr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rand/drbg_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rand/rand_egd.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rand/rand_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rand/rand_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rand/rand_unix.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rand/rand_vms.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rand/rand_win.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rand/randfile.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rc2/rc2_cbc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rc2/rc2_ecb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rc2/rc2_skey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rc2/rc2cfb64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rc2/rc2ofb64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rc4/rc4_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rc4/rc4_skey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ripemd/rmd_dgst.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ripemd/rmd_one.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_ameth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_asn1.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_chk.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_crpt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_depr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_gen.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_meth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_mp.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_none.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_oaep.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_ossl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_pk1.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_pmeth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_prn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_pss.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_saos.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_sign.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_ssl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_x931.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_x931g.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/s390xcpuid.o" =>
@@ -8090,31 +7581,26 @@ our %unified_info = (
             "crypto/seed/seed.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/seed/seed_cbc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/seed/seed_cfb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/seed/seed_ecb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/seed/seed_ofb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sha/keccak1600-armv4.o" =>
@@ -8124,7 +7610,6 @@ our %unified_info = (
             "crypto/sha/keccak1600.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sha/sha1-armv4-large.o" =>
@@ -8150,13 +7635,11 @@ our %unified_info = (
             "crypto/sha/sha1_one.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sha/sha1dgst.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sha/sha256-armv4.o" =>
@@ -8182,7 +7665,6 @@ our %unified_info = (
             "crypto/sha/sha256.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sha/sha512-armv4.o" =>
@@ -8208,709 +7690,591 @@ our %unified_info = (
             "crypto/sha/sha512.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/siphash/siphash.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/siphash/siphash_ameth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/siphash/siphash_pmeth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sm2/sm2_crypt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sm2/sm2_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sm2/sm2_pmeth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sm2/sm2_sign.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sm3/m_sm3.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sm3/sm3.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sm4/sm4.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/srp/srp_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/srp/srp_vfy.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/stack/stack.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/store/loader_file.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/store/store_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/store/store_init.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/store/store_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/store/store_register.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/store/store_strings.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/threads_none.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/threads_pthread.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/threads_win.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ts/ts_asn1.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ts/ts_conf.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ts/ts_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ts/ts_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ts/ts_req_print.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ts/ts_req_utils.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ts/ts_rsp_print.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ts/ts_rsp_sign.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ts/ts_rsp_utils.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ts/ts_rsp_verify.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ts/ts_verify_ctx.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/txt_db/txt_db.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ui/ui_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ui/ui_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ui/ui_null.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ui/ui_openssl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ui/ui_util.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/uid.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/whrlpool/wp_block.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/whrlpool/wp_dgst.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/by_dir.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/by_file.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/t_crl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/t_req.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/t_x509.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_att.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_cmp.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_d2.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_def.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_ext.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_lu.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_meth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_obj.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_r2x.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_req.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_set.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_trs.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_txt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_v3.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_vfy.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_vpm.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509cset.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509name.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509rset.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509spki.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509type.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x_all.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x_attrib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x_crl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x_exten.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x_name.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x_pubkey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x_req.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x_x509.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x_x509a.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/pcy_cache.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/pcy_data.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/pcy_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/pcy_map.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/pcy_node.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/pcy_tree.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_addr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_admis.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_akey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_akeya.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_alt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_asid.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_bcons.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_bitst.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_conf.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_cpols.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_crld.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_enum.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_extku.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_genn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_ia5.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_info.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_int.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_ncons.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_pci.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_pcia.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_pcons.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_pku.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_pmaps.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_prn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_purp.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_skey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_sxnet.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_tlsf.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_utl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "engines/e_capi.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "engines/e_padlock.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "fuzz/asn1.o" =>
@@ -8961,6 +8325,14 @@ our %unified_info = (
                 [
                     "include",
                 ],
+            "include/crypto/bn_conf.h" =>
+                [
+                    ".",
+                ],
+            "include/crypto/dso_conf.h" =>
+                [
+                    ".",
+                ],
             "include/openssl/opensslconf.h" =>
                 [
                     ".",
@@ -9205,7 +8577,6 @@ our %unified_info = (
                 [
                     ".",
                     "include",
-                    "crypto/include",
                 ],
             "test/asn1_string_table_test.o" =>
                 [
@@ -9531,7 +8902,6 @@ our %unified_info = (
                 [
                     ".",
                     "include",
-                    "crypto/include",
                 ],
             "test/cipher_overhead_test.o" =>
                 [
@@ -9577,7 +8947,6 @@ our %unified_info = (
             "test/ctype_internal_test.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "test/curve448_internal_test.o" =>
@@ -9643,7 +9012,6 @@ our %unified_info = (
                 [
                     "include",
                     "crypto/ec",
-                    "crypto/include",
                 ],
             "test/ecdsatest.o" =>
                 [
@@ -9668,7 +9036,6 @@ our %unified_info = (
             "test/evp_extra_test.o" =>
                 [
                     "include",
-                    "crypto/include",
                 ],
             "test/evp_test.o" =>
                 [
@@ -9766,7 +9133,6 @@ our %unified_info = (
                 [
                     ".",
                     "include",
-                    "crypto/include",
                 ],
             "test/rc2test.o" =>
                 [
@@ -9816,18 +9182,15 @@ our %unified_info = (
                 [
                     ".",
                     "include",
-                    "crypto/include",
                 ],
             "test/sm2_internal_test.o" =>
                 [
                     "include",
-                    "crypto/include",
                 ],
             "test/sm4_internal_test.o" =>
                 [
                     ".",
                     "include",
-                    "crypto/include",
                 ],
             "test/srptest.o" =>
                 [
@@ -9838,6 +9201,10 @@ our %unified_info = (
                     ".",
                     "include",
                 ],
+            "test/ssl_ctx_test.o" =>
+                [
+                    "include",
+                ],
             "test/ssl_test.o" =>
                 [
                     "include",
@@ -9901,10 +9268,6 @@ our %unified_info = (
                 [
                     "include",
                 ],
-            "test/testutil/init.o" =>
-                [
-                    "include",
-                ],
             "test/testutil/main.o" =>
                 [
                     "include",
@@ -9933,6 +9296,10 @@ our %unified_info = (
                 [
                     "include",
                 ],
+            "test/testutil/testutil_init.o" =>
+                [
+                    "include",
+                ],
             "test/threadstest.o" =>
                 [
                     "include",
@@ -10197,6 +9564,7 @@ our %unified_info = (
             "test/sm4_internal_test",
             "test/srptest",
             "test/ssl_cert_table_internal_test",
+            "test/ssl_ctx_test",
             "test/ssl_test",
             "test/ssl_test_ctx_test",
             "test/sslapitest",
@@ -15082,7 +14450,6 @@ our %unified_info = (
                     "test/testutil/cb.o",
                     "test/testutil/driver.o",
                     "test/testutil/format_output.o",
-                    "test/testutil/init.o",
                     "test/testutil/main.o",
                     "test/testutil/output_helpers.o",
                     "test/testutil/random.o",
@@ -15090,6 +14457,7 @@ our %unified_info = (
                     "test/testutil/tap_bio.o",
                     "test/testutil/test_cleanup.o",
                     "test/testutil/tests.o",
+                    "test/testutil/testutil_init.o",
                 ],
             "test/md2test" =>
                 [
@@ -15317,6 +14685,14 @@ our %unified_info = (
                 [
                     "test/ssl_cert_table_internal_test.c",
                 ],
+            "test/ssl_ctx_test" =>
+                [
+                    "test/ssl_ctx_test.o",
+                ],
+            "test/ssl_ctx_test.o" =>
+                [
+                    "test/ssl_ctx_test.c",
+                ],
             "test/ssl_test" =>
                 [
                     "test/handshake_helper.o",
@@ -15419,10 +14795,6 @@ our %unified_info = (
                 [
                     "test/testutil/format_output.c",
                 ],
-            "test/testutil/init.o" =>
-                [
-                    "test/testutil/init.c",
-                ],
             "test/testutil/main.o" =>
                 [
                     "test/testutil/main.c",
@@ -15451,6 +14823,10 @@ our %unified_info = (
                 [
                     "test/testutil/tests.c",
                 ],
+            "test/testutil/testutil_init.o" =>
+                [
+                    "test/testutil/testutil_init.c",
+                ],
             "test/threadstest" =>
                 [
                     "test/threadstest.o",
diff --git a/deps/openssl/config/archs/linux32-s390x/no-asm/crypto/buildinf.h b/deps/openssl/config/archs/linux32-s390x/no-asm/crypto/buildinf.h
index e7256e3f12..2fbe63990c 100644
--- a/deps/openssl/config/archs/linux32-s390x/no-asm/crypto/buildinf.h
+++ b/deps/openssl/config/archs/linux32-s390x/no-asm/crypto/buildinf.h
@@ -11,7 +11,7 @@
  */
 
 #define PLATFORM "platform: linux32-s390x"
-#define DATE "built on: Fri Sep 13 16:01:41 2019 UTC"
+#define DATE "built on: Wed Mar 18 21:09:09 2020 UTC"
 
 /*
  * Generate compiler_flags as an array of individual characters. This is a
diff --git a/deps/openssl/config/archs/linux32-s390x/no-asm/crypto/include/internal/bn_conf.h b/deps/openssl/config/archs/linux32-s390x/no-asm/crypto/include/internal/bn_conf.h
index fb52156bd0..459055c96f 100644
--- a/deps/openssl/config/archs/linux32-s390x/no-asm/crypto/include/internal/bn_conf.h
+++ b/deps/openssl/config/archs/linux32-s390x/no-asm/crypto/include/internal/bn_conf.h
@@ -1,5 +1,5 @@
 /* WARNING: do not edit! */
-/* Generated by Makefile from crypto/include/internal/bn_conf.h.in */
+/* Generated by Makefile from include/crypto/bn_conf.h.in */
 /*
  * Copyright 2016 The OpenSSL Project Authors. All Rights Reserved.
  *
@@ -9,8 +9,8 @@
  * https://www.openssl.org/source/license.html
  */
 
-#ifndef HEADER_BN_CONF_H
-# define HEADER_BN_CONF_H
+#ifndef OSSL_CRYPTO_BN_CONF_H
+# define OSSL_CRYPTO_BN_CONF_H
 
 /*
  * The contents of this file are not used in the UEFI build, as
diff --git a/deps/openssl/config/archs/linux32-s390x/no-asm/crypto/include/internal/dso_conf.h b/deps/openssl/config/archs/linux32-s390x/no-asm/crypto/include/internal/dso_conf.h
index 252266ec2a..4b1167c3d8 100644
--- a/deps/openssl/config/archs/linux32-s390x/no-asm/crypto/include/internal/dso_conf.h
+++ b/deps/openssl/config/archs/linux32-s390x/no-asm/crypto/include/internal/dso_conf.h
@@ -1,5 +1,5 @@
 /* WARNING: do not edit! */
-/* Generated by Makefile from crypto/include/internal/dso_conf.h.in */
+/* Generated by Makefile from include/crypto/dso_conf.h.in */
 /*
  * Copyright 2016-2019 The OpenSSL Project Authors. All Rights Reserved.
  *
@@ -9,8 +9,8 @@
  * https://www.openssl.org/source/license.html
  */
 
-#ifndef HEADER_DSO_CONF_H
-# define HEADER_DSO_CONF_H
+#ifndef OSSL_CRYPTO_DSO_CONF_H
+# define OSSL_CRYPTO_DSO_CONF_H
 # define DSO_DLFCN
 # define HAVE_DLFCN_H
 # define DSO_EXTENSION ".so"
diff --git a/deps/openssl/config/archs/linux32-s390x/no-asm/include/openssl/opensslconf.h b/deps/openssl/config/archs/linux32-s390x/no-asm/include/openssl/opensslconf.h
index 6419ec21a2..4cbafb777f 100644
--- a/deps/openssl/config/archs/linux32-s390x/no-asm/include/openssl/opensslconf.h
+++ b/deps/openssl/config/archs/linux32-s390x/no-asm/include/openssl/opensslconf.h
@@ -99,9 +99,6 @@ extern "C" {
 #ifndef OPENSSL_NO_DYNAMIC_ENGINE
 # define OPENSSL_NO_DYNAMIC_ENGINE
 #endif
-#ifndef OPENSSL_NO_AFALGENG
-# define OPENSSL_NO_AFALGENG
-#endif
 
 
 /*
diff --git a/deps/openssl/config/archs/linux32-s390x/no-asm/include/progs.h b/deps/openssl/config/archs/linux32-s390x/no-asm/include/progs.h
index 9b3d270e20..308c65601b 100644
--- a/deps/openssl/config/archs/linux32-s390x/no-asm/include/progs.h
+++ b/deps/openssl/config/archs/linux32-s390x/no-asm/include/progs.h
@@ -2,7 +2,7 @@
  * WARNING: do not edit!
  * Generated by apps/progs.pl
  *
- * Copyright 1995-2019 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 1995-2020 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
diff --git a/deps/openssl/config/archs/linux64-mips64/asm/configdata.pm b/deps/openssl/config/archs/linux64-mips64/asm/configdata.pm
index 6d77d25fe3..1302d730d0 100644
--- a/deps/openssl/config/archs/linux64-mips64/asm/configdata.pm
+++ b/deps/openssl/config/archs/linux64-mips64/asm/configdata.pm
@@ -55,7 +55,7 @@ our %config = (
   minor => "1.1",
   openssl_algorithm_defines => [ "OPENSSL_NO_COMP", "OPENSSL_NO_MD2", "OPENSSL_NO_RC5" ],
   openssl_api_defines => [  ],
-  openssl_other_defines => [ "OPENSSL_RAND_SEED_OS", "OPENSSL_NO_AFALGENG", "OPENSSL_NO_ASAN", "OPENSSL_NO_CRYPTO_MDEBUG", "OPENSSL_NO_CRYPTO_MDEBUG_BACKTRACE", "OPENSSL_NO_DEVCRYPTOENG", "OPENSSL_NO_EC_NISTP_64_GCC_128", "OPENSSL_NO_EGD", "OPENSSL_NO_EXTERNAL_TESTS", "OPENSSL_NO_FUZZ_AFL", "OPENSSL_NO_FUZZ_LIBFUZZER", "OPENSSL_NO_HEARTBEATS", "OPENSSL_NO_MSAN", "OPENSSL_NO_SCTP", "OPENSSL_NO_SSL3", "OPENSSL_NO_SSL3_METHOD", "OPENSSL_NO_UBSAN", "OPENSSL_NO_UNIT_TEST", "OPENSSL_NO_WEAK_SSL_CIPHERS", "OPENSSL_NO_DYNAMIC_ENGINE", "OPENSSL_NO_AFALGENG" ],
+  openssl_other_defines => [ "OPENSSL_RAND_SEED_OS", "OPENSSL_NO_AFALGENG", "OPENSSL_NO_ASAN", "OPENSSL_NO_CRYPTO_MDEBUG", "OPENSSL_NO_CRYPTO_MDEBUG_BACKTRACE", "OPENSSL_NO_DEVCRYPTOENG", "OPENSSL_NO_EC_NISTP_64_GCC_128", "OPENSSL_NO_EGD", "OPENSSL_NO_EXTERNAL_TESTS", "OPENSSL_NO_FUZZ_AFL", "OPENSSL_NO_FUZZ_LIBFUZZER", "OPENSSL_NO_HEARTBEATS", "OPENSSL_NO_MSAN", "OPENSSL_NO_SCTP", "OPENSSL_NO_SSL3", "OPENSSL_NO_SSL3_METHOD", "OPENSSL_NO_UBSAN", "OPENSSL_NO_UNIT_TEST", "OPENSSL_NO_WEAK_SSL_CIPHERS", "OPENSSL_NO_DYNAMIC_ENGINE" ],
   openssl_sys_defines => [  ],
   openssl_thread_defines => [ "OPENSSL_THREADS" ],
   openssldir => "",
@@ -111,8 +111,8 @@ our %config = (
   sourcedir => ".",
   target => "linux64-mips64",
   tdirs => [ "ossl_shim" ],
-  version => "1.1.1d",
-  version_num => "0x1010104fL",
+  version => "1.1.1e",
+  version_num => "0x1010105fL",
 );
 
 our %target = (
@@ -240,6 +240,7 @@ our @disablables = (
   "dgram",
   "dh",
   "dsa",
+  "dso",
   "dtls",
   "dynamic-engine",
   "ec",
@@ -357,8 +358,8 @@ our %unified_info = (
         {
             "" =>
                 [
-                    "crypto/include/internal/bn_conf.h",
-                    "crypto/include/internal/dso_conf.h",
+                    "include/crypto/bn_conf.h",
+                    "include/crypto/dso_conf.h",
                     "include/openssl/opensslconf.h",
                 ],
             "apps/asn1pars.o" =>
@@ -626,14 +627,6 @@ our %unified_info = (
                     "crypto/perlasm/cbc.pl",
                     "crypto/perlasm/x86asm.pl",
                 ],
-            "crypto/include/internal/bn_conf.h" =>
-                [
-                    "configdata.pm",
-                ],
-            "crypto/include/internal/dso_conf.h" =>
-                [
-                    "configdata.pm",
-                ],
             "crypto/rc4/rc4-586.s" =>
                 [
                     "crypto/perlasm/x86asm.pl",
@@ -709,6 +702,14 @@ our %unified_info = (
                 [
                     "libcrypto",
                 ],
+            "include/crypto/bn_conf.h" =>
+                [
+                    "configdata.pm",
+                ],
+            "include/crypto/dso_conf.h" =>
+                [
+                    "configdata.pm",
+                ],
             "include/openssl/opensslconf.h" =>
                 [
                     "configdata.pm",
@@ -1506,6 +1507,12 @@ our %unified_info = (
                     "libcrypto",
                     "test/libtestutil.a",
                 ],
+            "test/ssl_ctx_test" =>
+                [
+                    "libcrypto",
+                    "libssl",
+                    "test/libtestutil.a",
+                ],
             "test/ssl_test" =>
                 [
                     "libcrypto",
@@ -3229,7 +3236,6 @@ our %unified_info = (
                             "test/testutil/cb.o",
                             "test/testutil/driver.o",
                             "test/testutil/format_output.o",
-                            "test/testutil/init.o",
                             "test/testutil/main.o",
                             "test/testutil/output_helpers.o",
                             "test/testutil/random.o",
@@ -3237,6 +3243,7 @@ our %unified_info = (
                             "test/testutil/tap_bio.o",
                             "test/testutil/test_cleanup.o",
                             "test/testutil/tests.o",
+                            "test/testutil/testutil_init.o",
                         ],
                     "products" =>
                         {
@@ -3735,14 +3742,6 @@ our %unified_info = (
                 [
                     "crypto/ia64cpuid.S",
                 ],
-            "crypto/include/internal/bn_conf.h" =>
-                [
-                    "crypto/include/internal/bn_conf.h.in",
-                ],
-            "crypto/include/internal/dso_conf.h" =>
-                [
-                    "crypto/include/internal/dso_conf.h.in",
-                ],
             "crypto/md5/md5-586.s" =>
                 [
                     "crypto/md5/asm/md5-586.pl",
@@ -4183,6 +4182,14 @@ our %unified_info = (
                     "engines/asm/e_padlock-x86_64.pl",
                     "\$(PERLASM_SCHEME)",
                 ],
+            "include/crypto/bn_conf.h" =>
+                [
+                    "include/crypto/bn_conf.h.in",
+                ],
+            "include/crypto/dso_conf.h" =>
+                [
+                    "include/crypto/dso_conf.h.in",
+                ],
             "include/openssl/opensslconf.h" =>
                 [
                     "include/openssl/opensslconf.h.in",
@@ -4865,7 +4872,6 @@ our %unified_info = (
             "crypto/aes/aes-mips.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto",
                 ],
@@ -4880,43 +4886,36 @@ our %unified_info = (
             "crypto/aes/aes_cbc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/aes/aes_cfb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/aes/aes_ecb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/aes/aes_ige.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/aes/aes_misc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/aes/aes_ofb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/aes/aes_wrap.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/aes/aesfx-sparcv9.o" =>
@@ -4938,7 +4937,6 @@ our %unified_info = (
             "crypto/aria/aria.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/arm64cpuid.o" =>
@@ -4952,613 +4950,511 @@ our %unified_info = (
             "crypto/asn1/a_bitstr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_d2i_fp.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_digest.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_dup.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_gentm.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_i2d_fp.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_int.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_mbstr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_object.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_octet.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_print.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_sign.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_strex.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_strnid.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_time.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_type.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_utctm.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_utf8.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_verify.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/ameth_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/asn1_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/asn1_gen.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/asn1_item_list.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/asn1_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/asn1_par.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/asn_mime.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/asn_moid.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/asn_mstbl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/asn_pack.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/bio_asn1.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/bio_ndef.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/d2i_pr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/d2i_pu.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/evp_asn1.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/f_int.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/f_string.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/i2d_pr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/i2d_pu.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/n_pkey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/nsseq.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/p5_pbe.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/p5_pbev2.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/p5_scrypt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/p8_pkey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/t_bitst.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/t_pkey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/t_spki.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/tasn_dec.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/tasn_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/tasn_fre.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/tasn_new.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/tasn_prn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/tasn_scn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/tasn_typ.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/tasn_utl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/x_algor.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/x_bignum.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/x_info.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/x_int64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/x_long.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/x_pkey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/x_sig.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/x_spki.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/x_val.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/async/arch/async_null.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/async/arch/async_posix.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/async/arch/async_win.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/async/async.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/async/async_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/async/async_wait.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bf/bf_cfb64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bf/bf_ecb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bf/bf_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bf/bf_ofb64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bf/bf_skey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/b_addr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/b_dump.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/b_print.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/b_sock.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/b_sock2.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bf_buff.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bf_lbuf.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bf_nbio.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bf_null.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bio_cb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bio_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bio_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bio_meth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bss_acpt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bss_bio.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bss_conn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bss_dgram.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bss_fd.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bss_file.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bss_log.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bss_mem.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bss_null.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bss_sock.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/blake2/blake2b.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/blake2/blake2s.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/blake2/m_blake2b.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/blake2/m_blake2s.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/armv4-gf2m.o" =>
@@ -5572,195 +5468,163 @@ our %unified_info = (
             "crypto/bn/bn-mips.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto",
                 ],
             "crypto/bn/bn_add.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_blind.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_const.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_ctx.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_depr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_dh.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_div.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_exp.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto",
                 ],
             "crypto/bn/bn_exp2.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_gcd.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_gf2m.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_intern.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_kron.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_mod.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_mont.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_mpi.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_mul.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_nist.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_prime.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_print.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_rand.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_recp.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_shift.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_sqr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_sqrt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_srp.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_word.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_x931p.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/mips-mont.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto",
                 ],
@@ -5787,13 +5651,11 @@ our %unified_info = (
             "crypto/buffer/buf_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/buffer/buffer.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/buildinf.h" =>
@@ -5803,43 +5665,36 @@ our %unified_info = (
             "crypto/camellia/camellia.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/camellia/cmll_cbc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/camellia/cmll_cfb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/camellia/cmll_ctr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/camellia/cmll_ecb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/camellia/cmll_misc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/camellia/cmll_ofb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/camellia/cmllt4-sparcv9.o" =>
@@ -5849,31 +5704,26 @@ our %unified_info = (
             "crypto/cast/c_cfb64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cast/c_ecb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cast/c_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cast/c_ofb64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cast/c_skey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/chacha/chacha-armv4.o" =>
@@ -5891,278 +5741,232 @@ our %unified_info = (
             "crypto/chacha/chacha_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cmac/cm_ameth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cmac/cm_pmeth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cmac/cmac.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_asn1.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_att.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_cd.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_dd.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_env.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_ess.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_io.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_kari.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_pwri.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_sd.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_smime.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/conf/conf_api.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/conf/conf_def.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/conf/conf_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/conf/conf_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/conf/conf_mall.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/conf/conf_mod.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/conf/conf_sap.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/conf/conf_ssl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cpt_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cryptlib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ct/ct_b64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ct/ct_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ct/ct_log.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ct/ct_oct.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ct/ct_policy.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ct/ct_prn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ct/ct_sct.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ct/ct_sct_ctx.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ct/ct_vfy.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ct/ct_x509v3.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ctype.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cversion.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto",
                 ],
             "crypto/des/cbc_cksm.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/cbc_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/cfb64ede.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/cfb64enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/cfb_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/des_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/dest4-sparcv9.o" =>
@@ -6172,301 +5976,251 @@ our %unified_info = (
             "crypto/des/ecb3_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/ecb_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/fcrypt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/fcrypt_b.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/ofb64ede.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/ofb64enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/ofb_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/pcbc_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/qud_cksm.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/rand_key.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/set_key.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/str2key.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/xcbc_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_ameth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_asn1.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_check.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_depr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_gen.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_kdf.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_key.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_meth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_pmeth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_prn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_rfc5114.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_rfc7919.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dsa/dsa_ameth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dsa/dsa_asn1.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dsa/dsa_depr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dsa/dsa_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dsa/dsa_gen.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dsa/dsa_key.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dsa/dsa_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dsa/dsa_meth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dsa/dsa_ossl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dsa/dsa_pmeth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dsa/dsa_prn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dsa/dsa_sign.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dsa/dsa_vrf.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dso/dso_dl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dso/dso_dlfcn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dso/dso_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dso/dso_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dso/dso_openssl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dso/dso_vms.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dso/dso_win32.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ebcdic.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/curve25519.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/curve448/arch_32/f_impl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto/ec/curve448/arch_32",
                     "crypto/ec/curve448",
@@ -6474,7 +6228,6 @@ our %unified_info = (
             "crypto/ec/curve448/curve448.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto/ec/curve448/arch_32",
                     "crypto/ec/curve448",
@@ -6482,7 +6235,6 @@ our %unified_info = (
             "crypto/ec/curve448/curve448_tables.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto/ec/curve448/arch_32",
                     "crypto/ec/curve448",
@@ -6490,7 +6242,6 @@ our %unified_info = (
             "crypto/ec/curve448/eddsa.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto/ec/curve448/arch_32",
                     "crypto/ec/curve448",
@@ -6498,7 +6249,6 @@ our %unified_info = (
             "crypto/ec/curve448/f_generic.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto/ec/curve448/arch_32",
                     "crypto/ec/curve448",
@@ -6506,7 +6256,6 @@ our %unified_info = (
             "crypto/ec/curve448/scalar.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto/ec/curve448/arch_32",
                     "crypto/ec/curve448",
@@ -6514,163 +6263,136 @@ our %unified_info = (
             "crypto/ec/ec2_oct.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec2_smpl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec_ameth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec_asn1.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec_check.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec_curve.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec_cvt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec_key.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec_kmeth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec_mult.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec_oct.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec_pmeth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec_print.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecdh_kdf.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecdh_ossl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecdsa_ossl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecdsa_sign.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecdsa_vrf.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/eck_prn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecp_mont.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecp_nist.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecp_nistp224.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecp_nistp256.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecp_nistp521.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecp_nistputil.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecp_nistz256-armv4.o" =>
@@ -6688,223 +6410,186 @@ our %unified_info = (
             "crypto/ec/ecp_oct.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecp_smpl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecx_meth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/eng_all.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/eng_cnf.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/eng_ctrl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/eng_dyn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/eng_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/eng_fat.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/eng_init.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/eng_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/eng_list.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/eng_openssl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/eng_pkey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/eng_rdrand.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/eng_table.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/tb_asnmth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/tb_cipher.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/tb_dh.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/tb_digest.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/tb_dsa.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/tb_eckey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/tb_pkmeth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/tb_rand.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/tb_rsa.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/err/err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/err/err_all.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/err/err_prn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/bio_b64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/bio_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/bio_md.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/bio_ok.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/c_allc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/c_alld.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/cmeth_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/digest.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/e_aes.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto",
                     "crypto/modes",
@@ -6912,21 +6597,18 @@ our %unified_info = (
             "crypto/evp/e_aes_cbc_hmac_sha1.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto/modes",
                 ],
             "crypto/evp/e_aes_cbc_hmac_sha256.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto/modes",
                 ],
             "crypto/evp/e_aria.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto",
                     "crypto/modes",
@@ -6934,13 +6616,11 @@ our %unified_info = (
             "crypto/evp/e_bf.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/e_camellia.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto",
                     "crypto/modes",
@@ -6948,81 +6628,68 @@ our %unified_info = (
             "crypto/evp/e_cast.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/e_chacha20_poly1305.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/e_des.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto",
                 ],
             "crypto/evp/e_des3.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto",
                 ],
             "crypto/evp/e_idea.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/e_null.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/e_old.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/e_rc2.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/e_rc4.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/e_rc4_hmac_md5.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/e_rc5.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/e_seed.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/e_sm4.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto",
                     "crypto/modes",
@@ -7030,328 +6697,267 @@ our %unified_info = (
             "crypto/evp/e_xcbc_d.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/encode.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/evp_cnf.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/evp_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/evp_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/evp_key.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/evp_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/evp_pbe.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/evp_pkey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/m_md2.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/m_md4.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/m_md5.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/m_md5_sha1.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/m_mdc2.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/m_null.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/m_ripemd.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/m_sha1.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/m_sha3.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto",
                 ],
             "crypto/evp/m_sigver.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/m_wp.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/names.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/p5_crpt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/p5_crpt2.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/p_dec.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/p_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/p_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/p_open.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/p_seal.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/p_sign.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/p_verify.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/pbe_scrypt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/pmeth_fn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/pmeth_gn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/pmeth_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ex_data.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/getenv.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/hmac/hm_ameth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/hmac/hm_pmeth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/hmac/hmac.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/idea/i_cbc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/idea/i_cfb64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/idea/i_ecb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/idea/i_ofb64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/idea/i_skey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
-            "crypto/include/internal/bn_conf.h" =>
-                [
-                    ".",
-                ],
-            "crypto/include/internal/dso_conf.h" =>
-                [
-                    ".",
-                ],
             "crypto/init.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/kdf/hkdf.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/kdf/kdf_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/kdf/scrypt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/kdf/tls1_prf.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/lhash/lh_stats.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/lhash/lhash.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/md4/md4_dgst.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/md4/md4_one.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/md5/md5-sparcv9.o" =>
@@ -7361,85 +6967,71 @@ our %unified_info = (
             "crypto/md5/md5_dgst.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/md5/md5_one.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/mdc2/mdc2_one.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/mdc2/mdc2dgst.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/mem.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/mem_clr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/mem_dbg.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/mem_sec.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/modes/cbc128.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/modes/ccm128.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/modes/cfb128.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/modes/ctr128.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/modes/cts128.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/modes/gcm128.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto",
                 ],
@@ -7462,361 +7054,301 @@ our %unified_info = (
             "crypto/modes/ocb128.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/modes/ofb128.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/modes/wrap128.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/modes/xts128.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/o_dir.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/o_fips.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/o_fopen.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/o_init.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/o_str.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/o_time.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/objects/o_names.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/objects/obj_dat.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/objects/obj_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/objects/obj_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/objects/obj_xref.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ocsp/ocsp_asn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ocsp/ocsp_cl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ocsp/ocsp_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ocsp/ocsp_ext.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ocsp/ocsp_ht.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ocsp/ocsp_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ocsp/ocsp_prn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ocsp/ocsp_srv.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ocsp/ocsp_vfy.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ocsp/v3_ocsp.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pem/pem_all.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pem/pem_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pem/pem_info.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pem/pem_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pem/pem_oth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pem/pem_pk8.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pem/pem_pkey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pem/pem_sign.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pem/pem_x509.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pem/pem_xaux.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pem/pvkfmt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_add.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_asn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_attr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_crpt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_crt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_decr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_init.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_key.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_kiss.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_mutl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_npas.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_p8d.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_p8e.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_sbag.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_utl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/pk12err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs7/bio_pk7.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs7/pk7_asn1.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs7/pk7_attr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs7/pk7_doit.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs7/pk7_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs7/pk7_mime.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs7/pk7_smime.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs7/pkcs7err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/poly1305/poly1305-armv4.o" =>
@@ -7830,7 +7362,6 @@ our %unified_info = (
             "crypto/poly1305/poly1305-mips.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto",
                 ],
@@ -7841,259 +7372,216 @@ our %unified_info = (
             "crypto/poly1305/poly1305.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/poly1305/poly1305_ameth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/poly1305/poly1305_pmeth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rand/drbg_ctr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rand/drbg_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rand/rand_egd.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rand/rand_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rand/rand_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rand/rand_unix.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rand/rand_vms.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rand/rand_win.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rand/randfile.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rc2/rc2_cbc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rc2/rc2_ecb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rc2/rc2_skey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rc2/rc2cfb64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rc2/rc2ofb64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rc4/rc4_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rc4/rc4_skey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ripemd/rmd_dgst.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ripemd/rmd_one.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_ameth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_asn1.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_chk.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_crpt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_depr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_gen.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_meth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_mp.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_none.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_oaep.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_ossl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_pk1.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_pmeth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_prn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_pss.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_saos.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_sign.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_ssl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_x931.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_x931g.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/s390xcpuid.o" =>
@@ -8103,31 +7591,26 @@ our %unified_info = (
             "crypto/seed/seed.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/seed/seed_cbc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/seed/seed_cfb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/seed/seed_ecb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/seed/seed_ofb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sha/keccak1600-armv4.o" =>
@@ -8137,7 +7620,6 @@ our %unified_info = (
             "crypto/sha/keccak1600.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sha/sha1-armv4-large.o" =>
@@ -8151,7 +7633,6 @@ our %unified_info = (
             "crypto/sha/sha1-mips.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto",
                 ],
@@ -8166,13 +7647,11 @@ our %unified_info = (
             "crypto/sha/sha1_one.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sha/sha1dgst.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sha/sha256-armv4.o" =>
@@ -8186,7 +7665,6 @@ our %unified_info = (
             "crypto/sha/sha256-mips.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto",
                 ],
@@ -8201,7 +7679,6 @@ our %unified_info = (
             "crypto/sha/sha256.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sha/sha512-armv4.o" =>
@@ -8215,7 +7692,6 @@ our %unified_info = (
             "crypto/sha/sha512-mips.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto",
                 ],
@@ -8230,709 +7706,591 @@ our %unified_info = (
             "crypto/sha/sha512.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/siphash/siphash.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/siphash/siphash_ameth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/siphash/siphash_pmeth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sm2/sm2_crypt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sm2/sm2_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sm2/sm2_pmeth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sm2/sm2_sign.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sm3/m_sm3.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sm3/sm3.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sm4/sm4.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/srp/srp_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/srp/srp_vfy.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/stack/stack.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/store/loader_file.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/store/store_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/store/store_init.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/store/store_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/store/store_register.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/store/store_strings.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/threads_none.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/threads_pthread.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/threads_win.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ts/ts_asn1.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ts/ts_conf.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ts/ts_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ts/ts_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ts/ts_req_print.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ts/ts_req_utils.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ts/ts_rsp_print.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ts/ts_rsp_sign.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ts/ts_rsp_utils.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ts/ts_rsp_verify.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ts/ts_verify_ctx.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/txt_db/txt_db.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ui/ui_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ui/ui_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ui/ui_null.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ui/ui_openssl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ui/ui_util.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/uid.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/whrlpool/wp_block.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/whrlpool/wp_dgst.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/by_dir.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/by_file.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/t_crl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/t_req.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/t_x509.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_att.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_cmp.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_d2.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_def.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_ext.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_lu.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_meth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_obj.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_r2x.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_req.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_set.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_trs.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_txt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_v3.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_vfy.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_vpm.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509cset.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509name.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509rset.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509spki.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509type.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x_all.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x_attrib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x_crl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x_exten.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x_name.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x_pubkey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x_req.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x_x509.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x_x509a.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/pcy_cache.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/pcy_data.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/pcy_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/pcy_map.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/pcy_node.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/pcy_tree.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_addr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_admis.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_akey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_akeya.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_alt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_asid.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_bcons.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_bitst.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_conf.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_cpols.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_crld.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_enum.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_extku.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_genn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_ia5.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_info.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_int.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_ncons.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_pci.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_pcia.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_pcons.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_pku.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_pmaps.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_prn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_purp.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_skey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_sxnet.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_tlsf.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_utl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "engines/e_capi.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "engines/e_padlock.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "fuzz/asn1.o" =>
@@ -8983,6 +8341,14 @@ our %unified_info = (
                 [
                     "include",
                 ],
+            "include/crypto/bn_conf.h" =>
+                [
+                    ".",
+                ],
+            "include/crypto/dso_conf.h" =>
+                [
+                    ".",
+                ],
             "include/openssl/opensslconf.h" =>
                 [
                     ".",
@@ -9227,7 +8593,6 @@ our %unified_info = (
                 [
                     ".",
                     "include",
-                    "crypto/include",
                 ],
             "test/asn1_string_table_test.o" =>
                 [
@@ -9553,7 +8918,6 @@ our %unified_info = (
                 [
                     ".",
                     "include",
-                    "crypto/include",
                 ],
             "test/cipher_overhead_test.o" =>
                 [
@@ -9599,7 +8963,6 @@ our %unified_info = (
             "test/ctype_internal_test.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "test/curve448_internal_test.o" =>
@@ -9665,7 +9028,6 @@ our %unified_info = (
                 [
                     "include",
                     "crypto/ec",
-                    "crypto/include",
                 ],
             "test/ecdsatest.o" =>
                 [
@@ -9690,7 +9052,6 @@ our %unified_info = (
             "test/evp_extra_test.o" =>
                 [
                     "include",
-                    "crypto/include",
                 ],
             "test/evp_test.o" =>
                 [
@@ -9788,7 +9149,6 @@ our %unified_info = (
                 [
                     ".",
                     "include",
-                    "crypto/include",
                 ],
             "test/rc2test.o" =>
                 [
@@ -9838,18 +9198,15 @@ our %unified_info = (
                 [
                     ".",
                     "include",
-                    "crypto/include",
                 ],
             "test/sm2_internal_test.o" =>
                 [
                     "include",
-                    "crypto/include",
                 ],
             "test/sm4_internal_test.o" =>
                 [
                     ".",
                     "include",
-                    "crypto/include",
                 ],
             "test/srptest.o" =>
                 [
@@ -9860,6 +9217,10 @@ our %unified_info = (
                     ".",
                     "include",
                 ],
+            "test/ssl_ctx_test.o" =>
+                [
+                    "include",
+                ],
             "test/ssl_test.o" =>
                 [
                     "include",
@@ -9923,10 +9284,6 @@ our %unified_info = (
                 [
                     "include",
                 ],
-            "test/testutil/init.o" =>
-                [
-                    "include",
-                ],
             "test/testutil/main.o" =>
                 [
                     "include",
@@ -9955,6 +9312,10 @@ our %unified_info = (
                 [
                     "include",
                 ],
+            "test/testutil/testutil_init.o" =>
+                [
+                    "include",
+                ],
             "test/threadstest.o" =>
                 [
                     "include",
@@ -10219,6 +9580,7 @@ our %unified_info = (
             "test/sm4_internal_test",
             "test/srptest",
             "test/ssl_cert_table_internal_test",
+            "test/ssl_ctx_test",
             "test/ssl_test",
             "test/ssl_test_ctx_test",
             "test/sslapitest",
@@ -15134,7 +14496,6 @@ our %unified_info = (
                     "test/testutil/cb.o",
                     "test/testutil/driver.o",
                     "test/testutil/format_output.o",
-                    "test/testutil/init.o",
                     "test/testutil/main.o",
                     "test/testutil/output_helpers.o",
                     "test/testutil/random.o",
@@ -15142,6 +14503,7 @@ our %unified_info = (
                     "test/testutil/tap_bio.o",
                     "test/testutil/test_cleanup.o",
                     "test/testutil/tests.o",
+                    "test/testutil/testutil_init.o",
                 ],
             "test/md2test" =>
                 [
@@ -15369,6 +14731,14 @@ our %unified_info = (
                 [
                     "test/ssl_cert_table_internal_test.c",
                 ],
+            "test/ssl_ctx_test" =>
+                [
+                    "test/ssl_ctx_test.o",
+                ],
+            "test/ssl_ctx_test.o" =>
+                [
+                    "test/ssl_ctx_test.c",
+                ],
             "test/ssl_test" =>
                 [
                     "test/handshake_helper.o",
@@ -15471,10 +14841,6 @@ our %unified_info = (
                 [
                     "test/testutil/format_output.c",
                 ],
-            "test/testutil/init.o" =>
-                [
-                    "test/testutil/init.c",
-                ],
             "test/testutil/main.o" =>
                 [
                     "test/testutil/main.c",
@@ -15503,6 +14869,10 @@ our %unified_info = (
                 [
                     "test/testutil/tests.c",
                 ],
+            "test/testutil/testutil_init.o" =>
+                [
+                    "test/testutil/testutil_init.c",
+                ],
             "test/threadstest" =>
                 [
                     "test/threadstest.o",
diff --git a/deps/openssl/config/archs/linux64-mips64/asm/crypto/buildinf.h b/deps/openssl/config/archs/linux64-mips64/asm/crypto/buildinf.h
index 865115208d..5f969bc3a4 100644
--- a/deps/openssl/config/archs/linux64-mips64/asm/crypto/buildinf.h
+++ b/deps/openssl/config/archs/linux64-mips64/asm/crypto/buildinf.h
@@ -11,7 +11,7 @@
  */
 
 #define PLATFORM "platform: linux64-mips64"
-#define DATE "built on: Fri Sep 13 16:01:56 2019 UTC"
+#define DATE "built on: Wed Mar 18 21:09:33 2020 UTC"
 
 /*
  * Generate compiler_flags as an array of individual characters. This is a
diff --git a/deps/openssl/config/archs/linux64-mips64/asm/crypto/include/internal/bn_conf.h b/deps/openssl/config/archs/linux64-mips64/asm/crypto/include/internal/bn_conf.h
index 34bd8b78b4..5312ef5a7a 100644
--- a/deps/openssl/config/archs/linux64-mips64/asm/crypto/include/internal/bn_conf.h
+++ b/deps/openssl/config/archs/linux64-mips64/asm/crypto/include/internal/bn_conf.h
@@ -1,5 +1,5 @@
 /* WARNING: do not edit! */
-/* Generated by Makefile from crypto/include/internal/bn_conf.h.in */
+/* Generated by Makefile from include/crypto/bn_conf.h.in */
 /*
  * Copyright 2016 The OpenSSL Project Authors. All Rights Reserved.
  *
@@ -9,8 +9,8 @@
  * https://www.openssl.org/source/license.html
  */
 
-#ifndef HEADER_BN_CONF_H
-# define HEADER_BN_CONF_H
+#ifndef OSSL_CRYPTO_BN_CONF_H
+# define OSSL_CRYPTO_BN_CONF_H
 
 /*
  * The contents of this file are not used in the UEFI build, as
diff --git a/deps/openssl/config/archs/linux64-mips64/asm/crypto/include/internal/dso_conf.h b/deps/openssl/config/archs/linux64-mips64/asm/crypto/include/internal/dso_conf.h
index 252266ec2a..4b1167c3d8 100644
--- a/deps/openssl/config/archs/linux64-mips64/asm/crypto/include/internal/dso_conf.h
+++ b/deps/openssl/config/archs/linux64-mips64/asm/crypto/include/internal/dso_conf.h
@@ -1,5 +1,5 @@
 /* WARNING: do not edit! */
-/* Generated by Makefile from crypto/include/internal/dso_conf.h.in */
+/* Generated by Makefile from include/crypto/dso_conf.h.in */
 /*
  * Copyright 2016-2019 The OpenSSL Project Authors. All Rights Reserved.
  *
@@ -9,8 +9,8 @@
  * https://www.openssl.org/source/license.html
  */
 
-#ifndef HEADER_DSO_CONF_H
-# define HEADER_DSO_CONF_H
+#ifndef OSSL_CRYPTO_DSO_CONF_H
+# define OSSL_CRYPTO_DSO_CONF_H
 # define DSO_DLFCN
 # define HAVE_DLFCN_H
 # define DSO_EXTENSION ".so"
diff --git a/deps/openssl/config/archs/linux64-mips64/asm/include/openssl/opensslconf.h b/deps/openssl/config/archs/linux64-mips64/asm/include/openssl/opensslconf.h
index 30820b6051..937531fe9f 100644
--- a/deps/openssl/config/archs/linux64-mips64/asm/include/openssl/opensslconf.h
+++ b/deps/openssl/config/archs/linux64-mips64/asm/include/openssl/opensslconf.h
@@ -96,9 +96,6 @@ extern "C" {
 #ifndef OPENSSL_NO_DYNAMIC_ENGINE
 # define OPENSSL_NO_DYNAMIC_ENGINE
 #endif
-#ifndef OPENSSL_NO_AFALGENG
-# define OPENSSL_NO_AFALGENG
-#endif
 
 
 /*
diff --git a/deps/openssl/config/archs/linux64-mips64/asm/include/progs.h b/deps/openssl/config/archs/linux64-mips64/asm/include/progs.h
index 9b3d270e20..308c65601b 100644
--- a/deps/openssl/config/archs/linux64-mips64/asm/include/progs.h
+++ b/deps/openssl/config/archs/linux64-mips64/asm/include/progs.h
@@ -2,7 +2,7 @@
  * WARNING: do not edit!
  * Generated by apps/progs.pl
  *
- * Copyright 1995-2019 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 1995-2020 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
diff --git a/deps/openssl/config/archs/linux64-mips64/asm_avx2/configdata.pm b/deps/openssl/config/archs/linux64-mips64/asm_avx2/configdata.pm
index 8324964ca7..f53a77e0a0 100644
--- a/deps/openssl/config/archs/linux64-mips64/asm_avx2/configdata.pm
+++ b/deps/openssl/config/archs/linux64-mips64/asm_avx2/configdata.pm
@@ -55,7 +55,7 @@ our %config = (
   minor => "1.1",
   openssl_algorithm_defines => [ "OPENSSL_NO_COMP", "OPENSSL_NO_MD2", "OPENSSL_NO_RC5" ],
   openssl_api_defines => [  ],
-  openssl_other_defines => [ "OPENSSL_RAND_SEED_OS", "OPENSSL_NO_AFALGENG", "OPENSSL_NO_ASAN", "OPENSSL_NO_CRYPTO_MDEBUG", "OPENSSL_NO_CRYPTO_MDEBUG_BACKTRACE", "OPENSSL_NO_DEVCRYPTOENG", "OPENSSL_NO_EC_NISTP_64_GCC_128", "OPENSSL_NO_EGD", "OPENSSL_NO_EXTERNAL_TESTS", "OPENSSL_NO_FUZZ_AFL", "OPENSSL_NO_FUZZ_LIBFUZZER", "OPENSSL_NO_HEARTBEATS", "OPENSSL_NO_MSAN", "OPENSSL_NO_SCTP", "OPENSSL_NO_SSL3", "OPENSSL_NO_SSL3_METHOD", "OPENSSL_NO_UBSAN", "OPENSSL_NO_UNIT_TEST", "OPENSSL_NO_WEAK_SSL_CIPHERS", "OPENSSL_NO_DYNAMIC_ENGINE", "OPENSSL_NO_AFALGENG" ],
+  openssl_other_defines => [ "OPENSSL_RAND_SEED_OS", "OPENSSL_NO_AFALGENG", "OPENSSL_NO_ASAN", "OPENSSL_NO_CRYPTO_MDEBUG", "OPENSSL_NO_CRYPTO_MDEBUG_BACKTRACE", "OPENSSL_NO_DEVCRYPTOENG", "OPENSSL_NO_EC_NISTP_64_GCC_128", "OPENSSL_NO_EGD", "OPENSSL_NO_EXTERNAL_TESTS", "OPENSSL_NO_FUZZ_AFL", "OPENSSL_NO_FUZZ_LIBFUZZER", "OPENSSL_NO_HEARTBEATS", "OPENSSL_NO_MSAN", "OPENSSL_NO_SCTP", "OPENSSL_NO_SSL3", "OPENSSL_NO_SSL3_METHOD", "OPENSSL_NO_UBSAN", "OPENSSL_NO_UNIT_TEST", "OPENSSL_NO_WEAK_SSL_CIPHERS", "OPENSSL_NO_DYNAMIC_ENGINE" ],
   openssl_sys_defines => [  ],
   openssl_thread_defines => [ "OPENSSL_THREADS" ],
   openssldir => "",
@@ -111,8 +111,8 @@ our %config = (
   sourcedir => ".",
   target => "linux64-mips64",
   tdirs => [ "ossl_shim" ],
-  version => "1.1.1d",
-  version_num => "0x1010104fL",
+  version => "1.1.1e",
+  version_num => "0x1010105fL",
 );
 
 our %target = (
@@ -240,6 +240,7 @@ our @disablables = (
   "dgram",
   "dh",
   "dsa",
+  "dso",
   "dtls",
   "dynamic-engine",
   "ec",
@@ -357,8 +358,8 @@ our %unified_info = (
         {
             "" =>
                 [
-                    "crypto/include/internal/bn_conf.h",
-                    "crypto/include/internal/dso_conf.h",
+                    "include/crypto/bn_conf.h",
+                    "include/crypto/dso_conf.h",
                     "include/openssl/opensslconf.h",
                 ],
             "apps/asn1pars.o" =>
@@ -626,14 +627,6 @@ our %unified_info = (
                     "crypto/perlasm/cbc.pl",
                     "crypto/perlasm/x86asm.pl",
                 ],
-            "crypto/include/internal/bn_conf.h" =>
-                [
-                    "configdata.pm",
-                ],
-            "crypto/include/internal/dso_conf.h" =>
-                [
-                    "configdata.pm",
-                ],
             "crypto/rc4/rc4-586.s" =>
                 [
                     "crypto/perlasm/x86asm.pl",
@@ -709,6 +702,14 @@ our %unified_info = (
                 [
                     "libcrypto",
                 ],
+            "include/crypto/bn_conf.h" =>
+                [
+                    "configdata.pm",
+                ],
+            "include/crypto/dso_conf.h" =>
+                [
+                    "configdata.pm",
+                ],
             "include/openssl/opensslconf.h" =>
                 [
                     "configdata.pm",
@@ -1506,6 +1507,12 @@ our %unified_info = (
                     "libcrypto",
                     "test/libtestutil.a",
                 ],
+            "test/ssl_ctx_test" =>
+                [
+                    "libcrypto",
+                    "libssl",
+                    "test/libtestutil.a",
+                ],
             "test/ssl_test" =>
                 [
                     "libcrypto",
@@ -3229,7 +3236,6 @@ our %unified_info = (
                             "test/testutil/cb.o",
                             "test/testutil/driver.o",
                             "test/testutil/format_output.o",
-                            "test/testutil/init.o",
                             "test/testutil/main.o",
                             "test/testutil/output_helpers.o",
                             "test/testutil/random.o",
@@ -3237,6 +3243,7 @@ our %unified_info = (
                             "test/testutil/tap_bio.o",
                             "test/testutil/test_cleanup.o",
                             "test/testutil/tests.o",
+                            "test/testutil/testutil_init.o",
                         ],
                     "products" =>
                         {
@@ -3735,14 +3742,6 @@ our %unified_info = (
                 [
                     "crypto/ia64cpuid.S",
                 ],
-            "crypto/include/internal/bn_conf.h" =>
-                [
-                    "crypto/include/internal/bn_conf.h.in",
-                ],
-            "crypto/include/internal/dso_conf.h" =>
-                [
-                    "crypto/include/internal/dso_conf.h.in",
-                ],
             "crypto/md5/md5-586.s" =>
                 [
                     "crypto/md5/asm/md5-586.pl",
@@ -4183,6 +4182,14 @@ our %unified_info = (
                     "engines/asm/e_padlock-x86_64.pl",
                     "\$(PERLASM_SCHEME)",
                 ],
+            "include/crypto/bn_conf.h" =>
+                [
+                    "include/crypto/bn_conf.h.in",
+                ],
+            "include/crypto/dso_conf.h" =>
+                [
+                    "include/crypto/dso_conf.h.in",
+                ],
             "include/openssl/opensslconf.h" =>
                 [
                     "include/openssl/opensslconf.h.in",
@@ -4865,7 +4872,6 @@ our %unified_info = (
             "crypto/aes/aes-mips.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto",
                 ],
@@ -4880,43 +4886,36 @@ our %unified_info = (
             "crypto/aes/aes_cbc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/aes/aes_cfb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/aes/aes_ecb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/aes/aes_ige.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/aes/aes_misc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/aes/aes_ofb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/aes/aes_wrap.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/aes/aesfx-sparcv9.o" =>
@@ -4938,7 +4937,6 @@ our %unified_info = (
             "crypto/aria/aria.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/arm64cpuid.o" =>
@@ -4952,613 +4950,511 @@ our %unified_info = (
             "crypto/asn1/a_bitstr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_d2i_fp.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_digest.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_dup.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_gentm.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_i2d_fp.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_int.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_mbstr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_object.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_octet.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_print.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_sign.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_strex.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_strnid.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_time.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_type.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_utctm.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_utf8.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_verify.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/ameth_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/asn1_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/asn1_gen.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/asn1_item_list.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/asn1_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/asn1_par.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/asn_mime.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/asn_moid.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/asn_mstbl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/asn_pack.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/bio_asn1.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/bio_ndef.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/d2i_pr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/d2i_pu.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/evp_asn1.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/f_int.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/f_string.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/i2d_pr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/i2d_pu.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/n_pkey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/nsseq.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/p5_pbe.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/p5_pbev2.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/p5_scrypt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/p8_pkey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/t_bitst.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/t_pkey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/t_spki.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/tasn_dec.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/tasn_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/tasn_fre.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/tasn_new.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/tasn_prn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/tasn_scn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/tasn_typ.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/tasn_utl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/x_algor.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/x_bignum.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/x_info.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/x_int64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/x_long.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/x_pkey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/x_sig.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/x_spki.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/x_val.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/async/arch/async_null.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/async/arch/async_posix.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/async/arch/async_win.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/async/async.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/async/async_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/async/async_wait.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bf/bf_cfb64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bf/bf_ecb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bf/bf_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bf/bf_ofb64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bf/bf_skey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/b_addr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/b_dump.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/b_print.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/b_sock.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/b_sock2.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bf_buff.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bf_lbuf.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bf_nbio.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bf_null.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bio_cb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bio_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bio_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bio_meth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bss_acpt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bss_bio.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bss_conn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bss_dgram.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bss_fd.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bss_file.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bss_log.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bss_mem.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bss_null.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bss_sock.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/blake2/blake2b.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/blake2/blake2s.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/blake2/m_blake2b.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/blake2/m_blake2s.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/armv4-gf2m.o" =>
@@ -5572,195 +5468,163 @@ our %unified_info = (
             "crypto/bn/bn-mips.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto",
                 ],
             "crypto/bn/bn_add.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_blind.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_const.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_ctx.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_depr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_dh.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_div.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_exp.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto",
                 ],
             "crypto/bn/bn_exp2.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_gcd.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_gf2m.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_intern.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_kron.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_mod.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_mont.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_mpi.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_mul.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_nist.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_prime.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_print.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_rand.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_recp.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_shift.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_sqr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_sqrt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_srp.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_word.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_x931p.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/mips-mont.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto",
                 ],
@@ -5787,13 +5651,11 @@ our %unified_info = (
             "crypto/buffer/buf_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/buffer/buffer.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/buildinf.h" =>
@@ -5803,43 +5665,36 @@ our %unified_info = (
             "crypto/camellia/camellia.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/camellia/cmll_cbc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/camellia/cmll_cfb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/camellia/cmll_ctr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/camellia/cmll_ecb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/camellia/cmll_misc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/camellia/cmll_ofb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/camellia/cmllt4-sparcv9.o" =>
@@ -5849,31 +5704,26 @@ our %unified_info = (
             "crypto/cast/c_cfb64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cast/c_ecb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cast/c_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cast/c_ofb64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cast/c_skey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/chacha/chacha-armv4.o" =>
@@ -5891,278 +5741,232 @@ our %unified_info = (
             "crypto/chacha/chacha_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cmac/cm_ameth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cmac/cm_pmeth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cmac/cmac.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_asn1.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_att.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_cd.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_dd.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_env.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_ess.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_io.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_kari.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_pwri.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_sd.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_smime.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/conf/conf_api.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/conf/conf_def.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/conf/conf_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/conf/conf_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/conf/conf_mall.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/conf/conf_mod.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/conf/conf_sap.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/conf/conf_ssl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cpt_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cryptlib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ct/ct_b64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ct/ct_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ct/ct_log.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ct/ct_oct.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ct/ct_policy.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ct/ct_prn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ct/ct_sct.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ct/ct_sct_ctx.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ct/ct_vfy.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ct/ct_x509v3.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ctype.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cversion.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto",
                 ],
             "crypto/des/cbc_cksm.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/cbc_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/cfb64ede.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/cfb64enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/cfb_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/des_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/dest4-sparcv9.o" =>
@@ -6172,301 +5976,251 @@ our %unified_info = (
             "crypto/des/ecb3_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/ecb_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/fcrypt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/fcrypt_b.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/ofb64ede.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/ofb64enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/ofb_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/pcbc_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/qud_cksm.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/rand_key.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/set_key.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/str2key.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/xcbc_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_ameth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_asn1.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_check.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_depr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_gen.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_kdf.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_key.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_meth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_pmeth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_prn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_rfc5114.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_rfc7919.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dsa/dsa_ameth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dsa/dsa_asn1.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dsa/dsa_depr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dsa/dsa_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dsa/dsa_gen.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dsa/dsa_key.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dsa/dsa_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dsa/dsa_meth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dsa/dsa_ossl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dsa/dsa_pmeth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dsa/dsa_prn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dsa/dsa_sign.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dsa/dsa_vrf.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dso/dso_dl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dso/dso_dlfcn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dso/dso_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dso/dso_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dso/dso_openssl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dso/dso_vms.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dso/dso_win32.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ebcdic.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/curve25519.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/curve448/arch_32/f_impl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto/ec/curve448/arch_32",
                     "crypto/ec/curve448",
@@ -6474,7 +6228,6 @@ our %unified_info = (
             "crypto/ec/curve448/curve448.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto/ec/curve448/arch_32",
                     "crypto/ec/curve448",
@@ -6482,7 +6235,6 @@ our %unified_info = (
             "crypto/ec/curve448/curve448_tables.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto/ec/curve448/arch_32",
                     "crypto/ec/curve448",
@@ -6490,7 +6242,6 @@ our %unified_info = (
             "crypto/ec/curve448/eddsa.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto/ec/curve448/arch_32",
                     "crypto/ec/curve448",
@@ -6498,7 +6249,6 @@ our %unified_info = (
             "crypto/ec/curve448/f_generic.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto/ec/curve448/arch_32",
                     "crypto/ec/curve448",
@@ -6506,7 +6256,6 @@ our %unified_info = (
             "crypto/ec/curve448/scalar.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto/ec/curve448/arch_32",
                     "crypto/ec/curve448",
@@ -6514,163 +6263,136 @@ our %unified_info = (
             "crypto/ec/ec2_oct.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec2_smpl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec_ameth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec_asn1.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec_check.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec_curve.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec_cvt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec_key.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec_kmeth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec_mult.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec_oct.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec_pmeth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec_print.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecdh_kdf.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecdh_ossl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecdsa_ossl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecdsa_sign.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecdsa_vrf.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/eck_prn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecp_mont.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecp_nist.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecp_nistp224.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecp_nistp256.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecp_nistp521.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecp_nistputil.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecp_nistz256-armv4.o" =>
@@ -6688,223 +6410,186 @@ our %unified_info = (
             "crypto/ec/ecp_oct.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecp_smpl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecx_meth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/eng_all.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/eng_cnf.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/eng_ctrl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/eng_dyn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/eng_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/eng_fat.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/eng_init.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/eng_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/eng_list.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/eng_openssl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/eng_pkey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/eng_rdrand.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/eng_table.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/tb_asnmth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/tb_cipher.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/tb_dh.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/tb_digest.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/tb_dsa.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/tb_eckey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/tb_pkmeth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/tb_rand.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/tb_rsa.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/err/err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/err/err_all.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/err/err_prn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/bio_b64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/bio_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/bio_md.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/bio_ok.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/c_allc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/c_alld.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/cmeth_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/digest.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/e_aes.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto",
                     "crypto/modes",
@@ -6912,21 +6597,18 @@ our %unified_info = (
             "crypto/evp/e_aes_cbc_hmac_sha1.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto/modes",
                 ],
             "crypto/evp/e_aes_cbc_hmac_sha256.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto/modes",
                 ],
             "crypto/evp/e_aria.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto",
                     "crypto/modes",
@@ -6934,13 +6616,11 @@ our %unified_info = (
             "crypto/evp/e_bf.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/e_camellia.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto",
                     "crypto/modes",
@@ -6948,81 +6628,68 @@ our %unified_info = (
             "crypto/evp/e_cast.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/e_chacha20_poly1305.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/e_des.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto",
                 ],
             "crypto/evp/e_des3.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto",
                 ],
             "crypto/evp/e_idea.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/e_null.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/e_old.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/e_rc2.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/e_rc4.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/e_rc4_hmac_md5.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/e_rc5.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/e_seed.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/e_sm4.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto",
                     "crypto/modes",
@@ -7030,328 +6697,267 @@ our %unified_info = (
             "crypto/evp/e_xcbc_d.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/encode.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/evp_cnf.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/evp_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/evp_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/evp_key.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/evp_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/evp_pbe.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/evp_pkey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/m_md2.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/m_md4.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/m_md5.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/m_md5_sha1.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/m_mdc2.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/m_null.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/m_ripemd.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/m_sha1.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/m_sha3.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto",
                 ],
             "crypto/evp/m_sigver.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/m_wp.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/names.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/p5_crpt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/p5_crpt2.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/p_dec.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/p_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/p_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/p_open.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/p_seal.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/p_sign.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/p_verify.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/pbe_scrypt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/pmeth_fn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/pmeth_gn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/pmeth_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ex_data.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/getenv.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/hmac/hm_ameth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/hmac/hm_pmeth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/hmac/hmac.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/idea/i_cbc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/idea/i_cfb64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/idea/i_ecb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/idea/i_ofb64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/idea/i_skey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
-            "crypto/include/internal/bn_conf.h" =>
-                [
-                    ".",
-                ],
-            "crypto/include/internal/dso_conf.h" =>
-                [
-                    ".",
-                ],
             "crypto/init.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/kdf/hkdf.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/kdf/kdf_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/kdf/scrypt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/kdf/tls1_prf.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/lhash/lh_stats.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/lhash/lhash.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/md4/md4_dgst.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/md4/md4_one.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/md5/md5-sparcv9.o" =>
@@ -7361,85 +6967,71 @@ our %unified_info = (
             "crypto/md5/md5_dgst.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/md5/md5_one.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/mdc2/mdc2_one.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/mdc2/mdc2dgst.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/mem.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/mem_clr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/mem_dbg.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/mem_sec.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/modes/cbc128.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/modes/ccm128.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/modes/cfb128.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/modes/ctr128.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/modes/cts128.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/modes/gcm128.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto",
                 ],
@@ -7462,361 +7054,301 @@ our %unified_info = (
             "crypto/modes/ocb128.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/modes/ofb128.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/modes/wrap128.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/modes/xts128.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/o_dir.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/o_fips.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/o_fopen.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/o_init.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/o_str.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/o_time.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/objects/o_names.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/objects/obj_dat.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/objects/obj_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/objects/obj_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/objects/obj_xref.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ocsp/ocsp_asn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ocsp/ocsp_cl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ocsp/ocsp_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ocsp/ocsp_ext.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ocsp/ocsp_ht.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ocsp/ocsp_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ocsp/ocsp_prn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ocsp/ocsp_srv.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ocsp/ocsp_vfy.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ocsp/v3_ocsp.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pem/pem_all.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pem/pem_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pem/pem_info.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pem/pem_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pem/pem_oth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pem/pem_pk8.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pem/pem_pkey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pem/pem_sign.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pem/pem_x509.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pem/pem_xaux.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pem/pvkfmt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_add.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_asn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_attr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_crpt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_crt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_decr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_init.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_key.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_kiss.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_mutl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_npas.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_p8d.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_p8e.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_sbag.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_utl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/pk12err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs7/bio_pk7.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs7/pk7_asn1.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs7/pk7_attr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs7/pk7_doit.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs7/pk7_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs7/pk7_mime.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs7/pk7_smime.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs7/pkcs7err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/poly1305/poly1305-armv4.o" =>
@@ -7830,7 +7362,6 @@ our %unified_info = (
             "crypto/poly1305/poly1305-mips.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto",
                 ],
@@ -7841,259 +7372,216 @@ our %unified_info = (
             "crypto/poly1305/poly1305.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/poly1305/poly1305_ameth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/poly1305/poly1305_pmeth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rand/drbg_ctr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rand/drbg_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rand/rand_egd.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rand/rand_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rand/rand_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rand/rand_unix.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rand/rand_vms.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rand/rand_win.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rand/randfile.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rc2/rc2_cbc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rc2/rc2_ecb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rc2/rc2_skey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rc2/rc2cfb64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rc2/rc2ofb64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rc4/rc4_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rc4/rc4_skey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ripemd/rmd_dgst.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ripemd/rmd_one.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_ameth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_asn1.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_chk.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_crpt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_depr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_gen.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_meth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_mp.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_none.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_oaep.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_ossl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_pk1.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_pmeth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_prn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_pss.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_saos.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_sign.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_ssl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_x931.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_x931g.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/s390xcpuid.o" =>
@@ -8103,31 +7591,26 @@ our %unified_info = (
             "crypto/seed/seed.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/seed/seed_cbc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/seed/seed_cfb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/seed/seed_ecb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/seed/seed_ofb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sha/keccak1600-armv4.o" =>
@@ -8137,7 +7620,6 @@ our %unified_info = (
             "crypto/sha/keccak1600.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sha/sha1-armv4-large.o" =>
@@ -8151,7 +7633,6 @@ our %unified_info = (
             "crypto/sha/sha1-mips.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto",
                 ],
@@ -8166,13 +7647,11 @@ our %unified_info = (
             "crypto/sha/sha1_one.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sha/sha1dgst.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sha/sha256-armv4.o" =>
@@ -8186,7 +7665,6 @@ our %unified_info = (
             "crypto/sha/sha256-mips.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto",
                 ],
@@ -8201,7 +7679,6 @@ our %unified_info = (
             "crypto/sha/sha256.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sha/sha512-armv4.o" =>
@@ -8215,7 +7692,6 @@ our %unified_info = (
             "crypto/sha/sha512-mips.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto",
                 ],
@@ -8230,709 +7706,591 @@ our %unified_info = (
             "crypto/sha/sha512.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/siphash/siphash.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/siphash/siphash_ameth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/siphash/siphash_pmeth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sm2/sm2_crypt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sm2/sm2_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sm2/sm2_pmeth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sm2/sm2_sign.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sm3/m_sm3.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sm3/sm3.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sm4/sm4.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/srp/srp_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/srp/srp_vfy.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/stack/stack.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/store/loader_file.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/store/store_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/store/store_init.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/store/store_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/store/store_register.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/store/store_strings.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/threads_none.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/threads_pthread.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/threads_win.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ts/ts_asn1.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ts/ts_conf.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ts/ts_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ts/ts_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ts/ts_req_print.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ts/ts_req_utils.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ts/ts_rsp_print.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ts/ts_rsp_sign.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ts/ts_rsp_utils.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ts/ts_rsp_verify.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ts/ts_verify_ctx.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/txt_db/txt_db.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ui/ui_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ui/ui_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ui/ui_null.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ui/ui_openssl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ui/ui_util.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/uid.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/whrlpool/wp_block.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/whrlpool/wp_dgst.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/by_dir.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/by_file.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/t_crl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/t_req.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/t_x509.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_att.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_cmp.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_d2.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_def.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_ext.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_lu.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_meth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_obj.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_r2x.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_req.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_set.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_trs.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_txt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_v3.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_vfy.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_vpm.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509cset.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509name.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509rset.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509spki.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509type.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x_all.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x_attrib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x_crl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x_exten.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x_name.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x_pubkey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x_req.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x_x509.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x_x509a.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/pcy_cache.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/pcy_data.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/pcy_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/pcy_map.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/pcy_node.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/pcy_tree.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_addr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_admis.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_akey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_akeya.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_alt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_asid.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_bcons.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_bitst.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_conf.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_cpols.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_crld.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_enum.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_extku.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_genn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_ia5.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_info.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_int.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_ncons.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_pci.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_pcia.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_pcons.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_pku.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_pmaps.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_prn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_purp.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_skey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_sxnet.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_tlsf.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_utl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "engines/e_capi.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "engines/e_padlock.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "fuzz/asn1.o" =>
@@ -8983,6 +8341,14 @@ our %unified_info = (
                 [
                     "include",
                 ],
+            "include/crypto/bn_conf.h" =>
+                [
+                    ".",
+                ],
+            "include/crypto/dso_conf.h" =>
+                [
+                    ".",
+                ],
             "include/openssl/opensslconf.h" =>
                 [
                     ".",
@@ -9227,7 +8593,6 @@ our %unified_info = (
                 [
                     ".",
                     "include",
-                    "crypto/include",
                 ],
             "test/asn1_string_table_test.o" =>
                 [
@@ -9553,7 +8918,6 @@ our %unified_info = (
                 [
                     ".",
                     "include",
-                    "crypto/include",
                 ],
             "test/cipher_overhead_test.o" =>
                 [
@@ -9599,7 +8963,6 @@ our %unified_info = (
             "test/ctype_internal_test.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "test/curve448_internal_test.o" =>
@@ -9665,7 +9028,6 @@ our %unified_info = (
                 [
                     "include",
                     "crypto/ec",
-                    "crypto/include",
                 ],
             "test/ecdsatest.o" =>
                 [
@@ -9690,7 +9052,6 @@ our %unified_info = (
             "test/evp_extra_test.o" =>
                 [
                     "include",
-                    "crypto/include",
                 ],
             "test/evp_test.o" =>
                 [
@@ -9788,7 +9149,6 @@ our %unified_info = (
                 [
                     ".",
                     "include",
-                    "crypto/include",
                 ],
             "test/rc2test.o" =>
                 [
@@ -9838,18 +9198,15 @@ our %unified_info = (
                 [
                     ".",
                     "include",
-                    "crypto/include",
                 ],
             "test/sm2_internal_test.o" =>
                 [
                     "include",
-                    "crypto/include",
                 ],
             "test/sm4_internal_test.o" =>
                 [
                     ".",
                     "include",
-                    "crypto/include",
                 ],
             "test/srptest.o" =>
                 [
@@ -9860,6 +9217,10 @@ our %unified_info = (
                     ".",
                     "include",
                 ],
+            "test/ssl_ctx_test.o" =>
+                [
+                    "include",
+                ],
             "test/ssl_test.o" =>
                 [
                     "include",
@@ -9923,10 +9284,6 @@ our %unified_info = (
                 [
                     "include",
                 ],
-            "test/testutil/init.o" =>
-                [
-                    "include",
-                ],
             "test/testutil/main.o" =>
                 [
                     "include",
@@ -9955,6 +9312,10 @@ our %unified_info = (
                 [
                     "include",
                 ],
+            "test/testutil/testutil_init.o" =>
+                [
+                    "include",
+                ],
             "test/threadstest.o" =>
                 [
                     "include",
@@ -10219,6 +9580,7 @@ our %unified_info = (
             "test/sm4_internal_test",
             "test/srptest",
             "test/ssl_cert_table_internal_test",
+            "test/ssl_ctx_test",
             "test/ssl_test",
             "test/ssl_test_ctx_test",
             "test/sslapitest",
@@ -15134,7 +14496,6 @@ our %unified_info = (
                     "test/testutil/cb.o",
                     "test/testutil/driver.o",
                     "test/testutil/format_output.o",
-                    "test/testutil/init.o",
                     "test/testutil/main.o",
                     "test/testutil/output_helpers.o",
                     "test/testutil/random.o",
@@ -15142,6 +14503,7 @@ our %unified_info = (
                     "test/testutil/tap_bio.o",
                     "test/testutil/test_cleanup.o",
                     "test/testutil/tests.o",
+                    "test/testutil/testutil_init.o",
                 ],
             "test/md2test" =>
                 [
@@ -15369,6 +14731,14 @@ our %unified_info = (
                 [
                     "test/ssl_cert_table_internal_test.c",
                 ],
+            "test/ssl_ctx_test" =>
+                [
+                    "test/ssl_ctx_test.o",
+                ],
+            "test/ssl_ctx_test.o" =>
+                [
+                    "test/ssl_ctx_test.c",
+                ],
             "test/ssl_test" =>
                 [
                     "test/handshake_helper.o",
@@ -15471,10 +14841,6 @@ our %unified_info = (
                 [
                     "test/testutil/format_output.c",
                 ],
-            "test/testutil/init.o" =>
-                [
-                    "test/testutil/init.c",
-                ],
             "test/testutil/main.o" =>
                 [
                     "test/testutil/main.c",
@@ -15503,6 +14869,10 @@ our %unified_info = (
                 [
                     "test/testutil/tests.c",
                 ],
+            "test/testutil/testutil_init.o" =>
+                [
+                    "test/testutil/testutil_init.c",
+                ],
             "test/threadstest" =>
                 [
                     "test/threadstest.o",
diff --git a/deps/openssl/config/archs/linux64-mips64/asm_avx2/crypto/buildinf.h b/deps/openssl/config/archs/linux64-mips64/asm_avx2/crypto/buildinf.h
index f6a9d770f1..87d8f13efa 100644
--- a/deps/openssl/config/archs/linux64-mips64/asm_avx2/crypto/buildinf.h
+++ b/deps/openssl/config/archs/linux64-mips64/asm_avx2/crypto/buildinf.h
@@ -11,7 +11,7 @@
  */
 
 #define PLATFORM "platform: linux64-mips64"
-#define DATE "built on: Fri Sep 13 16:02:00 2019 UTC"
+#define DATE "built on: Wed Mar 18 21:09:39 2020 UTC"
 
 /*
  * Generate compiler_flags as an array of individual characters. This is a
diff --git a/deps/openssl/config/archs/linux64-mips64/asm_avx2/crypto/include/internal/bn_conf.h b/deps/openssl/config/archs/linux64-mips64/asm_avx2/crypto/include/internal/bn_conf.h
index 34bd8b78b4..5312ef5a7a 100644
--- a/deps/openssl/config/archs/linux64-mips64/asm_avx2/crypto/include/internal/bn_conf.h
+++ b/deps/openssl/config/archs/linux64-mips64/asm_avx2/crypto/include/internal/bn_conf.h
@@ -1,5 +1,5 @@
 /* WARNING: do not edit! */
-/* Generated by Makefile from crypto/include/internal/bn_conf.h.in */
+/* Generated by Makefile from include/crypto/bn_conf.h.in */
 /*
  * Copyright 2016 The OpenSSL Project Authors. All Rights Reserved.
  *
@@ -9,8 +9,8 @@
  * https://www.openssl.org/source/license.html
  */
 
-#ifndef HEADER_BN_CONF_H
-# define HEADER_BN_CONF_H
+#ifndef OSSL_CRYPTO_BN_CONF_H
+# define OSSL_CRYPTO_BN_CONF_H
 
 /*
  * The contents of this file are not used in the UEFI build, as
diff --git a/deps/openssl/config/archs/linux64-mips64/asm_avx2/crypto/include/internal/dso_conf.h b/deps/openssl/config/archs/linux64-mips64/asm_avx2/crypto/include/internal/dso_conf.h
index 252266ec2a..4b1167c3d8 100644
--- a/deps/openssl/config/archs/linux64-mips64/asm_avx2/crypto/include/internal/dso_conf.h
+++ b/deps/openssl/config/archs/linux64-mips64/asm_avx2/crypto/include/internal/dso_conf.h
@@ -1,5 +1,5 @@
 /* WARNING: do not edit! */
-/* Generated by Makefile from crypto/include/internal/dso_conf.h.in */
+/* Generated by Makefile from include/crypto/dso_conf.h.in */
 /*
  * Copyright 2016-2019 The OpenSSL Project Authors. All Rights Reserved.
  *
@@ -9,8 +9,8 @@
  * https://www.openssl.org/source/license.html
  */
 
-#ifndef HEADER_DSO_CONF_H
-# define HEADER_DSO_CONF_H
+#ifndef OSSL_CRYPTO_DSO_CONF_H
+# define OSSL_CRYPTO_DSO_CONF_H
 # define DSO_DLFCN
 # define HAVE_DLFCN_H
 # define DSO_EXTENSION ".so"
diff --git a/deps/openssl/config/archs/linux64-mips64/asm_avx2/include/openssl/opensslconf.h b/deps/openssl/config/archs/linux64-mips64/asm_avx2/include/openssl/opensslconf.h
index 30820b6051..937531fe9f 100644
--- a/deps/openssl/config/archs/linux64-mips64/asm_avx2/include/openssl/opensslconf.h
+++ b/deps/openssl/config/archs/linux64-mips64/asm_avx2/include/openssl/opensslconf.h
@@ -96,9 +96,6 @@ extern "C" {
 #ifndef OPENSSL_NO_DYNAMIC_ENGINE
 # define OPENSSL_NO_DYNAMIC_ENGINE
 #endif
-#ifndef OPENSSL_NO_AFALGENG
-# define OPENSSL_NO_AFALGENG
-#endif
 
 
 /*
diff --git a/deps/openssl/config/archs/linux64-mips64/asm_avx2/include/progs.h b/deps/openssl/config/archs/linux64-mips64/asm_avx2/include/progs.h
index 9b3d270e20..308c65601b 100644
--- a/deps/openssl/config/archs/linux64-mips64/asm_avx2/include/progs.h
+++ b/deps/openssl/config/archs/linux64-mips64/asm_avx2/include/progs.h
@@ -2,7 +2,7 @@
  * WARNING: do not edit!
  * Generated by apps/progs.pl
  *
- * Copyright 1995-2019 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 1995-2020 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
diff --git a/deps/openssl/config/archs/linux64-mips64/no-asm/configdata.pm b/deps/openssl/config/archs/linux64-mips64/no-asm/configdata.pm
index f5b0bfea29..62586346a8 100644
--- a/deps/openssl/config/archs/linux64-mips64/no-asm/configdata.pm
+++ b/deps/openssl/config/archs/linux64-mips64/no-asm/configdata.pm
@@ -55,7 +55,7 @@ our %config = (
   minor => "1.1",
   openssl_algorithm_defines => [ "OPENSSL_NO_COMP", "OPENSSL_NO_MD2", "OPENSSL_NO_RC5" ],
   openssl_api_defines => [  ],
-  openssl_other_defines => [ "OPENSSL_RAND_SEED_OS", "OPENSSL_NO_AFALGENG", "OPENSSL_NO_ASAN", "OPENSSL_NO_ASM", "OPENSSL_NO_CRYPTO_MDEBUG", "OPENSSL_NO_CRYPTO_MDEBUG_BACKTRACE", "OPENSSL_NO_DEVCRYPTOENG", "OPENSSL_NO_EC_NISTP_64_GCC_128", "OPENSSL_NO_EGD", "OPENSSL_NO_EXTERNAL_TESTS", "OPENSSL_NO_FUZZ_AFL", "OPENSSL_NO_FUZZ_LIBFUZZER", "OPENSSL_NO_HEARTBEATS", "OPENSSL_NO_MSAN", "OPENSSL_NO_SCTP", "OPENSSL_NO_SSL3", "OPENSSL_NO_SSL3_METHOD", "OPENSSL_NO_UBSAN", "OPENSSL_NO_UNIT_TEST", "OPENSSL_NO_WEAK_SSL_CIPHERS", "OPENSSL_NO_DYNAMIC_ENGINE", "OPENSSL_NO_AFALGENG" ],
+  openssl_other_defines => [ "OPENSSL_RAND_SEED_OS", "OPENSSL_NO_AFALGENG", "OPENSSL_NO_ASAN", "OPENSSL_NO_ASM", "OPENSSL_NO_CRYPTO_MDEBUG", "OPENSSL_NO_CRYPTO_MDEBUG_BACKTRACE", "OPENSSL_NO_DEVCRYPTOENG", "OPENSSL_NO_EC_NISTP_64_GCC_128", "OPENSSL_NO_EGD", "OPENSSL_NO_EXTERNAL_TESTS", "OPENSSL_NO_FUZZ_AFL", "OPENSSL_NO_FUZZ_LIBFUZZER", "OPENSSL_NO_HEARTBEATS", "OPENSSL_NO_MSAN", "OPENSSL_NO_SCTP", "OPENSSL_NO_SSL3", "OPENSSL_NO_SSL3_METHOD", "OPENSSL_NO_UBSAN", "OPENSSL_NO_UNIT_TEST", "OPENSSL_NO_WEAK_SSL_CIPHERS", "OPENSSL_NO_DYNAMIC_ENGINE" ],
   openssl_sys_defines => [  ],
   openssl_thread_defines => [ "OPENSSL_THREADS" ],
   openssldir => "",
@@ -111,8 +111,8 @@ our %config = (
   sourcedir => ".",
   target => "linux64-mips64",
   tdirs => [ "ossl_shim" ],
-  version => "1.1.1d",
-  version_num => "0x1010104fL",
+  version => "1.1.1e",
+  version_num => "0x1010105fL",
 );
 
 our %target = (
@@ -238,6 +238,7 @@ our @disablables = (
   "dgram",
   "dh",
   "dsa",
+  "dso",
   "dtls",
   "dynamic-engine",
   "ec",
@@ -356,8 +357,8 @@ our %unified_info = (
         {
             "" =>
                 [
-                    "crypto/include/internal/bn_conf.h",
-                    "crypto/include/internal/dso_conf.h",
+                    "include/crypto/bn_conf.h",
+                    "include/crypto/dso_conf.h",
                     "include/openssl/opensslconf.h",
                 ],
             "apps/asn1pars.o" =>
@@ -625,14 +626,6 @@ our %unified_info = (
                     "crypto/perlasm/cbc.pl",
                     "crypto/perlasm/x86asm.pl",
                 ],
-            "crypto/include/internal/bn_conf.h" =>
-                [
-                    "configdata.pm",
-                ],
-            "crypto/include/internal/dso_conf.h" =>
-                [
-                    "configdata.pm",
-                ],
             "crypto/rc4/rc4-586.s" =>
                 [
                     "crypto/perlasm/x86asm.pl",
@@ -708,6 +701,14 @@ our %unified_info = (
                 [
                     "libcrypto",
                 ],
+            "include/crypto/bn_conf.h" =>
+                [
+                    "configdata.pm",
+                ],
+            "include/crypto/dso_conf.h" =>
+                [
+                    "configdata.pm",
+                ],
             "include/openssl/opensslconf.h" =>
                 [
                     "configdata.pm",
@@ -1505,6 +1506,12 @@ our %unified_info = (
                     "libcrypto",
                     "test/libtestutil.a",
                 ],
+            "test/ssl_ctx_test" =>
+                [
+                    "libcrypto",
+                    "libssl",
+                    "test/libtestutil.a",
+                ],
             "test/ssl_test" =>
                 [
                     "libcrypto",
@@ -3223,7 +3230,6 @@ our %unified_info = (
                             "test/testutil/cb.o",
                             "test/testutil/driver.o",
                             "test/testutil/format_output.o",
-                            "test/testutil/init.o",
                             "test/testutil/main.o",
                             "test/testutil/output_helpers.o",
                             "test/testutil/random.o",
@@ -3231,6 +3237,7 @@ our %unified_info = (
                             "test/testutil/tap_bio.o",
                             "test/testutil/test_cleanup.o",
                             "test/testutil/tests.o",
+                            "test/testutil/testutil_init.o",
                         ],
                     "products" =>
                         {
@@ -3729,14 +3736,6 @@ our %unified_info = (
                 [
                     "crypto/ia64cpuid.S",
                 ],
-            "crypto/include/internal/bn_conf.h" =>
-                [
-                    "crypto/include/internal/bn_conf.h.in",
-                ],
-            "crypto/include/internal/dso_conf.h" =>
-                [
-                    "crypto/include/internal/dso_conf.h.in",
-                ],
             "crypto/md5/md5-586.s" =>
                 [
                     "crypto/md5/asm/md5-586.pl",
@@ -4177,6 +4176,14 @@ our %unified_info = (
                     "engines/asm/e_padlock-x86_64.pl",
                     "\$(PERLASM_SCHEME)",
                 ],
+            "include/crypto/bn_conf.h" =>
+                [
+                    "include/crypto/bn_conf.h.in",
+                ],
+            "include/crypto/dso_conf.h" =>
+                [
+                    "include/crypto/dso_conf.h.in",
+                ],
             "include/openssl/opensslconf.h" =>
                 [
                     "include/openssl/opensslconf.h.in",
@@ -4871,49 +4878,41 @@ our %unified_info = (
             "crypto/aes/aes_cbc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/aes/aes_cfb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/aes/aes_core.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/aes/aes_ecb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/aes/aes_ige.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/aes/aes_misc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/aes/aes_ofb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/aes/aes_wrap.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/aes/aesfx-sparcv9.o" =>
@@ -4935,7 +4934,6 @@ our %unified_info = (
             "crypto/aria/aria.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/arm64cpuid.o" =>
@@ -4949,613 +4947,511 @@ our %unified_info = (
             "crypto/asn1/a_bitstr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_d2i_fp.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_digest.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_dup.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_gentm.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_i2d_fp.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_int.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_mbstr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_object.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_octet.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_print.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_sign.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_strex.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_strnid.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_time.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_type.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_utctm.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_utf8.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_verify.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/ameth_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/asn1_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/asn1_gen.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/asn1_item_list.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/asn1_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/asn1_par.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/asn_mime.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/asn_moid.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/asn_mstbl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/asn_pack.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/bio_asn1.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/bio_ndef.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/d2i_pr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/d2i_pu.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/evp_asn1.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/f_int.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/f_string.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/i2d_pr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/i2d_pu.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/n_pkey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/nsseq.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/p5_pbe.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/p5_pbev2.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/p5_scrypt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/p8_pkey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/t_bitst.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/t_pkey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/t_spki.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/tasn_dec.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/tasn_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/tasn_fre.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/tasn_new.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/tasn_prn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/tasn_scn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/tasn_typ.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/tasn_utl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/x_algor.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/x_bignum.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/x_info.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/x_int64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/x_long.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/x_pkey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/x_sig.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/x_spki.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/x_val.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/async/arch/async_null.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/async/arch/async_posix.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/async/arch/async_win.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/async/async.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/async/async_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/async/async_wait.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bf/bf_cfb64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bf/bf_ecb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bf/bf_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bf/bf_ofb64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bf/bf_skey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/b_addr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/b_dump.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/b_print.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/b_sock.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/b_sock2.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bf_buff.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bf_lbuf.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bf_nbio.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bf_null.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bio_cb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bio_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bio_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bio_meth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bss_acpt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bss_bio.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bss_conn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bss_dgram.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bss_fd.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bss_file.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bss_log.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bss_mem.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bss_null.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bss_sock.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/blake2/blake2b.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/blake2/blake2s.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/blake2/m_blake2b.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/blake2/m_blake2s.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/armv4-gf2m.o" =>
@@ -5573,188 +5469,157 @@ our %unified_info = (
             "crypto/bn/bn_add.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_asm.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_blind.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_const.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_ctx.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_depr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_dh.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_div.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_exp.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto",
                 ],
             "crypto/bn/bn_exp2.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_gcd.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_gf2m.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_intern.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_kron.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_mod.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_mont.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_mpi.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_mul.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_nist.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_prime.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_print.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_rand.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_recp.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_shift.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_sqr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_sqrt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_srp.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_word.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_x931p.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/mips-mont.o" =>
@@ -5784,13 +5649,11 @@ our %unified_info = (
             "crypto/buffer/buf_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/buffer/buffer.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/buildinf.h" =>
@@ -5800,43 +5663,36 @@ our %unified_info = (
             "crypto/camellia/camellia.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/camellia/cmll_cbc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/camellia/cmll_cfb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/camellia/cmll_ctr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/camellia/cmll_ecb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/camellia/cmll_misc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/camellia/cmll_ofb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/camellia/cmllt4-sparcv9.o" =>
@@ -5846,31 +5702,26 @@ our %unified_info = (
             "crypto/cast/c_cfb64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cast/c_ecb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cast/c_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cast/c_ofb64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cast/c_skey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/chacha/chacha-armv4.o" =>
@@ -5888,278 +5739,232 @@ our %unified_info = (
             "crypto/chacha/chacha_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cmac/cm_ameth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cmac/cm_pmeth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cmac/cmac.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_asn1.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_att.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_cd.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_dd.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_env.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_ess.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_io.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_kari.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_pwri.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_sd.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_smime.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/conf/conf_api.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/conf/conf_def.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/conf/conf_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/conf/conf_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/conf/conf_mall.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/conf/conf_mod.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/conf/conf_sap.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/conf/conf_ssl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cpt_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cryptlib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ct/ct_b64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ct/ct_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ct/ct_log.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ct/ct_oct.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ct/ct_policy.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ct/ct_prn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ct/ct_sct.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ct/ct_sct_ctx.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ct/ct_vfy.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ct/ct_x509v3.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ctype.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cversion.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto",
                 ],
             "crypto/des/cbc_cksm.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/cbc_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/cfb64ede.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/cfb64enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/cfb_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/des_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/dest4-sparcv9.o" =>
@@ -6169,301 +5974,251 @@ our %unified_info = (
             "crypto/des/ecb3_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/ecb_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/fcrypt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/fcrypt_b.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/ofb64ede.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/ofb64enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/ofb_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/pcbc_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/qud_cksm.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/rand_key.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/set_key.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/str2key.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/xcbc_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_ameth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_asn1.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_check.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_depr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_gen.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_kdf.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_key.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_meth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_pmeth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_prn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_rfc5114.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_rfc7919.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dsa/dsa_ameth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dsa/dsa_asn1.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dsa/dsa_depr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dsa/dsa_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dsa/dsa_gen.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dsa/dsa_key.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dsa/dsa_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dsa/dsa_meth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dsa/dsa_ossl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dsa/dsa_pmeth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dsa/dsa_prn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dsa/dsa_sign.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dsa/dsa_vrf.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dso/dso_dl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dso/dso_dlfcn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dso/dso_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dso/dso_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dso/dso_openssl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dso/dso_vms.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dso/dso_win32.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ebcdic.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/curve25519.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/curve448/arch_32/f_impl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto/ec/curve448/arch_32",
                     "crypto/ec/curve448",
@@ -6471,7 +6226,6 @@ our %unified_info = (
             "crypto/ec/curve448/curve448.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto/ec/curve448/arch_32",
                     "crypto/ec/curve448",
@@ -6479,7 +6233,6 @@ our %unified_info = (
             "crypto/ec/curve448/curve448_tables.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto/ec/curve448/arch_32",
                     "crypto/ec/curve448",
@@ -6487,7 +6240,6 @@ our %unified_info = (
             "crypto/ec/curve448/eddsa.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto/ec/curve448/arch_32",
                     "crypto/ec/curve448",
@@ -6495,7 +6247,6 @@ our %unified_info = (
             "crypto/ec/curve448/f_generic.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto/ec/curve448/arch_32",
                     "crypto/ec/curve448",
@@ -6503,7 +6254,6 @@ our %unified_info = (
             "crypto/ec/curve448/scalar.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto/ec/curve448/arch_32",
                     "crypto/ec/curve448",
@@ -6511,163 +6261,136 @@ our %unified_info = (
             "crypto/ec/ec2_oct.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec2_smpl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec_ameth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec_asn1.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec_check.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec_curve.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec_cvt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec_key.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec_kmeth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec_mult.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec_oct.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec_pmeth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec_print.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecdh_kdf.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecdh_ossl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecdsa_ossl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecdsa_sign.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecdsa_vrf.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/eck_prn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecp_mont.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecp_nist.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecp_nistp224.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecp_nistp256.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecp_nistp521.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecp_nistputil.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecp_nistz256-armv4.o" =>
@@ -6685,223 +6408,186 @@ our %unified_info = (
             "crypto/ec/ecp_oct.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecp_smpl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecx_meth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/eng_all.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/eng_cnf.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/eng_ctrl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/eng_dyn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/eng_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/eng_fat.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/eng_init.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/eng_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/eng_list.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/eng_openssl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/eng_pkey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/eng_rdrand.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/eng_table.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/tb_asnmth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/tb_cipher.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/tb_dh.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/tb_digest.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/tb_dsa.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/tb_eckey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/tb_pkmeth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/tb_rand.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/tb_rsa.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/err/err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/err/err_all.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/err/err_prn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/bio_b64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/bio_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/bio_md.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/bio_ok.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/c_allc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/c_alld.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/cmeth_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/digest.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/e_aes.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto",
                     "crypto/modes",
@@ -6909,21 +6595,18 @@ our %unified_info = (
             "crypto/evp/e_aes_cbc_hmac_sha1.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto/modes",
                 ],
             "crypto/evp/e_aes_cbc_hmac_sha256.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto/modes",
                 ],
             "crypto/evp/e_aria.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto",
                     "crypto/modes",
@@ -6931,13 +6614,11 @@ our %unified_info = (
             "crypto/evp/e_bf.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/e_camellia.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto",
                     "crypto/modes",
@@ -6945,81 +6626,68 @@ our %unified_info = (
             "crypto/evp/e_cast.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/e_chacha20_poly1305.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/e_des.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto",
                 ],
             "crypto/evp/e_des3.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto",
                 ],
             "crypto/evp/e_idea.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/e_null.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/e_old.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/e_rc2.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/e_rc4.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/e_rc4_hmac_md5.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/e_rc5.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/e_seed.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/e_sm4.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto",
                     "crypto/modes",
@@ -7027,328 +6695,267 @@ our %unified_info = (
             "crypto/evp/e_xcbc_d.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/encode.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/evp_cnf.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/evp_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/evp_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/evp_key.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/evp_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/evp_pbe.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/evp_pkey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/m_md2.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/m_md4.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/m_md5.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/m_md5_sha1.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/m_mdc2.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/m_null.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/m_ripemd.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/m_sha1.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/m_sha3.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto",
                 ],
             "crypto/evp/m_sigver.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/m_wp.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/names.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/p5_crpt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/p5_crpt2.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/p_dec.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/p_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/p_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/p_open.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/p_seal.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/p_sign.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/p_verify.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/pbe_scrypt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/pmeth_fn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/pmeth_gn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/pmeth_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ex_data.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/getenv.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/hmac/hm_ameth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/hmac/hm_pmeth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/hmac/hmac.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/idea/i_cbc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/idea/i_cfb64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/idea/i_ecb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/idea/i_ofb64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/idea/i_skey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
-            "crypto/include/internal/bn_conf.h" =>
-                [
-                    ".",
-                ],
-            "crypto/include/internal/dso_conf.h" =>
-                [
-                    ".",
-                ],
             "crypto/init.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/kdf/hkdf.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/kdf/kdf_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/kdf/scrypt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/kdf/tls1_prf.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/lhash/lh_stats.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/lhash/lhash.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/md4/md4_dgst.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/md4/md4_one.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/md5/md5-sparcv9.o" =>
@@ -7358,85 +6965,71 @@ our %unified_info = (
             "crypto/md5/md5_dgst.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/md5/md5_one.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/mdc2/mdc2_one.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/mdc2/mdc2dgst.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/mem.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/mem_clr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/mem_dbg.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/mem_sec.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/modes/cbc128.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/modes/ccm128.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/modes/cfb128.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/modes/ctr128.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/modes/cts128.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/modes/gcm128.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto",
                 ],
@@ -7459,361 +7052,301 @@ our %unified_info = (
             "crypto/modes/ocb128.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/modes/ofb128.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/modes/wrap128.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/modes/xts128.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/o_dir.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/o_fips.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/o_fopen.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/o_init.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/o_str.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/o_time.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/objects/o_names.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/objects/obj_dat.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/objects/obj_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/objects/obj_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/objects/obj_xref.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ocsp/ocsp_asn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ocsp/ocsp_cl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ocsp/ocsp_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ocsp/ocsp_ext.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ocsp/ocsp_ht.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ocsp/ocsp_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ocsp/ocsp_prn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ocsp/ocsp_srv.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ocsp/ocsp_vfy.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ocsp/v3_ocsp.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pem/pem_all.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pem/pem_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pem/pem_info.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pem/pem_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pem/pem_oth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pem/pem_pk8.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pem/pem_pkey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pem/pem_sign.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pem/pem_x509.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pem/pem_xaux.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pem/pvkfmt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_add.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_asn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_attr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_crpt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_crt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_decr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_init.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_key.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_kiss.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_mutl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_npas.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_p8d.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_p8e.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_sbag.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_utl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/pk12err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs7/bio_pk7.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs7/pk7_asn1.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs7/pk7_attr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs7/pk7_doit.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs7/pk7_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs7/pk7_mime.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs7/pk7_smime.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs7/pkcs7err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/poly1305/poly1305-armv4.o" =>
@@ -7835,259 +7368,216 @@ our %unified_info = (
             "crypto/poly1305/poly1305.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/poly1305/poly1305_ameth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/poly1305/poly1305_pmeth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rand/drbg_ctr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rand/drbg_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rand/rand_egd.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rand/rand_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rand/rand_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rand/rand_unix.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rand/rand_vms.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rand/rand_win.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rand/randfile.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rc2/rc2_cbc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rc2/rc2_ecb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rc2/rc2_skey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rc2/rc2cfb64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rc2/rc2ofb64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rc4/rc4_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rc4/rc4_skey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ripemd/rmd_dgst.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ripemd/rmd_one.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_ameth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_asn1.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_chk.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_crpt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_depr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_gen.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_meth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_mp.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_none.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_oaep.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_ossl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_pk1.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_pmeth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_prn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_pss.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_saos.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_sign.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_ssl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_x931.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_x931g.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/s390xcpuid.o" =>
@@ -8097,31 +7587,26 @@ our %unified_info = (
             "crypto/seed/seed.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/seed/seed_cbc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/seed/seed_cfb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/seed/seed_ecb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/seed/seed_ofb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sha/keccak1600-armv4.o" =>
@@ -8131,7 +7616,6 @@ our %unified_info = (
             "crypto/sha/keccak1600.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sha/sha1-armv4-large.o" =>
@@ -8157,13 +7641,11 @@ our %unified_info = (
             "crypto/sha/sha1_one.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sha/sha1dgst.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sha/sha256-armv4.o" =>
@@ -8189,7 +7671,6 @@ our %unified_info = (
             "crypto/sha/sha256.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sha/sha512-armv4.o" =>
@@ -8215,709 +7696,591 @@ our %unified_info = (
             "crypto/sha/sha512.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/siphash/siphash.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/siphash/siphash_ameth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/siphash/siphash_pmeth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sm2/sm2_crypt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sm2/sm2_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sm2/sm2_pmeth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sm2/sm2_sign.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sm3/m_sm3.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sm3/sm3.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sm4/sm4.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/srp/srp_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/srp/srp_vfy.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/stack/stack.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/store/loader_file.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/store/store_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/store/store_init.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/store/store_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/store/store_register.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/store/store_strings.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/threads_none.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/threads_pthread.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/threads_win.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ts/ts_asn1.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ts/ts_conf.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ts/ts_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ts/ts_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ts/ts_req_print.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ts/ts_req_utils.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ts/ts_rsp_print.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ts/ts_rsp_sign.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ts/ts_rsp_utils.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ts/ts_rsp_verify.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ts/ts_verify_ctx.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/txt_db/txt_db.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ui/ui_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ui/ui_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ui/ui_null.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ui/ui_openssl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ui/ui_util.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/uid.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/whrlpool/wp_block.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/whrlpool/wp_dgst.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/by_dir.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/by_file.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/t_crl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/t_req.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/t_x509.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_att.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_cmp.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_d2.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_def.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_ext.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_lu.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_meth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_obj.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_r2x.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_req.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_set.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_trs.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_txt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_v3.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_vfy.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_vpm.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509cset.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509name.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509rset.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509spki.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509type.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x_all.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x_attrib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x_crl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x_exten.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x_name.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x_pubkey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x_req.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x_x509.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x_x509a.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/pcy_cache.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/pcy_data.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/pcy_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/pcy_map.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/pcy_node.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/pcy_tree.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_addr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_admis.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_akey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_akeya.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_alt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_asid.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_bcons.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_bitst.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_conf.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_cpols.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_crld.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_enum.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_extku.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_genn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_ia5.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_info.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_int.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_ncons.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_pci.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_pcia.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_pcons.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_pku.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_pmaps.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_prn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_purp.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_skey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_sxnet.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_tlsf.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_utl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "engines/e_capi.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "engines/e_padlock.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "fuzz/asn1.o" =>
@@ -8968,6 +8331,14 @@ our %unified_info = (
                 [
                     "include",
                 ],
+            "include/crypto/bn_conf.h" =>
+                [
+                    ".",
+                ],
+            "include/crypto/dso_conf.h" =>
+                [
+                    ".",
+                ],
             "include/openssl/opensslconf.h" =>
                 [
                     ".",
@@ -9212,7 +8583,6 @@ our %unified_info = (
                 [
                     ".",
                     "include",
-                    "crypto/include",
                 ],
             "test/asn1_string_table_test.o" =>
                 [
@@ -9538,7 +8908,6 @@ our %unified_info = (
                 [
                     ".",
                     "include",
-                    "crypto/include",
                 ],
             "test/cipher_overhead_test.o" =>
                 [
@@ -9584,7 +8953,6 @@ our %unified_info = (
             "test/ctype_internal_test.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "test/curve448_internal_test.o" =>
@@ -9650,7 +9018,6 @@ our %unified_info = (
                 [
                     "include",
                     "crypto/ec",
-                    "crypto/include",
                 ],
             "test/ecdsatest.o" =>
                 [
@@ -9675,7 +9042,6 @@ our %unified_info = (
             "test/evp_extra_test.o" =>
                 [
                     "include",
-                    "crypto/include",
                 ],
             "test/evp_test.o" =>
                 [
@@ -9773,7 +9139,6 @@ our %unified_info = (
                 [
                     ".",
                     "include",
-                    "crypto/include",
                 ],
             "test/rc2test.o" =>
                 [
@@ -9823,18 +9188,15 @@ our %unified_info = (
                 [
                     ".",
                     "include",
-                    "crypto/include",
                 ],
             "test/sm2_internal_test.o" =>
                 [
                     "include",
-                    "crypto/include",
                 ],
             "test/sm4_internal_test.o" =>
                 [
                     ".",
                     "include",
-                    "crypto/include",
                 ],
             "test/srptest.o" =>
                 [
@@ -9845,6 +9207,10 @@ our %unified_info = (
                     ".",
                     "include",
                 ],
+            "test/ssl_ctx_test.o" =>
+                [
+                    "include",
+                ],
             "test/ssl_test.o" =>
                 [
                     "include",
@@ -9908,10 +9274,6 @@ our %unified_info = (
                 [
                     "include",
                 ],
-            "test/testutil/init.o" =>
-                [
-                    "include",
-                ],
             "test/testutil/main.o" =>
                 [
                     "include",
@@ -9940,6 +9302,10 @@ our %unified_info = (
                 [
                     "include",
                 ],
+            "test/testutil/testutil_init.o" =>
+                [
+                    "include",
+                ],
             "test/threadstest.o" =>
                 [
                     "include",
@@ -10204,6 +9570,7 @@ our %unified_info = (
             "test/sm4_internal_test",
             "test/srptest",
             "test/ssl_cert_table_internal_test",
+            "test/ssl_ctx_test",
             "test/ssl_test",
             "test/ssl_test_ctx_test",
             "test/sslapitest",
@@ -15094,7 +14461,6 @@ our %unified_info = (
                     "test/testutil/cb.o",
                     "test/testutil/driver.o",
                     "test/testutil/format_output.o",
-                    "test/testutil/init.o",
                     "test/testutil/main.o",
                     "test/testutil/output_helpers.o",
                     "test/testutil/random.o",
@@ -15102,6 +14468,7 @@ our %unified_info = (
                     "test/testutil/tap_bio.o",
                     "test/testutil/test_cleanup.o",
                     "test/testutil/tests.o",
+                    "test/testutil/testutil_init.o",
                 ],
             "test/md2test" =>
                 [
@@ -15329,6 +14696,14 @@ our %unified_info = (
                 [
                     "test/ssl_cert_table_internal_test.c",
                 ],
+            "test/ssl_ctx_test" =>
+                [
+                    "test/ssl_ctx_test.o",
+                ],
+            "test/ssl_ctx_test.o" =>
+                [
+                    "test/ssl_ctx_test.c",
+                ],
             "test/ssl_test" =>
                 [
                     "test/handshake_helper.o",
@@ -15431,10 +14806,6 @@ our %unified_info = (
                 [
                     "test/testutil/format_output.c",
                 ],
-            "test/testutil/init.o" =>
-                [
-                    "test/testutil/init.c",
-                ],
             "test/testutil/main.o" =>
                 [
                     "test/testutil/main.c",
@@ -15463,6 +14834,10 @@ our %unified_info = (
                 [
                     "test/testutil/tests.c",
                 ],
+            "test/testutil/testutil_init.o" =>
+                [
+                    "test/testutil/testutil_init.c",
+                ],
             "test/threadstest" =>
                 [
                     "test/threadstest.o",
diff --git a/deps/openssl/config/archs/linux64-mips64/no-asm/crypto/buildinf.h b/deps/openssl/config/archs/linux64-mips64/no-asm/crypto/buildinf.h
index 3c6ad34101..f58b88ffe3 100644
--- a/deps/openssl/config/archs/linux64-mips64/no-asm/crypto/buildinf.h
+++ b/deps/openssl/config/archs/linux64-mips64/no-asm/crypto/buildinf.h
@@ -11,7 +11,7 @@
  */
 
 #define PLATFORM "platform: linux64-mips64"
-#define DATE "built on: Fri Sep 13 16:02:04 2019 UTC"
+#define DATE "built on: Wed Mar 18 21:09:46 2020 UTC"
 
 /*
  * Generate compiler_flags as an array of individual characters. This is a
diff --git a/deps/openssl/config/archs/linux64-mips64/no-asm/crypto/include/internal/bn_conf.h b/deps/openssl/config/archs/linux64-mips64/no-asm/crypto/include/internal/bn_conf.h
index 34bd8b78b4..5312ef5a7a 100644
--- a/deps/openssl/config/archs/linux64-mips64/no-asm/crypto/include/internal/bn_conf.h
+++ b/deps/openssl/config/archs/linux64-mips64/no-asm/crypto/include/internal/bn_conf.h
@@ -1,5 +1,5 @@
 /* WARNING: do not edit! */
-/* Generated by Makefile from crypto/include/internal/bn_conf.h.in */
+/* Generated by Makefile from include/crypto/bn_conf.h.in */
 /*
  * Copyright 2016 The OpenSSL Project Authors. All Rights Reserved.
  *
@@ -9,8 +9,8 @@
  * https://www.openssl.org/source/license.html
  */
 
-#ifndef HEADER_BN_CONF_H
-# define HEADER_BN_CONF_H
+#ifndef OSSL_CRYPTO_BN_CONF_H
+# define OSSL_CRYPTO_BN_CONF_H
 
 /*
  * The contents of this file are not used in the UEFI build, as
diff --git a/deps/openssl/config/archs/linux64-mips64/no-asm/crypto/include/internal/dso_conf.h b/deps/openssl/config/archs/linux64-mips64/no-asm/crypto/include/internal/dso_conf.h
index 252266ec2a..4b1167c3d8 100644
--- a/deps/openssl/config/archs/linux64-mips64/no-asm/crypto/include/internal/dso_conf.h
+++ b/deps/openssl/config/archs/linux64-mips64/no-asm/crypto/include/internal/dso_conf.h
@@ -1,5 +1,5 @@
 /* WARNING: do not edit! */
-/* Generated by Makefile from crypto/include/internal/dso_conf.h.in */
+/* Generated by Makefile from include/crypto/dso_conf.h.in */
 /*
  * Copyright 2016-2019 The OpenSSL Project Authors. All Rights Reserved.
  *
@@ -9,8 +9,8 @@
  * https://www.openssl.org/source/license.html
  */
 
-#ifndef HEADER_DSO_CONF_H
-# define HEADER_DSO_CONF_H
+#ifndef OSSL_CRYPTO_DSO_CONF_H
+# define OSSL_CRYPTO_DSO_CONF_H
 # define DSO_DLFCN
 # define HAVE_DLFCN_H
 # define DSO_EXTENSION ".so"
diff --git a/deps/openssl/config/archs/linux64-mips64/no-asm/include/openssl/opensslconf.h b/deps/openssl/config/archs/linux64-mips64/no-asm/include/openssl/opensslconf.h
index 212e3f67d8..781ef739dc 100644
--- a/deps/openssl/config/archs/linux64-mips64/no-asm/include/openssl/opensslconf.h
+++ b/deps/openssl/config/archs/linux64-mips64/no-asm/include/openssl/opensslconf.h
@@ -99,9 +99,6 @@ extern "C" {
 #ifndef OPENSSL_NO_DYNAMIC_ENGINE
 # define OPENSSL_NO_DYNAMIC_ENGINE
 #endif
-#ifndef OPENSSL_NO_AFALGENG
-# define OPENSSL_NO_AFALGENG
-#endif
 
 
 /*
diff --git a/deps/openssl/config/archs/linux64-mips64/no-asm/include/progs.h b/deps/openssl/config/archs/linux64-mips64/no-asm/include/progs.h
index 9b3d270e20..308c65601b 100644
--- a/deps/openssl/config/archs/linux64-mips64/no-asm/include/progs.h
+++ b/deps/openssl/config/archs/linux64-mips64/no-asm/include/progs.h
@@ -2,7 +2,7 @@
  * WARNING: do not edit!
  * Generated by apps/progs.pl
  *
- * Copyright 1995-2019 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 1995-2020 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
diff --git a/deps/openssl/config/archs/linux64-s390x/asm/configdata.pm b/deps/openssl/config/archs/linux64-s390x/asm/configdata.pm
index e31688fe1a..b73e953e4d 100644
--- a/deps/openssl/config/archs/linux64-s390x/asm/configdata.pm
+++ b/deps/openssl/config/archs/linux64-s390x/asm/configdata.pm
@@ -55,7 +55,7 @@ our %config = (
   minor => "1.1",
   openssl_algorithm_defines => [ "OPENSSL_NO_COMP", "OPENSSL_NO_MD2", "OPENSSL_NO_RC5" ],
   openssl_api_defines => [  ],
-  openssl_other_defines => [ "OPENSSL_RAND_SEED_OS", "OPENSSL_NO_AFALGENG", "OPENSSL_NO_ASAN", "OPENSSL_NO_CRYPTO_MDEBUG", "OPENSSL_NO_CRYPTO_MDEBUG_BACKTRACE", "OPENSSL_NO_DEVCRYPTOENG", "OPENSSL_NO_EC_NISTP_64_GCC_128", "OPENSSL_NO_EGD", "OPENSSL_NO_EXTERNAL_TESTS", "OPENSSL_NO_FUZZ_AFL", "OPENSSL_NO_FUZZ_LIBFUZZER", "OPENSSL_NO_HEARTBEATS", "OPENSSL_NO_MSAN", "OPENSSL_NO_SCTP", "OPENSSL_NO_SSL3", "OPENSSL_NO_SSL3_METHOD", "OPENSSL_NO_UBSAN", "OPENSSL_NO_UNIT_TEST", "OPENSSL_NO_WEAK_SSL_CIPHERS", "OPENSSL_NO_DYNAMIC_ENGINE", "OPENSSL_NO_AFALGENG" ],
+  openssl_other_defines => [ "OPENSSL_RAND_SEED_OS", "OPENSSL_NO_AFALGENG", "OPENSSL_NO_ASAN", "OPENSSL_NO_CRYPTO_MDEBUG", "OPENSSL_NO_CRYPTO_MDEBUG_BACKTRACE", "OPENSSL_NO_DEVCRYPTOENG", "OPENSSL_NO_EC_NISTP_64_GCC_128", "OPENSSL_NO_EGD", "OPENSSL_NO_EXTERNAL_TESTS", "OPENSSL_NO_FUZZ_AFL", "OPENSSL_NO_FUZZ_LIBFUZZER", "OPENSSL_NO_HEARTBEATS", "OPENSSL_NO_MSAN", "OPENSSL_NO_SCTP", "OPENSSL_NO_SSL3", "OPENSSL_NO_SSL3_METHOD", "OPENSSL_NO_UBSAN", "OPENSSL_NO_UNIT_TEST", "OPENSSL_NO_WEAK_SSL_CIPHERS", "OPENSSL_NO_DYNAMIC_ENGINE" ],
   openssl_sys_defines => [  ],
   openssl_thread_defines => [ "OPENSSL_THREADS" ],
   openssldir => "",
@@ -111,8 +111,8 @@ our %config = (
   sourcedir => ".",
   target => "linux64-s390x",
   tdirs => [ "ossl_shim" ],
-  version => "1.1.1d",
-  version_num => "0x1010104fL",
+  version => "1.1.1e",
+  version_num => "0x1010105fL",
 );
 
 our %target = (
@@ -240,6 +240,7 @@ our @disablables = (
   "dgram",
   "dh",
   "dsa",
+  "dso",
   "dtls",
   "dynamic-engine",
   "ec",
@@ -357,8 +358,8 @@ our %unified_info = (
         {
             "" =>
                 [
-                    "crypto/include/internal/bn_conf.h",
-                    "crypto/include/internal/dso_conf.h",
+                    "include/crypto/bn_conf.h",
+                    "include/crypto/dso_conf.h",
                     "include/openssl/opensslconf.h",
                 ],
             "apps/asn1pars.o" =>
@@ -626,14 +627,6 @@ our %unified_info = (
                     "crypto/perlasm/cbc.pl",
                     "crypto/perlasm/x86asm.pl",
                 ],
-            "crypto/include/internal/bn_conf.h" =>
-                [
-                    "configdata.pm",
-                ],
-            "crypto/include/internal/dso_conf.h" =>
-                [
-                    "configdata.pm",
-                ],
             "crypto/rc4/rc4-586.s" =>
                 [
                     "crypto/perlasm/x86asm.pl",
@@ -709,6 +702,14 @@ our %unified_info = (
                 [
                     "libcrypto",
                 ],
+            "include/crypto/bn_conf.h" =>
+                [
+                    "configdata.pm",
+                ],
+            "include/crypto/dso_conf.h" =>
+                [
+                    "configdata.pm",
+                ],
             "include/openssl/opensslconf.h" =>
                 [
                     "configdata.pm",
@@ -1506,6 +1507,12 @@ our %unified_info = (
                     "libcrypto",
                     "test/libtestutil.a",
                 ],
+            "test/ssl_ctx_test" =>
+                [
+                    "libcrypto",
+                    "libssl",
+                    "test/libtestutil.a",
+                ],
             "test/ssl_test" =>
                 [
                     "libcrypto",
@@ -3243,7 +3250,6 @@ our %unified_info = (
                             "test/testutil/cb.o",
                             "test/testutil/driver.o",
                             "test/testutil/format_output.o",
-                            "test/testutil/init.o",
                             "test/testutil/main.o",
                             "test/testutil/output_helpers.o",
                             "test/testutil/random.o",
@@ -3251,6 +3257,7 @@ our %unified_info = (
                             "test/testutil/tap_bio.o",
                             "test/testutil/test_cleanup.o",
                             "test/testutil/tests.o",
+                            "test/testutil/testutil_init.o",
                         ],
                     "products" =>
                         {
@@ -3749,14 +3756,6 @@ our %unified_info = (
                 [
                     "crypto/ia64cpuid.S",
                 ],
-            "crypto/include/internal/bn_conf.h" =>
-                [
-                    "crypto/include/internal/bn_conf.h.in",
-                ],
-            "crypto/include/internal/dso_conf.h" =>
-                [
-                    "crypto/include/internal/dso_conf.h.in",
-                ],
             "crypto/md5/md5-586.s" =>
                 [
                     "crypto/md5/asm/md5-586.pl",
@@ -4197,6 +4196,14 @@ our %unified_info = (
                     "engines/asm/e_padlock-x86_64.pl",
                     "\$(PERLASM_SCHEME)",
                 ],
+            "include/crypto/bn_conf.h" =>
+                [
+                    "include/crypto/bn_conf.h.in",
+                ],
+            "include/crypto/dso_conf.h" =>
+                [
+                    "include/crypto/dso_conf.h.in",
+                ],
             "include/openssl/opensslconf.h" =>
                 [
                     "include/openssl/opensslconf.h.in",
@@ -4883,7 +4890,6 @@ our %unified_info = (
             "crypto/aes/aes-s390x.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto",
                 ],
@@ -4894,37 +4900,31 @@ our %unified_info = (
             "crypto/aes/aes_cfb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/aes/aes_ecb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/aes/aes_ige.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/aes/aes_misc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/aes/aes_ofb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/aes/aes_wrap.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/aes/aesfx-sparcv9.o" =>
@@ -4946,7 +4946,6 @@ our %unified_info = (
             "crypto/aria/aria.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/arm64cpuid.o" =>
@@ -4960,613 +4959,511 @@ our %unified_info = (
             "crypto/asn1/a_bitstr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_d2i_fp.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_digest.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_dup.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_gentm.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_i2d_fp.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_int.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_mbstr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_object.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_octet.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_print.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_sign.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_strex.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_strnid.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_time.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_type.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_utctm.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_utf8.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_verify.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/ameth_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/asn1_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/asn1_gen.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/asn1_item_list.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/asn1_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/asn1_par.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/asn_mime.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/asn_moid.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/asn_mstbl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/asn_pack.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/bio_asn1.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/bio_ndef.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/d2i_pr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/d2i_pu.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/evp_asn1.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/f_int.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/f_string.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/i2d_pr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/i2d_pu.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/n_pkey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/nsseq.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/p5_pbe.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/p5_pbev2.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/p5_scrypt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/p8_pkey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/t_bitst.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/t_pkey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/t_spki.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/tasn_dec.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/tasn_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/tasn_fre.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/tasn_new.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/tasn_prn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/tasn_scn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/tasn_typ.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/tasn_utl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/x_algor.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/x_bignum.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/x_info.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/x_int64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/x_long.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/x_pkey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/x_sig.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/x_spki.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/x_val.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/async/arch/async_null.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/async/arch/async_posix.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/async/arch/async_win.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/async/async.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/async/async_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/async/async_wait.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bf/bf_cfb64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bf/bf_ecb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bf/bf_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bf/bf_ofb64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bf/bf_skey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/b_addr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/b_dump.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/b_print.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/b_sock.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/b_sock2.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bf_buff.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bf_lbuf.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bf_nbio.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bf_null.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bio_cb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bio_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bio_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bio_meth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bss_acpt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bss_bio.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bss_conn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bss_dgram.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bss_fd.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bss_file.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bss_log.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bss_mem.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bss_null.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bss_sock.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/blake2/blake2b.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/blake2/blake2s.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/blake2/m_blake2b.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/blake2/m_blake2s.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/armv4-gf2m.o" =>
@@ -5580,7 +5477,6 @@ our %unified_info = (
             "crypto/bn/asm/s390x.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn-mips.o" =>
@@ -5590,182 +5486,152 @@ our %unified_info = (
             "crypto/bn/bn_add.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_blind.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_const.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_ctx.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_depr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_dh.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_div.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_exp.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto",
                 ],
             "crypto/bn/bn_exp2.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_gcd.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_gf2m.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_intern.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_kron.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_mod.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_mont.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_mpi.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_mul.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_nist.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_prime.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_print.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_rand.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_recp.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_shift.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_sqr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_sqrt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_srp.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_word.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_x931p.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/mips-mont.o" =>
@@ -5775,13 +5641,11 @@ our %unified_info = (
             "crypto/bn/s390x-gf2m.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/s390x-mont.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/sparct4-mont.o" =>
@@ -5807,13 +5671,11 @@ our %unified_info = (
             "crypto/buffer/buf_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/buffer/buffer.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/buildinf.h" =>
@@ -5823,43 +5685,36 @@ our %unified_info = (
             "crypto/camellia/camellia.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/camellia/cmll_cbc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/camellia/cmll_cfb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/camellia/cmll_ctr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/camellia/cmll_ecb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/camellia/cmll_misc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/camellia/cmll_ofb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/camellia/cmllt4-sparcv9.o" =>
@@ -5869,31 +5724,26 @@ our %unified_info = (
             "crypto/cast/c_cfb64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cast/c_ecb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cast/c_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cast/c_ofb64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cast/c_skey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/chacha/chacha-armv4.o" =>
@@ -5907,279 +5757,233 @@ our %unified_info = (
             "crypto/chacha/chacha-s390x.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto",
                 ],
             "crypto/cmac/cm_ameth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cmac/cm_pmeth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cmac/cmac.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_asn1.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_att.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_cd.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_dd.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_env.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_ess.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_io.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_kari.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_pwri.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_sd.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_smime.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/conf/conf_api.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/conf/conf_def.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/conf/conf_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/conf/conf_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/conf/conf_mall.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/conf/conf_mod.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/conf/conf_sap.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/conf/conf_ssl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cpt_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cryptlib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ct/ct_b64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ct/ct_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ct/ct_log.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ct/ct_oct.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ct/ct_policy.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ct/ct_prn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ct/ct_sct.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ct/ct_sct_ctx.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ct/ct_vfy.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ct/ct_x509v3.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ctype.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cversion.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto",
                 ],
             "crypto/des/cbc_cksm.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/cbc_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/cfb64ede.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/cfb64enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/cfb_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/des_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/dest4-sparcv9.o" =>
@@ -6189,301 +5993,251 @@ our %unified_info = (
             "crypto/des/ecb3_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/ecb_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/fcrypt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/fcrypt_b.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/ofb64ede.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/ofb64enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/ofb_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/pcbc_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/qud_cksm.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/rand_key.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/set_key.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/str2key.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/xcbc_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_ameth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_asn1.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_check.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_depr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_gen.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_kdf.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_key.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_meth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_pmeth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_prn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_rfc5114.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_rfc7919.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dsa/dsa_ameth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dsa/dsa_asn1.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dsa/dsa_depr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dsa/dsa_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dsa/dsa_gen.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dsa/dsa_key.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dsa/dsa_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dsa/dsa_meth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dsa/dsa_ossl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dsa/dsa_pmeth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dsa/dsa_prn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dsa/dsa_sign.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dsa/dsa_vrf.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dso/dso_dl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dso/dso_dlfcn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dso/dso_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dso/dso_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dso/dso_openssl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dso/dso_vms.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dso/dso_win32.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ebcdic.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/curve25519.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/curve448/arch_32/f_impl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto/ec/curve448/arch_32",
                     "crypto/ec/curve448",
@@ -6491,7 +6245,6 @@ our %unified_info = (
             "crypto/ec/curve448/curve448.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto/ec/curve448/arch_32",
                     "crypto/ec/curve448",
@@ -6499,7 +6252,6 @@ our %unified_info = (
             "crypto/ec/curve448/curve448_tables.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto/ec/curve448/arch_32",
                     "crypto/ec/curve448",
@@ -6507,7 +6259,6 @@ our %unified_info = (
             "crypto/ec/curve448/eddsa.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto/ec/curve448/arch_32",
                     "crypto/ec/curve448",
@@ -6515,7 +6266,6 @@ our %unified_info = (
             "crypto/ec/curve448/f_generic.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto/ec/curve448/arch_32",
                     "crypto/ec/curve448",
@@ -6523,7 +6273,6 @@ our %unified_info = (
             "crypto/ec/curve448/scalar.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto/ec/curve448/arch_32",
                     "crypto/ec/curve448",
@@ -6531,163 +6280,136 @@ our %unified_info = (
             "crypto/ec/ec2_oct.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec2_smpl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec_ameth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec_asn1.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec_check.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec_curve.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec_cvt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec_key.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec_kmeth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec_mult.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec_oct.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec_pmeth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec_print.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecdh_kdf.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecdh_ossl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecdsa_ossl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecdsa_sign.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecdsa_vrf.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/eck_prn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecp_mont.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecp_nist.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecp_nistp224.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecp_nistp256.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecp_nistp521.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecp_nistputil.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecp_nistz256-armv4.o" =>
@@ -6705,223 +6427,186 @@ our %unified_info = (
             "crypto/ec/ecp_oct.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecp_smpl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecx_meth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/eng_all.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/eng_cnf.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/eng_ctrl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/eng_dyn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/eng_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/eng_fat.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/eng_init.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/eng_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/eng_list.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/eng_openssl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/eng_pkey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/eng_rdrand.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/eng_table.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/tb_asnmth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/tb_cipher.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/tb_dh.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/tb_digest.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/tb_dsa.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/tb_eckey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/tb_pkmeth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/tb_rand.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/tb_rsa.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/err/err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/err/err_all.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/err/err_prn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/bio_b64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/bio_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/bio_md.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/bio_ok.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/c_allc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/c_alld.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/cmeth_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/digest.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/e_aes.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto",
                     "crypto/modes",
@@ -6929,21 +6614,18 @@ our %unified_info = (
             "crypto/evp/e_aes_cbc_hmac_sha1.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto/modes",
                 ],
             "crypto/evp/e_aes_cbc_hmac_sha256.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto/modes",
                 ],
             "crypto/evp/e_aria.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto",
                     "crypto/modes",
@@ -6951,13 +6633,11 @@ our %unified_info = (
             "crypto/evp/e_bf.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/e_camellia.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto",
                     "crypto/modes",
@@ -6965,81 +6645,68 @@ our %unified_info = (
             "crypto/evp/e_cast.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/e_chacha20_poly1305.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/e_des.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto",
                 ],
             "crypto/evp/e_des3.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto",
                 ],
             "crypto/evp/e_idea.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/e_null.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/e_old.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/e_rc2.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/e_rc4.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/e_rc4_hmac_md5.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/e_rc5.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/e_seed.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/e_sm4.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto",
                     "crypto/modes",
@@ -7047,328 +6714,267 @@ our %unified_info = (
             "crypto/evp/e_xcbc_d.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/encode.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/evp_cnf.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/evp_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/evp_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/evp_key.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/evp_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/evp_pbe.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/evp_pkey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/m_md2.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/m_md4.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/m_md5.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/m_md5_sha1.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/m_mdc2.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/m_null.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/m_ripemd.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/m_sha1.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/m_sha3.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto",
                 ],
             "crypto/evp/m_sigver.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/m_wp.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/names.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/p5_crpt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/p5_crpt2.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/p_dec.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/p_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/p_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/p_open.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/p_seal.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/p_sign.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/p_verify.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/pbe_scrypt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/pmeth_fn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/pmeth_gn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/pmeth_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ex_data.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/getenv.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/hmac/hm_ameth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/hmac/hm_pmeth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/hmac/hmac.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/idea/i_cbc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/idea/i_cfb64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/idea/i_ecb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/idea/i_ofb64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/idea/i_skey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
-            "crypto/include/internal/bn_conf.h" =>
-                [
-                    ".",
-                ],
-            "crypto/include/internal/dso_conf.h" =>
-                [
-                    ".",
-                ],
             "crypto/init.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/kdf/hkdf.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/kdf/kdf_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/kdf/scrypt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/kdf/tls1_prf.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/lhash/lh_stats.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/lhash/lhash.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/md4/md4_dgst.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/md4/md4_one.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/md5/md5-sparcv9.o" =>
@@ -7378,79 +6984,66 @@ our %unified_info = (
             "crypto/md5/md5_dgst.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/md5/md5_one.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/mdc2/mdc2_one.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/mdc2/mdc2dgst.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/mem.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/mem_dbg.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/mem_sec.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/modes/cbc128.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/modes/ccm128.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/modes/cfb128.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/modes/ctr128.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/modes/cts128.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/modes/gcm128.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto",
                 ],
@@ -7461,7 +7054,6 @@ our %unified_info = (
             "crypto/modes/ghash-s390x.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto",
                 ],
@@ -7476,361 +7068,301 @@ our %unified_info = (
             "crypto/modes/ocb128.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/modes/ofb128.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/modes/wrap128.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/modes/xts128.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/o_dir.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/o_fips.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/o_fopen.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/o_init.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/o_str.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/o_time.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/objects/o_names.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/objects/obj_dat.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/objects/obj_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/objects/obj_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/objects/obj_xref.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ocsp/ocsp_asn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ocsp/ocsp_cl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ocsp/ocsp_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ocsp/ocsp_ext.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ocsp/ocsp_ht.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ocsp/ocsp_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ocsp/ocsp_prn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ocsp/ocsp_srv.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ocsp/ocsp_vfy.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ocsp/v3_ocsp.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pem/pem_all.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pem/pem_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pem/pem_info.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pem/pem_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pem/pem_oth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pem/pem_pk8.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pem/pem_pkey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pem/pem_sign.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pem/pem_x509.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pem/pem_xaux.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pem/pvkfmt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_add.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_asn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_attr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_crpt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_crt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_decr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_init.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_key.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_kiss.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_mutl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_npas.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_p8d.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_p8e.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_sbag.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_utl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/pk12err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs7/bio_pk7.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs7/pk7_asn1.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs7/pk7_attr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs7/pk7_doit.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs7/pk7_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs7/pk7_mime.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs7/pk7_smime.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs7/pkcs7err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/poly1305/poly1305-armv4.o" =>
@@ -7848,7 +7380,6 @@ our %unified_info = (
             "crypto/poly1305/poly1305-s390x.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/poly1305/poly1305-sparcv9.o" =>
@@ -7858,296 +7389,247 @@ our %unified_info = (
             "crypto/poly1305/poly1305.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/poly1305/poly1305_ameth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/poly1305/poly1305_pmeth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rand/drbg_ctr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rand/drbg_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rand/rand_egd.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rand/rand_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rand/rand_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rand/rand_unix.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rand/rand_vms.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rand/rand_win.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rand/randfile.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rc2/rc2_cbc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rc2/rc2_ecb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rc2/rc2_skey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rc2/rc2cfb64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rc2/rc2ofb64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rc4/rc4-s390x.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ripemd/rmd_dgst.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ripemd/rmd_one.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_ameth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_asn1.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_chk.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_crpt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_depr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_gen.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_meth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_mp.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_none.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_oaep.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_ossl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_pk1.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_pmeth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_prn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_pss.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_saos.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_sign.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_ssl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_x931.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_x931g.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/s390xcap.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/s390xcpuid.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto",
                 ],
             "crypto/seed/seed.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/seed/seed_cbc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/seed/seed_cfb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/seed/seed_ecb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/seed/seed_ofb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sha/keccak1600-armv4.o" =>
@@ -8157,7 +7639,6 @@ our %unified_info = (
             "crypto/sha/keccak1600-s390x.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sha/sha1-armv4-large.o" =>
@@ -8175,7 +7656,6 @@ our %unified_info = (
             "crypto/sha/sha1-s390x.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto",
                 ],
@@ -8186,13 +7666,11 @@ our %unified_info = (
             "crypto/sha/sha1_one.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sha/sha1dgst.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sha/sha256-armv4.o" =>
@@ -8210,7 +7688,6 @@ our %unified_info = (
             "crypto/sha/sha256-s390x.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto",
                 ],
@@ -8221,7 +7698,6 @@ our %unified_info = (
             "crypto/sha/sha256.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sha/sha512-armv4.o" =>
@@ -8239,7 +7715,6 @@ our %unified_info = (
             "crypto/sha/sha512-s390x.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto",
                 ],
@@ -8250,709 +7725,591 @@ our %unified_info = (
             "crypto/sha/sha512.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/siphash/siphash.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/siphash/siphash_ameth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/siphash/siphash_pmeth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sm2/sm2_crypt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sm2/sm2_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sm2/sm2_pmeth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sm2/sm2_sign.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sm3/m_sm3.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sm3/sm3.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sm4/sm4.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/srp/srp_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/srp/srp_vfy.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/stack/stack.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/store/loader_file.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/store/store_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/store/store_init.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/store/store_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/store/store_register.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/store/store_strings.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/threads_none.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/threads_pthread.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/threads_win.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ts/ts_asn1.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ts/ts_conf.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ts/ts_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ts/ts_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ts/ts_req_print.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ts/ts_req_utils.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ts/ts_rsp_print.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ts/ts_rsp_sign.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ts/ts_rsp_utils.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ts/ts_rsp_verify.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ts/ts_verify_ctx.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/txt_db/txt_db.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ui/ui_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ui/ui_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ui/ui_null.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ui/ui_openssl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ui/ui_util.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/uid.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/whrlpool/wp_block.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/whrlpool/wp_dgst.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/by_dir.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/by_file.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/t_crl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/t_req.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/t_x509.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_att.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_cmp.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_d2.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_def.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_ext.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_lu.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_meth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_obj.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_r2x.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_req.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_set.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_trs.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_txt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_v3.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_vfy.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_vpm.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509cset.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509name.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509rset.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509spki.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509type.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x_all.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x_attrib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x_crl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x_exten.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x_name.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x_pubkey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x_req.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x_x509.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x_x509a.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/pcy_cache.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/pcy_data.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/pcy_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/pcy_map.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/pcy_node.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/pcy_tree.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_addr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_admis.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_akey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_akeya.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_alt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_asid.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_bcons.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_bitst.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_conf.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_cpols.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_crld.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_enum.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_extku.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_genn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_ia5.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_info.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_int.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_ncons.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_pci.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_pcia.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_pcons.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_pku.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_pmaps.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_prn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_purp.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_skey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_sxnet.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_tlsf.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_utl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "engines/e_capi.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "engines/e_padlock.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "fuzz/asn1.o" =>
@@ -9003,6 +8360,14 @@ our %unified_info = (
                 [
                     "include",
                 ],
+            "include/crypto/bn_conf.h" =>
+                [
+                    ".",
+                ],
+            "include/crypto/dso_conf.h" =>
+                [
+                    ".",
+                ],
             "include/openssl/opensslconf.h" =>
                 [
                     ".",
@@ -9247,7 +8612,6 @@ our %unified_info = (
                 [
                     ".",
                     "include",
-                    "crypto/include",
                 ],
             "test/asn1_string_table_test.o" =>
                 [
@@ -9573,7 +8937,6 @@ our %unified_info = (
                 [
                     ".",
                     "include",
-                    "crypto/include",
                 ],
             "test/cipher_overhead_test.o" =>
                 [
@@ -9619,7 +8982,6 @@ our %unified_info = (
             "test/ctype_internal_test.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "test/curve448_internal_test.o" =>
@@ -9685,7 +9047,6 @@ our %unified_info = (
                 [
                     "include",
                     "crypto/ec",
-                    "crypto/include",
                 ],
             "test/ecdsatest.o" =>
                 [
@@ -9710,7 +9071,6 @@ our %unified_info = (
             "test/evp_extra_test.o" =>
                 [
                     "include",
-                    "crypto/include",
                 ],
             "test/evp_test.o" =>
                 [
@@ -9808,7 +9168,6 @@ our %unified_info = (
                 [
                     ".",
                     "include",
-                    "crypto/include",
                 ],
             "test/rc2test.o" =>
                 [
@@ -9858,18 +9217,15 @@ our %unified_info = (
                 [
                     ".",
                     "include",
-                    "crypto/include",
                 ],
             "test/sm2_internal_test.o" =>
                 [
                     "include",
-                    "crypto/include",
                 ],
             "test/sm4_internal_test.o" =>
                 [
                     ".",
                     "include",
-                    "crypto/include",
                 ],
             "test/srptest.o" =>
                 [
@@ -9880,6 +9236,10 @@ our %unified_info = (
                     ".",
                     "include",
                 ],
+            "test/ssl_ctx_test.o" =>
+                [
+                    "include",
+                ],
             "test/ssl_test.o" =>
                 [
                     "include",
@@ -9943,10 +9303,6 @@ our %unified_info = (
                 [
                     "include",
                 ],
-            "test/testutil/init.o" =>
-                [
-                    "include",
-                ],
             "test/testutil/main.o" =>
                 [
                     "include",
@@ -9975,6 +9331,10 @@ our %unified_info = (
                 [
                     "include",
                 ],
+            "test/testutil/testutil_init.o" =>
+                [
+                    "include",
+                ],
             "test/threadstest.o" =>
                 [
                     "include",
@@ -10239,6 +9599,7 @@ our %unified_info = (
             "test/sm4_internal_test",
             "test/srptest",
             "test/ssl_cert_table_internal_test",
+            "test/ssl_ctx_test",
             "test/ssl_test",
             "test/ssl_test_ctx_test",
             "test/sslapitest",
@@ -15159,7 +14520,6 @@ our %unified_info = (
                     "test/testutil/cb.o",
                     "test/testutil/driver.o",
                     "test/testutil/format_output.o",
-                    "test/testutil/init.o",
                     "test/testutil/main.o",
                     "test/testutil/output_helpers.o",
                     "test/testutil/random.o",
@@ -15167,6 +14527,7 @@ our %unified_info = (
                     "test/testutil/tap_bio.o",
                     "test/testutil/test_cleanup.o",
                     "test/testutil/tests.o",
+                    "test/testutil/testutil_init.o",
                 ],
             "test/md2test" =>
                 [
@@ -15394,6 +14755,14 @@ our %unified_info = (
                 [
                     "test/ssl_cert_table_internal_test.c",
                 ],
+            "test/ssl_ctx_test" =>
+                [
+                    "test/ssl_ctx_test.o",
+                ],
+            "test/ssl_ctx_test.o" =>
+                [
+                    "test/ssl_ctx_test.c",
+                ],
             "test/ssl_test" =>
                 [
                     "test/handshake_helper.o",
@@ -15496,10 +14865,6 @@ our %unified_info = (
                 [
                     "test/testutil/format_output.c",
                 ],
-            "test/testutil/init.o" =>
-                [
-                    "test/testutil/init.c",
-                ],
             "test/testutil/main.o" =>
                 [
                     "test/testutil/main.c",
@@ -15528,6 +14893,10 @@ our %unified_info = (
                 [
                     "test/testutil/tests.c",
                 ],
+            "test/testutil/testutil_init.o" =>
+                [
+                    "test/testutil/testutil_init.c",
+                ],
             "test/threadstest" =>
                 [
                     "test/threadstest.o",
diff --git a/deps/openssl/config/archs/linux64-s390x/asm/crypto/aes/aes-s390x.S b/deps/openssl/config/archs/linux64-s390x/asm/crypto/aes/aes-s390x.S
index e00f81ecd4..c432d017be 100644
--- a/deps/openssl/config/archs/linux64-s390x/asm/crypto/aes/aes-s390x.S
+++ b/deps/openssl/config/archs/linux64-s390x/asm/crypto/aes/aes-s390x.S
@@ -2093,7 +2093,7 @@ AES_xts_encrypt:
 
 .Lxts_enc_done:
 	stg	%r15,144+0(%r15)	# wipe tweak
-	stg	%r15,+8(%r15)
+	stg	%r15,144+8(%r15)
 	lmg	%r6,%r14,6*8(%r15)
 	br	%r14
 .size	AES_xts_encrypt,.-AES_xts_encrypt
@@ -2358,7 +2358,7 @@ AES_xts_decrypt:
 	stg	%r15,144-16+8(%r15)
 .Lxts_dec_done:
 	stg	%r15,144+0(%r15)	# wipe tweak
-	stg	%r15,+8(%r15)
+	stg	%r15,144+8(%r15)
 	lmg	%r6,%r14,6*8(%r15)
 	br	%r14
 .size	AES_xts_decrypt,.-AES_xts_decrypt
diff --git a/deps/openssl/config/archs/linux64-s390x/asm/crypto/bn/s390x-mont.S b/deps/openssl/config/archs/linux64-s390x/asm/crypto/bn/s390x-mont.S
index b8dea0a66f..b6119c009b 100644
--- a/deps/openssl/config/archs/linux64-s390x/asm/crypto/bn/s390x-mont.S
+++ b/deps/openssl/config/archs/linux64-s390x/asm/crypto/bn/s390x-mont.S
@@ -45,7 +45,7 @@ bn_mul_mont:
 	lghi	%r13,0
 	alcgr	%r13,%r10
 
-	la	%r7,8(%r0)	# j=1
+	la	%r7,8		# j=1
 	lr	%r14,%r1
 
 .align	16
@@ -97,7 +97,7 @@ bn_mul_mont:
 	lghi	%r13,0
 	alcgr	%r13,%r10
 
-	la	%r7,8(%r0)	# j=1
+	la	%r7,8		# j=1
 	lr	%r14,%r1
 
 .align	16
@@ -141,7 +141,7 @@ bn_mul_mont:
 	la	%r3,160(%r15)
 	ahi	%r1,1		# restore %r1, incidentally clears "borrow"
 
-	la	%r7,0(%r0)
+	la	%r7,0
 	lr	%r14,%r1
 .Lsub:	lg	%r9,0(%r7,%r3)
 	lg	%r11,0(%r7,%r5)
@@ -155,7 +155,7 @@ bn_mul_mont:
 	lghi	%r13,-1
 	xgr	%r13,%r12
 
-	la	%r7,0(%r0)
+	la	%r7,0
 	lgr	%r14,%r1
 .Lcopy:	lg	%r8,160(%r7,%r15)	# conditional copy
 	lg	%r9,0(%r7,%r2)
diff --git a/deps/openssl/config/archs/linux64-s390x/asm/crypto/buildinf.h b/deps/openssl/config/archs/linux64-s390x/asm/crypto/buildinf.h
index 6d2d3ce3fd..48a866e7b2 100644
--- a/deps/openssl/config/archs/linux64-s390x/asm/crypto/buildinf.h
+++ b/deps/openssl/config/archs/linux64-s390x/asm/crypto/buildinf.h
@@ -11,7 +11,7 @@
  */
 
 #define PLATFORM "platform: linux64-s390x"
-#define DATE "built on: Fri Sep 13 16:01:44 2019 UTC"
+#define DATE "built on: Wed Mar 18 21:09:15 2020 UTC"
 
 /*
  * Generate compiler_flags as an array of individual characters. This is a
diff --git a/deps/openssl/config/archs/linux64-s390x/asm/crypto/include/internal/bn_conf.h b/deps/openssl/config/archs/linux64-s390x/asm/crypto/include/internal/bn_conf.h
index 34bd8b78b4..5312ef5a7a 100644
--- a/deps/openssl/config/archs/linux64-s390x/asm/crypto/include/internal/bn_conf.h
+++ b/deps/openssl/config/archs/linux64-s390x/asm/crypto/include/internal/bn_conf.h
@@ -1,5 +1,5 @@
 /* WARNING: do not edit! */
-/* Generated by Makefile from crypto/include/internal/bn_conf.h.in */
+/* Generated by Makefile from include/crypto/bn_conf.h.in */
 /*
  * Copyright 2016 The OpenSSL Project Authors. All Rights Reserved.
  *
@@ -9,8 +9,8 @@
  * https://www.openssl.org/source/license.html
  */
 
-#ifndef HEADER_BN_CONF_H
-# define HEADER_BN_CONF_H
+#ifndef OSSL_CRYPTO_BN_CONF_H
+# define OSSL_CRYPTO_BN_CONF_H
 
 /*
  * The contents of this file are not used in the UEFI build, as
diff --git a/deps/openssl/config/archs/linux64-s390x/asm/crypto/include/internal/dso_conf.h b/deps/openssl/config/archs/linux64-s390x/asm/crypto/include/internal/dso_conf.h
index 252266ec2a..4b1167c3d8 100644
--- a/deps/openssl/config/archs/linux64-s390x/asm/crypto/include/internal/dso_conf.h
+++ b/deps/openssl/config/archs/linux64-s390x/asm/crypto/include/internal/dso_conf.h
@@ -1,5 +1,5 @@
 /* WARNING: do not edit! */
-/* Generated by Makefile from crypto/include/internal/dso_conf.h.in */
+/* Generated by Makefile from include/crypto/dso_conf.h.in */
 /*
  * Copyright 2016-2019 The OpenSSL Project Authors. All Rights Reserved.
  *
@@ -9,8 +9,8 @@
  * https://www.openssl.org/source/license.html
  */
 
-#ifndef HEADER_DSO_CONF_H
-# define HEADER_DSO_CONF_H
+#ifndef OSSL_CRYPTO_DSO_CONF_H
+# define OSSL_CRYPTO_DSO_CONF_H
 # define DSO_DLFCN
 # define HAVE_DLFCN_H
 # define DSO_EXTENSION ".so"
diff --git a/deps/openssl/config/archs/linux64-s390x/asm/crypto/rc4/rc4-s390x.s b/deps/openssl/config/archs/linux64-s390x/asm/crypto/rc4/rc4-s390x.s
index e5883fea42..d88918c013 100644
--- a/deps/openssl/config/archs/linux64-s390x/asm/crypto/rc4/rc4-s390x.s
+++ b/deps/openssl/config/archs/linux64-s390x/asm/crypto/rc4/rc4-s390x.s
@@ -192,7 +192,7 @@ RC4:
 RC4_set_key:
 	stmg	%r6,%r8,6*8(%r15)
 	lhi	%r0,256
-	la	%r1,0(%r0)
+	la	%r1,0
 	sth	%r1,0(%r2)
 .align	4
 .L1stloop:
@@ -202,8 +202,8 @@ RC4_set_key:
 
 	lghi	%r7,-256
 	lr	%r0,%r3
-	la	%r8,0(%r0)
-	la	%r1,0(%r0)
+	la	%r8,0
+	la	%r1,0
 .align	16
 .L2ndloop:
 	llgc	%r5,2+256(%r7,%r2)
@@ -220,7 +220,7 @@ RC4_set_key:
 	jz	.Ldone
 	brct	%r0,.L2ndloop
 	lr	%r0,%r3
-	la	%r8,0(%r0)
+	la	%r8,0
 	j	.L2ndloop
 .Ldone:
 	lmg	%r6,%r8,6*8(%r15)
diff --git a/deps/openssl/config/archs/linux64-s390x/asm/include/openssl/opensslconf.h b/deps/openssl/config/archs/linux64-s390x/asm/include/openssl/opensslconf.h
index 30820b6051..937531fe9f 100644
--- a/deps/openssl/config/archs/linux64-s390x/asm/include/openssl/opensslconf.h
+++ b/deps/openssl/config/archs/linux64-s390x/asm/include/openssl/opensslconf.h
@@ -96,9 +96,6 @@ extern "C" {
 #ifndef OPENSSL_NO_DYNAMIC_ENGINE
 # define OPENSSL_NO_DYNAMIC_ENGINE
 #endif
-#ifndef OPENSSL_NO_AFALGENG
-# define OPENSSL_NO_AFALGENG
-#endif
 
 
 /*
diff --git a/deps/openssl/config/archs/linux64-s390x/asm/include/progs.h b/deps/openssl/config/archs/linux64-s390x/asm/include/progs.h
index 9b3d270e20..308c65601b 100644
--- a/deps/openssl/config/archs/linux64-s390x/asm/include/progs.h
+++ b/deps/openssl/config/archs/linux64-s390x/asm/include/progs.h
@@ -2,7 +2,7 @@
  * WARNING: do not edit!
  * Generated by apps/progs.pl
  *
- * Copyright 1995-2019 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 1995-2020 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
diff --git a/deps/openssl/config/archs/linux64-s390x/asm_avx2/configdata.pm b/deps/openssl/config/archs/linux64-s390x/asm_avx2/configdata.pm
index 8aa79776f9..4419066fca 100644
--- a/deps/openssl/config/archs/linux64-s390x/asm_avx2/configdata.pm
+++ b/deps/openssl/config/archs/linux64-s390x/asm_avx2/configdata.pm
@@ -55,7 +55,7 @@ our %config = (
   minor => "1.1",
   openssl_algorithm_defines => [ "OPENSSL_NO_COMP", "OPENSSL_NO_MD2", "OPENSSL_NO_RC5" ],
   openssl_api_defines => [  ],
-  openssl_other_defines => [ "OPENSSL_RAND_SEED_OS", "OPENSSL_NO_AFALGENG", "OPENSSL_NO_ASAN", "OPENSSL_NO_CRYPTO_MDEBUG", "OPENSSL_NO_CRYPTO_MDEBUG_BACKTRACE", "OPENSSL_NO_DEVCRYPTOENG", "OPENSSL_NO_EC_NISTP_64_GCC_128", "OPENSSL_NO_EGD", "OPENSSL_NO_EXTERNAL_TESTS", "OPENSSL_NO_FUZZ_AFL", "OPENSSL_NO_FUZZ_LIBFUZZER", "OPENSSL_NO_HEARTBEATS", "OPENSSL_NO_MSAN", "OPENSSL_NO_SCTP", "OPENSSL_NO_SSL3", "OPENSSL_NO_SSL3_METHOD", "OPENSSL_NO_UBSAN", "OPENSSL_NO_UNIT_TEST", "OPENSSL_NO_WEAK_SSL_CIPHERS", "OPENSSL_NO_DYNAMIC_ENGINE", "OPENSSL_NO_AFALGENG" ],
+  openssl_other_defines => [ "OPENSSL_RAND_SEED_OS", "OPENSSL_NO_AFALGENG", "OPENSSL_NO_ASAN", "OPENSSL_NO_CRYPTO_MDEBUG", "OPENSSL_NO_CRYPTO_MDEBUG_BACKTRACE", "OPENSSL_NO_DEVCRYPTOENG", "OPENSSL_NO_EC_NISTP_64_GCC_128", "OPENSSL_NO_EGD", "OPENSSL_NO_EXTERNAL_TESTS", "OPENSSL_NO_FUZZ_AFL", "OPENSSL_NO_FUZZ_LIBFUZZER", "OPENSSL_NO_HEARTBEATS", "OPENSSL_NO_MSAN", "OPENSSL_NO_SCTP", "OPENSSL_NO_SSL3", "OPENSSL_NO_SSL3_METHOD", "OPENSSL_NO_UBSAN", "OPENSSL_NO_UNIT_TEST", "OPENSSL_NO_WEAK_SSL_CIPHERS", "OPENSSL_NO_DYNAMIC_ENGINE" ],
   openssl_sys_defines => [  ],
   openssl_thread_defines => [ "OPENSSL_THREADS" ],
   openssldir => "",
@@ -111,8 +111,8 @@ our %config = (
   sourcedir => ".",
   target => "linux64-s390x",
   tdirs => [ "ossl_shim" ],
-  version => "1.1.1d",
-  version_num => "0x1010104fL",
+  version => "1.1.1e",
+  version_num => "0x1010105fL",
 );
 
 our %target = (
@@ -240,6 +240,7 @@ our @disablables = (
   "dgram",
   "dh",
   "dsa",
+  "dso",
   "dtls",
   "dynamic-engine",
   "ec",
@@ -357,8 +358,8 @@ our %unified_info = (
         {
             "" =>
                 [
-                    "crypto/include/internal/bn_conf.h",
-                    "crypto/include/internal/dso_conf.h",
+                    "include/crypto/bn_conf.h",
+                    "include/crypto/dso_conf.h",
                     "include/openssl/opensslconf.h",
                 ],
             "apps/asn1pars.o" =>
@@ -626,14 +627,6 @@ our %unified_info = (
                     "crypto/perlasm/cbc.pl",
                     "crypto/perlasm/x86asm.pl",
                 ],
-            "crypto/include/internal/bn_conf.h" =>
-                [
-                    "configdata.pm",
-                ],
-            "crypto/include/internal/dso_conf.h" =>
-                [
-                    "configdata.pm",
-                ],
             "crypto/rc4/rc4-586.s" =>
                 [
                     "crypto/perlasm/x86asm.pl",
@@ -709,6 +702,14 @@ our %unified_info = (
                 [
                     "libcrypto",
                 ],
+            "include/crypto/bn_conf.h" =>
+                [
+                    "configdata.pm",
+                ],
+            "include/crypto/dso_conf.h" =>
+                [
+                    "configdata.pm",
+                ],
             "include/openssl/opensslconf.h" =>
                 [
                     "configdata.pm",
@@ -1506,6 +1507,12 @@ our %unified_info = (
                     "libcrypto",
                     "test/libtestutil.a",
                 ],
+            "test/ssl_ctx_test" =>
+                [
+                    "libcrypto",
+                    "libssl",
+                    "test/libtestutil.a",
+                ],
             "test/ssl_test" =>
                 [
                     "libcrypto",
@@ -3243,7 +3250,6 @@ our %unified_info = (
                             "test/testutil/cb.o",
                             "test/testutil/driver.o",
                             "test/testutil/format_output.o",
-                            "test/testutil/init.o",
                             "test/testutil/main.o",
                             "test/testutil/output_helpers.o",
                             "test/testutil/random.o",
@@ -3251,6 +3257,7 @@ our %unified_info = (
                             "test/testutil/tap_bio.o",
                             "test/testutil/test_cleanup.o",
                             "test/testutil/tests.o",
+                            "test/testutil/testutil_init.o",
                         ],
                     "products" =>
                         {
@@ -3749,14 +3756,6 @@ our %unified_info = (
                 [
                     "crypto/ia64cpuid.S",
                 ],
-            "crypto/include/internal/bn_conf.h" =>
-                [
-                    "crypto/include/internal/bn_conf.h.in",
-                ],
-            "crypto/include/internal/dso_conf.h" =>
-                [
-                    "crypto/include/internal/dso_conf.h.in",
-                ],
             "crypto/md5/md5-586.s" =>
                 [
                     "crypto/md5/asm/md5-586.pl",
@@ -4197,6 +4196,14 @@ our %unified_info = (
                     "engines/asm/e_padlock-x86_64.pl",
                     "\$(PERLASM_SCHEME)",
                 ],
+            "include/crypto/bn_conf.h" =>
+                [
+                    "include/crypto/bn_conf.h.in",
+                ],
+            "include/crypto/dso_conf.h" =>
+                [
+                    "include/crypto/dso_conf.h.in",
+                ],
             "include/openssl/opensslconf.h" =>
                 [
                     "include/openssl/opensslconf.h.in",
@@ -4883,7 +4890,6 @@ our %unified_info = (
             "crypto/aes/aes-s390x.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto",
                 ],
@@ -4894,37 +4900,31 @@ our %unified_info = (
             "crypto/aes/aes_cfb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/aes/aes_ecb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/aes/aes_ige.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/aes/aes_misc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/aes/aes_ofb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/aes/aes_wrap.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/aes/aesfx-sparcv9.o" =>
@@ -4946,7 +4946,6 @@ our %unified_info = (
             "crypto/aria/aria.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/arm64cpuid.o" =>
@@ -4960,613 +4959,511 @@ our %unified_info = (
             "crypto/asn1/a_bitstr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_d2i_fp.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_digest.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_dup.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_gentm.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_i2d_fp.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_int.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_mbstr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_object.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_octet.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_print.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_sign.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_strex.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_strnid.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_time.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_type.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_utctm.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_utf8.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_verify.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/ameth_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/asn1_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/asn1_gen.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/asn1_item_list.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/asn1_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/asn1_par.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/asn_mime.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/asn_moid.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/asn_mstbl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/asn_pack.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/bio_asn1.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/bio_ndef.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/d2i_pr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/d2i_pu.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/evp_asn1.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/f_int.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/f_string.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/i2d_pr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/i2d_pu.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/n_pkey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/nsseq.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/p5_pbe.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/p5_pbev2.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/p5_scrypt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/p8_pkey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/t_bitst.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/t_pkey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/t_spki.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/tasn_dec.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/tasn_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/tasn_fre.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/tasn_new.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/tasn_prn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/tasn_scn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/tasn_typ.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/tasn_utl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/x_algor.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/x_bignum.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/x_info.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/x_int64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/x_long.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/x_pkey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/x_sig.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/x_spki.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/x_val.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/async/arch/async_null.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/async/arch/async_posix.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/async/arch/async_win.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/async/async.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/async/async_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/async/async_wait.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bf/bf_cfb64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bf/bf_ecb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bf/bf_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bf/bf_ofb64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bf/bf_skey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/b_addr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/b_dump.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/b_print.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/b_sock.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/b_sock2.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bf_buff.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bf_lbuf.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bf_nbio.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bf_null.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bio_cb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bio_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bio_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bio_meth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bss_acpt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bss_bio.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bss_conn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bss_dgram.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bss_fd.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bss_file.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bss_log.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bss_mem.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bss_null.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bss_sock.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/blake2/blake2b.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/blake2/blake2s.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/blake2/m_blake2b.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/blake2/m_blake2s.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/armv4-gf2m.o" =>
@@ -5580,7 +5477,6 @@ our %unified_info = (
             "crypto/bn/asm/s390x.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn-mips.o" =>
@@ -5590,182 +5486,152 @@ our %unified_info = (
             "crypto/bn/bn_add.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_blind.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_const.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_ctx.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_depr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_dh.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_div.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_exp.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto",
                 ],
             "crypto/bn/bn_exp2.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_gcd.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_gf2m.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_intern.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_kron.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_mod.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_mont.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_mpi.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_mul.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_nist.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_prime.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_print.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_rand.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_recp.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_shift.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_sqr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_sqrt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_srp.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_word.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_x931p.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/mips-mont.o" =>
@@ -5775,13 +5641,11 @@ our %unified_info = (
             "crypto/bn/s390x-gf2m.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/s390x-mont.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/sparct4-mont.o" =>
@@ -5807,13 +5671,11 @@ our %unified_info = (
             "crypto/buffer/buf_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/buffer/buffer.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/buildinf.h" =>
@@ -5823,43 +5685,36 @@ our %unified_info = (
             "crypto/camellia/camellia.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/camellia/cmll_cbc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/camellia/cmll_cfb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/camellia/cmll_ctr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/camellia/cmll_ecb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/camellia/cmll_misc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/camellia/cmll_ofb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/camellia/cmllt4-sparcv9.o" =>
@@ -5869,31 +5724,26 @@ our %unified_info = (
             "crypto/cast/c_cfb64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cast/c_ecb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cast/c_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cast/c_ofb64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cast/c_skey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/chacha/chacha-armv4.o" =>
@@ -5907,279 +5757,233 @@ our %unified_info = (
             "crypto/chacha/chacha-s390x.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto",
                 ],
             "crypto/cmac/cm_ameth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cmac/cm_pmeth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cmac/cmac.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_asn1.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_att.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_cd.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_dd.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_env.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_ess.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_io.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_kari.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_pwri.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_sd.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_smime.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/conf/conf_api.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/conf/conf_def.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/conf/conf_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/conf/conf_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/conf/conf_mall.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/conf/conf_mod.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/conf/conf_sap.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/conf/conf_ssl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cpt_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cryptlib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ct/ct_b64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ct/ct_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ct/ct_log.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ct/ct_oct.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ct/ct_policy.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ct/ct_prn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ct/ct_sct.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ct/ct_sct_ctx.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ct/ct_vfy.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ct/ct_x509v3.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ctype.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cversion.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto",
                 ],
             "crypto/des/cbc_cksm.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/cbc_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/cfb64ede.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/cfb64enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/cfb_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/des_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/dest4-sparcv9.o" =>
@@ -6189,301 +5993,251 @@ our %unified_info = (
             "crypto/des/ecb3_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/ecb_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/fcrypt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/fcrypt_b.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/ofb64ede.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/ofb64enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/ofb_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/pcbc_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/qud_cksm.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/rand_key.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/set_key.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/str2key.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/xcbc_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_ameth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_asn1.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_check.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_depr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_gen.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_kdf.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_key.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_meth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_pmeth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_prn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_rfc5114.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_rfc7919.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dsa/dsa_ameth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dsa/dsa_asn1.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dsa/dsa_depr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dsa/dsa_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dsa/dsa_gen.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dsa/dsa_key.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dsa/dsa_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dsa/dsa_meth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dsa/dsa_ossl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dsa/dsa_pmeth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dsa/dsa_prn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dsa/dsa_sign.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dsa/dsa_vrf.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dso/dso_dl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dso/dso_dlfcn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dso/dso_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dso/dso_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dso/dso_openssl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dso/dso_vms.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dso/dso_win32.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ebcdic.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/curve25519.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/curve448/arch_32/f_impl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto/ec/curve448/arch_32",
                     "crypto/ec/curve448",
@@ -6491,7 +6245,6 @@ our %unified_info = (
             "crypto/ec/curve448/curve448.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto/ec/curve448/arch_32",
                     "crypto/ec/curve448",
@@ -6499,7 +6252,6 @@ our %unified_info = (
             "crypto/ec/curve448/curve448_tables.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto/ec/curve448/arch_32",
                     "crypto/ec/curve448",
@@ -6507,7 +6259,6 @@ our %unified_info = (
             "crypto/ec/curve448/eddsa.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto/ec/curve448/arch_32",
                     "crypto/ec/curve448",
@@ -6515,7 +6266,6 @@ our %unified_info = (
             "crypto/ec/curve448/f_generic.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto/ec/curve448/arch_32",
                     "crypto/ec/curve448",
@@ -6523,7 +6273,6 @@ our %unified_info = (
             "crypto/ec/curve448/scalar.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto/ec/curve448/arch_32",
                     "crypto/ec/curve448",
@@ -6531,163 +6280,136 @@ our %unified_info = (
             "crypto/ec/ec2_oct.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec2_smpl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec_ameth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec_asn1.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec_check.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec_curve.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec_cvt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec_key.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec_kmeth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec_mult.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec_oct.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec_pmeth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec_print.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecdh_kdf.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecdh_ossl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecdsa_ossl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecdsa_sign.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecdsa_vrf.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/eck_prn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecp_mont.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecp_nist.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecp_nistp224.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecp_nistp256.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecp_nistp521.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecp_nistputil.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecp_nistz256-armv4.o" =>
@@ -6705,223 +6427,186 @@ our %unified_info = (
             "crypto/ec/ecp_oct.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecp_smpl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecx_meth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/eng_all.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/eng_cnf.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/eng_ctrl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/eng_dyn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/eng_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/eng_fat.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/eng_init.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/eng_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/eng_list.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/eng_openssl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/eng_pkey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/eng_rdrand.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/eng_table.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/tb_asnmth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/tb_cipher.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/tb_dh.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/tb_digest.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/tb_dsa.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/tb_eckey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/tb_pkmeth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/tb_rand.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/tb_rsa.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/err/err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/err/err_all.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/err/err_prn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/bio_b64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/bio_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/bio_md.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/bio_ok.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/c_allc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/c_alld.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/cmeth_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/digest.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/e_aes.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto",
                     "crypto/modes",
@@ -6929,21 +6614,18 @@ our %unified_info = (
             "crypto/evp/e_aes_cbc_hmac_sha1.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto/modes",
                 ],
             "crypto/evp/e_aes_cbc_hmac_sha256.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto/modes",
                 ],
             "crypto/evp/e_aria.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto",
                     "crypto/modes",
@@ -6951,13 +6633,11 @@ our %unified_info = (
             "crypto/evp/e_bf.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/e_camellia.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto",
                     "crypto/modes",
@@ -6965,81 +6645,68 @@ our %unified_info = (
             "crypto/evp/e_cast.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/e_chacha20_poly1305.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/e_des.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto",
                 ],
             "crypto/evp/e_des3.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto",
                 ],
             "crypto/evp/e_idea.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/e_null.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/e_old.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/e_rc2.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/e_rc4.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/e_rc4_hmac_md5.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/e_rc5.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/e_seed.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/e_sm4.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto",
                     "crypto/modes",
@@ -7047,328 +6714,267 @@ our %unified_info = (
             "crypto/evp/e_xcbc_d.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/encode.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/evp_cnf.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/evp_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/evp_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/evp_key.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/evp_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/evp_pbe.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/evp_pkey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/m_md2.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/m_md4.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/m_md5.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/m_md5_sha1.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/m_mdc2.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/m_null.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/m_ripemd.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/m_sha1.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/m_sha3.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto",
                 ],
             "crypto/evp/m_sigver.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/m_wp.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/names.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/p5_crpt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/p5_crpt2.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/p_dec.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/p_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/p_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/p_open.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/p_seal.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/p_sign.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/p_verify.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/pbe_scrypt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/pmeth_fn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/pmeth_gn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/pmeth_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ex_data.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/getenv.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/hmac/hm_ameth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/hmac/hm_pmeth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/hmac/hmac.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/idea/i_cbc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/idea/i_cfb64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/idea/i_ecb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/idea/i_ofb64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/idea/i_skey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
-            "crypto/include/internal/bn_conf.h" =>
-                [
-                    ".",
-                ],
-            "crypto/include/internal/dso_conf.h" =>
-                [
-                    ".",
-                ],
             "crypto/init.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/kdf/hkdf.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/kdf/kdf_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/kdf/scrypt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/kdf/tls1_prf.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/lhash/lh_stats.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/lhash/lhash.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/md4/md4_dgst.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/md4/md4_one.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/md5/md5-sparcv9.o" =>
@@ -7378,79 +6984,66 @@ our %unified_info = (
             "crypto/md5/md5_dgst.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/md5/md5_one.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/mdc2/mdc2_one.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/mdc2/mdc2dgst.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/mem.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/mem_dbg.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/mem_sec.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/modes/cbc128.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/modes/ccm128.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/modes/cfb128.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/modes/ctr128.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/modes/cts128.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/modes/gcm128.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto",
                 ],
@@ -7461,7 +7054,6 @@ our %unified_info = (
             "crypto/modes/ghash-s390x.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto",
                 ],
@@ -7476,361 +7068,301 @@ our %unified_info = (
             "crypto/modes/ocb128.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/modes/ofb128.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/modes/wrap128.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/modes/xts128.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/o_dir.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/o_fips.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/o_fopen.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/o_init.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/o_str.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/o_time.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/objects/o_names.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/objects/obj_dat.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/objects/obj_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/objects/obj_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/objects/obj_xref.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ocsp/ocsp_asn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ocsp/ocsp_cl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ocsp/ocsp_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ocsp/ocsp_ext.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ocsp/ocsp_ht.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ocsp/ocsp_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ocsp/ocsp_prn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ocsp/ocsp_srv.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ocsp/ocsp_vfy.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ocsp/v3_ocsp.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pem/pem_all.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pem/pem_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pem/pem_info.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pem/pem_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pem/pem_oth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pem/pem_pk8.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pem/pem_pkey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pem/pem_sign.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pem/pem_x509.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pem/pem_xaux.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pem/pvkfmt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_add.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_asn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_attr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_crpt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_crt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_decr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_init.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_key.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_kiss.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_mutl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_npas.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_p8d.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_p8e.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_sbag.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_utl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/pk12err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs7/bio_pk7.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs7/pk7_asn1.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs7/pk7_attr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs7/pk7_doit.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs7/pk7_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs7/pk7_mime.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs7/pk7_smime.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs7/pkcs7err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/poly1305/poly1305-armv4.o" =>
@@ -7848,7 +7380,6 @@ our %unified_info = (
             "crypto/poly1305/poly1305-s390x.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/poly1305/poly1305-sparcv9.o" =>
@@ -7858,296 +7389,247 @@ our %unified_info = (
             "crypto/poly1305/poly1305.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/poly1305/poly1305_ameth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/poly1305/poly1305_pmeth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rand/drbg_ctr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rand/drbg_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rand/rand_egd.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rand/rand_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rand/rand_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rand/rand_unix.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rand/rand_vms.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rand/rand_win.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rand/randfile.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rc2/rc2_cbc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rc2/rc2_ecb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rc2/rc2_skey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rc2/rc2cfb64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rc2/rc2ofb64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rc4/rc4-s390x.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ripemd/rmd_dgst.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ripemd/rmd_one.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_ameth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_asn1.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_chk.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_crpt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_depr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_gen.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_meth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_mp.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_none.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_oaep.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_ossl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_pk1.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_pmeth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_prn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_pss.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_saos.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_sign.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_ssl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_x931.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_x931g.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/s390xcap.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/s390xcpuid.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto",
                 ],
             "crypto/seed/seed.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/seed/seed_cbc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/seed/seed_cfb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/seed/seed_ecb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/seed/seed_ofb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sha/keccak1600-armv4.o" =>
@@ -8157,7 +7639,6 @@ our %unified_info = (
             "crypto/sha/keccak1600-s390x.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sha/sha1-armv4-large.o" =>
@@ -8175,7 +7656,6 @@ our %unified_info = (
             "crypto/sha/sha1-s390x.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto",
                 ],
@@ -8186,13 +7666,11 @@ our %unified_info = (
             "crypto/sha/sha1_one.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sha/sha1dgst.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sha/sha256-armv4.o" =>
@@ -8210,7 +7688,6 @@ our %unified_info = (
             "crypto/sha/sha256-s390x.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto",
                 ],
@@ -8221,7 +7698,6 @@ our %unified_info = (
             "crypto/sha/sha256.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sha/sha512-armv4.o" =>
@@ -8239,7 +7715,6 @@ our %unified_info = (
             "crypto/sha/sha512-s390x.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto",
                 ],
@@ -8250,709 +7725,591 @@ our %unified_info = (
             "crypto/sha/sha512.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/siphash/siphash.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/siphash/siphash_ameth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/siphash/siphash_pmeth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sm2/sm2_crypt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sm2/sm2_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sm2/sm2_pmeth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sm2/sm2_sign.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sm3/m_sm3.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sm3/sm3.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sm4/sm4.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/srp/srp_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/srp/srp_vfy.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/stack/stack.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/store/loader_file.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/store/store_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/store/store_init.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/store/store_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/store/store_register.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/store/store_strings.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/threads_none.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/threads_pthread.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/threads_win.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ts/ts_asn1.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ts/ts_conf.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ts/ts_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ts/ts_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ts/ts_req_print.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ts/ts_req_utils.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ts/ts_rsp_print.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ts/ts_rsp_sign.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ts/ts_rsp_utils.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ts/ts_rsp_verify.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ts/ts_verify_ctx.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/txt_db/txt_db.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ui/ui_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ui/ui_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ui/ui_null.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ui/ui_openssl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ui/ui_util.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/uid.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/whrlpool/wp_block.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/whrlpool/wp_dgst.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/by_dir.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/by_file.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/t_crl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/t_req.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/t_x509.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_att.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_cmp.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_d2.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_def.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_ext.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_lu.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_meth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_obj.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_r2x.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_req.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_set.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_trs.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_txt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_v3.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_vfy.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_vpm.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509cset.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509name.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509rset.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509spki.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509type.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x_all.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x_attrib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x_crl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x_exten.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x_name.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x_pubkey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x_req.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x_x509.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x_x509a.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/pcy_cache.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/pcy_data.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/pcy_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/pcy_map.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/pcy_node.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/pcy_tree.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_addr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_admis.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_akey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_akeya.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_alt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_asid.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_bcons.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_bitst.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_conf.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_cpols.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_crld.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_enum.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_extku.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_genn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_ia5.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_info.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_int.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_ncons.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_pci.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_pcia.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_pcons.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_pku.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_pmaps.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_prn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_purp.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_skey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_sxnet.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_tlsf.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_utl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "engines/e_capi.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "engines/e_padlock.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "fuzz/asn1.o" =>
@@ -9003,6 +8360,14 @@ our %unified_info = (
                 [
                     "include",
                 ],
+            "include/crypto/bn_conf.h" =>
+                [
+                    ".",
+                ],
+            "include/crypto/dso_conf.h" =>
+                [
+                    ".",
+                ],
             "include/openssl/opensslconf.h" =>
                 [
                     ".",
@@ -9247,7 +8612,6 @@ our %unified_info = (
                 [
                     ".",
                     "include",
-                    "crypto/include",
                 ],
             "test/asn1_string_table_test.o" =>
                 [
@@ -9573,7 +8937,6 @@ our %unified_info = (
                 [
                     ".",
                     "include",
-                    "crypto/include",
                 ],
             "test/cipher_overhead_test.o" =>
                 [
@@ -9619,7 +8982,6 @@ our %unified_info = (
             "test/ctype_internal_test.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "test/curve448_internal_test.o" =>
@@ -9685,7 +9047,6 @@ our %unified_info = (
                 [
                     "include",
                     "crypto/ec",
-                    "crypto/include",
                 ],
             "test/ecdsatest.o" =>
                 [
@@ -9710,7 +9071,6 @@ our %unified_info = (
             "test/evp_extra_test.o" =>
                 [
                     "include",
-                    "crypto/include",
                 ],
             "test/evp_test.o" =>
                 [
@@ -9808,7 +9168,6 @@ our %unified_info = (
                 [
                     ".",
                     "include",
-                    "crypto/include",
                 ],
             "test/rc2test.o" =>
                 [
@@ -9858,18 +9217,15 @@ our %unified_info = (
                 [
                     ".",
                     "include",
-                    "crypto/include",
                 ],
             "test/sm2_internal_test.o" =>
                 [
                     "include",
-                    "crypto/include",
                 ],
             "test/sm4_internal_test.o" =>
                 [
                     ".",
                     "include",
-                    "crypto/include",
                 ],
             "test/srptest.o" =>
                 [
@@ -9880,6 +9236,10 @@ our %unified_info = (
                     ".",
                     "include",
                 ],
+            "test/ssl_ctx_test.o" =>
+                [
+                    "include",
+                ],
             "test/ssl_test.o" =>
                 [
                     "include",
@@ -9943,10 +9303,6 @@ our %unified_info = (
                 [
                     "include",
                 ],
-            "test/testutil/init.o" =>
-                [
-                    "include",
-                ],
             "test/testutil/main.o" =>
                 [
                     "include",
@@ -9975,6 +9331,10 @@ our %unified_info = (
                 [
                     "include",
                 ],
+            "test/testutil/testutil_init.o" =>
+                [
+                    "include",
+                ],
             "test/threadstest.o" =>
                 [
                     "include",
@@ -10239,6 +9599,7 @@ our %unified_info = (
             "test/sm4_internal_test",
             "test/srptest",
             "test/ssl_cert_table_internal_test",
+            "test/ssl_ctx_test",
             "test/ssl_test",
             "test/ssl_test_ctx_test",
             "test/sslapitest",
@@ -15159,7 +14520,6 @@ our %unified_info = (
                     "test/testutil/cb.o",
                     "test/testutil/driver.o",
                     "test/testutil/format_output.o",
-                    "test/testutil/init.o",
                     "test/testutil/main.o",
                     "test/testutil/output_helpers.o",
                     "test/testutil/random.o",
@@ -15167,6 +14527,7 @@ our %unified_info = (
                     "test/testutil/tap_bio.o",
                     "test/testutil/test_cleanup.o",
                     "test/testutil/tests.o",
+                    "test/testutil/testutil_init.o",
                 ],
             "test/md2test" =>
                 [
@@ -15394,6 +14755,14 @@ our %unified_info = (
                 [
                     "test/ssl_cert_table_internal_test.c",
                 ],
+            "test/ssl_ctx_test" =>
+                [
+                    "test/ssl_ctx_test.o",
+                ],
+            "test/ssl_ctx_test.o" =>
+                [
+                    "test/ssl_ctx_test.c",
+                ],
             "test/ssl_test" =>
                 [
                     "test/handshake_helper.o",
@@ -15496,10 +14865,6 @@ our %unified_info = (
                 [
                     "test/testutil/format_output.c",
                 ],
-            "test/testutil/init.o" =>
-                [
-                    "test/testutil/init.c",
-                ],
             "test/testutil/main.o" =>
                 [
                     "test/testutil/main.c",
@@ -15528,6 +14893,10 @@ our %unified_info = (
                 [
                     "test/testutil/tests.c",
                 ],
+            "test/testutil/testutil_init.o" =>
+                [
+                    "test/testutil/testutil_init.c",
+                ],
             "test/threadstest" =>
                 [
                     "test/threadstest.o",
diff --git a/deps/openssl/config/archs/linux64-s390x/asm_avx2/crypto/aes/aes-s390x.S b/deps/openssl/config/archs/linux64-s390x/asm_avx2/crypto/aes/aes-s390x.S
index e00f81ecd4..c432d017be 100644
--- a/deps/openssl/config/archs/linux64-s390x/asm_avx2/crypto/aes/aes-s390x.S
+++ b/deps/openssl/config/archs/linux64-s390x/asm_avx2/crypto/aes/aes-s390x.S
@@ -2093,7 +2093,7 @@ AES_xts_encrypt:
 
 .Lxts_enc_done:
 	stg	%r15,144+0(%r15)	# wipe tweak
-	stg	%r15,+8(%r15)
+	stg	%r15,144+8(%r15)
 	lmg	%r6,%r14,6*8(%r15)
 	br	%r14
 .size	AES_xts_encrypt,.-AES_xts_encrypt
@@ -2358,7 +2358,7 @@ AES_xts_decrypt:
 	stg	%r15,144-16+8(%r15)
 .Lxts_dec_done:
 	stg	%r15,144+0(%r15)	# wipe tweak
-	stg	%r15,+8(%r15)
+	stg	%r15,144+8(%r15)
 	lmg	%r6,%r14,6*8(%r15)
 	br	%r14
 .size	AES_xts_decrypt,.-AES_xts_decrypt
diff --git a/deps/openssl/config/archs/linux64-s390x/asm_avx2/crypto/bn/s390x-mont.S b/deps/openssl/config/archs/linux64-s390x/asm_avx2/crypto/bn/s390x-mont.S
index b8dea0a66f..b6119c009b 100644
--- a/deps/openssl/config/archs/linux64-s390x/asm_avx2/crypto/bn/s390x-mont.S
+++ b/deps/openssl/config/archs/linux64-s390x/asm_avx2/crypto/bn/s390x-mont.S
@@ -45,7 +45,7 @@ bn_mul_mont:
 	lghi	%r13,0
 	alcgr	%r13,%r10
 
-	la	%r7,8(%r0)	# j=1
+	la	%r7,8		# j=1
 	lr	%r14,%r1
 
 .align	16
@@ -97,7 +97,7 @@ bn_mul_mont:
 	lghi	%r13,0
 	alcgr	%r13,%r10
 
-	la	%r7,8(%r0)	# j=1
+	la	%r7,8		# j=1
 	lr	%r14,%r1
 
 .align	16
@@ -141,7 +141,7 @@ bn_mul_mont:
 	la	%r3,160(%r15)
 	ahi	%r1,1		# restore %r1, incidentally clears "borrow"
 
-	la	%r7,0(%r0)
+	la	%r7,0
 	lr	%r14,%r1
 .Lsub:	lg	%r9,0(%r7,%r3)
 	lg	%r11,0(%r7,%r5)
@@ -155,7 +155,7 @@ bn_mul_mont:
 	lghi	%r13,-1
 	xgr	%r13,%r12
 
-	la	%r7,0(%r0)
+	la	%r7,0
 	lgr	%r14,%r1
 .Lcopy:	lg	%r8,160(%r7,%r15)	# conditional copy
 	lg	%r9,0(%r7,%r2)
diff --git a/deps/openssl/config/archs/linux64-s390x/asm_avx2/crypto/buildinf.h b/deps/openssl/config/archs/linux64-s390x/asm_avx2/crypto/buildinf.h
index 34799d14b1..667449c83d 100644
--- a/deps/openssl/config/archs/linux64-s390x/asm_avx2/crypto/buildinf.h
+++ b/deps/openssl/config/archs/linux64-s390x/asm_avx2/crypto/buildinf.h
@@ -11,7 +11,7 @@
  */
 
 #define PLATFORM "platform: linux64-s390x"
-#define DATE "built on: Fri Sep 13 16:01:49 2019 UTC"
+#define DATE "built on: Wed Mar 18 21:09:21 2020 UTC"
 
 /*
  * Generate compiler_flags as an array of individual characters. This is a
diff --git a/deps/openssl/config/archs/linux64-s390x/asm_avx2/crypto/include/internal/bn_conf.h b/deps/openssl/config/archs/linux64-s390x/asm_avx2/crypto/include/internal/bn_conf.h
index 34bd8b78b4..5312ef5a7a 100644
--- a/deps/openssl/config/archs/linux64-s390x/asm_avx2/crypto/include/internal/bn_conf.h
+++ b/deps/openssl/config/archs/linux64-s390x/asm_avx2/crypto/include/internal/bn_conf.h
@@ -1,5 +1,5 @@
 /* WARNING: do not edit! */
-/* Generated by Makefile from crypto/include/internal/bn_conf.h.in */
+/* Generated by Makefile from include/crypto/bn_conf.h.in */
 /*
  * Copyright 2016 The OpenSSL Project Authors. All Rights Reserved.
  *
@@ -9,8 +9,8 @@
  * https://www.openssl.org/source/license.html
  */
 
-#ifndef HEADER_BN_CONF_H
-# define HEADER_BN_CONF_H
+#ifndef OSSL_CRYPTO_BN_CONF_H
+# define OSSL_CRYPTO_BN_CONF_H
 
 /*
  * The contents of this file are not used in the UEFI build, as
diff --git a/deps/openssl/config/archs/linux64-s390x/asm_avx2/crypto/include/internal/dso_conf.h b/deps/openssl/config/archs/linux64-s390x/asm_avx2/crypto/include/internal/dso_conf.h
index 252266ec2a..4b1167c3d8 100644
--- a/deps/openssl/config/archs/linux64-s390x/asm_avx2/crypto/include/internal/dso_conf.h
+++ b/deps/openssl/config/archs/linux64-s390x/asm_avx2/crypto/include/internal/dso_conf.h
@@ -1,5 +1,5 @@
 /* WARNING: do not edit! */
-/* Generated by Makefile from crypto/include/internal/dso_conf.h.in */
+/* Generated by Makefile from include/crypto/dso_conf.h.in */
 /*
  * Copyright 2016-2019 The OpenSSL Project Authors. All Rights Reserved.
  *
@@ -9,8 +9,8 @@
  * https://www.openssl.org/source/license.html
  */
 
-#ifndef HEADER_DSO_CONF_H
-# define HEADER_DSO_CONF_H
+#ifndef OSSL_CRYPTO_DSO_CONF_H
+# define OSSL_CRYPTO_DSO_CONF_H
 # define DSO_DLFCN
 # define HAVE_DLFCN_H
 # define DSO_EXTENSION ".so"
diff --git a/deps/openssl/config/archs/linux64-s390x/asm_avx2/crypto/rc4/rc4-s390x.s b/deps/openssl/config/archs/linux64-s390x/asm_avx2/crypto/rc4/rc4-s390x.s
index e5883fea42..d88918c013 100644
--- a/deps/openssl/config/archs/linux64-s390x/asm_avx2/crypto/rc4/rc4-s390x.s
+++ b/deps/openssl/config/archs/linux64-s390x/asm_avx2/crypto/rc4/rc4-s390x.s
@@ -192,7 +192,7 @@ RC4:
 RC4_set_key:
 	stmg	%r6,%r8,6*8(%r15)
 	lhi	%r0,256
-	la	%r1,0(%r0)
+	la	%r1,0
 	sth	%r1,0(%r2)
 .align	4
 .L1stloop:
@@ -202,8 +202,8 @@ RC4_set_key:
 
 	lghi	%r7,-256
 	lr	%r0,%r3
-	la	%r8,0(%r0)
-	la	%r1,0(%r0)
+	la	%r8,0
+	la	%r1,0
 .align	16
 .L2ndloop:
 	llgc	%r5,2+256(%r7,%r2)
@@ -220,7 +220,7 @@ RC4_set_key:
 	jz	.Ldone
 	brct	%r0,.L2ndloop
 	lr	%r0,%r3
-	la	%r8,0(%r0)
+	la	%r8,0
 	j	.L2ndloop
 .Ldone:
 	lmg	%r6,%r8,6*8(%r15)
diff --git a/deps/openssl/config/archs/linux64-s390x/asm_avx2/include/openssl/opensslconf.h b/deps/openssl/config/archs/linux64-s390x/asm_avx2/include/openssl/opensslconf.h
index 30820b6051..937531fe9f 100644
--- a/deps/openssl/config/archs/linux64-s390x/asm_avx2/include/openssl/opensslconf.h
+++ b/deps/openssl/config/archs/linux64-s390x/asm_avx2/include/openssl/opensslconf.h
@@ -96,9 +96,6 @@ extern "C" {
 #ifndef OPENSSL_NO_DYNAMIC_ENGINE
 # define OPENSSL_NO_DYNAMIC_ENGINE
 #endif
-#ifndef OPENSSL_NO_AFALGENG
-# define OPENSSL_NO_AFALGENG
-#endif
 
 
 /*
diff --git a/deps/openssl/config/archs/linux64-s390x/asm_avx2/include/progs.h b/deps/openssl/config/archs/linux64-s390x/asm_avx2/include/progs.h
index 9b3d270e20..308c65601b 100644
--- a/deps/openssl/config/archs/linux64-s390x/asm_avx2/include/progs.h
+++ b/deps/openssl/config/archs/linux64-s390x/asm_avx2/include/progs.h
@@ -2,7 +2,7 @@
  * WARNING: do not edit!
  * Generated by apps/progs.pl
  *
- * Copyright 1995-2019 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 1995-2020 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
diff --git a/deps/openssl/config/archs/linux64-s390x/no-asm/configdata.pm b/deps/openssl/config/archs/linux64-s390x/no-asm/configdata.pm
index 0a65365f26..37fd739d54 100644
--- a/deps/openssl/config/archs/linux64-s390x/no-asm/configdata.pm
+++ b/deps/openssl/config/archs/linux64-s390x/no-asm/configdata.pm
@@ -55,7 +55,7 @@ our %config = (
   minor => "1.1",
   openssl_algorithm_defines => [ "OPENSSL_NO_COMP", "OPENSSL_NO_MD2", "OPENSSL_NO_RC5" ],
   openssl_api_defines => [  ],
-  openssl_other_defines => [ "OPENSSL_RAND_SEED_OS", "OPENSSL_NO_AFALGENG", "OPENSSL_NO_ASAN", "OPENSSL_NO_ASM", "OPENSSL_NO_CRYPTO_MDEBUG", "OPENSSL_NO_CRYPTO_MDEBUG_BACKTRACE", "OPENSSL_NO_DEVCRYPTOENG", "OPENSSL_NO_EC_NISTP_64_GCC_128", "OPENSSL_NO_EGD", "OPENSSL_NO_EXTERNAL_TESTS", "OPENSSL_NO_FUZZ_AFL", "OPENSSL_NO_FUZZ_LIBFUZZER", "OPENSSL_NO_HEARTBEATS", "OPENSSL_NO_MSAN", "OPENSSL_NO_SCTP", "OPENSSL_NO_SSL3", "OPENSSL_NO_SSL3_METHOD", "OPENSSL_NO_UBSAN", "OPENSSL_NO_UNIT_TEST", "OPENSSL_NO_WEAK_SSL_CIPHERS", "OPENSSL_NO_DYNAMIC_ENGINE", "OPENSSL_NO_AFALGENG" ],
+  openssl_other_defines => [ "OPENSSL_RAND_SEED_OS", "OPENSSL_NO_AFALGENG", "OPENSSL_NO_ASAN", "OPENSSL_NO_ASM", "OPENSSL_NO_CRYPTO_MDEBUG", "OPENSSL_NO_CRYPTO_MDEBUG_BACKTRACE", "OPENSSL_NO_DEVCRYPTOENG", "OPENSSL_NO_EC_NISTP_64_GCC_128", "OPENSSL_NO_EGD", "OPENSSL_NO_EXTERNAL_TESTS", "OPENSSL_NO_FUZZ_AFL", "OPENSSL_NO_FUZZ_LIBFUZZER", "OPENSSL_NO_HEARTBEATS", "OPENSSL_NO_MSAN", "OPENSSL_NO_SCTP", "OPENSSL_NO_SSL3", "OPENSSL_NO_SSL3_METHOD", "OPENSSL_NO_UBSAN", "OPENSSL_NO_UNIT_TEST", "OPENSSL_NO_WEAK_SSL_CIPHERS", "OPENSSL_NO_DYNAMIC_ENGINE" ],
   openssl_sys_defines => [  ],
   openssl_thread_defines => [ "OPENSSL_THREADS" ],
   openssldir => "",
@@ -111,8 +111,8 @@ our %config = (
   sourcedir => ".",
   target => "linux64-s390x",
   tdirs => [ "ossl_shim" ],
-  version => "1.1.1d",
-  version_num => "0x1010104fL",
+  version => "1.1.1e",
+  version_num => "0x1010105fL",
 );
 
 our %target = (
@@ -238,6 +238,7 @@ our @disablables = (
   "dgram",
   "dh",
   "dsa",
+  "dso",
   "dtls",
   "dynamic-engine",
   "ec",
@@ -356,8 +357,8 @@ our %unified_info = (
         {
             "" =>
                 [
-                    "crypto/include/internal/bn_conf.h",
-                    "crypto/include/internal/dso_conf.h",
+                    "include/crypto/bn_conf.h",
+                    "include/crypto/dso_conf.h",
                     "include/openssl/opensslconf.h",
                 ],
             "apps/asn1pars.o" =>
@@ -625,14 +626,6 @@ our %unified_info = (
                     "crypto/perlasm/cbc.pl",
                     "crypto/perlasm/x86asm.pl",
                 ],
-            "crypto/include/internal/bn_conf.h" =>
-                [
-                    "configdata.pm",
-                ],
-            "crypto/include/internal/dso_conf.h" =>
-                [
-                    "configdata.pm",
-                ],
             "crypto/rc4/rc4-586.s" =>
                 [
                     "crypto/perlasm/x86asm.pl",
@@ -708,6 +701,14 @@ our %unified_info = (
                 [
                     "libcrypto",
                 ],
+            "include/crypto/bn_conf.h" =>
+                [
+                    "configdata.pm",
+                ],
+            "include/crypto/dso_conf.h" =>
+                [
+                    "configdata.pm",
+                ],
             "include/openssl/opensslconf.h" =>
                 [
                     "configdata.pm",
@@ -1505,6 +1506,12 @@ our %unified_info = (
                     "libcrypto",
                     "test/libtestutil.a",
                 ],
+            "test/ssl_ctx_test" =>
+                [
+                    "libcrypto",
+                    "libssl",
+                    "test/libtestutil.a",
+                ],
             "test/ssl_test" =>
                 [
                     "libcrypto",
@@ -3223,7 +3230,6 @@ our %unified_info = (
                             "test/testutil/cb.o",
                             "test/testutil/driver.o",
                             "test/testutil/format_output.o",
-                            "test/testutil/init.o",
                             "test/testutil/main.o",
                             "test/testutil/output_helpers.o",
                             "test/testutil/random.o",
@@ -3231,6 +3237,7 @@ our %unified_info = (
                             "test/testutil/tap_bio.o",
                             "test/testutil/test_cleanup.o",
                             "test/testutil/tests.o",
+                            "test/testutil/testutil_init.o",
                         ],
                     "products" =>
                         {
@@ -3729,14 +3736,6 @@ our %unified_info = (
                 [
                     "crypto/ia64cpuid.S",
                 ],
-            "crypto/include/internal/bn_conf.h" =>
-                [
-                    "crypto/include/internal/bn_conf.h.in",
-                ],
-            "crypto/include/internal/dso_conf.h" =>
-                [
-                    "crypto/include/internal/dso_conf.h.in",
-                ],
             "crypto/md5/md5-586.s" =>
                 [
                     "crypto/md5/asm/md5-586.pl",
@@ -4177,6 +4176,14 @@ our %unified_info = (
                     "engines/asm/e_padlock-x86_64.pl",
                     "\$(PERLASM_SCHEME)",
                 ],
+            "include/crypto/bn_conf.h" =>
+                [
+                    "include/crypto/bn_conf.h.in",
+                ],
+            "include/crypto/dso_conf.h" =>
+                [
+                    "include/crypto/dso_conf.h.in",
+                ],
             "include/openssl/opensslconf.h" =>
                 [
                     "include/openssl/opensslconf.h.in",
@@ -4871,49 +4878,41 @@ our %unified_info = (
             "crypto/aes/aes_cbc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/aes/aes_cfb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/aes/aes_core.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/aes/aes_ecb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/aes/aes_ige.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/aes/aes_misc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/aes/aes_ofb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/aes/aes_wrap.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/aes/aesfx-sparcv9.o" =>
@@ -4935,7 +4934,6 @@ our %unified_info = (
             "crypto/aria/aria.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/arm64cpuid.o" =>
@@ -4949,613 +4947,511 @@ our %unified_info = (
             "crypto/asn1/a_bitstr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_d2i_fp.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_digest.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_dup.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_gentm.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_i2d_fp.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_int.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_mbstr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_object.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_octet.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_print.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_sign.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_strex.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_strnid.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_time.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_type.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_utctm.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_utf8.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_verify.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/ameth_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/asn1_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/asn1_gen.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/asn1_item_list.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/asn1_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/asn1_par.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/asn_mime.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/asn_moid.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/asn_mstbl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/asn_pack.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/bio_asn1.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/bio_ndef.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/d2i_pr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/d2i_pu.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/evp_asn1.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/f_int.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/f_string.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/i2d_pr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/i2d_pu.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/n_pkey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/nsseq.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/p5_pbe.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/p5_pbev2.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/p5_scrypt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/p8_pkey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/t_bitst.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/t_pkey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/t_spki.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/tasn_dec.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/tasn_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/tasn_fre.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/tasn_new.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/tasn_prn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/tasn_scn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/tasn_typ.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/tasn_utl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/x_algor.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/x_bignum.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/x_info.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/x_int64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/x_long.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/x_pkey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/x_sig.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/x_spki.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/x_val.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/async/arch/async_null.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/async/arch/async_posix.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/async/arch/async_win.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/async/async.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/async/async_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/async/async_wait.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bf/bf_cfb64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bf/bf_ecb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bf/bf_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bf/bf_ofb64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bf/bf_skey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/b_addr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/b_dump.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/b_print.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/b_sock.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/b_sock2.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bf_buff.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bf_lbuf.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bf_nbio.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bf_null.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bio_cb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bio_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bio_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bio_meth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bss_acpt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bss_bio.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bss_conn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bss_dgram.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bss_fd.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bss_file.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bss_log.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bss_mem.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bss_null.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bss_sock.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/blake2/blake2b.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/blake2/blake2s.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/blake2/m_blake2b.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/blake2/m_blake2s.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/armv4-gf2m.o" =>
@@ -5573,188 +5469,157 @@ our %unified_info = (
             "crypto/bn/bn_add.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_asm.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_blind.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_const.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_ctx.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_depr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_dh.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_div.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_exp.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto",
                 ],
             "crypto/bn/bn_exp2.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_gcd.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_gf2m.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_intern.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_kron.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_mod.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_mont.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_mpi.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_mul.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_nist.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_prime.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_print.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_rand.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_recp.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_shift.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_sqr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_sqrt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_srp.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_word.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_x931p.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/mips-mont.o" =>
@@ -5784,13 +5649,11 @@ our %unified_info = (
             "crypto/buffer/buf_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/buffer/buffer.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/buildinf.h" =>
@@ -5800,43 +5663,36 @@ our %unified_info = (
             "crypto/camellia/camellia.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/camellia/cmll_cbc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/camellia/cmll_cfb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/camellia/cmll_ctr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/camellia/cmll_ecb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/camellia/cmll_misc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/camellia/cmll_ofb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/camellia/cmllt4-sparcv9.o" =>
@@ -5846,31 +5702,26 @@ our %unified_info = (
             "crypto/cast/c_cfb64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cast/c_ecb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cast/c_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cast/c_ofb64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cast/c_skey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/chacha/chacha-armv4.o" =>
@@ -5888,278 +5739,232 @@ our %unified_info = (
             "crypto/chacha/chacha_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cmac/cm_ameth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cmac/cm_pmeth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cmac/cmac.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_asn1.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_att.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_cd.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_dd.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_env.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_ess.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_io.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_kari.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_pwri.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_sd.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_smime.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/conf/conf_api.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/conf/conf_def.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/conf/conf_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/conf/conf_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/conf/conf_mall.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/conf/conf_mod.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/conf/conf_sap.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/conf/conf_ssl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cpt_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cryptlib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ct/ct_b64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ct/ct_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ct/ct_log.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ct/ct_oct.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ct/ct_policy.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ct/ct_prn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ct/ct_sct.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ct/ct_sct_ctx.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ct/ct_vfy.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ct/ct_x509v3.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ctype.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cversion.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto",
                 ],
             "crypto/des/cbc_cksm.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/cbc_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/cfb64ede.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/cfb64enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/cfb_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/des_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/dest4-sparcv9.o" =>
@@ -6169,301 +5974,251 @@ our %unified_info = (
             "crypto/des/ecb3_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/ecb_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/fcrypt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/fcrypt_b.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/ofb64ede.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/ofb64enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/ofb_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/pcbc_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/qud_cksm.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/rand_key.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/set_key.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/str2key.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/xcbc_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_ameth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_asn1.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_check.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_depr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_gen.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_kdf.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_key.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_meth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_pmeth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_prn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_rfc5114.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_rfc7919.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dsa/dsa_ameth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dsa/dsa_asn1.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dsa/dsa_depr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dsa/dsa_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dsa/dsa_gen.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dsa/dsa_key.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dsa/dsa_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dsa/dsa_meth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dsa/dsa_ossl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dsa/dsa_pmeth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dsa/dsa_prn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dsa/dsa_sign.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dsa/dsa_vrf.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dso/dso_dl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dso/dso_dlfcn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dso/dso_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dso/dso_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dso/dso_openssl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dso/dso_vms.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dso/dso_win32.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ebcdic.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/curve25519.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/curve448/arch_32/f_impl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto/ec/curve448/arch_32",
                     "crypto/ec/curve448",
@@ -6471,7 +6226,6 @@ our %unified_info = (
             "crypto/ec/curve448/curve448.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto/ec/curve448/arch_32",
                     "crypto/ec/curve448",
@@ -6479,7 +6233,6 @@ our %unified_info = (
             "crypto/ec/curve448/curve448_tables.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto/ec/curve448/arch_32",
                     "crypto/ec/curve448",
@@ -6487,7 +6240,6 @@ our %unified_info = (
             "crypto/ec/curve448/eddsa.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto/ec/curve448/arch_32",
                     "crypto/ec/curve448",
@@ -6495,7 +6247,6 @@ our %unified_info = (
             "crypto/ec/curve448/f_generic.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto/ec/curve448/arch_32",
                     "crypto/ec/curve448",
@@ -6503,7 +6254,6 @@ our %unified_info = (
             "crypto/ec/curve448/scalar.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto/ec/curve448/arch_32",
                     "crypto/ec/curve448",
@@ -6511,163 +6261,136 @@ our %unified_info = (
             "crypto/ec/ec2_oct.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec2_smpl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec_ameth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec_asn1.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec_check.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec_curve.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec_cvt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec_key.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec_kmeth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec_mult.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec_oct.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec_pmeth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec_print.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecdh_kdf.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecdh_ossl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecdsa_ossl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecdsa_sign.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecdsa_vrf.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/eck_prn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecp_mont.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecp_nist.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecp_nistp224.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecp_nistp256.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecp_nistp521.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecp_nistputil.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecp_nistz256-armv4.o" =>
@@ -6685,223 +6408,186 @@ our %unified_info = (
             "crypto/ec/ecp_oct.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecp_smpl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecx_meth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/eng_all.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/eng_cnf.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/eng_ctrl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/eng_dyn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/eng_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/eng_fat.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/eng_init.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/eng_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/eng_list.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/eng_openssl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/eng_pkey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/eng_rdrand.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/eng_table.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/tb_asnmth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/tb_cipher.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/tb_dh.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/tb_digest.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/tb_dsa.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/tb_eckey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/tb_pkmeth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/tb_rand.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/tb_rsa.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/err/err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/err/err_all.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/err/err_prn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/bio_b64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/bio_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/bio_md.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/bio_ok.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/c_allc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/c_alld.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/cmeth_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/digest.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/e_aes.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto",
                     "crypto/modes",
@@ -6909,21 +6595,18 @@ our %unified_info = (
             "crypto/evp/e_aes_cbc_hmac_sha1.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto/modes",
                 ],
             "crypto/evp/e_aes_cbc_hmac_sha256.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto/modes",
                 ],
             "crypto/evp/e_aria.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto",
                     "crypto/modes",
@@ -6931,13 +6614,11 @@ our %unified_info = (
             "crypto/evp/e_bf.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/e_camellia.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto",
                     "crypto/modes",
@@ -6945,81 +6626,68 @@ our %unified_info = (
             "crypto/evp/e_cast.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/e_chacha20_poly1305.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/e_des.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto",
                 ],
             "crypto/evp/e_des3.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto",
                 ],
             "crypto/evp/e_idea.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/e_null.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/e_old.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/e_rc2.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/e_rc4.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/e_rc4_hmac_md5.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/e_rc5.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/e_seed.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/e_sm4.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto",
                     "crypto/modes",
@@ -7027,328 +6695,267 @@ our %unified_info = (
             "crypto/evp/e_xcbc_d.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/encode.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/evp_cnf.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/evp_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/evp_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/evp_key.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/evp_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/evp_pbe.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/evp_pkey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/m_md2.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/m_md4.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/m_md5.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/m_md5_sha1.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/m_mdc2.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/m_null.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/m_ripemd.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/m_sha1.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/m_sha3.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto",
                 ],
             "crypto/evp/m_sigver.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/m_wp.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/names.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/p5_crpt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/p5_crpt2.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/p_dec.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/p_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/p_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/p_open.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/p_seal.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/p_sign.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/p_verify.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/pbe_scrypt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/pmeth_fn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/pmeth_gn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/pmeth_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ex_data.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/getenv.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/hmac/hm_ameth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/hmac/hm_pmeth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/hmac/hmac.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/idea/i_cbc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/idea/i_cfb64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/idea/i_ecb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/idea/i_ofb64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/idea/i_skey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
-            "crypto/include/internal/bn_conf.h" =>
-                [
-                    ".",
-                ],
-            "crypto/include/internal/dso_conf.h" =>
-                [
-                    ".",
-                ],
             "crypto/init.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/kdf/hkdf.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/kdf/kdf_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/kdf/scrypt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/kdf/tls1_prf.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/lhash/lh_stats.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/lhash/lhash.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/md4/md4_dgst.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/md4/md4_one.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/md5/md5-sparcv9.o" =>
@@ -7358,85 +6965,71 @@ our %unified_info = (
             "crypto/md5/md5_dgst.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/md5/md5_one.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/mdc2/mdc2_one.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/mdc2/mdc2dgst.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/mem.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/mem_clr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/mem_dbg.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/mem_sec.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/modes/cbc128.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/modes/ccm128.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/modes/cfb128.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/modes/ctr128.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/modes/cts128.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/modes/gcm128.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto",
                 ],
@@ -7459,361 +7052,301 @@ our %unified_info = (
             "crypto/modes/ocb128.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/modes/ofb128.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/modes/wrap128.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/modes/xts128.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/o_dir.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/o_fips.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/o_fopen.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/o_init.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/o_str.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/o_time.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/objects/o_names.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/objects/obj_dat.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/objects/obj_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/objects/obj_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/objects/obj_xref.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ocsp/ocsp_asn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ocsp/ocsp_cl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ocsp/ocsp_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ocsp/ocsp_ext.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ocsp/ocsp_ht.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ocsp/ocsp_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ocsp/ocsp_prn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ocsp/ocsp_srv.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ocsp/ocsp_vfy.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ocsp/v3_ocsp.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pem/pem_all.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pem/pem_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pem/pem_info.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pem/pem_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pem/pem_oth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pem/pem_pk8.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pem/pem_pkey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pem/pem_sign.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pem/pem_x509.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pem/pem_xaux.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pem/pvkfmt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_add.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_asn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_attr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_crpt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_crt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_decr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_init.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_key.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_kiss.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_mutl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_npas.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_p8d.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_p8e.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_sbag.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_utl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/pk12err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs7/bio_pk7.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs7/pk7_asn1.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs7/pk7_attr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs7/pk7_doit.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs7/pk7_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs7/pk7_mime.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs7/pk7_smime.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs7/pkcs7err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/poly1305/poly1305-armv4.o" =>
@@ -7835,259 +7368,216 @@ our %unified_info = (
             "crypto/poly1305/poly1305.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/poly1305/poly1305_ameth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/poly1305/poly1305_pmeth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rand/drbg_ctr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rand/drbg_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rand/rand_egd.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rand/rand_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rand/rand_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rand/rand_unix.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rand/rand_vms.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rand/rand_win.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rand/randfile.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rc2/rc2_cbc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rc2/rc2_ecb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rc2/rc2_skey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rc2/rc2cfb64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rc2/rc2ofb64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rc4/rc4_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rc4/rc4_skey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ripemd/rmd_dgst.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ripemd/rmd_one.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_ameth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_asn1.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_chk.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_crpt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_depr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_gen.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_meth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_mp.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_none.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_oaep.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_ossl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_pk1.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_pmeth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_prn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_pss.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_saos.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_sign.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_ssl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_x931.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_x931g.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/s390xcpuid.o" =>
@@ -8097,31 +7587,26 @@ our %unified_info = (
             "crypto/seed/seed.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/seed/seed_cbc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/seed/seed_cfb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/seed/seed_ecb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/seed/seed_ofb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sha/keccak1600-armv4.o" =>
@@ -8131,7 +7616,6 @@ our %unified_info = (
             "crypto/sha/keccak1600.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sha/sha1-armv4-large.o" =>
@@ -8157,13 +7641,11 @@ our %unified_info = (
             "crypto/sha/sha1_one.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sha/sha1dgst.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sha/sha256-armv4.o" =>
@@ -8189,7 +7671,6 @@ our %unified_info = (
             "crypto/sha/sha256.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sha/sha512-armv4.o" =>
@@ -8215,709 +7696,591 @@ our %unified_info = (
             "crypto/sha/sha512.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/siphash/siphash.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/siphash/siphash_ameth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/siphash/siphash_pmeth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sm2/sm2_crypt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sm2/sm2_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sm2/sm2_pmeth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sm2/sm2_sign.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sm3/m_sm3.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sm3/sm3.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sm4/sm4.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/srp/srp_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/srp/srp_vfy.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/stack/stack.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/store/loader_file.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/store/store_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/store/store_init.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/store/store_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/store/store_register.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/store/store_strings.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/threads_none.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/threads_pthread.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/threads_win.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ts/ts_asn1.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ts/ts_conf.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ts/ts_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ts/ts_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ts/ts_req_print.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ts/ts_req_utils.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ts/ts_rsp_print.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ts/ts_rsp_sign.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ts/ts_rsp_utils.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ts/ts_rsp_verify.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ts/ts_verify_ctx.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/txt_db/txt_db.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ui/ui_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ui/ui_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ui/ui_null.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ui/ui_openssl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ui/ui_util.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/uid.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/whrlpool/wp_block.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/whrlpool/wp_dgst.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/by_dir.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/by_file.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/t_crl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/t_req.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/t_x509.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_att.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_cmp.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_d2.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_def.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_ext.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_lu.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_meth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_obj.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_r2x.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_req.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_set.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_trs.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_txt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_v3.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_vfy.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_vpm.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509cset.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509name.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509rset.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509spki.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509type.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x_all.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x_attrib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x_crl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x_exten.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x_name.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x_pubkey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x_req.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x_x509.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x_x509a.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/pcy_cache.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/pcy_data.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/pcy_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/pcy_map.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/pcy_node.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/pcy_tree.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_addr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_admis.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_akey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_akeya.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_alt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_asid.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_bcons.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_bitst.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_conf.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_cpols.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_crld.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_enum.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_extku.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_genn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_ia5.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_info.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_int.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_ncons.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_pci.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_pcia.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_pcons.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_pku.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_pmaps.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_prn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_purp.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_skey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_sxnet.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_tlsf.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_utl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "engines/e_capi.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "engines/e_padlock.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "fuzz/asn1.o" =>
@@ -8968,6 +8331,14 @@ our %unified_info = (
                 [
                     "include",
                 ],
+            "include/crypto/bn_conf.h" =>
+                [
+                    ".",
+                ],
+            "include/crypto/dso_conf.h" =>
+                [
+                    ".",
+                ],
             "include/openssl/opensslconf.h" =>
                 [
                     ".",
@@ -9212,7 +8583,6 @@ our %unified_info = (
                 [
                     ".",
                     "include",
-                    "crypto/include",
                 ],
             "test/asn1_string_table_test.o" =>
                 [
@@ -9538,7 +8908,6 @@ our %unified_info = (
                 [
                     ".",
                     "include",
-                    "crypto/include",
                 ],
             "test/cipher_overhead_test.o" =>
                 [
@@ -9584,7 +8953,6 @@ our %unified_info = (
             "test/ctype_internal_test.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "test/curve448_internal_test.o" =>
@@ -9650,7 +9018,6 @@ our %unified_info = (
                 [
                     "include",
                     "crypto/ec",
-                    "crypto/include",
                 ],
             "test/ecdsatest.o" =>
                 [
@@ -9675,7 +9042,6 @@ our %unified_info = (
             "test/evp_extra_test.o" =>
                 [
                     "include",
-                    "crypto/include",
                 ],
             "test/evp_test.o" =>
                 [
@@ -9773,7 +9139,6 @@ our %unified_info = (
                 [
                     ".",
                     "include",
-                    "crypto/include",
                 ],
             "test/rc2test.o" =>
                 [
@@ -9823,18 +9188,15 @@ our %unified_info = (
                 [
                     ".",
                     "include",
-                    "crypto/include",
                 ],
             "test/sm2_internal_test.o" =>
                 [
                     "include",
-                    "crypto/include",
                 ],
             "test/sm4_internal_test.o" =>
                 [
                     ".",
                     "include",
-                    "crypto/include",
                 ],
             "test/srptest.o" =>
                 [
@@ -9845,6 +9207,10 @@ our %unified_info = (
                     ".",
                     "include",
                 ],
+            "test/ssl_ctx_test.o" =>
+                [
+                    "include",
+                ],
             "test/ssl_test.o" =>
                 [
                     "include",
@@ -9908,10 +9274,6 @@ our %unified_info = (
                 [
                     "include",
                 ],
-            "test/testutil/init.o" =>
-                [
-                    "include",
-                ],
             "test/testutil/main.o" =>
                 [
                     "include",
@@ -9940,6 +9302,10 @@ our %unified_info = (
                 [
                     "include",
                 ],
+            "test/testutil/testutil_init.o" =>
+                [
+                    "include",
+                ],
             "test/threadstest.o" =>
                 [
                     "include",
@@ -10204,6 +9570,7 @@ our %unified_info = (
             "test/sm4_internal_test",
             "test/srptest",
             "test/ssl_cert_table_internal_test",
+            "test/ssl_ctx_test",
             "test/ssl_test",
             "test/ssl_test_ctx_test",
             "test/sslapitest",
@@ -15094,7 +14461,6 @@ our %unified_info = (
                     "test/testutil/cb.o",
                     "test/testutil/driver.o",
                     "test/testutil/format_output.o",
-                    "test/testutil/init.o",
                     "test/testutil/main.o",
                     "test/testutil/output_helpers.o",
                     "test/testutil/random.o",
@@ -15102,6 +14468,7 @@ our %unified_info = (
                     "test/testutil/tap_bio.o",
                     "test/testutil/test_cleanup.o",
                     "test/testutil/tests.o",
+                    "test/testutil/testutil_init.o",
                 ],
             "test/md2test" =>
                 [
@@ -15329,6 +14696,14 @@ our %unified_info = (
                 [
                     "test/ssl_cert_table_internal_test.c",
                 ],
+            "test/ssl_ctx_test" =>
+                [
+                    "test/ssl_ctx_test.o",
+                ],
+            "test/ssl_ctx_test.o" =>
+                [
+                    "test/ssl_ctx_test.c",
+                ],
             "test/ssl_test" =>
                 [
                     "test/handshake_helper.o",
@@ -15431,10 +14806,6 @@ our %unified_info = (
                 [
                     "test/testutil/format_output.c",
                 ],
-            "test/testutil/init.o" =>
-                [
-                    "test/testutil/init.c",
-                ],
             "test/testutil/main.o" =>
                 [
                     "test/testutil/main.c",
@@ -15463,6 +14834,10 @@ our %unified_info = (
                 [
                     "test/testutil/tests.c",
                 ],
+            "test/testutil/testutil_init.o" =>
+                [
+                    "test/testutil/testutil_init.c",
+                ],
             "test/threadstest" =>
                 [
                     "test/threadstest.o",
diff --git a/deps/openssl/config/archs/linux64-s390x/no-asm/crypto/buildinf.h b/deps/openssl/config/archs/linux64-s390x/no-asm/crypto/buildinf.h
index e0fd887860..984838d0e0 100644
--- a/deps/openssl/config/archs/linux64-s390x/no-asm/crypto/buildinf.h
+++ b/deps/openssl/config/archs/linux64-s390x/no-asm/crypto/buildinf.h
@@ -11,7 +11,7 @@
  */
 
 #define PLATFORM "platform: linux64-s390x"
-#define DATE "built on: Fri Sep 13 16:01:53 2019 UTC"
+#define DATE "built on: Wed Mar 18 21:09:26 2020 UTC"
 
 /*
  * Generate compiler_flags as an array of individual characters. This is a
diff --git a/deps/openssl/config/archs/linux64-s390x/no-asm/crypto/include/internal/bn_conf.h b/deps/openssl/config/archs/linux64-s390x/no-asm/crypto/include/internal/bn_conf.h
index 34bd8b78b4..5312ef5a7a 100644
--- a/deps/openssl/config/archs/linux64-s390x/no-asm/crypto/include/internal/bn_conf.h
+++ b/deps/openssl/config/archs/linux64-s390x/no-asm/crypto/include/internal/bn_conf.h
@@ -1,5 +1,5 @@
 /* WARNING: do not edit! */
-/* Generated by Makefile from crypto/include/internal/bn_conf.h.in */
+/* Generated by Makefile from include/crypto/bn_conf.h.in */
 /*
  * Copyright 2016 The OpenSSL Project Authors. All Rights Reserved.
  *
@@ -9,8 +9,8 @@
  * https://www.openssl.org/source/license.html
  */
 
-#ifndef HEADER_BN_CONF_H
-# define HEADER_BN_CONF_H
+#ifndef OSSL_CRYPTO_BN_CONF_H
+# define OSSL_CRYPTO_BN_CONF_H
 
 /*
  * The contents of this file are not used in the UEFI build, as
diff --git a/deps/openssl/config/archs/linux64-s390x/no-asm/crypto/include/internal/dso_conf.h b/deps/openssl/config/archs/linux64-s390x/no-asm/crypto/include/internal/dso_conf.h
index 252266ec2a..4b1167c3d8 100644
--- a/deps/openssl/config/archs/linux64-s390x/no-asm/crypto/include/internal/dso_conf.h
+++ b/deps/openssl/config/archs/linux64-s390x/no-asm/crypto/include/internal/dso_conf.h
@@ -1,5 +1,5 @@
 /* WARNING: do not edit! */
-/* Generated by Makefile from crypto/include/internal/dso_conf.h.in */
+/* Generated by Makefile from include/crypto/dso_conf.h.in */
 /*
  * Copyright 2016-2019 The OpenSSL Project Authors. All Rights Reserved.
  *
@@ -9,8 +9,8 @@
  * https://www.openssl.org/source/license.html
  */
 
-#ifndef HEADER_DSO_CONF_H
-# define HEADER_DSO_CONF_H
+#ifndef OSSL_CRYPTO_DSO_CONF_H
+# define OSSL_CRYPTO_DSO_CONF_H
 # define DSO_DLFCN
 # define HAVE_DLFCN_H
 # define DSO_EXTENSION ".so"
diff --git a/deps/openssl/config/archs/linux64-s390x/no-asm/include/openssl/opensslconf.h b/deps/openssl/config/archs/linux64-s390x/no-asm/include/openssl/opensslconf.h
index 212e3f67d8..781ef739dc 100644
--- a/deps/openssl/config/archs/linux64-s390x/no-asm/include/openssl/opensslconf.h
+++ b/deps/openssl/config/archs/linux64-s390x/no-asm/include/openssl/opensslconf.h
@@ -99,9 +99,6 @@ extern "C" {
 #ifndef OPENSSL_NO_DYNAMIC_ENGINE
 # define OPENSSL_NO_DYNAMIC_ENGINE
 #endif
-#ifndef OPENSSL_NO_AFALGENG
-# define OPENSSL_NO_AFALGENG
-#endif
 
 
 /*
diff --git a/deps/openssl/config/archs/linux64-s390x/no-asm/include/progs.h b/deps/openssl/config/archs/linux64-s390x/no-asm/include/progs.h
index 9b3d270e20..308c65601b 100644
--- a/deps/openssl/config/archs/linux64-s390x/no-asm/include/progs.h
+++ b/deps/openssl/config/archs/linux64-s390x/no-asm/include/progs.h
@@ -2,7 +2,7 @@
  * WARNING: do not edit!
  * Generated by apps/progs.pl
  *
- * Copyright 1995-2019 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 1995-2020 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
diff --git a/deps/openssl/config/archs/solaris-x86-gcc/asm/configdata.pm b/deps/openssl/config/archs/solaris-x86-gcc/asm/configdata.pm
index c14020e995..6374bc5069 100644
--- a/deps/openssl/config/archs/solaris-x86-gcc/asm/configdata.pm
+++ b/deps/openssl/config/archs/solaris-x86-gcc/asm/configdata.pm
@@ -48,14 +48,14 @@ our %config = (
   export_var_as_fn => "0",
   includes => [  ],
   lflags => [  ],
-  lib_defines => [ "OPENSSL_PIC", "OPENSSL_CPUID_OBJ", "OPENSSL_BN_ASM_PART_WORDS", "OPENSSL_IA32_SSE2", "OPENSSL_BN_ASM_MONT", "OPENSSL_BN_ASM_GF2m", "SHA1_ASM", "SHA256_ASM", "SHA512_ASM", "RC4_ASM", "MD5_ASM", "RMD160_ASM", "VPAES_ASM", "WHIRLPOOL_ASM", "GHASH_ASM", "ECP_NISTZ256_ASM", "POLY1305_ASM" ],
+  lib_defines => [ "OPENSSL_PIC", "OPENSSL_CPUID_OBJ", "OPENSSL_BN_ASM_PART_WORDS", "OPENSSL_IA32_SSE2", "OPENSSL_BN_ASM_MONT", "OPENSSL_BN_ASM_GF2m", "SHA1_ASM", "SHA256_ASM", "SHA512_ASM", "RC4_ASM", "MD5_ASM", "RMD160_ASM", "AESNI_ASM", "VPAES_ASM", "WHIRLPOOL_ASM", "GHASH_ASM", "ECP_NISTZ256_ASM", "POLY1305_ASM" ],
   libdir => "",
   major => "1",
   makedepprog => "\$(CROSS_COMPILE)gcc",
   minor => "1.1",
   openssl_algorithm_defines => [ "OPENSSL_NO_COMP", "OPENSSL_NO_MD2", "OPENSSL_NO_RC5" ],
   openssl_api_defines => [  ],
-  openssl_other_defines => [ "OPENSSL_RAND_SEED_OS", "OPENSSL_NO_AFALGENG", "OPENSSL_NO_ASAN", "OPENSSL_NO_CRYPTO_MDEBUG", "OPENSSL_NO_CRYPTO_MDEBUG_BACKTRACE", "OPENSSL_NO_DEVCRYPTOENG", "OPENSSL_NO_EC_NISTP_64_GCC_128", "OPENSSL_NO_EGD", "OPENSSL_NO_EXTERNAL_TESTS", "OPENSSL_NO_FUZZ_AFL", "OPENSSL_NO_FUZZ_LIBFUZZER", "OPENSSL_NO_HEARTBEATS", "OPENSSL_NO_MSAN", "OPENSSL_NO_SCTP", "OPENSSL_NO_SSL3", "OPENSSL_NO_SSL3_METHOD", "OPENSSL_NO_UBSAN", "OPENSSL_NO_UNIT_TEST", "OPENSSL_NO_WEAK_SSL_CIPHERS", "OPENSSL_NO_DYNAMIC_ENGINE", "OPENSSL_NO_AFALGENG" ],
+  openssl_other_defines => [ "OPENSSL_RAND_SEED_OS", "OPENSSL_NO_AFALGENG", "OPENSSL_NO_ASAN", "OPENSSL_NO_CRYPTO_MDEBUG", "OPENSSL_NO_CRYPTO_MDEBUG_BACKTRACE", "OPENSSL_NO_DEVCRYPTOENG", "OPENSSL_NO_EC_NISTP_64_GCC_128", "OPENSSL_NO_EGD", "OPENSSL_NO_EXTERNAL_TESTS", "OPENSSL_NO_FUZZ_AFL", "OPENSSL_NO_FUZZ_LIBFUZZER", "OPENSSL_NO_HEARTBEATS", "OPENSSL_NO_MSAN", "OPENSSL_NO_SCTP", "OPENSSL_NO_SSL3", "OPENSSL_NO_SSL3_METHOD", "OPENSSL_NO_UBSAN", "OPENSSL_NO_UNIT_TEST", "OPENSSL_NO_WEAK_SSL_CIPHERS", "OPENSSL_NO_DYNAMIC_ENGINE" ],
   openssl_sys_defines => [  ],
   openssl_thread_defines => [ "OPENSSL_THREADS" ],
   openssldir => "",
@@ -111,8 +111,8 @@ our %config = (
   sourcedir => ".",
   target => "solaris-x86-gcc",
   tdirs => [ "ossl_shim" ],
-  version => "1.1.1d",
-  version_num => "0x1010104fL",
+  version => "1.1.1e",
+  version_num => "0x1010105fL",
 );
 
 our %target = (
@@ -236,6 +236,7 @@ our @disablables = (
   "dgram",
   "dh",
   "dsa",
+  "dso",
   "dtls",
   "dynamic-engine",
   "ec",
@@ -353,8 +354,8 @@ our %unified_info = (
         {
             "" =>
                 [
-                    "crypto/include/internal/bn_conf.h",
-                    "crypto/include/internal/dso_conf.h",
+                    "include/crypto/bn_conf.h",
+                    "include/crypto/dso_conf.h",
                     "include/openssl/opensslconf.h",
                 ],
             "apps/asn1pars.o" =>
@@ -622,14 +623,6 @@ our %unified_info = (
                     "crypto/perlasm/cbc.pl",
                     "crypto/perlasm/x86asm.pl",
                 ],
-            "crypto/include/internal/bn_conf.h" =>
-                [
-                    "configdata.pm",
-                ],
-            "crypto/include/internal/dso_conf.h" =>
-                [
-                    "configdata.pm",
-                ],
             "crypto/rc4/rc4-586.s" =>
                 [
                     "crypto/perlasm/x86asm.pl",
@@ -705,6 +698,14 @@ our %unified_info = (
                 [
                     "libcrypto",
                 ],
+            "include/crypto/bn_conf.h" =>
+                [
+                    "configdata.pm",
+                ],
+            "include/crypto/dso_conf.h" =>
+                [
+                    "configdata.pm",
+                ],
             "include/openssl/opensslconf.h" =>
                 [
                     "configdata.pm",
@@ -1502,6 +1503,12 @@ our %unified_info = (
                     "libcrypto",
                     "test/libtestutil.a",
                 ],
+            "test/ssl_ctx_test" =>
+                [
+                    "libcrypto",
+                    "libssl",
+                    "test/libtestutil.a",
+                ],
             "test/ssl_test" =>
                 [
                     "libcrypto",
@@ -3233,7 +3240,6 @@ our %unified_info = (
                             "test/testutil/cb.o",
                             "test/testutil/driver.o",
                             "test/testutil/format_output.o",
-                            "test/testutil/init.o",
                             "test/testutil/main.o",
                             "test/testutil/output_helpers.o",
                             "test/testutil/random.o",
@@ -3241,6 +3247,7 @@ our %unified_info = (
                             "test/testutil/tap_bio.o",
                             "test/testutil/test_cleanup.o",
                             "test/testutil/tests.o",
+                            "test/testutil/testutil_init.o",
                         ],
                     "products" =>
                         {
@@ -3739,14 +3746,6 @@ our %unified_info = (
                 [
                     "crypto/ia64cpuid.S",
                 ],
-            "crypto/include/internal/bn_conf.h" =>
-                [
-                    "crypto/include/internal/bn_conf.h.in",
-                ],
-            "crypto/include/internal/dso_conf.h" =>
-                [
-                    "crypto/include/internal/dso_conf.h.in",
-                ],
             "crypto/md5/md5-586.s" =>
                 [
                     "crypto/md5/asm/md5-586.pl",
@@ -4187,6 +4186,14 @@ our %unified_info = (
                     "engines/asm/e_padlock-x86_64.pl",
                     "\$(PERLASM_SCHEME)",
                 ],
+            "include/crypto/bn_conf.h" =>
+                [
+                    "include/crypto/bn_conf.h.in",
+                ],
+            "include/crypto/dso_conf.h" =>
+                [
+                    "include/crypto/dso_conf.h.in",
+                ],
             "include/openssl/opensslconf.h" =>
                 [
                     "include/openssl/opensslconf.h.in",
@@ -4881,49 +4888,41 @@ our %unified_info = (
             "crypto/aes/aes_cbc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/aes/aes_cfb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/aes/aes_core.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/aes/aes_ecb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/aes/aes_ige.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/aes/aes_misc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/aes/aes_ofb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/aes/aes_wrap.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/aes/aesfx-sparcv9.o" =>
@@ -4933,7 +4932,6 @@ our %unified_info = (
             "crypto/aes/aesni-x86.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/aes/aest4-sparcv9.o" =>
@@ -4951,13 +4949,11 @@ our %unified_info = (
             "crypto/aes/vpaes-x86.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/aria/aria.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/arm64cpuid.o" =>
@@ -4971,613 +4967,511 @@ our %unified_info = (
             "crypto/asn1/a_bitstr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_d2i_fp.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_digest.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_dup.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_gentm.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_i2d_fp.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_int.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_mbstr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_object.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_octet.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_print.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_sign.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_strex.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_strnid.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_time.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_type.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_utctm.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_utf8.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_verify.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/ameth_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/asn1_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/asn1_gen.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/asn1_item_list.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/asn1_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/asn1_par.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/asn_mime.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/asn_moid.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/asn_mstbl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/asn_pack.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/bio_asn1.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/bio_ndef.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/d2i_pr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/d2i_pu.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/evp_asn1.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/f_int.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/f_string.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/i2d_pr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/i2d_pu.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/n_pkey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/nsseq.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/p5_pbe.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/p5_pbev2.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/p5_scrypt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/p8_pkey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/t_bitst.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/t_pkey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/t_spki.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/tasn_dec.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/tasn_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/tasn_fre.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/tasn_new.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/tasn_prn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/tasn_scn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/tasn_typ.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/tasn_utl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/x_algor.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/x_bignum.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/x_info.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/x_int64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/x_long.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/x_pkey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/x_sig.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/x_spki.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/x_val.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/async/arch/async_null.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/async/arch/async_posix.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/async/arch/async_win.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/async/async.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/async/async_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/async/async_wait.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bf/bf-586.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bf/bf_cfb64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bf/bf_ecb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bf/bf_ofb64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bf/bf_skey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/b_addr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/b_dump.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/b_print.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/b_sock.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/b_sock2.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bf_buff.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bf_lbuf.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bf_nbio.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bf_null.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bio_cb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bio_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bio_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bio_meth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bss_acpt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bss_bio.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bss_conn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bss_dgram.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bss_fd.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bss_file.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bss_log.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bss_mem.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bss_null.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bss_sock.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/blake2/blake2b.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/blake2/blake2s.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/blake2/m_blake2b.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/blake2/m_blake2s.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/armv4-gf2m.o" =>
@@ -5591,7 +5485,6 @@ our %unified_info = (
             "crypto/bn/bn-586.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn-mips.o" =>
@@ -5601,188 +5494,157 @@ our %unified_info = (
             "crypto/bn/bn_add.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_blind.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_const.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_ctx.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_depr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_dh.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_div.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_exp.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto",
                 ],
             "crypto/bn/bn_exp2.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_gcd.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_gf2m.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_intern.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_kron.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_mod.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_mont.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_mpi.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_mul.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_nist.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_prime.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_print.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_rand.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_recp.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_shift.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_sqr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_sqrt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_srp.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_word.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_x931p.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/co-586.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/mips-mont.o" =>
@@ -5812,25 +5674,21 @@ our %unified_info = (
             "crypto/bn/x86-gf2m.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/x86-mont.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/buffer/buf_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/buffer/buffer.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/buildinf.h" =>
@@ -5840,31 +5698,26 @@ our %unified_info = (
             "crypto/camellia/cmll-x86.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/camellia/cmll_cfb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/camellia/cmll_ctr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/camellia/cmll_ecb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/camellia/cmll_ofb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/camellia/cmllt4-sparcv9.o" =>
@@ -5874,31 +5727,26 @@ our %unified_info = (
             "crypto/cast/c_cfb64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cast/c_ecb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cast/c_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cast/c_ofb64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cast/c_skey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/chacha/chacha-armv4.o" =>
@@ -5916,284 +5764,237 @@ our %unified_info = (
             "crypto/chacha/chacha-x86.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cmac/cm_ameth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cmac/cm_pmeth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cmac/cmac.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_asn1.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_att.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_cd.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_dd.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_env.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_ess.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_io.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_kari.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_pwri.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_sd.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_smime.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/conf/conf_api.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/conf/conf_def.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/conf/conf_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/conf/conf_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/conf/conf_mall.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/conf/conf_mod.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/conf/conf_sap.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/conf/conf_ssl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cpt_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cryptlib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ct/ct_b64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ct/ct_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ct/ct_log.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ct/ct_oct.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ct/ct_policy.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ct/ct_prn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ct/ct_sct.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ct/ct_sct_ctx.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ct/ct_vfy.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ct/ct_x509v3.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ctype.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cversion.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto",
                 ],
             "crypto/des/cbc_cksm.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/cbc_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/cfb64ede.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/cfb64enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/cfb_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/crypt586.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/des-586.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/dest4-sparcv9.o" =>
@@ -6203,295 +6004,246 @@ our %unified_info = (
             "crypto/des/ecb3_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/ecb_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/fcrypt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/ofb64ede.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/ofb64enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/ofb_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/pcbc_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/qud_cksm.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/rand_key.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/set_key.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/str2key.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/xcbc_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_ameth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_asn1.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_check.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_depr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_gen.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_kdf.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_key.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_meth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_pmeth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_prn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_rfc5114.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_rfc7919.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dsa/dsa_ameth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dsa/dsa_asn1.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dsa/dsa_depr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dsa/dsa_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dsa/dsa_gen.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dsa/dsa_key.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dsa/dsa_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dsa/dsa_meth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dsa/dsa_ossl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dsa/dsa_pmeth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dsa/dsa_prn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dsa/dsa_sign.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dsa/dsa_vrf.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dso/dso_dl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dso/dso_dlfcn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dso/dso_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dso/dso_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dso/dso_openssl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dso/dso_vms.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dso/dso_win32.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ebcdic.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/curve25519.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/curve448/arch_32/f_impl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto/ec/curve448/arch_32",
                     "crypto/ec/curve448",
@@ -6499,7 +6251,6 @@ our %unified_info = (
             "crypto/ec/curve448/curve448.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto/ec/curve448/arch_32",
                     "crypto/ec/curve448",
@@ -6507,7 +6258,6 @@ our %unified_info = (
             "crypto/ec/curve448/curve448_tables.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto/ec/curve448/arch_32",
                     "crypto/ec/curve448",
@@ -6515,7 +6265,6 @@ our %unified_info = (
             "crypto/ec/curve448/eddsa.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto/ec/curve448/arch_32",
                     "crypto/ec/curve448",
@@ -6523,7 +6272,6 @@ our %unified_info = (
             "crypto/ec/curve448/f_generic.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto/ec/curve448/arch_32",
                     "crypto/ec/curve448",
@@ -6531,7 +6279,6 @@ our %unified_info = (
             "crypto/ec/curve448/scalar.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto/ec/curve448/arch_32",
                     "crypto/ec/curve448",
@@ -6539,163 +6286,136 @@ our %unified_info = (
             "crypto/ec/ec2_oct.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec2_smpl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec_ameth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec_asn1.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec_check.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec_curve.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec_cvt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec_key.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec_kmeth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec_mult.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec_oct.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec_pmeth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec_print.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecdh_kdf.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecdh_ossl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecdsa_ossl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecdsa_sign.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecdsa_vrf.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/eck_prn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecp_mont.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecp_nist.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecp_nistp224.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecp_nistp256.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecp_nistp521.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecp_nistputil.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecp_nistz256-armv4.o" =>
@@ -6713,235 +6433,196 @@ our %unified_info = (
             "crypto/ec/ecp_nistz256-x86.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecp_nistz256.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecp_oct.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecp_smpl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecx_meth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/eng_all.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/eng_cnf.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/eng_ctrl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/eng_dyn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/eng_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/eng_fat.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/eng_init.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/eng_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/eng_list.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/eng_openssl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/eng_pkey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/eng_rdrand.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/eng_table.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/tb_asnmth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/tb_cipher.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/tb_dh.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/tb_digest.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/tb_dsa.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/tb_eckey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/tb_pkmeth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/tb_rand.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/tb_rsa.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/err/err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/err/err_all.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/err/err_prn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/bio_b64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/bio_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/bio_md.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/bio_ok.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/c_allc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/c_alld.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/cmeth_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/digest.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/e_aes.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto",
                     "crypto/modes",
@@ -6949,21 +6630,18 @@ our %unified_info = (
             "crypto/evp/e_aes_cbc_hmac_sha1.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto/modes",
                 ],
             "crypto/evp/e_aes_cbc_hmac_sha256.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto/modes",
                 ],
             "crypto/evp/e_aria.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto",
                     "crypto/modes",
@@ -6971,13 +6649,11 @@ our %unified_info = (
             "crypto/evp/e_bf.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/e_camellia.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto",
                     "crypto/modes",
@@ -6985,81 +6661,68 @@ our %unified_info = (
             "crypto/evp/e_cast.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/e_chacha20_poly1305.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/e_des.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto",
                 ],
             "crypto/evp/e_des3.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto",
                 ],
             "crypto/evp/e_idea.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/e_null.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/e_old.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/e_rc2.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/e_rc4.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/e_rc4_hmac_md5.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/e_rc5.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/e_seed.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/e_sm4.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto",
                     "crypto/modes",
@@ -7067,334 +6730,272 @@ our %unified_info = (
             "crypto/evp/e_xcbc_d.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/encode.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/evp_cnf.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/evp_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/evp_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/evp_key.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/evp_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/evp_pbe.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/evp_pkey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/m_md2.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/m_md4.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/m_md5.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/m_md5_sha1.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/m_mdc2.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/m_null.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/m_ripemd.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/m_sha1.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/m_sha3.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto",
                 ],
             "crypto/evp/m_sigver.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/m_wp.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/names.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/p5_crpt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/p5_crpt2.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/p_dec.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/p_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/p_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/p_open.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/p_seal.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/p_sign.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/p_verify.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/pbe_scrypt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/pmeth_fn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/pmeth_gn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/pmeth_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ex_data.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/getenv.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/hmac/hm_ameth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/hmac/hm_pmeth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/hmac/hmac.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/idea/i_cbc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/idea/i_cfb64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/idea/i_ecb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/idea/i_ofb64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/idea/i_skey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
-            "crypto/include/internal/bn_conf.h" =>
-                [
-                    ".",
-                ],
-            "crypto/include/internal/dso_conf.h" =>
-                [
-                    ".",
-                ],
             "crypto/init.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/kdf/hkdf.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/kdf/kdf_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/kdf/scrypt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/kdf/tls1_prf.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/lhash/lh_stats.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/lhash/lhash.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/md4/md4_dgst.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/md4/md4_one.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/md5/md5-586.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/md5/md5-sparcv9.o" =>
@@ -7404,79 +7005,66 @@ our %unified_info = (
             "crypto/md5/md5_dgst.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/md5/md5_one.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/mdc2/mdc2_one.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/mdc2/mdc2dgst.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/mem.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/mem_dbg.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/mem_sec.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/modes/cbc128.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/modes/ccm128.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/modes/cfb128.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/modes/ctr128.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/modes/cts128.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/modes/gcm128.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto",
                 ],
@@ -7495,7 +7083,6 @@ our %unified_info = (
             "crypto/modes/ghash-x86.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/modes/ghashv8-armx.o" =>
@@ -7505,361 +7092,301 @@ our %unified_info = (
             "crypto/modes/ocb128.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/modes/ofb128.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/modes/wrap128.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/modes/xts128.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/o_dir.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/o_fips.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/o_fopen.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/o_init.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/o_str.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/o_time.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/objects/o_names.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/objects/obj_dat.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/objects/obj_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/objects/obj_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/objects/obj_xref.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ocsp/ocsp_asn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ocsp/ocsp_cl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ocsp/ocsp_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ocsp/ocsp_ext.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ocsp/ocsp_ht.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ocsp/ocsp_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ocsp/ocsp_prn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ocsp/ocsp_srv.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ocsp/ocsp_vfy.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ocsp/v3_ocsp.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pem/pem_all.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pem/pem_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pem/pem_info.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pem/pem_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pem/pem_oth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pem/pem_pk8.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pem/pem_pkey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pem/pem_sign.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pem/pem_x509.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pem/pem_xaux.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pem/pvkfmt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_add.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_asn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_attr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_crpt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_crt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_decr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_init.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_key.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_kiss.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_mutl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_npas.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_p8d.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_p8e.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_sbag.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_utl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/pk12err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs7/bio_pk7.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs7/pk7_asn1.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs7/pk7_attr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs7/pk7_doit.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs7/pk7_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs7/pk7_mime.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs7/pk7_smime.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs7/pkcs7err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/poly1305/poly1305-armv4.o" =>
@@ -7881,265 +7408,221 @@ our %unified_info = (
             "crypto/poly1305/poly1305-x86.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/poly1305/poly1305.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/poly1305/poly1305_ameth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/poly1305/poly1305_pmeth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rand/drbg_ctr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rand/drbg_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rand/rand_egd.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rand/rand_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rand/rand_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rand/rand_unix.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rand/rand_vms.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rand/rand_win.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rand/randfile.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rc2/rc2_cbc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rc2/rc2_ecb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rc2/rc2_skey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rc2/rc2cfb64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rc2/rc2ofb64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rc4/rc4-586.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ripemd/rmd-586.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ripemd/rmd_dgst.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ripemd/rmd_one.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_ameth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_asn1.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_chk.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_crpt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_depr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_gen.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_meth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_mp.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_none.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_oaep.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_ossl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_pk1.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_pmeth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_prn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_pss.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_saos.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_sign.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_ssl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_x931.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_x931g.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/s390xcpuid.o" =>
@@ -8149,31 +7632,26 @@ our %unified_info = (
             "crypto/seed/seed.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/seed/seed_cbc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/seed/seed_cfb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/seed/seed_ecb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/seed/seed_ofb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sha/keccak1600-armv4.o" =>
@@ -8183,13 +7661,11 @@ our %unified_info = (
             "crypto/sha/keccak1600.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sha/sha1-586.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sha/sha1-armv4-large.o" =>
@@ -8215,19 +7691,16 @@ our %unified_info = (
             "crypto/sha/sha1_one.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sha/sha1dgst.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sha/sha256-586.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sha/sha256-armv4.o" =>
@@ -8253,13 +7726,11 @@ our %unified_info = (
             "crypto/sha/sha256.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sha/sha512-586.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sha/sha512-armv4.o" =>
@@ -8285,727 +7756,606 @@ our %unified_info = (
             "crypto/sha/sha512.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/siphash/siphash.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/siphash/siphash_ameth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/siphash/siphash_pmeth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sm2/sm2_crypt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sm2/sm2_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sm2/sm2_pmeth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sm2/sm2_sign.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sm3/m_sm3.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sm3/sm3.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sm4/sm4.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/srp/srp_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/srp/srp_vfy.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/stack/stack.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/store/loader_file.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/store/store_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/store/store_init.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/store/store_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/store/store_register.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/store/store_strings.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/threads_none.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/threads_pthread.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/threads_win.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ts/ts_asn1.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ts/ts_conf.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ts/ts_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ts/ts_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ts/ts_req_print.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ts/ts_req_utils.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ts/ts_rsp_print.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ts/ts_rsp_sign.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ts/ts_rsp_utils.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ts/ts_rsp_verify.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ts/ts_verify_ctx.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/txt_db/txt_db.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ui/ui_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ui/ui_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ui/ui_null.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ui/ui_openssl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ui/ui_util.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/uid.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/whrlpool/wp-mmx.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/whrlpool/wp_block.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/whrlpool/wp_dgst.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/by_dir.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/by_file.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/t_crl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/t_req.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/t_x509.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_att.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_cmp.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_d2.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_def.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_ext.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_lu.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_meth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_obj.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_r2x.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_req.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_set.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_trs.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_txt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_v3.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_vfy.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_vpm.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509cset.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509name.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509rset.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509spki.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509type.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x_all.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x_attrib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x_crl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x_exten.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x_name.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x_pubkey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x_req.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x_x509.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x_x509a.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/pcy_cache.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/pcy_data.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/pcy_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/pcy_map.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/pcy_node.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/pcy_tree.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_addr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_admis.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_akey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_akeya.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_alt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_asid.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_bcons.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_bitst.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_conf.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_cpols.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_crld.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_enum.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_extku.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_genn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_ia5.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_info.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_int.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_ncons.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_pci.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_pcia.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_pcons.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_pku.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_pmaps.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_prn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_purp.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_skey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_sxnet.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_tlsf.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_utl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x86cpuid.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "engines/e_capi.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "engines/e_padlock-x86.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "engines/e_padlock.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "fuzz/asn1.o" =>
@@ -9056,6 +8406,14 @@ our %unified_info = (
                 [
                     "include",
                 ],
+            "include/crypto/bn_conf.h" =>
+                [
+                    ".",
+                ],
+            "include/crypto/dso_conf.h" =>
+                [
+                    ".",
+                ],
             "include/openssl/opensslconf.h" =>
                 [
                     ".",
@@ -9300,7 +8658,6 @@ our %unified_info = (
                 [
                     ".",
                     "include",
-                    "crypto/include",
                 ],
             "test/asn1_string_table_test.o" =>
                 [
@@ -9626,7 +8983,6 @@ our %unified_info = (
                 [
                     ".",
                     "include",
-                    "crypto/include",
                 ],
             "test/cipher_overhead_test.o" =>
                 [
@@ -9672,7 +9028,6 @@ our %unified_info = (
             "test/ctype_internal_test.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "test/curve448_internal_test.o" =>
@@ -9738,7 +9093,6 @@ our %unified_info = (
                 [
                     "include",
                     "crypto/ec",
-                    "crypto/include",
                 ],
             "test/ecdsatest.o" =>
                 [
@@ -9763,7 +9117,6 @@ our %unified_info = (
             "test/evp_extra_test.o" =>
                 [
                     "include",
-                    "crypto/include",
                 ],
             "test/evp_test.o" =>
                 [
@@ -9861,7 +9214,6 @@ our %unified_info = (
                 [
                     ".",
                     "include",
-                    "crypto/include",
                 ],
             "test/rc2test.o" =>
                 [
@@ -9911,18 +9263,15 @@ our %unified_info = (
                 [
                     ".",
                     "include",
-                    "crypto/include",
                 ],
             "test/sm2_internal_test.o" =>
                 [
                     "include",
-                    "crypto/include",
                 ],
             "test/sm4_internal_test.o" =>
                 [
                     ".",
                     "include",
-                    "crypto/include",
                 ],
             "test/srptest.o" =>
                 [
@@ -9933,6 +9282,10 @@ our %unified_info = (
                     ".",
                     "include",
                 ],
+            "test/ssl_ctx_test.o" =>
+                [
+                    "include",
+                ],
             "test/ssl_test.o" =>
                 [
                     "include",
@@ -9996,10 +9349,6 @@ our %unified_info = (
                 [
                     "include",
                 ],
-            "test/testutil/init.o" =>
-                [
-                    "include",
-                ],
             "test/testutil/main.o" =>
                 [
                     "include",
@@ -10028,6 +9377,10 @@ our %unified_info = (
                 [
                     "include",
                 ],
+            "test/testutil/testutil_init.o" =>
+                [
+                    "include",
+                ],
             "test/threadstest.o" =>
                 [
                     "include",
@@ -10292,6 +9645,7 @@ our %unified_info = (
             "test/sm4_internal_test",
             "test/srptest",
             "test/ssl_cert_table_internal_test",
+            "test/ssl_ctx_test",
             "test/ssl_test",
             "test/ssl_test_ctx_test",
             "test/sslapitest",
@@ -15247,7 +14601,6 @@ our %unified_info = (
                     "test/testutil/cb.o",
                     "test/testutil/driver.o",
                     "test/testutil/format_output.o",
-                    "test/testutil/init.o",
                     "test/testutil/main.o",
                     "test/testutil/output_helpers.o",
                     "test/testutil/random.o",
@@ -15255,6 +14608,7 @@ our %unified_info = (
                     "test/testutil/tap_bio.o",
                     "test/testutil/test_cleanup.o",
                     "test/testutil/tests.o",
+                    "test/testutil/testutil_init.o",
                 ],
             "test/md2test" =>
                 [
@@ -15482,6 +14836,14 @@ our %unified_info = (
                 [
                     "test/ssl_cert_table_internal_test.c",
                 ],
+            "test/ssl_ctx_test" =>
+                [
+                    "test/ssl_ctx_test.o",
+                ],
+            "test/ssl_ctx_test.o" =>
+                [
+                    "test/ssl_ctx_test.c",
+                ],
             "test/ssl_test" =>
                 [
                     "test/handshake_helper.o",
@@ -15584,10 +14946,6 @@ our %unified_info = (
                 [
                     "test/testutil/format_output.c",
                 ],
-            "test/testutil/init.o" =>
-                [
-                    "test/testutil/init.c",
-                ],
             "test/testutil/main.o" =>
                 [
                     "test/testutil/main.c",
@@ -15616,6 +14974,10 @@ our %unified_info = (
                 [
                     "test/testutil/tests.c",
                 ],
+            "test/testutil/testutil_init.o" =>
+                [
+                    "test/testutil/testutil_init.c",
+                ],
             "test/threadstest" =>
                 [
                     "test/threadstest.o",
diff --git a/deps/openssl/config/archs/solaris-x86-gcc/asm/crypto/aes/aes-586.s b/deps/openssl/config/archs/solaris-x86-gcc/asm/crypto/aes/aes-586.s
deleted file mode 100644
index 53cd2909ac..0000000000
--- a/deps/openssl/config/archs/solaris-x86-gcc/asm/crypto/aes/aes-586.s
+++ /dev/null
@@ -1,3243 +0,0 @@
-.text
-.type	_x86_AES_encrypt_compact,@function
-.align	16
-_x86_AES_encrypt_compact:
-	movl	%edi,20(%esp)
-	xorl	(%edi),%eax
-	xorl	4(%edi),%ebx
-	xorl	8(%edi),%ecx
-	xorl	12(%edi),%edx
-	movl	240(%edi),%esi
-	leal	-2(%esi,%esi,1),%esi
-	leal	(%edi,%esi,8),%esi
-	movl	%esi,24(%esp)
-	movl	-128(%ebp),%edi
-	movl	-96(%ebp),%esi
-	movl	-64(%ebp),%edi
-	movl	-32(%ebp),%esi
-	movl	(%ebp),%edi
-	movl	32(%ebp),%esi
-	movl	64(%ebp),%edi
-	movl	96(%ebp),%esi
-.align	16
-.L000loop:
-	movl	%eax,%esi
-	andl	$255,%esi
-	movzbl	-128(%ebp,%esi,1),%esi
-	movzbl	%bh,%edi
-	movzbl	-128(%ebp,%edi,1),%edi
-	shll	$8,%edi
-	xorl	%edi,%esi
-	movl	%ecx,%edi
-	shrl	$16,%edi
-	andl	$255,%edi
-	movzbl	-128(%ebp,%edi,1),%edi
-	shll	$16,%edi
-	xorl	%edi,%esi
-	movl	%edx,%edi
-	shrl	$24,%edi
-	movzbl	-128(%ebp,%edi,1),%edi
-	shll	$24,%edi
-	xorl	%edi,%esi
-	movl	%esi,4(%esp)
-
-	movl	%ebx,%esi
-	andl	$255,%esi
-	shrl	$16,%ebx
-	movzbl	-128(%ebp,%esi,1),%esi
-	movzbl	%ch,%edi
-	movzbl	-128(%ebp,%edi,1),%edi
-	shll	$8,%edi
-	xorl	%edi,%esi
-	movl	%edx,%edi
-	shrl	$16,%edi
-	andl	$255,%edi
-	movzbl	-128(%ebp,%edi,1),%edi
-	shll	$16,%edi
-	xorl	%edi,%esi
-	movl	%eax,%edi
-	shrl	$24,%edi
-	movzbl	-128(%ebp,%edi,1),%edi
-	shll	$24,%edi
-	xorl	%edi,%esi
-	movl	%esi,8(%esp)
-
-	movl	%ecx,%esi
-	andl	$255,%esi
-	shrl	$24,%ecx
-	movzbl	-128(%ebp,%esi,1),%esi
-	movzbl	%dh,%edi
-	movzbl	-128(%ebp,%edi,1),%edi
-	shll	$8,%edi
-	xorl	%edi,%esi
-	movl	%eax,%edi
-	shrl	$16,%edi
-	andl	$255,%edx
-	andl	$255,%edi
-	movzbl	-128(%ebp,%edi,1),%edi
-	shll	$16,%edi
-	xorl	%edi,%esi
-	movzbl	%bh,%edi
-	movzbl	-128(%ebp,%edi,1),%edi
-	shll	$24,%edi
-	xorl	%edi,%esi
-
-	andl	$255,%edx
-	movzbl	-128(%ebp,%edx,1),%edx
-	movzbl	%ah,%eax
-	movzbl	-128(%ebp,%eax,1),%eax
-	shll	$8,%eax
-	xorl	%eax,%edx
-	movl	4(%esp),%eax
-	andl	$255,%ebx
-	movzbl	-128(%ebp,%ebx,1),%ebx
-	shll	$16,%ebx
-	xorl	%ebx,%edx
-	movl	8(%esp),%ebx
-	movzbl	-128(%ebp,%ecx,1),%ecx
-	shll	$24,%ecx
-	xorl	%ecx,%edx
-	movl	%esi,%ecx
-
-	movl	$2155905152,%ebp
-	andl	%ecx,%ebp
-	leal	(%ecx,%ecx,1),%edi
-	movl	%ebp,%esi
-	shrl	$7,%ebp
-	andl	$4278124286,%edi
-	subl	%ebp,%esi
-	movl	%ecx,%ebp
-	andl	$454761243,%esi
-	rorl	$16,%ebp
-	xorl	%edi,%esi
-	movl	%ecx,%edi
-	xorl	%esi,%ecx
-	rorl	$24,%edi
-	xorl	%ebp,%esi
-	roll	$24,%ecx
-	xorl	%edi,%esi
-	movl	$2155905152,%ebp
-	xorl	%esi,%ecx
-	andl	%edx,%ebp
-	leal	(%edx,%edx,1),%edi
-	movl	%ebp,%esi
-	shrl	$7,%ebp
-	andl	$4278124286,%edi
-	subl	%ebp,%esi
-	movl	%edx,%ebp
-	andl	$454761243,%esi
-	rorl	$16,%ebp
-	xorl	%edi,%esi
-	movl	%edx,%edi
-	xorl	%esi,%edx
-	rorl	$24,%edi
-	xorl	%ebp,%esi
-	roll	$24,%edx
-	xorl	%edi,%esi
-	movl	$2155905152,%ebp
-	xorl	%esi,%edx
-	andl	%eax,%ebp
-	leal	(%eax,%eax,1),%edi
-	movl	%ebp,%esi
-	shrl	$7,%ebp
-	andl	$4278124286,%edi
-	subl	%ebp,%esi
-	movl	%eax,%ebp
-	andl	$454761243,%esi
-	rorl	$16,%ebp
-	xorl	%edi,%esi
-	movl	%eax,%edi
-	xorl	%esi,%eax
-	rorl	$24,%edi
-	xorl	%ebp,%esi
-	roll	$24,%eax
-	xorl	%edi,%esi
-	movl	$2155905152,%ebp
-	xorl	%esi,%eax
-	andl	%ebx,%ebp
-	leal	(%ebx,%ebx,1),%edi
-	movl	%ebp,%esi
-	shrl	$7,%ebp
-	andl	$4278124286,%edi
-	subl	%ebp,%esi
-	movl	%ebx,%ebp
-	andl	$454761243,%esi
-	rorl	$16,%ebp
-	xorl	%edi,%esi
-	movl	%ebx,%edi
-	xorl	%esi,%ebx
-	rorl	$24,%edi
-	xorl	%ebp,%esi
-	roll	$24,%ebx
-	xorl	%edi,%esi
-	xorl	%esi,%ebx
-	movl	20(%esp),%edi
-	movl	28(%esp),%ebp
-	addl	$16,%edi
-	xorl	(%edi),%eax
-	xorl	4(%edi),%ebx
-	xorl	8(%edi),%ecx
-	xorl	12(%edi),%edx
-	cmpl	24(%esp),%edi
-	movl	%edi,20(%esp)
-	jb	.L000loop
-	movl	%eax,%esi
-	andl	$255,%esi
-	movzbl	-128(%ebp,%esi,1),%esi
-	movzbl	%bh,%edi
-	movzbl	-128(%ebp,%edi,1),%edi
-	shll	$8,%edi
-	xorl	%edi,%esi
-	movl	%ecx,%edi
-	shrl	$16,%edi
-	andl	$255,%edi
-	movzbl	-128(%ebp,%edi,1),%edi
-	shll	$16,%edi
-	xorl	%edi,%esi
-	movl	%edx,%edi
-	shrl	$24,%edi
-	movzbl	-128(%ebp,%edi,1),%edi
-	shll	$24,%edi
-	xorl	%edi,%esi
-	movl	%esi,4(%esp)
-
-	movl	%ebx,%esi
-	andl	$255,%esi
-	shrl	$16,%ebx
-	movzbl	-128(%ebp,%esi,1),%esi
-	movzbl	%ch,%edi
-	movzbl	-128(%ebp,%edi,1),%edi
-	shll	$8,%edi
-	xorl	%edi,%esi
-	movl	%edx,%edi
-	shrl	$16,%edi
-	andl	$255,%edi
-	movzbl	-128(%ebp,%edi,1),%edi
-	shll	$16,%edi
-	xorl	%edi,%esi
-	movl	%eax,%edi
-	shrl	$24,%edi
-	movzbl	-128(%ebp,%edi,1),%edi
-	shll	$24,%edi
-	xorl	%edi,%esi
-	movl	%esi,8(%esp)
-
-	movl	%ecx,%esi
-	andl	$255,%esi
-	shrl	$24,%ecx
-	movzbl	-128(%ebp,%esi,1),%esi
-	movzbl	%dh,%edi
-	movzbl	-128(%ebp,%edi,1),%edi
-	shll	$8,%edi
-	xorl	%edi,%esi
-	movl	%eax,%edi
-	shrl	$16,%edi
-	andl	$255,%edx
-	andl	$255,%edi
-	movzbl	-128(%ebp,%edi,1),%edi
-	shll	$16,%edi
-	xorl	%edi,%esi
-	movzbl	%bh,%edi
-	movzbl	-128(%ebp,%edi,1),%edi
-	shll	$24,%edi
-	xorl	%edi,%esi
-
-	movl	20(%esp),%edi
-	andl	$255,%edx
-	movzbl	-128(%ebp,%edx,1),%edx
-	movzbl	%ah,%eax
-	movzbl	-128(%ebp,%eax,1),%eax
-	shll	$8,%eax
-	xorl	%eax,%edx
-	movl	4(%esp),%eax
-	andl	$255,%ebx
-	movzbl	-128(%ebp,%ebx,1),%ebx
-	shll	$16,%ebx
-	xorl	%ebx,%edx
-	movl	8(%esp),%ebx
-	movzbl	-128(%ebp,%ecx,1),%ecx
-	shll	$24,%ecx
-	xorl	%ecx,%edx
-	movl	%esi,%ecx
-
-	xorl	16(%edi),%eax
-	xorl	20(%edi),%ebx
-	xorl	24(%edi),%ecx
-	xorl	28(%edi),%edx
-	ret
-.size	_x86_AES_encrypt_compact,.-_x86_AES_encrypt_compact
-.type	_sse_AES_encrypt_compact,@function
-.align	16
-_sse_AES_encrypt_compact:
-	pxor	(%edi),%mm0
-	pxor	8(%edi),%mm4
-	movl	240(%edi),%esi
-	leal	-2(%esi,%esi,1),%esi
-	leal	(%edi,%esi,8),%esi
-	movl	%esi,24(%esp)
-	movl	$454761243,%eax
-	movl	%eax,8(%esp)
-	movl	%eax,12(%esp)
-	movl	-128(%ebp),%eax
-	movl	-96(%ebp),%ebx
-	movl	-64(%ebp),%ecx
-	movl	-32(%ebp),%edx
-	movl	(%ebp),%eax
-	movl	32(%ebp),%ebx
-	movl	64(%ebp),%ecx
-	movl	96(%ebp),%edx
-.align	16
-.L001loop:
-	pshufw	$8,%mm0,%mm1
-	pshufw	$13,%mm4,%mm5
-	movd	%mm1,%eax
-	movd	%mm5,%ebx
-	movl	%edi,20(%esp)
-	movzbl	%al,%esi
-	movzbl	%ah,%edx
-	pshufw	$13,%mm0,%mm2
-	movzbl	-128(%ebp,%esi,1),%ecx
-	movzbl	%bl,%edi
-	movzbl	-128(%ebp,%edx,1),%edx
-	shrl	$16,%eax
-	shll	$8,%edx
-	movzbl	-128(%ebp,%edi,1),%esi
-	movzbl	%bh,%edi
-	shll	$16,%esi
-	pshufw	$8,%mm4,%mm6
-	orl	%esi,%ecx
-	movzbl	-128(%ebp,%edi,1),%esi
-	movzbl	%ah,%edi
-	shll	$24,%esi
-	shrl	$16,%ebx
-	orl	%esi,%edx
-	movzbl	-128(%ebp,%edi,1),%esi
-	movzbl	%bh,%edi
-	shll	$8,%esi
-	orl	%esi,%ecx
-	movzbl	-128(%ebp,%edi,1),%esi
-	movzbl	%al,%edi
-	shll	$24,%esi
-	orl	%esi,%ecx
-	movzbl	-128(%ebp,%edi,1),%esi
-	movzbl	%bl,%edi
-	movd	%mm2,%eax
-	movd	%ecx,%mm0
-	movzbl	-128(%ebp,%edi,1),%ecx
-	movzbl	%ah,%edi
-	shll	$16,%ecx
-	movd	%mm6,%ebx
-	orl	%esi,%ecx
-	movzbl	-128(%ebp,%edi,1),%esi
-	movzbl	%bh,%edi
-	shll	$24,%esi
-	orl	%esi,%ecx
-	movzbl	-128(%ebp,%edi,1),%esi
-	movzbl	%bl,%edi
-	shll	$8,%esi
-	shrl	$16,%ebx
-	orl	%esi,%ecx
-	movzbl	-128(%ebp,%edi,1),%esi
-	movzbl	%al,%edi
-	shrl	$16,%eax
-	movd	%ecx,%mm1
-	movzbl	-128(%ebp,%edi,1),%ecx
-	movzbl	%ah,%edi
-	shll	$16,%ecx
-	andl	$255,%eax
-	orl	%esi,%ecx
-	punpckldq	%mm1,%mm0
-	movzbl	-128(%ebp,%edi,1),%esi
-	movzbl	%bh,%edi
-	shll	$24,%esi
-	andl	$255,%ebx
-	movzbl	-128(%ebp,%eax,1),%eax
-	orl	%esi,%ecx
-	shll	$16,%eax
-	movzbl	-128(%ebp,%edi,1),%esi
-	orl	%eax,%edx
-	shll	$8,%esi
-	movzbl	-128(%ebp,%ebx,1),%ebx
-	orl	%esi,%ecx
-	orl	%ebx,%edx
-	movl	20(%esp),%edi
-	movd	%ecx,%mm4
-	movd	%edx,%mm5
-	punpckldq	%mm5,%mm4
-	addl	$16,%edi
-	cmpl	24(%esp),%edi
-	ja	.L002out
-	movq	8(%esp),%mm2
-	pxor	%mm3,%mm3
-	pxor	%mm7,%mm7
-	movq	%mm0,%mm1
-	movq	%mm4,%mm5
-	pcmpgtb	%mm0,%mm3
-	pcmpgtb	%mm4,%mm7
-	pand	%mm2,%mm3
-	pand	%mm2,%mm7
-	pshufw	$177,%mm0,%mm2
-	pshufw	$177,%mm4,%mm6
-	paddb	%mm0,%mm0
-	paddb	%mm4,%mm4
-	pxor	%mm3,%mm0
-	pxor	%mm7,%mm4
-	pshufw	$177,%mm2,%mm3
-	pshufw	$177,%mm6,%mm7
-	pxor	%mm0,%mm1
-	pxor	%mm4,%mm5
-	pxor	%mm2,%mm0
-	pxor	%mm6,%mm4
-	movq	%mm3,%mm2
-	movq	%mm7,%mm6
-	pslld	$8,%mm3
-	pslld	$8,%mm7
-	psrld	$24,%mm2
-	psrld	$24,%mm6
-	pxor	%mm3,%mm0
-	pxor	%mm7,%mm4
-	pxor	%mm2,%mm0
-	pxor	%mm6,%mm4
-	movq	%mm1,%mm3
-	movq	%mm5,%mm7
-	movq	(%edi),%mm2
-	movq	8(%edi),%mm6
-	psrld	$8,%mm1
-	psrld	$8,%mm5
-	movl	-128(%ebp),%eax
-	pslld	$24,%mm3
-	pslld	$24,%mm7
-	movl	-64(%ebp),%ebx
-	pxor	%mm1,%mm0
-	pxor	%mm5,%mm4
-	movl	(%ebp),%ecx
-	pxor	%mm3,%mm0
-	pxor	%mm7,%mm4
-	movl	64(%ebp),%edx
-	pxor	%mm2,%mm0
-	pxor	%mm6,%mm4
-	jmp	.L001loop
-.align	16
-.L002out:
-	pxor	(%edi),%mm0
-	pxor	8(%edi),%mm4
-	ret
-.size	_sse_AES_encrypt_compact,.-_sse_AES_encrypt_compact
-.type	_x86_AES_encrypt,@function
-.align	16
-_x86_AES_encrypt:
-	movl	%edi,20(%esp)
-	xorl	(%edi),%eax
-	xorl	4(%edi),%ebx
-	xorl	8(%edi),%ecx
-	xorl	12(%edi),%edx
-	movl	240(%edi),%esi
-	leal	-2(%esi,%esi,1),%esi
-	leal	(%edi,%esi,8),%esi
-	movl	%esi,24(%esp)
-.align	16
-.L003loop:
-	movl	%eax,%esi
-	andl	$255,%esi
-	movl	(%ebp,%esi,8),%esi
-	movzbl	%bh,%edi
-	xorl	3(%ebp,%edi,8),%esi
-	movl	%ecx,%edi
-	shrl	$16,%edi
-	andl	$255,%edi
-	xorl	2(%ebp,%edi,8),%esi
-	movl	%edx,%edi
-	shrl	$24,%edi
-	xorl	1(%ebp,%edi,8),%esi
-	movl	%esi,4(%esp)
-
-	movl	%ebx,%esi
-	andl	$255,%esi
-	shrl	$16,%ebx
-	movl	(%ebp,%esi,8),%esi
-	movzbl	%ch,%edi
-	xorl	3(%ebp,%edi,8),%esi
-	movl	%edx,%edi
-	shrl	$16,%edi
-	andl	$255,%edi
-	xorl	2(%ebp,%edi,8),%esi
-	movl	%eax,%edi
-	shrl	$24,%edi
-	xorl	1(%ebp,%edi,8),%esi
-	movl	%esi,8(%esp)
-
-	movl	%ecx,%esi
-	andl	$255,%esi
-	shrl	$24,%ecx
-	movl	(%ebp,%esi,8),%esi
-	movzbl	%dh,%edi
-	xorl	3(%ebp,%edi,8),%esi
-	movl	%eax,%edi
-	shrl	$16,%edi
-	andl	$255,%edx
-	andl	$255,%edi
-	xorl	2(%ebp,%edi,8),%esi
-	movzbl	%bh,%edi
-	xorl	1(%ebp,%edi,8),%esi
-
-	movl	20(%esp),%edi
-	movl	(%ebp,%edx,8),%edx
-	movzbl	%ah,%eax
-	xorl	3(%ebp,%eax,8),%edx
-	movl	4(%esp),%eax
-	andl	$255,%ebx
-	xorl	2(%ebp,%ebx,8),%edx
-	movl	8(%esp),%ebx
-	xorl	1(%ebp,%ecx,8),%edx
-	movl	%esi,%ecx
-
-	addl	$16,%edi
-	xorl	(%edi),%eax
-	xorl	4(%edi),%ebx
-	xorl	8(%edi),%ecx
-	xorl	12(%edi),%edx
-	cmpl	24(%esp),%edi
-	movl	%edi,20(%esp)
-	jb	.L003loop
-	movl	%eax,%esi
-	andl	$255,%esi
-	movl	2(%ebp,%esi,8),%esi
-	andl	$255,%esi
-	movzbl	%bh,%edi
-	movl	(%ebp,%edi,8),%edi
-	andl	$65280,%edi
-	xorl	%edi,%esi
-	movl	%ecx,%edi
-	shrl	$16,%edi
-	andl	$255,%edi
-	movl	(%ebp,%edi,8),%edi
-	andl	$16711680,%edi
-	xorl	%edi,%esi
-	movl	%edx,%edi
-	shrl	$24,%edi
-	movl	2(%ebp,%edi,8),%edi
-	andl	$4278190080,%edi
-	xorl	%edi,%esi
-	movl	%esi,4(%esp)
-	movl	%ebx,%esi
-	andl	$255,%esi
-	shrl	$16,%ebx
-	movl	2(%ebp,%esi,8),%esi
-	andl	$255,%esi
-	movzbl	%ch,%edi
-	movl	(%ebp,%edi,8),%edi
-	andl	$65280,%edi
-	xorl	%edi,%esi
-	movl	%edx,%edi
-	shrl	$16,%edi
-	andl	$255,%edi
-	movl	(%ebp,%edi,8),%edi
-	andl	$16711680,%edi
-	xorl	%edi,%esi
-	movl	%eax,%edi
-	shrl	$24,%edi
-	movl	2(%ebp,%edi,8),%edi
-	andl	$4278190080,%edi
-	xorl	%edi,%esi
-	movl	%esi,8(%esp)
-	movl	%ecx,%esi
-	andl	$255,%esi
-	shrl	$24,%ecx
-	movl	2(%ebp,%esi,8),%esi
-	andl	$255,%esi
-	movzbl	%dh,%edi
-	movl	(%ebp,%edi,8),%edi
-	andl	$65280,%edi
-	xorl	%edi,%esi
-	movl	%eax,%edi
-	shrl	$16,%edi
-	andl	$255,%edx
-	andl	$255,%edi
-	movl	(%ebp,%edi,8),%edi
-	andl	$16711680,%edi
-	xorl	%edi,%esi
-	movzbl	%bh,%edi
-	movl	2(%ebp,%edi,8),%edi
-	andl	$4278190080,%edi
-	xorl	%edi,%esi
-	movl	20(%esp),%edi
-	andl	$255,%edx
-	movl	2(%ebp,%edx,8),%edx
-	andl	$255,%edx
-	movzbl	%ah,%eax
-	movl	(%ebp,%eax,8),%eax
-	andl	$65280,%eax
-	xorl	%eax,%edx
-	movl	4(%esp),%eax
-	andl	$255,%ebx
-	movl	(%ebp,%ebx,8),%ebx
-	andl	$16711680,%ebx
-	xorl	%ebx,%edx
-	movl	8(%esp),%ebx
-	movl	2(%ebp,%ecx,8),%ecx
-	andl	$4278190080,%ecx
-	xorl	%ecx,%edx
-	movl	%esi,%ecx
-	addl	$16,%edi
-	xorl	(%edi),%eax
-	xorl	4(%edi),%ebx
-	xorl	8(%edi),%ecx
-	xorl	12(%edi),%edx
-	ret
-.align	64
-.LAES_Te:
-.long	2774754246,2774754246
-.long	2222750968,2222750968
-.long	2574743534,2574743534
-.long	2373680118,2373680118
-.long	234025727,234025727
-.long	3177933782,3177933782
-.long	2976870366,2976870366
-.long	1422247313,1422247313
-.long	1345335392,1345335392
-.long	50397442,50397442
-.long	2842126286,2842126286
-.long	2099981142,2099981142
-.long	436141799,436141799
-.long	1658312629,1658312629
-.long	3870010189,3870010189
-.long	2591454956,2591454956
-.long	1170918031,1170918031
-.long	2642575903,2642575903
-.long	1086966153,1086966153
-.long	2273148410,2273148410
-.long	368769775,368769775
-.long	3948501426,3948501426
-.long	3376891790,3376891790
-.long	200339707,200339707
-.long	3970805057,3970805057
-.long	1742001331,1742001331
-.long	4255294047,4255294047
-.long	3937382213,3937382213
-.long	3214711843,3214711843
-.long	4154762323,4154762323
-.long	2524082916,2524082916
-.long	1539358875,1539358875
-.long	3266819957,3266819957
-.long	486407649,486407649
-.long	2928907069,2928907069
-.long	1780885068,1780885068
-.long	1513502316,1513502316
-.long	1094664062,1094664062
-.long	49805301,49805301
-.long	1338821763,1338821763
-.long	1546925160,1546925160
-.long	4104496465,4104496465
-.long	887481809,887481809
-.long	150073849,150073849
-.long	2473685474,2473685474
-.long	1943591083,1943591083
-.long	1395732834,1395732834
-.long	1058346282,1058346282
-.long	201589768,201589768
-.long	1388824469,1388824469
-.long	1696801606,1696801606
-.long	1589887901,1589887901
-.long	672667696,672667696
-.long	2711000631,2711000631
-.long	251987210,251987210
-.long	3046808111,3046808111
-.long	151455502,151455502
-.long	907153956,907153956
-.long	2608889883,2608889883
-.long	1038279391,1038279391
-.long	652995533,652995533
-.long	1764173646,1764173646
-.long	3451040383,3451040383
-.long	2675275242,2675275242
-.long	453576978,453576978
-.long	2659418909,2659418909
-.long	1949051992,1949051992
-.long	773462580,773462580
-.long	756751158,756751158
-.long	2993581788,2993581788
-.long	3998898868,3998898868
-.long	4221608027,4221608027
-.long	4132590244,4132590244
-.long	1295727478,1295727478
-.long	1641469623,1641469623
-.long	3467883389,3467883389
-.long	2066295122,2066295122
-.long	1055122397,1055122397
-.long	1898917726,1898917726
-.long	2542044179,2542044179
-.long	4115878822,4115878822
-.long	1758581177,1758581177
-.long	0,0
-.long	753790401,753790401
-.long	1612718144,1612718144
-.long	536673507,536673507
-.long	3367088505,3367088505
-.long	3982187446,3982187446
-.long	3194645204,3194645204
-.long	1187761037,1187761037
-.long	3653156455,3653156455
-.long	1262041458,1262041458
-.long	3729410708,3729410708
-.long	3561770136,3561770136
-.long	3898103984,3898103984
-.long	1255133061,1255133061
-.long	1808847035,1808847035
-.long	720367557,720367557
-.long	3853167183,3853167183
-.long	385612781,385612781
-.long	3309519750,3309519750
-.long	3612167578,3612167578
-.long	1429418854,1429418854
-.long	2491778321,2491778321
-.long	3477423498,3477423498
-.long	284817897,284817897
-.long	100794884,100794884
-.long	2172616702,2172616702
-.long	4031795360,4031795360
-.long	1144798328,1144798328
-.long	3131023141,3131023141
-.long	3819481163,3819481163
-.long	4082192802,4082192802
-.long	4272137053,4272137053
-.long	3225436288,3225436288
-.long	2324664069,2324664069
-.long	2912064063,2912064063
-.long	3164445985,3164445985
-.long	1211644016,1211644016
-.long	83228145,83228145
-.long	3753688163,3753688163
-.long	3249976951,3249976951
-.long	1977277103,1977277103
-.long	1663115586,1663115586
-.long	806359072,806359072
-.long	452984805,452984805
-.long	250868733,250868733
-.long	1842533055,1842533055
-.long	1288555905,1288555905
-.long	336333848,336333848
-.long	890442534,890442534
-.long	804056259,804056259
-.long	3781124030,3781124030
-.long	2727843637,2727843637
-.long	3427026056,3427026056
-.long	957814574,957814574
-.long	1472513171,1472513171
-.long	4071073621,4071073621
-.long	2189328124,2189328124
-.long	1195195770,1195195770
-.long	2892260552,2892260552
-.long	3881655738,3881655738
-.long	723065138,723065138
-.long	2507371494,2507371494
-.long	2690670784,2690670784
-.long	2558624025,2558624025
-.long	3511635870,3511635870
-.long	2145180835,2145180835
-.long	1713513028,1713513028
-.long	2116692564,2116692564
-.long	2878378043,2878378043
-.long	2206763019,2206763019
-.long	3393603212,3393603212
-.long	703524551,703524551
-.long	3552098411,3552098411
-.long	1007948840,1007948840
-.long	2044649127,2044649127
-.long	3797835452,3797835452
-.long	487262998,487262998
-.long	1994120109,1994120109
-.long	1004593371,1004593371
-.long	1446130276,1446130276
-.long	1312438900,1312438900
-.long	503974420,503974420
-.long	3679013266,3679013266
-.long	168166924,168166924
-.long	1814307912,1814307912
-.long	3831258296,3831258296
-.long	1573044895,1573044895
-.long	1859376061,1859376061
-.long	4021070915,4021070915
-.long	2791465668,2791465668
-.long	2828112185,2828112185
-.long	2761266481,2761266481
-.long	937747667,937747667
-.long	2339994098,2339994098
-.long	854058965,854058965
-.long	1137232011,1137232011
-.long	1496790894,1496790894
-.long	3077402074,3077402074
-.long	2358086913,2358086913
-.long	1691735473,1691735473
-.long	3528347292,3528347292
-.long	3769215305,3769215305
-.long	3027004632,3027004632
-.long	4199962284,4199962284
-.long	133494003,133494003
-.long	636152527,636152527
-.long	2942657994,2942657994
-.long	2390391540,2390391540
-.long	3920539207,3920539207
-.long	403179536,403179536
-.long	3585784431,3585784431
-.long	2289596656,2289596656
-.long	1864705354,1864705354
-.long	1915629148,1915629148
-.long	605822008,605822008
-.long	4054230615,4054230615
-.long	3350508659,3350508659
-.long	1371981463,1371981463
-.long	602466507,602466507
-.long	2094914977,2094914977
-.long	2624877800,2624877800
-.long	555687742,555687742
-.long	3712699286,3712699286
-.long	3703422305,3703422305
-.long	2257292045,2257292045
-.long	2240449039,2240449039
-.long	2423288032,2423288032
-.long	1111375484,1111375484
-.long	3300242801,3300242801
-.long	2858837708,2858837708
-.long	3628615824,3628615824
-.long	84083462,84083462
-.long	32962295,32962295
-.long	302911004,302911004
-.long	2741068226,2741068226
-.long	1597322602,1597322602
-.long	4183250862,4183250862
-.long	3501832553,3501832553
-.long	2441512471,2441512471
-.long	1489093017,1489093017
-.long	656219450,656219450
-.long	3114180135,3114180135
-.long	954327513,954327513
-.long	335083755,335083755
-.long	3013122091,3013122091
-.long	856756514,856756514
-.long	3144247762,3144247762
-.long	1893325225,1893325225
-.long	2307821063,2307821063
-.long	2811532339,2811532339
-.long	3063651117,3063651117
-.long	572399164,572399164
-.long	2458355477,2458355477
-.long	552200649,552200649
-.long	1238290055,1238290055
-.long	4283782570,4283782570
-.long	2015897680,2015897680
-.long	2061492133,2061492133
-.long	2408352771,2408352771
-.long	4171342169,4171342169
-.long	2156497161,2156497161
-.long	386731290,386731290
-.long	3669999461,3669999461
-.long	837215959,837215959
-.long	3326231172,3326231172
-.long	3093850320,3093850320
-.long	3275833730,3275833730
-.long	2962856233,2962856233
-.long	1999449434,1999449434
-.long	286199582,286199582
-.long	3417354363,3417354363
-.long	4233385128,4233385128
-.long	3602627437,3602627437
-.long	974525996,974525996
-.byte	99,124,119,123,242,107,111,197
-.byte	48,1,103,43,254,215,171,118
-.byte	202,130,201,125,250,89,71,240
-.byte	173,212,162,175,156,164,114,192
-.byte	183,253,147,38,54,63,247,204
-.byte	52,165,229,241,113,216,49,21
-.byte	4,199,35,195,24,150,5,154
-.byte	7,18,128,226,235,39,178,117
-.byte	9,131,44,26,27,110,90,160
-.byte	82,59,214,179,41,227,47,132
-.byte	83,209,0,237,32,252,177,91
-.byte	106,203,190,57,74,76,88,207
-.byte	208,239,170,251,67,77,51,133
-.byte	69,249,2,127,80,60,159,168
-.byte	81,163,64,143,146,157,56,245
-.byte	188,182,218,33,16,255,243,210
-.byte	205,12,19,236,95,151,68,23
-.byte	196,167,126,61,100,93,25,115
-.byte	96,129,79,220,34,42,144,136
-.byte	70,238,184,20,222,94,11,219
-.byte	224,50,58,10,73,6,36,92
-.byte	194,211,172,98,145,149,228,121
-.byte	231,200,55,109,141,213,78,169
-.byte	108,86,244,234,101,122,174,8
-.byte	186,120,37,46,28,166,180,198
-.byte	232,221,116,31,75,189,139,138
-.byte	112,62,181,102,72,3,246,14
-.byte	97,53,87,185,134,193,29,158
-.byte	225,248,152,17,105,217,142,148
-.byte	155,30,135,233,206,85,40,223
-.byte	140,161,137,13,191,230,66,104
-.byte	65,153,45,15,176,84,187,22
-.byte	99,124,119,123,242,107,111,197
-.byte	48,1,103,43,254,215,171,118
-.byte	202,130,201,125,250,89,71,240
-.byte	173,212,162,175,156,164,114,192
-.byte	183,253,147,38,54,63,247,204
-.byte	52,165,229,241,113,216,49,21
-.byte	4,199,35,195,24,150,5,154
-.byte	7,18,128,226,235,39,178,117
-.byte	9,131,44,26,27,110,90,160
-.byte	82,59,214,179,41,227,47,132
-.byte	83,209,0,237,32,252,177,91
-.byte	106,203,190,57,74,76,88,207
-.byte	208,239,170,251,67,77,51,133
-.byte	69,249,2,127,80,60,159,168
-.byte	81,163,64,143,146,157,56,245
-.byte	188,182,218,33,16,255,243,210
-.byte	205,12,19,236,95,151,68,23
-.byte	196,167,126,61,100,93,25,115
-.byte	96,129,79,220,34,42,144,136
-.byte	70,238,184,20,222,94,11,219
-.byte	224,50,58,10,73,6,36,92
-.byte	194,211,172,98,145,149,228,121
-.byte	231,200,55,109,141,213,78,169
-.byte	108,86,244,234,101,122,174,8
-.byte	186,120,37,46,28,166,180,198
-.byte	232,221,116,31,75,189,139,138
-.byte	112,62,181,102,72,3,246,14
-.byte	97,53,87,185,134,193,29,158
-.byte	225,248,152,17,105,217,142,148
-.byte	155,30,135,233,206,85,40,223
-.byte	140,161,137,13,191,230,66,104
-.byte	65,153,45,15,176,84,187,22
-.byte	99,124,119,123,242,107,111,197
-.byte	48,1,103,43,254,215,171,118
-.byte	202,130,201,125,250,89,71,240
-.byte	173,212,162,175,156,164,114,192
-.byte	183,253,147,38,54,63,247,204
-.byte	52,165,229,241,113,216,49,21
-.byte	4,199,35,195,24,150,5,154
-.byte	7,18,128,226,235,39,178,117
-.byte	9,131,44,26,27,110,90,160
-.byte	82,59,214,179,41,227,47,132
-.byte	83,209,0,237,32,252,177,91
-.byte	106,203,190,57,74,76,88,207
-.byte	208,239,170,251,67,77,51,133
-.byte	69,249,2,127,80,60,159,168
-.byte	81,163,64,143,146,157,56,245
-.byte	188,182,218,33,16,255,243,210
-.byte	205,12,19,236,95,151,68,23
-.byte	196,167,126,61,100,93,25,115
-.byte	96,129,79,220,34,42,144,136
-.byte	70,238,184,20,222,94,11,219
-.byte	224,50,58,10,73,6,36,92
-.byte	194,211,172,98,145,149,228,121
-.byte	231,200,55,109,141,213,78,169
-.byte	108,86,244,234,101,122,174,8
-.byte	186,120,37,46,28,166,180,198
-.byte	232,221,116,31,75,189,139,138
-.byte	112,62,181,102,72,3,246,14
-.byte	97,53,87,185,134,193,29,158
-.byte	225,248,152,17,105,217,142,148
-.byte	155,30,135,233,206,85,40,223
-.byte	140,161,137,13,191,230,66,104
-.byte	65,153,45,15,176,84,187,22
-.byte	99,124,119,123,242,107,111,197
-.byte	48,1,103,43,254,215,171,118
-.byte	202,130,201,125,250,89,71,240
-.byte	173,212,162,175,156,164,114,192
-.byte	183,253,147,38,54,63,247,204
-.byte	52,165,229,241,113,216,49,21
-.byte	4,199,35,195,24,150,5,154
-.byte	7,18,128,226,235,39,178,117
-.byte	9,131,44,26,27,110,90,160
-.byte	82,59,214,179,41,227,47,132
-.byte	83,209,0,237,32,252,177,91
-.byte	106,203,190,57,74,76,88,207
-.byte	208,239,170,251,67,77,51,133
-.byte	69,249,2,127,80,60,159,168
-.byte	81,163,64,143,146,157,56,245
-.byte	188,182,218,33,16,255,243,210
-.byte	205,12,19,236,95,151,68,23
-.byte	196,167,126,61,100,93,25,115
-.byte	96,129,79,220,34,42,144,136
-.byte	70,238,184,20,222,94,11,219
-.byte	224,50,58,10,73,6,36,92
-.byte	194,211,172,98,145,149,228,121
-.byte	231,200,55,109,141,213,78,169
-.byte	108,86,244,234,101,122,174,8
-.byte	186,120,37,46,28,166,180,198
-.byte	232,221,116,31,75,189,139,138
-.byte	112,62,181,102,72,3,246,14
-.byte	97,53,87,185,134,193,29,158
-.byte	225,248,152,17,105,217,142,148
-.byte	155,30,135,233,206,85,40,223
-.byte	140,161,137,13,191,230,66,104
-.byte	65,153,45,15,176,84,187,22
-.long	1,2,4,8
-.long	16,32,64,128
-.long	27,54,0,0
-.long	0,0,0,0
-.size	_x86_AES_encrypt,.-_x86_AES_encrypt
-.globl	AES_encrypt
-.type	AES_encrypt,@function
-.align	16
-AES_encrypt:
-.L_AES_encrypt_begin:
-	pushl	%ebp
-	pushl	%ebx
-	pushl	%esi
-	pushl	%edi
-	movl	20(%esp),%esi
-	movl	28(%esp),%edi
-	movl	%esp,%eax
-	subl	$36,%esp
-	andl	$-64,%esp
-	leal	-127(%edi),%ebx
-	subl	%esp,%ebx
-	negl	%ebx
-	andl	$960,%ebx
-	subl	%ebx,%esp
-	addl	$4,%esp
-	movl	%eax,28(%esp)
-	call	.L004pic_point
-.L004pic_point:
-	popl	%ebp
-	leal	OPENSSL_ia32cap_P-.L004pic_point(%ebp),%eax
-	leal	.LAES_Te-.L004pic_point(%ebp),%ebp
-	leal	764(%esp),%ebx
-	subl	%ebp,%ebx
-	andl	$768,%ebx
-	leal	2176(%ebp,%ebx,1),%ebp
-	btl	$25,(%eax)
-	jnc	.L005x86
-	movq	(%esi),%mm0
-	movq	8(%esi),%mm4
-	call	_sse_AES_encrypt_compact
-	movl	28(%esp),%esp
-	movl	24(%esp),%esi
-	movq	%mm0,(%esi)
-	movq	%mm4,8(%esi)
-	emms
-	popl	%edi
-	popl	%esi
-	popl	%ebx
-	popl	%ebp
-	ret
-.align	16
-.L005x86:
-	movl	%ebp,24(%esp)
-	movl	(%esi),%eax
-	movl	4(%esi),%ebx
-	movl	8(%esi),%ecx
-	movl	12(%esi),%edx
-	call	_x86_AES_encrypt_compact
-	movl	28(%esp),%esp
-	movl	24(%esp),%esi
-	movl	%eax,(%esi)
-	movl	%ebx,4(%esi)
-	movl	%ecx,8(%esi)
-	movl	%edx,12(%esi)
-	popl	%edi
-	popl	%esi
-	popl	%ebx
-	popl	%ebp
-	ret
-.size	AES_encrypt,.-.L_AES_encrypt_begin
-.type	_x86_AES_decrypt_compact,@function
-.align	16
-_x86_AES_decrypt_compact:
-	movl	%edi,20(%esp)
-	xorl	(%edi),%eax
-	xorl	4(%edi),%ebx
-	xorl	8(%edi),%ecx
-	xorl	12(%edi),%edx
-	movl	240(%edi),%esi
-	leal	-2(%esi,%esi,1),%esi
-	leal	(%edi,%esi,8),%esi
-	movl	%esi,24(%esp)
-	movl	-128(%ebp),%edi
-	movl	-96(%ebp),%esi
-	movl	-64(%ebp),%edi
-	movl	-32(%ebp),%esi
-	movl	(%ebp),%edi
-	movl	32(%ebp),%esi
-	movl	64(%ebp),%edi
-	movl	96(%ebp),%esi
-.align	16
-.L006loop:
-	movl	%eax,%esi
-	andl	$255,%esi
-	movzbl	-128(%ebp,%esi,1),%esi
-	movzbl	%dh,%edi
-	movzbl	-128(%ebp,%edi,1),%edi
-	shll	$8,%edi
-	xorl	%edi,%esi
-	movl	%ecx,%edi
-	shrl	$16,%edi
-	andl	$255,%edi
-	movzbl	-128(%ebp,%edi,1),%edi
-	shll	$16,%edi
-	xorl	%edi,%esi
-	movl	%ebx,%edi
-	shrl	$24,%edi
-	movzbl	-128(%ebp,%edi,1),%edi
-	shll	$24,%edi
-	xorl	%edi,%esi
-	movl	%esi,4(%esp)
-	movl	%ebx,%esi
-	andl	$255,%esi
-	movzbl	-128(%ebp,%esi,1),%esi
-	movzbl	%ah,%edi
-	movzbl	-128(%ebp,%edi,1),%edi
-	shll	$8,%edi
-	xorl	%edi,%esi
-	movl	%edx,%edi
-	shrl	$16,%edi
-	andl	$255,%edi
-	movzbl	-128(%ebp,%edi,1),%edi
-	shll	$16,%edi
-	xorl	%edi,%esi
-	movl	%ecx,%edi
-	shrl	$24,%edi
-	movzbl	-128(%ebp,%edi,1),%edi
-	shll	$24,%edi
-	xorl	%edi,%esi
-	movl	%esi,8(%esp)
-	movl	%ecx,%esi
-	andl	$255,%esi
-	movzbl	-128(%ebp,%esi,1),%esi
-	movzbl	%bh,%edi
-	movzbl	-128(%ebp,%edi,1),%edi
-	shll	$8,%edi
-	xorl	%edi,%esi
-	movl	%eax,%edi
-	shrl	$16,%edi
-	andl	$255,%edi
-	movzbl	-128(%ebp,%edi,1),%edi
-	shll	$16,%edi
-	xorl	%edi,%esi
-	movl	%edx,%edi
-	shrl	$24,%edi
-	movzbl	-128(%ebp,%edi,1),%edi
-	shll	$24,%edi
-	xorl	%edi,%esi
-	andl	$255,%edx
-	movzbl	-128(%ebp,%edx,1),%edx
-	movzbl	%ch,%ecx
-	movzbl	-128(%ebp,%ecx,1),%ecx
-	shll	$8,%ecx
-	xorl	%ecx,%edx
-	movl	%esi,%ecx
-	shrl	$16,%ebx
-	andl	$255,%ebx
-	movzbl	-128(%ebp,%ebx,1),%ebx
-	shll	$16,%ebx
-	xorl	%ebx,%edx
-	shrl	$24,%eax
-	movzbl	-128(%ebp,%eax,1),%eax
-	shll	$24,%eax
-	xorl	%eax,%edx
-	movl	$2155905152,%edi
-	andl	%ecx,%edi
-	movl	%edi,%esi
-	shrl	$7,%edi
-	leal	(%ecx,%ecx,1),%eax
-	subl	%edi,%esi
-	andl	$4278124286,%eax
-	andl	$454761243,%esi
-	xorl	%esi,%eax
-	movl	$2155905152,%edi
-	andl	%eax,%edi
-	movl	%edi,%esi
-	shrl	$7,%edi
-	leal	(%eax,%eax,1),%ebx
-	subl	%edi,%esi
-	andl	$4278124286,%ebx
-	andl	$454761243,%esi
-	xorl	%ecx,%eax
-	xorl	%esi,%ebx
-	movl	$2155905152,%edi
-	andl	%ebx,%edi
-	movl	%edi,%esi
-	shrl	$7,%edi
-	leal	(%ebx,%ebx,1),%ebp
-	subl	%edi,%esi
-	andl	$4278124286,%ebp
-	andl	$454761243,%esi
-	xorl	%ecx,%ebx
-	roll	$8,%ecx
-	xorl	%esi,%ebp
-	xorl	%eax,%ecx
-	xorl	%ebp,%eax
-	xorl	%ebx,%ecx
-	xorl	%ebp,%ebx
-	roll	$24,%eax
-	xorl	%ebp,%ecx
-	roll	$16,%ebx
-	xorl	%eax,%ecx
-	roll	$8,%ebp
-	xorl	%ebx,%ecx
-	movl	4(%esp),%eax
-	xorl	%ebp,%ecx
-	movl	%ecx,12(%esp)
-	movl	$2155905152,%edi
-	andl	%edx,%edi
-	movl	%edi,%esi
-	shrl	$7,%edi
-	leal	(%edx,%edx,1),%ebx
-	subl	%edi,%esi
-	andl	$4278124286,%ebx
-	andl	$454761243,%esi
-	xorl	%esi,%ebx
-	movl	$2155905152,%edi
-	andl	%ebx,%edi
-	movl	%edi,%esi
-	shrl	$7,%edi
-	leal	(%ebx,%ebx,1),%ecx
-	subl	%edi,%esi
-	andl	$4278124286,%ecx
-	andl	$454761243,%esi
-	xorl	%edx,%ebx
-	xorl	%esi,%ecx
-	movl	$2155905152,%edi
-	andl	%ecx,%edi
-	movl	%edi,%esi
-	shrl	$7,%edi
-	leal	(%ecx,%ecx,1),%ebp
-	subl	%edi,%esi
-	andl	$4278124286,%ebp
-	andl	$454761243,%esi
-	xorl	%edx,%ecx
-	roll	$8,%edx
-	xorl	%esi,%ebp
-	xorl	%ebx,%edx
-	xorl	%ebp,%ebx
-	xorl	%ecx,%edx
-	xorl	%ebp,%ecx
-	roll	$24,%ebx
-	xorl	%ebp,%edx
-	roll	$16,%ecx
-	xorl	%ebx,%edx
-	roll	$8,%ebp
-	xorl	%ecx,%edx
-	movl	8(%esp),%ebx
-	xorl	%ebp,%edx
-	movl	%edx,16(%esp)
-	movl	$2155905152,%edi
-	andl	%eax,%edi
-	movl	%edi,%esi
-	shrl	$7,%edi
-	leal	(%eax,%eax,1),%ecx
-	subl	%edi,%esi
-	andl	$4278124286,%ecx
-	andl	$454761243,%esi
-	xorl	%esi,%ecx
-	movl	$2155905152,%edi
-	andl	%ecx,%edi
-	movl	%edi,%esi
-	shrl	$7,%edi
-	leal	(%ecx,%ecx,1),%edx
-	subl	%edi,%esi
-	andl	$4278124286,%edx
-	andl	$454761243,%esi
-	xorl	%eax,%ecx
-	xorl	%esi,%edx
-	movl	$2155905152,%edi
-	andl	%edx,%edi
-	movl	%edi,%esi
-	shrl	$7,%edi
-	leal	(%edx,%edx,1),%ebp
-	subl	%edi,%esi
-	andl	$4278124286,%ebp
-	andl	$454761243,%esi
-	xorl	%eax,%edx
-	roll	$8,%eax
-	xorl	%esi,%ebp
-	xorl	%ecx,%eax
-	xorl	%ebp,%ecx
-	xorl	%edx,%eax
-	xorl	%ebp,%edx
-	roll	$24,%ecx
-	xorl	%ebp,%eax
-	roll	$16,%edx
-	xorl	%ecx,%eax
-	roll	$8,%ebp
-	xorl	%edx,%eax
-	xorl	%ebp,%eax
-	movl	$2155905152,%edi
-	andl	%ebx,%edi
-	movl	%edi,%esi
-	shrl	$7,%edi
-	leal	(%ebx,%ebx,1),%ecx
-	subl	%edi,%esi
-	andl	$4278124286,%ecx
-	andl	$454761243,%esi
-	xorl	%esi,%ecx
-	movl	$2155905152,%edi
-	andl	%ecx,%edi
-	movl	%edi,%esi
-	shrl	$7,%edi
-	leal	(%ecx,%ecx,1),%edx
-	subl	%edi,%esi
-	andl	$4278124286,%edx
-	andl	$454761243,%esi
-	xorl	%ebx,%ecx
-	xorl	%esi,%edx
-	movl	$2155905152,%edi
-	andl	%edx,%edi
-	movl	%edi,%esi
-	shrl	$7,%edi
-	leal	(%edx,%edx,1),%ebp
-	subl	%edi,%esi
-	andl	$4278124286,%ebp
-	andl	$454761243,%esi
-	xorl	%ebx,%edx
-	roll	$8,%ebx
-	xorl	%esi,%ebp
-	xorl	%ecx,%ebx
-	xorl	%ebp,%ecx
-	xorl	%edx,%ebx
-	xorl	%ebp,%edx
-	roll	$24,%ecx
-	xorl	%ebp,%ebx
-	roll	$16,%edx
-	xorl	%ecx,%ebx
-	roll	$8,%ebp
-	xorl	%edx,%ebx
-	movl	12(%esp),%ecx
-	xorl	%ebp,%ebx
-	movl	16(%esp),%edx
-	movl	20(%esp),%edi
-	movl	28(%esp),%ebp
-	addl	$16,%edi
-	xorl	(%edi),%eax
-	xorl	4(%edi),%ebx
-	xorl	8(%edi),%ecx
-	xorl	12(%edi),%edx
-	cmpl	24(%esp),%edi
-	movl	%edi,20(%esp)
-	jb	.L006loop
-	movl	%eax,%esi
-	andl	$255,%esi
-	movzbl	-128(%ebp,%esi,1),%esi
-	movzbl	%dh,%edi
-	movzbl	-128(%ebp,%edi,1),%edi
-	shll	$8,%edi
-	xorl	%edi,%esi
-	movl	%ecx,%edi
-	shrl	$16,%edi
-	andl	$255,%edi
-	movzbl	-128(%ebp,%edi,1),%edi
-	shll	$16,%edi
-	xorl	%edi,%esi
-	movl	%ebx,%edi
-	shrl	$24,%edi
-	movzbl	-128(%ebp,%edi,1),%edi
-	shll	$24,%edi
-	xorl	%edi,%esi
-	movl	%esi,4(%esp)
-	movl	%ebx,%esi
-	andl	$255,%esi
-	movzbl	-128(%ebp,%esi,1),%esi
-	movzbl	%ah,%edi
-	movzbl	-128(%ebp,%edi,1),%edi
-	shll	$8,%edi
-	xorl	%edi,%esi
-	movl	%edx,%edi
-	shrl	$16,%edi
-	andl	$255,%edi
-	movzbl	-128(%ebp,%edi,1),%edi
-	shll	$16,%edi
-	xorl	%edi,%esi
-	movl	%ecx,%edi
-	shrl	$24,%edi
-	movzbl	-128(%ebp,%edi,1),%edi
-	shll	$24,%edi
-	xorl	%edi,%esi
-	movl	%esi,8(%esp)
-	movl	%ecx,%esi
-	andl	$255,%esi
-	movzbl	-128(%ebp,%esi,1),%esi
-	movzbl	%bh,%edi
-	movzbl	-128(%ebp,%edi,1),%edi
-	shll	$8,%edi
-	xorl	%edi,%esi
-	movl	%eax,%edi
-	shrl	$16,%edi
-	andl	$255,%edi
-	movzbl	-128(%ebp,%edi,1),%edi
-	shll	$16,%edi
-	xorl	%edi,%esi
-	movl	%edx,%edi
-	shrl	$24,%edi
-	movzbl	-128(%ebp,%edi,1),%edi
-	shll	$24,%edi
-	xorl	%edi,%esi
-	movl	20(%esp),%edi
-	andl	$255,%edx
-	movzbl	-128(%ebp,%edx,1),%edx
-	movzbl	%ch,%ecx
-	movzbl	-128(%ebp,%ecx,1),%ecx
-	shll	$8,%ecx
-	xorl	%ecx,%edx
-	movl	%esi,%ecx
-	shrl	$16,%ebx
-	andl	$255,%ebx
-	movzbl	-128(%ebp,%ebx,1),%ebx
-	shll	$16,%ebx
-	xorl	%ebx,%edx
-	movl	8(%esp),%ebx
-	shrl	$24,%eax
-	movzbl	-128(%ebp,%eax,1),%eax
-	shll	$24,%eax
-	xorl	%eax,%edx
-	movl	4(%esp),%eax
-	xorl	16(%edi),%eax
-	xorl	20(%edi),%ebx
-	xorl	24(%edi),%ecx
-	xorl	28(%edi),%edx
-	ret
-.size	_x86_AES_decrypt_compact,.-_x86_AES_decrypt_compact
-.type	_sse_AES_decrypt_compact,@function
-.align	16
-_sse_AES_decrypt_compact:
-	pxor	(%edi),%mm0
-	pxor	8(%edi),%mm4
-	movl	240(%edi),%esi
-	leal	-2(%esi,%esi,1),%esi
-	leal	(%edi,%esi,8),%esi
-	movl	%esi,24(%esp)
-	movl	$454761243,%eax
-	movl	%eax,8(%esp)
-	movl	%eax,12(%esp)
-	movl	-128(%ebp),%eax
-	movl	-96(%ebp),%ebx
-	movl	-64(%ebp),%ecx
-	movl	-32(%ebp),%edx
-	movl	(%ebp),%eax
-	movl	32(%ebp),%ebx
-	movl	64(%ebp),%ecx
-	movl	96(%ebp),%edx
-.align	16
-.L007loop:
-	pshufw	$12,%mm0,%mm1
-	pshufw	$9,%mm4,%mm5
-	movd	%mm1,%eax
-	movd	%mm5,%ebx
-	movl	%edi,20(%esp)
-	movzbl	%al,%esi
-	movzbl	%ah,%edx
-	pshufw	$6,%mm0,%mm2
-	movzbl	-128(%ebp,%esi,1),%ecx
-	movzbl	%bl,%edi
-	movzbl	-128(%ebp,%edx,1),%edx
-	shrl	$16,%eax
-	shll	$8,%edx
-	movzbl	-128(%ebp,%edi,1),%esi
-	movzbl	%bh,%edi
-	shll	$16,%esi
-	pshufw	$3,%mm4,%mm6
-	orl	%esi,%ecx
-	movzbl	-128(%ebp,%edi,1),%esi
-	movzbl	%ah,%edi
-	shll	$24,%esi
-	shrl	$16,%ebx
-	orl	%esi,%edx
-	movzbl	-128(%ebp,%edi,1),%esi
-	movzbl	%bh,%edi
-	shll	$24,%esi
-	orl	%esi,%ecx
-	movzbl	-128(%ebp,%edi,1),%esi
-	movzbl	%al,%edi
-	shll	$8,%esi
-	movd	%mm2,%eax
-	orl	%esi,%ecx
-	movzbl	-128(%ebp,%edi,1),%esi
-	movzbl	%bl,%edi
-	shll	$16,%esi
-	movd	%mm6,%ebx
-	movd	%ecx,%mm0
-	movzbl	-128(%ebp,%edi,1),%ecx
-	movzbl	%al,%edi
-	orl	%esi,%ecx
-	movzbl	-128(%ebp,%edi,1),%esi
-	movzbl	%bl,%edi
-	orl	%esi,%edx
-	movzbl	-128(%ebp,%edi,1),%esi
-	movzbl	%ah,%edi
-	shll	$16,%esi
-	shrl	$16,%eax
-	orl	%esi,%edx
-	movzbl	-128(%ebp,%edi,1),%esi
-	movzbl	%bh,%edi
-	shrl	$16,%ebx
-	shll	$8,%esi
-	movd	%edx,%mm1
-	movzbl	-128(%ebp,%edi,1),%edx
-	movzbl	%bh,%edi
-	shll	$24,%edx
-	andl	$255,%ebx
-	orl	%esi,%edx
-	punpckldq	%mm1,%mm0
-	movzbl	-128(%ebp,%edi,1),%esi
-	movzbl	%al,%edi
-	shll	$8,%esi
-	movzbl	%ah,%eax
-	movzbl	-128(%ebp,%ebx,1),%ebx
-	orl	%esi,%ecx
-	movzbl	-128(%ebp,%edi,1),%esi
-	orl	%ebx,%edx
-	shll	$16,%esi
-	movzbl	-128(%ebp,%eax,1),%eax
-	orl	%esi,%edx
-	shll	$24,%eax
-	orl	%eax,%ecx
-	movl	20(%esp),%edi
-	movd	%edx,%mm4
-	movd	%ecx,%mm5
-	punpckldq	%mm5,%mm4
-	addl	$16,%edi
-	cmpl	24(%esp),%edi
-	ja	.L008out
-	movq	%mm0,%mm3
-	movq	%mm4,%mm7
-	pshufw	$228,%mm0,%mm2
-	pshufw	$228,%mm4,%mm6
-	movq	%mm0,%mm1
-	movq	%mm4,%mm5
-	pshufw	$177,%mm0,%mm0
-	pshufw	$177,%mm4,%mm4
-	pslld	$8,%mm2
-	pslld	$8,%mm6
-	psrld	$8,%mm3
-	psrld	$8,%mm7
-	pxor	%mm2,%mm0
-	pxor	%mm6,%mm4
-	pxor	%mm3,%mm0
-	pxor	%mm7,%mm4
-	pslld	$16,%mm2
-	pslld	$16,%mm6
-	psrld	$16,%mm3
-	psrld	$16,%mm7
-	pxor	%mm2,%mm0
-	pxor	%mm6,%mm4
-	pxor	%mm3,%mm0
-	pxor	%mm7,%mm4
-	movq	8(%esp),%mm3
-	pxor	%mm2,%mm2
-	pxor	%mm6,%mm6
-	pcmpgtb	%mm1,%mm2
-	pcmpgtb	%mm5,%mm6
-	pand	%mm3,%mm2
-	pand	%mm3,%mm6
-	paddb	%mm1,%mm1
-	paddb	%mm5,%mm5
-	pxor	%mm2,%mm1
-	pxor	%mm6,%mm5
-	movq	%mm1,%mm3
-	movq	%mm5,%mm7
-	movq	%mm1,%mm2
-	movq	%mm5,%mm6
-	pxor	%mm1,%mm0
-	pxor	%mm5,%mm4
-	pslld	$24,%mm3
-	pslld	$24,%mm7
-	psrld	$8,%mm2
-	psrld	$8,%mm6
-	pxor	%mm3,%mm0
-	pxor	%mm7,%mm4
-	pxor	%mm2,%mm0
-	pxor	%mm6,%mm4
-	movq	8(%esp),%mm2
-	pxor	%mm3,%mm3
-	pxor	%mm7,%mm7
-	pcmpgtb	%mm1,%mm3
-	pcmpgtb	%mm5,%mm7
-	pand	%mm2,%mm3
-	pand	%mm2,%mm7
-	paddb	%mm1,%mm1
-	paddb	%mm5,%mm5
-	pxor	%mm3,%mm1
-	pxor	%mm7,%mm5
-	pshufw	$177,%mm1,%mm3
-	pshufw	$177,%mm5,%mm7
-	pxor	%mm1,%mm0
-	pxor	%mm5,%mm4
-	pxor	%mm3,%mm0
-	pxor	%mm7,%mm4
-	pxor	%mm3,%mm3
-	pxor	%mm7,%mm7
-	pcmpgtb	%mm1,%mm3
-	pcmpgtb	%mm5,%mm7
-	pand	%mm2,%mm3
-	pand	%mm2,%mm7
-	paddb	%mm1,%mm1
-	paddb	%mm5,%mm5
-	pxor	%mm3,%mm1
-	pxor	%mm7,%mm5
-	pxor	%mm1,%mm0
-	pxor	%mm5,%mm4
-	movq	%mm1,%mm3
-	movq	%mm5,%mm7
-	pshufw	$177,%mm1,%mm2
-	pshufw	$177,%mm5,%mm6
-	pxor	%mm2,%mm0
-	pxor	%mm6,%mm4
-	pslld	$8,%mm1
-	pslld	$8,%mm5
-	psrld	$8,%mm3
-	psrld	$8,%mm7
-	movq	(%edi),%mm2
-	movq	8(%edi),%mm6
-	pxor	%mm1,%mm0
-	pxor	%mm5,%mm4
-	pxor	%mm3,%mm0
-	pxor	%mm7,%mm4
-	movl	-128(%ebp),%eax
-	pslld	$16,%mm1
-	pslld	$16,%mm5
-	movl	-64(%ebp),%ebx
-	psrld	$16,%mm3
-	psrld	$16,%mm7
-	movl	(%ebp),%ecx
-	pxor	%mm1,%mm0
-	pxor	%mm5,%mm4
-	movl	64(%ebp),%edx
-	pxor	%mm3,%mm0
-	pxor	%mm7,%mm4
-	pxor	%mm2,%mm0
-	pxor	%mm6,%mm4
-	jmp	.L007loop
-.align	16
-.L008out:
-	pxor	(%edi),%mm0
-	pxor	8(%edi),%mm4
-	ret
-.size	_sse_AES_decrypt_compact,.-_sse_AES_decrypt_compact
-.type	_x86_AES_decrypt,@function
-.align	16
-_x86_AES_decrypt:
-	movl	%edi,20(%esp)
-	xorl	(%edi),%eax
-	xorl	4(%edi),%ebx
-	xorl	8(%edi),%ecx
-	xorl	12(%edi),%edx
-	movl	240(%edi),%esi
-	leal	-2(%esi,%esi,1),%esi
-	leal	(%edi,%esi,8),%esi
-	movl	%esi,24(%esp)
-.align	16
-.L009loop:
-	movl	%eax,%esi
-	andl	$255,%esi
-	movl	(%ebp,%esi,8),%esi
-	movzbl	%dh,%edi
-	xorl	3(%ebp,%edi,8),%esi
-	movl	%ecx,%edi
-	shrl	$16,%edi
-	andl	$255,%edi
-	xorl	2(%ebp,%edi,8),%esi
-	movl	%ebx,%edi
-	shrl	$24,%edi
-	xorl	1(%ebp,%edi,8),%esi
-	movl	%esi,4(%esp)
-
-	movl	%ebx,%esi
-	andl	$255,%esi
-	movl	(%ebp,%esi,8),%esi
-	movzbl	%ah,%edi
-	xorl	3(%ebp,%edi,8),%esi
-	movl	%edx,%edi
-	shrl	$16,%edi
-	andl	$255,%edi
-	xorl	2(%ebp,%edi,8),%esi
-	movl	%ecx,%edi
-	shrl	$24,%edi
-	xorl	1(%ebp,%edi,8),%esi
-	movl	%esi,8(%esp)
-
-	movl	%ecx,%esi
-	andl	$255,%esi
-	movl	(%ebp,%esi,8),%esi
-	movzbl	%bh,%edi
-	xorl	3(%ebp,%edi,8),%esi
-	movl	%eax,%edi
-	shrl	$16,%edi
-	andl	$255,%edi
-	xorl	2(%ebp,%edi,8),%esi
-	movl	%edx,%edi
-	shrl	$24,%edi
-	xorl	1(%ebp,%edi,8),%esi
-
-	movl	20(%esp),%edi
-	andl	$255,%edx
-	movl	(%ebp,%edx,8),%edx
-	movzbl	%ch,%ecx
-	xorl	3(%ebp,%ecx,8),%edx
-	movl	%esi,%ecx
-	shrl	$16,%ebx
-	andl	$255,%ebx
-	xorl	2(%ebp,%ebx,8),%edx
-	movl	8(%esp),%ebx
-	shrl	$24,%eax
-	xorl	1(%ebp,%eax,8),%edx
-	movl	4(%esp),%eax
-
-	addl	$16,%edi
-	xorl	(%edi),%eax
-	xorl	4(%edi),%ebx
-	xorl	8(%edi),%ecx
-	xorl	12(%edi),%edx
-	cmpl	24(%esp),%edi
-	movl	%edi,20(%esp)
-	jb	.L009loop
-	leal	2176(%ebp),%ebp
-	movl	-128(%ebp),%edi
-	movl	-96(%ebp),%esi
-	movl	-64(%ebp),%edi
-	movl	-32(%ebp),%esi
-	movl	(%ebp),%edi
-	movl	32(%ebp),%esi
-	movl	64(%ebp),%edi
-	movl	96(%ebp),%esi
-	leal	-128(%ebp),%ebp
-	movl	%eax,%esi
-	andl	$255,%esi
-	movzbl	(%ebp,%esi,1),%esi
-	movzbl	%dh,%edi
-	movzbl	(%ebp,%edi,1),%edi
-	shll	$8,%edi
-	xorl	%edi,%esi
-	movl	%ecx,%edi
-	shrl	$16,%edi
-	andl	$255,%edi
-	movzbl	(%ebp,%edi,1),%edi
-	shll	$16,%edi
-	xorl	%edi,%esi
-	movl	%ebx,%edi
-	shrl	$24,%edi
-	movzbl	(%ebp,%edi,1),%edi
-	shll	$24,%edi
-	xorl	%edi,%esi
-	movl	%esi,4(%esp)
-	movl	%ebx,%esi
-	andl	$255,%esi
-	movzbl	(%ebp,%esi,1),%esi
-	movzbl	%ah,%edi
-	movzbl	(%ebp,%edi,1),%edi
-	shll	$8,%edi
-	xorl	%edi,%esi
-	movl	%edx,%edi
-	shrl	$16,%edi
-	andl	$255,%edi
-	movzbl	(%ebp,%edi,1),%edi
-	shll	$16,%edi
-	xorl	%edi,%esi
-	movl	%ecx,%edi
-	shrl	$24,%edi
-	movzbl	(%ebp,%edi,1),%edi
-	shll	$24,%edi
-	xorl	%edi,%esi
-	movl	%esi,8(%esp)
-	movl	%ecx,%esi
-	andl	$255,%esi
-	movzbl	(%ebp,%esi,1),%esi
-	movzbl	%bh,%edi
-	movzbl	(%ebp,%edi,1),%edi
-	shll	$8,%edi
-	xorl	%edi,%esi
-	movl	%eax,%edi
-	shrl	$16,%edi
-	andl	$255,%edi
-	movzbl	(%ebp,%edi,1),%edi
-	shll	$16,%edi
-	xorl	%edi,%esi
-	movl	%edx,%edi
-	shrl	$24,%edi
-	movzbl	(%ebp,%edi,1),%edi
-	shll	$24,%edi
-	xorl	%edi,%esi
-	movl	20(%esp),%edi
-	andl	$255,%edx
-	movzbl	(%ebp,%edx,1),%edx
-	movzbl	%ch,%ecx
-	movzbl	(%ebp,%ecx,1),%ecx
-	shll	$8,%ecx
-	xorl	%ecx,%edx
-	movl	%esi,%ecx
-	shrl	$16,%ebx
-	andl	$255,%ebx
-	movzbl	(%ebp,%ebx,1),%ebx
-	shll	$16,%ebx
-	xorl	%ebx,%edx
-	movl	8(%esp),%ebx
-	shrl	$24,%eax
-	movzbl	(%ebp,%eax,1),%eax
-	shll	$24,%eax
-	xorl	%eax,%edx
-	movl	4(%esp),%eax
-	leal	-2048(%ebp),%ebp
-	addl	$16,%edi
-	xorl	(%edi),%eax
-	xorl	4(%edi),%ebx
-	xorl	8(%edi),%ecx
-	xorl	12(%edi),%edx
-	ret
-.align	64
-.LAES_Td:
-.long	1353184337,1353184337
-.long	1399144830,1399144830
-.long	3282310938,3282310938
-.long	2522752826,2522752826
-.long	3412831035,3412831035
-.long	4047871263,4047871263
-.long	2874735276,2874735276
-.long	2466505547,2466505547
-.long	1442459680,1442459680
-.long	4134368941,4134368941
-.long	2440481928,2440481928
-.long	625738485,625738485
-.long	4242007375,4242007375
-.long	3620416197,3620416197
-.long	2151953702,2151953702
-.long	2409849525,2409849525
-.long	1230680542,1230680542
-.long	1729870373,1729870373
-.long	2551114309,2551114309
-.long	3787521629,3787521629
-.long	41234371,41234371
-.long	317738113,317738113
-.long	2744600205,2744600205
-.long	3338261355,3338261355
-.long	3881799427,3881799427
-.long	2510066197,2510066197
-.long	3950669247,3950669247
-.long	3663286933,3663286933
-.long	763608788,763608788
-.long	3542185048,3542185048
-.long	694804553,694804553
-.long	1154009486,1154009486
-.long	1787413109,1787413109
-.long	2021232372,2021232372
-.long	1799248025,1799248025
-.long	3715217703,3715217703
-.long	3058688446,3058688446
-.long	397248752,397248752
-.long	1722556617,1722556617
-.long	3023752829,3023752829
-.long	407560035,407560035
-.long	2184256229,2184256229
-.long	1613975959,1613975959
-.long	1165972322,1165972322
-.long	3765920945,3765920945
-.long	2226023355,2226023355
-.long	480281086,480281086
-.long	2485848313,2485848313
-.long	1483229296,1483229296
-.long	436028815,436028815
-.long	2272059028,2272059028
-.long	3086515026,3086515026
-.long	601060267,601060267
-.long	3791801202,3791801202
-.long	1468997603,1468997603
-.long	715871590,715871590
-.long	120122290,120122290
-.long	63092015,63092015
-.long	2591802758,2591802758
-.long	2768779219,2768779219
-.long	4068943920,4068943920
-.long	2997206819,2997206819
-.long	3127509762,3127509762
-.long	1552029421,1552029421
-.long	723308426,723308426
-.long	2461301159,2461301159
-.long	4042393587,4042393587
-.long	2715969870,2715969870
-.long	3455375973,3455375973
-.long	3586000134,3586000134
-.long	526529745,526529745
-.long	2331944644,2331944644
-.long	2639474228,2639474228
-.long	2689987490,2689987490
-.long	853641733,853641733
-.long	1978398372,1978398372
-.long	971801355,971801355
-.long	2867814464,2867814464
-.long	111112542,111112542
-.long	1360031421,1360031421
-.long	4186579262,4186579262
-.long	1023860118,1023860118
-.long	2919579357,2919579357
-.long	1186850381,1186850381
-.long	3045938321,3045938321
-.long	90031217,90031217
-.long	1876166148,1876166148
-.long	4279586912,4279586912
-.long	620468249,620468249
-.long	2548678102,2548678102
-.long	3426959497,3426959497
-.long	2006899047,2006899047
-.long	3175278768,3175278768
-.long	2290845959,2290845959
-.long	945494503,945494503
-.long	3689859193,3689859193
-.long	1191869601,1191869601
-.long	3910091388,3910091388
-.long	3374220536,3374220536
-.long	0,0
-.long	2206629897,2206629897
-.long	1223502642,1223502642
-.long	2893025566,2893025566
-.long	1316117100,1316117100
-.long	4227796733,4227796733
-.long	1446544655,1446544655
-.long	517320253,517320253
-.long	658058550,658058550
-.long	1691946762,1691946762
-.long	564550760,564550760
-.long	3511966619,3511966619
-.long	976107044,976107044
-.long	2976320012,2976320012
-.long	266819475,266819475
-.long	3533106868,3533106868
-.long	2660342555,2660342555
-.long	1338359936,1338359936
-.long	2720062561,2720062561
-.long	1766553434,1766553434
-.long	370807324,370807324
-.long	179999714,179999714
-.long	3844776128,3844776128
-.long	1138762300,1138762300
-.long	488053522,488053522
-.long	185403662,185403662
-.long	2915535858,2915535858
-.long	3114841645,3114841645
-.long	3366526484,3366526484
-.long	2233069911,2233069911
-.long	1275557295,1275557295
-.long	3151862254,3151862254
-.long	4250959779,4250959779
-.long	2670068215,2670068215
-.long	3170202204,3170202204
-.long	3309004356,3309004356
-.long	880737115,880737115
-.long	1982415755,1982415755
-.long	3703972811,3703972811
-.long	1761406390,1761406390
-.long	1676797112,1676797112
-.long	3403428311,3403428311
-.long	277177154,277177154
-.long	1076008723,1076008723
-.long	538035844,538035844
-.long	2099530373,2099530373
-.long	4164795346,4164795346
-.long	288553390,288553390
-.long	1839278535,1839278535
-.long	1261411869,1261411869
-.long	4080055004,4080055004
-.long	3964831245,3964831245
-.long	3504587127,3504587127
-.long	1813426987,1813426987
-.long	2579067049,2579067049
-.long	4199060497,4199060497
-.long	577038663,577038663
-.long	3297574056,3297574056
-.long	440397984,440397984
-.long	3626794326,3626794326
-.long	4019204898,4019204898
-.long	3343796615,3343796615
-.long	3251714265,3251714265
-.long	4272081548,4272081548
-.long	906744984,906744984
-.long	3481400742,3481400742
-.long	685669029,685669029
-.long	646887386,646887386
-.long	2764025151,2764025151
-.long	3835509292,3835509292
-.long	227702864,227702864
-.long	2613862250,2613862250
-.long	1648787028,1648787028
-.long	3256061430,3256061430
-.long	3904428176,3904428176
-.long	1593260334,1593260334
-.long	4121936770,4121936770
-.long	3196083615,3196083615
-.long	2090061929,2090061929
-.long	2838353263,2838353263
-.long	3004310991,3004310991
-.long	999926984,999926984
-.long	2809993232,2809993232
-.long	1852021992,1852021992
-.long	2075868123,2075868123
-.long	158869197,158869197
-.long	4095236462,4095236462
-.long	28809964,28809964
-.long	2828685187,2828685187
-.long	1701746150,1701746150
-.long	2129067946,2129067946
-.long	147831841,147831841
-.long	3873969647,3873969647
-.long	3650873274,3650873274
-.long	3459673930,3459673930
-.long	3557400554,3557400554
-.long	3598495785,3598495785
-.long	2947720241,2947720241
-.long	824393514,824393514
-.long	815048134,815048134
-.long	3227951669,3227951669
-.long	935087732,935087732
-.long	2798289660,2798289660
-.long	2966458592,2966458592
-.long	366520115,366520115
-.long	1251476721,1251476721
-.long	4158319681,4158319681
-.long	240176511,240176511
-.long	804688151,804688151
-.long	2379631990,2379631990
-.long	1303441219,1303441219
-.long	1414376140,1414376140
-.long	3741619940,3741619940
-.long	3820343710,3820343710
-.long	461924940,461924940
-.long	3089050817,3089050817
-.long	2136040774,2136040774
-.long	82468509,82468509
-.long	1563790337,1563790337
-.long	1937016826,1937016826
-.long	776014843,776014843
-.long	1511876531,1511876531
-.long	1389550482,1389550482
-.long	861278441,861278441
-.long	323475053,323475053
-.long	2355222426,2355222426
-.long	2047648055,2047648055
-.long	2383738969,2383738969
-.long	2302415851,2302415851
-.long	3995576782,3995576782
-.long	902390199,902390199
-.long	3991215329,3991215329
-.long	1018251130,1018251130
-.long	1507840668,1507840668
-.long	1064563285,1064563285
-.long	2043548696,2043548696
-.long	3208103795,3208103795
-.long	3939366739,3939366739
-.long	1537932639,1537932639
-.long	342834655,342834655
-.long	2262516856,2262516856
-.long	2180231114,2180231114
-.long	1053059257,1053059257
-.long	741614648,741614648
-.long	1598071746,1598071746
-.long	1925389590,1925389590
-.long	203809468,203809468
-.long	2336832552,2336832552
-.long	1100287487,1100287487
-.long	1895934009,1895934009
-.long	3736275976,3736275976
-.long	2632234200,2632234200
-.long	2428589668,2428589668
-.long	1636092795,1636092795
-.long	1890988757,1890988757
-.long	1952214088,1952214088
-.long	1113045200,1113045200
-.byte	82,9,106,213,48,54,165,56
-.byte	191,64,163,158,129,243,215,251
-.byte	124,227,57,130,155,47,255,135
-.byte	52,142,67,68,196,222,233,203
-.byte	84,123,148,50,166,194,35,61
-.byte	238,76,149,11,66,250,195,78
-.byte	8,46,161,102,40,217,36,178
-.byte	118,91,162,73,109,139,209,37
-.byte	114,248,246,100,134,104,152,22
-.byte	212,164,92,204,93,101,182,146
-.byte	108,112,72,80,253,237,185,218
-.byte	94,21,70,87,167,141,157,132
-.byte	144,216,171,0,140,188,211,10
-.byte	247,228,88,5,184,179,69,6
-.byte	208,44,30,143,202,63,15,2
-.byte	193,175,189,3,1,19,138,107
-.byte	58,145,17,65,79,103,220,234
-.byte	151,242,207,206,240,180,230,115
-.byte	150,172,116,34,231,173,53,133
-.byte	226,249,55,232,28,117,223,110
-.byte	71,241,26,113,29,41,197,137
-.byte	111,183,98,14,170,24,190,27
-.byte	252,86,62,75,198,210,121,32
-.byte	154,219,192,254,120,205,90,244
-.byte	31,221,168,51,136,7,199,49
-.byte	177,18,16,89,39,128,236,95
-.byte	96,81,127,169,25,181,74,13
-.byte	45,229,122,159,147,201,156,239
-.byte	160,224,59,77,174,42,245,176
-.byte	200,235,187,60,131,83,153,97
-.byte	23,43,4,126,186,119,214,38
-.byte	225,105,20,99,85,33,12,125
-.byte	82,9,106,213,48,54,165,56
-.byte	191,64,163,158,129,243,215,251
-.byte	124,227,57,130,155,47,255,135
-.byte	52,142,67,68,196,222,233,203
-.byte	84,123,148,50,166,194,35,61
-.byte	238,76,149,11,66,250,195,78
-.byte	8,46,161,102,40,217,36,178
-.byte	118,91,162,73,109,139,209,37
-.byte	114,248,246,100,134,104,152,22
-.byte	212,164,92,204,93,101,182,146
-.byte	108,112,72,80,253,237,185,218
-.byte	94,21,70,87,167,141,157,132
-.byte	144,216,171,0,140,188,211,10
-.byte	247,228,88,5,184,179,69,6
-.byte	208,44,30,143,202,63,15,2
-.byte	193,175,189,3,1,19,138,107
-.byte	58,145,17,65,79,103,220,234
-.byte	151,242,207,206,240,180,230,115
-.byte	150,172,116,34,231,173,53,133
-.byte	226,249,55,232,28,117,223,110
-.byte	71,241,26,113,29,41,197,137
-.byte	111,183,98,14,170,24,190,27
-.byte	252,86,62,75,198,210,121,32
-.byte	154,219,192,254,120,205,90,244
-.byte	31,221,168,51,136,7,199,49
-.byte	177,18,16,89,39,128,236,95
-.byte	96,81,127,169,25,181,74,13
-.byte	45,229,122,159,147,201,156,239
-.byte	160,224,59,77,174,42,245,176
-.byte	200,235,187,60,131,83,153,97
-.byte	23,43,4,126,186,119,214,38
-.byte	225,105,20,99,85,33,12,125
-.byte	82,9,106,213,48,54,165,56
-.byte	191,64,163,158,129,243,215,251
-.byte	124,227,57,130,155,47,255,135
-.byte	52,142,67,68,196,222,233,203
-.byte	84,123,148,50,166,194,35,61
-.byte	238,76,149,11,66,250,195,78
-.byte	8,46,161,102,40,217,36,178
-.byte	118,91,162,73,109,139,209,37
-.byte	114,248,246,100,134,104,152,22
-.byte	212,164,92,204,93,101,182,146
-.byte	108,112,72,80,253,237,185,218
-.byte	94,21,70,87,167,141,157,132
-.byte	144,216,171,0,140,188,211,10
-.byte	247,228,88,5,184,179,69,6
-.byte	208,44,30,143,202,63,15,2
-.byte	193,175,189,3,1,19,138,107
-.byte	58,145,17,65,79,103,220,234
-.byte	151,242,207,206,240,180,230,115
-.byte	150,172,116,34,231,173,53,133
-.byte	226,249,55,232,28,117,223,110
-.byte	71,241,26,113,29,41,197,137
-.byte	111,183,98,14,170,24,190,27
-.byte	252,86,62,75,198,210,121,32
-.byte	154,219,192,254,120,205,90,244
-.byte	31,221,168,51,136,7,199,49
-.byte	177,18,16,89,39,128,236,95
-.byte	96,81,127,169,25,181,74,13
-.byte	45,229,122,159,147,201,156,239
-.byte	160,224,59,77,174,42,245,176
-.byte	200,235,187,60,131,83,153,97
-.byte	23,43,4,126,186,119,214,38
-.byte	225,105,20,99,85,33,12,125
-.byte	82,9,106,213,48,54,165,56
-.byte	191,64,163,158,129,243,215,251
-.byte	124,227,57,130,155,47,255,135
-.byte	52,142,67,68,196,222,233,203
-.byte	84,123,148,50,166,194,35,61
-.byte	238,76,149,11,66,250,195,78
-.byte	8,46,161,102,40,217,36,178
-.byte	118,91,162,73,109,139,209,37
-.byte	114,248,246,100,134,104,152,22
-.byte	212,164,92,204,93,101,182,146
-.byte	108,112,72,80,253,237,185,218
-.byte	94,21,70,87,167,141,157,132
-.byte	144,216,171,0,140,188,211,10
-.byte	247,228,88,5,184,179,69,6
-.byte	208,44,30,143,202,63,15,2
-.byte	193,175,189,3,1,19,138,107
-.byte	58,145,17,65,79,103,220,234
-.byte	151,242,207,206,240,180,230,115
-.byte	150,172,116,34,231,173,53,133
-.byte	226,249,55,232,28,117,223,110
-.byte	71,241,26,113,29,41,197,137
-.byte	111,183,98,14,170,24,190,27
-.byte	252,86,62,75,198,210,121,32
-.byte	154,219,192,254,120,205,90,244
-.byte	31,221,168,51,136,7,199,49
-.byte	177,18,16,89,39,128,236,95
-.byte	96,81,127,169,25,181,74,13
-.byte	45,229,122,159,147,201,156,239
-.byte	160,224,59,77,174,42,245,176
-.byte	200,235,187,60,131,83,153,97
-.byte	23,43,4,126,186,119,214,38
-.byte	225,105,20,99,85,33,12,125
-.size	_x86_AES_decrypt,.-_x86_AES_decrypt
-.globl	AES_decrypt
-.type	AES_decrypt,@function
-.align	16
-AES_decrypt:
-.L_AES_decrypt_begin:
-	pushl	%ebp
-	pushl	%ebx
-	pushl	%esi
-	pushl	%edi
-	movl	20(%esp),%esi
-	movl	28(%esp),%edi
-	movl	%esp,%eax
-	subl	$36,%esp
-	andl	$-64,%esp
-	leal	-127(%edi),%ebx
-	subl	%esp,%ebx
-	negl	%ebx
-	andl	$960,%ebx
-	subl	%ebx,%esp
-	addl	$4,%esp
-	movl	%eax,28(%esp)
-	call	.L010pic_point
-.L010pic_point:
-	popl	%ebp
-	leal	OPENSSL_ia32cap_P-.L010pic_point(%ebp),%eax
-	leal	.LAES_Td-.L010pic_point(%ebp),%ebp
-	leal	764(%esp),%ebx
-	subl	%ebp,%ebx
-	andl	$768,%ebx
-	leal	2176(%ebp,%ebx,1),%ebp
-	btl	$25,(%eax)
-	jnc	.L011x86
-	movq	(%esi),%mm0
-	movq	8(%esi),%mm4
-	call	_sse_AES_decrypt_compact
-	movl	28(%esp),%esp
-	movl	24(%esp),%esi
-	movq	%mm0,(%esi)
-	movq	%mm4,8(%esi)
-	emms
-	popl	%edi
-	popl	%esi
-	popl	%ebx
-	popl	%ebp
-	ret
-.align	16
-.L011x86:
-	movl	%ebp,24(%esp)
-	movl	(%esi),%eax
-	movl	4(%esi),%ebx
-	movl	8(%esi),%ecx
-	movl	12(%esi),%edx
-	call	_x86_AES_decrypt_compact
-	movl	28(%esp),%esp
-	movl	24(%esp),%esi
-	movl	%eax,(%esi)
-	movl	%ebx,4(%esi)
-	movl	%ecx,8(%esi)
-	movl	%edx,12(%esi)
-	popl	%edi
-	popl	%esi
-	popl	%ebx
-	popl	%ebp
-	ret
-.size	AES_decrypt,.-.L_AES_decrypt_begin
-.globl	AES_cbc_encrypt
-.type	AES_cbc_encrypt,@function
-.align	16
-AES_cbc_encrypt:
-.L_AES_cbc_encrypt_begin:
-	pushl	%ebp
-	pushl	%ebx
-	pushl	%esi
-	pushl	%edi
-	movl	28(%esp),%ecx
-	cmpl	$0,%ecx
-	je	.L012drop_out
-	call	.L013pic_point
-.L013pic_point:
-	popl	%ebp
-	leal	OPENSSL_ia32cap_P-.L013pic_point(%ebp),%eax
-	cmpl	$0,40(%esp)
-	leal	.LAES_Te-.L013pic_point(%ebp),%ebp
-	jne	.L014picked_te
-	leal	.LAES_Td-.LAES_Te(%ebp),%ebp
-.L014picked_te:
-	pushfl
-	cld
-	cmpl	$512,%ecx
-	jb	.L015slow_way
-	testl	$15,%ecx
-	jnz	.L015slow_way
-	btl	$28,(%eax)
-	jc	.L015slow_way
-	leal	-324(%esp),%esi
-	andl	$-64,%esi
-	movl	%ebp,%eax
-	leal	2304(%ebp),%ebx
-	movl	%esi,%edx
-	andl	$4095,%eax
-	andl	$4095,%ebx
-	andl	$4095,%edx
-	cmpl	%ebx,%edx
-	jb	.L016tbl_break_out
-	subl	%ebx,%edx
-	subl	%edx,%esi
-	jmp	.L017tbl_ok
-.align	4
-.L016tbl_break_out:
-	subl	%eax,%edx
-	andl	$4095,%edx
-	addl	$384,%edx
-	subl	%edx,%esi
-.align	4
-.L017tbl_ok:
-	leal	24(%esp),%edx
-	xchgl	%esi,%esp
-	addl	$4,%esp
-	movl	%ebp,24(%esp)
-	movl	%esi,28(%esp)
-	movl	(%edx),%eax
-	movl	4(%edx),%ebx
-	movl	12(%edx),%edi
-	movl	16(%edx),%esi
-	movl	20(%edx),%edx
-	movl	%eax,32(%esp)
-	movl	%ebx,36(%esp)
-	movl	%ecx,40(%esp)
-	movl	%edi,44(%esp)
-	movl	%esi,48(%esp)
-	movl	$0,316(%esp)
-	movl	%edi,%ebx
-	movl	$61,%ecx
-	subl	%ebp,%ebx
-	movl	%edi,%esi
-	andl	$4095,%ebx
-	leal	76(%esp),%edi
-	cmpl	$2304,%ebx
-	jb	.L018do_copy
-	cmpl	$3852,%ebx
-	jb	.L019skip_copy
-.align	4
-.L018do_copy:
-	movl	%edi,44(%esp)
-.long	2784229001
-.L019skip_copy:
-	movl	$16,%edi
-.align	4
-.L020prefetch_tbl:
-	movl	(%ebp),%eax
-	movl	32(%ebp),%ebx
-	movl	64(%ebp),%ecx
-	movl	96(%ebp),%esi
-	leal	128(%ebp),%ebp
-	subl	$1,%edi
-	jnz	.L020prefetch_tbl
-	subl	$2048,%ebp
-	movl	32(%esp),%esi
-	movl	48(%esp),%edi
-	cmpl	$0,%edx
-	je	.L021fast_decrypt
-	movl	(%edi),%eax
-	movl	4(%edi),%ebx
-.align	16
-.L022fast_enc_loop:
-	movl	8(%edi),%ecx
-	movl	12(%edi),%edx
-	xorl	(%esi),%eax
-	xorl	4(%esi),%ebx
-	xorl	8(%esi),%ecx
-	xorl	12(%esi),%edx
-	movl	44(%esp),%edi
-	call	_x86_AES_encrypt
-	movl	32(%esp),%esi
-	movl	36(%esp),%edi
-	movl	%eax,(%edi)
-	movl	%ebx,4(%edi)
-	movl	%ecx,8(%edi)
-	movl	%edx,12(%edi)
-	leal	16(%esi),%esi
-	movl	40(%esp),%ecx
-	movl	%esi,32(%esp)
-	leal	16(%edi),%edx
-	movl	%edx,36(%esp)
-	subl	$16,%ecx
-	movl	%ecx,40(%esp)
-	jnz	.L022fast_enc_loop
-	movl	48(%esp),%esi
-	movl	8(%edi),%ecx
-	movl	12(%edi),%edx
-	movl	%eax,(%esi)
-	movl	%ebx,4(%esi)
-	movl	%ecx,8(%esi)
-	movl	%edx,12(%esi)
-	cmpl	$0,316(%esp)
-	movl	44(%esp),%edi
-	je	.L023skip_ezero
-	movl	$60,%ecx
-	xorl	%eax,%eax
-.align	4
-.long	2884892297
-.L023skip_ezero:
-	movl	28(%esp),%esp
-	popfl
-.L012drop_out:
-	popl	%edi
-	popl	%esi
-	popl	%ebx
-	popl	%ebp
-	ret
-	pushfl
-.align	16
-.L021fast_decrypt:
-	cmpl	36(%esp),%esi
-	je	.L024fast_dec_in_place
-	movl	%edi,52(%esp)
-.align	4
-.align	16
-.L025fast_dec_loop:
-	movl	(%esi),%eax
-	movl	4(%esi),%ebx
-	movl	8(%esi),%ecx
-	movl	12(%esi),%edx
-	movl	44(%esp),%edi
-	call	_x86_AES_decrypt
-	movl	52(%esp),%edi
-	movl	40(%esp),%esi
-	xorl	(%edi),%eax
-	xorl	4(%edi),%ebx
-	xorl	8(%edi),%ecx
-	xorl	12(%edi),%edx
-	movl	36(%esp),%edi
-	movl	32(%esp),%esi
-	movl	%eax,(%edi)
-	movl	%ebx,4(%edi)
-	movl	%ecx,8(%edi)
-	movl	%edx,12(%edi)
-	movl	40(%esp),%ecx
-	movl	%esi,52(%esp)
-	leal	16(%esi),%esi
-	movl	%esi,32(%esp)
-	leal	16(%edi),%edi
-	movl	%edi,36(%esp)
-	subl	$16,%ecx
-	movl	%ecx,40(%esp)
-	jnz	.L025fast_dec_loop
-	movl	52(%esp),%edi
-	movl	48(%esp),%esi
-	movl	(%edi),%eax
-	movl	4(%edi),%ebx
-	movl	8(%edi),%ecx
-	movl	12(%edi),%edx
-	movl	%eax,(%esi)
-	movl	%ebx,4(%esi)
-	movl	%ecx,8(%esi)
-	movl	%edx,12(%esi)
-	jmp	.L026fast_dec_out
-.align	16
-.L024fast_dec_in_place:
-.L027fast_dec_in_place_loop:
-	movl	(%esi),%eax
-	movl	4(%esi),%ebx
-	movl	8(%esi),%ecx
-	movl	12(%esi),%edx
-	leal	60(%esp),%edi
-	movl	%eax,(%edi)
-	movl	%ebx,4(%edi)
-	movl	%ecx,8(%edi)
-	movl	%edx,12(%edi)
-	movl	44(%esp),%edi
-	call	_x86_AES_decrypt
-	movl	48(%esp),%edi
-	movl	36(%esp),%esi
-	xorl	(%edi),%eax
-	xorl	4(%edi),%ebx
-	xorl	8(%edi),%ecx
-	xorl	12(%edi),%edx
-	movl	%eax,(%esi)
-	movl	%ebx,4(%esi)
-	movl	%ecx,8(%esi)
-	movl	%edx,12(%esi)
-	leal	16(%esi),%esi
-	movl	%esi,36(%esp)
-	leal	60(%esp),%esi
-	movl	(%esi),%eax
-	movl	4(%esi),%ebx
-	movl	8(%esi),%ecx
-	movl	12(%esi),%edx
-	movl	%eax,(%edi)
-	movl	%ebx,4(%edi)
-	movl	%ecx,8(%edi)
-	movl	%edx,12(%edi)
-	movl	32(%esp),%esi
-	movl	40(%esp),%ecx
-	leal	16(%esi),%esi
-	movl	%esi,32(%esp)
-	subl	$16,%ecx
-	movl	%ecx,40(%esp)
-	jnz	.L027fast_dec_in_place_loop
-.align	4
-.L026fast_dec_out:
-	cmpl	$0,316(%esp)
-	movl	44(%esp),%edi
-	je	.L028skip_dzero
-	movl	$60,%ecx
-	xorl	%eax,%eax
-.align	4
-.long	2884892297
-.L028skip_dzero:
-	movl	28(%esp),%esp
-	popfl
-	popl	%edi
-	popl	%esi
-	popl	%ebx
-	popl	%ebp
-	ret
-	pushfl
-.align	16
-.L015slow_way:
-	movl	(%eax),%eax
-	movl	36(%esp),%edi
-	leal	-80(%esp),%esi
-	andl	$-64,%esi
-	leal	-143(%edi),%ebx
-	subl	%esi,%ebx
-	negl	%ebx
-	andl	$960,%ebx
-	subl	%ebx,%esi
-	leal	768(%esi),%ebx
-	subl	%ebp,%ebx
-	andl	$768,%ebx
-	leal	2176(%ebp,%ebx,1),%ebp
-	leal	24(%esp),%edx
-	xchgl	%esi,%esp
-	addl	$4,%esp
-	movl	%ebp,24(%esp)
-	movl	%esi,28(%esp)
-	movl	%eax,52(%esp)
-	movl	(%edx),%eax
-	movl	4(%edx),%ebx
-	movl	16(%edx),%esi
-	movl	20(%edx),%edx
-	movl	%eax,32(%esp)
-	movl	%ebx,36(%esp)
-	movl	%ecx,40(%esp)
-	movl	%edi,44(%esp)
-	movl	%esi,48(%esp)
-	movl	%esi,%edi
-	movl	%eax,%esi
-	cmpl	$0,%edx
-	je	.L029slow_decrypt
-	cmpl	$16,%ecx
-	movl	%ebx,%edx
-	jb	.L030slow_enc_tail
-	btl	$25,52(%esp)
-	jnc	.L031slow_enc_x86
-	movq	(%edi),%mm0
-	movq	8(%edi),%mm4
-.align	16
-.L032slow_enc_loop_sse:
-	pxor	(%esi),%mm0
-	pxor	8(%esi),%mm4
-	movl	44(%esp),%edi
-	call	_sse_AES_encrypt_compact
-	movl	32(%esp),%esi
-	movl	36(%esp),%edi
-	movl	40(%esp),%ecx
-	movq	%mm0,(%edi)
-	movq	%mm4,8(%edi)
-	leal	16(%esi),%esi
-	movl	%esi,32(%esp)
-	leal	16(%edi),%edx
-	movl	%edx,36(%esp)
-	subl	$16,%ecx
-	cmpl	$16,%ecx
-	movl	%ecx,40(%esp)
-	jae	.L032slow_enc_loop_sse
-	testl	$15,%ecx
-	jnz	.L030slow_enc_tail
-	movl	48(%esp),%esi
-	movq	%mm0,(%esi)
-	movq	%mm4,8(%esi)
-	emms
-	movl	28(%esp),%esp
-	popfl
-	popl	%edi
-	popl	%esi
-	popl	%ebx
-	popl	%ebp
-	ret
-	pushfl
-.align	16
-.L031slow_enc_x86:
-	movl	(%edi),%eax
-	movl	4(%edi),%ebx
-.align	4
-.L033slow_enc_loop_x86:
-	movl	8(%edi),%ecx
-	movl	12(%edi),%edx
-	xorl	(%esi),%eax
-	xorl	4(%esi),%ebx
-	xorl	8(%esi),%ecx
-	xorl	12(%esi),%edx
-	movl	44(%esp),%edi
-	call	_x86_AES_encrypt_compact
-	movl	32(%esp),%esi
-	movl	36(%esp),%edi
-	movl	%eax,(%edi)
-	movl	%ebx,4(%edi)
-	movl	%ecx,8(%edi)
-	movl	%edx,12(%edi)
-	movl	40(%esp),%ecx
-	leal	16(%esi),%esi
-	movl	%esi,32(%esp)
-	leal	16(%edi),%edx
-	movl	%edx,36(%esp)
-	subl	$16,%ecx
-	cmpl	$16,%ecx
-	movl	%ecx,40(%esp)
-	jae	.L033slow_enc_loop_x86
-	testl	$15,%ecx
-	jnz	.L030slow_enc_tail
-	movl	48(%esp),%esi
-	movl	8(%edi),%ecx
-	movl	12(%edi),%edx
-	movl	%eax,(%esi)
-	movl	%ebx,4(%esi)
-	movl	%ecx,8(%esi)
-	movl	%edx,12(%esi)
-	movl	28(%esp),%esp
-	popfl
-	popl	%edi
-	popl	%esi
-	popl	%ebx
-	popl	%ebp
-	ret
-	pushfl
-.align	16
-.L030slow_enc_tail:
-	emms
-	movl	%edx,%edi
-	movl	$16,%ebx
-	subl	%ecx,%ebx
-	cmpl	%esi,%edi
-	je	.L034enc_in_place
-.align	4
-.long	2767451785
-	jmp	.L035enc_skip_in_place
-.L034enc_in_place:
-	leal	(%edi,%ecx,1),%edi
-.L035enc_skip_in_place:
-	movl	%ebx,%ecx
-	xorl	%eax,%eax
-.align	4
-.long	2868115081
-	movl	48(%esp),%edi
-	movl	%edx,%esi
-	movl	(%edi),%eax
-	movl	4(%edi),%ebx
-	movl	$16,40(%esp)
-	jmp	.L033slow_enc_loop_x86
-.align	16
-.L029slow_decrypt:
-	btl	$25,52(%esp)
-	jnc	.L036slow_dec_loop_x86
-.align	4
-.L037slow_dec_loop_sse:
-	movq	(%esi),%mm0
-	movq	8(%esi),%mm4
-	movl	44(%esp),%edi
-	call	_sse_AES_decrypt_compact
-	movl	32(%esp),%esi
-	leal	60(%esp),%eax
-	movl	36(%esp),%ebx
-	movl	40(%esp),%ecx
-	movl	48(%esp),%edi
-	movq	(%esi),%mm1
-	movq	8(%esi),%mm5
-	pxor	(%edi),%mm0
-	pxor	8(%edi),%mm4
-	movq	%mm1,(%edi)
-	movq	%mm5,8(%edi)
-	subl	$16,%ecx
-	jc	.L038slow_dec_partial_sse
-	movq	%mm0,(%ebx)
-	movq	%mm4,8(%ebx)
-	leal	16(%ebx),%ebx
-	movl	%ebx,36(%esp)
-	leal	16(%esi),%esi
-	movl	%esi,32(%esp)
-	movl	%ecx,40(%esp)
-	jnz	.L037slow_dec_loop_sse
-	emms
-	movl	28(%esp),%esp
-	popfl
-	popl	%edi
-	popl	%esi
-	popl	%ebx
-	popl	%ebp
-	ret
-	pushfl
-.align	16
-.L038slow_dec_partial_sse:
-	movq	%mm0,(%eax)
-	movq	%mm4,8(%eax)
-	emms
-	addl	$16,%ecx
-	movl	%ebx,%edi
-	movl	%eax,%esi
-.align	4
-.long	2767451785
-	movl	28(%esp),%esp
-	popfl
-	popl	%edi
-	popl	%esi
-	popl	%ebx
-	popl	%ebp
-	ret
-	pushfl
-.align	16
-.L036slow_dec_loop_x86:
-	movl	(%esi),%eax
-	movl	4(%esi),%ebx
-	movl	8(%esi),%ecx
-	movl	12(%esi),%edx
-	leal	60(%esp),%edi
-	movl	%eax,(%edi)
-	movl	%ebx,4(%edi)
-	movl	%ecx,8(%edi)
-	movl	%edx,12(%edi)
-	movl	44(%esp),%edi
-	call	_x86_AES_decrypt_compact
-	movl	48(%esp),%edi
-	movl	40(%esp),%esi
-	xorl	(%edi),%eax
-	xorl	4(%edi),%ebx
-	xorl	8(%edi),%ecx
-	xorl	12(%edi),%edx
-	subl	$16,%esi
-	jc	.L039slow_dec_partial_x86
-	movl	%esi,40(%esp)
-	movl	36(%esp),%esi
-	movl	%eax,(%esi)
-	movl	%ebx,4(%esi)
-	movl	%ecx,8(%esi)
-	movl	%edx,12(%esi)
-	leal	16(%esi),%esi
-	movl	%esi,36(%esp)
-	leal	60(%esp),%esi
-	movl	(%esi),%eax
-	movl	4(%esi),%ebx
-	movl	8(%esi),%ecx
-	movl	12(%esi),%edx
-	movl	%eax,(%edi)
-	movl	%ebx,4(%edi)
-	movl	%ecx,8(%edi)
-	movl	%edx,12(%edi)
-	movl	32(%esp),%esi
-	leal	16(%esi),%esi
-	movl	%esi,32(%esp)
-	jnz	.L036slow_dec_loop_x86
-	movl	28(%esp),%esp
-	popfl
-	popl	%edi
-	popl	%esi
-	popl	%ebx
-	popl	%ebp
-	ret
-	pushfl
-.align	16
-.L039slow_dec_partial_x86:
-	leal	60(%esp),%esi
-	movl	%eax,(%esi)
-	movl	%ebx,4(%esi)
-	movl	%ecx,8(%esi)
-	movl	%edx,12(%esi)
-	movl	32(%esp),%esi
-	movl	(%esi),%eax
-	movl	4(%esi),%ebx
-	movl	8(%esi),%ecx
-	movl	12(%esi),%edx
-	movl	%eax,(%edi)
-	movl	%ebx,4(%edi)
-	movl	%ecx,8(%edi)
-	movl	%edx,12(%edi)
-	movl	40(%esp),%ecx
-	movl	36(%esp),%edi
-	leal	60(%esp),%esi
-.align	4
-.long	2767451785
-	movl	28(%esp),%esp
-	popfl
-	popl	%edi
-	popl	%esi
-	popl	%ebx
-	popl	%ebp
-	ret
-.size	AES_cbc_encrypt,.-.L_AES_cbc_encrypt_begin
-.type	_x86_AES_set_encrypt_key,@function
-.align	16
-_x86_AES_set_encrypt_key:
-	pushl	%ebp
-	pushl	%ebx
-	pushl	%esi
-	pushl	%edi
-	movl	24(%esp),%esi
-	movl	32(%esp),%edi
-	testl	$-1,%esi
-	jz	.L040badpointer
-	testl	$-1,%edi
-	jz	.L040badpointer
-	call	.L041pic_point
-.L041pic_point:
-	popl	%ebp
-	leal	.LAES_Te-.L041pic_point(%ebp),%ebp
-	leal	2176(%ebp),%ebp
-	movl	-128(%ebp),%eax
-	movl	-96(%ebp),%ebx
-	movl	-64(%ebp),%ecx
-	movl	-32(%ebp),%edx
-	movl	(%ebp),%eax
-	movl	32(%ebp),%ebx
-	movl	64(%ebp),%ecx
-	movl	96(%ebp),%edx
-	movl	28(%esp),%ecx
-	cmpl	$128,%ecx
-	je	.L04210rounds
-	cmpl	$192,%ecx
-	je	.L04312rounds
-	cmpl	$256,%ecx
-	je	.L04414rounds
-	movl	$-2,%eax
-	jmp	.L045exit
-.L04210rounds:
-	movl	(%esi),%eax
-	movl	4(%esi),%ebx
-	movl	8(%esi),%ecx
-	movl	12(%esi),%edx
-	movl	%eax,(%edi)
-	movl	%ebx,4(%edi)
-	movl	%ecx,8(%edi)
-	movl	%edx,12(%edi)
-	xorl	%ecx,%ecx
-	jmp	.L04610shortcut
-.align	4
-.L04710loop:
-	movl	(%edi),%eax
-	movl	12(%edi),%edx
-.L04610shortcut:
-	movzbl	%dl,%esi
-	movzbl	-128(%ebp,%esi,1),%ebx
-	movzbl	%dh,%esi
-	shll	$24,%ebx
-	xorl	%ebx,%eax
-	movzbl	-128(%ebp,%esi,1),%ebx
-	shrl	$16,%edx
-	movzbl	%dl,%esi
-	xorl	%ebx,%eax
-	movzbl	-128(%ebp,%esi,1),%ebx
-	movzbl	%dh,%esi
-	shll	$8,%ebx
-	xorl	%ebx,%eax
-	movzbl	-128(%ebp,%esi,1),%ebx
-	shll	$16,%ebx
-	xorl	%ebx,%eax
-	xorl	896(%ebp,%ecx,4),%eax
-	movl	%eax,16(%edi)
-	xorl	4(%edi),%eax
-	movl	%eax,20(%edi)
-	xorl	8(%edi),%eax
-	movl	%eax,24(%edi)
-	xorl	12(%edi),%eax
-	movl	%eax,28(%edi)
-	incl	%ecx
-	addl	$16,%edi
-	cmpl	$10,%ecx
-	jl	.L04710loop
-	movl	$10,80(%edi)
-	xorl	%eax,%eax
-	jmp	.L045exit
-.L04312rounds:
-	movl	(%esi),%eax
-	movl	4(%esi),%ebx
-	movl	8(%esi),%ecx
-	movl	12(%esi),%edx
-	movl	%eax,(%edi)
-	movl	%ebx,4(%edi)
-	movl	%ecx,8(%edi)
-	movl	%edx,12(%edi)
-	movl	16(%esi),%ecx
-	movl	20(%esi),%edx
-	movl	%ecx,16(%edi)
-	movl	%edx,20(%edi)
-	xorl	%ecx,%ecx
-	jmp	.L04812shortcut
-.align	4
-.L04912loop:
-	movl	(%edi),%eax
-	movl	20(%edi),%edx
-.L04812shortcut:
-	movzbl	%dl,%esi
-	movzbl	-128(%ebp,%esi,1),%ebx
-	movzbl	%dh,%esi
-	shll	$24,%ebx
-	xorl	%ebx,%eax
-	movzbl	-128(%ebp,%esi,1),%ebx
-	shrl	$16,%edx
-	movzbl	%dl,%esi
-	xorl	%ebx,%eax
-	movzbl	-128(%ebp,%esi,1),%ebx
-	movzbl	%dh,%esi
-	shll	$8,%ebx
-	xorl	%ebx,%eax
-	movzbl	-128(%ebp,%esi,1),%ebx
-	shll	$16,%ebx
-	xorl	%ebx,%eax
-	xorl	896(%ebp,%ecx,4),%eax
-	movl	%eax,24(%edi)
-	xorl	4(%edi),%eax
-	movl	%eax,28(%edi)
-	xorl	8(%edi),%eax
-	movl	%eax,32(%edi)
-	xorl	12(%edi),%eax
-	movl	%eax,36(%edi)
-	cmpl	$7,%ecx
-	je	.L05012break
-	incl	%ecx
-	xorl	16(%edi),%eax
-	movl	%eax,40(%edi)
-	xorl	20(%edi),%eax
-	movl	%eax,44(%edi)
-	addl	$24,%edi
-	jmp	.L04912loop
-.L05012break:
-	movl	$12,72(%edi)
-	xorl	%eax,%eax
-	jmp	.L045exit
-.L04414rounds:
-	movl	(%esi),%eax
-	movl	4(%esi),%ebx
-	movl	8(%esi),%ecx
-	movl	12(%esi),%edx
-	movl	%eax,(%edi)
-	movl	%ebx,4(%edi)
-	movl	%ecx,8(%edi)
-	movl	%edx,12(%edi)
-	movl	16(%esi),%eax
-	movl	20(%esi),%ebx
-	movl	24(%esi),%ecx
-	movl	28(%esi),%edx
-	movl	%eax,16(%edi)
-	movl	%ebx,20(%edi)
-	movl	%ecx,24(%edi)
-	movl	%edx,28(%edi)
-	xorl	%ecx,%ecx
-	jmp	.L05114shortcut
-.align	4
-.L05214loop:
-	movl	28(%edi),%edx
-.L05114shortcut:
-	movl	(%edi),%eax
-	movzbl	%dl,%esi
-	movzbl	-128(%ebp,%esi,1),%ebx
-	movzbl	%dh,%esi
-	shll	$24,%ebx
-	xorl	%ebx,%eax
-	movzbl	-128(%ebp,%esi,1),%ebx
-	shrl	$16,%edx
-	movzbl	%dl,%esi
-	xorl	%ebx,%eax
-	movzbl	-128(%ebp,%esi,1),%ebx
-	movzbl	%dh,%esi
-	shll	$8,%ebx
-	xorl	%ebx,%eax
-	movzbl	-128(%ebp,%esi,1),%ebx
-	shll	$16,%ebx
-	xorl	%ebx,%eax
-	xorl	896(%ebp,%ecx,4),%eax
-	movl	%eax,32(%edi)
-	xorl	4(%edi),%eax
-	movl	%eax,36(%edi)
-	xorl	8(%edi),%eax
-	movl	%eax,40(%edi)
-	xorl	12(%edi),%eax
-	movl	%eax,44(%edi)
-	cmpl	$6,%ecx
-	je	.L05314break
-	incl	%ecx
-	movl	%eax,%edx
-	movl	16(%edi),%eax
-	movzbl	%dl,%esi
-	movzbl	-128(%ebp,%esi,1),%ebx
-	movzbl	%dh,%esi
-	xorl	%ebx,%eax
-	movzbl	-128(%ebp,%esi,1),%ebx
-	shrl	$16,%edx
-	shll	$8,%ebx
-	movzbl	%dl,%esi
-	xorl	%ebx,%eax
-	movzbl	-128(%ebp,%esi,1),%ebx
-	movzbl	%dh,%esi
-	shll	$16,%ebx
-	xorl	%ebx,%eax
-	movzbl	-128(%ebp,%esi,1),%ebx
-	shll	$24,%ebx
-	xorl	%ebx,%eax
-	movl	%eax,48(%edi)
-	xorl	20(%edi),%eax
-	movl	%eax,52(%edi)
-	xorl	24(%edi),%eax
-	movl	%eax,56(%edi)
-	xorl	28(%edi),%eax
-	movl	%eax,60(%edi)
-	addl	$32,%edi
-	jmp	.L05214loop
-.L05314break:
-	movl	$14,48(%edi)
-	xorl	%eax,%eax
-	jmp	.L045exit
-.L040badpointer:
-	movl	$-1,%eax
-.L045exit:
-	popl	%edi
-	popl	%esi
-	popl	%ebx
-	popl	%ebp
-	ret
-.size	_x86_AES_set_encrypt_key,.-_x86_AES_set_encrypt_key
-.globl	AES_set_encrypt_key
-.type	AES_set_encrypt_key,@function
-.align	16
-AES_set_encrypt_key:
-.L_AES_set_encrypt_key_begin:
-	call	_x86_AES_set_encrypt_key
-	ret
-.size	AES_set_encrypt_key,.-.L_AES_set_encrypt_key_begin
-.globl	AES_set_decrypt_key
-.type	AES_set_decrypt_key,@function
-.align	16
-AES_set_decrypt_key:
-.L_AES_set_decrypt_key_begin:
-	call	_x86_AES_set_encrypt_key
-	cmpl	$0,%eax
-	je	.L054proceed
-	ret
-.L054proceed:
-	pushl	%ebp
-	pushl	%ebx
-	pushl	%esi
-	pushl	%edi
-	movl	28(%esp),%esi
-	movl	240(%esi),%ecx
-	leal	(,%ecx,4),%ecx
-	leal	(%esi,%ecx,4),%edi
-.align	4
-.L055invert:
-	movl	(%esi),%eax
-	movl	4(%esi),%ebx
-	movl	(%edi),%ecx
-	movl	4(%edi),%edx
-	movl	%eax,(%edi)
-	movl	%ebx,4(%edi)
-	movl	%ecx,(%esi)
-	movl	%edx,4(%esi)
-	movl	8(%esi),%eax
-	movl	12(%esi),%ebx
-	movl	8(%edi),%ecx
-	movl	12(%edi),%edx
-	movl	%eax,8(%edi)
-	movl	%ebx,12(%edi)
-	movl	%ecx,8(%esi)
-	movl	%edx,12(%esi)
-	addl	$16,%esi
-	subl	$16,%edi
-	cmpl	%edi,%esi
-	jne	.L055invert
-	movl	28(%esp),%edi
-	movl	240(%edi),%esi
-	leal	-2(%esi,%esi,1),%esi
-	leal	(%edi,%esi,8),%esi
-	movl	%esi,28(%esp)
-	movl	16(%edi),%eax
-.align	4
-.L056permute:
-	addl	$16,%edi
-	movl	$2155905152,%ebp
-	andl	%eax,%ebp
-	leal	(%eax,%eax,1),%ebx
-	movl	%ebp,%esi
-	shrl	$7,%ebp
-	subl	%ebp,%esi
-	andl	$4278124286,%ebx
-	andl	$454761243,%esi
-	xorl	%esi,%ebx
-	movl	$2155905152,%ebp
-	andl	%ebx,%ebp
-	leal	(%ebx,%ebx,1),%ecx
-	movl	%ebp,%esi
-	shrl	$7,%ebp
-	subl	%ebp,%esi
-	andl	$4278124286,%ecx
-	andl	$454761243,%esi
-	xorl	%eax,%ebx
-	xorl	%esi,%ecx
-	movl	$2155905152,%ebp
-	andl	%ecx,%ebp
-	leal	(%ecx,%ecx,1),%edx
-	movl	%ebp,%esi
-	shrl	$7,%ebp
-	xorl	%eax,%ecx
-	subl	%ebp,%esi
-	andl	$4278124286,%edx
-	andl	$454761243,%esi
-	roll	$8,%eax
-	xorl	%esi,%edx
-	movl	4(%edi),%ebp
-	xorl	%ebx,%eax
-	xorl	%edx,%ebx
-	xorl	%ecx,%eax
-	roll	$24,%ebx
-	xorl	%edx,%ecx
-	xorl	%edx,%eax
-	roll	$16,%ecx
-	xorl	%ebx,%eax
-	roll	$8,%edx
-	xorl	%ecx,%eax
-	movl	%ebp,%ebx
-	xorl	%edx,%eax
-	movl	%eax,(%edi)
-	movl	$2155905152,%ebp
-	andl	%ebx,%ebp
-	leal	(%ebx,%ebx,1),%ecx
-	movl	%ebp,%esi
-	shrl	$7,%ebp
-	subl	%ebp,%esi
-	andl	$4278124286,%ecx
-	andl	$454761243,%esi
-	xorl	%esi,%ecx
-	movl	$2155905152,%ebp
-	andl	%ecx,%ebp
-	leal	(%ecx,%ecx,1),%edx
-	movl	%ebp,%esi
-	shrl	$7,%ebp
-	subl	%ebp,%esi
-	andl	$4278124286,%edx
-	andl	$454761243,%esi
-	xorl	%ebx,%ecx
-	xorl	%esi,%edx
-	movl	$2155905152,%ebp
-	andl	%edx,%ebp
-	leal	(%edx,%edx,1),%eax
-	movl	%ebp,%esi
-	shrl	$7,%ebp
-	xorl	%ebx,%edx
-	subl	%ebp,%esi
-	andl	$4278124286,%eax
-	andl	$454761243,%esi
-	roll	$8,%ebx
-	xorl	%esi,%eax
-	movl	8(%edi),%ebp
-	xorl	%ecx,%ebx
-	xorl	%eax,%ecx
-	xorl	%edx,%ebx
-	roll	$24,%ecx
-	xorl	%eax,%edx
-	xorl	%eax,%ebx
-	roll	$16,%edx
-	xorl	%ecx,%ebx
-	roll	$8,%eax
-	xorl	%edx,%ebx
-	movl	%ebp,%ecx
-	xorl	%eax,%ebx
-	movl	%ebx,4(%edi)
-	movl	$2155905152,%ebp
-	andl	%ecx,%ebp
-	leal	(%ecx,%ecx,1),%edx
-	movl	%ebp,%esi
-	shrl	$7,%ebp
-	subl	%ebp,%esi
-	andl	$4278124286,%edx
-	andl	$454761243,%esi
-	xorl	%esi,%edx
-	movl	$2155905152,%ebp
-	andl	%edx,%ebp
-	leal	(%edx,%edx,1),%eax
-	movl	%ebp,%esi
-	shrl	$7,%ebp
-	subl	%ebp,%esi
-	andl	$4278124286,%eax
-	andl	$454761243,%esi
-	xorl	%ecx,%edx
-	xorl	%esi,%eax
-	movl	$2155905152,%ebp
-	andl	%eax,%ebp
-	leal	(%eax,%eax,1),%ebx
-	movl	%ebp,%esi
-	shrl	$7,%ebp
-	xorl	%ecx,%eax
-	subl	%ebp,%esi
-	andl	$4278124286,%ebx
-	andl	$454761243,%esi
-	roll	$8,%ecx
-	xorl	%esi,%ebx
-	movl	12(%edi),%ebp
-	xorl	%edx,%ecx
-	xorl	%ebx,%edx
-	xorl	%eax,%ecx
-	roll	$24,%edx
-	xorl	%ebx,%eax
-	xorl	%ebx,%ecx
-	roll	$16,%eax
-	xorl	%edx,%ecx
-	roll	$8,%ebx
-	xorl	%eax,%ecx
-	movl	%ebp,%edx
-	xorl	%ebx,%ecx
-	movl	%ecx,8(%edi)
-	movl	$2155905152,%ebp
-	andl	%edx,%ebp
-	leal	(%edx,%edx,1),%eax
-	movl	%ebp,%esi
-	shrl	$7,%ebp
-	subl	%ebp,%esi
-	andl	$4278124286,%eax
-	andl	$454761243,%esi
-	xorl	%esi,%eax
-	movl	$2155905152,%ebp
-	andl	%eax,%ebp
-	leal	(%eax,%eax,1),%ebx
-	movl	%ebp,%esi
-	shrl	$7,%ebp
-	subl	%ebp,%esi
-	andl	$4278124286,%ebx
-	andl	$454761243,%esi
-	xorl	%edx,%eax
-	xorl	%esi,%ebx
-	movl	$2155905152,%ebp
-	andl	%ebx,%ebp
-	leal	(%ebx,%ebx,1),%ecx
-	movl	%ebp,%esi
-	shrl	$7,%ebp
-	xorl	%edx,%ebx
-	subl	%ebp,%esi
-	andl	$4278124286,%ecx
-	andl	$454761243,%esi
-	roll	$8,%edx
-	xorl	%esi,%ecx
-	movl	16(%edi),%ebp
-	xorl	%eax,%edx
-	xorl	%ecx,%eax
-	xorl	%ebx,%edx
-	roll	$24,%eax
-	xorl	%ecx,%ebx
-	xorl	%ecx,%edx
-	roll	$16,%ebx
-	xorl	%eax,%edx
-	roll	$8,%ecx
-	xorl	%ebx,%edx
-	movl	%ebp,%eax
-	xorl	%ecx,%edx
-	movl	%edx,12(%edi)
-	cmpl	28(%esp),%edi
-	jb	.L056permute
-	xorl	%eax,%eax
-	popl	%edi
-	popl	%esi
-	popl	%ebx
-	popl	%ebp
-	ret
-.size	AES_set_decrypt_key,.-.L_AES_set_decrypt_key_begin
-.byte	65,69,83,32,102,111,114,32,120,56,54,44,32,67,82,89
-.byte	80,84,79,71,65,77,83,32,98,121,32,60,97,112,112,114
-.byte	111,64,111,112,101,110,115,115,108,46,111,114,103,62,0
-.comm	OPENSSL_ia32cap_P,16,4
diff --git a/deps/openssl/config/archs/solaris-x86-gcc/asm/crypto/buildinf.h b/deps/openssl/config/archs/solaris-x86-gcc/asm/crypto/buildinf.h
index 15030d5907..201a165d1c 100644
--- a/deps/openssl/config/archs/solaris-x86-gcc/asm/crypto/buildinf.h
+++ b/deps/openssl/config/archs/solaris-x86-gcc/asm/crypto/buildinf.h
@@ -11,7 +11,7 @@
  */
 
 #define PLATFORM "platform: solaris-x86-gcc"
-#define DATE "built on: Fri Sep 13 16:02:08 2019 UTC"
+#define DATE "built on: Wed Mar 18 21:09:49 2020 UTC"
 
 /*
  * Generate compiler_flags as an array of individual characters. This is a
@@ -37,10 +37,11 @@ static const char compiler_flags[] = {
     'A','2','5','6','_','A','S','M',' ','-','D','S','H','A','5','1',
     '2','_','A','S','M',' ','-','D','R','C','4','_','A','S','M',' ',
     '-','D','M','D','5','_','A','S','M',' ','-','D','R','M','D','1',
-    '6','0','_','A','S','M',' ','-','D','V','P','A','E','S','_','A',
-    'S','M',' ','-','D','W','H','I','R','L','P','O','O','L','_','A',
-    'S','M',' ','-','D','G','H','A','S','H','_','A','S','M',' ','-',
-    'D','E','C','P','_','N','I','S','T','Z','2','5','6','_','A','S',
-    'M',' ','-','D','P','O','L','Y','1','3','0','5','_','A','S','M',
-    ' ','-','D','N','D','E','B','U','G','\0'
+    '6','0','_','A','S','M',' ','-','D','A','E','S','N','I','_','A',
+    'S','M',' ','-','D','V','P','A','E','S','_','A','S','M',' ','-',
+    'D','W','H','I','R','L','P','O','O','L','_','A','S','M',' ','-',
+    'D','G','H','A','S','H','_','A','S','M',' ','-','D','E','C','P',
+    '_','N','I','S','T','Z','2','5','6','_','A','S','M',' ','-','D',
+    'P','O','L','Y','1','3','0','5','_','A','S','M',' ','-','D','N',
+    'D','E','B','U','G','\0'
 };
diff --git a/deps/openssl/config/archs/solaris-x86-gcc/asm/crypto/ec/ecp_nistz256-x86.s b/deps/openssl/config/archs/solaris-x86-gcc/asm/crypto/ec/ecp_nistz256-x86.s
index da9b3a7ee1..4cec24f4e2 100644
--- a/deps/openssl/config/archs/solaris-x86-gcc/asm/crypto/ec/ecp_nistz256-x86.s
+++ b/deps/openssl/config/archs/solaris-x86-gcc/asm/crypto/ec/ecp_nistz256-x86.s
@@ -4419,19 +4419,15 @@ ecp_nistz256_point_add:
 	orl	4(%edi),%eax
 	orl	8(%edi),%eax
 	orl	12(%edi),%eax
+	movl	576(%esp),%ebx
+	notl	%ebx
+	orl	%ebx,%eax
+	movl	580(%esp),%ebx
+	notl	%ebx
+	orl	%ebx,%eax
+	orl	584(%esp),%eax
 .byte	62
 	jnz	.L010add_proceed
-	movl	576(%esp),%eax
-	andl	580(%esp),%eax
-	movl	584(%esp),%ebx
-	jz	.L010add_proceed
-	testl	%ebx,%ebx
-	jz	.L011add_double
-	movl	616(%esp),%edi
-	xorl	%eax,%eax
-	movl	$24,%ecx
-.byte	252,243,171
-	jmp	.L012add_done
 .align	16
 .L011add_double:
 	movl	620(%esp),%esi
diff --git a/deps/openssl/config/archs/solaris-x86-gcc/asm/crypto/include/internal/bn_conf.h b/deps/openssl/config/archs/solaris-x86-gcc/asm/crypto/include/internal/bn_conf.h
index fb52156bd0..459055c96f 100644
--- a/deps/openssl/config/archs/solaris-x86-gcc/asm/crypto/include/internal/bn_conf.h
+++ b/deps/openssl/config/archs/solaris-x86-gcc/asm/crypto/include/internal/bn_conf.h
@@ -1,5 +1,5 @@
 /* WARNING: do not edit! */
-/* Generated by Makefile from crypto/include/internal/bn_conf.h.in */
+/* Generated by Makefile from include/crypto/bn_conf.h.in */
 /*
  * Copyright 2016 The OpenSSL Project Authors. All Rights Reserved.
  *
@@ -9,8 +9,8 @@
  * https://www.openssl.org/source/license.html
  */
 
-#ifndef HEADER_BN_CONF_H
-# define HEADER_BN_CONF_H
+#ifndef OSSL_CRYPTO_BN_CONF_H
+# define OSSL_CRYPTO_BN_CONF_H
 
 /*
  * The contents of this file are not used in the UEFI build, as
diff --git a/deps/openssl/config/archs/solaris-x86-gcc/asm/crypto/include/internal/dso_conf.h b/deps/openssl/config/archs/solaris-x86-gcc/asm/crypto/include/internal/dso_conf.h
index 252266ec2a..4b1167c3d8 100644
--- a/deps/openssl/config/archs/solaris-x86-gcc/asm/crypto/include/internal/dso_conf.h
+++ b/deps/openssl/config/archs/solaris-x86-gcc/asm/crypto/include/internal/dso_conf.h
@@ -1,5 +1,5 @@
 /* WARNING: do not edit! */
-/* Generated by Makefile from crypto/include/internal/dso_conf.h.in */
+/* Generated by Makefile from include/crypto/dso_conf.h.in */
 /*
  * Copyright 2016-2019 The OpenSSL Project Authors. All Rights Reserved.
  *
@@ -9,8 +9,8 @@
  * https://www.openssl.org/source/license.html
  */
 
-#ifndef HEADER_DSO_CONF_H
-# define HEADER_DSO_CONF_H
+#ifndef OSSL_CRYPTO_DSO_CONF_H
+# define OSSL_CRYPTO_DSO_CONF_H
 # define DSO_DLFCN
 # define HAVE_DLFCN_H
 # define DSO_EXTENSION ".so"
diff --git a/deps/openssl/config/archs/solaris-x86-gcc/asm/include/openssl/opensslconf.h b/deps/openssl/config/archs/solaris-x86-gcc/asm/include/openssl/opensslconf.h
index c43f227296..da0b080ce0 100644
--- a/deps/openssl/config/archs/solaris-x86-gcc/asm/include/openssl/opensslconf.h
+++ b/deps/openssl/config/archs/solaris-x86-gcc/asm/include/openssl/opensslconf.h
@@ -96,9 +96,6 @@ extern "C" {
 #ifndef OPENSSL_NO_DYNAMIC_ENGINE
 # define OPENSSL_NO_DYNAMIC_ENGINE
 #endif
-#ifndef OPENSSL_NO_AFALGENG
-# define OPENSSL_NO_AFALGENG
-#endif
 
 
 /*
diff --git a/deps/openssl/config/archs/solaris-x86-gcc/asm/include/progs.h b/deps/openssl/config/archs/solaris-x86-gcc/asm/include/progs.h
index 9b3d270e20..308c65601b 100644
--- a/deps/openssl/config/archs/solaris-x86-gcc/asm/include/progs.h
+++ b/deps/openssl/config/archs/solaris-x86-gcc/asm/include/progs.h
@@ -2,7 +2,7 @@
  * WARNING: do not edit!
  * Generated by apps/progs.pl
  *
- * Copyright 1995-2019 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 1995-2020 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
diff --git a/deps/openssl/config/archs/solaris-x86-gcc/asm/openssl-cl.gypi b/deps/openssl/config/archs/solaris-x86-gcc/asm/openssl-cl.gypi
index 3f5a755eeb..f9a78c541b 100644
--- a/deps/openssl/config/archs/solaris-x86-gcc/asm/openssl-cl.gypi
+++ b/deps/openssl/config/archs/solaris-x86-gcc/asm/openssl-cl.gypi
@@ -16,6 +16,7 @@
       'RC4_ASM',
       'MD5_ASM',
       'RMD160_ASM',
+      'AESNI_ASM',
       'VPAES_ASM',
       'WHIRLPOOL_ASM',
       'GHASH_ASM',
diff --git a/deps/openssl/config/archs/solaris-x86-gcc/asm/openssl.gypi b/deps/openssl/config/archs/solaris-x86-gcc/asm/openssl.gypi
index 69bded9b4f..60c75c7f2e 100644
--- a/deps/openssl/config/archs/solaris-x86-gcc/asm/openssl.gypi
+++ b/deps/openssl/config/archs/solaris-x86-gcc/asm/openssl.gypi
@@ -713,6 +713,7 @@
       'RC4_ASM',
       'MD5_ASM',
       'RMD160_ASM',
+      'AESNI_ASM',
       'VPAES_ASM',
       'WHIRLPOOL_ASM',
       'GHASH_ASM',
diff --git a/deps/openssl/config/archs/solaris-x86-gcc/asm_avx2/configdata.pm b/deps/openssl/config/archs/solaris-x86-gcc/asm_avx2/configdata.pm
index 7663c71cf6..2cca99ea71 100644
--- a/deps/openssl/config/archs/solaris-x86-gcc/asm_avx2/configdata.pm
+++ b/deps/openssl/config/archs/solaris-x86-gcc/asm_avx2/configdata.pm
@@ -48,14 +48,14 @@ our %config = (
   export_var_as_fn => "0",
   includes => [  ],
   lflags => [  ],
-  lib_defines => [ "OPENSSL_PIC", "OPENSSL_CPUID_OBJ", "OPENSSL_BN_ASM_PART_WORDS", "OPENSSL_IA32_SSE2", "OPENSSL_BN_ASM_MONT", "OPENSSL_BN_ASM_GF2m", "SHA1_ASM", "SHA256_ASM", "SHA512_ASM", "RC4_ASM", "MD5_ASM", "RMD160_ASM", "VPAES_ASM", "WHIRLPOOL_ASM", "GHASH_ASM", "ECP_NISTZ256_ASM", "POLY1305_ASM" ],
+  lib_defines => [ "OPENSSL_PIC", "OPENSSL_CPUID_OBJ", "OPENSSL_BN_ASM_PART_WORDS", "OPENSSL_IA32_SSE2", "OPENSSL_BN_ASM_MONT", "OPENSSL_BN_ASM_GF2m", "SHA1_ASM", "SHA256_ASM", "SHA512_ASM", "RC4_ASM", "MD5_ASM", "RMD160_ASM", "AESNI_ASM", "VPAES_ASM", "WHIRLPOOL_ASM", "GHASH_ASM", "ECP_NISTZ256_ASM", "POLY1305_ASM" ],
   libdir => "",
   major => "1",
   makedepprog => "\$(CROSS_COMPILE)../config/fake_gcc.pl",
   minor => "1.1",
   openssl_algorithm_defines => [ "OPENSSL_NO_COMP", "OPENSSL_NO_MD2", "OPENSSL_NO_RC5" ],
   openssl_api_defines => [  ],
-  openssl_other_defines => [ "OPENSSL_RAND_SEED_OS", "OPENSSL_NO_AFALGENG", "OPENSSL_NO_ASAN", "OPENSSL_NO_CRYPTO_MDEBUG", "OPENSSL_NO_CRYPTO_MDEBUG_BACKTRACE", "OPENSSL_NO_DEVCRYPTOENG", "OPENSSL_NO_EC_NISTP_64_GCC_128", "OPENSSL_NO_EGD", "OPENSSL_NO_EXTERNAL_TESTS", "OPENSSL_NO_FUZZ_AFL", "OPENSSL_NO_FUZZ_LIBFUZZER", "OPENSSL_NO_HEARTBEATS", "OPENSSL_NO_MSAN", "OPENSSL_NO_SCTP", "OPENSSL_NO_SSL3", "OPENSSL_NO_SSL3_METHOD", "OPENSSL_NO_UBSAN", "OPENSSL_NO_UNIT_TEST", "OPENSSL_NO_WEAK_SSL_CIPHERS", "OPENSSL_NO_DYNAMIC_ENGINE", "OPENSSL_NO_AFALGENG" ],
+  openssl_other_defines => [ "OPENSSL_RAND_SEED_OS", "OPENSSL_NO_AFALGENG", "OPENSSL_NO_ASAN", "OPENSSL_NO_CRYPTO_MDEBUG", "OPENSSL_NO_CRYPTO_MDEBUG_BACKTRACE", "OPENSSL_NO_DEVCRYPTOENG", "OPENSSL_NO_EC_NISTP_64_GCC_128", "OPENSSL_NO_EGD", "OPENSSL_NO_EXTERNAL_TESTS", "OPENSSL_NO_FUZZ_AFL", "OPENSSL_NO_FUZZ_LIBFUZZER", "OPENSSL_NO_HEARTBEATS", "OPENSSL_NO_MSAN", "OPENSSL_NO_SCTP", "OPENSSL_NO_SSL3", "OPENSSL_NO_SSL3_METHOD", "OPENSSL_NO_UBSAN", "OPENSSL_NO_UNIT_TEST", "OPENSSL_NO_WEAK_SSL_CIPHERS", "OPENSSL_NO_DYNAMIC_ENGINE" ],
   openssl_sys_defines => [  ],
   openssl_thread_defines => [ "OPENSSL_THREADS" ],
   openssldir => "",
@@ -111,8 +111,8 @@ our %config = (
   sourcedir => ".",
   target => "solaris-x86-gcc",
   tdirs => [ "ossl_shim" ],
-  version => "1.1.1d",
-  version_num => "0x1010104fL",
+  version => "1.1.1e",
+  version_num => "0x1010105fL",
 );
 
 our %target = (
@@ -236,6 +236,7 @@ our @disablables = (
   "dgram",
   "dh",
   "dsa",
+  "dso",
   "dtls",
   "dynamic-engine",
   "ec",
@@ -353,8 +354,8 @@ our %unified_info = (
         {
             "" =>
                 [
-                    "crypto/include/internal/bn_conf.h",
-                    "crypto/include/internal/dso_conf.h",
+                    "include/crypto/bn_conf.h",
+                    "include/crypto/dso_conf.h",
                     "include/openssl/opensslconf.h",
                 ],
             "apps/asn1pars.o" =>
@@ -622,14 +623,6 @@ our %unified_info = (
                     "crypto/perlasm/cbc.pl",
                     "crypto/perlasm/x86asm.pl",
                 ],
-            "crypto/include/internal/bn_conf.h" =>
-                [
-                    "configdata.pm",
-                ],
-            "crypto/include/internal/dso_conf.h" =>
-                [
-                    "configdata.pm",
-                ],
             "crypto/rc4/rc4-586.s" =>
                 [
                     "crypto/perlasm/x86asm.pl",
@@ -705,6 +698,14 @@ our %unified_info = (
                 [
                     "libcrypto",
                 ],
+            "include/crypto/bn_conf.h" =>
+                [
+                    "configdata.pm",
+                ],
+            "include/crypto/dso_conf.h" =>
+                [
+                    "configdata.pm",
+                ],
             "include/openssl/opensslconf.h" =>
                 [
                     "configdata.pm",
@@ -1502,6 +1503,12 @@ our %unified_info = (
                     "libcrypto",
                     "test/libtestutil.a",
                 ],
+            "test/ssl_ctx_test" =>
+                [
+                    "libcrypto",
+                    "libssl",
+                    "test/libtestutil.a",
+                ],
             "test/ssl_test" =>
                 [
                     "libcrypto",
@@ -3233,7 +3240,6 @@ our %unified_info = (
                             "test/testutil/cb.o",
                             "test/testutil/driver.o",
                             "test/testutil/format_output.o",
-                            "test/testutil/init.o",
                             "test/testutil/main.o",
                             "test/testutil/output_helpers.o",
                             "test/testutil/random.o",
@@ -3241,6 +3247,7 @@ our %unified_info = (
                             "test/testutil/tap_bio.o",
                             "test/testutil/test_cleanup.o",
                             "test/testutil/tests.o",
+                            "test/testutil/testutil_init.o",
                         ],
                     "products" =>
                         {
@@ -3739,14 +3746,6 @@ our %unified_info = (
                 [
                     "crypto/ia64cpuid.S",
                 ],
-            "crypto/include/internal/bn_conf.h" =>
-                [
-                    "crypto/include/internal/bn_conf.h.in",
-                ],
-            "crypto/include/internal/dso_conf.h" =>
-                [
-                    "crypto/include/internal/dso_conf.h.in",
-                ],
             "crypto/md5/md5-586.s" =>
                 [
                     "crypto/md5/asm/md5-586.pl",
@@ -4187,6 +4186,14 @@ our %unified_info = (
                     "engines/asm/e_padlock-x86_64.pl",
                     "\$(PERLASM_SCHEME)",
                 ],
+            "include/crypto/bn_conf.h" =>
+                [
+                    "include/crypto/bn_conf.h.in",
+                ],
+            "include/crypto/dso_conf.h" =>
+                [
+                    "include/crypto/dso_conf.h.in",
+                ],
             "include/openssl/opensslconf.h" =>
                 [
                     "include/openssl/opensslconf.h.in",
@@ -4881,49 +4888,41 @@ our %unified_info = (
             "crypto/aes/aes_cbc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/aes/aes_cfb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/aes/aes_core.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/aes/aes_ecb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/aes/aes_ige.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/aes/aes_misc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/aes/aes_ofb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/aes/aes_wrap.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/aes/aesfx-sparcv9.o" =>
@@ -4933,7 +4932,6 @@ our %unified_info = (
             "crypto/aes/aesni-x86.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/aes/aest4-sparcv9.o" =>
@@ -4951,13 +4949,11 @@ our %unified_info = (
             "crypto/aes/vpaes-x86.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/aria/aria.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/arm64cpuid.o" =>
@@ -4971,613 +4967,511 @@ our %unified_info = (
             "crypto/asn1/a_bitstr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_d2i_fp.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_digest.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_dup.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_gentm.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_i2d_fp.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_int.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_mbstr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_object.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_octet.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_print.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_sign.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_strex.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_strnid.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_time.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_type.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_utctm.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_utf8.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_verify.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/ameth_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/asn1_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/asn1_gen.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/asn1_item_list.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/asn1_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/asn1_par.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/asn_mime.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/asn_moid.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/asn_mstbl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/asn_pack.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/bio_asn1.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/bio_ndef.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/d2i_pr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/d2i_pu.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/evp_asn1.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/f_int.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/f_string.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/i2d_pr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/i2d_pu.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/n_pkey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/nsseq.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/p5_pbe.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/p5_pbev2.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/p5_scrypt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/p8_pkey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/t_bitst.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/t_pkey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/t_spki.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/tasn_dec.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/tasn_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/tasn_fre.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/tasn_new.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/tasn_prn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/tasn_scn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/tasn_typ.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/tasn_utl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/x_algor.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/x_bignum.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/x_info.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/x_int64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/x_long.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/x_pkey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/x_sig.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/x_spki.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/x_val.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/async/arch/async_null.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/async/arch/async_posix.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/async/arch/async_win.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/async/async.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/async/async_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/async/async_wait.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bf/bf-586.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bf/bf_cfb64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bf/bf_ecb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bf/bf_ofb64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bf/bf_skey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/b_addr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/b_dump.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/b_print.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/b_sock.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/b_sock2.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bf_buff.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bf_lbuf.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bf_nbio.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bf_null.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bio_cb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bio_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bio_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bio_meth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bss_acpt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bss_bio.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bss_conn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bss_dgram.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bss_fd.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bss_file.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bss_log.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bss_mem.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bss_null.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bss_sock.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/blake2/blake2b.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/blake2/blake2s.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/blake2/m_blake2b.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/blake2/m_blake2s.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/armv4-gf2m.o" =>
@@ -5591,7 +5485,6 @@ our %unified_info = (
             "crypto/bn/bn-586.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn-mips.o" =>
@@ -5601,188 +5494,157 @@ our %unified_info = (
             "crypto/bn/bn_add.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_blind.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_const.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_ctx.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_depr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_dh.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_div.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_exp.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto",
                 ],
             "crypto/bn/bn_exp2.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_gcd.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_gf2m.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_intern.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_kron.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_mod.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_mont.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_mpi.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_mul.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_nist.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_prime.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_print.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_rand.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_recp.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_shift.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_sqr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_sqrt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_srp.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_word.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_x931p.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/co-586.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/mips-mont.o" =>
@@ -5812,25 +5674,21 @@ our %unified_info = (
             "crypto/bn/x86-gf2m.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/x86-mont.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/buffer/buf_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/buffer/buffer.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/buildinf.h" =>
@@ -5840,31 +5698,26 @@ our %unified_info = (
             "crypto/camellia/cmll-x86.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/camellia/cmll_cfb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/camellia/cmll_ctr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/camellia/cmll_ecb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/camellia/cmll_ofb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/camellia/cmllt4-sparcv9.o" =>
@@ -5874,31 +5727,26 @@ our %unified_info = (
             "crypto/cast/c_cfb64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cast/c_ecb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cast/c_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cast/c_ofb64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cast/c_skey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/chacha/chacha-armv4.o" =>
@@ -5916,284 +5764,237 @@ our %unified_info = (
             "crypto/chacha/chacha-x86.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cmac/cm_ameth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cmac/cm_pmeth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cmac/cmac.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_asn1.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_att.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_cd.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_dd.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_env.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_ess.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_io.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_kari.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_pwri.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_sd.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_smime.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/conf/conf_api.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/conf/conf_def.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/conf/conf_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/conf/conf_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/conf/conf_mall.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/conf/conf_mod.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/conf/conf_sap.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/conf/conf_ssl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cpt_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cryptlib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ct/ct_b64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ct/ct_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ct/ct_log.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ct/ct_oct.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ct/ct_policy.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ct/ct_prn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ct/ct_sct.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ct/ct_sct_ctx.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ct/ct_vfy.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ct/ct_x509v3.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ctype.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cversion.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto",
                 ],
             "crypto/des/cbc_cksm.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/cbc_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/cfb64ede.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/cfb64enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/cfb_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/crypt586.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/des-586.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/dest4-sparcv9.o" =>
@@ -6203,295 +6004,246 @@ our %unified_info = (
             "crypto/des/ecb3_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/ecb_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/fcrypt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/ofb64ede.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/ofb64enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/ofb_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/pcbc_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/qud_cksm.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/rand_key.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/set_key.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/str2key.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/xcbc_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_ameth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_asn1.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_check.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_depr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_gen.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_kdf.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_key.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_meth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_pmeth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_prn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_rfc5114.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_rfc7919.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dsa/dsa_ameth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dsa/dsa_asn1.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dsa/dsa_depr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dsa/dsa_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dsa/dsa_gen.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dsa/dsa_key.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dsa/dsa_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dsa/dsa_meth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dsa/dsa_ossl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dsa/dsa_pmeth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dsa/dsa_prn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dsa/dsa_sign.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dsa/dsa_vrf.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dso/dso_dl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dso/dso_dlfcn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dso/dso_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dso/dso_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dso/dso_openssl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dso/dso_vms.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dso/dso_win32.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ebcdic.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/curve25519.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/curve448/arch_32/f_impl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto/ec/curve448/arch_32",
                     "crypto/ec/curve448",
@@ -6499,7 +6251,6 @@ our %unified_info = (
             "crypto/ec/curve448/curve448.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto/ec/curve448/arch_32",
                     "crypto/ec/curve448",
@@ -6507,7 +6258,6 @@ our %unified_info = (
             "crypto/ec/curve448/curve448_tables.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto/ec/curve448/arch_32",
                     "crypto/ec/curve448",
@@ -6515,7 +6265,6 @@ our %unified_info = (
             "crypto/ec/curve448/eddsa.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto/ec/curve448/arch_32",
                     "crypto/ec/curve448",
@@ -6523,7 +6272,6 @@ our %unified_info = (
             "crypto/ec/curve448/f_generic.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto/ec/curve448/arch_32",
                     "crypto/ec/curve448",
@@ -6531,7 +6279,6 @@ our %unified_info = (
             "crypto/ec/curve448/scalar.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto/ec/curve448/arch_32",
                     "crypto/ec/curve448",
@@ -6539,163 +6286,136 @@ our %unified_info = (
             "crypto/ec/ec2_oct.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec2_smpl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec_ameth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec_asn1.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec_check.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec_curve.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec_cvt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec_key.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec_kmeth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec_mult.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec_oct.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec_pmeth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec_print.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecdh_kdf.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecdh_ossl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecdsa_ossl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecdsa_sign.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecdsa_vrf.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/eck_prn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecp_mont.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecp_nist.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecp_nistp224.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecp_nistp256.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecp_nistp521.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecp_nistputil.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecp_nistz256-armv4.o" =>
@@ -6713,235 +6433,196 @@ our %unified_info = (
             "crypto/ec/ecp_nistz256-x86.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecp_nistz256.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecp_oct.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecp_smpl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecx_meth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/eng_all.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/eng_cnf.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/eng_ctrl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/eng_dyn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/eng_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/eng_fat.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/eng_init.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/eng_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/eng_list.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/eng_openssl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/eng_pkey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/eng_rdrand.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/eng_table.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/tb_asnmth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/tb_cipher.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/tb_dh.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/tb_digest.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/tb_dsa.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/tb_eckey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/tb_pkmeth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/tb_rand.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/tb_rsa.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/err/err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/err/err_all.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/err/err_prn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/bio_b64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/bio_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/bio_md.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/bio_ok.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/c_allc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/c_alld.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/cmeth_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/digest.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/e_aes.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto",
                     "crypto/modes",
@@ -6949,21 +6630,18 @@ our %unified_info = (
             "crypto/evp/e_aes_cbc_hmac_sha1.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto/modes",
                 ],
             "crypto/evp/e_aes_cbc_hmac_sha256.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto/modes",
                 ],
             "crypto/evp/e_aria.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto",
                     "crypto/modes",
@@ -6971,13 +6649,11 @@ our %unified_info = (
             "crypto/evp/e_bf.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/e_camellia.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto",
                     "crypto/modes",
@@ -6985,81 +6661,68 @@ our %unified_info = (
             "crypto/evp/e_cast.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/e_chacha20_poly1305.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/e_des.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto",
                 ],
             "crypto/evp/e_des3.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto",
                 ],
             "crypto/evp/e_idea.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/e_null.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/e_old.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/e_rc2.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/e_rc4.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/e_rc4_hmac_md5.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/e_rc5.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/e_seed.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/e_sm4.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto",
                     "crypto/modes",
@@ -7067,334 +6730,272 @@ our %unified_info = (
             "crypto/evp/e_xcbc_d.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/encode.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/evp_cnf.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/evp_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/evp_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/evp_key.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/evp_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/evp_pbe.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/evp_pkey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/m_md2.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/m_md4.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/m_md5.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/m_md5_sha1.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/m_mdc2.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/m_null.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/m_ripemd.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/m_sha1.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/m_sha3.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto",
                 ],
             "crypto/evp/m_sigver.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/m_wp.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/names.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/p5_crpt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/p5_crpt2.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/p_dec.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/p_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/p_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/p_open.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/p_seal.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/p_sign.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/p_verify.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/pbe_scrypt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/pmeth_fn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/pmeth_gn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/pmeth_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ex_data.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/getenv.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/hmac/hm_ameth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/hmac/hm_pmeth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/hmac/hmac.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/idea/i_cbc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/idea/i_cfb64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/idea/i_ecb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/idea/i_ofb64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/idea/i_skey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
-            "crypto/include/internal/bn_conf.h" =>
-                [
-                    ".",
-                ],
-            "crypto/include/internal/dso_conf.h" =>
-                [
-                    ".",
-                ],
             "crypto/init.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/kdf/hkdf.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/kdf/kdf_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/kdf/scrypt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/kdf/tls1_prf.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/lhash/lh_stats.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/lhash/lhash.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/md4/md4_dgst.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/md4/md4_one.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/md5/md5-586.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/md5/md5-sparcv9.o" =>
@@ -7404,79 +7005,66 @@ our %unified_info = (
             "crypto/md5/md5_dgst.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/md5/md5_one.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/mdc2/mdc2_one.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/mdc2/mdc2dgst.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/mem.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/mem_dbg.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/mem_sec.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/modes/cbc128.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/modes/ccm128.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/modes/cfb128.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/modes/ctr128.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/modes/cts128.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/modes/gcm128.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto",
                 ],
@@ -7495,7 +7083,6 @@ our %unified_info = (
             "crypto/modes/ghash-x86.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/modes/ghashv8-armx.o" =>
@@ -7505,361 +7092,301 @@ our %unified_info = (
             "crypto/modes/ocb128.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/modes/ofb128.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/modes/wrap128.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/modes/xts128.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/o_dir.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/o_fips.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/o_fopen.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/o_init.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/o_str.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/o_time.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/objects/o_names.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/objects/obj_dat.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/objects/obj_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/objects/obj_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/objects/obj_xref.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ocsp/ocsp_asn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ocsp/ocsp_cl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ocsp/ocsp_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ocsp/ocsp_ext.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ocsp/ocsp_ht.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ocsp/ocsp_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ocsp/ocsp_prn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ocsp/ocsp_srv.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ocsp/ocsp_vfy.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ocsp/v3_ocsp.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pem/pem_all.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pem/pem_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pem/pem_info.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pem/pem_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pem/pem_oth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pem/pem_pk8.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pem/pem_pkey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pem/pem_sign.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pem/pem_x509.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pem/pem_xaux.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pem/pvkfmt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_add.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_asn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_attr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_crpt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_crt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_decr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_init.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_key.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_kiss.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_mutl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_npas.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_p8d.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_p8e.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_sbag.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_utl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/pk12err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs7/bio_pk7.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs7/pk7_asn1.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs7/pk7_attr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs7/pk7_doit.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs7/pk7_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs7/pk7_mime.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs7/pk7_smime.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs7/pkcs7err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/poly1305/poly1305-armv4.o" =>
@@ -7881,265 +7408,221 @@ our %unified_info = (
             "crypto/poly1305/poly1305-x86.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/poly1305/poly1305.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/poly1305/poly1305_ameth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/poly1305/poly1305_pmeth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rand/drbg_ctr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rand/drbg_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rand/rand_egd.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rand/rand_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rand/rand_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rand/rand_unix.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rand/rand_vms.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rand/rand_win.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rand/randfile.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rc2/rc2_cbc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rc2/rc2_ecb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rc2/rc2_skey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rc2/rc2cfb64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rc2/rc2ofb64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rc4/rc4-586.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ripemd/rmd-586.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ripemd/rmd_dgst.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ripemd/rmd_one.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_ameth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_asn1.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_chk.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_crpt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_depr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_gen.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_meth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_mp.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_none.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_oaep.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_ossl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_pk1.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_pmeth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_prn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_pss.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_saos.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_sign.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_ssl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_x931.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_x931g.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/s390xcpuid.o" =>
@@ -8149,31 +7632,26 @@ our %unified_info = (
             "crypto/seed/seed.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/seed/seed_cbc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/seed/seed_cfb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/seed/seed_ecb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/seed/seed_ofb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sha/keccak1600-armv4.o" =>
@@ -8183,13 +7661,11 @@ our %unified_info = (
             "crypto/sha/keccak1600.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sha/sha1-586.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sha/sha1-armv4-large.o" =>
@@ -8215,19 +7691,16 @@ our %unified_info = (
             "crypto/sha/sha1_one.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sha/sha1dgst.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sha/sha256-586.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sha/sha256-armv4.o" =>
@@ -8253,13 +7726,11 @@ our %unified_info = (
             "crypto/sha/sha256.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sha/sha512-586.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sha/sha512-armv4.o" =>
@@ -8285,727 +7756,606 @@ our %unified_info = (
             "crypto/sha/sha512.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/siphash/siphash.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/siphash/siphash_ameth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/siphash/siphash_pmeth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sm2/sm2_crypt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sm2/sm2_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sm2/sm2_pmeth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sm2/sm2_sign.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sm3/m_sm3.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sm3/sm3.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sm4/sm4.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/srp/srp_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/srp/srp_vfy.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/stack/stack.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/store/loader_file.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/store/store_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/store/store_init.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/store/store_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/store/store_register.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/store/store_strings.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/threads_none.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/threads_pthread.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/threads_win.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ts/ts_asn1.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ts/ts_conf.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ts/ts_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ts/ts_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ts/ts_req_print.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ts/ts_req_utils.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ts/ts_rsp_print.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ts/ts_rsp_sign.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ts/ts_rsp_utils.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ts/ts_rsp_verify.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ts/ts_verify_ctx.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/txt_db/txt_db.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ui/ui_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ui/ui_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ui/ui_null.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ui/ui_openssl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ui/ui_util.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/uid.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/whrlpool/wp-mmx.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/whrlpool/wp_block.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/whrlpool/wp_dgst.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/by_dir.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/by_file.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/t_crl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/t_req.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/t_x509.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_att.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_cmp.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_d2.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_def.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_ext.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_lu.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_meth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_obj.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_r2x.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_req.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_set.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_trs.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_txt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_v3.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_vfy.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_vpm.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509cset.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509name.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509rset.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509spki.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509type.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x_all.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x_attrib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x_crl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x_exten.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x_name.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x_pubkey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x_req.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x_x509.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x_x509a.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/pcy_cache.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/pcy_data.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/pcy_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/pcy_map.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/pcy_node.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/pcy_tree.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_addr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_admis.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_akey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_akeya.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_alt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_asid.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_bcons.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_bitst.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_conf.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_cpols.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_crld.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_enum.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_extku.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_genn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_ia5.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_info.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_int.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_ncons.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_pci.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_pcia.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_pcons.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_pku.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_pmaps.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_prn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_purp.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_skey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_sxnet.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_tlsf.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_utl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x86cpuid.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "engines/e_capi.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "engines/e_padlock-x86.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "engines/e_padlock.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "fuzz/asn1.o" =>
@@ -9056,6 +8406,14 @@ our %unified_info = (
                 [
                     "include",
                 ],
+            "include/crypto/bn_conf.h" =>
+                [
+                    ".",
+                ],
+            "include/crypto/dso_conf.h" =>
+                [
+                    ".",
+                ],
             "include/openssl/opensslconf.h" =>
                 [
                     ".",
@@ -9300,7 +8658,6 @@ our %unified_info = (
                 [
                     ".",
                     "include",
-                    "crypto/include",
                 ],
             "test/asn1_string_table_test.o" =>
                 [
@@ -9626,7 +8983,6 @@ our %unified_info = (
                 [
                     ".",
                     "include",
-                    "crypto/include",
                 ],
             "test/cipher_overhead_test.o" =>
                 [
@@ -9672,7 +9028,6 @@ our %unified_info = (
             "test/ctype_internal_test.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "test/curve448_internal_test.o" =>
@@ -9738,7 +9093,6 @@ our %unified_info = (
                 [
                     "include",
                     "crypto/ec",
-                    "crypto/include",
                 ],
             "test/ecdsatest.o" =>
                 [
@@ -9763,7 +9117,6 @@ our %unified_info = (
             "test/evp_extra_test.o" =>
                 [
                     "include",
-                    "crypto/include",
                 ],
             "test/evp_test.o" =>
                 [
@@ -9861,7 +9214,6 @@ our %unified_info = (
                 [
                     ".",
                     "include",
-                    "crypto/include",
                 ],
             "test/rc2test.o" =>
                 [
@@ -9911,18 +9263,15 @@ our %unified_info = (
                 [
                     ".",
                     "include",
-                    "crypto/include",
                 ],
             "test/sm2_internal_test.o" =>
                 [
                     "include",
-                    "crypto/include",
                 ],
             "test/sm4_internal_test.o" =>
                 [
                     ".",
                     "include",
-                    "crypto/include",
                 ],
             "test/srptest.o" =>
                 [
@@ -9933,6 +9282,10 @@ our %unified_info = (
                     ".",
                     "include",
                 ],
+            "test/ssl_ctx_test.o" =>
+                [
+                    "include",
+                ],
             "test/ssl_test.o" =>
                 [
                     "include",
@@ -9996,10 +9349,6 @@ our %unified_info = (
                 [
                     "include",
                 ],
-            "test/testutil/init.o" =>
-                [
-                    "include",
-                ],
             "test/testutil/main.o" =>
                 [
                     "include",
@@ -10028,6 +9377,10 @@ our %unified_info = (
                 [
                     "include",
                 ],
+            "test/testutil/testutil_init.o" =>
+                [
+                    "include",
+                ],
             "test/threadstest.o" =>
                 [
                     "include",
@@ -10292,6 +9645,7 @@ our %unified_info = (
             "test/sm4_internal_test",
             "test/srptest",
             "test/ssl_cert_table_internal_test",
+            "test/ssl_ctx_test",
             "test/ssl_test",
             "test/ssl_test_ctx_test",
             "test/sslapitest",
@@ -15247,7 +14601,6 @@ our %unified_info = (
                     "test/testutil/cb.o",
                     "test/testutil/driver.o",
                     "test/testutil/format_output.o",
-                    "test/testutil/init.o",
                     "test/testutil/main.o",
                     "test/testutil/output_helpers.o",
                     "test/testutil/random.o",
@@ -15255,6 +14608,7 @@ our %unified_info = (
                     "test/testutil/tap_bio.o",
                     "test/testutil/test_cleanup.o",
                     "test/testutil/tests.o",
+                    "test/testutil/testutil_init.o",
                 ],
             "test/md2test" =>
                 [
@@ -15482,6 +14836,14 @@ our %unified_info = (
                 [
                     "test/ssl_cert_table_internal_test.c",
                 ],
+            "test/ssl_ctx_test" =>
+                [
+                    "test/ssl_ctx_test.o",
+                ],
+            "test/ssl_ctx_test.o" =>
+                [
+                    "test/ssl_ctx_test.c",
+                ],
             "test/ssl_test" =>
                 [
                     "test/handshake_helper.o",
@@ -15584,10 +14946,6 @@ our %unified_info = (
                 [
                     "test/testutil/format_output.c",
                 ],
-            "test/testutil/init.o" =>
-                [
-                    "test/testutil/init.c",
-                ],
             "test/testutil/main.o" =>
                 [
                     "test/testutil/main.c",
@@ -15616,6 +14974,10 @@ our %unified_info = (
                 [
                     "test/testutil/tests.c",
                 ],
+            "test/testutil/testutil_init.o" =>
+                [
+                    "test/testutil/testutil_init.c",
+                ],
             "test/threadstest" =>
                 [
                     "test/threadstest.o",
diff --git a/deps/openssl/config/archs/solaris-x86-gcc/asm_avx2/crypto/aes/aes-586.s b/deps/openssl/config/archs/solaris-x86-gcc/asm_avx2/crypto/aes/aes-586.s
deleted file mode 100644
index 53cd2909ac..0000000000
--- a/deps/openssl/config/archs/solaris-x86-gcc/asm_avx2/crypto/aes/aes-586.s
+++ /dev/null
@@ -1,3243 +0,0 @@
-.text
-.type	_x86_AES_encrypt_compact,@function
-.align	16
-_x86_AES_encrypt_compact:
-	movl	%edi,20(%esp)
-	xorl	(%edi),%eax
-	xorl	4(%edi),%ebx
-	xorl	8(%edi),%ecx
-	xorl	12(%edi),%edx
-	movl	240(%edi),%esi
-	leal	-2(%esi,%esi,1),%esi
-	leal	(%edi,%esi,8),%esi
-	movl	%esi,24(%esp)
-	movl	-128(%ebp),%edi
-	movl	-96(%ebp),%esi
-	movl	-64(%ebp),%edi
-	movl	-32(%ebp),%esi
-	movl	(%ebp),%edi
-	movl	32(%ebp),%esi
-	movl	64(%ebp),%edi
-	movl	96(%ebp),%esi
-.align	16
-.L000loop:
-	movl	%eax,%esi
-	andl	$255,%esi
-	movzbl	-128(%ebp,%esi,1),%esi
-	movzbl	%bh,%edi
-	movzbl	-128(%ebp,%edi,1),%edi
-	shll	$8,%edi
-	xorl	%edi,%esi
-	movl	%ecx,%edi
-	shrl	$16,%edi
-	andl	$255,%edi
-	movzbl	-128(%ebp,%edi,1),%edi
-	shll	$16,%edi
-	xorl	%edi,%esi
-	movl	%edx,%edi
-	shrl	$24,%edi
-	movzbl	-128(%ebp,%edi,1),%edi
-	shll	$24,%edi
-	xorl	%edi,%esi
-	movl	%esi,4(%esp)
-
-	movl	%ebx,%esi
-	andl	$255,%esi
-	shrl	$16,%ebx
-	movzbl	-128(%ebp,%esi,1),%esi
-	movzbl	%ch,%edi
-	movzbl	-128(%ebp,%edi,1),%edi
-	shll	$8,%edi
-	xorl	%edi,%esi
-	movl	%edx,%edi
-	shrl	$16,%edi
-	andl	$255,%edi
-	movzbl	-128(%ebp,%edi,1),%edi
-	shll	$16,%edi
-	xorl	%edi,%esi
-	movl	%eax,%edi
-	shrl	$24,%edi
-	movzbl	-128(%ebp,%edi,1),%edi
-	shll	$24,%edi
-	xorl	%edi,%esi
-	movl	%esi,8(%esp)
-
-	movl	%ecx,%esi
-	andl	$255,%esi
-	shrl	$24,%ecx
-	movzbl	-128(%ebp,%esi,1),%esi
-	movzbl	%dh,%edi
-	movzbl	-128(%ebp,%edi,1),%edi
-	shll	$8,%edi
-	xorl	%edi,%esi
-	movl	%eax,%edi
-	shrl	$16,%edi
-	andl	$255,%edx
-	andl	$255,%edi
-	movzbl	-128(%ebp,%edi,1),%edi
-	shll	$16,%edi
-	xorl	%edi,%esi
-	movzbl	%bh,%edi
-	movzbl	-128(%ebp,%edi,1),%edi
-	shll	$24,%edi
-	xorl	%edi,%esi
-
-	andl	$255,%edx
-	movzbl	-128(%ebp,%edx,1),%edx
-	movzbl	%ah,%eax
-	movzbl	-128(%ebp,%eax,1),%eax
-	shll	$8,%eax
-	xorl	%eax,%edx
-	movl	4(%esp),%eax
-	andl	$255,%ebx
-	movzbl	-128(%ebp,%ebx,1),%ebx
-	shll	$16,%ebx
-	xorl	%ebx,%edx
-	movl	8(%esp),%ebx
-	movzbl	-128(%ebp,%ecx,1),%ecx
-	shll	$24,%ecx
-	xorl	%ecx,%edx
-	movl	%esi,%ecx
-
-	movl	$2155905152,%ebp
-	andl	%ecx,%ebp
-	leal	(%ecx,%ecx,1),%edi
-	movl	%ebp,%esi
-	shrl	$7,%ebp
-	andl	$4278124286,%edi
-	subl	%ebp,%esi
-	movl	%ecx,%ebp
-	andl	$454761243,%esi
-	rorl	$16,%ebp
-	xorl	%edi,%esi
-	movl	%ecx,%edi
-	xorl	%esi,%ecx
-	rorl	$24,%edi
-	xorl	%ebp,%esi
-	roll	$24,%ecx
-	xorl	%edi,%esi
-	movl	$2155905152,%ebp
-	xorl	%esi,%ecx
-	andl	%edx,%ebp
-	leal	(%edx,%edx,1),%edi
-	movl	%ebp,%esi
-	shrl	$7,%ebp
-	andl	$4278124286,%edi
-	subl	%ebp,%esi
-	movl	%edx,%ebp
-	andl	$454761243,%esi
-	rorl	$16,%ebp
-	xorl	%edi,%esi
-	movl	%edx,%edi
-	xorl	%esi,%edx
-	rorl	$24,%edi
-	xorl	%ebp,%esi
-	roll	$24,%edx
-	xorl	%edi,%esi
-	movl	$2155905152,%ebp
-	xorl	%esi,%edx
-	andl	%eax,%ebp
-	leal	(%eax,%eax,1),%edi
-	movl	%ebp,%esi
-	shrl	$7,%ebp
-	andl	$4278124286,%edi
-	subl	%ebp,%esi
-	movl	%eax,%ebp
-	andl	$454761243,%esi
-	rorl	$16,%ebp
-	xorl	%edi,%esi
-	movl	%eax,%edi
-	xorl	%esi,%eax
-	rorl	$24,%edi
-	xorl	%ebp,%esi
-	roll	$24,%eax
-	xorl	%edi,%esi
-	movl	$2155905152,%ebp
-	xorl	%esi,%eax
-	andl	%ebx,%ebp
-	leal	(%ebx,%ebx,1),%edi
-	movl	%ebp,%esi
-	shrl	$7,%ebp
-	andl	$4278124286,%edi
-	subl	%ebp,%esi
-	movl	%ebx,%ebp
-	andl	$454761243,%esi
-	rorl	$16,%ebp
-	xorl	%edi,%esi
-	movl	%ebx,%edi
-	xorl	%esi,%ebx
-	rorl	$24,%edi
-	xorl	%ebp,%esi
-	roll	$24,%ebx
-	xorl	%edi,%esi
-	xorl	%esi,%ebx
-	movl	20(%esp),%edi
-	movl	28(%esp),%ebp
-	addl	$16,%edi
-	xorl	(%edi),%eax
-	xorl	4(%edi),%ebx
-	xorl	8(%edi),%ecx
-	xorl	12(%edi),%edx
-	cmpl	24(%esp),%edi
-	movl	%edi,20(%esp)
-	jb	.L000loop
-	movl	%eax,%esi
-	andl	$255,%esi
-	movzbl	-128(%ebp,%esi,1),%esi
-	movzbl	%bh,%edi
-	movzbl	-128(%ebp,%edi,1),%edi
-	shll	$8,%edi
-	xorl	%edi,%esi
-	movl	%ecx,%edi
-	shrl	$16,%edi
-	andl	$255,%edi
-	movzbl	-128(%ebp,%edi,1),%edi
-	shll	$16,%edi
-	xorl	%edi,%esi
-	movl	%edx,%edi
-	shrl	$24,%edi
-	movzbl	-128(%ebp,%edi,1),%edi
-	shll	$24,%edi
-	xorl	%edi,%esi
-	movl	%esi,4(%esp)
-
-	movl	%ebx,%esi
-	andl	$255,%esi
-	shrl	$16,%ebx
-	movzbl	-128(%ebp,%esi,1),%esi
-	movzbl	%ch,%edi
-	movzbl	-128(%ebp,%edi,1),%edi
-	shll	$8,%edi
-	xorl	%edi,%esi
-	movl	%edx,%edi
-	shrl	$16,%edi
-	andl	$255,%edi
-	movzbl	-128(%ebp,%edi,1),%edi
-	shll	$16,%edi
-	xorl	%edi,%esi
-	movl	%eax,%edi
-	shrl	$24,%edi
-	movzbl	-128(%ebp,%edi,1),%edi
-	shll	$24,%edi
-	xorl	%edi,%esi
-	movl	%esi,8(%esp)
-
-	movl	%ecx,%esi
-	andl	$255,%esi
-	shrl	$24,%ecx
-	movzbl	-128(%ebp,%esi,1),%esi
-	movzbl	%dh,%edi
-	movzbl	-128(%ebp,%edi,1),%edi
-	shll	$8,%edi
-	xorl	%edi,%esi
-	movl	%eax,%edi
-	shrl	$16,%edi
-	andl	$255,%edx
-	andl	$255,%edi
-	movzbl	-128(%ebp,%edi,1),%edi
-	shll	$16,%edi
-	xorl	%edi,%esi
-	movzbl	%bh,%edi
-	movzbl	-128(%ebp,%edi,1),%edi
-	shll	$24,%edi
-	xorl	%edi,%esi
-
-	movl	20(%esp),%edi
-	andl	$255,%edx
-	movzbl	-128(%ebp,%edx,1),%edx
-	movzbl	%ah,%eax
-	movzbl	-128(%ebp,%eax,1),%eax
-	shll	$8,%eax
-	xorl	%eax,%edx
-	movl	4(%esp),%eax
-	andl	$255,%ebx
-	movzbl	-128(%ebp,%ebx,1),%ebx
-	shll	$16,%ebx
-	xorl	%ebx,%edx
-	movl	8(%esp),%ebx
-	movzbl	-128(%ebp,%ecx,1),%ecx
-	shll	$24,%ecx
-	xorl	%ecx,%edx
-	movl	%esi,%ecx
-
-	xorl	16(%edi),%eax
-	xorl	20(%edi),%ebx
-	xorl	24(%edi),%ecx
-	xorl	28(%edi),%edx
-	ret
-.size	_x86_AES_encrypt_compact,.-_x86_AES_encrypt_compact
-.type	_sse_AES_encrypt_compact,@function
-.align	16
-_sse_AES_encrypt_compact:
-	pxor	(%edi),%mm0
-	pxor	8(%edi),%mm4
-	movl	240(%edi),%esi
-	leal	-2(%esi,%esi,1),%esi
-	leal	(%edi,%esi,8),%esi
-	movl	%esi,24(%esp)
-	movl	$454761243,%eax
-	movl	%eax,8(%esp)
-	movl	%eax,12(%esp)
-	movl	-128(%ebp),%eax
-	movl	-96(%ebp),%ebx
-	movl	-64(%ebp),%ecx
-	movl	-32(%ebp),%edx
-	movl	(%ebp),%eax
-	movl	32(%ebp),%ebx
-	movl	64(%ebp),%ecx
-	movl	96(%ebp),%edx
-.align	16
-.L001loop:
-	pshufw	$8,%mm0,%mm1
-	pshufw	$13,%mm4,%mm5
-	movd	%mm1,%eax
-	movd	%mm5,%ebx
-	movl	%edi,20(%esp)
-	movzbl	%al,%esi
-	movzbl	%ah,%edx
-	pshufw	$13,%mm0,%mm2
-	movzbl	-128(%ebp,%esi,1),%ecx
-	movzbl	%bl,%edi
-	movzbl	-128(%ebp,%edx,1),%edx
-	shrl	$16,%eax
-	shll	$8,%edx
-	movzbl	-128(%ebp,%edi,1),%esi
-	movzbl	%bh,%edi
-	shll	$16,%esi
-	pshufw	$8,%mm4,%mm6
-	orl	%esi,%ecx
-	movzbl	-128(%ebp,%edi,1),%esi
-	movzbl	%ah,%edi
-	shll	$24,%esi
-	shrl	$16,%ebx
-	orl	%esi,%edx
-	movzbl	-128(%ebp,%edi,1),%esi
-	movzbl	%bh,%edi
-	shll	$8,%esi
-	orl	%esi,%ecx
-	movzbl	-128(%ebp,%edi,1),%esi
-	movzbl	%al,%edi
-	shll	$24,%esi
-	orl	%esi,%ecx
-	movzbl	-128(%ebp,%edi,1),%esi
-	movzbl	%bl,%edi
-	movd	%mm2,%eax
-	movd	%ecx,%mm0
-	movzbl	-128(%ebp,%edi,1),%ecx
-	movzbl	%ah,%edi
-	shll	$16,%ecx
-	movd	%mm6,%ebx
-	orl	%esi,%ecx
-	movzbl	-128(%ebp,%edi,1),%esi
-	movzbl	%bh,%edi
-	shll	$24,%esi
-	orl	%esi,%ecx
-	movzbl	-128(%ebp,%edi,1),%esi
-	movzbl	%bl,%edi
-	shll	$8,%esi
-	shrl	$16,%ebx
-	orl	%esi,%ecx
-	movzbl	-128(%ebp,%edi,1),%esi
-	movzbl	%al,%edi
-	shrl	$16,%eax
-	movd	%ecx,%mm1
-	movzbl	-128(%ebp,%edi,1),%ecx
-	movzbl	%ah,%edi
-	shll	$16,%ecx
-	andl	$255,%eax
-	orl	%esi,%ecx
-	punpckldq	%mm1,%mm0
-	movzbl	-128(%ebp,%edi,1),%esi
-	movzbl	%bh,%edi
-	shll	$24,%esi
-	andl	$255,%ebx
-	movzbl	-128(%ebp,%eax,1),%eax
-	orl	%esi,%ecx
-	shll	$16,%eax
-	movzbl	-128(%ebp,%edi,1),%esi
-	orl	%eax,%edx
-	shll	$8,%esi
-	movzbl	-128(%ebp,%ebx,1),%ebx
-	orl	%esi,%ecx
-	orl	%ebx,%edx
-	movl	20(%esp),%edi
-	movd	%ecx,%mm4
-	movd	%edx,%mm5
-	punpckldq	%mm5,%mm4
-	addl	$16,%edi
-	cmpl	24(%esp),%edi
-	ja	.L002out
-	movq	8(%esp),%mm2
-	pxor	%mm3,%mm3
-	pxor	%mm7,%mm7
-	movq	%mm0,%mm1
-	movq	%mm4,%mm5
-	pcmpgtb	%mm0,%mm3
-	pcmpgtb	%mm4,%mm7
-	pand	%mm2,%mm3
-	pand	%mm2,%mm7
-	pshufw	$177,%mm0,%mm2
-	pshufw	$177,%mm4,%mm6
-	paddb	%mm0,%mm0
-	paddb	%mm4,%mm4
-	pxor	%mm3,%mm0
-	pxor	%mm7,%mm4
-	pshufw	$177,%mm2,%mm3
-	pshufw	$177,%mm6,%mm7
-	pxor	%mm0,%mm1
-	pxor	%mm4,%mm5
-	pxor	%mm2,%mm0
-	pxor	%mm6,%mm4
-	movq	%mm3,%mm2
-	movq	%mm7,%mm6
-	pslld	$8,%mm3
-	pslld	$8,%mm7
-	psrld	$24,%mm2
-	psrld	$24,%mm6
-	pxor	%mm3,%mm0
-	pxor	%mm7,%mm4
-	pxor	%mm2,%mm0
-	pxor	%mm6,%mm4
-	movq	%mm1,%mm3
-	movq	%mm5,%mm7
-	movq	(%edi),%mm2
-	movq	8(%edi),%mm6
-	psrld	$8,%mm1
-	psrld	$8,%mm5
-	movl	-128(%ebp),%eax
-	pslld	$24,%mm3
-	pslld	$24,%mm7
-	movl	-64(%ebp),%ebx
-	pxor	%mm1,%mm0
-	pxor	%mm5,%mm4
-	movl	(%ebp),%ecx
-	pxor	%mm3,%mm0
-	pxor	%mm7,%mm4
-	movl	64(%ebp),%edx
-	pxor	%mm2,%mm0
-	pxor	%mm6,%mm4
-	jmp	.L001loop
-.align	16
-.L002out:
-	pxor	(%edi),%mm0
-	pxor	8(%edi),%mm4
-	ret
-.size	_sse_AES_encrypt_compact,.-_sse_AES_encrypt_compact
-.type	_x86_AES_encrypt,@function
-.align	16
-_x86_AES_encrypt:
-	movl	%edi,20(%esp)
-	xorl	(%edi),%eax
-	xorl	4(%edi),%ebx
-	xorl	8(%edi),%ecx
-	xorl	12(%edi),%edx
-	movl	240(%edi),%esi
-	leal	-2(%esi,%esi,1),%esi
-	leal	(%edi,%esi,8),%esi
-	movl	%esi,24(%esp)
-.align	16
-.L003loop:
-	movl	%eax,%esi
-	andl	$255,%esi
-	movl	(%ebp,%esi,8),%esi
-	movzbl	%bh,%edi
-	xorl	3(%ebp,%edi,8),%esi
-	movl	%ecx,%edi
-	shrl	$16,%edi
-	andl	$255,%edi
-	xorl	2(%ebp,%edi,8),%esi
-	movl	%edx,%edi
-	shrl	$24,%edi
-	xorl	1(%ebp,%edi,8),%esi
-	movl	%esi,4(%esp)
-
-	movl	%ebx,%esi
-	andl	$255,%esi
-	shrl	$16,%ebx
-	movl	(%ebp,%esi,8),%esi
-	movzbl	%ch,%edi
-	xorl	3(%ebp,%edi,8),%esi
-	movl	%edx,%edi
-	shrl	$16,%edi
-	andl	$255,%edi
-	xorl	2(%ebp,%edi,8),%esi
-	movl	%eax,%edi
-	shrl	$24,%edi
-	xorl	1(%ebp,%edi,8),%esi
-	movl	%esi,8(%esp)
-
-	movl	%ecx,%esi
-	andl	$255,%esi
-	shrl	$24,%ecx
-	movl	(%ebp,%esi,8),%esi
-	movzbl	%dh,%edi
-	xorl	3(%ebp,%edi,8),%esi
-	movl	%eax,%edi
-	shrl	$16,%edi
-	andl	$255,%edx
-	andl	$255,%edi
-	xorl	2(%ebp,%edi,8),%esi
-	movzbl	%bh,%edi
-	xorl	1(%ebp,%edi,8),%esi
-
-	movl	20(%esp),%edi
-	movl	(%ebp,%edx,8),%edx
-	movzbl	%ah,%eax
-	xorl	3(%ebp,%eax,8),%edx
-	movl	4(%esp),%eax
-	andl	$255,%ebx
-	xorl	2(%ebp,%ebx,8),%edx
-	movl	8(%esp),%ebx
-	xorl	1(%ebp,%ecx,8),%edx
-	movl	%esi,%ecx
-
-	addl	$16,%edi
-	xorl	(%edi),%eax
-	xorl	4(%edi),%ebx
-	xorl	8(%edi),%ecx
-	xorl	12(%edi),%edx
-	cmpl	24(%esp),%edi
-	movl	%edi,20(%esp)
-	jb	.L003loop
-	movl	%eax,%esi
-	andl	$255,%esi
-	movl	2(%ebp,%esi,8),%esi
-	andl	$255,%esi
-	movzbl	%bh,%edi
-	movl	(%ebp,%edi,8),%edi
-	andl	$65280,%edi
-	xorl	%edi,%esi
-	movl	%ecx,%edi
-	shrl	$16,%edi
-	andl	$255,%edi
-	movl	(%ebp,%edi,8),%edi
-	andl	$16711680,%edi
-	xorl	%edi,%esi
-	movl	%edx,%edi
-	shrl	$24,%edi
-	movl	2(%ebp,%edi,8),%edi
-	andl	$4278190080,%edi
-	xorl	%edi,%esi
-	movl	%esi,4(%esp)
-	movl	%ebx,%esi
-	andl	$255,%esi
-	shrl	$16,%ebx
-	movl	2(%ebp,%esi,8),%esi
-	andl	$255,%esi
-	movzbl	%ch,%edi
-	movl	(%ebp,%edi,8),%edi
-	andl	$65280,%edi
-	xorl	%edi,%esi
-	movl	%edx,%edi
-	shrl	$16,%edi
-	andl	$255,%edi
-	movl	(%ebp,%edi,8),%edi
-	andl	$16711680,%edi
-	xorl	%edi,%esi
-	movl	%eax,%edi
-	shrl	$24,%edi
-	movl	2(%ebp,%edi,8),%edi
-	andl	$4278190080,%edi
-	xorl	%edi,%esi
-	movl	%esi,8(%esp)
-	movl	%ecx,%esi
-	andl	$255,%esi
-	shrl	$24,%ecx
-	movl	2(%ebp,%esi,8),%esi
-	andl	$255,%esi
-	movzbl	%dh,%edi
-	movl	(%ebp,%edi,8),%edi
-	andl	$65280,%edi
-	xorl	%edi,%esi
-	movl	%eax,%edi
-	shrl	$16,%edi
-	andl	$255,%edx
-	andl	$255,%edi
-	movl	(%ebp,%edi,8),%edi
-	andl	$16711680,%edi
-	xorl	%edi,%esi
-	movzbl	%bh,%edi
-	movl	2(%ebp,%edi,8),%edi
-	andl	$4278190080,%edi
-	xorl	%edi,%esi
-	movl	20(%esp),%edi
-	andl	$255,%edx
-	movl	2(%ebp,%edx,8),%edx
-	andl	$255,%edx
-	movzbl	%ah,%eax
-	movl	(%ebp,%eax,8),%eax
-	andl	$65280,%eax
-	xorl	%eax,%edx
-	movl	4(%esp),%eax
-	andl	$255,%ebx
-	movl	(%ebp,%ebx,8),%ebx
-	andl	$16711680,%ebx
-	xorl	%ebx,%edx
-	movl	8(%esp),%ebx
-	movl	2(%ebp,%ecx,8),%ecx
-	andl	$4278190080,%ecx
-	xorl	%ecx,%edx
-	movl	%esi,%ecx
-	addl	$16,%edi
-	xorl	(%edi),%eax
-	xorl	4(%edi),%ebx
-	xorl	8(%edi),%ecx
-	xorl	12(%edi),%edx
-	ret
-.align	64
-.LAES_Te:
-.long	2774754246,2774754246
-.long	2222750968,2222750968
-.long	2574743534,2574743534
-.long	2373680118,2373680118
-.long	234025727,234025727
-.long	3177933782,3177933782
-.long	2976870366,2976870366
-.long	1422247313,1422247313
-.long	1345335392,1345335392
-.long	50397442,50397442
-.long	2842126286,2842126286
-.long	2099981142,2099981142
-.long	436141799,436141799
-.long	1658312629,1658312629
-.long	3870010189,3870010189
-.long	2591454956,2591454956
-.long	1170918031,1170918031
-.long	2642575903,2642575903
-.long	1086966153,1086966153
-.long	2273148410,2273148410
-.long	368769775,368769775
-.long	3948501426,3948501426
-.long	3376891790,3376891790
-.long	200339707,200339707
-.long	3970805057,3970805057
-.long	1742001331,1742001331
-.long	4255294047,4255294047
-.long	3937382213,3937382213
-.long	3214711843,3214711843
-.long	4154762323,4154762323
-.long	2524082916,2524082916
-.long	1539358875,1539358875
-.long	3266819957,3266819957
-.long	486407649,486407649
-.long	2928907069,2928907069
-.long	1780885068,1780885068
-.long	1513502316,1513502316
-.long	1094664062,1094664062
-.long	49805301,49805301
-.long	1338821763,1338821763
-.long	1546925160,1546925160
-.long	4104496465,4104496465
-.long	887481809,887481809
-.long	150073849,150073849
-.long	2473685474,2473685474
-.long	1943591083,1943591083
-.long	1395732834,1395732834
-.long	1058346282,1058346282
-.long	201589768,201589768
-.long	1388824469,1388824469
-.long	1696801606,1696801606
-.long	1589887901,1589887901
-.long	672667696,672667696
-.long	2711000631,2711000631
-.long	251987210,251987210
-.long	3046808111,3046808111
-.long	151455502,151455502
-.long	907153956,907153956
-.long	2608889883,2608889883
-.long	1038279391,1038279391
-.long	652995533,652995533
-.long	1764173646,1764173646
-.long	3451040383,3451040383
-.long	2675275242,2675275242
-.long	453576978,453576978
-.long	2659418909,2659418909
-.long	1949051992,1949051992
-.long	773462580,773462580
-.long	756751158,756751158
-.long	2993581788,2993581788
-.long	3998898868,3998898868
-.long	4221608027,4221608027
-.long	4132590244,4132590244
-.long	1295727478,1295727478
-.long	1641469623,1641469623
-.long	3467883389,3467883389
-.long	2066295122,2066295122
-.long	1055122397,1055122397
-.long	1898917726,1898917726
-.long	2542044179,2542044179
-.long	4115878822,4115878822
-.long	1758581177,1758581177
-.long	0,0
-.long	753790401,753790401
-.long	1612718144,1612718144
-.long	536673507,536673507
-.long	3367088505,3367088505
-.long	3982187446,3982187446
-.long	3194645204,3194645204
-.long	1187761037,1187761037
-.long	3653156455,3653156455
-.long	1262041458,1262041458
-.long	3729410708,3729410708
-.long	3561770136,3561770136
-.long	3898103984,3898103984
-.long	1255133061,1255133061
-.long	1808847035,1808847035
-.long	720367557,720367557
-.long	3853167183,3853167183
-.long	385612781,385612781
-.long	3309519750,3309519750
-.long	3612167578,3612167578
-.long	1429418854,1429418854
-.long	2491778321,2491778321
-.long	3477423498,3477423498
-.long	284817897,284817897
-.long	100794884,100794884
-.long	2172616702,2172616702
-.long	4031795360,4031795360
-.long	1144798328,1144798328
-.long	3131023141,3131023141
-.long	3819481163,3819481163
-.long	4082192802,4082192802
-.long	4272137053,4272137053
-.long	3225436288,3225436288
-.long	2324664069,2324664069
-.long	2912064063,2912064063
-.long	3164445985,3164445985
-.long	1211644016,1211644016
-.long	83228145,83228145
-.long	3753688163,3753688163
-.long	3249976951,3249976951
-.long	1977277103,1977277103
-.long	1663115586,1663115586
-.long	806359072,806359072
-.long	452984805,452984805
-.long	250868733,250868733
-.long	1842533055,1842533055
-.long	1288555905,1288555905
-.long	336333848,336333848
-.long	890442534,890442534
-.long	804056259,804056259
-.long	3781124030,3781124030
-.long	2727843637,2727843637
-.long	3427026056,3427026056
-.long	957814574,957814574
-.long	1472513171,1472513171
-.long	4071073621,4071073621
-.long	2189328124,2189328124
-.long	1195195770,1195195770
-.long	2892260552,2892260552
-.long	3881655738,3881655738
-.long	723065138,723065138
-.long	2507371494,2507371494
-.long	2690670784,2690670784
-.long	2558624025,2558624025
-.long	3511635870,3511635870
-.long	2145180835,2145180835
-.long	1713513028,1713513028
-.long	2116692564,2116692564
-.long	2878378043,2878378043
-.long	2206763019,2206763019
-.long	3393603212,3393603212
-.long	703524551,703524551
-.long	3552098411,3552098411
-.long	1007948840,1007948840
-.long	2044649127,2044649127
-.long	3797835452,3797835452
-.long	487262998,487262998
-.long	1994120109,1994120109
-.long	1004593371,1004593371
-.long	1446130276,1446130276
-.long	1312438900,1312438900
-.long	503974420,503974420
-.long	3679013266,3679013266
-.long	168166924,168166924
-.long	1814307912,1814307912
-.long	3831258296,3831258296
-.long	1573044895,1573044895
-.long	1859376061,1859376061
-.long	4021070915,4021070915
-.long	2791465668,2791465668
-.long	2828112185,2828112185
-.long	2761266481,2761266481
-.long	937747667,937747667
-.long	2339994098,2339994098
-.long	854058965,854058965
-.long	1137232011,1137232011
-.long	1496790894,1496790894
-.long	3077402074,3077402074
-.long	2358086913,2358086913
-.long	1691735473,1691735473
-.long	3528347292,3528347292
-.long	3769215305,3769215305
-.long	3027004632,3027004632
-.long	4199962284,4199962284
-.long	133494003,133494003
-.long	636152527,636152527
-.long	2942657994,2942657994
-.long	2390391540,2390391540
-.long	3920539207,3920539207
-.long	403179536,403179536
-.long	3585784431,3585784431
-.long	2289596656,2289596656
-.long	1864705354,1864705354
-.long	1915629148,1915629148
-.long	605822008,605822008
-.long	4054230615,4054230615
-.long	3350508659,3350508659
-.long	1371981463,1371981463
-.long	602466507,602466507
-.long	2094914977,2094914977
-.long	2624877800,2624877800
-.long	555687742,555687742
-.long	3712699286,3712699286
-.long	3703422305,3703422305
-.long	2257292045,2257292045
-.long	2240449039,2240449039
-.long	2423288032,2423288032
-.long	1111375484,1111375484
-.long	3300242801,3300242801
-.long	2858837708,2858837708
-.long	3628615824,3628615824
-.long	84083462,84083462
-.long	32962295,32962295
-.long	302911004,302911004
-.long	2741068226,2741068226
-.long	1597322602,1597322602
-.long	4183250862,4183250862
-.long	3501832553,3501832553
-.long	2441512471,2441512471
-.long	1489093017,1489093017
-.long	656219450,656219450
-.long	3114180135,3114180135
-.long	954327513,954327513
-.long	335083755,335083755
-.long	3013122091,3013122091
-.long	856756514,856756514
-.long	3144247762,3144247762
-.long	1893325225,1893325225
-.long	2307821063,2307821063
-.long	2811532339,2811532339
-.long	3063651117,3063651117
-.long	572399164,572399164
-.long	2458355477,2458355477
-.long	552200649,552200649
-.long	1238290055,1238290055
-.long	4283782570,4283782570
-.long	2015897680,2015897680
-.long	2061492133,2061492133
-.long	2408352771,2408352771
-.long	4171342169,4171342169
-.long	2156497161,2156497161
-.long	386731290,386731290
-.long	3669999461,3669999461
-.long	837215959,837215959
-.long	3326231172,3326231172
-.long	3093850320,3093850320
-.long	3275833730,3275833730
-.long	2962856233,2962856233
-.long	1999449434,1999449434
-.long	286199582,286199582
-.long	3417354363,3417354363
-.long	4233385128,4233385128
-.long	3602627437,3602627437
-.long	974525996,974525996
-.byte	99,124,119,123,242,107,111,197
-.byte	48,1,103,43,254,215,171,118
-.byte	202,130,201,125,250,89,71,240
-.byte	173,212,162,175,156,164,114,192
-.byte	183,253,147,38,54,63,247,204
-.byte	52,165,229,241,113,216,49,21
-.byte	4,199,35,195,24,150,5,154
-.byte	7,18,128,226,235,39,178,117
-.byte	9,131,44,26,27,110,90,160
-.byte	82,59,214,179,41,227,47,132
-.byte	83,209,0,237,32,252,177,91
-.byte	106,203,190,57,74,76,88,207
-.byte	208,239,170,251,67,77,51,133
-.byte	69,249,2,127,80,60,159,168
-.byte	81,163,64,143,146,157,56,245
-.byte	188,182,218,33,16,255,243,210
-.byte	205,12,19,236,95,151,68,23
-.byte	196,167,126,61,100,93,25,115
-.byte	96,129,79,220,34,42,144,136
-.byte	70,238,184,20,222,94,11,219
-.byte	224,50,58,10,73,6,36,92
-.byte	194,211,172,98,145,149,228,121
-.byte	231,200,55,109,141,213,78,169
-.byte	108,86,244,234,101,122,174,8
-.byte	186,120,37,46,28,166,180,198
-.byte	232,221,116,31,75,189,139,138
-.byte	112,62,181,102,72,3,246,14
-.byte	97,53,87,185,134,193,29,158
-.byte	225,248,152,17,105,217,142,148
-.byte	155,30,135,233,206,85,40,223
-.byte	140,161,137,13,191,230,66,104
-.byte	65,153,45,15,176,84,187,22
-.byte	99,124,119,123,242,107,111,197
-.byte	48,1,103,43,254,215,171,118
-.byte	202,130,201,125,250,89,71,240
-.byte	173,212,162,175,156,164,114,192
-.byte	183,253,147,38,54,63,247,204
-.byte	52,165,229,241,113,216,49,21
-.byte	4,199,35,195,24,150,5,154
-.byte	7,18,128,226,235,39,178,117
-.byte	9,131,44,26,27,110,90,160
-.byte	82,59,214,179,41,227,47,132
-.byte	83,209,0,237,32,252,177,91
-.byte	106,203,190,57,74,76,88,207
-.byte	208,239,170,251,67,77,51,133
-.byte	69,249,2,127,80,60,159,168
-.byte	81,163,64,143,146,157,56,245
-.byte	188,182,218,33,16,255,243,210
-.byte	205,12,19,236,95,151,68,23
-.byte	196,167,126,61,100,93,25,115
-.byte	96,129,79,220,34,42,144,136
-.byte	70,238,184,20,222,94,11,219
-.byte	224,50,58,10,73,6,36,92
-.byte	194,211,172,98,145,149,228,121
-.byte	231,200,55,109,141,213,78,169
-.byte	108,86,244,234,101,122,174,8
-.byte	186,120,37,46,28,166,180,198
-.byte	232,221,116,31,75,189,139,138
-.byte	112,62,181,102,72,3,246,14
-.byte	97,53,87,185,134,193,29,158
-.byte	225,248,152,17,105,217,142,148
-.byte	155,30,135,233,206,85,40,223
-.byte	140,161,137,13,191,230,66,104
-.byte	65,153,45,15,176,84,187,22
-.byte	99,124,119,123,242,107,111,197
-.byte	48,1,103,43,254,215,171,118
-.byte	202,130,201,125,250,89,71,240
-.byte	173,212,162,175,156,164,114,192
-.byte	183,253,147,38,54,63,247,204
-.byte	52,165,229,241,113,216,49,21
-.byte	4,199,35,195,24,150,5,154
-.byte	7,18,128,226,235,39,178,117
-.byte	9,131,44,26,27,110,90,160
-.byte	82,59,214,179,41,227,47,132
-.byte	83,209,0,237,32,252,177,91
-.byte	106,203,190,57,74,76,88,207
-.byte	208,239,170,251,67,77,51,133
-.byte	69,249,2,127,80,60,159,168
-.byte	81,163,64,143,146,157,56,245
-.byte	188,182,218,33,16,255,243,210
-.byte	205,12,19,236,95,151,68,23
-.byte	196,167,126,61,100,93,25,115
-.byte	96,129,79,220,34,42,144,136
-.byte	70,238,184,20,222,94,11,219
-.byte	224,50,58,10,73,6,36,92
-.byte	194,211,172,98,145,149,228,121
-.byte	231,200,55,109,141,213,78,169
-.byte	108,86,244,234,101,122,174,8
-.byte	186,120,37,46,28,166,180,198
-.byte	232,221,116,31,75,189,139,138
-.byte	112,62,181,102,72,3,246,14
-.byte	97,53,87,185,134,193,29,158
-.byte	225,248,152,17,105,217,142,148
-.byte	155,30,135,233,206,85,40,223
-.byte	140,161,137,13,191,230,66,104
-.byte	65,153,45,15,176,84,187,22
-.byte	99,124,119,123,242,107,111,197
-.byte	48,1,103,43,254,215,171,118
-.byte	202,130,201,125,250,89,71,240
-.byte	173,212,162,175,156,164,114,192
-.byte	183,253,147,38,54,63,247,204
-.byte	52,165,229,241,113,216,49,21
-.byte	4,199,35,195,24,150,5,154
-.byte	7,18,128,226,235,39,178,117
-.byte	9,131,44,26,27,110,90,160
-.byte	82,59,214,179,41,227,47,132
-.byte	83,209,0,237,32,252,177,91
-.byte	106,203,190,57,74,76,88,207
-.byte	208,239,170,251,67,77,51,133
-.byte	69,249,2,127,80,60,159,168
-.byte	81,163,64,143,146,157,56,245
-.byte	188,182,218,33,16,255,243,210
-.byte	205,12,19,236,95,151,68,23
-.byte	196,167,126,61,100,93,25,115
-.byte	96,129,79,220,34,42,144,136
-.byte	70,238,184,20,222,94,11,219
-.byte	224,50,58,10,73,6,36,92
-.byte	194,211,172,98,145,149,228,121
-.byte	231,200,55,109,141,213,78,169
-.byte	108,86,244,234,101,122,174,8
-.byte	186,120,37,46,28,166,180,198
-.byte	232,221,116,31,75,189,139,138
-.byte	112,62,181,102,72,3,246,14
-.byte	97,53,87,185,134,193,29,158
-.byte	225,248,152,17,105,217,142,148
-.byte	155,30,135,233,206,85,40,223
-.byte	140,161,137,13,191,230,66,104
-.byte	65,153,45,15,176,84,187,22
-.long	1,2,4,8
-.long	16,32,64,128
-.long	27,54,0,0
-.long	0,0,0,0
-.size	_x86_AES_encrypt,.-_x86_AES_encrypt
-.globl	AES_encrypt
-.type	AES_encrypt,@function
-.align	16
-AES_encrypt:
-.L_AES_encrypt_begin:
-	pushl	%ebp
-	pushl	%ebx
-	pushl	%esi
-	pushl	%edi
-	movl	20(%esp),%esi
-	movl	28(%esp),%edi
-	movl	%esp,%eax
-	subl	$36,%esp
-	andl	$-64,%esp
-	leal	-127(%edi),%ebx
-	subl	%esp,%ebx
-	negl	%ebx
-	andl	$960,%ebx
-	subl	%ebx,%esp
-	addl	$4,%esp
-	movl	%eax,28(%esp)
-	call	.L004pic_point
-.L004pic_point:
-	popl	%ebp
-	leal	OPENSSL_ia32cap_P-.L004pic_point(%ebp),%eax
-	leal	.LAES_Te-.L004pic_point(%ebp),%ebp
-	leal	764(%esp),%ebx
-	subl	%ebp,%ebx
-	andl	$768,%ebx
-	leal	2176(%ebp,%ebx,1),%ebp
-	btl	$25,(%eax)
-	jnc	.L005x86
-	movq	(%esi),%mm0
-	movq	8(%esi),%mm4
-	call	_sse_AES_encrypt_compact
-	movl	28(%esp),%esp
-	movl	24(%esp),%esi
-	movq	%mm0,(%esi)
-	movq	%mm4,8(%esi)
-	emms
-	popl	%edi
-	popl	%esi
-	popl	%ebx
-	popl	%ebp
-	ret
-.align	16
-.L005x86:
-	movl	%ebp,24(%esp)
-	movl	(%esi),%eax
-	movl	4(%esi),%ebx
-	movl	8(%esi),%ecx
-	movl	12(%esi),%edx
-	call	_x86_AES_encrypt_compact
-	movl	28(%esp),%esp
-	movl	24(%esp),%esi
-	movl	%eax,(%esi)
-	movl	%ebx,4(%esi)
-	movl	%ecx,8(%esi)
-	movl	%edx,12(%esi)
-	popl	%edi
-	popl	%esi
-	popl	%ebx
-	popl	%ebp
-	ret
-.size	AES_encrypt,.-.L_AES_encrypt_begin
-.type	_x86_AES_decrypt_compact,@function
-.align	16
-_x86_AES_decrypt_compact:
-	movl	%edi,20(%esp)
-	xorl	(%edi),%eax
-	xorl	4(%edi),%ebx
-	xorl	8(%edi),%ecx
-	xorl	12(%edi),%edx
-	movl	240(%edi),%esi
-	leal	-2(%esi,%esi,1),%esi
-	leal	(%edi,%esi,8),%esi
-	movl	%esi,24(%esp)
-	movl	-128(%ebp),%edi
-	movl	-96(%ebp),%esi
-	movl	-64(%ebp),%edi
-	movl	-32(%ebp),%esi
-	movl	(%ebp),%edi
-	movl	32(%ebp),%esi
-	movl	64(%ebp),%edi
-	movl	96(%ebp),%esi
-.align	16
-.L006loop:
-	movl	%eax,%esi
-	andl	$255,%esi
-	movzbl	-128(%ebp,%esi,1),%esi
-	movzbl	%dh,%edi
-	movzbl	-128(%ebp,%edi,1),%edi
-	shll	$8,%edi
-	xorl	%edi,%esi
-	movl	%ecx,%edi
-	shrl	$16,%edi
-	andl	$255,%edi
-	movzbl	-128(%ebp,%edi,1),%edi
-	shll	$16,%edi
-	xorl	%edi,%esi
-	movl	%ebx,%edi
-	shrl	$24,%edi
-	movzbl	-128(%ebp,%edi,1),%edi
-	shll	$24,%edi
-	xorl	%edi,%esi
-	movl	%esi,4(%esp)
-	movl	%ebx,%esi
-	andl	$255,%esi
-	movzbl	-128(%ebp,%esi,1),%esi
-	movzbl	%ah,%edi
-	movzbl	-128(%ebp,%edi,1),%edi
-	shll	$8,%edi
-	xorl	%edi,%esi
-	movl	%edx,%edi
-	shrl	$16,%edi
-	andl	$255,%edi
-	movzbl	-128(%ebp,%edi,1),%edi
-	shll	$16,%edi
-	xorl	%edi,%esi
-	movl	%ecx,%edi
-	shrl	$24,%edi
-	movzbl	-128(%ebp,%edi,1),%edi
-	shll	$24,%edi
-	xorl	%edi,%esi
-	movl	%esi,8(%esp)
-	movl	%ecx,%esi
-	andl	$255,%esi
-	movzbl	-128(%ebp,%esi,1),%esi
-	movzbl	%bh,%edi
-	movzbl	-128(%ebp,%edi,1),%edi
-	shll	$8,%edi
-	xorl	%edi,%esi
-	movl	%eax,%edi
-	shrl	$16,%edi
-	andl	$255,%edi
-	movzbl	-128(%ebp,%edi,1),%edi
-	shll	$16,%edi
-	xorl	%edi,%esi
-	movl	%edx,%edi
-	shrl	$24,%edi
-	movzbl	-128(%ebp,%edi,1),%edi
-	shll	$24,%edi
-	xorl	%edi,%esi
-	andl	$255,%edx
-	movzbl	-128(%ebp,%edx,1),%edx
-	movzbl	%ch,%ecx
-	movzbl	-128(%ebp,%ecx,1),%ecx
-	shll	$8,%ecx
-	xorl	%ecx,%edx
-	movl	%esi,%ecx
-	shrl	$16,%ebx
-	andl	$255,%ebx
-	movzbl	-128(%ebp,%ebx,1),%ebx
-	shll	$16,%ebx
-	xorl	%ebx,%edx
-	shrl	$24,%eax
-	movzbl	-128(%ebp,%eax,1),%eax
-	shll	$24,%eax
-	xorl	%eax,%edx
-	movl	$2155905152,%edi
-	andl	%ecx,%edi
-	movl	%edi,%esi
-	shrl	$7,%edi
-	leal	(%ecx,%ecx,1),%eax
-	subl	%edi,%esi
-	andl	$4278124286,%eax
-	andl	$454761243,%esi
-	xorl	%esi,%eax
-	movl	$2155905152,%edi
-	andl	%eax,%edi
-	movl	%edi,%esi
-	shrl	$7,%edi
-	leal	(%eax,%eax,1),%ebx
-	subl	%edi,%esi
-	andl	$4278124286,%ebx
-	andl	$454761243,%esi
-	xorl	%ecx,%eax
-	xorl	%esi,%ebx
-	movl	$2155905152,%edi
-	andl	%ebx,%edi
-	movl	%edi,%esi
-	shrl	$7,%edi
-	leal	(%ebx,%ebx,1),%ebp
-	subl	%edi,%esi
-	andl	$4278124286,%ebp
-	andl	$454761243,%esi
-	xorl	%ecx,%ebx
-	roll	$8,%ecx
-	xorl	%esi,%ebp
-	xorl	%eax,%ecx
-	xorl	%ebp,%eax
-	xorl	%ebx,%ecx
-	xorl	%ebp,%ebx
-	roll	$24,%eax
-	xorl	%ebp,%ecx
-	roll	$16,%ebx
-	xorl	%eax,%ecx
-	roll	$8,%ebp
-	xorl	%ebx,%ecx
-	movl	4(%esp),%eax
-	xorl	%ebp,%ecx
-	movl	%ecx,12(%esp)
-	movl	$2155905152,%edi
-	andl	%edx,%edi
-	movl	%edi,%esi
-	shrl	$7,%edi
-	leal	(%edx,%edx,1),%ebx
-	subl	%edi,%esi
-	andl	$4278124286,%ebx
-	andl	$454761243,%esi
-	xorl	%esi,%ebx
-	movl	$2155905152,%edi
-	andl	%ebx,%edi
-	movl	%edi,%esi
-	shrl	$7,%edi
-	leal	(%ebx,%ebx,1),%ecx
-	subl	%edi,%esi
-	andl	$4278124286,%ecx
-	andl	$454761243,%esi
-	xorl	%edx,%ebx
-	xorl	%esi,%ecx
-	movl	$2155905152,%edi
-	andl	%ecx,%edi
-	movl	%edi,%esi
-	shrl	$7,%edi
-	leal	(%ecx,%ecx,1),%ebp
-	subl	%edi,%esi
-	andl	$4278124286,%ebp
-	andl	$454761243,%esi
-	xorl	%edx,%ecx
-	roll	$8,%edx
-	xorl	%esi,%ebp
-	xorl	%ebx,%edx
-	xorl	%ebp,%ebx
-	xorl	%ecx,%edx
-	xorl	%ebp,%ecx
-	roll	$24,%ebx
-	xorl	%ebp,%edx
-	roll	$16,%ecx
-	xorl	%ebx,%edx
-	roll	$8,%ebp
-	xorl	%ecx,%edx
-	movl	8(%esp),%ebx
-	xorl	%ebp,%edx
-	movl	%edx,16(%esp)
-	movl	$2155905152,%edi
-	andl	%eax,%edi
-	movl	%edi,%esi
-	shrl	$7,%edi
-	leal	(%eax,%eax,1),%ecx
-	subl	%edi,%esi
-	andl	$4278124286,%ecx
-	andl	$454761243,%esi
-	xorl	%esi,%ecx
-	movl	$2155905152,%edi
-	andl	%ecx,%edi
-	movl	%edi,%esi
-	shrl	$7,%edi
-	leal	(%ecx,%ecx,1),%edx
-	subl	%edi,%esi
-	andl	$4278124286,%edx
-	andl	$454761243,%esi
-	xorl	%eax,%ecx
-	xorl	%esi,%edx
-	movl	$2155905152,%edi
-	andl	%edx,%edi
-	movl	%edi,%esi
-	shrl	$7,%edi
-	leal	(%edx,%edx,1),%ebp
-	subl	%edi,%esi
-	andl	$4278124286,%ebp
-	andl	$454761243,%esi
-	xorl	%eax,%edx
-	roll	$8,%eax
-	xorl	%esi,%ebp
-	xorl	%ecx,%eax
-	xorl	%ebp,%ecx
-	xorl	%edx,%eax
-	xorl	%ebp,%edx
-	roll	$24,%ecx
-	xorl	%ebp,%eax
-	roll	$16,%edx
-	xorl	%ecx,%eax
-	roll	$8,%ebp
-	xorl	%edx,%eax
-	xorl	%ebp,%eax
-	movl	$2155905152,%edi
-	andl	%ebx,%edi
-	movl	%edi,%esi
-	shrl	$7,%edi
-	leal	(%ebx,%ebx,1),%ecx
-	subl	%edi,%esi
-	andl	$4278124286,%ecx
-	andl	$454761243,%esi
-	xorl	%esi,%ecx
-	movl	$2155905152,%edi
-	andl	%ecx,%edi
-	movl	%edi,%esi
-	shrl	$7,%edi
-	leal	(%ecx,%ecx,1),%edx
-	subl	%edi,%esi
-	andl	$4278124286,%edx
-	andl	$454761243,%esi
-	xorl	%ebx,%ecx
-	xorl	%esi,%edx
-	movl	$2155905152,%edi
-	andl	%edx,%edi
-	movl	%edi,%esi
-	shrl	$7,%edi
-	leal	(%edx,%edx,1),%ebp
-	subl	%edi,%esi
-	andl	$4278124286,%ebp
-	andl	$454761243,%esi
-	xorl	%ebx,%edx
-	roll	$8,%ebx
-	xorl	%esi,%ebp
-	xorl	%ecx,%ebx
-	xorl	%ebp,%ecx
-	xorl	%edx,%ebx
-	xorl	%ebp,%edx
-	roll	$24,%ecx
-	xorl	%ebp,%ebx
-	roll	$16,%edx
-	xorl	%ecx,%ebx
-	roll	$8,%ebp
-	xorl	%edx,%ebx
-	movl	12(%esp),%ecx
-	xorl	%ebp,%ebx
-	movl	16(%esp),%edx
-	movl	20(%esp),%edi
-	movl	28(%esp),%ebp
-	addl	$16,%edi
-	xorl	(%edi),%eax
-	xorl	4(%edi),%ebx
-	xorl	8(%edi),%ecx
-	xorl	12(%edi),%edx
-	cmpl	24(%esp),%edi
-	movl	%edi,20(%esp)
-	jb	.L006loop
-	movl	%eax,%esi
-	andl	$255,%esi
-	movzbl	-128(%ebp,%esi,1),%esi
-	movzbl	%dh,%edi
-	movzbl	-128(%ebp,%edi,1),%edi
-	shll	$8,%edi
-	xorl	%edi,%esi
-	movl	%ecx,%edi
-	shrl	$16,%edi
-	andl	$255,%edi
-	movzbl	-128(%ebp,%edi,1),%edi
-	shll	$16,%edi
-	xorl	%edi,%esi
-	movl	%ebx,%edi
-	shrl	$24,%edi
-	movzbl	-128(%ebp,%edi,1),%edi
-	shll	$24,%edi
-	xorl	%edi,%esi
-	movl	%esi,4(%esp)
-	movl	%ebx,%esi
-	andl	$255,%esi
-	movzbl	-128(%ebp,%esi,1),%esi
-	movzbl	%ah,%edi
-	movzbl	-128(%ebp,%edi,1),%edi
-	shll	$8,%edi
-	xorl	%edi,%esi
-	movl	%edx,%edi
-	shrl	$16,%edi
-	andl	$255,%edi
-	movzbl	-128(%ebp,%edi,1),%edi
-	shll	$16,%edi
-	xorl	%edi,%esi
-	movl	%ecx,%edi
-	shrl	$24,%edi
-	movzbl	-128(%ebp,%edi,1),%edi
-	shll	$24,%edi
-	xorl	%edi,%esi
-	movl	%esi,8(%esp)
-	movl	%ecx,%esi
-	andl	$255,%esi
-	movzbl	-128(%ebp,%esi,1),%esi
-	movzbl	%bh,%edi
-	movzbl	-128(%ebp,%edi,1),%edi
-	shll	$8,%edi
-	xorl	%edi,%esi
-	movl	%eax,%edi
-	shrl	$16,%edi
-	andl	$255,%edi
-	movzbl	-128(%ebp,%edi,1),%edi
-	shll	$16,%edi
-	xorl	%edi,%esi
-	movl	%edx,%edi
-	shrl	$24,%edi
-	movzbl	-128(%ebp,%edi,1),%edi
-	shll	$24,%edi
-	xorl	%edi,%esi
-	movl	20(%esp),%edi
-	andl	$255,%edx
-	movzbl	-128(%ebp,%edx,1),%edx
-	movzbl	%ch,%ecx
-	movzbl	-128(%ebp,%ecx,1),%ecx
-	shll	$8,%ecx
-	xorl	%ecx,%edx
-	movl	%esi,%ecx
-	shrl	$16,%ebx
-	andl	$255,%ebx
-	movzbl	-128(%ebp,%ebx,1),%ebx
-	shll	$16,%ebx
-	xorl	%ebx,%edx
-	movl	8(%esp),%ebx
-	shrl	$24,%eax
-	movzbl	-128(%ebp,%eax,1),%eax
-	shll	$24,%eax
-	xorl	%eax,%edx
-	movl	4(%esp),%eax
-	xorl	16(%edi),%eax
-	xorl	20(%edi),%ebx
-	xorl	24(%edi),%ecx
-	xorl	28(%edi),%edx
-	ret
-.size	_x86_AES_decrypt_compact,.-_x86_AES_decrypt_compact
-.type	_sse_AES_decrypt_compact,@function
-.align	16
-_sse_AES_decrypt_compact:
-	pxor	(%edi),%mm0
-	pxor	8(%edi),%mm4
-	movl	240(%edi),%esi
-	leal	-2(%esi,%esi,1),%esi
-	leal	(%edi,%esi,8),%esi
-	movl	%esi,24(%esp)
-	movl	$454761243,%eax
-	movl	%eax,8(%esp)
-	movl	%eax,12(%esp)
-	movl	-128(%ebp),%eax
-	movl	-96(%ebp),%ebx
-	movl	-64(%ebp),%ecx
-	movl	-32(%ebp),%edx
-	movl	(%ebp),%eax
-	movl	32(%ebp),%ebx
-	movl	64(%ebp),%ecx
-	movl	96(%ebp),%edx
-.align	16
-.L007loop:
-	pshufw	$12,%mm0,%mm1
-	pshufw	$9,%mm4,%mm5
-	movd	%mm1,%eax
-	movd	%mm5,%ebx
-	movl	%edi,20(%esp)
-	movzbl	%al,%esi
-	movzbl	%ah,%edx
-	pshufw	$6,%mm0,%mm2
-	movzbl	-128(%ebp,%esi,1),%ecx
-	movzbl	%bl,%edi
-	movzbl	-128(%ebp,%edx,1),%edx
-	shrl	$16,%eax
-	shll	$8,%edx
-	movzbl	-128(%ebp,%edi,1),%esi
-	movzbl	%bh,%edi
-	shll	$16,%esi
-	pshufw	$3,%mm4,%mm6
-	orl	%esi,%ecx
-	movzbl	-128(%ebp,%edi,1),%esi
-	movzbl	%ah,%edi
-	shll	$24,%esi
-	shrl	$16,%ebx
-	orl	%esi,%edx
-	movzbl	-128(%ebp,%edi,1),%esi
-	movzbl	%bh,%edi
-	shll	$24,%esi
-	orl	%esi,%ecx
-	movzbl	-128(%ebp,%edi,1),%esi
-	movzbl	%al,%edi
-	shll	$8,%esi
-	movd	%mm2,%eax
-	orl	%esi,%ecx
-	movzbl	-128(%ebp,%edi,1),%esi
-	movzbl	%bl,%edi
-	shll	$16,%esi
-	movd	%mm6,%ebx
-	movd	%ecx,%mm0
-	movzbl	-128(%ebp,%edi,1),%ecx
-	movzbl	%al,%edi
-	orl	%esi,%ecx
-	movzbl	-128(%ebp,%edi,1),%esi
-	movzbl	%bl,%edi
-	orl	%esi,%edx
-	movzbl	-128(%ebp,%edi,1),%esi
-	movzbl	%ah,%edi
-	shll	$16,%esi
-	shrl	$16,%eax
-	orl	%esi,%edx
-	movzbl	-128(%ebp,%edi,1),%esi
-	movzbl	%bh,%edi
-	shrl	$16,%ebx
-	shll	$8,%esi
-	movd	%edx,%mm1
-	movzbl	-128(%ebp,%edi,1),%edx
-	movzbl	%bh,%edi
-	shll	$24,%edx
-	andl	$255,%ebx
-	orl	%esi,%edx
-	punpckldq	%mm1,%mm0
-	movzbl	-128(%ebp,%edi,1),%esi
-	movzbl	%al,%edi
-	shll	$8,%esi
-	movzbl	%ah,%eax
-	movzbl	-128(%ebp,%ebx,1),%ebx
-	orl	%esi,%ecx
-	movzbl	-128(%ebp,%edi,1),%esi
-	orl	%ebx,%edx
-	shll	$16,%esi
-	movzbl	-128(%ebp,%eax,1),%eax
-	orl	%esi,%edx
-	shll	$24,%eax
-	orl	%eax,%ecx
-	movl	20(%esp),%edi
-	movd	%edx,%mm4
-	movd	%ecx,%mm5
-	punpckldq	%mm5,%mm4
-	addl	$16,%edi
-	cmpl	24(%esp),%edi
-	ja	.L008out
-	movq	%mm0,%mm3
-	movq	%mm4,%mm7
-	pshufw	$228,%mm0,%mm2
-	pshufw	$228,%mm4,%mm6
-	movq	%mm0,%mm1
-	movq	%mm4,%mm5
-	pshufw	$177,%mm0,%mm0
-	pshufw	$177,%mm4,%mm4
-	pslld	$8,%mm2
-	pslld	$8,%mm6
-	psrld	$8,%mm3
-	psrld	$8,%mm7
-	pxor	%mm2,%mm0
-	pxor	%mm6,%mm4
-	pxor	%mm3,%mm0
-	pxor	%mm7,%mm4
-	pslld	$16,%mm2
-	pslld	$16,%mm6
-	psrld	$16,%mm3
-	psrld	$16,%mm7
-	pxor	%mm2,%mm0
-	pxor	%mm6,%mm4
-	pxor	%mm3,%mm0
-	pxor	%mm7,%mm4
-	movq	8(%esp),%mm3
-	pxor	%mm2,%mm2
-	pxor	%mm6,%mm6
-	pcmpgtb	%mm1,%mm2
-	pcmpgtb	%mm5,%mm6
-	pand	%mm3,%mm2
-	pand	%mm3,%mm6
-	paddb	%mm1,%mm1
-	paddb	%mm5,%mm5
-	pxor	%mm2,%mm1
-	pxor	%mm6,%mm5
-	movq	%mm1,%mm3
-	movq	%mm5,%mm7
-	movq	%mm1,%mm2
-	movq	%mm5,%mm6
-	pxor	%mm1,%mm0
-	pxor	%mm5,%mm4
-	pslld	$24,%mm3
-	pslld	$24,%mm7
-	psrld	$8,%mm2
-	psrld	$8,%mm6
-	pxor	%mm3,%mm0
-	pxor	%mm7,%mm4
-	pxor	%mm2,%mm0
-	pxor	%mm6,%mm4
-	movq	8(%esp),%mm2
-	pxor	%mm3,%mm3
-	pxor	%mm7,%mm7
-	pcmpgtb	%mm1,%mm3
-	pcmpgtb	%mm5,%mm7
-	pand	%mm2,%mm3
-	pand	%mm2,%mm7
-	paddb	%mm1,%mm1
-	paddb	%mm5,%mm5
-	pxor	%mm3,%mm1
-	pxor	%mm7,%mm5
-	pshufw	$177,%mm1,%mm3
-	pshufw	$177,%mm5,%mm7
-	pxor	%mm1,%mm0
-	pxor	%mm5,%mm4
-	pxor	%mm3,%mm0
-	pxor	%mm7,%mm4
-	pxor	%mm3,%mm3
-	pxor	%mm7,%mm7
-	pcmpgtb	%mm1,%mm3
-	pcmpgtb	%mm5,%mm7
-	pand	%mm2,%mm3
-	pand	%mm2,%mm7
-	paddb	%mm1,%mm1
-	paddb	%mm5,%mm5
-	pxor	%mm3,%mm1
-	pxor	%mm7,%mm5
-	pxor	%mm1,%mm0
-	pxor	%mm5,%mm4
-	movq	%mm1,%mm3
-	movq	%mm5,%mm7
-	pshufw	$177,%mm1,%mm2
-	pshufw	$177,%mm5,%mm6
-	pxor	%mm2,%mm0
-	pxor	%mm6,%mm4
-	pslld	$8,%mm1
-	pslld	$8,%mm5
-	psrld	$8,%mm3
-	psrld	$8,%mm7
-	movq	(%edi),%mm2
-	movq	8(%edi),%mm6
-	pxor	%mm1,%mm0
-	pxor	%mm5,%mm4
-	pxor	%mm3,%mm0
-	pxor	%mm7,%mm4
-	movl	-128(%ebp),%eax
-	pslld	$16,%mm1
-	pslld	$16,%mm5
-	movl	-64(%ebp),%ebx
-	psrld	$16,%mm3
-	psrld	$16,%mm7
-	movl	(%ebp),%ecx
-	pxor	%mm1,%mm0
-	pxor	%mm5,%mm4
-	movl	64(%ebp),%edx
-	pxor	%mm3,%mm0
-	pxor	%mm7,%mm4
-	pxor	%mm2,%mm0
-	pxor	%mm6,%mm4
-	jmp	.L007loop
-.align	16
-.L008out:
-	pxor	(%edi),%mm0
-	pxor	8(%edi),%mm4
-	ret
-.size	_sse_AES_decrypt_compact,.-_sse_AES_decrypt_compact
-.type	_x86_AES_decrypt,@function
-.align	16
-_x86_AES_decrypt:
-	movl	%edi,20(%esp)
-	xorl	(%edi),%eax
-	xorl	4(%edi),%ebx
-	xorl	8(%edi),%ecx
-	xorl	12(%edi),%edx
-	movl	240(%edi),%esi
-	leal	-2(%esi,%esi,1),%esi
-	leal	(%edi,%esi,8),%esi
-	movl	%esi,24(%esp)
-.align	16
-.L009loop:
-	movl	%eax,%esi
-	andl	$255,%esi
-	movl	(%ebp,%esi,8),%esi
-	movzbl	%dh,%edi
-	xorl	3(%ebp,%edi,8),%esi
-	movl	%ecx,%edi
-	shrl	$16,%edi
-	andl	$255,%edi
-	xorl	2(%ebp,%edi,8),%esi
-	movl	%ebx,%edi
-	shrl	$24,%edi
-	xorl	1(%ebp,%edi,8),%esi
-	movl	%esi,4(%esp)
-
-	movl	%ebx,%esi
-	andl	$255,%esi
-	movl	(%ebp,%esi,8),%esi
-	movzbl	%ah,%edi
-	xorl	3(%ebp,%edi,8),%esi
-	movl	%edx,%edi
-	shrl	$16,%edi
-	andl	$255,%edi
-	xorl	2(%ebp,%edi,8),%esi
-	movl	%ecx,%edi
-	shrl	$24,%edi
-	xorl	1(%ebp,%edi,8),%esi
-	movl	%esi,8(%esp)
-
-	movl	%ecx,%esi
-	andl	$255,%esi
-	movl	(%ebp,%esi,8),%esi
-	movzbl	%bh,%edi
-	xorl	3(%ebp,%edi,8),%esi
-	movl	%eax,%edi
-	shrl	$16,%edi
-	andl	$255,%edi
-	xorl	2(%ebp,%edi,8),%esi
-	movl	%edx,%edi
-	shrl	$24,%edi
-	xorl	1(%ebp,%edi,8),%esi
-
-	movl	20(%esp),%edi
-	andl	$255,%edx
-	movl	(%ebp,%edx,8),%edx
-	movzbl	%ch,%ecx
-	xorl	3(%ebp,%ecx,8),%edx
-	movl	%esi,%ecx
-	shrl	$16,%ebx
-	andl	$255,%ebx
-	xorl	2(%ebp,%ebx,8),%edx
-	movl	8(%esp),%ebx
-	shrl	$24,%eax
-	xorl	1(%ebp,%eax,8),%edx
-	movl	4(%esp),%eax
-
-	addl	$16,%edi
-	xorl	(%edi),%eax
-	xorl	4(%edi),%ebx
-	xorl	8(%edi),%ecx
-	xorl	12(%edi),%edx
-	cmpl	24(%esp),%edi
-	movl	%edi,20(%esp)
-	jb	.L009loop
-	leal	2176(%ebp),%ebp
-	movl	-128(%ebp),%edi
-	movl	-96(%ebp),%esi
-	movl	-64(%ebp),%edi
-	movl	-32(%ebp),%esi
-	movl	(%ebp),%edi
-	movl	32(%ebp),%esi
-	movl	64(%ebp),%edi
-	movl	96(%ebp),%esi
-	leal	-128(%ebp),%ebp
-	movl	%eax,%esi
-	andl	$255,%esi
-	movzbl	(%ebp,%esi,1),%esi
-	movzbl	%dh,%edi
-	movzbl	(%ebp,%edi,1),%edi
-	shll	$8,%edi
-	xorl	%edi,%esi
-	movl	%ecx,%edi
-	shrl	$16,%edi
-	andl	$255,%edi
-	movzbl	(%ebp,%edi,1),%edi
-	shll	$16,%edi
-	xorl	%edi,%esi
-	movl	%ebx,%edi
-	shrl	$24,%edi
-	movzbl	(%ebp,%edi,1),%edi
-	shll	$24,%edi
-	xorl	%edi,%esi
-	movl	%esi,4(%esp)
-	movl	%ebx,%esi
-	andl	$255,%esi
-	movzbl	(%ebp,%esi,1),%esi
-	movzbl	%ah,%edi
-	movzbl	(%ebp,%edi,1),%edi
-	shll	$8,%edi
-	xorl	%edi,%esi
-	movl	%edx,%edi
-	shrl	$16,%edi
-	andl	$255,%edi
-	movzbl	(%ebp,%edi,1),%edi
-	shll	$16,%edi
-	xorl	%edi,%esi
-	movl	%ecx,%edi
-	shrl	$24,%edi
-	movzbl	(%ebp,%edi,1),%edi
-	shll	$24,%edi
-	xorl	%edi,%esi
-	movl	%esi,8(%esp)
-	movl	%ecx,%esi
-	andl	$255,%esi
-	movzbl	(%ebp,%esi,1),%esi
-	movzbl	%bh,%edi
-	movzbl	(%ebp,%edi,1),%edi
-	shll	$8,%edi
-	xorl	%edi,%esi
-	movl	%eax,%edi
-	shrl	$16,%edi
-	andl	$255,%edi
-	movzbl	(%ebp,%edi,1),%edi
-	shll	$16,%edi
-	xorl	%edi,%esi
-	movl	%edx,%edi
-	shrl	$24,%edi
-	movzbl	(%ebp,%edi,1),%edi
-	shll	$24,%edi
-	xorl	%edi,%esi
-	movl	20(%esp),%edi
-	andl	$255,%edx
-	movzbl	(%ebp,%edx,1),%edx
-	movzbl	%ch,%ecx
-	movzbl	(%ebp,%ecx,1),%ecx
-	shll	$8,%ecx
-	xorl	%ecx,%edx
-	movl	%esi,%ecx
-	shrl	$16,%ebx
-	andl	$255,%ebx
-	movzbl	(%ebp,%ebx,1),%ebx
-	shll	$16,%ebx
-	xorl	%ebx,%edx
-	movl	8(%esp),%ebx
-	shrl	$24,%eax
-	movzbl	(%ebp,%eax,1),%eax
-	shll	$24,%eax
-	xorl	%eax,%edx
-	movl	4(%esp),%eax
-	leal	-2048(%ebp),%ebp
-	addl	$16,%edi
-	xorl	(%edi),%eax
-	xorl	4(%edi),%ebx
-	xorl	8(%edi),%ecx
-	xorl	12(%edi),%edx
-	ret
-.align	64
-.LAES_Td:
-.long	1353184337,1353184337
-.long	1399144830,1399144830
-.long	3282310938,3282310938
-.long	2522752826,2522752826
-.long	3412831035,3412831035
-.long	4047871263,4047871263
-.long	2874735276,2874735276
-.long	2466505547,2466505547
-.long	1442459680,1442459680
-.long	4134368941,4134368941
-.long	2440481928,2440481928
-.long	625738485,625738485
-.long	4242007375,4242007375
-.long	3620416197,3620416197
-.long	2151953702,2151953702
-.long	2409849525,2409849525
-.long	1230680542,1230680542
-.long	1729870373,1729870373
-.long	2551114309,2551114309
-.long	3787521629,3787521629
-.long	41234371,41234371
-.long	317738113,317738113
-.long	2744600205,2744600205
-.long	3338261355,3338261355
-.long	3881799427,3881799427
-.long	2510066197,2510066197
-.long	3950669247,3950669247
-.long	3663286933,3663286933
-.long	763608788,763608788
-.long	3542185048,3542185048
-.long	694804553,694804553
-.long	1154009486,1154009486
-.long	1787413109,1787413109
-.long	2021232372,2021232372
-.long	1799248025,1799248025
-.long	3715217703,3715217703
-.long	3058688446,3058688446
-.long	397248752,397248752
-.long	1722556617,1722556617
-.long	3023752829,3023752829
-.long	407560035,407560035
-.long	2184256229,2184256229
-.long	1613975959,1613975959
-.long	1165972322,1165972322
-.long	3765920945,3765920945
-.long	2226023355,2226023355
-.long	480281086,480281086
-.long	2485848313,2485848313
-.long	1483229296,1483229296
-.long	436028815,436028815
-.long	2272059028,2272059028
-.long	3086515026,3086515026
-.long	601060267,601060267
-.long	3791801202,3791801202
-.long	1468997603,1468997603
-.long	715871590,715871590
-.long	120122290,120122290
-.long	63092015,63092015
-.long	2591802758,2591802758
-.long	2768779219,2768779219
-.long	4068943920,4068943920
-.long	2997206819,2997206819
-.long	3127509762,3127509762
-.long	1552029421,1552029421
-.long	723308426,723308426
-.long	2461301159,2461301159
-.long	4042393587,4042393587
-.long	2715969870,2715969870
-.long	3455375973,3455375973
-.long	3586000134,3586000134
-.long	526529745,526529745
-.long	2331944644,2331944644
-.long	2639474228,2639474228
-.long	2689987490,2689987490
-.long	853641733,853641733
-.long	1978398372,1978398372
-.long	971801355,971801355
-.long	2867814464,2867814464
-.long	111112542,111112542
-.long	1360031421,1360031421
-.long	4186579262,4186579262
-.long	1023860118,1023860118
-.long	2919579357,2919579357
-.long	1186850381,1186850381
-.long	3045938321,3045938321
-.long	90031217,90031217
-.long	1876166148,1876166148
-.long	4279586912,4279586912
-.long	620468249,620468249
-.long	2548678102,2548678102
-.long	3426959497,3426959497
-.long	2006899047,2006899047
-.long	3175278768,3175278768
-.long	2290845959,2290845959
-.long	945494503,945494503
-.long	3689859193,3689859193
-.long	1191869601,1191869601
-.long	3910091388,3910091388
-.long	3374220536,3374220536
-.long	0,0
-.long	2206629897,2206629897
-.long	1223502642,1223502642
-.long	2893025566,2893025566
-.long	1316117100,1316117100
-.long	4227796733,4227796733
-.long	1446544655,1446544655
-.long	517320253,517320253
-.long	658058550,658058550
-.long	1691946762,1691946762
-.long	564550760,564550760
-.long	3511966619,3511966619
-.long	976107044,976107044
-.long	2976320012,2976320012
-.long	266819475,266819475
-.long	3533106868,3533106868
-.long	2660342555,2660342555
-.long	1338359936,1338359936
-.long	2720062561,2720062561
-.long	1766553434,1766553434
-.long	370807324,370807324
-.long	179999714,179999714
-.long	3844776128,3844776128
-.long	1138762300,1138762300
-.long	488053522,488053522
-.long	185403662,185403662
-.long	2915535858,2915535858
-.long	3114841645,3114841645
-.long	3366526484,3366526484
-.long	2233069911,2233069911
-.long	1275557295,1275557295
-.long	3151862254,3151862254
-.long	4250959779,4250959779
-.long	2670068215,2670068215
-.long	3170202204,3170202204
-.long	3309004356,3309004356
-.long	880737115,880737115
-.long	1982415755,1982415755
-.long	3703972811,3703972811
-.long	1761406390,1761406390
-.long	1676797112,1676797112
-.long	3403428311,3403428311
-.long	277177154,277177154
-.long	1076008723,1076008723
-.long	538035844,538035844
-.long	2099530373,2099530373
-.long	4164795346,4164795346
-.long	288553390,288553390
-.long	1839278535,1839278535
-.long	1261411869,1261411869
-.long	4080055004,4080055004
-.long	3964831245,3964831245
-.long	3504587127,3504587127
-.long	1813426987,1813426987
-.long	2579067049,2579067049
-.long	4199060497,4199060497
-.long	577038663,577038663
-.long	3297574056,3297574056
-.long	440397984,440397984
-.long	3626794326,3626794326
-.long	4019204898,4019204898
-.long	3343796615,3343796615
-.long	3251714265,3251714265
-.long	4272081548,4272081548
-.long	906744984,906744984
-.long	3481400742,3481400742
-.long	685669029,685669029
-.long	646887386,646887386
-.long	2764025151,2764025151
-.long	3835509292,3835509292
-.long	227702864,227702864
-.long	2613862250,2613862250
-.long	1648787028,1648787028
-.long	3256061430,3256061430
-.long	3904428176,3904428176
-.long	1593260334,1593260334
-.long	4121936770,4121936770
-.long	3196083615,3196083615
-.long	2090061929,2090061929
-.long	2838353263,2838353263
-.long	3004310991,3004310991
-.long	999926984,999926984
-.long	2809993232,2809993232
-.long	1852021992,1852021992
-.long	2075868123,2075868123
-.long	158869197,158869197
-.long	4095236462,4095236462
-.long	28809964,28809964
-.long	2828685187,2828685187
-.long	1701746150,1701746150
-.long	2129067946,2129067946
-.long	147831841,147831841
-.long	3873969647,3873969647
-.long	3650873274,3650873274
-.long	3459673930,3459673930
-.long	3557400554,3557400554
-.long	3598495785,3598495785
-.long	2947720241,2947720241
-.long	824393514,824393514
-.long	815048134,815048134
-.long	3227951669,3227951669
-.long	935087732,935087732
-.long	2798289660,2798289660
-.long	2966458592,2966458592
-.long	366520115,366520115
-.long	1251476721,1251476721
-.long	4158319681,4158319681
-.long	240176511,240176511
-.long	804688151,804688151
-.long	2379631990,2379631990
-.long	1303441219,1303441219
-.long	1414376140,1414376140
-.long	3741619940,3741619940
-.long	3820343710,3820343710
-.long	461924940,461924940
-.long	3089050817,3089050817
-.long	2136040774,2136040774
-.long	82468509,82468509
-.long	1563790337,1563790337
-.long	1937016826,1937016826
-.long	776014843,776014843
-.long	1511876531,1511876531
-.long	1389550482,1389550482
-.long	861278441,861278441
-.long	323475053,323475053
-.long	2355222426,2355222426
-.long	2047648055,2047648055
-.long	2383738969,2383738969
-.long	2302415851,2302415851
-.long	3995576782,3995576782
-.long	902390199,902390199
-.long	3991215329,3991215329
-.long	1018251130,1018251130
-.long	1507840668,1507840668
-.long	1064563285,1064563285
-.long	2043548696,2043548696
-.long	3208103795,3208103795
-.long	3939366739,3939366739
-.long	1537932639,1537932639
-.long	342834655,342834655
-.long	2262516856,2262516856
-.long	2180231114,2180231114
-.long	1053059257,1053059257
-.long	741614648,741614648
-.long	1598071746,1598071746
-.long	1925389590,1925389590
-.long	203809468,203809468
-.long	2336832552,2336832552
-.long	1100287487,1100287487
-.long	1895934009,1895934009
-.long	3736275976,3736275976
-.long	2632234200,2632234200
-.long	2428589668,2428589668
-.long	1636092795,1636092795
-.long	1890988757,1890988757
-.long	1952214088,1952214088
-.long	1113045200,1113045200
-.byte	82,9,106,213,48,54,165,56
-.byte	191,64,163,158,129,243,215,251
-.byte	124,227,57,130,155,47,255,135
-.byte	52,142,67,68,196,222,233,203
-.byte	84,123,148,50,166,194,35,61
-.byte	238,76,149,11,66,250,195,78
-.byte	8,46,161,102,40,217,36,178
-.byte	118,91,162,73,109,139,209,37
-.byte	114,248,246,100,134,104,152,22
-.byte	212,164,92,204,93,101,182,146
-.byte	108,112,72,80,253,237,185,218
-.byte	94,21,70,87,167,141,157,132
-.byte	144,216,171,0,140,188,211,10
-.byte	247,228,88,5,184,179,69,6
-.byte	208,44,30,143,202,63,15,2
-.byte	193,175,189,3,1,19,138,107
-.byte	58,145,17,65,79,103,220,234
-.byte	151,242,207,206,240,180,230,115
-.byte	150,172,116,34,231,173,53,133
-.byte	226,249,55,232,28,117,223,110
-.byte	71,241,26,113,29,41,197,137
-.byte	111,183,98,14,170,24,190,27
-.byte	252,86,62,75,198,210,121,32
-.byte	154,219,192,254,120,205,90,244
-.byte	31,221,168,51,136,7,199,49
-.byte	177,18,16,89,39,128,236,95
-.byte	96,81,127,169,25,181,74,13
-.byte	45,229,122,159,147,201,156,239
-.byte	160,224,59,77,174,42,245,176
-.byte	200,235,187,60,131,83,153,97
-.byte	23,43,4,126,186,119,214,38
-.byte	225,105,20,99,85,33,12,125
-.byte	82,9,106,213,48,54,165,56
-.byte	191,64,163,158,129,243,215,251
-.byte	124,227,57,130,155,47,255,135
-.byte	52,142,67,68,196,222,233,203
-.byte	84,123,148,50,166,194,35,61
-.byte	238,76,149,11,66,250,195,78
-.byte	8,46,161,102,40,217,36,178
-.byte	118,91,162,73,109,139,209,37
-.byte	114,248,246,100,134,104,152,22
-.byte	212,164,92,204,93,101,182,146
-.byte	108,112,72,80,253,237,185,218
-.byte	94,21,70,87,167,141,157,132
-.byte	144,216,171,0,140,188,211,10
-.byte	247,228,88,5,184,179,69,6
-.byte	208,44,30,143,202,63,15,2
-.byte	193,175,189,3,1,19,138,107
-.byte	58,145,17,65,79,103,220,234
-.byte	151,242,207,206,240,180,230,115
-.byte	150,172,116,34,231,173,53,133
-.byte	226,249,55,232,28,117,223,110
-.byte	71,241,26,113,29,41,197,137
-.byte	111,183,98,14,170,24,190,27
-.byte	252,86,62,75,198,210,121,32
-.byte	154,219,192,254,120,205,90,244
-.byte	31,221,168,51,136,7,199,49
-.byte	177,18,16,89,39,128,236,95
-.byte	96,81,127,169,25,181,74,13
-.byte	45,229,122,159,147,201,156,239
-.byte	160,224,59,77,174,42,245,176
-.byte	200,235,187,60,131,83,153,97
-.byte	23,43,4,126,186,119,214,38
-.byte	225,105,20,99,85,33,12,125
-.byte	82,9,106,213,48,54,165,56
-.byte	191,64,163,158,129,243,215,251
-.byte	124,227,57,130,155,47,255,135
-.byte	52,142,67,68,196,222,233,203
-.byte	84,123,148,50,166,194,35,61
-.byte	238,76,149,11,66,250,195,78
-.byte	8,46,161,102,40,217,36,178
-.byte	118,91,162,73,109,139,209,37
-.byte	114,248,246,100,134,104,152,22
-.byte	212,164,92,204,93,101,182,146
-.byte	108,112,72,80,253,237,185,218
-.byte	94,21,70,87,167,141,157,132
-.byte	144,216,171,0,140,188,211,10
-.byte	247,228,88,5,184,179,69,6
-.byte	208,44,30,143,202,63,15,2
-.byte	193,175,189,3,1,19,138,107
-.byte	58,145,17,65,79,103,220,234
-.byte	151,242,207,206,240,180,230,115
-.byte	150,172,116,34,231,173,53,133
-.byte	226,249,55,232,28,117,223,110
-.byte	71,241,26,113,29,41,197,137
-.byte	111,183,98,14,170,24,190,27
-.byte	252,86,62,75,198,210,121,32
-.byte	154,219,192,254,120,205,90,244
-.byte	31,221,168,51,136,7,199,49
-.byte	177,18,16,89,39,128,236,95
-.byte	96,81,127,169,25,181,74,13
-.byte	45,229,122,159,147,201,156,239
-.byte	160,224,59,77,174,42,245,176
-.byte	200,235,187,60,131,83,153,97
-.byte	23,43,4,126,186,119,214,38
-.byte	225,105,20,99,85,33,12,125
-.byte	82,9,106,213,48,54,165,56
-.byte	191,64,163,158,129,243,215,251
-.byte	124,227,57,130,155,47,255,135
-.byte	52,142,67,68,196,222,233,203
-.byte	84,123,148,50,166,194,35,61
-.byte	238,76,149,11,66,250,195,78
-.byte	8,46,161,102,40,217,36,178
-.byte	118,91,162,73,109,139,209,37
-.byte	114,248,246,100,134,104,152,22
-.byte	212,164,92,204,93,101,182,146
-.byte	108,112,72,80,253,237,185,218
-.byte	94,21,70,87,167,141,157,132
-.byte	144,216,171,0,140,188,211,10
-.byte	247,228,88,5,184,179,69,6
-.byte	208,44,30,143,202,63,15,2
-.byte	193,175,189,3,1,19,138,107
-.byte	58,145,17,65,79,103,220,234
-.byte	151,242,207,206,240,180,230,115
-.byte	150,172,116,34,231,173,53,133
-.byte	226,249,55,232,28,117,223,110
-.byte	71,241,26,113,29,41,197,137
-.byte	111,183,98,14,170,24,190,27
-.byte	252,86,62,75,198,210,121,32
-.byte	154,219,192,254,120,205,90,244
-.byte	31,221,168,51,136,7,199,49
-.byte	177,18,16,89,39,128,236,95
-.byte	96,81,127,169,25,181,74,13
-.byte	45,229,122,159,147,201,156,239
-.byte	160,224,59,77,174,42,245,176
-.byte	200,235,187,60,131,83,153,97
-.byte	23,43,4,126,186,119,214,38
-.byte	225,105,20,99,85,33,12,125
-.size	_x86_AES_decrypt,.-_x86_AES_decrypt
-.globl	AES_decrypt
-.type	AES_decrypt,@function
-.align	16
-AES_decrypt:
-.L_AES_decrypt_begin:
-	pushl	%ebp
-	pushl	%ebx
-	pushl	%esi
-	pushl	%edi
-	movl	20(%esp),%esi
-	movl	28(%esp),%edi
-	movl	%esp,%eax
-	subl	$36,%esp
-	andl	$-64,%esp
-	leal	-127(%edi),%ebx
-	subl	%esp,%ebx
-	negl	%ebx
-	andl	$960,%ebx
-	subl	%ebx,%esp
-	addl	$4,%esp
-	movl	%eax,28(%esp)
-	call	.L010pic_point
-.L010pic_point:
-	popl	%ebp
-	leal	OPENSSL_ia32cap_P-.L010pic_point(%ebp),%eax
-	leal	.LAES_Td-.L010pic_point(%ebp),%ebp
-	leal	764(%esp),%ebx
-	subl	%ebp,%ebx
-	andl	$768,%ebx
-	leal	2176(%ebp,%ebx,1),%ebp
-	btl	$25,(%eax)
-	jnc	.L011x86
-	movq	(%esi),%mm0
-	movq	8(%esi),%mm4
-	call	_sse_AES_decrypt_compact
-	movl	28(%esp),%esp
-	movl	24(%esp),%esi
-	movq	%mm0,(%esi)
-	movq	%mm4,8(%esi)
-	emms
-	popl	%edi
-	popl	%esi
-	popl	%ebx
-	popl	%ebp
-	ret
-.align	16
-.L011x86:
-	movl	%ebp,24(%esp)
-	movl	(%esi),%eax
-	movl	4(%esi),%ebx
-	movl	8(%esi),%ecx
-	movl	12(%esi),%edx
-	call	_x86_AES_decrypt_compact
-	movl	28(%esp),%esp
-	movl	24(%esp),%esi
-	movl	%eax,(%esi)
-	movl	%ebx,4(%esi)
-	movl	%ecx,8(%esi)
-	movl	%edx,12(%esi)
-	popl	%edi
-	popl	%esi
-	popl	%ebx
-	popl	%ebp
-	ret
-.size	AES_decrypt,.-.L_AES_decrypt_begin
-.globl	AES_cbc_encrypt
-.type	AES_cbc_encrypt,@function
-.align	16
-AES_cbc_encrypt:
-.L_AES_cbc_encrypt_begin:
-	pushl	%ebp
-	pushl	%ebx
-	pushl	%esi
-	pushl	%edi
-	movl	28(%esp),%ecx
-	cmpl	$0,%ecx
-	je	.L012drop_out
-	call	.L013pic_point
-.L013pic_point:
-	popl	%ebp
-	leal	OPENSSL_ia32cap_P-.L013pic_point(%ebp),%eax
-	cmpl	$0,40(%esp)
-	leal	.LAES_Te-.L013pic_point(%ebp),%ebp
-	jne	.L014picked_te
-	leal	.LAES_Td-.LAES_Te(%ebp),%ebp
-.L014picked_te:
-	pushfl
-	cld
-	cmpl	$512,%ecx
-	jb	.L015slow_way
-	testl	$15,%ecx
-	jnz	.L015slow_way
-	btl	$28,(%eax)
-	jc	.L015slow_way
-	leal	-324(%esp),%esi
-	andl	$-64,%esi
-	movl	%ebp,%eax
-	leal	2304(%ebp),%ebx
-	movl	%esi,%edx
-	andl	$4095,%eax
-	andl	$4095,%ebx
-	andl	$4095,%edx
-	cmpl	%ebx,%edx
-	jb	.L016tbl_break_out
-	subl	%ebx,%edx
-	subl	%edx,%esi
-	jmp	.L017tbl_ok
-.align	4
-.L016tbl_break_out:
-	subl	%eax,%edx
-	andl	$4095,%edx
-	addl	$384,%edx
-	subl	%edx,%esi
-.align	4
-.L017tbl_ok:
-	leal	24(%esp),%edx
-	xchgl	%esi,%esp
-	addl	$4,%esp
-	movl	%ebp,24(%esp)
-	movl	%esi,28(%esp)
-	movl	(%edx),%eax
-	movl	4(%edx),%ebx
-	movl	12(%edx),%edi
-	movl	16(%edx),%esi
-	movl	20(%edx),%edx
-	movl	%eax,32(%esp)
-	movl	%ebx,36(%esp)
-	movl	%ecx,40(%esp)
-	movl	%edi,44(%esp)
-	movl	%esi,48(%esp)
-	movl	$0,316(%esp)
-	movl	%edi,%ebx
-	movl	$61,%ecx
-	subl	%ebp,%ebx
-	movl	%edi,%esi
-	andl	$4095,%ebx
-	leal	76(%esp),%edi
-	cmpl	$2304,%ebx
-	jb	.L018do_copy
-	cmpl	$3852,%ebx
-	jb	.L019skip_copy
-.align	4
-.L018do_copy:
-	movl	%edi,44(%esp)
-.long	2784229001
-.L019skip_copy:
-	movl	$16,%edi
-.align	4
-.L020prefetch_tbl:
-	movl	(%ebp),%eax
-	movl	32(%ebp),%ebx
-	movl	64(%ebp),%ecx
-	movl	96(%ebp),%esi
-	leal	128(%ebp),%ebp
-	subl	$1,%edi
-	jnz	.L020prefetch_tbl
-	subl	$2048,%ebp
-	movl	32(%esp),%esi
-	movl	48(%esp),%edi
-	cmpl	$0,%edx
-	je	.L021fast_decrypt
-	movl	(%edi),%eax
-	movl	4(%edi),%ebx
-.align	16
-.L022fast_enc_loop:
-	movl	8(%edi),%ecx
-	movl	12(%edi),%edx
-	xorl	(%esi),%eax
-	xorl	4(%esi),%ebx
-	xorl	8(%esi),%ecx
-	xorl	12(%esi),%edx
-	movl	44(%esp),%edi
-	call	_x86_AES_encrypt
-	movl	32(%esp),%esi
-	movl	36(%esp),%edi
-	movl	%eax,(%edi)
-	movl	%ebx,4(%edi)
-	movl	%ecx,8(%edi)
-	movl	%edx,12(%edi)
-	leal	16(%esi),%esi
-	movl	40(%esp),%ecx
-	movl	%esi,32(%esp)
-	leal	16(%edi),%edx
-	movl	%edx,36(%esp)
-	subl	$16,%ecx
-	movl	%ecx,40(%esp)
-	jnz	.L022fast_enc_loop
-	movl	48(%esp),%esi
-	movl	8(%edi),%ecx
-	movl	12(%edi),%edx
-	movl	%eax,(%esi)
-	movl	%ebx,4(%esi)
-	movl	%ecx,8(%esi)
-	movl	%edx,12(%esi)
-	cmpl	$0,316(%esp)
-	movl	44(%esp),%edi
-	je	.L023skip_ezero
-	movl	$60,%ecx
-	xorl	%eax,%eax
-.align	4
-.long	2884892297
-.L023skip_ezero:
-	movl	28(%esp),%esp
-	popfl
-.L012drop_out:
-	popl	%edi
-	popl	%esi
-	popl	%ebx
-	popl	%ebp
-	ret
-	pushfl
-.align	16
-.L021fast_decrypt:
-	cmpl	36(%esp),%esi
-	je	.L024fast_dec_in_place
-	movl	%edi,52(%esp)
-.align	4
-.align	16
-.L025fast_dec_loop:
-	movl	(%esi),%eax
-	movl	4(%esi),%ebx
-	movl	8(%esi),%ecx
-	movl	12(%esi),%edx
-	movl	44(%esp),%edi
-	call	_x86_AES_decrypt
-	movl	52(%esp),%edi
-	movl	40(%esp),%esi
-	xorl	(%edi),%eax
-	xorl	4(%edi),%ebx
-	xorl	8(%edi),%ecx
-	xorl	12(%edi),%edx
-	movl	36(%esp),%edi
-	movl	32(%esp),%esi
-	movl	%eax,(%edi)
-	movl	%ebx,4(%edi)
-	movl	%ecx,8(%edi)
-	movl	%edx,12(%edi)
-	movl	40(%esp),%ecx
-	movl	%esi,52(%esp)
-	leal	16(%esi),%esi
-	movl	%esi,32(%esp)
-	leal	16(%edi),%edi
-	movl	%edi,36(%esp)
-	subl	$16,%ecx
-	movl	%ecx,40(%esp)
-	jnz	.L025fast_dec_loop
-	movl	52(%esp),%edi
-	movl	48(%esp),%esi
-	movl	(%edi),%eax
-	movl	4(%edi),%ebx
-	movl	8(%edi),%ecx
-	movl	12(%edi),%edx
-	movl	%eax,(%esi)
-	movl	%ebx,4(%esi)
-	movl	%ecx,8(%esi)
-	movl	%edx,12(%esi)
-	jmp	.L026fast_dec_out
-.align	16
-.L024fast_dec_in_place:
-.L027fast_dec_in_place_loop:
-	movl	(%esi),%eax
-	movl	4(%esi),%ebx
-	movl	8(%esi),%ecx
-	movl	12(%esi),%edx
-	leal	60(%esp),%edi
-	movl	%eax,(%edi)
-	movl	%ebx,4(%edi)
-	movl	%ecx,8(%edi)
-	movl	%edx,12(%edi)
-	movl	44(%esp),%edi
-	call	_x86_AES_decrypt
-	movl	48(%esp),%edi
-	movl	36(%esp),%esi
-	xorl	(%edi),%eax
-	xorl	4(%edi),%ebx
-	xorl	8(%edi),%ecx
-	xorl	12(%edi),%edx
-	movl	%eax,(%esi)
-	movl	%ebx,4(%esi)
-	movl	%ecx,8(%esi)
-	movl	%edx,12(%esi)
-	leal	16(%esi),%esi
-	movl	%esi,36(%esp)
-	leal	60(%esp),%esi
-	movl	(%esi),%eax
-	movl	4(%esi),%ebx
-	movl	8(%esi),%ecx
-	movl	12(%esi),%edx
-	movl	%eax,(%edi)
-	movl	%ebx,4(%edi)
-	movl	%ecx,8(%edi)
-	movl	%edx,12(%edi)
-	movl	32(%esp),%esi
-	movl	40(%esp),%ecx
-	leal	16(%esi),%esi
-	movl	%esi,32(%esp)
-	subl	$16,%ecx
-	movl	%ecx,40(%esp)
-	jnz	.L027fast_dec_in_place_loop
-.align	4
-.L026fast_dec_out:
-	cmpl	$0,316(%esp)
-	movl	44(%esp),%edi
-	je	.L028skip_dzero
-	movl	$60,%ecx
-	xorl	%eax,%eax
-.align	4
-.long	2884892297
-.L028skip_dzero:
-	movl	28(%esp),%esp
-	popfl
-	popl	%edi
-	popl	%esi
-	popl	%ebx
-	popl	%ebp
-	ret
-	pushfl
-.align	16
-.L015slow_way:
-	movl	(%eax),%eax
-	movl	36(%esp),%edi
-	leal	-80(%esp),%esi
-	andl	$-64,%esi
-	leal	-143(%edi),%ebx
-	subl	%esi,%ebx
-	negl	%ebx
-	andl	$960,%ebx
-	subl	%ebx,%esi
-	leal	768(%esi),%ebx
-	subl	%ebp,%ebx
-	andl	$768,%ebx
-	leal	2176(%ebp,%ebx,1),%ebp
-	leal	24(%esp),%edx
-	xchgl	%esi,%esp
-	addl	$4,%esp
-	movl	%ebp,24(%esp)
-	movl	%esi,28(%esp)
-	movl	%eax,52(%esp)
-	movl	(%edx),%eax
-	movl	4(%edx),%ebx
-	movl	16(%edx),%esi
-	movl	20(%edx),%edx
-	movl	%eax,32(%esp)
-	movl	%ebx,36(%esp)
-	movl	%ecx,40(%esp)
-	movl	%edi,44(%esp)
-	movl	%esi,48(%esp)
-	movl	%esi,%edi
-	movl	%eax,%esi
-	cmpl	$0,%edx
-	je	.L029slow_decrypt
-	cmpl	$16,%ecx
-	movl	%ebx,%edx
-	jb	.L030slow_enc_tail
-	btl	$25,52(%esp)
-	jnc	.L031slow_enc_x86
-	movq	(%edi),%mm0
-	movq	8(%edi),%mm4
-.align	16
-.L032slow_enc_loop_sse:
-	pxor	(%esi),%mm0
-	pxor	8(%esi),%mm4
-	movl	44(%esp),%edi
-	call	_sse_AES_encrypt_compact
-	movl	32(%esp),%esi
-	movl	36(%esp),%edi
-	movl	40(%esp),%ecx
-	movq	%mm0,(%edi)
-	movq	%mm4,8(%edi)
-	leal	16(%esi),%esi
-	movl	%esi,32(%esp)
-	leal	16(%edi),%edx
-	movl	%edx,36(%esp)
-	subl	$16,%ecx
-	cmpl	$16,%ecx
-	movl	%ecx,40(%esp)
-	jae	.L032slow_enc_loop_sse
-	testl	$15,%ecx
-	jnz	.L030slow_enc_tail
-	movl	48(%esp),%esi
-	movq	%mm0,(%esi)
-	movq	%mm4,8(%esi)
-	emms
-	movl	28(%esp),%esp
-	popfl
-	popl	%edi
-	popl	%esi
-	popl	%ebx
-	popl	%ebp
-	ret
-	pushfl
-.align	16
-.L031slow_enc_x86:
-	movl	(%edi),%eax
-	movl	4(%edi),%ebx
-.align	4
-.L033slow_enc_loop_x86:
-	movl	8(%edi),%ecx
-	movl	12(%edi),%edx
-	xorl	(%esi),%eax
-	xorl	4(%esi),%ebx
-	xorl	8(%esi),%ecx
-	xorl	12(%esi),%edx
-	movl	44(%esp),%edi
-	call	_x86_AES_encrypt_compact
-	movl	32(%esp),%esi
-	movl	36(%esp),%edi
-	movl	%eax,(%edi)
-	movl	%ebx,4(%edi)
-	movl	%ecx,8(%edi)
-	movl	%edx,12(%edi)
-	movl	40(%esp),%ecx
-	leal	16(%esi),%esi
-	movl	%esi,32(%esp)
-	leal	16(%edi),%edx
-	movl	%edx,36(%esp)
-	subl	$16,%ecx
-	cmpl	$16,%ecx
-	movl	%ecx,40(%esp)
-	jae	.L033slow_enc_loop_x86
-	testl	$15,%ecx
-	jnz	.L030slow_enc_tail
-	movl	48(%esp),%esi
-	movl	8(%edi),%ecx
-	movl	12(%edi),%edx
-	movl	%eax,(%esi)
-	movl	%ebx,4(%esi)
-	movl	%ecx,8(%esi)
-	movl	%edx,12(%esi)
-	movl	28(%esp),%esp
-	popfl
-	popl	%edi
-	popl	%esi
-	popl	%ebx
-	popl	%ebp
-	ret
-	pushfl
-.align	16
-.L030slow_enc_tail:
-	emms
-	movl	%edx,%edi
-	movl	$16,%ebx
-	subl	%ecx,%ebx
-	cmpl	%esi,%edi
-	je	.L034enc_in_place
-.align	4
-.long	2767451785
-	jmp	.L035enc_skip_in_place
-.L034enc_in_place:
-	leal	(%edi,%ecx,1),%edi
-.L035enc_skip_in_place:
-	movl	%ebx,%ecx
-	xorl	%eax,%eax
-.align	4
-.long	2868115081
-	movl	48(%esp),%edi
-	movl	%edx,%esi
-	movl	(%edi),%eax
-	movl	4(%edi),%ebx
-	movl	$16,40(%esp)
-	jmp	.L033slow_enc_loop_x86
-.align	16
-.L029slow_decrypt:
-	btl	$25,52(%esp)
-	jnc	.L036slow_dec_loop_x86
-.align	4
-.L037slow_dec_loop_sse:
-	movq	(%esi),%mm0
-	movq	8(%esi),%mm4
-	movl	44(%esp),%edi
-	call	_sse_AES_decrypt_compact
-	movl	32(%esp),%esi
-	leal	60(%esp),%eax
-	movl	36(%esp),%ebx
-	movl	40(%esp),%ecx
-	movl	48(%esp),%edi
-	movq	(%esi),%mm1
-	movq	8(%esi),%mm5
-	pxor	(%edi),%mm0
-	pxor	8(%edi),%mm4
-	movq	%mm1,(%edi)
-	movq	%mm5,8(%edi)
-	subl	$16,%ecx
-	jc	.L038slow_dec_partial_sse
-	movq	%mm0,(%ebx)
-	movq	%mm4,8(%ebx)
-	leal	16(%ebx),%ebx
-	movl	%ebx,36(%esp)
-	leal	16(%esi),%esi
-	movl	%esi,32(%esp)
-	movl	%ecx,40(%esp)
-	jnz	.L037slow_dec_loop_sse
-	emms
-	movl	28(%esp),%esp
-	popfl
-	popl	%edi
-	popl	%esi
-	popl	%ebx
-	popl	%ebp
-	ret
-	pushfl
-.align	16
-.L038slow_dec_partial_sse:
-	movq	%mm0,(%eax)
-	movq	%mm4,8(%eax)
-	emms
-	addl	$16,%ecx
-	movl	%ebx,%edi
-	movl	%eax,%esi
-.align	4
-.long	2767451785
-	movl	28(%esp),%esp
-	popfl
-	popl	%edi
-	popl	%esi
-	popl	%ebx
-	popl	%ebp
-	ret
-	pushfl
-.align	16
-.L036slow_dec_loop_x86:
-	movl	(%esi),%eax
-	movl	4(%esi),%ebx
-	movl	8(%esi),%ecx
-	movl	12(%esi),%edx
-	leal	60(%esp),%edi
-	movl	%eax,(%edi)
-	movl	%ebx,4(%edi)
-	movl	%ecx,8(%edi)
-	movl	%edx,12(%edi)
-	movl	44(%esp),%edi
-	call	_x86_AES_decrypt_compact
-	movl	48(%esp),%edi
-	movl	40(%esp),%esi
-	xorl	(%edi),%eax
-	xorl	4(%edi),%ebx
-	xorl	8(%edi),%ecx
-	xorl	12(%edi),%edx
-	subl	$16,%esi
-	jc	.L039slow_dec_partial_x86
-	movl	%esi,40(%esp)
-	movl	36(%esp),%esi
-	movl	%eax,(%esi)
-	movl	%ebx,4(%esi)
-	movl	%ecx,8(%esi)
-	movl	%edx,12(%esi)
-	leal	16(%esi),%esi
-	movl	%esi,36(%esp)
-	leal	60(%esp),%esi
-	movl	(%esi),%eax
-	movl	4(%esi),%ebx
-	movl	8(%esi),%ecx
-	movl	12(%esi),%edx
-	movl	%eax,(%edi)
-	movl	%ebx,4(%edi)
-	movl	%ecx,8(%edi)
-	movl	%edx,12(%edi)
-	movl	32(%esp),%esi
-	leal	16(%esi),%esi
-	movl	%esi,32(%esp)
-	jnz	.L036slow_dec_loop_x86
-	movl	28(%esp),%esp
-	popfl
-	popl	%edi
-	popl	%esi
-	popl	%ebx
-	popl	%ebp
-	ret
-	pushfl
-.align	16
-.L039slow_dec_partial_x86:
-	leal	60(%esp),%esi
-	movl	%eax,(%esi)
-	movl	%ebx,4(%esi)
-	movl	%ecx,8(%esi)
-	movl	%edx,12(%esi)
-	movl	32(%esp),%esi
-	movl	(%esi),%eax
-	movl	4(%esi),%ebx
-	movl	8(%esi),%ecx
-	movl	12(%esi),%edx
-	movl	%eax,(%edi)
-	movl	%ebx,4(%edi)
-	movl	%ecx,8(%edi)
-	movl	%edx,12(%edi)
-	movl	40(%esp),%ecx
-	movl	36(%esp),%edi
-	leal	60(%esp),%esi
-.align	4
-.long	2767451785
-	movl	28(%esp),%esp
-	popfl
-	popl	%edi
-	popl	%esi
-	popl	%ebx
-	popl	%ebp
-	ret
-.size	AES_cbc_encrypt,.-.L_AES_cbc_encrypt_begin
-.type	_x86_AES_set_encrypt_key,@function
-.align	16
-_x86_AES_set_encrypt_key:
-	pushl	%ebp
-	pushl	%ebx
-	pushl	%esi
-	pushl	%edi
-	movl	24(%esp),%esi
-	movl	32(%esp),%edi
-	testl	$-1,%esi
-	jz	.L040badpointer
-	testl	$-1,%edi
-	jz	.L040badpointer
-	call	.L041pic_point
-.L041pic_point:
-	popl	%ebp
-	leal	.LAES_Te-.L041pic_point(%ebp),%ebp
-	leal	2176(%ebp),%ebp
-	movl	-128(%ebp),%eax
-	movl	-96(%ebp),%ebx
-	movl	-64(%ebp),%ecx
-	movl	-32(%ebp),%edx
-	movl	(%ebp),%eax
-	movl	32(%ebp),%ebx
-	movl	64(%ebp),%ecx
-	movl	96(%ebp),%edx
-	movl	28(%esp),%ecx
-	cmpl	$128,%ecx
-	je	.L04210rounds
-	cmpl	$192,%ecx
-	je	.L04312rounds
-	cmpl	$256,%ecx
-	je	.L04414rounds
-	movl	$-2,%eax
-	jmp	.L045exit
-.L04210rounds:
-	movl	(%esi),%eax
-	movl	4(%esi),%ebx
-	movl	8(%esi),%ecx
-	movl	12(%esi),%edx
-	movl	%eax,(%edi)
-	movl	%ebx,4(%edi)
-	movl	%ecx,8(%edi)
-	movl	%edx,12(%edi)
-	xorl	%ecx,%ecx
-	jmp	.L04610shortcut
-.align	4
-.L04710loop:
-	movl	(%edi),%eax
-	movl	12(%edi),%edx
-.L04610shortcut:
-	movzbl	%dl,%esi
-	movzbl	-128(%ebp,%esi,1),%ebx
-	movzbl	%dh,%esi
-	shll	$24,%ebx
-	xorl	%ebx,%eax
-	movzbl	-128(%ebp,%esi,1),%ebx
-	shrl	$16,%edx
-	movzbl	%dl,%esi
-	xorl	%ebx,%eax
-	movzbl	-128(%ebp,%esi,1),%ebx
-	movzbl	%dh,%esi
-	shll	$8,%ebx
-	xorl	%ebx,%eax
-	movzbl	-128(%ebp,%esi,1),%ebx
-	shll	$16,%ebx
-	xorl	%ebx,%eax
-	xorl	896(%ebp,%ecx,4),%eax
-	movl	%eax,16(%edi)
-	xorl	4(%edi),%eax
-	movl	%eax,20(%edi)
-	xorl	8(%edi),%eax
-	movl	%eax,24(%edi)
-	xorl	12(%edi),%eax
-	movl	%eax,28(%edi)
-	incl	%ecx
-	addl	$16,%edi
-	cmpl	$10,%ecx
-	jl	.L04710loop
-	movl	$10,80(%edi)
-	xorl	%eax,%eax
-	jmp	.L045exit
-.L04312rounds:
-	movl	(%esi),%eax
-	movl	4(%esi),%ebx
-	movl	8(%esi),%ecx
-	movl	12(%esi),%edx
-	movl	%eax,(%edi)
-	movl	%ebx,4(%edi)
-	movl	%ecx,8(%edi)
-	movl	%edx,12(%edi)
-	movl	16(%esi),%ecx
-	movl	20(%esi),%edx
-	movl	%ecx,16(%edi)
-	movl	%edx,20(%edi)
-	xorl	%ecx,%ecx
-	jmp	.L04812shortcut
-.align	4
-.L04912loop:
-	movl	(%edi),%eax
-	movl	20(%edi),%edx
-.L04812shortcut:
-	movzbl	%dl,%esi
-	movzbl	-128(%ebp,%esi,1),%ebx
-	movzbl	%dh,%esi
-	shll	$24,%ebx
-	xorl	%ebx,%eax
-	movzbl	-128(%ebp,%esi,1),%ebx
-	shrl	$16,%edx
-	movzbl	%dl,%esi
-	xorl	%ebx,%eax
-	movzbl	-128(%ebp,%esi,1),%ebx
-	movzbl	%dh,%esi
-	shll	$8,%ebx
-	xorl	%ebx,%eax
-	movzbl	-128(%ebp,%esi,1),%ebx
-	shll	$16,%ebx
-	xorl	%ebx,%eax
-	xorl	896(%ebp,%ecx,4),%eax
-	movl	%eax,24(%edi)
-	xorl	4(%edi),%eax
-	movl	%eax,28(%edi)
-	xorl	8(%edi),%eax
-	movl	%eax,32(%edi)
-	xorl	12(%edi),%eax
-	movl	%eax,36(%edi)
-	cmpl	$7,%ecx
-	je	.L05012break
-	incl	%ecx
-	xorl	16(%edi),%eax
-	movl	%eax,40(%edi)
-	xorl	20(%edi),%eax
-	movl	%eax,44(%edi)
-	addl	$24,%edi
-	jmp	.L04912loop
-.L05012break:
-	movl	$12,72(%edi)
-	xorl	%eax,%eax
-	jmp	.L045exit
-.L04414rounds:
-	movl	(%esi),%eax
-	movl	4(%esi),%ebx
-	movl	8(%esi),%ecx
-	movl	12(%esi),%edx
-	movl	%eax,(%edi)
-	movl	%ebx,4(%edi)
-	movl	%ecx,8(%edi)
-	movl	%edx,12(%edi)
-	movl	16(%esi),%eax
-	movl	20(%esi),%ebx
-	movl	24(%esi),%ecx
-	movl	28(%esi),%edx
-	movl	%eax,16(%edi)
-	movl	%ebx,20(%edi)
-	movl	%ecx,24(%edi)
-	movl	%edx,28(%edi)
-	xorl	%ecx,%ecx
-	jmp	.L05114shortcut
-.align	4
-.L05214loop:
-	movl	28(%edi),%edx
-.L05114shortcut:
-	movl	(%edi),%eax
-	movzbl	%dl,%esi
-	movzbl	-128(%ebp,%esi,1),%ebx
-	movzbl	%dh,%esi
-	shll	$24,%ebx
-	xorl	%ebx,%eax
-	movzbl	-128(%ebp,%esi,1),%ebx
-	shrl	$16,%edx
-	movzbl	%dl,%esi
-	xorl	%ebx,%eax
-	movzbl	-128(%ebp,%esi,1),%ebx
-	movzbl	%dh,%esi
-	shll	$8,%ebx
-	xorl	%ebx,%eax
-	movzbl	-128(%ebp,%esi,1),%ebx
-	shll	$16,%ebx
-	xorl	%ebx,%eax
-	xorl	896(%ebp,%ecx,4),%eax
-	movl	%eax,32(%edi)
-	xorl	4(%edi),%eax
-	movl	%eax,36(%edi)
-	xorl	8(%edi),%eax
-	movl	%eax,40(%edi)
-	xorl	12(%edi),%eax
-	movl	%eax,44(%edi)
-	cmpl	$6,%ecx
-	je	.L05314break
-	incl	%ecx
-	movl	%eax,%edx
-	movl	16(%edi),%eax
-	movzbl	%dl,%esi
-	movzbl	-128(%ebp,%esi,1),%ebx
-	movzbl	%dh,%esi
-	xorl	%ebx,%eax
-	movzbl	-128(%ebp,%esi,1),%ebx
-	shrl	$16,%edx
-	shll	$8,%ebx
-	movzbl	%dl,%esi
-	xorl	%ebx,%eax
-	movzbl	-128(%ebp,%esi,1),%ebx
-	movzbl	%dh,%esi
-	shll	$16,%ebx
-	xorl	%ebx,%eax
-	movzbl	-128(%ebp,%esi,1),%ebx
-	shll	$24,%ebx
-	xorl	%ebx,%eax
-	movl	%eax,48(%edi)
-	xorl	20(%edi),%eax
-	movl	%eax,52(%edi)
-	xorl	24(%edi),%eax
-	movl	%eax,56(%edi)
-	xorl	28(%edi),%eax
-	movl	%eax,60(%edi)
-	addl	$32,%edi
-	jmp	.L05214loop
-.L05314break:
-	movl	$14,48(%edi)
-	xorl	%eax,%eax
-	jmp	.L045exit
-.L040badpointer:
-	movl	$-1,%eax
-.L045exit:
-	popl	%edi
-	popl	%esi
-	popl	%ebx
-	popl	%ebp
-	ret
-.size	_x86_AES_set_encrypt_key,.-_x86_AES_set_encrypt_key
-.globl	AES_set_encrypt_key
-.type	AES_set_encrypt_key,@function
-.align	16
-AES_set_encrypt_key:
-.L_AES_set_encrypt_key_begin:
-	call	_x86_AES_set_encrypt_key
-	ret
-.size	AES_set_encrypt_key,.-.L_AES_set_encrypt_key_begin
-.globl	AES_set_decrypt_key
-.type	AES_set_decrypt_key,@function
-.align	16
-AES_set_decrypt_key:
-.L_AES_set_decrypt_key_begin:
-	call	_x86_AES_set_encrypt_key
-	cmpl	$0,%eax
-	je	.L054proceed
-	ret
-.L054proceed:
-	pushl	%ebp
-	pushl	%ebx
-	pushl	%esi
-	pushl	%edi
-	movl	28(%esp),%esi
-	movl	240(%esi),%ecx
-	leal	(,%ecx,4),%ecx
-	leal	(%esi,%ecx,4),%edi
-.align	4
-.L055invert:
-	movl	(%esi),%eax
-	movl	4(%esi),%ebx
-	movl	(%edi),%ecx
-	movl	4(%edi),%edx
-	movl	%eax,(%edi)
-	movl	%ebx,4(%edi)
-	movl	%ecx,(%esi)
-	movl	%edx,4(%esi)
-	movl	8(%esi),%eax
-	movl	12(%esi),%ebx
-	movl	8(%edi),%ecx
-	movl	12(%edi),%edx
-	movl	%eax,8(%edi)
-	movl	%ebx,12(%edi)
-	movl	%ecx,8(%esi)
-	movl	%edx,12(%esi)
-	addl	$16,%esi
-	subl	$16,%edi
-	cmpl	%edi,%esi
-	jne	.L055invert
-	movl	28(%esp),%edi
-	movl	240(%edi),%esi
-	leal	-2(%esi,%esi,1),%esi
-	leal	(%edi,%esi,8),%esi
-	movl	%esi,28(%esp)
-	movl	16(%edi),%eax
-.align	4
-.L056permute:
-	addl	$16,%edi
-	movl	$2155905152,%ebp
-	andl	%eax,%ebp
-	leal	(%eax,%eax,1),%ebx
-	movl	%ebp,%esi
-	shrl	$7,%ebp
-	subl	%ebp,%esi
-	andl	$4278124286,%ebx
-	andl	$454761243,%esi
-	xorl	%esi,%ebx
-	movl	$2155905152,%ebp
-	andl	%ebx,%ebp
-	leal	(%ebx,%ebx,1),%ecx
-	movl	%ebp,%esi
-	shrl	$7,%ebp
-	subl	%ebp,%esi
-	andl	$4278124286,%ecx
-	andl	$454761243,%esi
-	xorl	%eax,%ebx
-	xorl	%esi,%ecx
-	movl	$2155905152,%ebp
-	andl	%ecx,%ebp
-	leal	(%ecx,%ecx,1),%edx
-	movl	%ebp,%esi
-	shrl	$7,%ebp
-	xorl	%eax,%ecx
-	subl	%ebp,%esi
-	andl	$4278124286,%edx
-	andl	$454761243,%esi
-	roll	$8,%eax
-	xorl	%esi,%edx
-	movl	4(%edi),%ebp
-	xorl	%ebx,%eax
-	xorl	%edx,%ebx
-	xorl	%ecx,%eax
-	roll	$24,%ebx
-	xorl	%edx,%ecx
-	xorl	%edx,%eax
-	roll	$16,%ecx
-	xorl	%ebx,%eax
-	roll	$8,%edx
-	xorl	%ecx,%eax
-	movl	%ebp,%ebx
-	xorl	%edx,%eax
-	movl	%eax,(%edi)
-	movl	$2155905152,%ebp
-	andl	%ebx,%ebp
-	leal	(%ebx,%ebx,1),%ecx
-	movl	%ebp,%esi
-	shrl	$7,%ebp
-	subl	%ebp,%esi
-	andl	$4278124286,%ecx
-	andl	$454761243,%esi
-	xorl	%esi,%ecx
-	movl	$2155905152,%ebp
-	andl	%ecx,%ebp
-	leal	(%ecx,%ecx,1),%edx
-	movl	%ebp,%esi
-	shrl	$7,%ebp
-	subl	%ebp,%esi
-	andl	$4278124286,%edx
-	andl	$454761243,%esi
-	xorl	%ebx,%ecx
-	xorl	%esi,%edx
-	movl	$2155905152,%ebp
-	andl	%edx,%ebp
-	leal	(%edx,%edx,1),%eax
-	movl	%ebp,%esi
-	shrl	$7,%ebp
-	xorl	%ebx,%edx
-	subl	%ebp,%esi
-	andl	$4278124286,%eax
-	andl	$454761243,%esi
-	roll	$8,%ebx
-	xorl	%esi,%eax
-	movl	8(%edi),%ebp
-	xorl	%ecx,%ebx
-	xorl	%eax,%ecx
-	xorl	%edx,%ebx
-	roll	$24,%ecx
-	xorl	%eax,%edx
-	xorl	%eax,%ebx
-	roll	$16,%edx
-	xorl	%ecx,%ebx
-	roll	$8,%eax
-	xorl	%edx,%ebx
-	movl	%ebp,%ecx
-	xorl	%eax,%ebx
-	movl	%ebx,4(%edi)
-	movl	$2155905152,%ebp
-	andl	%ecx,%ebp
-	leal	(%ecx,%ecx,1),%edx
-	movl	%ebp,%esi
-	shrl	$7,%ebp
-	subl	%ebp,%esi
-	andl	$4278124286,%edx
-	andl	$454761243,%esi
-	xorl	%esi,%edx
-	movl	$2155905152,%ebp
-	andl	%edx,%ebp
-	leal	(%edx,%edx,1),%eax
-	movl	%ebp,%esi
-	shrl	$7,%ebp
-	subl	%ebp,%esi
-	andl	$4278124286,%eax
-	andl	$454761243,%esi
-	xorl	%ecx,%edx
-	xorl	%esi,%eax
-	movl	$2155905152,%ebp
-	andl	%eax,%ebp
-	leal	(%eax,%eax,1),%ebx
-	movl	%ebp,%esi
-	shrl	$7,%ebp
-	xorl	%ecx,%eax
-	subl	%ebp,%esi
-	andl	$4278124286,%ebx
-	andl	$454761243,%esi
-	roll	$8,%ecx
-	xorl	%esi,%ebx
-	movl	12(%edi),%ebp
-	xorl	%edx,%ecx
-	xorl	%ebx,%edx
-	xorl	%eax,%ecx
-	roll	$24,%edx
-	xorl	%ebx,%eax
-	xorl	%ebx,%ecx
-	roll	$16,%eax
-	xorl	%edx,%ecx
-	roll	$8,%ebx
-	xorl	%eax,%ecx
-	movl	%ebp,%edx
-	xorl	%ebx,%ecx
-	movl	%ecx,8(%edi)
-	movl	$2155905152,%ebp
-	andl	%edx,%ebp
-	leal	(%edx,%edx,1),%eax
-	movl	%ebp,%esi
-	shrl	$7,%ebp
-	subl	%ebp,%esi
-	andl	$4278124286,%eax
-	andl	$454761243,%esi
-	xorl	%esi,%eax
-	movl	$2155905152,%ebp
-	andl	%eax,%ebp
-	leal	(%eax,%eax,1),%ebx
-	movl	%ebp,%esi
-	shrl	$7,%ebp
-	subl	%ebp,%esi
-	andl	$4278124286,%ebx
-	andl	$454761243,%esi
-	xorl	%edx,%eax
-	xorl	%esi,%ebx
-	movl	$2155905152,%ebp
-	andl	%ebx,%ebp
-	leal	(%ebx,%ebx,1),%ecx
-	movl	%ebp,%esi
-	shrl	$7,%ebp
-	xorl	%edx,%ebx
-	subl	%ebp,%esi
-	andl	$4278124286,%ecx
-	andl	$454761243,%esi
-	roll	$8,%edx
-	xorl	%esi,%ecx
-	movl	16(%edi),%ebp
-	xorl	%eax,%edx
-	xorl	%ecx,%eax
-	xorl	%ebx,%edx
-	roll	$24,%eax
-	xorl	%ecx,%ebx
-	xorl	%ecx,%edx
-	roll	$16,%ebx
-	xorl	%eax,%edx
-	roll	$8,%ecx
-	xorl	%ebx,%edx
-	movl	%ebp,%eax
-	xorl	%ecx,%edx
-	movl	%edx,12(%edi)
-	cmpl	28(%esp),%edi
-	jb	.L056permute
-	xorl	%eax,%eax
-	popl	%edi
-	popl	%esi
-	popl	%ebx
-	popl	%ebp
-	ret
-.size	AES_set_decrypt_key,.-.L_AES_set_decrypt_key_begin
-.byte	65,69,83,32,102,111,114,32,120,56,54,44,32,67,82,89
-.byte	80,84,79,71,65,77,83,32,98,121,32,60,97,112,112,114
-.byte	111,64,111,112,101,110,115,115,108,46,111,114,103,62,0
-.comm	OPENSSL_ia32cap_P,16,4
diff --git a/deps/openssl/config/archs/solaris-x86-gcc/asm_avx2/crypto/buildinf.h b/deps/openssl/config/archs/solaris-x86-gcc/asm_avx2/crypto/buildinf.h
index 78995b8d82..98a2077093 100644
--- a/deps/openssl/config/archs/solaris-x86-gcc/asm_avx2/crypto/buildinf.h
+++ b/deps/openssl/config/archs/solaris-x86-gcc/asm_avx2/crypto/buildinf.h
@@ -11,7 +11,7 @@
  */
 
 #define PLATFORM "platform: solaris-x86-gcc"
-#define DATE "built on: Fri Sep 13 16:02:14 2019 UTC"
+#define DATE "built on: Wed Mar 18 21:09:53 2020 UTC"
 
 /*
  * Generate compiler_flags as an array of individual characters. This is a
@@ -38,10 +38,11 @@ static const char compiler_flags[] = {
     'S','H','A','2','5','6','_','A','S','M',' ','-','D','S','H','A',
     '5','1','2','_','A','S','M',' ','-','D','R','C','4','_','A','S',
     'M',' ','-','D','M','D','5','_','A','S','M',' ','-','D','R','M',
-    'D','1','6','0','_','A','S','M',' ','-','D','V','P','A','E','S',
-    '_','A','S','M',' ','-','D','W','H','I','R','L','P','O','O','L',
-    '_','A','S','M',' ','-','D','G','H','A','S','H','_','A','S','M',
-    ' ','-','D','E','C','P','_','N','I','S','T','Z','2','5','6','_',
-    'A','S','M',' ','-','D','P','O','L','Y','1','3','0','5','_','A',
-    'S','M',' ','-','D','N','D','E','B','U','G','\0'
+    'D','1','6','0','_','A','S','M',' ','-','D','A','E','S','N','I',
+    '_','A','S','M',' ','-','D','V','P','A','E','S','_','A','S','M',
+    ' ','-','D','W','H','I','R','L','P','O','O','L','_','A','S','M',
+    ' ','-','D','G','H','A','S','H','_','A','S','M',' ','-','D','E',
+    'C','P','_','N','I','S','T','Z','2','5','6','_','A','S','M',' ',
+    '-','D','P','O','L','Y','1','3','0','5','_','A','S','M',' ','-',
+    'D','N','D','E','B','U','G','\0'
 };
diff --git a/deps/openssl/config/archs/solaris-x86-gcc/asm_avx2/crypto/ec/ecp_nistz256-x86.s b/deps/openssl/config/archs/solaris-x86-gcc/asm_avx2/crypto/ec/ecp_nistz256-x86.s
index da9b3a7ee1..4cec24f4e2 100644
--- a/deps/openssl/config/archs/solaris-x86-gcc/asm_avx2/crypto/ec/ecp_nistz256-x86.s
+++ b/deps/openssl/config/archs/solaris-x86-gcc/asm_avx2/crypto/ec/ecp_nistz256-x86.s
@@ -4419,19 +4419,15 @@ ecp_nistz256_point_add:
 	orl	4(%edi),%eax
 	orl	8(%edi),%eax
 	orl	12(%edi),%eax
+	movl	576(%esp),%ebx
+	notl	%ebx
+	orl	%ebx,%eax
+	movl	580(%esp),%ebx
+	notl	%ebx
+	orl	%ebx,%eax
+	orl	584(%esp),%eax
 .byte	62
 	jnz	.L010add_proceed
-	movl	576(%esp),%eax
-	andl	580(%esp),%eax
-	movl	584(%esp),%ebx
-	jz	.L010add_proceed
-	testl	%ebx,%ebx
-	jz	.L011add_double
-	movl	616(%esp),%edi
-	xorl	%eax,%eax
-	movl	$24,%ecx
-.byte	252,243,171
-	jmp	.L012add_done
 .align	16
 .L011add_double:
 	movl	620(%esp),%esi
diff --git a/deps/openssl/config/archs/solaris-x86-gcc/asm_avx2/crypto/include/internal/bn_conf.h b/deps/openssl/config/archs/solaris-x86-gcc/asm_avx2/crypto/include/internal/bn_conf.h
index fb52156bd0..459055c96f 100644
--- a/deps/openssl/config/archs/solaris-x86-gcc/asm_avx2/crypto/include/internal/bn_conf.h
+++ b/deps/openssl/config/archs/solaris-x86-gcc/asm_avx2/crypto/include/internal/bn_conf.h
@@ -1,5 +1,5 @@
 /* WARNING: do not edit! */
-/* Generated by Makefile from crypto/include/internal/bn_conf.h.in */
+/* Generated by Makefile from include/crypto/bn_conf.h.in */
 /*
  * Copyright 2016 The OpenSSL Project Authors. All Rights Reserved.
  *
@@ -9,8 +9,8 @@
  * https://www.openssl.org/source/license.html
  */
 
-#ifndef HEADER_BN_CONF_H
-# define HEADER_BN_CONF_H
+#ifndef OSSL_CRYPTO_BN_CONF_H
+# define OSSL_CRYPTO_BN_CONF_H
 
 /*
  * The contents of this file are not used in the UEFI build, as
diff --git a/deps/openssl/config/archs/solaris-x86-gcc/asm_avx2/crypto/include/internal/dso_conf.h b/deps/openssl/config/archs/solaris-x86-gcc/asm_avx2/crypto/include/internal/dso_conf.h
index 252266ec2a..4b1167c3d8 100644
--- a/deps/openssl/config/archs/solaris-x86-gcc/asm_avx2/crypto/include/internal/dso_conf.h
+++ b/deps/openssl/config/archs/solaris-x86-gcc/asm_avx2/crypto/include/internal/dso_conf.h
@@ -1,5 +1,5 @@
 /* WARNING: do not edit! */
-/* Generated by Makefile from crypto/include/internal/dso_conf.h.in */
+/* Generated by Makefile from include/crypto/dso_conf.h.in */
 /*
  * Copyright 2016-2019 The OpenSSL Project Authors. All Rights Reserved.
  *
@@ -9,8 +9,8 @@
  * https://www.openssl.org/source/license.html
  */
 
-#ifndef HEADER_DSO_CONF_H
-# define HEADER_DSO_CONF_H
+#ifndef OSSL_CRYPTO_DSO_CONF_H
+# define OSSL_CRYPTO_DSO_CONF_H
 # define DSO_DLFCN
 # define HAVE_DLFCN_H
 # define DSO_EXTENSION ".so"
diff --git a/deps/openssl/config/archs/solaris-x86-gcc/asm_avx2/include/openssl/opensslconf.h b/deps/openssl/config/archs/solaris-x86-gcc/asm_avx2/include/openssl/opensslconf.h
index c43f227296..da0b080ce0 100644
--- a/deps/openssl/config/archs/solaris-x86-gcc/asm_avx2/include/openssl/opensslconf.h
+++ b/deps/openssl/config/archs/solaris-x86-gcc/asm_avx2/include/openssl/opensslconf.h
@@ -96,9 +96,6 @@ extern "C" {
 #ifndef OPENSSL_NO_DYNAMIC_ENGINE
 # define OPENSSL_NO_DYNAMIC_ENGINE
 #endif
-#ifndef OPENSSL_NO_AFALGENG
-# define OPENSSL_NO_AFALGENG
-#endif
 
 
 /*
diff --git a/deps/openssl/config/archs/solaris-x86-gcc/asm_avx2/include/progs.h b/deps/openssl/config/archs/solaris-x86-gcc/asm_avx2/include/progs.h
index 9b3d270e20..308c65601b 100644
--- a/deps/openssl/config/archs/solaris-x86-gcc/asm_avx2/include/progs.h
+++ b/deps/openssl/config/archs/solaris-x86-gcc/asm_avx2/include/progs.h
@@ -2,7 +2,7 @@
  * WARNING: do not edit!
  * Generated by apps/progs.pl
  *
- * Copyright 1995-2019 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 1995-2020 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
diff --git a/deps/openssl/config/archs/solaris-x86-gcc/asm_avx2/openssl-cl.gypi b/deps/openssl/config/archs/solaris-x86-gcc/asm_avx2/openssl-cl.gypi
index 3f5a755eeb..f9a78c541b 100644
--- a/deps/openssl/config/archs/solaris-x86-gcc/asm_avx2/openssl-cl.gypi
+++ b/deps/openssl/config/archs/solaris-x86-gcc/asm_avx2/openssl-cl.gypi
@@ -16,6 +16,7 @@
       'RC4_ASM',
       'MD5_ASM',
       'RMD160_ASM',
+      'AESNI_ASM',
       'VPAES_ASM',
       'WHIRLPOOL_ASM',
       'GHASH_ASM',
diff --git a/deps/openssl/config/archs/solaris-x86-gcc/asm_avx2/openssl.gypi b/deps/openssl/config/archs/solaris-x86-gcc/asm_avx2/openssl.gypi
index 2e4804695f..a154448014 100644
--- a/deps/openssl/config/archs/solaris-x86-gcc/asm_avx2/openssl.gypi
+++ b/deps/openssl/config/archs/solaris-x86-gcc/asm_avx2/openssl.gypi
@@ -713,6 +713,7 @@
       'RC4_ASM',
       'MD5_ASM',
       'RMD160_ASM',
+      'AESNI_ASM',
       'VPAES_ASM',
       'WHIRLPOOL_ASM',
       'GHASH_ASM',
diff --git a/deps/openssl/config/archs/solaris-x86-gcc/no-asm/configdata.pm b/deps/openssl/config/archs/solaris-x86-gcc/no-asm/configdata.pm
index b0d7b13f22..2bdfa61a08 100644
--- a/deps/openssl/config/archs/solaris-x86-gcc/no-asm/configdata.pm
+++ b/deps/openssl/config/archs/solaris-x86-gcc/no-asm/configdata.pm
@@ -54,7 +54,7 @@ our %config = (
   minor => "1.1",
   openssl_algorithm_defines => [ "OPENSSL_NO_COMP", "OPENSSL_NO_MD2", "OPENSSL_NO_RC5" ],
   openssl_api_defines => [  ],
-  openssl_other_defines => [ "OPENSSL_RAND_SEED_OS", "OPENSSL_NO_AFALGENG", "OPENSSL_NO_ASAN", "OPENSSL_NO_ASM", "OPENSSL_NO_CRYPTO_MDEBUG", "OPENSSL_NO_CRYPTO_MDEBUG_BACKTRACE", "OPENSSL_NO_DEVCRYPTOENG", "OPENSSL_NO_EC_NISTP_64_GCC_128", "OPENSSL_NO_EGD", "OPENSSL_NO_EXTERNAL_TESTS", "OPENSSL_NO_FUZZ_AFL", "OPENSSL_NO_FUZZ_LIBFUZZER", "OPENSSL_NO_HEARTBEATS", "OPENSSL_NO_MSAN", "OPENSSL_NO_SCTP", "OPENSSL_NO_SSL3", "OPENSSL_NO_SSL3_METHOD", "OPENSSL_NO_UBSAN", "OPENSSL_NO_UNIT_TEST", "OPENSSL_NO_WEAK_SSL_CIPHERS", "OPENSSL_NO_DYNAMIC_ENGINE", "OPENSSL_NO_AFALGENG" ],
+  openssl_other_defines => [ "OPENSSL_RAND_SEED_OS", "OPENSSL_NO_AFALGENG", "OPENSSL_NO_ASAN", "OPENSSL_NO_ASM", "OPENSSL_NO_CRYPTO_MDEBUG", "OPENSSL_NO_CRYPTO_MDEBUG_BACKTRACE", "OPENSSL_NO_DEVCRYPTOENG", "OPENSSL_NO_EC_NISTP_64_GCC_128", "OPENSSL_NO_EGD", "OPENSSL_NO_EXTERNAL_TESTS", "OPENSSL_NO_FUZZ_AFL", "OPENSSL_NO_FUZZ_LIBFUZZER", "OPENSSL_NO_HEARTBEATS", "OPENSSL_NO_MSAN", "OPENSSL_NO_SCTP", "OPENSSL_NO_SSL3", "OPENSSL_NO_SSL3_METHOD", "OPENSSL_NO_UBSAN", "OPENSSL_NO_UNIT_TEST", "OPENSSL_NO_WEAK_SSL_CIPHERS", "OPENSSL_NO_DYNAMIC_ENGINE" ],
   openssl_sys_defines => [  ],
   openssl_thread_defines => [ "OPENSSL_THREADS" ],
   openssldir => "",
@@ -110,8 +110,8 @@ our %config = (
   sourcedir => ".",
   target => "solaris-x86-gcc",
   tdirs => [ "ossl_shim" ],
-  version => "1.1.1d",
-  version_num => "0x1010104fL",
+  version => "1.1.1e",
+  version_num => "0x1010105fL",
 );
 
 our %target = (
@@ -232,6 +232,7 @@ our @disablables = (
   "dgram",
   "dh",
   "dsa",
+  "dso",
   "dtls",
   "dynamic-engine",
   "ec",
@@ -350,8 +351,8 @@ our %unified_info = (
         {
             "" =>
                 [
-                    "crypto/include/internal/bn_conf.h",
-                    "crypto/include/internal/dso_conf.h",
+                    "include/crypto/bn_conf.h",
+                    "include/crypto/dso_conf.h",
                     "include/openssl/opensslconf.h",
                 ],
             "apps/asn1pars.o" =>
@@ -619,14 +620,6 @@ our %unified_info = (
                     "crypto/perlasm/cbc.pl",
                     "crypto/perlasm/x86asm.pl",
                 ],
-            "crypto/include/internal/bn_conf.h" =>
-                [
-                    "configdata.pm",
-                ],
-            "crypto/include/internal/dso_conf.h" =>
-                [
-                    "configdata.pm",
-                ],
             "crypto/rc4/rc4-586.s" =>
                 [
                     "crypto/perlasm/x86asm.pl",
@@ -702,6 +695,14 @@ our %unified_info = (
                 [
                     "libcrypto",
                 ],
+            "include/crypto/bn_conf.h" =>
+                [
+                    "configdata.pm",
+                ],
+            "include/crypto/dso_conf.h" =>
+                [
+                    "configdata.pm",
+                ],
             "include/openssl/opensslconf.h" =>
                 [
                     "configdata.pm",
@@ -1499,6 +1500,12 @@ our %unified_info = (
                     "libcrypto",
                     "test/libtestutil.a",
                 ],
+            "test/ssl_ctx_test" =>
+                [
+                    "libcrypto",
+                    "libssl",
+                    "test/libtestutil.a",
+                ],
             "test/ssl_test" =>
                 [
                     "libcrypto",
@@ -3217,7 +3224,6 @@ our %unified_info = (
                             "test/testutil/cb.o",
                             "test/testutil/driver.o",
                             "test/testutil/format_output.o",
-                            "test/testutil/init.o",
                             "test/testutil/main.o",
                             "test/testutil/output_helpers.o",
                             "test/testutil/random.o",
@@ -3225,6 +3231,7 @@ our %unified_info = (
                             "test/testutil/tap_bio.o",
                             "test/testutil/test_cleanup.o",
                             "test/testutil/tests.o",
+                            "test/testutil/testutil_init.o",
                         ],
                     "products" =>
                         {
@@ -3723,14 +3730,6 @@ our %unified_info = (
                 [
                     "crypto/ia64cpuid.S",
                 ],
-            "crypto/include/internal/bn_conf.h" =>
-                [
-                    "crypto/include/internal/bn_conf.h.in",
-                ],
-            "crypto/include/internal/dso_conf.h" =>
-                [
-                    "crypto/include/internal/dso_conf.h.in",
-                ],
             "crypto/md5/md5-586.s" =>
                 [
                     "crypto/md5/asm/md5-586.pl",
@@ -4171,6 +4170,14 @@ our %unified_info = (
                     "engines/asm/e_padlock-x86_64.pl",
                     "\$(PERLASM_SCHEME)",
                 ],
+            "include/crypto/bn_conf.h" =>
+                [
+                    "include/crypto/bn_conf.h.in",
+                ],
+            "include/crypto/dso_conf.h" =>
+                [
+                    "include/crypto/dso_conf.h.in",
+                ],
             "include/openssl/opensslconf.h" =>
                 [
                     "include/openssl/opensslconf.h.in",
@@ -4865,49 +4872,41 @@ our %unified_info = (
             "crypto/aes/aes_cbc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/aes/aes_cfb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/aes/aes_core.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/aes/aes_ecb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/aes/aes_ige.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/aes/aes_misc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/aes/aes_ofb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/aes/aes_wrap.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/aes/aesfx-sparcv9.o" =>
@@ -4929,7 +4928,6 @@ our %unified_info = (
             "crypto/aria/aria.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/arm64cpuid.o" =>
@@ -4943,613 +4941,511 @@ our %unified_info = (
             "crypto/asn1/a_bitstr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_d2i_fp.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_digest.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_dup.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_gentm.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_i2d_fp.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_int.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_mbstr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_object.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_octet.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_print.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_sign.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_strex.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_strnid.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_time.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_type.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_utctm.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_utf8.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_verify.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/ameth_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/asn1_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/asn1_gen.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/asn1_item_list.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/asn1_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/asn1_par.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/asn_mime.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/asn_moid.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/asn_mstbl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/asn_pack.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/bio_asn1.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/bio_ndef.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/d2i_pr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/d2i_pu.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/evp_asn1.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/f_int.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/f_string.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/i2d_pr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/i2d_pu.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/n_pkey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/nsseq.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/p5_pbe.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/p5_pbev2.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/p5_scrypt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/p8_pkey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/t_bitst.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/t_pkey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/t_spki.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/tasn_dec.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/tasn_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/tasn_fre.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/tasn_new.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/tasn_prn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/tasn_scn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/tasn_typ.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/tasn_utl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/x_algor.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/x_bignum.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/x_info.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/x_int64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/x_long.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/x_pkey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/x_sig.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/x_spki.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/x_val.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/async/arch/async_null.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/async/arch/async_posix.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/async/arch/async_win.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/async/async.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/async/async_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/async/async_wait.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bf/bf_cfb64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bf/bf_ecb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bf/bf_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bf/bf_ofb64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bf/bf_skey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/b_addr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/b_dump.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/b_print.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/b_sock.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/b_sock2.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bf_buff.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bf_lbuf.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bf_nbio.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bf_null.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bio_cb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bio_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bio_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bio_meth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bss_acpt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bss_bio.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bss_conn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bss_dgram.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bss_fd.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bss_file.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bss_log.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bss_mem.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bss_null.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bss_sock.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/blake2/blake2b.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/blake2/blake2s.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/blake2/m_blake2b.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/blake2/m_blake2s.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/armv4-gf2m.o" =>
@@ -5567,188 +5463,157 @@ our %unified_info = (
             "crypto/bn/bn_add.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_asm.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_blind.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_const.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_ctx.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_depr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_dh.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_div.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_exp.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto",
                 ],
             "crypto/bn/bn_exp2.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_gcd.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_gf2m.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_intern.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_kron.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_mod.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_mont.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_mpi.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_mul.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_nist.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_prime.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_print.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_rand.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_recp.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_shift.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_sqr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_sqrt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_srp.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_word.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_x931p.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/mips-mont.o" =>
@@ -5778,13 +5643,11 @@ our %unified_info = (
             "crypto/buffer/buf_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/buffer/buffer.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/buildinf.h" =>
@@ -5794,43 +5657,36 @@ our %unified_info = (
             "crypto/camellia/camellia.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/camellia/cmll_cbc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/camellia/cmll_cfb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/camellia/cmll_ctr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/camellia/cmll_ecb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/camellia/cmll_misc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/camellia/cmll_ofb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/camellia/cmllt4-sparcv9.o" =>
@@ -5840,31 +5696,26 @@ our %unified_info = (
             "crypto/cast/c_cfb64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cast/c_ecb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cast/c_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cast/c_ofb64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cast/c_skey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/chacha/chacha-armv4.o" =>
@@ -5882,278 +5733,232 @@ our %unified_info = (
             "crypto/chacha/chacha_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cmac/cm_ameth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cmac/cm_pmeth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cmac/cmac.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_asn1.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_att.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_cd.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_dd.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_env.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_ess.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_io.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_kari.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_pwri.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_sd.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_smime.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/conf/conf_api.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/conf/conf_def.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/conf/conf_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/conf/conf_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/conf/conf_mall.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/conf/conf_mod.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/conf/conf_sap.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/conf/conf_ssl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cpt_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cryptlib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ct/ct_b64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ct/ct_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ct/ct_log.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ct/ct_oct.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ct/ct_policy.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ct/ct_prn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ct/ct_sct.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ct/ct_sct_ctx.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ct/ct_vfy.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ct/ct_x509v3.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ctype.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cversion.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto",
                 ],
             "crypto/des/cbc_cksm.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/cbc_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/cfb64ede.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/cfb64enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/cfb_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/des_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/dest4-sparcv9.o" =>
@@ -6163,301 +5968,251 @@ our %unified_info = (
             "crypto/des/ecb3_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/ecb_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/fcrypt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/fcrypt_b.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/ofb64ede.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/ofb64enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/ofb_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/pcbc_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/qud_cksm.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/rand_key.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/set_key.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/str2key.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/xcbc_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_ameth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_asn1.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_check.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_depr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_gen.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_kdf.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_key.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_meth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_pmeth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_prn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_rfc5114.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_rfc7919.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dsa/dsa_ameth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dsa/dsa_asn1.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dsa/dsa_depr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dsa/dsa_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dsa/dsa_gen.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dsa/dsa_key.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dsa/dsa_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dsa/dsa_meth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dsa/dsa_ossl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dsa/dsa_pmeth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dsa/dsa_prn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dsa/dsa_sign.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dsa/dsa_vrf.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dso/dso_dl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dso/dso_dlfcn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dso/dso_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dso/dso_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dso/dso_openssl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dso/dso_vms.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dso/dso_win32.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ebcdic.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/curve25519.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/curve448/arch_32/f_impl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto/ec/curve448/arch_32",
                     "crypto/ec/curve448",
@@ -6465,7 +6220,6 @@ our %unified_info = (
             "crypto/ec/curve448/curve448.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto/ec/curve448/arch_32",
                     "crypto/ec/curve448",
@@ -6473,7 +6227,6 @@ our %unified_info = (
             "crypto/ec/curve448/curve448_tables.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto/ec/curve448/arch_32",
                     "crypto/ec/curve448",
@@ -6481,7 +6234,6 @@ our %unified_info = (
             "crypto/ec/curve448/eddsa.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto/ec/curve448/arch_32",
                     "crypto/ec/curve448",
@@ -6489,7 +6241,6 @@ our %unified_info = (
             "crypto/ec/curve448/f_generic.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto/ec/curve448/arch_32",
                     "crypto/ec/curve448",
@@ -6497,7 +6248,6 @@ our %unified_info = (
             "crypto/ec/curve448/scalar.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto/ec/curve448/arch_32",
                     "crypto/ec/curve448",
@@ -6505,163 +6255,136 @@ our %unified_info = (
             "crypto/ec/ec2_oct.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec2_smpl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec_ameth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec_asn1.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec_check.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec_curve.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec_cvt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec_key.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec_kmeth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec_mult.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec_oct.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec_pmeth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec_print.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecdh_kdf.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecdh_ossl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecdsa_ossl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecdsa_sign.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecdsa_vrf.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/eck_prn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecp_mont.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecp_nist.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecp_nistp224.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecp_nistp256.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecp_nistp521.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecp_nistputil.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecp_nistz256-armv4.o" =>
@@ -6679,223 +6402,186 @@ our %unified_info = (
             "crypto/ec/ecp_oct.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecp_smpl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecx_meth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/eng_all.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/eng_cnf.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/eng_ctrl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/eng_dyn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/eng_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/eng_fat.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/eng_init.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/eng_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/eng_list.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/eng_openssl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/eng_pkey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/eng_rdrand.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/eng_table.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/tb_asnmth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/tb_cipher.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/tb_dh.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/tb_digest.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/tb_dsa.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/tb_eckey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/tb_pkmeth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/tb_rand.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/tb_rsa.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/err/err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/err/err_all.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/err/err_prn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/bio_b64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/bio_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/bio_md.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/bio_ok.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/c_allc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/c_alld.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/cmeth_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/digest.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/e_aes.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto",
                     "crypto/modes",
@@ -6903,21 +6589,18 @@ our %unified_info = (
             "crypto/evp/e_aes_cbc_hmac_sha1.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto/modes",
                 ],
             "crypto/evp/e_aes_cbc_hmac_sha256.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto/modes",
                 ],
             "crypto/evp/e_aria.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto",
                     "crypto/modes",
@@ -6925,13 +6608,11 @@ our %unified_info = (
             "crypto/evp/e_bf.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/e_camellia.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto",
                     "crypto/modes",
@@ -6939,81 +6620,68 @@ our %unified_info = (
             "crypto/evp/e_cast.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/e_chacha20_poly1305.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/e_des.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto",
                 ],
             "crypto/evp/e_des3.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto",
                 ],
             "crypto/evp/e_idea.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/e_null.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/e_old.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/e_rc2.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/e_rc4.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/e_rc4_hmac_md5.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/e_rc5.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/e_seed.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/e_sm4.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto",
                     "crypto/modes",
@@ -7021,328 +6689,267 @@ our %unified_info = (
             "crypto/evp/e_xcbc_d.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/encode.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/evp_cnf.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/evp_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/evp_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/evp_key.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/evp_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/evp_pbe.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/evp_pkey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/m_md2.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/m_md4.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/m_md5.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/m_md5_sha1.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/m_mdc2.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/m_null.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/m_ripemd.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/m_sha1.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/m_sha3.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto",
                 ],
             "crypto/evp/m_sigver.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/m_wp.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/names.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/p5_crpt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/p5_crpt2.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/p_dec.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/p_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/p_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/p_open.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/p_seal.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/p_sign.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/p_verify.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/pbe_scrypt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/pmeth_fn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/pmeth_gn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/pmeth_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ex_data.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/getenv.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/hmac/hm_ameth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/hmac/hm_pmeth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/hmac/hmac.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/idea/i_cbc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/idea/i_cfb64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/idea/i_ecb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/idea/i_ofb64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/idea/i_skey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
-            "crypto/include/internal/bn_conf.h" =>
-                [
-                    ".",
-                ],
-            "crypto/include/internal/dso_conf.h" =>
-                [
-                    ".",
-                ],
             "crypto/init.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/kdf/hkdf.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/kdf/kdf_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/kdf/scrypt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/kdf/tls1_prf.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/lhash/lh_stats.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/lhash/lhash.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/md4/md4_dgst.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/md4/md4_one.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/md5/md5-sparcv9.o" =>
@@ -7352,85 +6959,71 @@ our %unified_info = (
             "crypto/md5/md5_dgst.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/md5/md5_one.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/mdc2/mdc2_one.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/mdc2/mdc2dgst.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/mem.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/mem_clr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/mem_dbg.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/mem_sec.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/modes/cbc128.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/modes/ccm128.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/modes/cfb128.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/modes/ctr128.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/modes/cts128.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/modes/gcm128.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto",
                 ],
@@ -7453,361 +7046,301 @@ our %unified_info = (
             "crypto/modes/ocb128.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/modes/ofb128.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/modes/wrap128.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/modes/xts128.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/o_dir.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/o_fips.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/o_fopen.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/o_init.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/o_str.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/o_time.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/objects/o_names.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/objects/obj_dat.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/objects/obj_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/objects/obj_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/objects/obj_xref.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ocsp/ocsp_asn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ocsp/ocsp_cl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ocsp/ocsp_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ocsp/ocsp_ext.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ocsp/ocsp_ht.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ocsp/ocsp_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ocsp/ocsp_prn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ocsp/ocsp_srv.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ocsp/ocsp_vfy.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ocsp/v3_ocsp.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pem/pem_all.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pem/pem_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pem/pem_info.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pem/pem_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pem/pem_oth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pem/pem_pk8.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pem/pem_pkey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pem/pem_sign.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pem/pem_x509.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pem/pem_xaux.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pem/pvkfmt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_add.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_asn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_attr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_crpt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_crt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_decr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_init.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_key.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_kiss.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_mutl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_npas.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_p8d.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_p8e.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_sbag.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_utl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/pk12err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs7/bio_pk7.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs7/pk7_asn1.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs7/pk7_attr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs7/pk7_doit.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs7/pk7_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs7/pk7_mime.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs7/pk7_smime.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs7/pkcs7err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/poly1305/poly1305-armv4.o" =>
@@ -7829,259 +7362,216 @@ our %unified_info = (
             "crypto/poly1305/poly1305.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/poly1305/poly1305_ameth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/poly1305/poly1305_pmeth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rand/drbg_ctr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rand/drbg_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rand/rand_egd.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rand/rand_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rand/rand_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rand/rand_unix.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rand/rand_vms.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rand/rand_win.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rand/randfile.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rc2/rc2_cbc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rc2/rc2_ecb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rc2/rc2_skey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rc2/rc2cfb64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rc2/rc2ofb64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rc4/rc4_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rc4/rc4_skey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ripemd/rmd_dgst.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ripemd/rmd_one.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_ameth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_asn1.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_chk.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_crpt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_depr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_gen.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_meth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_mp.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_none.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_oaep.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_ossl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_pk1.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_pmeth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_prn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_pss.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_saos.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_sign.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_ssl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_x931.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_x931g.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/s390xcpuid.o" =>
@@ -8091,31 +7581,26 @@ our %unified_info = (
             "crypto/seed/seed.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/seed/seed_cbc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/seed/seed_cfb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/seed/seed_ecb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/seed/seed_ofb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sha/keccak1600-armv4.o" =>
@@ -8125,7 +7610,6 @@ our %unified_info = (
             "crypto/sha/keccak1600.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sha/sha1-armv4-large.o" =>
@@ -8151,13 +7635,11 @@ our %unified_info = (
             "crypto/sha/sha1_one.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sha/sha1dgst.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sha/sha256-armv4.o" =>
@@ -8183,7 +7665,6 @@ our %unified_info = (
             "crypto/sha/sha256.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sha/sha512-armv4.o" =>
@@ -8209,709 +7690,591 @@ our %unified_info = (
             "crypto/sha/sha512.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/siphash/siphash.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/siphash/siphash_ameth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/siphash/siphash_pmeth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sm2/sm2_crypt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sm2/sm2_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sm2/sm2_pmeth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sm2/sm2_sign.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sm3/m_sm3.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sm3/sm3.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sm4/sm4.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/srp/srp_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/srp/srp_vfy.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/stack/stack.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/store/loader_file.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/store/store_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/store/store_init.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/store/store_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/store/store_register.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/store/store_strings.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/threads_none.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/threads_pthread.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/threads_win.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ts/ts_asn1.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ts/ts_conf.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ts/ts_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ts/ts_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ts/ts_req_print.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ts/ts_req_utils.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ts/ts_rsp_print.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ts/ts_rsp_sign.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ts/ts_rsp_utils.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ts/ts_rsp_verify.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ts/ts_verify_ctx.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/txt_db/txt_db.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ui/ui_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ui/ui_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ui/ui_null.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ui/ui_openssl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ui/ui_util.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/uid.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/whrlpool/wp_block.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/whrlpool/wp_dgst.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/by_dir.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/by_file.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/t_crl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/t_req.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/t_x509.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_att.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_cmp.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_d2.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_def.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_ext.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_lu.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_meth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_obj.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_r2x.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_req.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_set.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_trs.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_txt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_v3.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_vfy.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_vpm.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509cset.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509name.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509rset.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509spki.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509type.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x_all.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x_attrib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x_crl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x_exten.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x_name.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x_pubkey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x_req.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x_x509.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x_x509a.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/pcy_cache.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/pcy_data.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/pcy_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/pcy_map.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/pcy_node.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/pcy_tree.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_addr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_admis.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_akey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_akeya.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_alt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_asid.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_bcons.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_bitst.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_conf.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_cpols.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_crld.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_enum.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_extku.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_genn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_ia5.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_info.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_int.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_ncons.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_pci.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_pcia.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_pcons.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_pku.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_pmaps.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_prn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_purp.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_skey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_sxnet.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_tlsf.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_utl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "engines/e_capi.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "engines/e_padlock.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "fuzz/asn1.o" =>
@@ -8962,6 +8325,14 @@ our %unified_info = (
                 [
                     "include",
                 ],
+            "include/crypto/bn_conf.h" =>
+                [
+                    ".",
+                ],
+            "include/crypto/dso_conf.h" =>
+                [
+                    ".",
+                ],
             "include/openssl/opensslconf.h" =>
                 [
                     ".",
@@ -9206,7 +8577,6 @@ our %unified_info = (
                 [
                     ".",
                     "include",
-                    "crypto/include",
                 ],
             "test/asn1_string_table_test.o" =>
                 [
@@ -9532,7 +8902,6 @@ our %unified_info = (
                 [
                     ".",
                     "include",
-                    "crypto/include",
                 ],
             "test/cipher_overhead_test.o" =>
                 [
@@ -9578,7 +8947,6 @@ our %unified_info = (
             "test/ctype_internal_test.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "test/curve448_internal_test.o" =>
@@ -9644,7 +9012,6 @@ our %unified_info = (
                 [
                     "include",
                     "crypto/ec",
-                    "crypto/include",
                 ],
             "test/ecdsatest.o" =>
                 [
@@ -9669,7 +9036,6 @@ our %unified_info = (
             "test/evp_extra_test.o" =>
                 [
                     "include",
-                    "crypto/include",
                 ],
             "test/evp_test.o" =>
                 [
@@ -9767,7 +9133,6 @@ our %unified_info = (
                 [
                     ".",
                     "include",
-                    "crypto/include",
                 ],
             "test/rc2test.o" =>
                 [
@@ -9817,18 +9182,15 @@ our %unified_info = (
                 [
                     ".",
                     "include",
-                    "crypto/include",
                 ],
             "test/sm2_internal_test.o" =>
                 [
                     "include",
-                    "crypto/include",
                 ],
             "test/sm4_internal_test.o" =>
                 [
                     ".",
                     "include",
-                    "crypto/include",
                 ],
             "test/srptest.o" =>
                 [
@@ -9839,6 +9201,10 @@ our %unified_info = (
                     ".",
                     "include",
                 ],
+            "test/ssl_ctx_test.o" =>
+                [
+                    "include",
+                ],
             "test/ssl_test.o" =>
                 [
                     "include",
@@ -9902,10 +9268,6 @@ our %unified_info = (
                 [
                     "include",
                 ],
-            "test/testutil/init.o" =>
-                [
-                    "include",
-                ],
             "test/testutil/main.o" =>
                 [
                     "include",
@@ -9934,6 +9296,10 @@ our %unified_info = (
                 [
                     "include",
                 ],
+            "test/testutil/testutil_init.o" =>
+                [
+                    "include",
+                ],
             "test/threadstest.o" =>
                 [
                     "include",
@@ -10198,6 +9564,7 @@ our %unified_info = (
             "test/sm4_internal_test",
             "test/srptest",
             "test/ssl_cert_table_internal_test",
+            "test/ssl_ctx_test",
             "test/ssl_test",
             "test/ssl_test_ctx_test",
             "test/sslapitest",
@@ -15088,7 +14455,6 @@ our %unified_info = (
                     "test/testutil/cb.o",
                     "test/testutil/driver.o",
                     "test/testutil/format_output.o",
-                    "test/testutil/init.o",
                     "test/testutil/main.o",
                     "test/testutil/output_helpers.o",
                     "test/testutil/random.o",
@@ -15096,6 +14462,7 @@ our %unified_info = (
                     "test/testutil/tap_bio.o",
                     "test/testutil/test_cleanup.o",
                     "test/testutil/tests.o",
+                    "test/testutil/testutil_init.o",
                 ],
             "test/md2test" =>
                 [
@@ -15323,6 +14690,14 @@ our %unified_info = (
                 [
                     "test/ssl_cert_table_internal_test.c",
                 ],
+            "test/ssl_ctx_test" =>
+                [
+                    "test/ssl_ctx_test.o",
+                ],
+            "test/ssl_ctx_test.o" =>
+                [
+                    "test/ssl_ctx_test.c",
+                ],
             "test/ssl_test" =>
                 [
                     "test/handshake_helper.o",
@@ -15425,10 +14800,6 @@ our %unified_info = (
                 [
                     "test/testutil/format_output.c",
                 ],
-            "test/testutil/init.o" =>
-                [
-                    "test/testutil/init.c",
-                ],
             "test/testutil/main.o" =>
                 [
                     "test/testutil/main.c",
@@ -15457,6 +14828,10 @@ our %unified_info = (
                 [
                     "test/testutil/tests.c",
                 ],
+            "test/testutil/testutil_init.o" =>
+                [
+                    "test/testutil/testutil_init.c",
+                ],
             "test/threadstest" =>
                 [
                     "test/threadstest.o",
diff --git a/deps/openssl/config/archs/solaris-x86-gcc/no-asm/crypto/buildinf.h b/deps/openssl/config/archs/solaris-x86-gcc/no-asm/crypto/buildinf.h
index e606a3cd75..0418a6f8ba 100644
--- a/deps/openssl/config/archs/solaris-x86-gcc/no-asm/crypto/buildinf.h
+++ b/deps/openssl/config/archs/solaris-x86-gcc/no-asm/crypto/buildinf.h
@@ -11,7 +11,7 @@
  */
 
 #define PLATFORM "platform: solaris-x86-gcc"
-#define DATE "built on: Fri Sep 13 16:02:21 2019 UTC"
+#define DATE "built on: Wed Mar 18 21:09:57 2020 UTC"
 
 /*
  * Generate compiler_flags as an array of individual characters. This is a
diff --git a/deps/openssl/config/archs/solaris-x86-gcc/no-asm/crypto/include/internal/bn_conf.h b/deps/openssl/config/archs/solaris-x86-gcc/no-asm/crypto/include/internal/bn_conf.h
index fb52156bd0..459055c96f 100644
--- a/deps/openssl/config/archs/solaris-x86-gcc/no-asm/crypto/include/internal/bn_conf.h
+++ b/deps/openssl/config/archs/solaris-x86-gcc/no-asm/crypto/include/internal/bn_conf.h
@@ -1,5 +1,5 @@
 /* WARNING: do not edit! */
-/* Generated by Makefile from crypto/include/internal/bn_conf.h.in */
+/* Generated by Makefile from include/crypto/bn_conf.h.in */
 /*
  * Copyright 2016 The OpenSSL Project Authors. All Rights Reserved.
  *
@@ -9,8 +9,8 @@
  * https://www.openssl.org/source/license.html
  */
 
-#ifndef HEADER_BN_CONF_H
-# define HEADER_BN_CONF_H
+#ifndef OSSL_CRYPTO_BN_CONF_H
+# define OSSL_CRYPTO_BN_CONF_H
 
 /*
  * The contents of this file are not used in the UEFI build, as
diff --git a/deps/openssl/config/archs/solaris-x86-gcc/no-asm/crypto/include/internal/dso_conf.h b/deps/openssl/config/archs/solaris-x86-gcc/no-asm/crypto/include/internal/dso_conf.h
index 252266ec2a..4b1167c3d8 100644
--- a/deps/openssl/config/archs/solaris-x86-gcc/no-asm/crypto/include/internal/dso_conf.h
+++ b/deps/openssl/config/archs/solaris-x86-gcc/no-asm/crypto/include/internal/dso_conf.h
@@ -1,5 +1,5 @@
 /* WARNING: do not edit! */
-/* Generated by Makefile from crypto/include/internal/dso_conf.h.in */
+/* Generated by Makefile from include/crypto/dso_conf.h.in */
 /*
  * Copyright 2016-2019 The OpenSSL Project Authors. All Rights Reserved.
  *
@@ -9,8 +9,8 @@
  * https://www.openssl.org/source/license.html
  */
 
-#ifndef HEADER_DSO_CONF_H
-# define HEADER_DSO_CONF_H
+#ifndef OSSL_CRYPTO_DSO_CONF_H
+# define OSSL_CRYPTO_DSO_CONF_H
 # define DSO_DLFCN
 # define HAVE_DLFCN_H
 # define DSO_EXTENSION ".so"
diff --git a/deps/openssl/config/archs/solaris-x86-gcc/no-asm/include/openssl/opensslconf.h b/deps/openssl/config/archs/solaris-x86-gcc/no-asm/include/openssl/opensslconf.h
index f1f7572f38..6db191cd5c 100644
--- a/deps/openssl/config/archs/solaris-x86-gcc/no-asm/include/openssl/opensslconf.h
+++ b/deps/openssl/config/archs/solaris-x86-gcc/no-asm/include/openssl/opensslconf.h
@@ -99,9 +99,6 @@ extern "C" {
 #ifndef OPENSSL_NO_DYNAMIC_ENGINE
 # define OPENSSL_NO_DYNAMIC_ENGINE
 #endif
-#ifndef OPENSSL_NO_AFALGENG
-# define OPENSSL_NO_AFALGENG
-#endif
 
 
 /*
diff --git a/deps/openssl/config/archs/solaris-x86-gcc/no-asm/include/progs.h b/deps/openssl/config/archs/solaris-x86-gcc/no-asm/include/progs.h
index 9b3d270e20..308c65601b 100644
--- a/deps/openssl/config/archs/solaris-x86-gcc/no-asm/include/progs.h
+++ b/deps/openssl/config/archs/solaris-x86-gcc/no-asm/include/progs.h
@@ -2,7 +2,7 @@
  * WARNING: do not edit!
  * Generated by apps/progs.pl
  *
- * Copyright 1995-2019 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 1995-2020 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
diff --git a/deps/openssl/config/archs/solaris64-x86_64-gcc/asm/configdata.pm b/deps/openssl/config/archs/solaris64-x86_64-gcc/asm/configdata.pm
index d651ee1e5f..499dac2321 100644
--- a/deps/openssl/config/archs/solaris64-x86_64-gcc/asm/configdata.pm
+++ b/deps/openssl/config/archs/solaris64-x86_64-gcc/asm/configdata.pm
@@ -48,14 +48,14 @@ our %config = (
   export_var_as_fn => "0",
   includes => [  ],
   lflags => [  ],
-  lib_defines => [ "OPENSSL_PIC", "OPENSSL_CPUID_OBJ", "OPENSSL_IA32_SSE2", "OPENSSL_BN_ASM_MONT", "OPENSSL_BN_ASM_MONT5", "OPENSSL_BN_ASM_GF2m", "SHA1_ASM", "SHA256_ASM", "SHA512_ASM", "KECCAK1600_ASM", "RC4_ASM", "MD5_ASM", "VPAES_ASM", "GHASH_ASM", "ECP_NISTZ256_ASM", "X25519_ASM", "POLY1305_ASM" ],
+  lib_defines => [ "OPENSSL_PIC", "OPENSSL_CPUID_OBJ", "OPENSSL_IA32_SSE2", "OPENSSL_BN_ASM_MONT", "OPENSSL_BN_ASM_MONT5", "OPENSSL_BN_ASM_GF2m", "SHA1_ASM", "SHA256_ASM", "SHA512_ASM", "KECCAK1600_ASM", "RC4_ASM", "MD5_ASM", "AESNI_ASM", "VPAES_ASM", "GHASH_ASM", "ECP_NISTZ256_ASM", "X25519_ASM", "POLY1305_ASM" ],
   libdir => "",
   major => "1",
   makedepprog => "\$(CROSS_COMPILE)gcc",
   minor => "1.1",
   openssl_algorithm_defines => [ "OPENSSL_NO_COMP", "OPENSSL_NO_MD2", "OPENSSL_NO_RC5" ],
   openssl_api_defines => [  ],
-  openssl_other_defines => [ "OPENSSL_RAND_SEED_OS", "OPENSSL_NO_AFALGENG", "OPENSSL_NO_ASAN", "OPENSSL_NO_CRYPTO_MDEBUG", "OPENSSL_NO_CRYPTO_MDEBUG_BACKTRACE", "OPENSSL_NO_DEVCRYPTOENG", "OPENSSL_NO_EC_NISTP_64_GCC_128", "OPENSSL_NO_EGD", "OPENSSL_NO_EXTERNAL_TESTS", "OPENSSL_NO_FUZZ_AFL", "OPENSSL_NO_FUZZ_LIBFUZZER", "OPENSSL_NO_HEARTBEATS", "OPENSSL_NO_MSAN", "OPENSSL_NO_SCTP", "OPENSSL_NO_SSL3", "OPENSSL_NO_SSL3_METHOD", "OPENSSL_NO_UBSAN", "OPENSSL_NO_UNIT_TEST", "OPENSSL_NO_WEAK_SSL_CIPHERS", "OPENSSL_NO_DYNAMIC_ENGINE", "OPENSSL_NO_AFALGENG" ],
+  openssl_other_defines => [ "OPENSSL_RAND_SEED_OS", "OPENSSL_NO_AFALGENG", "OPENSSL_NO_ASAN", "OPENSSL_NO_CRYPTO_MDEBUG", "OPENSSL_NO_CRYPTO_MDEBUG_BACKTRACE", "OPENSSL_NO_DEVCRYPTOENG", "OPENSSL_NO_EC_NISTP_64_GCC_128", "OPENSSL_NO_EGD", "OPENSSL_NO_EXTERNAL_TESTS", "OPENSSL_NO_FUZZ_AFL", "OPENSSL_NO_FUZZ_LIBFUZZER", "OPENSSL_NO_HEARTBEATS", "OPENSSL_NO_MSAN", "OPENSSL_NO_SCTP", "OPENSSL_NO_SSL3", "OPENSSL_NO_SSL3_METHOD", "OPENSSL_NO_UBSAN", "OPENSSL_NO_UNIT_TEST", "OPENSSL_NO_WEAK_SSL_CIPHERS", "OPENSSL_NO_DYNAMIC_ENGINE" ],
   openssl_sys_defines => [  ],
   openssl_thread_defines => [ "OPENSSL_THREADS" ],
   openssldir => "",
@@ -111,8 +111,8 @@ our %config = (
   sourcedir => ".",
   target => "solaris64-x86_64-gcc",
   tdirs => [ "ossl_shim" ],
-  version => "1.1.1d",
-  version_num => "0x1010104fL",
+  version => "1.1.1e",
+  version_num => "0x1010105fL",
 );
 
 our %target = (
@@ -237,6 +237,7 @@ our @disablables = (
   "dgram",
   "dh",
   "dsa",
+  "dso",
   "dtls",
   "dynamic-engine",
   "ec",
@@ -354,8 +355,8 @@ our %unified_info = (
         {
             "" =>
                 [
-                    "crypto/include/internal/bn_conf.h",
-                    "crypto/include/internal/dso_conf.h",
+                    "include/crypto/bn_conf.h",
+                    "include/crypto/dso_conf.h",
                     "include/openssl/opensslconf.h",
                 ],
             "apps/asn1pars.o" =>
@@ -623,14 +624,6 @@ our %unified_info = (
                     "crypto/perlasm/cbc.pl",
                     "crypto/perlasm/x86asm.pl",
                 ],
-            "crypto/include/internal/bn_conf.h" =>
-                [
-                    "configdata.pm",
-                ],
-            "crypto/include/internal/dso_conf.h" =>
-                [
-                    "configdata.pm",
-                ],
             "crypto/rc4/rc4-586.s" =>
                 [
                     "crypto/perlasm/x86asm.pl",
@@ -706,6 +699,14 @@ our %unified_info = (
                 [
                     "libcrypto",
                 ],
+            "include/crypto/bn_conf.h" =>
+                [
+                    "configdata.pm",
+                ],
+            "include/crypto/dso_conf.h" =>
+                [
+                    "configdata.pm",
+                ],
             "include/openssl/opensslconf.h" =>
                 [
                     "configdata.pm",
@@ -1503,6 +1504,12 @@ our %unified_info = (
                     "libcrypto",
                     "test/libtestutil.a",
                 ],
+            "test/ssl_ctx_test" =>
+                [
+                    "libcrypto",
+                    "libssl",
+                    "test/libtestutil.a",
+                ],
             "test/ssl_test" =>
                 [
                     "libcrypto",
@@ -3257,7 +3264,6 @@ our %unified_info = (
                             "test/testutil/cb.o",
                             "test/testutil/driver.o",
                             "test/testutil/format_output.o",
-                            "test/testutil/init.o",
                             "test/testutil/main.o",
                             "test/testutil/output_helpers.o",
                             "test/testutil/random.o",
@@ -3265,6 +3271,7 @@ our %unified_info = (
                             "test/testutil/tap_bio.o",
                             "test/testutil/test_cleanup.o",
                             "test/testutil/tests.o",
+                            "test/testutil/testutil_init.o",
                         ],
                     "products" =>
                         {
@@ -3763,14 +3770,6 @@ our %unified_info = (
                 [
                     "crypto/ia64cpuid.S",
                 ],
-            "crypto/include/internal/bn_conf.h" =>
-                [
-                    "crypto/include/internal/bn_conf.h.in",
-                ],
-            "crypto/include/internal/dso_conf.h" =>
-                [
-                    "crypto/include/internal/dso_conf.h.in",
-                ],
             "crypto/md5/md5-586.s" =>
                 [
                     "crypto/md5/asm/md5-586.pl",
@@ -4211,6 +4210,14 @@ our %unified_info = (
                     "engines/asm/e_padlock-x86_64.pl",
                     "\$(PERLASM_SCHEME)",
                 ],
+            "include/crypto/bn_conf.h" =>
+                [
+                    "include/crypto/bn_conf.h.in",
+                ],
+            "include/crypto/dso_conf.h" =>
+                [
+                    "include/crypto/dso_conf.h.in",
+                ],
             "include/openssl/opensslconf.h" =>
                 [
                     "include/openssl/opensslconf.h.in",
@@ -4905,49 +4912,41 @@ our %unified_info = (
             "crypto/aes/aes_cbc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/aes/aes_cfb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/aes/aes_core.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/aes/aes_ecb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/aes/aes_ige.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/aes/aes_misc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/aes/aes_ofb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/aes/aes_wrap.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/aes/aesfx-sparcv9.o" =>
@@ -4957,25 +4956,21 @@ our %unified_info = (
             "crypto/aes/aesni-mb-x86_64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/aes/aesni-sha1-x86_64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/aes/aesni-sha256-x86_64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/aes/aesni-x86_64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/aes/aest4-sparcv9.o" =>
@@ -4993,13 +4988,11 @@ our %unified_info = (
             "crypto/aes/vpaes-x86_64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/aria/aria.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/arm64cpuid.o" =>
@@ -5013,613 +5006,511 @@ our %unified_info = (
             "crypto/asn1/a_bitstr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_d2i_fp.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_digest.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_dup.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_gentm.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_i2d_fp.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_int.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_mbstr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_object.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_octet.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_print.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_sign.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_strex.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_strnid.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_time.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_type.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_utctm.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_utf8.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_verify.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/ameth_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/asn1_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/asn1_gen.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/asn1_item_list.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/asn1_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/asn1_par.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/asn_mime.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/asn_moid.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/asn_mstbl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/asn_pack.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/bio_asn1.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/bio_ndef.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/d2i_pr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/d2i_pu.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/evp_asn1.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/f_int.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/f_string.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/i2d_pr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/i2d_pu.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/n_pkey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/nsseq.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/p5_pbe.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/p5_pbev2.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/p5_scrypt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/p8_pkey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/t_bitst.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/t_pkey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/t_spki.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/tasn_dec.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/tasn_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/tasn_fre.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/tasn_new.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/tasn_prn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/tasn_scn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/tasn_typ.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/tasn_utl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/x_algor.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/x_bignum.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/x_info.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/x_int64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/x_long.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/x_pkey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/x_sig.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/x_spki.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/x_val.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/async/arch/async_null.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/async/arch/async_posix.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/async/arch/async_win.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/async/async.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/async/async_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/async/async_wait.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bf/bf_cfb64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bf/bf_ecb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bf/bf_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bf/bf_ofb64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bf/bf_skey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/b_addr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/b_dump.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/b_print.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/b_sock.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/b_sock2.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bf_buff.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bf_lbuf.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bf_nbio.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bf_null.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bio_cb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bio_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bio_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bio_meth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bss_acpt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bss_bio.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bss_conn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bss_dgram.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bss_fd.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bss_file.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bss_log.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bss_mem.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bss_null.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bss_sock.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/blake2/blake2b.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/blake2/blake2s.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/blake2/m_blake2b.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/blake2/m_blake2s.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/armv4-gf2m.o" =>
@@ -5633,7 +5524,6 @@ our %unified_info = (
             "crypto/bn/asm/x86_64-gcc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn-mips.o" =>
@@ -5643,182 +5533,152 @@ our %unified_info = (
             "crypto/bn/bn_add.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_blind.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_const.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_ctx.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_depr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_dh.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_div.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_exp.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto",
                 ],
             "crypto/bn/bn_exp2.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_gcd.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_gf2m.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_intern.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_kron.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_mod.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_mont.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_mpi.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_mul.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_nist.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_prime.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_print.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_rand.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_recp.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_shift.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_sqr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_sqrt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_srp.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_word.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_x931p.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/mips-mont.o" =>
@@ -5828,19 +5688,16 @@ our %unified_info = (
             "crypto/bn/rsaz-avx2.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/rsaz-x86_64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/rsaz_exp.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/sparct4-mont.o" =>
@@ -5866,31 +5723,26 @@ our %unified_info = (
             "crypto/bn/x86_64-gf2m.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/x86_64-mont.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/x86_64-mont5.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/buffer/buf_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/buffer/buffer.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/buildinf.h" =>
@@ -5900,37 +5752,31 @@ our %unified_info = (
             "crypto/camellia/cmll-x86_64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/camellia/cmll_cfb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/camellia/cmll_ctr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/camellia/cmll_ecb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/camellia/cmll_misc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/camellia/cmll_ofb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/camellia/cmllt4-sparcv9.o" =>
@@ -5940,31 +5786,26 @@ our %unified_info = (
             "crypto/cast/c_cfb64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cast/c_ecb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cast/c_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cast/c_ofb64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cast/c_skey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/chacha/chacha-armv4.o" =>
@@ -5982,278 +5823,232 @@ our %unified_info = (
             "crypto/chacha/chacha-x86_64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cmac/cm_ameth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cmac/cm_pmeth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cmac/cmac.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_asn1.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_att.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_cd.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_dd.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_env.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_ess.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_io.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_kari.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_pwri.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_sd.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_smime.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/conf/conf_api.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/conf/conf_def.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/conf/conf_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/conf/conf_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/conf/conf_mall.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/conf/conf_mod.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/conf/conf_sap.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/conf/conf_ssl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cpt_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cryptlib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ct/ct_b64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ct/ct_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ct/ct_log.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ct/ct_oct.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ct/ct_policy.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ct/ct_prn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ct/ct_sct.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ct/ct_sct_ctx.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ct/ct_vfy.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ct/ct_x509v3.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ctype.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cversion.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto",
                 ],
             "crypto/des/cbc_cksm.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/cbc_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/cfb64ede.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/cfb64enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/cfb_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/des_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/dest4-sparcv9.o" =>
@@ -6263,301 +6058,251 @@ our %unified_info = (
             "crypto/des/ecb3_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/ecb_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/fcrypt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/fcrypt_b.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/ofb64ede.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/ofb64enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/ofb_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/pcbc_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/qud_cksm.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/rand_key.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/set_key.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/str2key.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/xcbc_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_ameth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_asn1.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_check.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_depr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_gen.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_kdf.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_key.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_meth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_pmeth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_prn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_rfc5114.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_rfc7919.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dsa/dsa_ameth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dsa/dsa_asn1.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dsa/dsa_depr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dsa/dsa_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dsa/dsa_gen.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dsa/dsa_key.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dsa/dsa_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dsa/dsa_meth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dsa/dsa_ossl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dsa/dsa_pmeth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dsa/dsa_prn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dsa/dsa_sign.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dsa/dsa_vrf.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dso/dso_dl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dso/dso_dlfcn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dso/dso_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dso/dso_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dso/dso_openssl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dso/dso_vms.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dso/dso_win32.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ebcdic.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/curve25519.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/curve448/arch_32/f_impl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto/ec/curve448/arch_32",
                     "crypto/ec/curve448",
@@ -6565,7 +6310,6 @@ our %unified_info = (
             "crypto/ec/curve448/curve448.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto/ec/curve448/arch_32",
                     "crypto/ec/curve448",
@@ -6573,7 +6317,6 @@ our %unified_info = (
             "crypto/ec/curve448/curve448_tables.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto/ec/curve448/arch_32",
                     "crypto/ec/curve448",
@@ -6581,7 +6324,6 @@ our %unified_info = (
             "crypto/ec/curve448/eddsa.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto/ec/curve448/arch_32",
                     "crypto/ec/curve448",
@@ -6589,7 +6331,6 @@ our %unified_info = (
             "crypto/ec/curve448/f_generic.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto/ec/curve448/arch_32",
                     "crypto/ec/curve448",
@@ -6597,7 +6338,6 @@ our %unified_info = (
             "crypto/ec/curve448/scalar.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto/ec/curve448/arch_32",
                     "crypto/ec/curve448",
@@ -6605,163 +6345,136 @@ our %unified_info = (
             "crypto/ec/ec2_oct.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec2_smpl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec_ameth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec_asn1.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec_check.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec_curve.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec_cvt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec_key.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec_kmeth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec_mult.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec_oct.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec_pmeth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec_print.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecdh_kdf.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecdh_ossl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecdsa_ossl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecdsa_sign.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecdsa_vrf.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/eck_prn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecp_mont.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecp_nist.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecp_nistp224.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecp_nistp256.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecp_nistp521.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecp_nistputil.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecp_nistz256-armv4.o" =>
@@ -6779,241 +6492,201 @@ our %unified_info = (
             "crypto/ec/ecp_nistz256-x86_64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecp_nistz256.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecp_oct.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecp_smpl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecx_meth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/x25519-x86_64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/eng_all.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/eng_cnf.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/eng_ctrl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/eng_dyn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/eng_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/eng_fat.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/eng_init.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/eng_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/eng_list.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/eng_openssl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/eng_pkey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/eng_rdrand.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/eng_table.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/tb_asnmth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/tb_cipher.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/tb_dh.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/tb_digest.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/tb_dsa.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/tb_eckey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/tb_pkmeth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/tb_rand.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/tb_rsa.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/err/err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/err/err_all.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/err/err_prn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/bio_b64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/bio_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/bio_md.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/bio_ok.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/c_allc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/c_alld.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/cmeth_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/digest.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/e_aes.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto",
                     "crypto/modes",
@@ -7021,21 +6694,18 @@ our %unified_info = (
             "crypto/evp/e_aes_cbc_hmac_sha1.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto/modes",
                 ],
             "crypto/evp/e_aes_cbc_hmac_sha256.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto/modes",
                 ],
             "crypto/evp/e_aria.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto",
                     "crypto/modes",
@@ -7043,13 +6713,11 @@ our %unified_info = (
             "crypto/evp/e_bf.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/e_camellia.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto",
                     "crypto/modes",
@@ -7057,81 +6725,68 @@ our %unified_info = (
             "crypto/evp/e_cast.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/e_chacha20_poly1305.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/e_des.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto",
                 ],
             "crypto/evp/e_des3.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto",
                 ],
             "crypto/evp/e_idea.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/e_null.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/e_old.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/e_rc2.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/e_rc4.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/e_rc4_hmac_md5.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/e_rc5.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/e_seed.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/e_sm4.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto",
                     "crypto/modes",
@@ -7139,328 +6794,267 @@ our %unified_info = (
             "crypto/evp/e_xcbc_d.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/encode.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/evp_cnf.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/evp_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/evp_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/evp_key.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/evp_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/evp_pbe.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/evp_pkey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/m_md2.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/m_md4.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/m_md5.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/m_md5_sha1.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/m_mdc2.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/m_null.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/m_ripemd.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/m_sha1.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/m_sha3.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto",
                 ],
             "crypto/evp/m_sigver.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/m_wp.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/names.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/p5_crpt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/p5_crpt2.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/p_dec.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/p_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/p_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/p_open.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/p_seal.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/p_sign.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/p_verify.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/pbe_scrypt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/pmeth_fn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/pmeth_gn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/pmeth_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ex_data.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/getenv.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/hmac/hm_ameth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/hmac/hm_pmeth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/hmac/hmac.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/idea/i_cbc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/idea/i_cfb64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/idea/i_ecb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/idea/i_ofb64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/idea/i_skey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
-            "crypto/include/internal/bn_conf.h" =>
-                [
-                    ".",
-                ],
-            "crypto/include/internal/dso_conf.h" =>
-                [
-                    ".",
-                ],
             "crypto/init.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/kdf/hkdf.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/kdf/kdf_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/kdf/scrypt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/kdf/tls1_prf.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/lhash/lh_stats.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/lhash/lhash.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/md4/md4_dgst.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/md4/md4_one.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/md5/md5-sparcv9.o" =>
@@ -7470,91 +7064,76 @@ our %unified_info = (
             "crypto/md5/md5-x86_64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/md5/md5_dgst.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/md5/md5_one.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/mdc2/mdc2_one.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/mdc2/mdc2dgst.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/mem.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/mem_dbg.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/mem_sec.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/modes/aesni-gcm-x86_64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/modes/cbc128.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/modes/ccm128.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/modes/cfb128.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/modes/ctr128.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/modes/cts128.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/modes/gcm128.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto",
                 ],
@@ -7573,7 +7152,6 @@ our %unified_info = (
             "crypto/modes/ghash-x86_64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/modes/ghashv8-armx.o" =>
@@ -7583,361 +7161,301 @@ our %unified_info = (
             "crypto/modes/ocb128.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/modes/ofb128.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/modes/wrap128.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/modes/xts128.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/o_dir.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/o_fips.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/o_fopen.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/o_init.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/o_str.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/o_time.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/objects/o_names.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/objects/obj_dat.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/objects/obj_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/objects/obj_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/objects/obj_xref.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ocsp/ocsp_asn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ocsp/ocsp_cl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ocsp/ocsp_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ocsp/ocsp_ext.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ocsp/ocsp_ht.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ocsp/ocsp_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ocsp/ocsp_prn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ocsp/ocsp_srv.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ocsp/ocsp_vfy.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ocsp/v3_ocsp.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pem/pem_all.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pem/pem_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pem/pem_info.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pem/pem_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pem/pem_oth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pem/pem_pk8.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pem/pem_pkey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pem/pem_sign.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pem/pem_x509.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pem/pem_xaux.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pem/pvkfmt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_add.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_asn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_attr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_crpt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_crt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_decr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_init.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_key.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_kiss.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_mutl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_npas.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_p8d.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_p8e.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_sbag.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_utl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/pk12err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs7/bio_pk7.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs7/pk7_asn1.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs7/pk7_attr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs7/pk7_doit.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs7/pk7_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs7/pk7_mime.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs7/pk7_smime.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs7/pkcs7err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/poly1305/poly1305-armv4.o" =>
@@ -7959,265 +7477,221 @@ our %unified_info = (
             "crypto/poly1305/poly1305-x86_64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/poly1305/poly1305.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/poly1305/poly1305_ameth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/poly1305/poly1305_pmeth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rand/drbg_ctr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rand/drbg_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rand/rand_egd.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rand/rand_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rand/rand_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rand/rand_unix.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rand/rand_vms.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rand/rand_win.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rand/randfile.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rc2/rc2_cbc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rc2/rc2_ecb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rc2/rc2_skey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rc2/rc2cfb64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rc2/rc2ofb64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rc4/rc4-md5-x86_64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rc4/rc4-x86_64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ripemd/rmd_dgst.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ripemd/rmd_one.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_ameth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_asn1.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_chk.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_crpt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_depr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_gen.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_meth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_mp.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_none.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_oaep.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_ossl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_pk1.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_pmeth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_prn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_pss.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_saos.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_sign.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_ssl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_x931.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_x931g.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/s390xcpuid.o" =>
@@ -8227,31 +7701,26 @@ our %unified_info = (
             "crypto/seed/seed.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/seed/seed_cbc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/seed/seed_cfb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/seed/seed_ecb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/seed/seed_ofb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sha/keccak1600-armv4.o" =>
@@ -8261,7 +7730,6 @@ our %unified_info = (
             "crypto/sha/keccak1600-x86_64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sha/sha1-armv4-large.o" =>
@@ -8275,7 +7743,6 @@ our %unified_info = (
             "crypto/sha/sha1-mb-x86_64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sha/sha1-mips.o" =>
@@ -8293,19 +7760,16 @@ our %unified_info = (
             "crypto/sha/sha1-x86_64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sha/sha1_one.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sha/sha1dgst.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sha/sha256-armv4.o" =>
@@ -8319,7 +7783,6 @@ our %unified_info = (
             "crypto/sha/sha256-mb-x86_64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sha/sha256-mips.o" =>
@@ -8337,13 +7800,11 @@ our %unified_info = (
             "crypto/sha/sha256-x86_64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sha/sha256.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sha/sha512-armv4.o" =>
@@ -8369,727 +7830,606 @@ our %unified_info = (
             "crypto/sha/sha512-x86_64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sha/sha512.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/siphash/siphash.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/siphash/siphash_ameth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/siphash/siphash_pmeth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sm2/sm2_crypt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sm2/sm2_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sm2/sm2_pmeth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sm2/sm2_sign.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sm3/m_sm3.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sm3/sm3.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sm4/sm4.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/srp/srp_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/srp/srp_vfy.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/stack/stack.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/store/loader_file.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/store/store_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/store/store_init.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/store/store_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/store/store_register.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/store/store_strings.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/threads_none.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/threads_pthread.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/threads_win.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ts/ts_asn1.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ts/ts_conf.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ts/ts_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ts/ts_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ts/ts_req_print.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ts/ts_req_utils.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ts/ts_rsp_print.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ts/ts_rsp_sign.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ts/ts_rsp_utils.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ts/ts_rsp_verify.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ts/ts_verify_ctx.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/txt_db/txt_db.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ui/ui_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ui/ui_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ui/ui_null.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ui/ui_openssl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ui/ui_util.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/uid.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/whrlpool/wp-x86_64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/whrlpool/wp_dgst.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/by_dir.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/by_file.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/t_crl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/t_req.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/t_x509.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_att.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_cmp.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_d2.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_def.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_ext.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_lu.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_meth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_obj.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_r2x.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_req.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_set.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_trs.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_txt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_v3.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_vfy.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_vpm.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509cset.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509name.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509rset.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509spki.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509type.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x_all.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x_attrib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x_crl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x_exten.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x_name.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x_pubkey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x_req.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x_x509.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x_x509a.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/pcy_cache.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/pcy_data.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/pcy_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/pcy_map.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/pcy_node.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/pcy_tree.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_addr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_admis.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_akey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_akeya.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_alt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_asid.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_bcons.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_bitst.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_conf.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_cpols.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_crld.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_enum.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_extku.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_genn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_ia5.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_info.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_int.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_ncons.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_pci.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_pcia.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_pcons.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_pku.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_pmaps.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_prn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_purp.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_skey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_sxnet.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_tlsf.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_utl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x86_64cpuid.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "engines/e_capi.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "engines/e_padlock-x86_64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "engines/e_padlock.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "fuzz/asn1.o" =>
@@ -9140,6 +8480,14 @@ our %unified_info = (
                 [
                     "include",
                 ],
+            "include/crypto/bn_conf.h" =>
+                [
+                    ".",
+                ],
+            "include/crypto/dso_conf.h" =>
+                [
+                    ".",
+                ],
             "include/openssl/opensslconf.h" =>
                 [
                     ".",
@@ -9384,7 +8732,6 @@ our %unified_info = (
                 [
                     ".",
                     "include",
-                    "crypto/include",
                 ],
             "test/asn1_string_table_test.o" =>
                 [
@@ -9710,7 +9057,6 @@ our %unified_info = (
                 [
                     ".",
                     "include",
-                    "crypto/include",
                 ],
             "test/cipher_overhead_test.o" =>
                 [
@@ -9756,7 +9102,6 @@ our %unified_info = (
             "test/ctype_internal_test.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "test/curve448_internal_test.o" =>
@@ -9822,7 +9167,6 @@ our %unified_info = (
                 [
                     "include",
                     "crypto/ec",
-                    "crypto/include",
                 ],
             "test/ecdsatest.o" =>
                 [
@@ -9847,7 +9191,6 @@ our %unified_info = (
             "test/evp_extra_test.o" =>
                 [
                     "include",
-                    "crypto/include",
                 ],
             "test/evp_test.o" =>
                 [
@@ -9945,7 +9288,6 @@ our %unified_info = (
                 [
                     ".",
                     "include",
-                    "crypto/include",
                 ],
             "test/rc2test.o" =>
                 [
@@ -9995,18 +9337,15 @@ our %unified_info = (
                 [
                     ".",
                     "include",
-                    "crypto/include",
                 ],
             "test/sm2_internal_test.o" =>
                 [
                     "include",
-                    "crypto/include",
                 ],
             "test/sm4_internal_test.o" =>
                 [
                     ".",
                     "include",
-                    "crypto/include",
                 ],
             "test/srptest.o" =>
                 [
@@ -10017,6 +9356,10 @@ our %unified_info = (
                     ".",
                     "include",
                 ],
+            "test/ssl_ctx_test.o" =>
+                [
+                    "include",
+                ],
             "test/ssl_test.o" =>
                 [
                     "include",
@@ -10080,10 +9423,6 @@ our %unified_info = (
                 [
                     "include",
                 ],
-            "test/testutil/init.o" =>
-                [
-                    "include",
-                ],
             "test/testutil/main.o" =>
                 [
                     "include",
@@ -10112,6 +9451,10 @@ our %unified_info = (
                 [
                     "include",
                 ],
+            "test/testutil/testutil_init.o" =>
+                [
+                    "include",
+                ],
             "test/threadstest.o" =>
                 [
                     "include",
@@ -10376,6 +9719,7 @@ our %unified_info = (
             "test/sm4_internal_test",
             "test/srptest",
             "test/ssl_cert_table_internal_test",
+            "test/ssl_ctx_test",
             "test/ssl_test",
             "test/ssl_test_ctx_test",
             "test/sslapitest",
@@ -15381,7 +14725,6 @@ our %unified_info = (
                     "test/testutil/cb.o",
                     "test/testutil/driver.o",
                     "test/testutil/format_output.o",
-                    "test/testutil/init.o",
                     "test/testutil/main.o",
                     "test/testutil/output_helpers.o",
                     "test/testutil/random.o",
@@ -15389,6 +14732,7 @@ our %unified_info = (
                     "test/testutil/tap_bio.o",
                     "test/testutil/test_cleanup.o",
                     "test/testutil/tests.o",
+                    "test/testutil/testutil_init.o",
                 ],
             "test/md2test" =>
                 [
@@ -15616,6 +14960,14 @@ our %unified_info = (
                 [
                     "test/ssl_cert_table_internal_test.c",
                 ],
+            "test/ssl_ctx_test" =>
+                [
+                    "test/ssl_ctx_test.o",
+                ],
+            "test/ssl_ctx_test.o" =>
+                [
+                    "test/ssl_ctx_test.c",
+                ],
             "test/ssl_test" =>
                 [
                     "test/handshake_helper.o",
@@ -15718,10 +15070,6 @@ our %unified_info = (
                 [
                     "test/testutil/format_output.c",
                 ],
-            "test/testutil/init.o" =>
-                [
-                    "test/testutil/init.c",
-                ],
             "test/testutil/main.o" =>
                 [
                     "test/testutil/main.c",
@@ -15750,6 +15098,10 @@ our %unified_info = (
                 [
                     "test/testutil/tests.c",
                 ],
+            "test/testutil/testutil_init.o" =>
+                [
+                    "test/testutil/testutil_init.c",
+                ],
             "test/threadstest" =>
                 [
                     "test/threadstest.o",
diff --git a/deps/openssl/config/archs/solaris64-x86_64-gcc/asm/crypto/aes/aes-x86_64.s b/deps/openssl/config/archs/solaris64-x86_64-gcc/asm/crypto/aes/aes-x86_64.s
deleted file mode 100644
index f0c1685fb9..0000000000
--- a/deps/openssl/config/archs/solaris64-x86_64-gcc/asm/crypto/aes/aes-x86_64.s
+++ /dev/null
@@ -1,2649 +0,0 @@
-.text	
-.type	_x86_64_AES_encrypt,@function
-.align	16
-_x86_64_AES_encrypt:
-	xorl	0(%r15),%eax
-	xorl	4(%r15),%ebx
-	xorl	8(%r15),%ecx
-	xorl	12(%r15),%edx
-
-	movl	240(%r15),%r13d
-	subl	$1,%r13d
-	jmp	.Lenc_loop
-.align	16
-.Lenc_loop:
-
-	movzbl	%al,%esi
-	movzbl	%bl,%edi
-	movzbl	%cl,%ebp
-	movl	0(%r14,%rsi,8),%r10d
-	movl	0(%r14,%rdi,8),%r11d
-	movl	0(%r14,%rbp,8),%r12d
-
-	movzbl	%bh,%esi
-	movzbl	%ch,%edi
-	movzbl	%dl,%ebp
-	xorl	3(%r14,%rsi,8),%r10d
-	xorl	3(%r14,%rdi,8),%r11d
-	movl	0(%r14,%rbp,8),%r8d
-
-	movzbl	%dh,%esi
-	shrl	$16,%ecx
-	movzbl	%ah,%ebp
-	xorl	3(%r14,%rsi,8),%r12d
-	shrl	$16,%edx
-	xorl	3(%r14,%rbp,8),%r8d
-
-	shrl	$16,%ebx
-	leaq	16(%r15),%r15
-	shrl	$16,%eax
-
-	movzbl	%cl,%esi
-	movzbl	%dl,%edi
-	movzbl	%al,%ebp
-	xorl	2(%r14,%rsi,8),%r10d
-	xorl	2(%r14,%rdi,8),%r11d
-	xorl	2(%r14,%rbp,8),%r12d
-
-	movzbl	%dh,%esi
-	movzbl	%ah,%edi
-	movzbl	%bl,%ebp
-	xorl	1(%r14,%rsi,8),%r10d
-	xorl	1(%r14,%rdi,8),%r11d
-	xorl	2(%r14,%rbp,8),%r8d
-
-	movl	12(%r15),%edx
-	movzbl	%bh,%edi
-	movzbl	%ch,%ebp
-	movl	0(%r15),%eax
-	xorl	1(%r14,%rdi,8),%r12d
-	xorl	1(%r14,%rbp,8),%r8d
-
-	movl	4(%r15),%ebx
-	movl	8(%r15),%ecx
-	xorl	%r10d,%eax
-	xorl	%r11d,%ebx
-	xorl	%r12d,%ecx
-	xorl	%r8d,%edx
-	subl	$1,%r13d
-	jnz	.Lenc_loop
-	movzbl	%al,%esi
-	movzbl	%bl,%edi
-	movzbl	%cl,%ebp
-	movzbl	2(%r14,%rsi,8),%r10d
-	movzbl	2(%r14,%rdi,8),%r11d
-	movzbl	2(%r14,%rbp,8),%r12d
-
-	movzbl	%dl,%esi
-	movzbl	%bh,%edi
-	movzbl	%ch,%ebp
-	movzbl	2(%r14,%rsi,8),%r8d
-	movl	0(%r14,%rdi,8),%edi
-	movl	0(%r14,%rbp,8),%ebp
-
-	andl	$0x0000ff00,%edi
-	andl	$0x0000ff00,%ebp
-
-	xorl	%edi,%r10d
-	xorl	%ebp,%r11d
-	shrl	$16,%ecx
-
-	movzbl	%dh,%esi
-	movzbl	%ah,%edi
-	shrl	$16,%edx
-	movl	0(%r14,%rsi,8),%esi
-	movl	0(%r14,%rdi,8),%edi
-
-	andl	$0x0000ff00,%esi
-	andl	$0x0000ff00,%edi
-	shrl	$16,%ebx
-	xorl	%esi,%r12d
-	xorl	%edi,%r8d
-	shrl	$16,%eax
-
-	movzbl	%cl,%esi
-	movzbl	%dl,%edi
-	movzbl	%al,%ebp
-	movl	0(%r14,%rsi,8),%esi
-	movl	0(%r14,%rdi,8),%edi
-	movl	0(%r14,%rbp,8),%ebp
-
-	andl	$0x00ff0000,%esi
-	andl	$0x00ff0000,%edi
-	andl	$0x00ff0000,%ebp
-
-	xorl	%esi,%r10d
-	xorl	%edi,%r11d
-	xorl	%ebp,%r12d
-
-	movzbl	%bl,%esi
-	movzbl	%dh,%edi
-	movzbl	%ah,%ebp
-	movl	0(%r14,%rsi,8),%esi
-	movl	2(%r14,%rdi,8),%edi
-	movl	2(%r14,%rbp,8),%ebp
-
-	andl	$0x00ff0000,%esi
-	andl	$0xff000000,%edi
-	andl	$0xff000000,%ebp
-
-	xorl	%esi,%r8d
-	xorl	%edi,%r10d
-	xorl	%ebp,%r11d
-
-	movzbl	%bh,%esi
-	movzbl	%ch,%edi
-	movl	16+12(%r15),%edx
-	movl	2(%r14,%rsi,8),%esi
-	movl	2(%r14,%rdi,8),%edi
-	movl	16+0(%r15),%eax
-
-	andl	$0xff000000,%esi
-	andl	$0xff000000,%edi
-
-	xorl	%esi,%r12d
-	xorl	%edi,%r8d
-
-	movl	16+4(%r15),%ebx
-	movl	16+8(%r15),%ecx
-	xorl	%r10d,%eax
-	xorl	%r11d,%ebx
-	xorl	%r12d,%ecx
-	xorl	%r8d,%edx
-.byte	0xf3,0xc3
-.size	_x86_64_AES_encrypt,.-_x86_64_AES_encrypt
-.type	_x86_64_AES_encrypt_compact,@function
-.align	16
-_x86_64_AES_encrypt_compact:
-.cfi_startproc	
-	leaq	128(%r14),%r8
-	movl	0-128(%r8),%edi
-	movl	32-128(%r8),%ebp
-	movl	64-128(%r8),%r10d
-	movl	96-128(%r8),%r11d
-	movl	128-128(%r8),%edi
-	movl	160-128(%r8),%ebp
-	movl	192-128(%r8),%r10d
-	movl	224-128(%r8),%r11d
-	jmp	.Lenc_loop_compact
-.align	16
-.Lenc_loop_compact:
-	xorl	0(%r15),%eax
-	xorl	4(%r15),%ebx
-	xorl	8(%r15),%ecx
-	xorl	12(%r15),%edx
-	leaq	16(%r15),%r15
-	movzbl	%al,%r10d
-	movzbl	%bl,%r11d
-	movzbl	%cl,%r12d
-	movzbl	%dl,%r8d
-	movzbl	%bh,%esi
-	movzbl	%ch,%edi
-	shrl	$16,%ecx
-	movzbl	%dh,%ebp
-	movzbl	(%r14,%r10,1),%r10d
-	movzbl	(%r14,%r11,1),%r11d
-	movzbl	(%r14,%r12,1),%r12d
-	movzbl	(%r14,%r8,1),%r8d
-
-	movzbl	(%r14,%rsi,1),%r9d
-	movzbl	%ah,%esi
-	movzbl	(%r14,%rdi,1),%r13d
-	movzbl	%cl,%edi
-	movzbl	(%r14,%rbp,1),%ebp
-	movzbl	(%r14,%rsi,1),%esi
-
-	shll	$8,%r9d
-	shrl	$16,%edx
-	shll	$8,%r13d
-	xorl	%r9d,%r10d
-	shrl	$16,%eax
-	movzbl	%dl,%r9d
-	shrl	$16,%ebx
-	xorl	%r13d,%r11d
-	shll	$8,%ebp
-	movzbl	%al,%r13d
-	movzbl	(%r14,%rdi,1),%edi
-	xorl	%ebp,%r12d
-
-	shll	$8,%esi
-	movzbl	%bl,%ebp
-	shll	$16,%edi
-	xorl	%esi,%r8d
-	movzbl	(%r14,%r9,1),%r9d
-	movzbl	%dh,%esi
-	movzbl	(%r14,%r13,1),%r13d
-	xorl	%edi,%r10d
-
-	shrl	$8,%ecx
-	movzbl	%ah,%edi
-	shll	$16,%r9d
-	shrl	$8,%ebx
-	shll	$16,%r13d
-	xorl	%r9d,%r11d
-	movzbl	(%r14,%rbp,1),%ebp
-	movzbl	(%r14,%rsi,1),%esi
-	movzbl	(%r14,%rdi,1),%edi
-	movzbl	(%r14,%rcx,1),%edx
-	movzbl	(%r14,%rbx,1),%ecx
-
-	shll	$16,%ebp
-	xorl	%r13d,%r12d
-	shll	$24,%esi
-	xorl	%ebp,%r8d
-	shll	$24,%edi
-	xorl	%esi,%r10d
-	shll	$24,%edx
-	xorl	%edi,%r11d
-	shll	$24,%ecx
-	movl	%r10d,%eax
-	movl	%r11d,%ebx
-	xorl	%r12d,%ecx
-	xorl	%r8d,%edx
-	cmpq	16(%rsp),%r15
-	je	.Lenc_compact_done
-	movl	$0x80808080,%r10d
-	movl	$0x80808080,%r11d
-	andl	%eax,%r10d
-	andl	%ebx,%r11d
-	movl	%r10d,%esi
-	movl	%r11d,%edi
-	shrl	$7,%r10d
-	leal	(%rax,%rax,1),%r8d
-	shrl	$7,%r11d
-	leal	(%rbx,%rbx,1),%r9d
-	subl	%r10d,%esi
-	subl	%r11d,%edi
-	andl	$0xfefefefe,%r8d
-	andl	$0xfefefefe,%r9d
-	andl	$0x1b1b1b1b,%esi
-	andl	$0x1b1b1b1b,%edi
-	movl	%eax,%r10d
-	movl	%ebx,%r11d
-	xorl	%esi,%r8d
-	xorl	%edi,%r9d
-
-	xorl	%r8d,%eax
-	xorl	%r9d,%ebx
-	movl	$0x80808080,%r12d
-	roll	$24,%eax
-	movl	$0x80808080,%ebp
-	roll	$24,%ebx
-	andl	%ecx,%r12d
-	andl	%edx,%ebp
-	xorl	%r8d,%eax
-	xorl	%r9d,%ebx
-	movl	%r12d,%esi
-	rorl	$16,%r10d
-	movl	%ebp,%edi
-	rorl	$16,%r11d
-	leal	(%rcx,%rcx,1),%r8d
-	shrl	$7,%r12d
-	xorl	%r10d,%eax
-	shrl	$7,%ebp
-	xorl	%r11d,%ebx
-	rorl	$8,%r10d
-	leal	(%rdx,%rdx,1),%r9d
-	rorl	$8,%r11d
-	subl	%r12d,%esi
-	subl	%ebp,%edi
-	xorl	%r10d,%eax
-	xorl	%r11d,%ebx
-
-	andl	$0xfefefefe,%r8d
-	andl	$0xfefefefe,%r9d
-	andl	$0x1b1b1b1b,%esi
-	andl	$0x1b1b1b1b,%edi
-	movl	%ecx,%r12d
-	movl	%edx,%ebp
-	xorl	%esi,%r8d
-	xorl	%edi,%r9d
-
-	rorl	$16,%r12d
-	xorl	%r8d,%ecx
-	rorl	$16,%ebp
-	xorl	%r9d,%edx
-	roll	$24,%ecx
-	movl	0(%r14),%esi
-	roll	$24,%edx
-	xorl	%r8d,%ecx
-	movl	64(%r14),%edi
-	xorl	%r9d,%edx
-	movl	128(%r14),%r8d
-	xorl	%r12d,%ecx
-	rorl	$8,%r12d
-	xorl	%ebp,%edx
-	rorl	$8,%ebp
-	xorl	%r12d,%ecx
-	movl	192(%r14),%r9d
-	xorl	%ebp,%edx
-	jmp	.Lenc_loop_compact
-.align	16
-.Lenc_compact_done:
-	xorl	0(%r15),%eax
-	xorl	4(%r15),%ebx
-	xorl	8(%r15),%ecx
-	xorl	12(%r15),%edx
-.byte	0xf3,0xc3
-.cfi_endproc	
-.size	_x86_64_AES_encrypt_compact,.-_x86_64_AES_encrypt_compact
-.globl	AES_encrypt
-.type	AES_encrypt,@function
-.align	16
-.globl	asm_AES_encrypt
-.hidden	asm_AES_encrypt
-asm_AES_encrypt:
-AES_encrypt:
-.cfi_startproc	
-	movq	%rsp,%rax
-.cfi_def_cfa_register	%rax
-	pushq	%rbx
-.cfi_offset	%rbx,-16
-	pushq	%rbp
-.cfi_offset	%rbp,-24
-	pushq	%r12
-.cfi_offset	%r12,-32
-	pushq	%r13
-.cfi_offset	%r13,-40
-	pushq	%r14
-.cfi_offset	%r14,-48
-	pushq	%r15
-.cfi_offset	%r15,-56
-
-
-	leaq	-63(%rdx),%rcx
-	andq	$-64,%rsp
-	subq	%rsp,%rcx
-	negq	%rcx
-	andq	$0x3c0,%rcx
-	subq	%rcx,%rsp
-	subq	$32,%rsp
-
-	movq	%rsi,16(%rsp)
-	movq	%rax,24(%rsp)
-.cfi_escape	0x0f,0x05,0x77,0x18,0x06,0x23,0x08
-.Lenc_prologue:
-
-	movq	%rdx,%r15
-	movl	240(%r15),%r13d
-
-	movl	0(%rdi),%eax
-	movl	4(%rdi),%ebx
-	movl	8(%rdi),%ecx
-	movl	12(%rdi),%edx
-
-	shll	$4,%r13d
-	leaq	(%r15,%r13,1),%rbp
-	movq	%r15,(%rsp)
-	movq	%rbp,8(%rsp)
-
-
-	leaq	.LAES_Te+2048(%rip),%r14
-	leaq	768(%rsp),%rbp
-	subq	%r14,%rbp
-	andq	$0x300,%rbp
-	leaq	(%r14,%rbp,1),%r14
-
-	call	_x86_64_AES_encrypt_compact
-
-	movq	16(%rsp),%r9
-	movq	24(%rsp),%rsi
-.cfi_def_cfa	%rsi,8
-	movl	%eax,0(%r9)
-	movl	%ebx,4(%r9)
-	movl	%ecx,8(%r9)
-	movl	%edx,12(%r9)
-
-	movq	-48(%rsi),%r15
-.cfi_restore	%r15
-	movq	-40(%rsi),%r14
-.cfi_restore	%r14
-	movq	-32(%rsi),%r13
-.cfi_restore	%r13
-	movq	-24(%rsi),%r12
-.cfi_restore	%r12
-	movq	-16(%rsi),%rbp
-.cfi_restore	%rbp
-	movq	-8(%rsi),%rbx
-.cfi_restore	%rbx
-	leaq	(%rsi),%rsp
-.cfi_def_cfa_register	%rsp
-.Lenc_epilogue:
-	.byte	0xf3,0xc3
-.cfi_endproc	
-.size	AES_encrypt,.-AES_encrypt
-.type	_x86_64_AES_decrypt,@function
-.align	16
-_x86_64_AES_decrypt:
-	xorl	0(%r15),%eax
-	xorl	4(%r15),%ebx
-	xorl	8(%r15),%ecx
-	xorl	12(%r15),%edx
-
-	movl	240(%r15),%r13d
-	subl	$1,%r13d
-	jmp	.Ldec_loop
-.align	16
-.Ldec_loop:
-
-	movzbl	%al,%esi
-	movzbl	%bl,%edi
-	movzbl	%cl,%ebp
-	movl	0(%r14,%rsi,8),%r10d
-	movl	0(%r14,%rdi,8),%r11d
-	movl	0(%r14,%rbp,8),%r12d
-
-	movzbl	%dh,%esi
-	movzbl	%ah,%edi
-	movzbl	%dl,%ebp
-	xorl	3(%r14,%rsi,8),%r10d
-	xorl	3(%r14,%rdi,8),%r11d
-	movl	0(%r14,%rbp,8),%r8d
-
-	movzbl	%bh,%esi
-	shrl	$16,%eax
-	movzbl	%ch,%ebp
-	xorl	3(%r14,%rsi,8),%r12d
-	shrl	$16,%edx
-	xorl	3(%r14,%rbp,8),%r8d
-
-	shrl	$16,%ebx
-	leaq	16(%r15),%r15
-	shrl	$16,%ecx
-
-	movzbl	%cl,%esi
-	movzbl	%dl,%edi
-	movzbl	%al,%ebp
-	xorl	2(%r14,%rsi,8),%r10d
-	xorl	2(%r14,%rdi,8),%r11d
-	xorl	2(%r14,%rbp,8),%r12d
-
-	movzbl	%bh,%esi
-	movzbl	%ch,%edi
-	movzbl	%bl,%ebp
-	xorl	1(%r14,%rsi,8),%r10d
-	xorl	1(%r14,%rdi,8),%r11d
-	xorl	2(%r14,%rbp,8),%r8d
-
-	movzbl	%dh,%esi
-	movl	12(%r15),%edx
-	movzbl	%ah,%ebp
-	xorl	1(%r14,%rsi,8),%r12d
-	movl	0(%r15),%eax
-	xorl	1(%r14,%rbp,8),%r8d
-
-	xorl	%r10d,%eax
-	movl	4(%r15),%ebx
-	movl	8(%r15),%ecx
-	xorl	%r12d,%ecx
-	xorl	%r11d,%ebx
-	xorl	%r8d,%edx
-	subl	$1,%r13d
-	jnz	.Ldec_loop
-	leaq	2048(%r14),%r14
-	movzbl	%al,%esi
-	movzbl	%bl,%edi
-	movzbl	%cl,%ebp
-	movzbl	(%r14,%rsi,1),%r10d
-	movzbl	(%r14,%rdi,1),%r11d
-	movzbl	(%r14,%rbp,1),%r12d
-
-	movzbl	%dl,%esi
-	movzbl	%dh,%edi
-	movzbl	%ah,%ebp
-	movzbl	(%r14,%rsi,1),%r8d
-	movzbl	(%r14,%rdi,1),%edi
-	movzbl	(%r14,%rbp,1),%ebp
-
-	shll	$8,%edi
-	shll	$8,%ebp
-
-	xorl	%edi,%r10d
-	xorl	%ebp,%r11d
-	shrl	$16,%edx
-
-	movzbl	%bh,%esi
-	movzbl	%ch,%edi
-	shrl	$16,%eax
-	movzbl	(%r14,%rsi,1),%esi
-	movzbl	(%r14,%rdi,1),%edi
-
-	shll	$8,%esi
-	shll	$8,%edi
-	shrl	$16,%ebx
-	xorl	%esi,%r12d
-	xorl	%edi,%r8d
-	shrl	$16,%ecx
-
-	movzbl	%cl,%esi
-	movzbl	%dl,%edi
-	movzbl	%al,%ebp
-	movzbl	(%r14,%rsi,1),%esi
-	movzbl	(%r14,%rdi,1),%edi
-	movzbl	(%r14,%rbp,1),%ebp
-
-	shll	$16,%esi
-	shll	$16,%edi
-	shll	$16,%ebp
-
-	xorl	%esi,%r10d
-	xorl	%edi,%r11d
-	xorl	%ebp,%r12d
-
-	movzbl	%bl,%esi
-	movzbl	%bh,%edi
-	movzbl	%ch,%ebp
-	movzbl	(%r14,%rsi,1),%esi
-	movzbl	(%r14,%rdi,1),%edi
-	movzbl	(%r14,%rbp,1),%ebp
-
-	shll	$16,%esi
-	shll	$24,%edi
-	shll	$24,%ebp
-
-	xorl	%esi,%r8d
-	xorl	%edi,%r10d
-	xorl	%ebp,%r11d
-
-	movzbl	%dh,%esi
-	movzbl	%ah,%edi
-	movl	16+12(%r15),%edx
-	movzbl	(%r14,%rsi,1),%esi
-	movzbl	(%r14,%rdi,1),%edi
-	movl	16+0(%r15),%eax
-
-	shll	$24,%esi
-	shll	$24,%edi
-
-	xorl	%esi,%r12d
-	xorl	%edi,%r8d
-
-	movl	16+4(%r15),%ebx
-	movl	16+8(%r15),%ecx
-	leaq	-2048(%r14),%r14
-	xorl	%r10d,%eax
-	xorl	%r11d,%ebx
-	xorl	%r12d,%ecx
-	xorl	%r8d,%edx
-.byte	0xf3,0xc3
-.size	_x86_64_AES_decrypt,.-_x86_64_AES_decrypt
-.type	_x86_64_AES_decrypt_compact,@function
-.align	16
-_x86_64_AES_decrypt_compact:
-.cfi_startproc	
-	leaq	128(%r14),%r8
-	movl	0-128(%r8),%edi
-	movl	32-128(%r8),%ebp
-	movl	64-128(%r8),%r10d
-	movl	96-128(%r8),%r11d
-	movl	128-128(%r8),%edi
-	movl	160-128(%r8),%ebp
-	movl	192-128(%r8),%r10d
-	movl	224-128(%r8),%r11d
-	jmp	.Ldec_loop_compact
-
-.align	16
-.Ldec_loop_compact:
-	xorl	0(%r15),%eax
-	xorl	4(%r15),%ebx
-	xorl	8(%r15),%ecx
-	xorl	12(%r15),%edx
-	leaq	16(%r15),%r15
-	movzbl	%al,%r10d
-	movzbl	%bl,%r11d
-	movzbl	%cl,%r12d
-	movzbl	%dl,%r8d
-	movzbl	%dh,%esi
-	movzbl	%ah,%edi
-	shrl	$16,%edx
-	movzbl	%bh,%ebp
-	movzbl	(%r14,%r10,1),%r10d
-	movzbl	(%r14,%r11,1),%r11d
-	movzbl	(%r14,%r12,1),%r12d
-	movzbl	(%r14,%r8,1),%r8d
-
-	movzbl	(%r14,%rsi,1),%r9d
-	movzbl	%ch,%esi
-	movzbl	(%r14,%rdi,1),%r13d
-	movzbl	(%r14,%rbp,1),%ebp
-	movzbl	(%r14,%rsi,1),%esi
-
-	shrl	$16,%ecx
-	shll	$8,%r13d
-	shll	$8,%r9d
-	movzbl	%cl,%edi
-	shrl	$16,%eax
-	xorl	%r9d,%r10d
-	shrl	$16,%ebx
-	movzbl	%dl,%r9d
-
-	shll	$8,%ebp
-	xorl	%r13d,%r11d
-	shll	$8,%esi
-	movzbl	%al,%r13d
-	movzbl	(%r14,%rdi,1),%edi
-	xorl	%ebp,%r12d
-	movzbl	%bl,%ebp
-
-	shll	$16,%edi
-	xorl	%esi,%r8d
-	movzbl	(%r14,%r9,1),%r9d
-	movzbl	%bh,%esi
-	movzbl	(%r14,%rbp,1),%ebp
-	xorl	%edi,%r10d
-	movzbl	(%r14,%r13,1),%r13d
-	movzbl	%ch,%edi
-
-	shll	$16,%ebp
-	shll	$16,%r9d
-	shll	$16,%r13d
-	xorl	%ebp,%r8d
-	movzbl	%dh,%ebp
-	xorl	%r9d,%r11d
-	shrl	$8,%eax
-	xorl	%r13d,%r12d
-
-	movzbl	(%r14,%rsi,1),%esi
-	movzbl	(%r14,%rdi,1),%ebx
-	movzbl	(%r14,%rbp,1),%ecx
-	movzbl	(%r14,%rax,1),%edx
-
-	movl	%r10d,%eax
-	shll	$24,%esi
-	shll	$24,%ebx
-	shll	$24,%ecx
-	xorl	%esi,%eax
-	shll	$24,%edx
-	xorl	%r11d,%ebx
-	xorl	%r12d,%ecx
-	xorl	%r8d,%edx
-	cmpq	16(%rsp),%r15
-	je	.Ldec_compact_done
-
-	movq	256+0(%r14),%rsi
-	shlq	$32,%rbx
-	shlq	$32,%rdx
-	movq	256+8(%r14),%rdi
-	orq	%rbx,%rax
-	orq	%rdx,%rcx
-	movq	256+16(%r14),%rbp
-	movq	%rsi,%r9
-	movq	%rsi,%r12
-	andq	%rax,%r9
-	andq	%rcx,%r12
-	movq	%r9,%rbx
-	movq	%r12,%rdx
-	shrq	$7,%r9
-	leaq	(%rax,%rax,1),%r8
-	shrq	$7,%r12
-	leaq	(%rcx,%rcx,1),%r11
-	subq	%r9,%rbx
-	subq	%r12,%rdx
-	andq	%rdi,%r8
-	andq	%rdi,%r11
-	andq	%rbp,%rbx
-	andq	%rbp,%rdx
-	xorq	%rbx,%r8
-	xorq	%rdx,%r11
-	movq	%rsi,%r10
-	movq	%rsi,%r13
-
-	andq	%r8,%r10
-	andq	%r11,%r13
-	movq	%r10,%rbx
-	movq	%r13,%rdx
-	shrq	$7,%r10
-	leaq	(%r8,%r8,1),%r9
-	shrq	$7,%r13
-	leaq	(%r11,%r11,1),%r12
-	subq	%r10,%rbx
-	subq	%r13,%rdx
-	andq	%rdi,%r9
-	andq	%rdi,%r12
-	andq	%rbp,%rbx
-	andq	%rbp,%rdx
-	xorq	%rbx,%r9
-	xorq	%rdx,%r12
-	movq	%rsi,%r10
-	movq	%rsi,%r13
-
-	andq	%r9,%r10
-	andq	%r12,%r13
-	movq	%r10,%rbx
-	movq	%r13,%rdx
-	shrq	$7,%r10
-	xorq	%rax,%r8
-	shrq	$7,%r13
-	xorq	%rcx,%r11
-	subq	%r10,%rbx
-	subq	%r13,%rdx
-	leaq	(%r9,%r9,1),%r10
-	leaq	(%r12,%r12,1),%r13
-	xorq	%rax,%r9
-	xorq	%rcx,%r12
-	andq	%rdi,%r10
-	andq	%rdi,%r13
-	andq	%rbp,%rbx
-	andq	%rbp,%rdx
-	xorq	%rbx,%r10
-	xorq	%rdx,%r13
-
-	xorq	%r10,%rax
-	xorq	%r13,%rcx
-	xorq	%r10,%r8
-	xorq	%r13,%r11
-	movq	%rax,%rbx
-	movq	%rcx,%rdx
-	xorq	%r10,%r9
-	shrq	$32,%rbx
-	xorq	%r13,%r12
-	shrq	$32,%rdx
-	xorq	%r8,%r10
-	roll	$8,%eax
-	xorq	%r11,%r13
-	roll	$8,%ecx
-	xorq	%r9,%r10
-	roll	$8,%ebx
-	xorq	%r12,%r13
-
-	roll	$8,%edx
-	xorl	%r10d,%eax
-	shrq	$32,%r10
-	xorl	%r13d,%ecx
-	shrq	$32,%r13
-	xorl	%r10d,%ebx
-	xorl	%r13d,%edx
-
-	movq	%r8,%r10
-	roll	$24,%r8d
-	movq	%r11,%r13
-	roll	$24,%r11d
-	shrq	$32,%r10
-	xorl	%r8d,%eax
-	shrq	$32,%r13
-	xorl	%r11d,%ecx
-	roll	$24,%r10d
-	movq	%r9,%r8
-	roll	$24,%r13d
-	movq	%r12,%r11
-	shrq	$32,%r8
-	xorl	%r10d,%ebx
-	shrq	$32,%r11
-	xorl	%r13d,%edx
-
-	movq	0(%r14),%rsi
-	roll	$16,%r9d
-	movq	64(%r14),%rdi
-	roll	$16,%r12d
-	movq	128(%r14),%rbp
-	roll	$16,%r8d
-	movq	192(%r14),%r10
-	xorl	%r9d,%eax
-	roll	$16,%r11d
-	xorl	%r12d,%ecx
-	movq	256(%r14),%r13
-	xorl	%r8d,%ebx
-	xorl	%r11d,%edx
-	jmp	.Ldec_loop_compact
-.align	16
-.Ldec_compact_done:
-	xorl	0(%r15),%eax
-	xorl	4(%r15),%ebx
-	xorl	8(%r15),%ecx
-	xorl	12(%r15),%edx
-.byte	0xf3,0xc3
-.cfi_endproc	
-.size	_x86_64_AES_decrypt_compact,.-_x86_64_AES_decrypt_compact
-.globl	AES_decrypt
-.type	AES_decrypt,@function
-.align	16
-.globl	asm_AES_decrypt
-.hidden	asm_AES_decrypt
-asm_AES_decrypt:
-AES_decrypt:
-.cfi_startproc	
-	movq	%rsp,%rax
-.cfi_def_cfa_register	%rax
-	pushq	%rbx
-.cfi_offset	%rbx,-16
-	pushq	%rbp
-.cfi_offset	%rbp,-24
-	pushq	%r12
-.cfi_offset	%r12,-32
-	pushq	%r13
-.cfi_offset	%r13,-40
-	pushq	%r14
-.cfi_offset	%r14,-48
-	pushq	%r15
-.cfi_offset	%r15,-56
-
-
-	leaq	-63(%rdx),%rcx
-	andq	$-64,%rsp
-	subq	%rsp,%rcx
-	negq	%rcx
-	andq	$0x3c0,%rcx
-	subq	%rcx,%rsp
-	subq	$32,%rsp
-
-	movq	%rsi,16(%rsp)
-	movq	%rax,24(%rsp)
-.cfi_escape	0x0f,0x05,0x77,0x18,0x06,0x23,0x08
-.Ldec_prologue:
-
-	movq	%rdx,%r15
-	movl	240(%r15),%r13d
-
-	movl	0(%rdi),%eax
-	movl	4(%rdi),%ebx
-	movl	8(%rdi),%ecx
-	movl	12(%rdi),%edx
-
-	shll	$4,%r13d
-	leaq	(%r15,%r13,1),%rbp
-	movq	%r15,(%rsp)
-	movq	%rbp,8(%rsp)
-
-
-	leaq	.LAES_Td+2048(%rip),%r14
-	leaq	768(%rsp),%rbp
-	subq	%r14,%rbp
-	andq	$0x300,%rbp
-	leaq	(%r14,%rbp,1),%r14
-	shrq	$3,%rbp
-	addq	%rbp,%r14
-
-	call	_x86_64_AES_decrypt_compact
-
-	movq	16(%rsp),%r9
-	movq	24(%rsp),%rsi
-.cfi_def_cfa	%rsi,8
-	movl	%eax,0(%r9)
-	movl	%ebx,4(%r9)
-	movl	%ecx,8(%r9)
-	movl	%edx,12(%r9)
-
-	movq	-48(%rsi),%r15
-.cfi_restore	%r15
-	movq	-40(%rsi),%r14
-.cfi_restore	%r14
-	movq	-32(%rsi),%r13
-.cfi_restore	%r13
-	movq	-24(%rsi),%r12
-.cfi_restore	%r12
-	movq	-16(%rsi),%rbp
-.cfi_restore	%rbp
-	movq	-8(%rsi),%rbx
-.cfi_restore	%rbx
-	leaq	(%rsi),%rsp
-.cfi_def_cfa_register	%rsp
-.Ldec_epilogue:
-	.byte	0xf3,0xc3
-.cfi_endproc	
-.size	AES_decrypt,.-AES_decrypt
-.globl	AES_set_encrypt_key
-.type	AES_set_encrypt_key,@function
-.align	16
-AES_set_encrypt_key:
-.cfi_startproc	
-	pushq	%rbx
-.cfi_adjust_cfa_offset	8
-.cfi_offset	%rbx,-16
-	pushq	%rbp
-.cfi_adjust_cfa_offset	8
-.cfi_offset	%rbp,-24
-	pushq	%r12
-.cfi_adjust_cfa_offset	8
-.cfi_offset	%r12,-32
-	pushq	%r13
-.cfi_adjust_cfa_offset	8
-.cfi_offset	%r13,-40
-	pushq	%r14
-.cfi_adjust_cfa_offset	8
-.cfi_offset	%r14,-48
-	pushq	%r15
-.cfi_adjust_cfa_offset	8
-.cfi_offset	%r15,-56
-	subq	$8,%rsp
-.cfi_adjust_cfa_offset	8
-.Lenc_key_prologue:
-
-	call	_x86_64_AES_set_encrypt_key
-
-	movq	40(%rsp),%rbp
-.cfi_restore	%rbp
-	movq	48(%rsp),%rbx
-.cfi_restore	%rbx
-	addq	$56,%rsp
-.cfi_adjust_cfa_offset	-56
-.Lenc_key_epilogue:
-	.byte	0xf3,0xc3
-.cfi_endproc	
-.size	AES_set_encrypt_key,.-AES_set_encrypt_key
-
-.type	_x86_64_AES_set_encrypt_key,@function
-.align	16
-_x86_64_AES_set_encrypt_key:
-.cfi_startproc	
-	movl	%esi,%ecx
-	movq	%rdi,%rsi
-	movq	%rdx,%rdi
-
-	testq	$-1,%rsi
-	jz	.Lbadpointer
-	testq	$-1,%rdi
-	jz	.Lbadpointer
-
-	leaq	.LAES_Te(%rip),%rbp
-	leaq	2048+128(%rbp),%rbp
-
-
-	movl	0-128(%rbp),%eax
-	movl	32-128(%rbp),%ebx
-	movl	64-128(%rbp),%r8d
-	movl	96-128(%rbp),%edx
-	movl	128-128(%rbp),%eax
-	movl	160-128(%rbp),%ebx
-	movl	192-128(%rbp),%r8d
-	movl	224-128(%rbp),%edx
-
-	cmpl	$128,%ecx
-	je	.L10rounds
-	cmpl	$192,%ecx
-	je	.L12rounds
-	cmpl	$256,%ecx
-	je	.L14rounds
-	movq	$-2,%rax
-	jmp	.Lexit
-
-.L10rounds:
-	movq	0(%rsi),%rax
-	movq	8(%rsi),%rdx
-	movq	%rax,0(%rdi)
-	movq	%rdx,8(%rdi)
-
-	shrq	$32,%rdx
-	xorl	%ecx,%ecx
-	jmp	.L10shortcut
-.align	4
-.L10loop:
-	movl	0(%rdi),%eax
-	movl	12(%rdi),%edx
-.L10shortcut:
-	movzbl	%dl,%esi
-	movzbl	-128(%rbp,%rsi,1),%ebx
-	movzbl	%dh,%esi
-	shll	$24,%ebx
-	xorl	%ebx,%eax
-
-	movzbl	-128(%rbp,%rsi,1),%ebx
-	shrl	$16,%edx
-	movzbl	%dl,%esi
-	xorl	%ebx,%eax
-
-	movzbl	-128(%rbp,%rsi,1),%ebx
-	movzbl	%dh,%esi
-	shll	$8,%ebx
-	xorl	%ebx,%eax
-
-	movzbl	-128(%rbp,%rsi,1),%ebx
-	shll	$16,%ebx
-	xorl	%ebx,%eax
-
-	xorl	1024-128(%rbp,%rcx,4),%eax
-	movl	%eax,16(%rdi)
-	xorl	4(%rdi),%eax
-	movl	%eax,20(%rdi)
-	xorl	8(%rdi),%eax
-	movl	%eax,24(%rdi)
-	xorl	12(%rdi),%eax
-	movl	%eax,28(%rdi)
-	addl	$1,%ecx
-	leaq	16(%rdi),%rdi
-	cmpl	$10,%ecx
-	jl	.L10loop
-
-	movl	$10,80(%rdi)
-	xorq	%rax,%rax
-	jmp	.Lexit
-
-.L12rounds:
-	movq	0(%rsi),%rax
-	movq	8(%rsi),%rbx
-	movq	16(%rsi),%rdx
-	movq	%rax,0(%rdi)
-	movq	%rbx,8(%rdi)
-	movq	%rdx,16(%rdi)
-
-	shrq	$32,%rdx
-	xorl	%ecx,%ecx
-	jmp	.L12shortcut
-.align	4
-.L12loop:
-	movl	0(%rdi),%eax
-	movl	20(%rdi),%edx
-.L12shortcut:
-	movzbl	%dl,%esi
-	movzbl	-128(%rbp,%rsi,1),%ebx
-	movzbl	%dh,%esi
-	shll	$24,%ebx
-	xorl	%ebx,%eax
-
-	movzbl	-128(%rbp,%rsi,1),%ebx
-	shrl	$16,%edx
-	movzbl	%dl,%esi
-	xorl	%ebx,%eax
-
-	movzbl	-128(%rbp,%rsi,1),%ebx
-	movzbl	%dh,%esi
-	shll	$8,%ebx
-	xorl	%ebx,%eax
-
-	movzbl	-128(%rbp,%rsi,1),%ebx
-	shll	$16,%ebx
-	xorl	%ebx,%eax
-
-	xorl	1024-128(%rbp,%rcx,4),%eax
-	movl	%eax,24(%rdi)
-	xorl	4(%rdi),%eax
-	movl	%eax,28(%rdi)
-	xorl	8(%rdi),%eax
-	movl	%eax,32(%rdi)
-	xorl	12(%rdi),%eax
-	movl	%eax,36(%rdi)
-
-	cmpl	$7,%ecx
-	je	.L12break
-	addl	$1,%ecx
-
-	xorl	16(%rdi),%eax
-	movl	%eax,40(%rdi)
-	xorl	20(%rdi),%eax
-	movl	%eax,44(%rdi)
-
-	leaq	24(%rdi),%rdi
-	jmp	.L12loop
-.L12break:
-	movl	$12,72(%rdi)
-	xorq	%rax,%rax
-	jmp	.Lexit
-
-.L14rounds:
-	movq	0(%rsi),%rax
-	movq	8(%rsi),%rbx
-	movq	16(%rsi),%rcx
-	movq	24(%rsi),%rdx
-	movq	%rax,0(%rdi)
-	movq	%rbx,8(%rdi)
-	movq	%rcx,16(%rdi)
-	movq	%rdx,24(%rdi)
-
-	shrq	$32,%rdx
-	xorl	%ecx,%ecx
-	jmp	.L14shortcut
-.align	4
-.L14loop:
-	movl	0(%rdi),%eax
-	movl	28(%rdi),%edx
-.L14shortcut:
-	movzbl	%dl,%esi
-	movzbl	-128(%rbp,%rsi,1),%ebx
-	movzbl	%dh,%esi
-	shll	$24,%ebx
-	xorl	%ebx,%eax
-
-	movzbl	-128(%rbp,%rsi,1),%ebx
-	shrl	$16,%edx
-	movzbl	%dl,%esi
-	xorl	%ebx,%eax
-
-	movzbl	-128(%rbp,%rsi,1),%ebx
-	movzbl	%dh,%esi
-	shll	$8,%ebx
-	xorl	%ebx,%eax
-
-	movzbl	-128(%rbp,%rsi,1),%ebx
-	shll	$16,%ebx
-	xorl	%ebx,%eax
-
-	xorl	1024-128(%rbp,%rcx,4),%eax
-	movl	%eax,32(%rdi)
-	xorl	4(%rdi),%eax
-	movl	%eax,36(%rdi)
-	xorl	8(%rdi),%eax
-	movl	%eax,40(%rdi)
-	xorl	12(%rdi),%eax
-	movl	%eax,44(%rdi)
-
-	cmpl	$6,%ecx
-	je	.L14break
-	addl	$1,%ecx
-
-	movl	%eax,%edx
-	movl	16(%rdi),%eax
-	movzbl	%dl,%esi
-	movzbl	-128(%rbp,%rsi,1),%ebx
-	movzbl	%dh,%esi
-	xorl	%ebx,%eax
-
-	movzbl	-128(%rbp,%rsi,1),%ebx
-	shrl	$16,%edx
-	shll	$8,%ebx
-	movzbl	%dl,%esi
-	xorl	%ebx,%eax
-
-	movzbl	-128(%rbp,%rsi,1),%ebx
-	movzbl	%dh,%esi
-	shll	$16,%ebx
-	xorl	%ebx,%eax
-
-	movzbl	-128(%rbp,%rsi,1),%ebx
-	shll	$24,%ebx
-	xorl	%ebx,%eax
-
-	movl	%eax,48(%rdi)
-	xorl	20(%rdi),%eax
-	movl	%eax,52(%rdi)
-	xorl	24(%rdi),%eax
-	movl	%eax,56(%rdi)
-	xorl	28(%rdi),%eax
-	movl	%eax,60(%rdi)
-
-	leaq	32(%rdi),%rdi
-	jmp	.L14loop
-.L14break:
-	movl	$14,48(%rdi)
-	xorq	%rax,%rax
-	jmp	.Lexit
-
-.Lbadpointer:
-	movq	$-1,%rax
-.Lexit:
-.byte	0xf3,0xc3
-.cfi_endproc	
-.size	_x86_64_AES_set_encrypt_key,.-_x86_64_AES_set_encrypt_key
-.globl	AES_set_decrypt_key
-.type	AES_set_decrypt_key,@function
-.align	16
-AES_set_decrypt_key:
-.cfi_startproc	
-	pushq	%rbx
-.cfi_adjust_cfa_offset	8
-.cfi_offset	%rbx,-16
-	pushq	%rbp
-.cfi_adjust_cfa_offset	8
-.cfi_offset	%rbp,-24
-	pushq	%r12
-.cfi_adjust_cfa_offset	8
-.cfi_offset	%r12,-32
-	pushq	%r13
-.cfi_adjust_cfa_offset	8
-.cfi_offset	%r13,-40
-	pushq	%r14
-.cfi_adjust_cfa_offset	8
-.cfi_offset	%r14,-48
-	pushq	%r15
-.cfi_adjust_cfa_offset	8
-.cfi_offset	%r15,-56
-	pushq	%rdx
-.cfi_adjust_cfa_offset	8
-.Ldec_key_prologue:
-
-	call	_x86_64_AES_set_encrypt_key
-	movq	(%rsp),%r8
-	cmpl	$0,%eax
-	jne	.Labort
-
-	movl	240(%r8),%r14d
-	xorq	%rdi,%rdi
-	leaq	(%rdi,%r14,4),%rcx
-	movq	%r8,%rsi
-	leaq	(%r8,%rcx,4),%rdi
-.align	4
-.Linvert:
-	movq	0(%rsi),%rax
-	movq	8(%rsi),%rbx
-	movq	0(%rdi),%rcx
-	movq	8(%rdi),%rdx
-	movq	%rax,0(%rdi)
-	movq	%rbx,8(%rdi)
-	movq	%rcx,0(%rsi)
-	movq	%rdx,8(%rsi)
-	leaq	16(%rsi),%rsi
-	leaq	-16(%rdi),%rdi
-	cmpq	%rsi,%rdi
-	jne	.Linvert
-
-	leaq	.LAES_Te+2048+1024(%rip),%rax
-
-	movq	40(%rax),%rsi
-	movq	48(%rax),%rdi
-	movq	56(%rax),%rbp
-
-	movq	%r8,%r15
-	subl	$1,%r14d
-.align	4
-.Lpermute:
-	leaq	16(%r15),%r15
-	movq	0(%r15),%rax
-	movq	8(%r15),%rcx
-	movq	%rsi,%r9
-	movq	%rsi,%r12
-	andq	%rax,%r9
-	andq	%rcx,%r12
-	movq	%r9,%rbx
-	movq	%r12,%rdx
-	shrq	$7,%r9
-	leaq	(%rax,%rax,1),%r8
-	shrq	$7,%r12
-	leaq	(%rcx,%rcx,1),%r11
-	subq	%r9,%rbx
-	subq	%r12,%rdx
-	andq	%rdi,%r8
-	andq	%rdi,%r11
-	andq	%rbp,%rbx
-	andq	%rbp,%rdx
-	xorq	%rbx,%r8
-	xorq	%rdx,%r11
-	movq	%rsi,%r10
-	movq	%rsi,%r13
-
-	andq	%r8,%r10
-	andq	%r11,%r13
-	movq	%r10,%rbx
-	movq	%r13,%rdx
-	shrq	$7,%r10
-	leaq	(%r8,%r8,1),%r9
-	shrq	$7,%r13
-	leaq	(%r11,%r11,1),%r12
-	subq	%r10,%rbx
-	subq	%r13,%rdx
-	andq	%rdi,%r9
-	andq	%rdi,%r12
-	andq	%rbp,%rbx
-	andq	%rbp,%rdx
-	xorq	%rbx,%r9
-	xorq	%rdx,%r12
-	movq	%rsi,%r10
-	movq	%rsi,%r13
-
-	andq	%r9,%r10
-	andq	%r12,%r13
-	movq	%r10,%rbx
-	movq	%r13,%rdx
-	shrq	$7,%r10
-	xorq	%rax,%r8
-	shrq	$7,%r13
-	xorq	%rcx,%r11
-	subq	%r10,%rbx
-	subq	%r13,%rdx
-	leaq	(%r9,%r9,1),%r10
-	leaq	(%r12,%r12,1),%r13
-	xorq	%rax,%r9
-	xorq	%rcx,%r12
-	andq	%rdi,%r10
-	andq	%rdi,%r13
-	andq	%rbp,%rbx
-	andq	%rbp,%rdx
-	xorq	%rbx,%r10
-	xorq	%rdx,%r13
-
-	xorq	%r10,%rax
-	xorq	%r13,%rcx
-	xorq	%r10,%r8
-	xorq	%r13,%r11
-	movq	%rax,%rbx
-	movq	%rcx,%rdx
-	xorq	%r10,%r9
-	shrq	$32,%rbx
-	xorq	%r13,%r12
-	shrq	$32,%rdx
-	xorq	%r8,%r10
-	roll	$8,%eax
-	xorq	%r11,%r13
-	roll	$8,%ecx
-	xorq	%r9,%r10
-	roll	$8,%ebx
-	xorq	%r12,%r13
-
-	roll	$8,%edx
-	xorl	%r10d,%eax
-	shrq	$32,%r10
-	xorl	%r13d,%ecx
-	shrq	$32,%r13
-	xorl	%r10d,%ebx
-	xorl	%r13d,%edx
-
-	movq	%r8,%r10
-	roll	$24,%r8d
-	movq	%r11,%r13
-	roll	$24,%r11d
-	shrq	$32,%r10
-	xorl	%r8d,%eax
-	shrq	$32,%r13
-	xorl	%r11d,%ecx
-	roll	$24,%r10d
-	movq	%r9,%r8
-	roll	$24,%r13d
-	movq	%r12,%r11
-	shrq	$32,%r8
-	xorl	%r10d,%ebx
-	shrq	$32,%r11
-	xorl	%r13d,%edx
-
-
-	roll	$16,%r9d
-
-	roll	$16,%r12d
-
-	roll	$16,%r8d
-
-	xorl	%r9d,%eax
-	roll	$16,%r11d
-	xorl	%r12d,%ecx
-
-	xorl	%r8d,%ebx
-	xorl	%r11d,%edx
-	movl	%eax,0(%r15)
-	movl	%ebx,4(%r15)
-	movl	%ecx,8(%r15)
-	movl	%edx,12(%r15)
-	subl	$1,%r14d
-	jnz	.Lpermute
-
-	xorq	%rax,%rax
-.Labort:
-	movq	8(%rsp),%r15
-.cfi_restore	%r15
-	movq	16(%rsp),%r14
-.cfi_restore	%r14
-	movq	24(%rsp),%r13
-.cfi_restore	%r13
-	movq	32(%rsp),%r12
-.cfi_restore	%r12
-	movq	40(%rsp),%rbp
-.cfi_restore	%rbp
-	movq	48(%rsp),%rbx
-.cfi_restore	%rbx
-	addq	$56,%rsp
-.cfi_adjust_cfa_offset	-56
-.Ldec_key_epilogue:
-	.byte	0xf3,0xc3
-.cfi_endproc	
-.size	AES_set_decrypt_key,.-AES_set_decrypt_key
-.globl	AES_cbc_encrypt
-.type	AES_cbc_encrypt,@function
-.align	16
-
-.globl	asm_AES_cbc_encrypt
-.hidden	asm_AES_cbc_encrypt
-asm_AES_cbc_encrypt:
-AES_cbc_encrypt:
-.cfi_startproc	
-	cmpq	$0,%rdx
-	je	.Lcbc_epilogue
-	pushfq
-
-
-.cfi_adjust_cfa_offset	8
-	pushq	%rbx
-.cfi_adjust_cfa_offset	8
-.cfi_offset	%rbx,-24
-	pushq	%rbp
-.cfi_adjust_cfa_offset	8
-.cfi_offset	%rbp,-32
-	pushq	%r12
-.cfi_adjust_cfa_offset	8
-.cfi_offset	%r12,-40
-	pushq	%r13
-.cfi_adjust_cfa_offset	8
-.cfi_offset	%r13,-48
-	pushq	%r14
-.cfi_adjust_cfa_offset	8
-.cfi_offset	%r14,-56
-	pushq	%r15
-.cfi_adjust_cfa_offset	8
-.cfi_offset	%r15,-64
-.Lcbc_prologue:
-
-	cld
-	movl	%r9d,%r9d
-
-	leaq	.LAES_Te(%rip),%r14
-	leaq	.LAES_Td(%rip),%r10
-	cmpq	$0,%r9
-	cmoveq	%r10,%r14
-
-.cfi_remember_state	
-	movl	OPENSSL_ia32cap_P(%rip),%r10d
-	cmpq	$512,%rdx
-	jb	.Lcbc_slow_prologue
-	testq	$15,%rdx
-	jnz	.Lcbc_slow_prologue
-	btl	$28,%r10d
-	jc	.Lcbc_slow_prologue
-
-
-	leaq	-88-248(%rsp),%r15
-	andq	$-64,%r15
-
-
-	movq	%r14,%r10
-	leaq	2304(%r14),%r11
-	movq	%r15,%r12
-	andq	$0xFFF,%r10
-	andq	$0xFFF,%r11
-	andq	$0xFFF,%r12
-
-	cmpq	%r11,%r12
-	jb	.Lcbc_te_break_out
-	subq	%r11,%r12
-	subq	%r12,%r15
-	jmp	.Lcbc_te_ok
-.Lcbc_te_break_out:
-	subq	%r10,%r12
-	andq	$0xFFF,%r12
-	addq	$320,%r12
-	subq	%r12,%r15
-.align	4
-.Lcbc_te_ok:
-
-	xchgq	%rsp,%r15
-.cfi_def_cfa_register	%r15
-
-	movq	%r15,16(%rsp)
-.cfi_escape	0x0f,0x05,0x77,0x10,0x06,0x23,0x40
-.Lcbc_fast_body:
-	movq	%rdi,24(%rsp)
-	movq	%rsi,32(%rsp)
-	movq	%rdx,40(%rsp)
-	movq	%rcx,48(%rsp)
-	movq	%r8,56(%rsp)
-	movl	$0,80+240(%rsp)
-	movq	%r8,%rbp
-	movq	%r9,%rbx
-	movq	%rsi,%r9
-	movq	%rdi,%r8
-	movq	%rcx,%r15
-
-	movl	240(%r15),%eax
-
-	movq	%r15,%r10
-	subq	%r14,%r10
-	andq	$0xfff,%r10
-	cmpq	$2304,%r10
-	jb	.Lcbc_do_ecopy
-	cmpq	$4096-248,%r10
-	jb	.Lcbc_skip_ecopy
-.align	4
-.Lcbc_do_ecopy:
-	movq	%r15,%rsi
-	leaq	80(%rsp),%rdi
-	leaq	80(%rsp),%r15
-	movl	$30,%ecx
-.long	0x90A548F3
-	movl	%eax,(%rdi)
-.Lcbc_skip_ecopy:
-	movq	%r15,0(%rsp)
-
-	movl	$18,%ecx
-.align	4
-.Lcbc_prefetch_te:
-	movq	0(%r14),%r10
-	movq	32(%r14),%r11
-	movq	64(%r14),%r12
-	movq	96(%r14),%r13
-	leaq	128(%r14),%r14
-	subl	$1,%ecx
-	jnz	.Lcbc_prefetch_te
-	leaq	-2304(%r14),%r14
-
-	cmpq	$0,%rbx
-	je	.LFAST_DECRYPT
-
-
-	movl	0(%rbp),%eax
-	movl	4(%rbp),%ebx
-	movl	8(%rbp),%ecx
-	movl	12(%rbp),%edx
-
-.align	4
-.Lcbc_fast_enc_loop:
-	xorl	0(%r8),%eax
-	xorl	4(%r8),%ebx
-	xorl	8(%r8),%ecx
-	xorl	12(%r8),%edx
-	movq	0(%rsp),%r15
-	movq	%r8,24(%rsp)
-
-	call	_x86_64_AES_encrypt
-
-	movq	24(%rsp),%r8
-	movq	40(%rsp),%r10
-	movl	%eax,0(%r9)
-	movl	%ebx,4(%r9)
-	movl	%ecx,8(%r9)
-	movl	%edx,12(%r9)
-
-	leaq	16(%r8),%r8
-	leaq	16(%r9),%r9
-	subq	$16,%r10
-	testq	$-16,%r10
-	movq	%r10,40(%rsp)
-	jnz	.Lcbc_fast_enc_loop
-	movq	56(%rsp),%rbp
-	movl	%eax,0(%rbp)
-	movl	%ebx,4(%rbp)
-	movl	%ecx,8(%rbp)
-	movl	%edx,12(%rbp)
-
-	jmp	.Lcbc_fast_cleanup
-
-
-.align	16
-.LFAST_DECRYPT:
-	cmpq	%r8,%r9
-	je	.Lcbc_fast_dec_in_place
-
-	movq	%rbp,64(%rsp)
-.align	4
-.Lcbc_fast_dec_loop:
-	movl	0(%r8),%eax
-	movl	4(%r8),%ebx
-	movl	8(%r8),%ecx
-	movl	12(%r8),%edx
-	movq	0(%rsp),%r15
-	movq	%r8,24(%rsp)
-
-	call	_x86_64_AES_decrypt
-
-	movq	64(%rsp),%rbp
-	movq	24(%rsp),%r8
-	movq	40(%rsp),%r10
-	xorl	0(%rbp),%eax
-	xorl	4(%rbp),%ebx
-	xorl	8(%rbp),%ecx
-	xorl	12(%rbp),%edx
-	movq	%r8,%rbp
-
-	subq	$16,%r10
-	movq	%r10,40(%rsp)
-	movq	%rbp,64(%rsp)
-
-	movl	%eax,0(%r9)
-	movl	%ebx,4(%r9)
-	movl	%ecx,8(%r9)
-	movl	%edx,12(%r9)
-
-	leaq	16(%r8),%r8
-	leaq	16(%r9),%r9
-	jnz	.Lcbc_fast_dec_loop
-	movq	56(%rsp),%r12
-	movq	0(%rbp),%r10
-	movq	8(%rbp),%r11
-	movq	%r10,0(%r12)
-	movq	%r11,8(%r12)
-	jmp	.Lcbc_fast_cleanup
-
-.align	16
-.Lcbc_fast_dec_in_place:
-	movq	0(%rbp),%r10
-	movq	8(%rbp),%r11
-	movq	%r10,0+64(%rsp)
-	movq	%r11,8+64(%rsp)
-.align	4
-.Lcbc_fast_dec_in_place_loop:
-	movl	0(%r8),%eax
-	movl	4(%r8),%ebx
-	movl	8(%r8),%ecx
-	movl	12(%r8),%edx
-	movq	0(%rsp),%r15
-	movq	%r8,24(%rsp)
-
-	call	_x86_64_AES_decrypt
-
-	movq	24(%rsp),%r8
-	movq	40(%rsp),%r10
-	xorl	0+64(%rsp),%eax
-	xorl	4+64(%rsp),%ebx
-	xorl	8+64(%rsp),%ecx
-	xorl	12+64(%rsp),%edx
-
-	movq	0(%r8),%r11
-	movq	8(%r8),%r12
-	subq	$16,%r10
-	jz	.Lcbc_fast_dec_in_place_done
-
-	movq	%r11,0+64(%rsp)
-	movq	%r12,8+64(%rsp)
-
-	movl	%eax,0(%r9)
-	movl	%ebx,4(%r9)
-	movl	%ecx,8(%r9)
-	movl	%edx,12(%r9)
-
-	leaq	16(%r8),%r8
-	leaq	16(%r9),%r9
-	movq	%r10,40(%rsp)
-	jmp	.Lcbc_fast_dec_in_place_loop
-.Lcbc_fast_dec_in_place_done:
-	movq	56(%rsp),%rdi
-	movq	%r11,0(%rdi)
-	movq	%r12,8(%rdi)
-
-	movl	%eax,0(%r9)
-	movl	%ebx,4(%r9)
-	movl	%ecx,8(%r9)
-	movl	%edx,12(%r9)
-
-.align	4
-.Lcbc_fast_cleanup:
-	cmpl	$0,80+240(%rsp)
-	leaq	80(%rsp),%rdi
-	je	.Lcbc_exit
-	movl	$30,%ecx
-	xorq	%rax,%rax
-.long	0x90AB48F3
-
-	jmp	.Lcbc_exit
-
-
-.align	16
-.Lcbc_slow_prologue:
-.cfi_restore_state	
-
-	leaq	-88(%rsp),%rbp
-	andq	$-64,%rbp
-
-	leaq	-88-63(%rcx),%r10
-	subq	%rbp,%r10
-	negq	%r10
-	andq	$0x3c0,%r10
-	subq	%r10,%rbp
-
-	xchgq	%rsp,%rbp
-.cfi_def_cfa_register	%rbp
-
-	movq	%rbp,16(%rsp)
-.cfi_escape	0x0f,0x05,0x77,0x10,0x06,0x23,0x40
-.Lcbc_slow_body:
-
-
-
-
-	movq	%r8,56(%rsp)
-	movq	%r8,%rbp
-	movq	%r9,%rbx
-	movq	%rsi,%r9
-	movq	%rdi,%r8
-	movq	%rcx,%r15
-	movq	%rdx,%r10
-
-	movl	240(%r15),%eax
-	movq	%r15,0(%rsp)
-	shll	$4,%eax
-	leaq	(%r15,%rax,1),%rax
-	movq	%rax,8(%rsp)
-
-
-	leaq	2048(%r14),%r14
-	leaq	768-8(%rsp),%rax
-	subq	%r14,%rax
-	andq	$0x300,%rax
-	leaq	(%r14,%rax,1),%r14
-
-	cmpq	$0,%rbx
-	je	.LSLOW_DECRYPT
-
-
-	testq	$-16,%r10
-	movl	0(%rbp),%eax
-	movl	4(%rbp),%ebx
-	movl	8(%rbp),%ecx
-	movl	12(%rbp),%edx
-	jz	.Lcbc_slow_enc_tail
-
-.align	4
-.Lcbc_slow_enc_loop:
-	xorl	0(%r8),%eax
-	xorl	4(%r8),%ebx
-	xorl	8(%r8),%ecx
-	xorl	12(%r8),%edx
-	movq	0(%rsp),%r15
-	movq	%r8,24(%rsp)
-	movq	%r9,32(%rsp)
-	movq	%r10,40(%rsp)
-
-	call	_x86_64_AES_encrypt_compact
-
-	movq	24(%rsp),%r8
-	movq	32(%rsp),%r9
-	movq	40(%rsp),%r10
-	movl	%eax,0(%r9)
-	movl	%ebx,4(%r9)
-	movl	%ecx,8(%r9)
-	movl	%edx,12(%r9)
-
-	leaq	16(%r8),%r8
-	leaq	16(%r9),%r9
-	subq	$16,%r10
-	testq	$-16,%r10
-	jnz	.Lcbc_slow_enc_loop
-	testq	$15,%r10
-	jnz	.Lcbc_slow_enc_tail
-	movq	56(%rsp),%rbp
-	movl	%eax,0(%rbp)
-	movl	%ebx,4(%rbp)
-	movl	%ecx,8(%rbp)
-	movl	%edx,12(%rbp)
-
-	jmp	.Lcbc_exit
-
-.align	4
-.Lcbc_slow_enc_tail:
-	movq	%rax,%r11
-	movq	%rcx,%r12
-	movq	%r10,%rcx
-	movq	%r8,%rsi
-	movq	%r9,%rdi
-.long	0x9066A4F3
-	movq	$16,%rcx
-	subq	%r10,%rcx
-	xorq	%rax,%rax
-.long	0x9066AAF3
-	movq	%r9,%r8
-	movq	$16,%r10
-	movq	%r11,%rax
-	movq	%r12,%rcx
-	jmp	.Lcbc_slow_enc_loop
-
-.align	16
-.LSLOW_DECRYPT:
-	shrq	$3,%rax
-	addq	%rax,%r14
-
-	movq	0(%rbp),%r11
-	movq	8(%rbp),%r12
-	movq	%r11,0+64(%rsp)
-	movq	%r12,8+64(%rsp)
-
-.align	4
-.Lcbc_slow_dec_loop:
-	movl	0(%r8),%eax
-	movl	4(%r8),%ebx
-	movl	8(%r8),%ecx
-	movl	12(%r8),%edx
-	movq	0(%rsp),%r15
-	movq	%r8,24(%rsp)
-	movq	%r9,32(%rsp)
-	movq	%r10,40(%rsp)
-
-	call	_x86_64_AES_decrypt_compact
-
-	movq	24(%rsp),%r8
-	movq	32(%rsp),%r9
-	movq	40(%rsp),%r10
-	xorl	0+64(%rsp),%eax
-	xorl	4+64(%rsp),%ebx
-	xorl	8+64(%rsp),%ecx
-	xorl	12+64(%rsp),%edx
-
-	movq	0(%r8),%r11
-	movq	8(%r8),%r12
-	subq	$16,%r10
-	jc	.Lcbc_slow_dec_partial
-	jz	.Lcbc_slow_dec_done
-
-	movq	%r11,0+64(%rsp)
-	movq	%r12,8+64(%rsp)
-
-	movl	%eax,0(%r9)
-	movl	%ebx,4(%r9)
-	movl	%ecx,8(%r9)
-	movl	%edx,12(%r9)
-
-	leaq	16(%r8),%r8
-	leaq	16(%r9),%r9
-	jmp	.Lcbc_slow_dec_loop
-.Lcbc_slow_dec_done:
-	movq	56(%rsp),%rdi
-	movq	%r11,0(%rdi)
-	movq	%r12,8(%rdi)
-
-	movl	%eax,0(%r9)
-	movl	%ebx,4(%r9)
-	movl	%ecx,8(%r9)
-	movl	%edx,12(%r9)
-
-	jmp	.Lcbc_exit
-
-.align	4
-.Lcbc_slow_dec_partial:
-	movq	56(%rsp),%rdi
-	movq	%r11,0(%rdi)
-	movq	%r12,8(%rdi)
-
-	movl	%eax,0+64(%rsp)
-	movl	%ebx,4+64(%rsp)
-	movl	%ecx,8+64(%rsp)
-	movl	%edx,12+64(%rsp)
-
-	movq	%r9,%rdi
-	leaq	64(%rsp),%rsi
-	leaq	16(%r10),%rcx
-.long	0x9066A4F3
-	jmp	.Lcbc_exit
-
-.align	16
-.Lcbc_exit:
-	movq	16(%rsp),%rsi
-.cfi_def_cfa	%rsi,64
-	movq	(%rsi),%r15
-.cfi_restore	%r15
-	movq	8(%rsi),%r14
-.cfi_restore	%r14
-	movq	16(%rsi),%r13
-.cfi_restore	%r13
-	movq	24(%rsi),%r12
-.cfi_restore	%r12
-	movq	32(%rsi),%rbp
-.cfi_restore	%rbp
-	movq	40(%rsi),%rbx
-.cfi_restore	%rbx
-	leaq	48(%rsi),%rsp
-.cfi_def_cfa	%rsp,16
-.Lcbc_popfq:
-	popfq
-
-
-.cfi_adjust_cfa_offset	-8
-.Lcbc_epilogue:
-	.byte	0xf3,0xc3
-.cfi_endproc	
-.size	AES_cbc_encrypt,.-AES_cbc_encrypt
-.align	64
-.LAES_Te:
-.long	0xa56363c6,0xa56363c6
-.long	0x847c7cf8,0x847c7cf8
-.long	0x997777ee,0x997777ee
-.long	0x8d7b7bf6,0x8d7b7bf6
-.long	0x0df2f2ff,0x0df2f2ff
-.long	0xbd6b6bd6,0xbd6b6bd6
-.long	0xb16f6fde,0xb16f6fde
-.long	0x54c5c591,0x54c5c591
-.long	0x50303060,0x50303060
-.long	0x03010102,0x03010102
-.long	0xa96767ce,0xa96767ce
-.long	0x7d2b2b56,0x7d2b2b56
-.long	0x19fefee7,0x19fefee7
-.long	0x62d7d7b5,0x62d7d7b5
-.long	0xe6abab4d,0xe6abab4d
-.long	0x9a7676ec,0x9a7676ec
-.long	0x45caca8f,0x45caca8f
-.long	0x9d82821f,0x9d82821f
-.long	0x40c9c989,0x40c9c989
-.long	0x877d7dfa,0x877d7dfa
-.long	0x15fafaef,0x15fafaef
-.long	0xeb5959b2,0xeb5959b2
-.long	0xc947478e,0xc947478e
-.long	0x0bf0f0fb,0x0bf0f0fb
-.long	0xecadad41,0xecadad41
-.long	0x67d4d4b3,0x67d4d4b3
-.long	0xfda2a25f,0xfda2a25f
-.long	0xeaafaf45,0xeaafaf45
-.long	0xbf9c9c23,0xbf9c9c23
-.long	0xf7a4a453,0xf7a4a453
-.long	0x967272e4,0x967272e4
-.long	0x5bc0c09b,0x5bc0c09b
-.long	0xc2b7b775,0xc2b7b775
-.long	0x1cfdfde1,0x1cfdfde1
-.long	0xae93933d,0xae93933d
-.long	0x6a26264c,0x6a26264c
-.long	0x5a36366c,0x5a36366c
-.long	0x413f3f7e,0x413f3f7e
-.long	0x02f7f7f5,0x02f7f7f5
-.long	0x4fcccc83,0x4fcccc83
-.long	0x5c343468,0x5c343468
-.long	0xf4a5a551,0xf4a5a551
-.long	0x34e5e5d1,0x34e5e5d1
-.long	0x08f1f1f9,0x08f1f1f9
-.long	0x937171e2,0x937171e2
-.long	0x73d8d8ab,0x73d8d8ab
-.long	0x53313162,0x53313162
-.long	0x3f15152a,0x3f15152a
-.long	0x0c040408,0x0c040408
-.long	0x52c7c795,0x52c7c795
-.long	0x65232346,0x65232346
-.long	0x5ec3c39d,0x5ec3c39d
-.long	0x28181830,0x28181830
-.long	0xa1969637,0xa1969637
-.long	0x0f05050a,0x0f05050a
-.long	0xb59a9a2f,0xb59a9a2f
-.long	0x0907070e,0x0907070e
-.long	0x36121224,0x36121224
-.long	0x9b80801b,0x9b80801b
-.long	0x3de2e2df,0x3de2e2df
-.long	0x26ebebcd,0x26ebebcd
-.long	0x6927274e,0x6927274e
-.long	0xcdb2b27f,0xcdb2b27f
-.long	0x9f7575ea,0x9f7575ea
-.long	0x1b090912,0x1b090912
-.long	0x9e83831d,0x9e83831d
-.long	0x742c2c58,0x742c2c58
-.long	0x2e1a1a34,0x2e1a1a34
-.long	0x2d1b1b36,0x2d1b1b36
-.long	0xb26e6edc,0xb26e6edc
-.long	0xee5a5ab4,0xee5a5ab4
-.long	0xfba0a05b,0xfba0a05b
-.long	0xf65252a4,0xf65252a4
-.long	0x4d3b3b76,0x4d3b3b76
-.long	0x61d6d6b7,0x61d6d6b7
-.long	0xceb3b37d,0xceb3b37d
-.long	0x7b292952,0x7b292952
-.long	0x3ee3e3dd,0x3ee3e3dd
-.long	0x712f2f5e,0x712f2f5e
-.long	0x97848413,0x97848413
-.long	0xf55353a6,0xf55353a6
-.long	0x68d1d1b9,0x68d1d1b9
-.long	0x00000000,0x00000000
-.long	0x2cededc1,0x2cededc1
-.long	0x60202040,0x60202040
-.long	0x1ffcfce3,0x1ffcfce3
-.long	0xc8b1b179,0xc8b1b179
-.long	0xed5b5bb6,0xed5b5bb6
-.long	0xbe6a6ad4,0xbe6a6ad4
-.long	0x46cbcb8d,0x46cbcb8d
-.long	0xd9bebe67,0xd9bebe67
-.long	0x4b393972,0x4b393972
-.long	0xde4a4a94,0xde4a4a94
-.long	0xd44c4c98,0xd44c4c98
-.long	0xe85858b0,0xe85858b0
-.long	0x4acfcf85,0x4acfcf85
-.long	0x6bd0d0bb,0x6bd0d0bb
-.long	0x2aefefc5,0x2aefefc5
-.long	0xe5aaaa4f,0xe5aaaa4f
-.long	0x16fbfbed,0x16fbfbed
-.long	0xc5434386,0xc5434386
-.long	0xd74d4d9a,0xd74d4d9a
-.long	0x55333366,0x55333366
-.long	0x94858511,0x94858511
-.long	0xcf45458a,0xcf45458a
-.long	0x10f9f9e9,0x10f9f9e9
-.long	0x06020204,0x06020204
-.long	0x817f7ffe,0x817f7ffe
-.long	0xf05050a0,0xf05050a0
-.long	0x443c3c78,0x443c3c78
-.long	0xba9f9f25,0xba9f9f25
-.long	0xe3a8a84b,0xe3a8a84b
-.long	0xf35151a2,0xf35151a2
-.long	0xfea3a35d,0xfea3a35d
-.long	0xc0404080,0xc0404080
-.long	0x8a8f8f05,0x8a8f8f05
-.long	0xad92923f,0xad92923f
-.long	0xbc9d9d21,0xbc9d9d21
-.long	0x48383870,0x48383870
-.long	0x04f5f5f1,0x04f5f5f1
-.long	0xdfbcbc63,0xdfbcbc63
-.long	0xc1b6b677,0xc1b6b677
-.long	0x75dadaaf,0x75dadaaf
-.long	0x63212142,0x63212142
-.long	0x30101020,0x30101020
-.long	0x1affffe5,0x1affffe5
-.long	0x0ef3f3fd,0x0ef3f3fd
-.long	0x6dd2d2bf,0x6dd2d2bf
-.long	0x4ccdcd81,0x4ccdcd81
-.long	0x140c0c18,0x140c0c18
-.long	0x35131326,0x35131326
-.long	0x2fececc3,0x2fececc3
-.long	0xe15f5fbe,0xe15f5fbe
-.long	0xa2979735,0xa2979735
-.long	0xcc444488,0xcc444488
-.long	0x3917172e,0x3917172e
-.long	0x57c4c493,0x57c4c493
-.long	0xf2a7a755,0xf2a7a755
-.long	0x827e7efc,0x827e7efc
-.long	0x473d3d7a,0x473d3d7a
-.long	0xac6464c8,0xac6464c8
-.long	0xe75d5dba,0xe75d5dba
-.long	0x2b191932,0x2b191932
-.long	0x957373e6,0x957373e6
-.long	0xa06060c0,0xa06060c0
-.long	0x98818119,0x98818119
-.long	0xd14f4f9e,0xd14f4f9e
-.long	0x7fdcdca3,0x7fdcdca3
-.long	0x66222244,0x66222244
-.long	0x7e2a2a54,0x7e2a2a54
-.long	0xab90903b,0xab90903b
-.long	0x8388880b,0x8388880b
-.long	0xca46468c,0xca46468c
-.long	0x29eeeec7,0x29eeeec7
-.long	0xd3b8b86b,0xd3b8b86b
-.long	0x3c141428,0x3c141428
-.long	0x79dedea7,0x79dedea7
-.long	0xe25e5ebc,0xe25e5ebc
-.long	0x1d0b0b16,0x1d0b0b16
-.long	0x76dbdbad,0x76dbdbad
-.long	0x3be0e0db,0x3be0e0db
-.long	0x56323264,0x56323264
-.long	0x4e3a3a74,0x4e3a3a74
-.long	0x1e0a0a14,0x1e0a0a14
-.long	0xdb494992,0xdb494992
-.long	0x0a06060c,0x0a06060c
-.long	0x6c242448,0x6c242448
-.long	0xe45c5cb8,0xe45c5cb8
-.long	0x5dc2c29f,0x5dc2c29f
-.long	0x6ed3d3bd,0x6ed3d3bd
-.long	0xefacac43,0xefacac43
-.long	0xa66262c4,0xa66262c4
-.long	0xa8919139,0xa8919139
-.long	0xa4959531,0xa4959531
-.long	0x37e4e4d3,0x37e4e4d3
-.long	0x8b7979f2,0x8b7979f2
-.long	0x32e7e7d5,0x32e7e7d5
-.long	0x43c8c88b,0x43c8c88b
-.long	0x5937376e,0x5937376e
-.long	0xb76d6dda,0xb76d6dda
-.long	0x8c8d8d01,0x8c8d8d01
-.long	0x64d5d5b1,0x64d5d5b1
-.long	0xd24e4e9c,0xd24e4e9c
-.long	0xe0a9a949,0xe0a9a949
-.long	0xb46c6cd8,0xb46c6cd8
-.long	0xfa5656ac,0xfa5656ac
-.long	0x07f4f4f3,0x07f4f4f3
-.long	0x25eaeacf,0x25eaeacf
-.long	0xaf6565ca,0xaf6565ca
-.long	0x8e7a7af4,0x8e7a7af4
-.long	0xe9aeae47,0xe9aeae47
-.long	0x18080810,0x18080810
-.long	0xd5baba6f,0xd5baba6f
-.long	0x887878f0,0x887878f0
-.long	0x6f25254a,0x6f25254a
-.long	0x722e2e5c,0x722e2e5c
-.long	0x241c1c38,0x241c1c38
-.long	0xf1a6a657,0xf1a6a657
-.long	0xc7b4b473,0xc7b4b473
-.long	0x51c6c697,0x51c6c697
-.long	0x23e8e8cb,0x23e8e8cb
-.long	0x7cdddda1,0x7cdddda1
-.long	0x9c7474e8,0x9c7474e8
-.long	0x211f1f3e,0x211f1f3e
-.long	0xdd4b4b96,0xdd4b4b96
-.long	0xdcbdbd61,0xdcbdbd61
-.long	0x868b8b0d,0x868b8b0d
-.long	0x858a8a0f,0x858a8a0f
-.long	0x907070e0,0x907070e0
-.long	0x423e3e7c,0x423e3e7c
-.long	0xc4b5b571,0xc4b5b571
-.long	0xaa6666cc,0xaa6666cc
-.long	0xd8484890,0xd8484890
-.long	0x05030306,0x05030306
-.long	0x01f6f6f7,0x01f6f6f7
-.long	0x120e0e1c,0x120e0e1c
-.long	0xa36161c2,0xa36161c2
-.long	0x5f35356a,0x5f35356a
-.long	0xf95757ae,0xf95757ae
-.long	0xd0b9b969,0xd0b9b969
-.long	0x91868617,0x91868617
-.long	0x58c1c199,0x58c1c199
-.long	0x271d1d3a,0x271d1d3a
-.long	0xb99e9e27,0xb99e9e27
-.long	0x38e1e1d9,0x38e1e1d9
-.long	0x13f8f8eb,0x13f8f8eb
-.long	0xb398982b,0xb398982b
-.long	0x33111122,0x33111122
-.long	0xbb6969d2,0xbb6969d2
-.long	0x70d9d9a9,0x70d9d9a9
-.long	0x898e8e07,0x898e8e07
-.long	0xa7949433,0xa7949433
-.long	0xb69b9b2d,0xb69b9b2d
-.long	0x221e1e3c,0x221e1e3c
-.long	0x92878715,0x92878715
-.long	0x20e9e9c9,0x20e9e9c9
-.long	0x49cece87,0x49cece87
-.long	0xff5555aa,0xff5555aa
-.long	0x78282850,0x78282850
-.long	0x7adfdfa5,0x7adfdfa5
-.long	0x8f8c8c03,0x8f8c8c03
-.long	0xf8a1a159,0xf8a1a159
-.long	0x80898909,0x80898909
-.long	0x170d0d1a,0x170d0d1a
-.long	0xdabfbf65,0xdabfbf65
-.long	0x31e6e6d7,0x31e6e6d7
-.long	0xc6424284,0xc6424284
-.long	0xb86868d0,0xb86868d0
-.long	0xc3414182,0xc3414182
-.long	0xb0999929,0xb0999929
-.long	0x772d2d5a,0x772d2d5a
-.long	0x110f0f1e,0x110f0f1e
-.long	0xcbb0b07b,0xcbb0b07b
-.long	0xfc5454a8,0xfc5454a8
-.long	0xd6bbbb6d,0xd6bbbb6d
-.long	0x3a16162c,0x3a16162c
-.byte	0x63,0x7c,0x77,0x7b,0xf2,0x6b,0x6f,0xc5
-.byte	0x30,0x01,0x67,0x2b,0xfe,0xd7,0xab,0x76
-.byte	0xca,0x82,0xc9,0x7d,0xfa,0x59,0x47,0xf0
-.byte	0xad,0xd4,0xa2,0xaf,0x9c,0xa4,0x72,0xc0
-.byte	0xb7,0xfd,0x93,0x26,0x36,0x3f,0xf7,0xcc
-.byte	0x34,0xa5,0xe5,0xf1,0x71,0xd8,0x31,0x15
-.byte	0x04,0xc7,0x23,0xc3,0x18,0x96,0x05,0x9a
-.byte	0x07,0x12,0x80,0xe2,0xeb,0x27,0xb2,0x75
-.byte	0x09,0x83,0x2c,0x1a,0x1b,0x6e,0x5a,0xa0
-.byte	0x52,0x3b,0xd6,0xb3,0x29,0xe3,0x2f,0x84
-.byte	0x53,0xd1,0x00,0xed,0x20,0xfc,0xb1,0x5b
-.byte	0x6a,0xcb,0xbe,0x39,0x4a,0x4c,0x58,0xcf
-.byte	0xd0,0xef,0xaa,0xfb,0x43,0x4d,0x33,0x85
-.byte	0x45,0xf9,0x02,0x7f,0x50,0x3c,0x9f,0xa8
-.byte	0x51,0xa3,0x40,0x8f,0x92,0x9d,0x38,0xf5
-.byte	0xbc,0xb6,0xda,0x21,0x10,0xff,0xf3,0xd2
-.byte	0xcd,0x0c,0x13,0xec,0x5f,0x97,0x44,0x17
-.byte	0xc4,0xa7,0x7e,0x3d,0x64,0x5d,0x19,0x73
-.byte	0x60,0x81,0x4f,0xdc,0x22,0x2a,0x90,0x88
-.byte	0x46,0xee,0xb8,0x14,0xde,0x5e,0x0b,0xdb
-.byte	0xe0,0x32,0x3a,0x0a,0x49,0x06,0x24,0x5c
-.byte	0xc2,0xd3,0xac,0x62,0x91,0x95,0xe4,0x79
-.byte	0xe7,0xc8,0x37,0x6d,0x8d,0xd5,0x4e,0xa9
-.byte	0x6c,0x56,0xf4,0xea,0x65,0x7a,0xae,0x08
-.byte	0xba,0x78,0x25,0x2e,0x1c,0xa6,0xb4,0xc6
-.byte	0xe8,0xdd,0x74,0x1f,0x4b,0xbd,0x8b,0x8a
-.byte	0x70,0x3e,0xb5,0x66,0x48,0x03,0xf6,0x0e
-.byte	0x61,0x35,0x57,0xb9,0x86,0xc1,0x1d,0x9e
-.byte	0xe1,0xf8,0x98,0x11,0x69,0xd9,0x8e,0x94
-.byte	0x9b,0x1e,0x87,0xe9,0xce,0x55,0x28,0xdf
-.byte	0x8c,0xa1,0x89,0x0d,0xbf,0xe6,0x42,0x68
-.byte	0x41,0x99,0x2d,0x0f,0xb0,0x54,0xbb,0x16
-.byte	0x63,0x7c,0x77,0x7b,0xf2,0x6b,0x6f,0xc5
-.byte	0x30,0x01,0x67,0x2b,0xfe,0xd7,0xab,0x76
-.byte	0xca,0x82,0xc9,0x7d,0xfa,0x59,0x47,0xf0
-.byte	0xad,0xd4,0xa2,0xaf,0x9c,0xa4,0x72,0xc0
-.byte	0xb7,0xfd,0x93,0x26,0x36,0x3f,0xf7,0xcc
-.byte	0x34,0xa5,0xe5,0xf1,0x71,0xd8,0x31,0x15
-.byte	0x04,0xc7,0x23,0xc3,0x18,0x96,0x05,0x9a
-.byte	0x07,0x12,0x80,0xe2,0xeb,0x27,0xb2,0x75
-.byte	0x09,0x83,0x2c,0x1a,0x1b,0x6e,0x5a,0xa0
-.byte	0x52,0x3b,0xd6,0xb3,0x29,0xe3,0x2f,0x84
-.byte	0x53,0xd1,0x00,0xed,0x20,0xfc,0xb1,0x5b
-.byte	0x6a,0xcb,0xbe,0x39,0x4a,0x4c,0x58,0xcf
-.byte	0xd0,0xef,0xaa,0xfb,0x43,0x4d,0x33,0x85
-.byte	0x45,0xf9,0x02,0x7f,0x50,0x3c,0x9f,0xa8
-.byte	0x51,0xa3,0x40,0x8f,0x92,0x9d,0x38,0xf5
-.byte	0xbc,0xb6,0xda,0x21,0x10,0xff,0xf3,0xd2
-.byte	0xcd,0x0c,0x13,0xec,0x5f,0x97,0x44,0x17
-.byte	0xc4,0xa7,0x7e,0x3d,0x64,0x5d,0x19,0x73
-.byte	0x60,0x81,0x4f,0xdc,0x22,0x2a,0x90,0x88
-.byte	0x46,0xee,0xb8,0x14,0xde,0x5e,0x0b,0xdb
-.byte	0xe0,0x32,0x3a,0x0a,0x49,0x06,0x24,0x5c
-.byte	0xc2,0xd3,0xac,0x62,0x91,0x95,0xe4,0x79
-.byte	0xe7,0xc8,0x37,0x6d,0x8d,0xd5,0x4e,0xa9
-.byte	0x6c,0x56,0xf4,0xea,0x65,0x7a,0xae,0x08
-.byte	0xba,0x78,0x25,0x2e,0x1c,0xa6,0xb4,0xc6
-.byte	0xe8,0xdd,0x74,0x1f,0x4b,0xbd,0x8b,0x8a
-.byte	0x70,0x3e,0xb5,0x66,0x48,0x03,0xf6,0x0e
-.byte	0x61,0x35,0x57,0xb9,0x86,0xc1,0x1d,0x9e
-.byte	0xe1,0xf8,0x98,0x11,0x69,0xd9,0x8e,0x94
-.byte	0x9b,0x1e,0x87,0xe9,0xce,0x55,0x28,0xdf
-.byte	0x8c,0xa1,0x89,0x0d,0xbf,0xe6,0x42,0x68
-.byte	0x41,0x99,0x2d,0x0f,0xb0,0x54,0xbb,0x16
-.byte	0x63,0x7c,0x77,0x7b,0xf2,0x6b,0x6f,0xc5
-.byte	0x30,0x01,0x67,0x2b,0xfe,0xd7,0xab,0x76
-.byte	0xca,0x82,0xc9,0x7d,0xfa,0x59,0x47,0xf0
-.byte	0xad,0xd4,0xa2,0xaf,0x9c,0xa4,0x72,0xc0
-.byte	0xb7,0xfd,0x93,0x26,0x36,0x3f,0xf7,0xcc
-.byte	0x34,0xa5,0xe5,0xf1,0x71,0xd8,0x31,0x15
-.byte	0x04,0xc7,0x23,0xc3,0x18,0x96,0x05,0x9a
-.byte	0x07,0x12,0x80,0xe2,0xeb,0x27,0xb2,0x75
-.byte	0x09,0x83,0x2c,0x1a,0x1b,0x6e,0x5a,0xa0
-.byte	0x52,0x3b,0xd6,0xb3,0x29,0xe3,0x2f,0x84
-.byte	0x53,0xd1,0x00,0xed,0x20,0xfc,0xb1,0x5b
-.byte	0x6a,0xcb,0xbe,0x39,0x4a,0x4c,0x58,0xcf
-.byte	0xd0,0xef,0xaa,0xfb,0x43,0x4d,0x33,0x85
-.byte	0x45,0xf9,0x02,0x7f,0x50,0x3c,0x9f,0xa8
-.byte	0x51,0xa3,0x40,0x8f,0x92,0x9d,0x38,0xf5
-.byte	0xbc,0xb6,0xda,0x21,0x10,0xff,0xf3,0xd2
-.byte	0xcd,0x0c,0x13,0xec,0x5f,0x97,0x44,0x17
-.byte	0xc4,0xa7,0x7e,0x3d,0x64,0x5d,0x19,0x73
-.byte	0x60,0x81,0x4f,0xdc,0x22,0x2a,0x90,0x88
-.byte	0x46,0xee,0xb8,0x14,0xde,0x5e,0x0b,0xdb
-.byte	0xe0,0x32,0x3a,0x0a,0x49,0x06,0x24,0x5c
-.byte	0xc2,0xd3,0xac,0x62,0x91,0x95,0xe4,0x79
-.byte	0xe7,0xc8,0x37,0x6d,0x8d,0xd5,0x4e,0xa9
-.byte	0x6c,0x56,0xf4,0xea,0x65,0x7a,0xae,0x08
-.byte	0xba,0x78,0x25,0x2e,0x1c,0xa6,0xb4,0xc6
-.byte	0xe8,0xdd,0x74,0x1f,0x4b,0xbd,0x8b,0x8a
-.byte	0x70,0x3e,0xb5,0x66,0x48,0x03,0xf6,0x0e
-.byte	0x61,0x35,0x57,0xb9,0x86,0xc1,0x1d,0x9e
-.byte	0xe1,0xf8,0x98,0x11,0x69,0xd9,0x8e,0x94
-.byte	0x9b,0x1e,0x87,0xe9,0xce,0x55,0x28,0xdf
-.byte	0x8c,0xa1,0x89,0x0d,0xbf,0xe6,0x42,0x68
-.byte	0x41,0x99,0x2d,0x0f,0xb0,0x54,0xbb,0x16
-.byte	0x63,0x7c,0x77,0x7b,0xf2,0x6b,0x6f,0xc5
-.byte	0x30,0x01,0x67,0x2b,0xfe,0xd7,0xab,0x76
-.byte	0xca,0x82,0xc9,0x7d,0xfa,0x59,0x47,0xf0
-.byte	0xad,0xd4,0xa2,0xaf,0x9c,0xa4,0x72,0xc0
-.byte	0xb7,0xfd,0x93,0x26,0x36,0x3f,0xf7,0xcc
-.byte	0x34,0xa5,0xe5,0xf1,0x71,0xd8,0x31,0x15
-.byte	0x04,0xc7,0x23,0xc3,0x18,0x96,0x05,0x9a
-.byte	0x07,0x12,0x80,0xe2,0xeb,0x27,0xb2,0x75
-.byte	0x09,0x83,0x2c,0x1a,0x1b,0x6e,0x5a,0xa0
-.byte	0x52,0x3b,0xd6,0xb3,0x29,0xe3,0x2f,0x84
-.byte	0x53,0xd1,0x00,0xed,0x20,0xfc,0xb1,0x5b
-.byte	0x6a,0xcb,0xbe,0x39,0x4a,0x4c,0x58,0xcf
-.byte	0xd0,0xef,0xaa,0xfb,0x43,0x4d,0x33,0x85
-.byte	0x45,0xf9,0x02,0x7f,0x50,0x3c,0x9f,0xa8
-.byte	0x51,0xa3,0x40,0x8f,0x92,0x9d,0x38,0xf5
-.byte	0xbc,0xb6,0xda,0x21,0x10,0xff,0xf3,0xd2
-.byte	0xcd,0x0c,0x13,0xec,0x5f,0x97,0x44,0x17
-.byte	0xc4,0xa7,0x7e,0x3d,0x64,0x5d,0x19,0x73
-.byte	0x60,0x81,0x4f,0xdc,0x22,0x2a,0x90,0x88
-.byte	0x46,0xee,0xb8,0x14,0xde,0x5e,0x0b,0xdb
-.byte	0xe0,0x32,0x3a,0x0a,0x49,0x06,0x24,0x5c
-.byte	0xc2,0xd3,0xac,0x62,0x91,0x95,0xe4,0x79
-.byte	0xe7,0xc8,0x37,0x6d,0x8d,0xd5,0x4e,0xa9
-.byte	0x6c,0x56,0xf4,0xea,0x65,0x7a,0xae,0x08
-.byte	0xba,0x78,0x25,0x2e,0x1c,0xa6,0xb4,0xc6
-.byte	0xe8,0xdd,0x74,0x1f,0x4b,0xbd,0x8b,0x8a
-.byte	0x70,0x3e,0xb5,0x66,0x48,0x03,0xf6,0x0e
-.byte	0x61,0x35,0x57,0xb9,0x86,0xc1,0x1d,0x9e
-.byte	0xe1,0xf8,0x98,0x11,0x69,0xd9,0x8e,0x94
-.byte	0x9b,0x1e,0x87,0xe9,0xce,0x55,0x28,0xdf
-.byte	0x8c,0xa1,0x89,0x0d,0xbf,0xe6,0x42,0x68
-.byte	0x41,0x99,0x2d,0x0f,0xb0,0x54,0xbb,0x16
-.long	0x00000001, 0x00000002, 0x00000004, 0x00000008
-.long	0x00000010, 0x00000020, 0x00000040, 0x00000080
-.long	0x0000001b, 0x00000036, 0x80808080, 0x80808080
-.long	0xfefefefe, 0xfefefefe, 0x1b1b1b1b, 0x1b1b1b1b
-.align	64
-.LAES_Td:
-.long	0x50a7f451,0x50a7f451
-.long	0x5365417e,0x5365417e
-.long	0xc3a4171a,0xc3a4171a
-.long	0x965e273a,0x965e273a
-.long	0xcb6bab3b,0xcb6bab3b
-.long	0xf1459d1f,0xf1459d1f
-.long	0xab58faac,0xab58faac
-.long	0x9303e34b,0x9303e34b
-.long	0x55fa3020,0x55fa3020
-.long	0xf66d76ad,0xf66d76ad
-.long	0x9176cc88,0x9176cc88
-.long	0x254c02f5,0x254c02f5
-.long	0xfcd7e54f,0xfcd7e54f
-.long	0xd7cb2ac5,0xd7cb2ac5
-.long	0x80443526,0x80443526
-.long	0x8fa362b5,0x8fa362b5
-.long	0x495ab1de,0x495ab1de
-.long	0x671bba25,0x671bba25
-.long	0x980eea45,0x980eea45
-.long	0xe1c0fe5d,0xe1c0fe5d
-.long	0x02752fc3,0x02752fc3
-.long	0x12f04c81,0x12f04c81
-.long	0xa397468d,0xa397468d
-.long	0xc6f9d36b,0xc6f9d36b
-.long	0xe75f8f03,0xe75f8f03
-.long	0x959c9215,0x959c9215
-.long	0xeb7a6dbf,0xeb7a6dbf
-.long	0xda595295,0xda595295
-.long	0x2d83bed4,0x2d83bed4
-.long	0xd3217458,0xd3217458
-.long	0x2969e049,0x2969e049
-.long	0x44c8c98e,0x44c8c98e
-.long	0x6a89c275,0x6a89c275
-.long	0x78798ef4,0x78798ef4
-.long	0x6b3e5899,0x6b3e5899
-.long	0xdd71b927,0xdd71b927
-.long	0xb64fe1be,0xb64fe1be
-.long	0x17ad88f0,0x17ad88f0
-.long	0x66ac20c9,0x66ac20c9
-.long	0xb43ace7d,0xb43ace7d
-.long	0x184adf63,0x184adf63
-.long	0x82311ae5,0x82311ae5
-.long	0x60335197,0x60335197
-.long	0x457f5362,0x457f5362
-.long	0xe07764b1,0xe07764b1
-.long	0x84ae6bbb,0x84ae6bbb
-.long	0x1ca081fe,0x1ca081fe
-.long	0x942b08f9,0x942b08f9
-.long	0x58684870,0x58684870
-.long	0x19fd458f,0x19fd458f
-.long	0x876cde94,0x876cde94
-.long	0xb7f87b52,0xb7f87b52
-.long	0x23d373ab,0x23d373ab
-.long	0xe2024b72,0xe2024b72
-.long	0x578f1fe3,0x578f1fe3
-.long	0x2aab5566,0x2aab5566
-.long	0x0728ebb2,0x0728ebb2
-.long	0x03c2b52f,0x03c2b52f
-.long	0x9a7bc586,0x9a7bc586
-.long	0xa50837d3,0xa50837d3
-.long	0xf2872830,0xf2872830
-.long	0xb2a5bf23,0xb2a5bf23
-.long	0xba6a0302,0xba6a0302
-.long	0x5c8216ed,0x5c8216ed
-.long	0x2b1ccf8a,0x2b1ccf8a
-.long	0x92b479a7,0x92b479a7
-.long	0xf0f207f3,0xf0f207f3
-.long	0xa1e2694e,0xa1e2694e
-.long	0xcdf4da65,0xcdf4da65
-.long	0xd5be0506,0xd5be0506
-.long	0x1f6234d1,0x1f6234d1
-.long	0x8afea6c4,0x8afea6c4
-.long	0x9d532e34,0x9d532e34
-.long	0xa055f3a2,0xa055f3a2
-.long	0x32e18a05,0x32e18a05
-.long	0x75ebf6a4,0x75ebf6a4
-.long	0x39ec830b,0x39ec830b
-.long	0xaaef6040,0xaaef6040
-.long	0x069f715e,0x069f715e
-.long	0x51106ebd,0x51106ebd
-.long	0xf98a213e,0xf98a213e
-.long	0x3d06dd96,0x3d06dd96
-.long	0xae053edd,0xae053edd
-.long	0x46bde64d,0x46bde64d
-.long	0xb58d5491,0xb58d5491
-.long	0x055dc471,0x055dc471
-.long	0x6fd40604,0x6fd40604
-.long	0xff155060,0xff155060
-.long	0x24fb9819,0x24fb9819
-.long	0x97e9bdd6,0x97e9bdd6
-.long	0xcc434089,0xcc434089
-.long	0x779ed967,0x779ed967
-.long	0xbd42e8b0,0xbd42e8b0
-.long	0x888b8907,0x888b8907
-.long	0x385b19e7,0x385b19e7
-.long	0xdbeec879,0xdbeec879
-.long	0x470a7ca1,0x470a7ca1
-.long	0xe90f427c,0xe90f427c
-.long	0xc91e84f8,0xc91e84f8
-.long	0x00000000,0x00000000
-.long	0x83868009,0x83868009
-.long	0x48ed2b32,0x48ed2b32
-.long	0xac70111e,0xac70111e
-.long	0x4e725a6c,0x4e725a6c
-.long	0xfbff0efd,0xfbff0efd
-.long	0x5638850f,0x5638850f
-.long	0x1ed5ae3d,0x1ed5ae3d
-.long	0x27392d36,0x27392d36
-.long	0x64d90f0a,0x64d90f0a
-.long	0x21a65c68,0x21a65c68
-.long	0xd1545b9b,0xd1545b9b
-.long	0x3a2e3624,0x3a2e3624
-.long	0xb1670a0c,0xb1670a0c
-.long	0x0fe75793,0x0fe75793
-.long	0xd296eeb4,0xd296eeb4
-.long	0x9e919b1b,0x9e919b1b
-.long	0x4fc5c080,0x4fc5c080
-.long	0xa220dc61,0xa220dc61
-.long	0x694b775a,0x694b775a
-.long	0x161a121c,0x161a121c
-.long	0x0aba93e2,0x0aba93e2
-.long	0xe52aa0c0,0xe52aa0c0
-.long	0x43e0223c,0x43e0223c
-.long	0x1d171b12,0x1d171b12
-.long	0x0b0d090e,0x0b0d090e
-.long	0xadc78bf2,0xadc78bf2
-.long	0xb9a8b62d,0xb9a8b62d
-.long	0xc8a91e14,0xc8a91e14
-.long	0x8519f157,0x8519f157
-.long	0x4c0775af,0x4c0775af
-.long	0xbbdd99ee,0xbbdd99ee
-.long	0xfd607fa3,0xfd607fa3
-.long	0x9f2601f7,0x9f2601f7
-.long	0xbcf5725c,0xbcf5725c
-.long	0xc53b6644,0xc53b6644
-.long	0x347efb5b,0x347efb5b
-.long	0x7629438b,0x7629438b
-.long	0xdcc623cb,0xdcc623cb
-.long	0x68fcedb6,0x68fcedb6
-.long	0x63f1e4b8,0x63f1e4b8
-.long	0xcadc31d7,0xcadc31d7
-.long	0x10856342,0x10856342
-.long	0x40229713,0x40229713
-.long	0x2011c684,0x2011c684
-.long	0x7d244a85,0x7d244a85
-.long	0xf83dbbd2,0xf83dbbd2
-.long	0x1132f9ae,0x1132f9ae
-.long	0x6da129c7,0x6da129c7
-.long	0x4b2f9e1d,0x4b2f9e1d
-.long	0xf330b2dc,0xf330b2dc
-.long	0xec52860d,0xec52860d
-.long	0xd0e3c177,0xd0e3c177
-.long	0x6c16b32b,0x6c16b32b
-.long	0x99b970a9,0x99b970a9
-.long	0xfa489411,0xfa489411
-.long	0x2264e947,0x2264e947
-.long	0xc48cfca8,0xc48cfca8
-.long	0x1a3ff0a0,0x1a3ff0a0
-.long	0xd82c7d56,0xd82c7d56
-.long	0xef903322,0xef903322
-.long	0xc74e4987,0xc74e4987
-.long	0xc1d138d9,0xc1d138d9
-.long	0xfea2ca8c,0xfea2ca8c
-.long	0x360bd498,0x360bd498
-.long	0xcf81f5a6,0xcf81f5a6
-.long	0x28de7aa5,0x28de7aa5
-.long	0x268eb7da,0x268eb7da
-.long	0xa4bfad3f,0xa4bfad3f
-.long	0xe49d3a2c,0xe49d3a2c
-.long	0x0d927850,0x0d927850
-.long	0x9bcc5f6a,0x9bcc5f6a
-.long	0x62467e54,0x62467e54
-.long	0xc2138df6,0xc2138df6
-.long	0xe8b8d890,0xe8b8d890
-.long	0x5ef7392e,0x5ef7392e
-.long	0xf5afc382,0xf5afc382
-.long	0xbe805d9f,0xbe805d9f
-.long	0x7c93d069,0x7c93d069
-.long	0xa92dd56f,0xa92dd56f
-.long	0xb31225cf,0xb31225cf
-.long	0x3b99acc8,0x3b99acc8
-.long	0xa77d1810,0xa77d1810
-.long	0x6e639ce8,0x6e639ce8
-.long	0x7bbb3bdb,0x7bbb3bdb
-.long	0x097826cd,0x097826cd
-.long	0xf418596e,0xf418596e
-.long	0x01b79aec,0x01b79aec
-.long	0xa89a4f83,0xa89a4f83
-.long	0x656e95e6,0x656e95e6
-.long	0x7ee6ffaa,0x7ee6ffaa
-.long	0x08cfbc21,0x08cfbc21
-.long	0xe6e815ef,0xe6e815ef
-.long	0xd99be7ba,0xd99be7ba
-.long	0xce366f4a,0xce366f4a
-.long	0xd4099fea,0xd4099fea
-.long	0xd67cb029,0xd67cb029
-.long	0xafb2a431,0xafb2a431
-.long	0x31233f2a,0x31233f2a
-.long	0x3094a5c6,0x3094a5c6
-.long	0xc066a235,0xc066a235
-.long	0x37bc4e74,0x37bc4e74
-.long	0xa6ca82fc,0xa6ca82fc
-.long	0xb0d090e0,0xb0d090e0
-.long	0x15d8a733,0x15d8a733
-.long	0x4a9804f1,0x4a9804f1
-.long	0xf7daec41,0xf7daec41
-.long	0x0e50cd7f,0x0e50cd7f
-.long	0x2ff69117,0x2ff69117
-.long	0x8dd64d76,0x8dd64d76
-.long	0x4db0ef43,0x4db0ef43
-.long	0x544daacc,0x544daacc
-.long	0xdf0496e4,0xdf0496e4
-.long	0xe3b5d19e,0xe3b5d19e
-.long	0x1b886a4c,0x1b886a4c
-.long	0xb81f2cc1,0xb81f2cc1
-.long	0x7f516546,0x7f516546
-.long	0x04ea5e9d,0x04ea5e9d
-.long	0x5d358c01,0x5d358c01
-.long	0x737487fa,0x737487fa
-.long	0x2e410bfb,0x2e410bfb
-.long	0x5a1d67b3,0x5a1d67b3
-.long	0x52d2db92,0x52d2db92
-.long	0x335610e9,0x335610e9
-.long	0x1347d66d,0x1347d66d
-.long	0x8c61d79a,0x8c61d79a
-.long	0x7a0ca137,0x7a0ca137
-.long	0x8e14f859,0x8e14f859
-.long	0x893c13eb,0x893c13eb
-.long	0xee27a9ce,0xee27a9ce
-.long	0x35c961b7,0x35c961b7
-.long	0xede51ce1,0xede51ce1
-.long	0x3cb1477a,0x3cb1477a
-.long	0x59dfd29c,0x59dfd29c
-.long	0x3f73f255,0x3f73f255
-.long	0x79ce1418,0x79ce1418
-.long	0xbf37c773,0xbf37c773
-.long	0xeacdf753,0xeacdf753
-.long	0x5baafd5f,0x5baafd5f
-.long	0x146f3ddf,0x146f3ddf
-.long	0x86db4478,0x86db4478
-.long	0x81f3afca,0x81f3afca
-.long	0x3ec468b9,0x3ec468b9
-.long	0x2c342438,0x2c342438
-.long	0x5f40a3c2,0x5f40a3c2
-.long	0x72c31d16,0x72c31d16
-.long	0x0c25e2bc,0x0c25e2bc
-.long	0x8b493c28,0x8b493c28
-.long	0x41950dff,0x41950dff
-.long	0x7101a839,0x7101a839
-.long	0xdeb30c08,0xdeb30c08
-.long	0x9ce4b4d8,0x9ce4b4d8
-.long	0x90c15664,0x90c15664
-.long	0x6184cb7b,0x6184cb7b
-.long	0x70b632d5,0x70b632d5
-.long	0x745c6c48,0x745c6c48
-.long	0x4257b8d0,0x4257b8d0
-.byte	0x52,0x09,0x6a,0xd5,0x30,0x36,0xa5,0x38
-.byte	0xbf,0x40,0xa3,0x9e,0x81,0xf3,0xd7,0xfb
-.byte	0x7c,0xe3,0x39,0x82,0x9b,0x2f,0xff,0x87
-.byte	0x34,0x8e,0x43,0x44,0xc4,0xde,0xe9,0xcb
-.byte	0x54,0x7b,0x94,0x32,0xa6,0xc2,0x23,0x3d
-.byte	0xee,0x4c,0x95,0x0b,0x42,0xfa,0xc3,0x4e
-.byte	0x08,0x2e,0xa1,0x66,0x28,0xd9,0x24,0xb2
-.byte	0x76,0x5b,0xa2,0x49,0x6d,0x8b,0xd1,0x25
-.byte	0x72,0xf8,0xf6,0x64,0x86,0x68,0x98,0x16
-.byte	0xd4,0xa4,0x5c,0xcc,0x5d,0x65,0xb6,0x92
-.byte	0x6c,0x70,0x48,0x50,0xfd,0xed,0xb9,0xda
-.byte	0x5e,0x15,0x46,0x57,0xa7,0x8d,0x9d,0x84
-.byte	0x90,0xd8,0xab,0x00,0x8c,0xbc,0xd3,0x0a
-.byte	0xf7,0xe4,0x58,0x05,0xb8,0xb3,0x45,0x06
-.byte	0xd0,0x2c,0x1e,0x8f,0xca,0x3f,0x0f,0x02
-.byte	0xc1,0xaf,0xbd,0x03,0x01,0x13,0x8a,0x6b
-.byte	0x3a,0x91,0x11,0x41,0x4f,0x67,0xdc,0xea
-.byte	0x97,0xf2,0xcf,0xce,0xf0,0xb4,0xe6,0x73
-.byte	0x96,0xac,0x74,0x22,0xe7,0xad,0x35,0x85
-.byte	0xe2,0xf9,0x37,0xe8,0x1c,0x75,0xdf,0x6e
-.byte	0x47,0xf1,0x1a,0x71,0x1d,0x29,0xc5,0x89
-.byte	0x6f,0xb7,0x62,0x0e,0xaa,0x18,0xbe,0x1b
-.byte	0xfc,0x56,0x3e,0x4b,0xc6,0xd2,0x79,0x20
-.byte	0x9a,0xdb,0xc0,0xfe,0x78,0xcd,0x5a,0xf4
-.byte	0x1f,0xdd,0xa8,0x33,0x88,0x07,0xc7,0x31
-.byte	0xb1,0x12,0x10,0x59,0x27,0x80,0xec,0x5f
-.byte	0x60,0x51,0x7f,0xa9,0x19,0xb5,0x4a,0x0d
-.byte	0x2d,0xe5,0x7a,0x9f,0x93,0xc9,0x9c,0xef
-.byte	0xa0,0xe0,0x3b,0x4d,0xae,0x2a,0xf5,0xb0
-.byte	0xc8,0xeb,0xbb,0x3c,0x83,0x53,0x99,0x61
-.byte	0x17,0x2b,0x04,0x7e,0xba,0x77,0xd6,0x26
-.byte	0xe1,0x69,0x14,0x63,0x55,0x21,0x0c,0x7d
-.long	0x80808080, 0x80808080, 0xfefefefe, 0xfefefefe
-.long	0x1b1b1b1b, 0x1b1b1b1b, 0, 0
-.byte	0x52,0x09,0x6a,0xd5,0x30,0x36,0xa5,0x38
-.byte	0xbf,0x40,0xa3,0x9e,0x81,0xf3,0xd7,0xfb
-.byte	0x7c,0xe3,0x39,0x82,0x9b,0x2f,0xff,0x87
-.byte	0x34,0x8e,0x43,0x44,0xc4,0xde,0xe9,0xcb
-.byte	0x54,0x7b,0x94,0x32,0xa6,0xc2,0x23,0x3d
-.byte	0xee,0x4c,0x95,0x0b,0x42,0xfa,0xc3,0x4e
-.byte	0x08,0x2e,0xa1,0x66,0x28,0xd9,0x24,0xb2
-.byte	0x76,0x5b,0xa2,0x49,0x6d,0x8b,0xd1,0x25
-.byte	0x72,0xf8,0xf6,0x64,0x86,0x68,0x98,0x16
-.byte	0xd4,0xa4,0x5c,0xcc,0x5d,0x65,0xb6,0x92
-.byte	0x6c,0x70,0x48,0x50,0xfd,0xed,0xb9,0xda
-.byte	0x5e,0x15,0x46,0x57,0xa7,0x8d,0x9d,0x84
-.byte	0x90,0xd8,0xab,0x00,0x8c,0xbc,0xd3,0x0a
-.byte	0xf7,0xe4,0x58,0x05,0xb8,0xb3,0x45,0x06
-.byte	0xd0,0x2c,0x1e,0x8f,0xca,0x3f,0x0f,0x02
-.byte	0xc1,0xaf,0xbd,0x03,0x01,0x13,0x8a,0x6b
-.byte	0x3a,0x91,0x11,0x41,0x4f,0x67,0xdc,0xea
-.byte	0x97,0xf2,0xcf,0xce,0xf0,0xb4,0xe6,0x73
-.byte	0x96,0xac,0x74,0x22,0xe7,0xad,0x35,0x85
-.byte	0xe2,0xf9,0x37,0xe8,0x1c,0x75,0xdf,0x6e
-.byte	0x47,0xf1,0x1a,0x71,0x1d,0x29,0xc5,0x89
-.byte	0x6f,0xb7,0x62,0x0e,0xaa,0x18,0xbe,0x1b
-.byte	0xfc,0x56,0x3e,0x4b,0xc6,0xd2,0x79,0x20
-.byte	0x9a,0xdb,0xc0,0xfe,0x78,0xcd,0x5a,0xf4
-.byte	0x1f,0xdd,0xa8,0x33,0x88,0x07,0xc7,0x31
-.byte	0xb1,0x12,0x10,0x59,0x27,0x80,0xec,0x5f
-.byte	0x60,0x51,0x7f,0xa9,0x19,0xb5,0x4a,0x0d
-.byte	0x2d,0xe5,0x7a,0x9f,0x93,0xc9,0x9c,0xef
-.byte	0xa0,0xe0,0x3b,0x4d,0xae,0x2a,0xf5,0xb0
-.byte	0xc8,0xeb,0xbb,0x3c,0x83,0x53,0x99,0x61
-.byte	0x17,0x2b,0x04,0x7e,0xba,0x77,0xd6,0x26
-.byte	0xe1,0x69,0x14,0x63,0x55,0x21,0x0c,0x7d
-.long	0x80808080, 0x80808080, 0xfefefefe, 0xfefefefe
-.long	0x1b1b1b1b, 0x1b1b1b1b, 0, 0
-.byte	0x52,0x09,0x6a,0xd5,0x30,0x36,0xa5,0x38
-.byte	0xbf,0x40,0xa3,0x9e,0x81,0xf3,0xd7,0xfb
-.byte	0x7c,0xe3,0x39,0x82,0x9b,0x2f,0xff,0x87
-.byte	0x34,0x8e,0x43,0x44,0xc4,0xde,0xe9,0xcb
-.byte	0x54,0x7b,0x94,0x32,0xa6,0xc2,0x23,0x3d
-.byte	0xee,0x4c,0x95,0x0b,0x42,0xfa,0xc3,0x4e
-.byte	0x08,0x2e,0xa1,0x66,0x28,0xd9,0x24,0xb2
-.byte	0x76,0x5b,0xa2,0x49,0x6d,0x8b,0xd1,0x25
-.byte	0x72,0xf8,0xf6,0x64,0x86,0x68,0x98,0x16
-.byte	0xd4,0xa4,0x5c,0xcc,0x5d,0x65,0xb6,0x92
-.byte	0x6c,0x70,0x48,0x50,0xfd,0xed,0xb9,0xda
-.byte	0x5e,0x15,0x46,0x57,0xa7,0x8d,0x9d,0x84
-.byte	0x90,0xd8,0xab,0x00,0x8c,0xbc,0xd3,0x0a
-.byte	0xf7,0xe4,0x58,0x05,0xb8,0xb3,0x45,0x06
-.byte	0xd0,0x2c,0x1e,0x8f,0xca,0x3f,0x0f,0x02
-.byte	0xc1,0xaf,0xbd,0x03,0x01,0x13,0x8a,0x6b
-.byte	0x3a,0x91,0x11,0x41,0x4f,0x67,0xdc,0xea
-.byte	0x97,0xf2,0xcf,0xce,0xf0,0xb4,0xe6,0x73
-.byte	0x96,0xac,0x74,0x22,0xe7,0xad,0x35,0x85
-.byte	0xe2,0xf9,0x37,0xe8,0x1c,0x75,0xdf,0x6e
-.byte	0x47,0xf1,0x1a,0x71,0x1d,0x29,0xc5,0x89
-.byte	0x6f,0xb7,0x62,0x0e,0xaa,0x18,0xbe,0x1b
-.byte	0xfc,0x56,0x3e,0x4b,0xc6,0xd2,0x79,0x20
-.byte	0x9a,0xdb,0xc0,0xfe,0x78,0xcd,0x5a,0xf4
-.byte	0x1f,0xdd,0xa8,0x33,0x88,0x07,0xc7,0x31
-.byte	0xb1,0x12,0x10,0x59,0x27,0x80,0xec,0x5f
-.byte	0x60,0x51,0x7f,0xa9,0x19,0xb5,0x4a,0x0d
-.byte	0x2d,0xe5,0x7a,0x9f,0x93,0xc9,0x9c,0xef
-.byte	0xa0,0xe0,0x3b,0x4d,0xae,0x2a,0xf5,0xb0
-.byte	0xc8,0xeb,0xbb,0x3c,0x83,0x53,0x99,0x61
-.byte	0x17,0x2b,0x04,0x7e,0xba,0x77,0xd6,0x26
-.byte	0xe1,0x69,0x14,0x63,0x55,0x21,0x0c,0x7d
-.long	0x80808080, 0x80808080, 0xfefefefe, 0xfefefefe
-.long	0x1b1b1b1b, 0x1b1b1b1b, 0, 0
-.byte	0x52,0x09,0x6a,0xd5,0x30,0x36,0xa5,0x38
-.byte	0xbf,0x40,0xa3,0x9e,0x81,0xf3,0xd7,0xfb
-.byte	0x7c,0xe3,0x39,0x82,0x9b,0x2f,0xff,0x87
-.byte	0x34,0x8e,0x43,0x44,0xc4,0xde,0xe9,0xcb
-.byte	0x54,0x7b,0x94,0x32,0xa6,0xc2,0x23,0x3d
-.byte	0xee,0x4c,0x95,0x0b,0x42,0xfa,0xc3,0x4e
-.byte	0x08,0x2e,0xa1,0x66,0x28,0xd9,0x24,0xb2
-.byte	0x76,0x5b,0xa2,0x49,0x6d,0x8b,0xd1,0x25
-.byte	0x72,0xf8,0xf6,0x64,0x86,0x68,0x98,0x16
-.byte	0xd4,0xa4,0x5c,0xcc,0x5d,0x65,0xb6,0x92
-.byte	0x6c,0x70,0x48,0x50,0xfd,0xed,0xb9,0xda
-.byte	0x5e,0x15,0x46,0x57,0xa7,0x8d,0x9d,0x84
-.byte	0x90,0xd8,0xab,0x00,0x8c,0xbc,0xd3,0x0a
-.byte	0xf7,0xe4,0x58,0x05,0xb8,0xb3,0x45,0x06
-.byte	0xd0,0x2c,0x1e,0x8f,0xca,0x3f,0x0f,0x02
-.byte	0xc1,0xaf,0xbd,0x03,0x01,0x13,0x8a,0x6b
-.byte	0x3a,0x91,0x11,0x41,0x4f,0x67,0xdc,0xea
-.byte	0x97,0xf2,0xcf,0xce,0xf0,0xb4,0xe6,0x73
-.byte	0x96,0xac,0x74,0x22,0xe7,0xad,0x35,0x85
-.byte	0xe2,0xf9,0x37,0xe8,0x1c,0x75,0xdf,0x6e
-.byte	0x47,0xf1,0x1a,0x71,0x1d,0x29,0xc5,0x89
-.byte	0x6f,0xb7,0x62,0x0e,0xaa,0x18,0xbe,0x1b
-.byte	0xfc,0x56,0x3e,0x4b,0xc6,0xd2,0x79,0x20
-.byte	0x9a,0xdb,0xc0,0xfe,0x78,0xcd,0x5a,0xf4
-.byte	0x1f,0xdd,0xa8,0x33,0x88,0x07,0xc7,0x31
-.byte	0xb1,0x12,0x10,0x59,0x27,0x80,0xec,0x5f
-.byte	0x60,0x51,0x7f,0xa9,0x19,0xb5,0x4a,0x0d
-.byte	0x2d,0xe5,0x7a,0x9f,0x93,0xc9,0x9c,0xef
-.byte	0xa0,0xe0,0x3b,0x4d,0xae,0x2a,0xf5,0xb0
-.byte	0xc8,0xeb,0xbb,0x3c,0x83,0x53,0x99,0x61
-.byte	0x17,0x2b,0x04,0x7e,0xba,0x77,0xd6,0x26
-.byte	0xe1,0x69,0x14,0x63,0x55,0x21,0x0c,0x7d
-.long	0x80808080, 0x80808080, 0xfefefefe, 0xfefefefe
-.long	0x1b1b1b1b, 0x1b1b1b1b, 0, 0
-.byte	65,69,83,32,102,111,114,32,120,56,54,95,54,52,44,32,67,82,89,80,84,79,71,65,77,83,32,98,121,32,60,97,112,112,114,111,64,111,112,101,110,115,115,108,46,111,114,103,62,0
-.align	64
diff --git a/deps/openssl/config/archs/solaris64-x86_64-gcc/asm/crypto/aes/aesni-sha1-x86_64.s b/deps/openssl/config/archs/solaris64-x86_64-gcc/asm/crypto/aes/aesni-sha1-x86_64.s
index 4d2dfe4489..978bd2b623 100644
--- a/deps/openssl/config/archs/solaris64-x86_64-gcc/asm/crypto/aes/aesni-sha1-x86_64.s
+++ b/deps/openssl/config/archs/solaris64-x86_64-gcc/asm/crypto/aes/aesni-sha1-x86_64.s
@@ -5,6 +5,7 @@
 .type	aesni_cbc_sha1_enc,@function
 .align	32
 aesni_cbc_sha1_enc:
+.cfi_startproc
 
 	movl	OPENSSL_ia32cap_P+0(%rip),%r10d
 	movq	OPENSSL_ia32cap_P+4(%rip),%r11
@@ -17,6 +18,7 @@ aesni_cbc_sha1_enc:
 	je	aesni_cbc_sha1_enc_avx
 	jmp	aesni_cbc_sha1_enc_ssse3
 	.byte	0xf3,0xc3
+.cfi_endproc
 .size	aesni_cbc_sha1_enc,.-aesni_cbc_sha1_enc
 .type	aesni_cbc_sha1_enc_ssse3,@function
 .align	32
@@ -2730,6 +2732,7 @@ K_XX_XX:
 .type	aesni_cbc_sha1_enc_shaext,@function
 .align	32
 aesni_cbc_sha1_enc_shaext:
+.cfi_startproc
 	movq	8(%rsp),%r10
 	movdqu	(%r9),%xmm8
 	movd	16(%r9),%xmm9
@@ -3028,4 +3031,5 @@ aesni_cbc_sha1_enc_shaext:
 	movdqu	%xmm8,(%r9)
 	movd	%xmm9,16(%r9)
 	.byte	0xf3,0xc3
+.cfi_endproc
 .size	aesni_cbc_sha1_enc_shaext,.-aesni_cbc_sha1_enc_shaext
diff --git a/deps/openssl/config/archs/solaris64-x86_64-gcc/asm/crypto/aes/aesni-sha256-x86_64.s b/deps/openssl/config/archs/solaris64-x86_64-gcc/asm/crypto/aes/aesni-sha256-x86_64.s
index 5a47b3ee51..dd09f1b290 100644
--- a/deps/openssl/config/archs/solaris64-x86_64-gcc/asm/crypto/aes/aesni-sha256-x86_64.s
+++ b/deps/openssl/config/archs/solaris64-x86_64-gcc/asm/crypto/aes/aesni-sha256-x86_64.s
@@ -5,6 +5,7 @@
 .type	aesni_cbc_sha256_enc,@function
 .align	16
 aesni_cbc_sha256_enc:
+.cfi_startproc
 	leaq	OPENSSL_ia32cap_P(%rip),%r11
 	movl	$1,%eax
 	cmpq	$0,%rdi
@@ -30,6 +31,7 @@ aesni_cbc_sha256_enc:
 	ud2
 .Lprobe:
 	.byte	0xf3,0xc3
+.cfi_endproc
 .size	aesni_cbc_sha256_enc,.-aesni_cbc_sha256_enc
 
 .align	64
@@ -2528,7 +2530,15 @@ aesni_cbc_sha256_enc_avx2:
 	vmovdqa	%ymm4,0(%rsp)
 	xorl	%r14d,%r14d
 	vmovdqa	%ymm5,32(%rsp)
+
+	movq	120(%rsp),%rsi
+.cfi_def_cfa	%rsi,8
 	leaq	-64(%rsp),%rsp
+
+
+
+	movq	%rsi,-8(%rsp)
+.cfi_escape	0x0f,0x05,0x77,0x78,0x06,0x23,0x08
 	movl	%ebx,%esi
 	vmovdqa	%ymm6,0(%rsp)
 	xorl	%ecx,%esi
@@ -2542,6 +2552,12 @@ aesni_cbc_sha256_enc_avx2:
 	vmovdqu	(%r13),%xmm9
 	vpinsrq	$0,%r13,%xmm15,%xmm15
 	leaq	-64(%rsp),%rsp
+.cfi_escape	0x0f,0x05,0x77,0x38,0x06,0x23,0x08
+
+	pushq	64-8(%rsp)
+.cfi_escape	0x0f,0x05,0x77,0x00,0x06,0x23,0x08
+	leaq	8(%rsp),%rsp
+.cfi_escape	0x0f,0x05,0x77,0x78,0x06,0x23,0x08
 	vpalignr	$4,%ymm0,%ymm1,%ymm4
 	addl	0+128(%rsp),%r11d
 	andl	%r8d,%r12d
@@ -2816,6 +2832,12 @@ aesni_cbc_sha256_enc_avx2:
 	movl	%r9d,%r12d
 	vmovdqa	%ymm6,32(%rsp)
 	leaq	-64(%rsp),%rsp
+.cfi_escape	0x0f,0x05,0x77,0x38,0x06,0x23,0x08
+
+	pushq	64-8(%rsp)
+.cfi_escape	0x0f,0x05,0x77,0x00,0x06,0x23,0x08
+	leaq	8(%rsp),%rsp
+.cfi_escape	0x0f,0x05,0x77,0x78,0x06,0x23,0x08
 	vpalignr	$4,%ymm2,%ymm3,%ymm4
 	addl	0+128(%rsp),%r11d
 	andl	%r8d,%r12d
@@ -4029,10 +4051,12 @@ aesni_cbc_sha256_enc_avx2:
 	jbe	.Loop_avx2
 	leaq	(%rsp),%rbp
 
+
+.cfi_escape	0x0f,0x06,0x76,0xf8,0x00,0x06,0x23,0x08
+
 .Ldone_avx2:
-	leaq	(%rbp),%rsp
-	movq	64+32(%rsp),%r8
-	movq	120(%rsp),%rsi
+	movq	64+32(%rbp),%r8
+	movq	64+56(%rbp),%rsi
 .cfi_def_cfa	%rsi,8
 	vmovdqu	%xmm8,(%r8)
 	vzeroall
@@ -4057,6 +4081,7 @@ aesni_cbc_sha256_enc_avx2:
 .type	aesni_cbc_sha256_enc_shaext,@function
 .align	32
 aesni_cbc_sha256_enc_shaext:
+.cfi_startproc
 	movq	8(%rsp),%r10
 	leaq	K256+128(%rip),%rax
 	movdqu	(%r9),%xmm1
@@ -4406,4 +4431,5 @@ aesni_cbc_sha256_enc_shaext:
 	movdqu	%xmm1,(%r9)
 	movdqu	%xmm2,16(%r9)
 	.byte	0xf3,0xc3
+.cfi_endproc
 .size	aesni_cbc_sha256_enc_shaext,.-aesni_cbc_sha256_enc_shaext
diff --git a/deps/openssl/config/archs/solaris64-x86_64-gcc/asm/crypto/aes/aesni-x86_64.s b/deps/openssl/config/archs/solaris64-x86_64-gcc/asm/crypto/aes/aesni-x86_64.s
index 2986a647c1..c1e791eff5 100644
--- a/deps/openssl/config/archs/solaris64-x86_64-gcc/asm/crypto/aes/aesni-x86_64.s
+++ b/deps/openssl/config/archs/solaris64-x86_64-gcc/asm/crypto/aes/aesni-x86_64.s
@@ -861,6 +861,7 @@ aesni_ecb_encrypt:
 .type	aesni_ccm64_encrypt_blocks,@function
 .align	16
 aesni_ccm64_encrypt_blocks:
+.cfi_startproc
 	movl	240(%rcx),%eax
 	movdqu	(%r8),%xmm6
 	movdqa	.Lincrement64(%rip),%xmm9
@@ -919,11 +920,13 @@ aesni_ccm64_encrypt_blocks:
 	pxor	%xmm8,%xmm8
 	pxor	%xmm6,%xmm6
 	.byte	0xf3,0xc3
+.cfi_endproc
 .size	aesni_ccm64_encrypt_blocks,.-aesni_ccm64_encrypt_blocks
 .globl	aesni_ccm64_decrypt_blocks
 .type	aesni_ccm64_decrypt_blocks,@function
 .align	16
 aesni_ccm64_decrypt_blocks:
+.cfi_startproc
 	movl	240(%rcx),%eax
 	movups	(%r8),%xmm6
 	movdqu	(%r9),%xmm3
@@ -1016,6 +1019,7 @@ aesni_ccm64_decrypt_blocks:
 	pxor	%xmm8,%xmm8
 	pxor	%xmm6,%xmm6
 	.byte	0xf3,0xc3
+.cfi_endproc
 .size	aesni_ccm64_decrypt_blocks,.-aesni_ccm64_decrypt_blocks
 .globl	aesni_ctr32_encrypt_blocks
 .type	aesni_ctr32_encrypt_blocks,@function
@@ -2790,6 +2794,7 @@ aesni_ocb_encrypt:
 .type	__ocb_encrypt6,@function
 .align	32
 __ocb_encrypt6:
+.cfi_startproc
 	pxor	%xmm9,%xmm15
 	movdqu	(%rbx,%r12,1),%xmm11
 	movdqa	%xmm10,%xmm12
@@ -2887,11 +2892,13 @@ __ocb_encrypt6:
 .byte	102,65,15,56,221,246
 .byte	102,65,15,56,221,255
 	.byte	0xf3,0xc3
+.cfi_endproc
 .size	__ocb_encrypt6,.-__ocb_encrypt6
 
 .type	__ocb_encrypt4,@function
 .align	32
 __ocb_encrypt4:
+.cfi_startproc
 	pxor	%xmm9,%xmm15
 	movdqu	(%rbx,%r12,1),%xmm11
 	movdqa	%xmm10,%xmm12
@@ -2956,11 +2963,13 @@ __ocb_encrypt4:
 .byte	102,65,15,56,221,228
 .byte	102,65,15,56,221,237
 	.byte	0xf3,0xc3
+.cfi_endproc
 .size	__ocb_encrypt4,.-__ocb_encrypt4
 
 .type	__ocb_encrypt1,@function
 .align	32
 __ocb_encrypt1:
+.cfi_startproc
 	pxor	%xmm15,%xmm7
 	pxor	%xmm9,%xmm7
 	pxor	%xmm2,%xmm8
@@ -2991,6 +3000,7 @@ __ocb_encrypt1:
 
 .byte	102,15,56,221,215
 	.byte	0xf3,0xc3
+.cfi_endproc
 .size	__ocb_encrypt1,.-__ocb_encrypt1
 
 .globl	aesni_ocb_decrypt
@@ -3233,6 +3243,7 @@ aesni_ocb_decrypt:
 .type	__ocb_decrypt6,@function
 .align	32
 __ocb_decrypt6:
+.cfi_startproc
 	pxor	%xmm9,%xmm15
 	movdqu	(%rbx,%r12,1),%xmm11
 	movdqa	%xmm10,%xmm12
@@ -3324,11 +3335,13 @@ __ocb_decrypt6:
 .byte	102,65,15,56,223,246
 .byte	102,65,15,56,223,255
 	.byte	0xf3,0xc3
+.cfi_endproc
 .size	__ocb_decrypt6,.-__ocb_decrypt6
 
 .type	__ocb_decrypt4,@function
 .align	32
 __ocb_decrypt4:
+.cfi_startproc
 	pxor	%xmm9,%xmm15
 	movdqu	(%rbx,%r12,1),%xmm11
 	movdqa	%xmm10,%xmm12
@@ -3389,11 +3402,13 @@ __ocb_decrypt4:
 .byte	102,65,15,56,223,228
 .byte	102,65,15,56,223,237
 	.byte	0xf3,0xc3
+.cfi_endproc
 .size	__ocb_decrypt4,.-__ocb_decrypt4
 
 .type	__ocb_decrypt1,@function
 .align	32
 __ocb_decrypt1:
+.cfi_startproc
 	pxor	%xmm15,%xmm7
 	pxor	%xmm9,%xmm7
 	pxor	%xmm7,%xmm2
@@ -3423,6 +3438,7 @@ __ocb_decrypt1:
 
 .byte	102,15,56,223,215
 	.byte	0xf3,0xc3
+.cfi_endproc
 .size	__ocb_decrypt1,.-__ocb_decrypt1
 .globl	aesni_cbc_encrypt
 .type	aesni_cbc_encrypt,@function
@@ -4361,7 +4377,6 @@ __aesni_set_encrypt_key:
 	addq	$8,%rsp
 .cfi_adjust_cfa_offset	-8
 	.byte	0xf3,0xc3
-.cfi_endproc	
 .LSEH_end_set_encrypt_key:
 
 .align	16
@@ -4432,6 +4447,7 @@ __aesni_set_encrypt_key:
 	shufps	$170,%xmm1,%xmm1
 	xorps	%xmm1,%xmm2
 	.byte	0xf3,0xc3
+.cfi_endproc
 .size	aesni_set_encrypt_key,.-aesni_set_encrypt_key
 .size	__aesni_set_encrypt_key,.-__aesni_set_encrypt_key
 .align	64
diff --git a/deps/openssl/config/archs/solaris64-x86_64-gcc/asm/crypto/aes/bsaes-x86_64.s b/deps/openssl/config/archs/solaris64-x86_64-gcc/asm/crypto/aes/bsaes-x86_64.s
deleted file mode 100644
index e1f3abadbc..0000000000
--- a/deps/openssl/config/archs/solaris64-x86_64-gcc/asm/crypto/aes/bsaes-x86_64.s
+++ /dev/null
@@ -1,2595 +0,0 @@
-.text	
-
-
-
-
-.type	_bsaes_encrypt8,@function
-.align	64
-_bsaes_encrypt8:
-.cfi_startproc	
-	leaq	.LBS0(%rip),%r11
-
-	movdqa	(%rax),%xmm8
-	leaq	16(%rax),%rax
-	movdqa	80(%r11),%xmm7
-	pxor	%xmm8,%xmm15
-	pxor	%xmm8,%xmm0
-	pxor	%xmm8,%xmm1
-	pxor	%xmm8,%xmm2
-.byte	102,68,15,56,0,255
-.byte	102,15,56,0,199
-	pxor	%xmm8,%xmm3
-	pxor	%xmm8,%xmm4
-.byte	102,15,56,0,207
-.byte	102,15,56,0,215
-	pxor	%xmm8,%xmm5
-	pxor	%xmm8,%xmm6
-.byte	102,15,56,0,223
-.byte	102,15,56,0,231
-.byte	102,15,56,0,239
-.byte	102,15,56,0,247
-_bsaes_encrypt8_bitslice:
-	movdqa	0(%r11),%xmm7
-	movdqa	16(%r11),%xmm8
-	movdqa	%xmm5,%xmm9
-	psrlq	$1,%xmm5
-	movdqa	%xmm3,%xmm10
-	psrlq	$1,%xmm3
-	pxor	%xmm6,%xmm5
-	pxor	%xmm4,%xmm3
-	pand	%xmm7,%xmm5
-	pand	%xmm7,%xmm3
-	pxor	%xmm5,%xmm6
-	psllq	$1,%xmm5
-	pxor	%xmm3,%xmm4
-	psllq	$1,%xmm3
-	pxor	%xmm9,%xmm5
-	pxor	%xmm10,%xmm3
-	movdqa	%xmm1,%xmm9
-	psrlq	$1,%xmm1
-	movdqa	%xmm15,%xmm10
-	psrlq	$1,%xmm15
-	pxor	%xmm2,%xmm1
-	pxor	%xmm0,%xmm15
-	pand	%xmm7,%xmm1
-	pand	%xmm7,%xmm15
-	pxor	%xmm1,%xmm2
-	psllq	$1,%xmm1
-	pxor	%xmm15,%xmm0
-	psllq	$1,%xmm15
-	pxor	%xmm9,%xmm1
-	pxor	%xmm10,%xmm15
-	movdqa	32(%r11),%xmm7
-	movdqa	%xmm4,%xmm9
-	psrlq	$2,%xmm4
-	movdqa	%xmm3,%xmm10
-	psrlq	$2,%xmm3
-	pxor	%xmm6,%xmm4
-	pxor	%xmm5,%xmm3
-	pand	%xmm8,%xmm4
-	pand	%xmm8,%xmm3
-	pxor	%xmm4,%xmm6
-	psllq	$2,%xmm4
-	pxor	%xmm3,%xmm5
-	psllq	$2,%xmm3
-	pxor	%xmm9,%xmm4
-	pxor	%xmm10,%xmm3
-	movdqa	%xmm0,%xmm9
-	psrlq	$2,%xmm0
-	movdqa	%xmm15,%xmm10
-	psrlq	$2,%xmm15
-	pxor	%xmm2,%xmm0
-	pxor	%xmm1,%xmm15
-	pand	%xmm8,%xmm0
-	pand	%xmm8,%xmm15
-	pxor	%xmm0,%xmm2
-	psllq	$2,%xmm0
-	pxor	%xmm15,%xmm1
-	psllq	$2,%xmm15
-	pxor	%xmm9,%xmm0
-	pxor	%xmm10,%xmm15
-	movdqa	%xmm2,%xmm9
-	psrlq	$4,%xmm2
-	movdqa	%xmm1,%xmm10
-	psrlq	$4,%xmm1
-	pxor	%xmm6,%xmm2
-	pxor	%xmm5,%xmm1
-	pand	%xmm7,%xmm2
-	pand	%xmm7,%xmm1
-	pxor	%xmm2,%xmm6
-	psllq	$4,%xmm2
-	pxor	%xmm1,%xmm5
-	psllq	$4,%xmm1
-	pxor	%xmm9,%xmm2
-	pxor	%xmm10,%xmm1
-	movdqa	%xmm0,%xmm9
-	psrlq	$4,%xmm0
-	movdqa	%xmm15,%xmm10
-	psrlq	$4,%xmm15
-	pxor	%xmm4,%xmm0
-	pxor	%xmm3,%xmm15
-	pand	%xmm7,%xmm0
-	pand	%xmm7,%xmm15
-	pxor	%xmm0,%xmm4
-	psllq	$4,%xmm0
-	pxor	%xmm15,%xmm3
-	psllq	$4,%xmm15
-	pxor	%xmm9,%xmm0
-	pxor	%xmm10,%xmm15
-	decl	%r10d
-	jmp	.Lenc_sbox
-.align	16
-.Lenc_loop:
-	pxor	0(%rax),%xmm15
-	pxor	16(%rax),%xmm0
-	pxor	32(%rax),%xmm1
-	pxor	48(%rax),%xmm2
-.byte	102,68,15,56,0,255
-.byte	102,15,56,0,199
-	pxor	64(%rax),%xmm3
-	pxor	80(%rax),%xmm4
-.byte	102,15,56,0,207
-.byte	102,15,56,0,215
-	pxor	96(%rax),%xmm5
-	pxor	112(%rax),%xmm6
-.byte	102,15,56,0,223
-.byte	102,15,56,0,231
-.byte	102,15,56,0,239
-.byte	102,15,56,0,247
-	leaq	128(%rax),%rax
-.Lenc_sbox:
-	pxor	%xmm5,%xmm4
-	pxor	%xmm0,%xmm1
-	pxor	%xmm15,%xmm2
-	pxor	%xmm1,%xmm5
-	pxor	%xmm15,%xmm4
-
-	pxor	%xmm2,%xmm5
-	pxor	%xmm6,%xmm2
-	pxor	%xmm4,%xmm6
-	pxor	%xmm3,%xmm2
-	pxor	%xmm4,%xmm3
-	pxor	%xmm0,%xmm2
-
-	pxor	%xmm6,%xmm1
-	pxor	%xmm4,%xmm0
-	movdqa	%xmm6,%xmm10
-	movdqa	%xmm0,%xmm9
-	movdqa	%xmm4,%xmm8
-	movdqa	%xmm1,%xmm12
-	movdqa	%xmm5,%xmm11
-
-	pxor	%xmm3,%xmm10
-	pxor	%xmm1,%xmm9
-	pxor	%xmm2,%xmm8
-	movdqa	%xmm10,%xmm13
-	pxor	%xmm3,%xmm12
-	movdqa	%xmm9,%xmm7
-	pxor	%xmm15,%xmm11
-	movdqa	%xmm10,%xmm14
-
-	por	%xmm8,%xmm9
-	por	%xmm11,%xmm10
-	pxor	%xmm7,%xmm14
-	pand	%xmm11,%xmm13
-	pxor	%xmm8,%xmm11
-	pand	%xmm8,%xmm7
-	pand	%xmm11,%xmm14
-	movdqa	%xmm2,%xmm11
-	pxor	%xmm15,%xmm11
-	pand	%xmm11,%xmm12
-	pxor	%xmm12,%xmm10
-	pxor	%xmm12,%xmm9
-	movdqa	%xmm6,%xmm12
-	movdqa	%xmm4,%xmm11
-	pxor	%xmm0,%xmm12
-	pxor	%xmm5,%xmm11
-	movdqa	%xmm12,%xmm8
-	pand	%xmm11,%xmm12
-	por	%xmm11,%xmm8
-	pxor	%xmm12,%xmm7
-	pxor	%xmm14,%xmm10
-	pxor	%xmm13,%xmm9
-	pxor	%xmm14,%xmm8
-	movdqa	%xmm1,%xmm11
-	pxor	%xmm13,%xmm7
-	movdqa	%xmm3,%xmm12
-	pxor	%xmm13,%xmm8
-	movdqa	%xmm0,%xmm13
-	pand	%xmm2,%xmm11
-	movdqa	%xmm6,%xmm14
-	pand	%xmm15,%xmm12
-	pand	%xmm4,%xmm13
-	por	%xmm5,%xmm14
-	pxor	%xmm11,%xmm10
-	pxor	%xmm12,%xmm9
-	pxor	%xmm13,%xmm8
-	pxor	%xmm14,%xmm7
-
-
-
-
-
-	movdqa	%xmm10,%xmm11
-	pand	%xmm8,%xmm10
-	pxor	%xmm9,%xmm11
-
-	movdqa	%xmm7,%xmm13
-	movdqa	%xmm11,%xmm14
-	pxor	%xmm10,%xmm13
-	pand	%xmm13,%xmm14
-
-	movdqa	%xmm8,%xmm12
-	pxor	%xmm9,%xmm14
-	pxor	%xmm7,%xmm12
-
-	pxor	%xmm9,%xmm10
-
-	pand	%xmm10,%xmm12
-
-	movdqa	%xmm13,%xmm9
-	pxor	%xmm7,%xmm12
-
-	pxor	%xmm12,%xmm9
-	pxor	%xmm12,%xmm8
-
-	pand	%xmm7,%xmm9
-
-	pxor	%xmm9,%xmm13
-	pxor	%xmm9,%xmm8
-
-	pand	%xmm14,%xmm13
-
-	pxor	%xmm11,%xmm13
-	movdqa	%xmm5,%xmm11
-	movdqa	%xmm4,%xmm7
-	movdqa	%xmm14,%xmm9
-	pxor	%xmm13,%xmm9
-	pand	%xmm5,%xmm9
-	pxor	%xmm4,%xmm5
-	pand	%xmm14,%xmm4
-	pand	%xmm13,%xmm5
-	pxor	%xmm4,%xmm5
-	pxor	%xmm9,%xmm4
-	pxor	%xmm15,%xmm11
-	pxor	%xmm2,%xmm7
-	pxor	%xmm12,%xmm14
-	pxor	%xmm8,%xmm13
-	movdqa	%xmm14,%xmm10
-	movdqa	%xmm12,%xmm9
-	pxor	%xmm13,%xmm10
-	pxor	%xmm8,%xmm9
-	pand	%xmm11,%xmm10
-	pand	%xmm15,%xmm9
-	pxor	%xmm7,%xmm11
-	pxor	%xmm2,%xmm15
-	pand	%xmm14,%xmm7
-	pand	%xmm12,%xmm2
-	pand	%xmm13,%xmm11
-	pand	%xmm8,%xmm15
-	pxor	%xmm11,%xmm7
-	pxor	%xmm2,%xmm15
-	pxor	%xmm10,%xmm11
-	pxor	%xmm9,%xmm2
-	pxor	%xmm11,%xmm5
-	pxor	%xmm11,%xmm15
-	pxor	%xmm7,%xmm4
-	pxor	%xmm7,%xmm2
-
-	movdqa	%xmm6,%xmm11
-	movdqa	%xmm0,%xmm7
-	pxor	%xmm3,%xmm11
-	pxor	%xmm1,%xmm7
-	movdqa	%xmm14,%xmm10
-	movdqa	%xmm12,%xmm9
-	pxor	%xmm13,%xmm10
-	pxor	%xmm8,%xmm9
-	pand	%xmm11,%xmm10
-	pand	%xmm3,%xmm9
-	pxor	%xmm7,%xmm11
-	pxor	%xmm1,%xmm3
-	pand	%xmm14,%xmm7
-	pand	%xmm12,%xmm1
-	pand	%xmm13,%xmm11
-	pand	%xmm8,%xmm3
-	pxor	%xmm11,%xmm7
-	pxor	%xmm1,%xmm3
-	pxor	%xmm10,%xmm11
-	pxor	%xmm9,%xmm1
-	pxor	%xmm12,%xmm14
-	pxor	%xmm8,%xmm13
-	movdqa	%xmm14,%xmm10
-	pxor	%xmm13,%xmm10
-	pand	%xmm6,%xmm10
-	pxor	%xmm0,%xmm6
-	pand	%xmm14,%xmm0
-	pand	%xmm13,%xmm6
-	pxor	%xmm0,%xmm6
-	pxor	%xmm10,%xmm0
-	pxor	%xmm11,%xmm6
-	pxor	%xmm11,%xmm3
-	pxor	%xmm7,%xmm0
-	pxor	%xmm7,%xmm1
-	pxor	%xmm15,%xmm6
-	pxor	%xmm5,%xmm0
-	pxor	%xmm6,%xmm3
-	pxor	%xmm15,%xmm5
-	pxor	%xmm0,%xmm15
-
-	pxor	%xmm4,%xmm0
-	pxor	%xmm1,%xmm4
-	pxor	%xmm2,%xmm1
-	pxor	%xmm4,%xmm2
-	pxor	%xmm4,%xmm3
-
-	pxor	%xmm2,%xmm5
-	decl	%r10d
-	jl	.Lenc_done
-	pshufd	$0x93,%xmm15,%xmm7
-	pshufd	$0x93,%xmm0,%xmm8
-	pxor	%xmm7,%xmm15
-	pshufd	$0x93,%xmm3,%xmm9
-	pxor	%xmm8,%xmm0
-	pshufd	$0x93,%xmm5,%xmm10
-	pxor	%xmm9,%xmm3
-	pshufd	$0x93,%xmm2,%xmm11
-	pxor	%xmm10,%xmm5
-	pshufd	$0x93,%xmm6,%xmm12
-	pxor	%xmm11,%xmm2
-	pshufd	$0x93,%xmm1,%xmm13
-	pxor	%xmm12,%xmm6
-	pshufd	$0x93,%xmm4,%xmm14
-	pxor	%xmm13,%xmm1
-	pxor	%xmm14,%xmm4
-
-	pxor	%xmm15,%xmm8
-	pxor	%xmm4,%xmm7
-	pxor	%xmm4,%xmm8
-	pshufd	$0x4E,%xmm15,%xmm15
-	pxor	%xmm0,%xmm9
-	pshufd	$0x4E,%xmm0,%xmm0
-	pxor	%xmm2,%xmm12
-	pxor	%xmm7,%xmm15
-	pxor	%xmm6,%xmm13
-	pxor	%xmm8,%xmm0
-	pxor	%xmm5,%xmm11
-	pshufd	$0x4E,%xmm2,%xmm7
-	pxor	%xmm1,%xmm14
-	pshufd	$0x4E,%xmm6,%xmm8
-	pxor	%xmm3,%xmm10
-	pshufd	$0x4E,%xmm5,%xmm2
-	pxor	%xmm4,%xmm10
-	pshufd	$0x4E,%xmm4,%xmm6
-	pxor	%xmm4,%xmm11
-	pshufd	$0x4E,%xmm1,%xmm5
-	pxor	%xmm11,%xmm7
-	pshufd	$0x4E,%xmm3,%xmm1
-	pxor	%xmm12,%xmm8
-	pxor	%xmm10,%xmm2
-	pxor	%xmm14,%xmm6
-	pxor	%xmm13,%xmm5
-	movdqa	%xmm7,%xmm3
-	pxor	%xmm9,%xmm1
-	movdqa	%xmm8,%xmm4
-	movdqa	48(%r11),%xmm7
-	jnz	.Lenc_loop
-	movdqa	64(%r11),%xmm7
-	jmp	.Lenc_loop
-.align	16
-.Lenc_done:
-	movdqa	0(%r11),%xmm7
-	movdqa	16(%r11),%xmm8
-	movdqa	%xmm1,%xmm9
-	psrlq	$1,%xmm1
-	movdqa	%xmm2,%xmm10
-	psrlq	$1,%xmm2
-	pxor	%xmm4,%xmm1
-	pxor	%xmm6,%xmm2
-	pand	%xmm7,%xmm1
-	pand	%xmm7,%xmm2
-	pxor	%xmm1,%xmm4
-	psllq	$1,%xmm1
-	pxor	%xmm2,%xmm6
-	psllq	$1,%xmm2
-	pxor	%xmm9,%xmm1
-	pxor	%xmm10,%xmm2
-	movdqa	%xmm3,%xmm9
-	psrlq	$1,%xmm3
-	movdqa	%xmm15,%xmm10
-	psrlq	$1,%xmm15
-	pxor	%xmm5,%xmm3
-	pxor	%xmm0,%xmm15
-	pand	%xmm7,%xmm3
-	pand	%xmm7,%xmm15
-	pxor	%xmm3,%xmm5
-	psllq	$1,%xmm3
-	pxor	%xmm15,%xmm0
-	psllq	$1,%xmm15
-	pxor	%xmm9,%xmm3
-	pxor	%xmm10,%xmm15
-	movdqa	32(%r11),%xmm7
-	movdqa	%xmm6,%xmm9
-	psrlq	$2,%xmm6
-	movdqa	%xmm2,%xmm10
-	psrlq	$2,%xmm2
-	pxor	%xmm4,%xmm6
-	pxor	%xmm1,%xmm2
-	pand	%xmm8,%xmm6
-	pand	%xmm8,%xmm2
-	pxor	%xmm6,%xmm4
-	psllq	$2,%xmm6
-	pxor	%xmm2,%xmm1
-	psllq	$2,%xmm2
-	pxor	%xmm9,%xmm6
-	pxor	%xmm10,%xmm2
-	movdqa	%xmm0,%xmm9
-	psrlq	$2,%xmm0
-	movdqa	%xmm15,%xmm10
-	psrlq	$2,%xmm15
-	pxor	%xmm5,%xmm0
-	pxor	%xmm3,%xmm15
-	pand	%xmm8,%xmm0
-	pand	%xmm8,%xmm15
-	pxor	%xmm0,%xmm5
-	psllq	$2,%xmm0
-	pxor	%xmm15,%xmm3
-	psllq	$2,%xmm15
-	pxor	%xmm9,%xmm0
-	pxor	%xmm10,%xmm15
-	movdqa	%xmm5,%xmm9
-	psrlq	$4,%xmm5
-	movdqa	%xmm3,%xmm10
-	psrlq	$4,%xmm3
-	pxor	%xmm4,%xmm5
-	pxor	%xmm1,%xmm3
-	pand	%xmm7,%xmm5
-	pand	%xmm7,%xmm3
-	pxor	%xmm5,%xmm4
-	psllq	$4,%xmm5
-	pxor	%xmm3,%xmm1
-	psllq	$4,%xmm3
-	pxor	%xmm9,%xmm5
-	pxor	%xmm10,%xmm3
-	movdqa	%xmm0,%xmm9
-	psrlq	$4,%xmm0
-	movdqa	%xmm15,%xmm10
-	psrlq	$4,%xmm15
-	pxor	%xmm6,%xmm0
-	pxor	%xmm2,%xmm15
-	pand	%xmm7,%xmm0
-	pand	%xmm7,%xmm15
-	pxor	%xmm0,%xmm6
-	psllq	$4,%xmm0
-	pxor	%xmm15,%xmm2
-	psllq	$4,%xmm15
-	pxor	%xmm9,%xmm0
-	pxor	%xmm10,%xmm15
-	movdqa	(%rax),%xmm7
-	pxor	%xmm7,%xmm3
-	pxor	%xmm7,%xmm5
-	pxor	%xmm7,%xmm2
-	pxor	%xmm7,%xmm6
-	pxor	%xmm7,%xmm1
-	pxor	%xmm7,%xmm4
-	pxor	%xmm7,%xmm15
-	pxor	%xmm7,%xmm0
-	.byte	0xf3,0xc3
-.cfi_endproc	
-.size	_bsaes_encrypt8,.-_bsaes_encrypt8
-
-.type	_bsaes_decrypt8,@function
-.align	64
-_bsaes_decrypt8:
-.cfi_startproc	
-	leaq	.LBS0(%rip),%r11
-
-	movdqa	(%rax),%xmm8
-	leaq	16(%rax),%rax
-	movdqa	-48(%r11),%xmm7
-	pxor	%xmm8,%xmm15
-	pxor	%xmm8,%xmm0
-	pxor	%xmm8,%xmm1
-	pxor	%xmm8,%xmm2
-.byte	102,68,15,56,0,255
-.byte	102,15,56,0,199
-	pxor	%xmm8,%xmm3
-	pxor	%xmm8,%xmm4
-.byte	102,15,56,0,207
-.byte	102,15,56,0,215
-	pxor	%xmm8,%xmm5
-	pxor	%xmm8,%xmm6
-.byte	102,15,56,0,223
-.byte	102,15,56,0,231
-.byte	102,15,56,0,239
-.byte	102,15,56,0,247
-	movdqa	0(%r11),%xmm7
-	movdqa	16(%r11),%xmm8
-	movdqa	%xmm5,%xmm9
-	psrlq	$1,%xmm5
-	movdqa	%xmm3,%xmm10
-	psrlq	$1,%xmm3
-	pxor	%xmm6,%xmm5
-	pxor	%xmm4,%xmm3
-	pand	%xmm7,%xmm5
-	pand	%xmm7,%xmm3
-	pxor	%xmm5,%xmm6
-	psllq	$1,%xmm5
-	pxor	%xmm3,%xmm4
-	psllq	$1,%xmm3
-	pxor	%xmm9,%xmm5
-	pxor	%xmm10,%xmm3
-	movdqa	%xmm1,%xmm9
-	psrlq	$1,%xmm1
-	movdqa	%xmm15,%xmm10
-	psrlq	$1,%xmm15
-	pxor	%xmm2,%xmm1
-	pxor	%xmm0,%xmm15
-	pand	%xmm7,%xmm1
-	pand	%xmm7,%xmm15
-	pxor	%xmm1,%xmm2
-	psllq	$1,%xmm1
-	pxor	%xmm15,%xmm0
-	psllq	$1,%xmm15
-	pxor	%xmm9,%xmm1
-	pxor	%xmm10,%xmm15
-	movdqa	32(%r11),%xmm7
-	movdqa	%xmm4,%xmm9
-	psrlq	$2,%xmm4
-	movdqa	%xmm3,%xmm10
-	psrlq	$2,%xmm3
-	pxor	%xmm6,%xmm4
-	pxor	%xmm5,%xmm3
-	pand	%xmm8,%xmm4
-	pand	%xmm8,%xmm3
-	pxor	%xmm4,%xmm6
-	psllq	$2,%xmm4
-	pxor	%xmm3,%xmm5
-	psllq	$2,%xmm3
-	pxor	%xmm9,%xmm4
-	pxor	%xmm10,%xmm3
-	movdqa	%xmm0,%xmm9
-	psrlq	$2,%xmm0
-	movdqa	%xmm15,%xmm10
-	psrlq	$2,%xmm15
-	pxor	%xmm2,%xmm0
-	pxor	%xmm1,%xmm15
-	pand	%xmm8,%xmm0
-	pand	%xmm8,%xmm15
-	pxor	%xmm0,%xmm2
-	psllq	$2,%xmm0
-	pxor	%xmm15,%xmm1
-	psllq	$2,%xmm15
-	pxor	%xmm9,%xmm0
-	pxor	%xmm10,%xmm15
-	movdqa	%xmm2,%xmm9
-	psrlq	$4,%xmm2
-	movdqa	%xmm1,%xmm10
-	psrlq	$4,%xmm1
-	pxor	%xmm6,%xmm2
-	pxor	%xmm5,%xmm1
-	pand	%xmm7,%xmm2
-	pand	%xmm7,%xmm1
-	pxor	%xmm2,%xmm6
-	psllq	$4,%xmm2
-	pxor	%xmm1,%xmm5
-	psllq	$4,%xmm1
-	pxor	%xmm9,%xmm2
-	pxor	%xmm10,%xmm1
-	movdqa	%xmm0,%xmm9
-	psrlq	$4,%xmm0
-	movdqa	%xmm15,%xmm10
-	psrlq	$4,%xmm15
-	pxor	%xmm4,%xmm0
-	pxor	%xmm3,%xmm15
-	pand	%xmm7,%xmm0
-	pand	%xmm7,%xmm15
-	pxor	%xmm0,%xmm4
-	psllq	$4,%xmm0
-	pxor	%xmm15,%xmm3
-	psllq	$4,%xmm15
-	pxor	%xmm9,%xmm0
-	pxor	%xmm10,%xmm15
-	decl	%r10d
-	jmp	.Ldec_sbox
-.align	16
-.Ldec_loop:
-	pxor	0(%rax),%xmm15
-	pxor	16(%rax),%xmm0
-	pxor	32(%rax),%xmm1
-	pxor	48(%rax),%xmm2
-.byte	102,68,15,56,0,255
-.byte	102,15,56,0,199
-	pxor	64(%rax),%xmm3
-	pxor	80(%rax),%xmm4
-.byte	102,15,56,0,207
-.byte	102,15,56,0,215
-	pxor	96(%rax),%xmm5
-	pxor	112(%rax),%xmm6
-.byte	102,15,56,0,223
-.byte	102,15,56,0,231
-.byte	102,15,56,0,239
-.byte	102,15,56,0,247
-	leaq	128(%rax),%rax
-.Ldec_sbox:
-	pxor	%xmm3,%xmm2
-
-	pxor	%xmm6,%xmm3
-	pxor	%xmm6,%xmm1
-	pxor	%xmm3,%xmm5
-	pxor	%xmm5,%xmm6
-	pxor	%xmm6,%xmm0
-
-	pxor	%xmm0,%xmm15
-	pxor	%xmm4,%xmm1
-	pxor	%xmm15,%xmm2
-	pxor	%xmm15,%xmm4
-	pxor	%xmm2,%xmm0
-	movdqa	%xmm2,%xmm10
-	movdqa	%xmm6,%xmm9
-	movdqa	%xmm0,%xmm8
-	movdqa	%xmm3,%xmm12
-	movdqa	%xmm4,%xmm11
-
-	pxor	%xmm15,%xmm10
-	pxor	%xmm3,%xmm9
-	pxor	%xmm5,%xmm8
-	movdqa	%xmm10,%xmm13
-	pxor	%xmm15,%xmm12
-	movdqa	%xmm9,%xmm7
-	pxor	%xmm1,%xmm11
-	movdqa	%xmm10,%xmm14
-
-	por	%xmm8,%xmm9
-	por	%xmm11,%xmm10
-	pxor	%xmm7,%xmm14
-	pand	%xmm11,%xmm13
-	pxor	%xmm8,%xmm11
-	pand	%xmm8,%xmm7
-	pand	%xmm11,%xmm14
-	movdqa	%xmm5,%xmm11
-	pxor	%xmm1,%xmm11
-	pand	%xmm11,%xmm12
-	pxor	%xmm12,%xmm10
-	pxor	%xmm12,%xmm9
-	movdqa	%xmm2,%xmm12
-	movdqa	%xmm0,%xmm11
-	pxor	%xmm6,%xmm12
-	pxor	%xmm4,%xmm11
-	movdqa	%xmm12,%xmm8
-	pand	%xmm11,%xmm12
-	por	%xmm11,%xmm8
-	pxor	%xmm12,%xmm7
-	pxor	%xmm14,%xmm10
-	pxor	%xmm13,%xmm9
-	pxor	%xmm14,%xmm8
-	movdqa	%xmm3,%xmm11
-	pxor	%xmm13,%xmm7
-	movdqa	%xmm15,%xmm12
-	pxor	%xmm13,%xmm8
-	movdqa	%xmm6,%xmm13
-	pand	%xmm5,%xmm11
-	movdqa	%xmm2,%xmm14
-	pand	%xmm1,%xmm12
-	pand	%xmm0,%xmm13
-	por	%xmm4,%xmm14
-	pxor	%xmm11,%xmm10
-	pxor	%xmm12,%xmm9
-	pxor	%xmm13,%xmm8
-	pxor	%xmm14,%xmm7
-
-
-
-
-
-	movdqa	%xmm10,%xmm11
-	pand	%xmm8,%xmm10
-	pxor	%xmm9,%xmm11
-
-	movdqa	%xmm7,%xmm13
-	movdqa	%xmm11,%xmm14
-	pxor	%xmm10,%xmm13
-	pand	%xmm13,%xmm14
-
-	movdqa	%xmm8,%xmm12
-	pxor	%xmm9,%xmm14
-	pxor	%xmm7,%xmm12
-
-	pxor	%xmm9,%xmm10
-
-	pand	%xmm10,%xmm12
-
-	movdqa	%xmm13,%xmm9
-	pxor	%xmm7,%xmm12
-
-	pxor	%xmm12,%xmm9
-	pxor	%xmm12,%xmm8
-
-	pand	%xmm7,%xmm9
-
-	pxor	%xmm9,%xmm13
-	pxor	%xmm9,%xmm8
-
-	pand	%xmm14,%xmm13
-
-	pxor	%xmm11,%xmm13
-	movdqa	%xmm4,%xmm11
-	movdqa	%xmm0,%xmm7
-	movdqa	%xmm14,%xmm9
-	pxor	%xmm13,%xmm9
-	pand	%xmm4,%xmm9
-	pxor	%xmm0,%xmm4
-	pand	%xmm14,%xmm0
-	pand	%xmm13,%xmm4
-	pxor	%xmm0,%xmm4
-	pxor	%xmm9,%xmm0
-	pxor	%xmm1,%xmm11
-	pxor	%xmm5,%xmm7
-	pxor	%xmm12,%xmm14
-	pxor	%xmm8,%xmm13
-	movdqa	%xmm14,%xmm10
-	movdqa	%xmm12,%xmm9
-	pxor	%xmm13,%xmm10
-	pxor	%xmm8,%xmm9
-	pand	%xmm11,%xmm10
-	pand	%xmm1,%xmm9
-	pxor	%xmm7,%xmm11
-	pxor	%xmm5,%xmm1
-	pand	%xmm14,%xmm7
-	pand	%xmm12,%xmm5
-	pand	%xmm13,%xmm11
-	pand	%xmm8,%xmm1
-	pxor	%xmm11,%xmm7
-	pxor	%xmm5,%xmm1
-	pxor	%xmm10,%xmm11
-	pxor	%xmm9,%xmm5
-	pxor	%xmm11,%xmm4
-	pxor	%xmm11,%xmm1
-	pxor	%xmm7,%xmm0
-	pxor	%xmm7,%xmm5
-
-	movdqa	%xmm2,%xmm11
-	movdqa	%xmm6,%xmm7
-	pxor	%xmm15,%xmm11
-	pxor	%xmm3,%xmm7
-	movdqa	%xmm14,%xmm10
-	movdqa	%xmm12,%xmm9
-	pxor	%xmm13,%xmm10
-	pxor	%xmm8,%xmm9
-	pand	%xmm11,%xmm10
-	pand	%xmm15,%xmm9
-	pxor	%xmm7,%xmm11
-	pxor	%xmm3,%xmm15
-	pand	%xmm14,%xmm7
-	pand	%xmm12,%xmm3
-	pand	%xmm13,%xmm11
-	pand	%xmm8,%xmm15
-	pxor	%xmm11,%xmm7
-	pxor	%xmm3,%xmm15
-	pxor	%xmm10,%xmm11
-	pxor	%xmm9,%xmm3
-	pxor	%xmm12,%xmm14
-	pxor	%xmm8,%xmm13
-	movdqa	%xmm14,%xmm10
-	pxor	%xmm13,%xmm10
-	pand	%xmm2,%xmm10
-	pxor	%xmm6,%xmm2
-	pand	%xmm14,%xmm6
-	pand	%xmm13,%xmm2
-	pxor	%xmm6,%xmm2
-	pxor	%xmm10,%xmm6
-	pxor	%xmm11,%xmm2
-	pxor	%xmm11,%xmm15
-	pxor	%xmm7,%xmm6
-	pxor	%xmm7,%xmm3
-	pxor	%xmm6,%xmm0
-	pxor	%xmm4,%xmm5
-
-	pxor	%xmm0,%xmm3
-	pxor	%xmm6,%xmm1
-	pxor	%xmm6,%xmm4
-	pxor	%xmm1,%xmm3
-	pxor	%xmm15,%xmm6
-	pxor	%xmm4,%xmm3
-	pxor	%xmm5,%xmm2
-	pxor	%xmm0,%xmm5
-	pxor	%xmm3,%xmm2
-
-	pxor	%xmm15,%xmm3
-	pxor	%xmm2,%xmm6
-	decl	%r10d
-	jl	.Ldec_done
-
-	pshufd	$0x4E,%xmm15,%xmm7
-	pshufd	$0x4E,%xmm2,%xmm13
-	pxor	%xmm15,%xmm7
-	pshufd	$0x4E,%xmm4,%xmm14
-	pxor	%xmm2,%xmm13
-	pshufd	$0x4E,%xmm0,%xmm8
-	pxor	%xmm4,%xmm14
-	pshufd	$0x4E,%xmm5,%xmm9
-	pxor	%xmm0,%xmm8
-	pshufd	$0x4E,%xmm3,%xmm10
-	pxor	%xmm5,%xmm9
-	pxor	%xmm13,%xmm15
-	pxor	%xmm13,%xmm0
-	pshufd	$0x4E,%xmm1,%xmm11
-	pxor	%xmm3,%xmm10
-	pxor	%xmm7,%xmm5
-	pxor	%xmm8,%xmm3
-	pshufd	$0x4E,%xmm6,%xmm12
-	pxor	%xmm1,%xmm11
-	pxor	%xmm14,%xmm0
-	pxor	%xmm9,%xmm1
-	pxor	%xmm6,%xmm12
-
-	pxor	%xmm14,%xmm5
-	pxor	%xmm13,%xmm3
-	pxor	%xmm13,%xmm1
-	pxor	%xmm10,%xmm6
-	pxor	%xmm11,%xmm2
-	pxor	%xmm14,%xmm1
-	pxor	%xmm14,%xmm6
-	pxor	%xmm12,%xmm4
-	pshufd	$0x93,%xmm15,%xmm7
-	pshufd	$0x93,%xmm0,%xmm8
-	pxor	%xmm7,%xmm15
-	pshufd	$0x93,%xmm5,%xmm9
-	pxor	%xmm8,%xmm0
-	pshufd	$0x93,%xmm3,%xmm10
-	pxor	%xmm9,%xmm5
-	pshufd	$0x93,%xmm1,%xmm11
-	pxor	%xmm10,%xmm3
-	pshufd	$0x93,%xmm6,%xmm12
-	pxor	%xmm11,%xmm1
-	pshufd	$0x93,%xmm2,%xmm13
-	pxor	%xmm12,%xmm6
-	pshufd	$0x93,%xmm4,%xmm14
-	pxor	%xmm13,%xmm2
-	pxor	%xmm14,%xmm4
-
-	pxor	%xmm15,%xmm8
-	pxor	%xmm4,%xmm7
-	pxor	%xmm4,%xmm8
-	pshufd	$0x4E,%xmm15,%xmm15
-	pxor	%xmm0,%xmm9
-	pshufd	$0x4E,%xmm0,%xmm0
-	pxor	%xmm1,%xmm12
-	pxor	%xmm7,%xmm15
-	pxor	%xmm6,%xmm13
-	pxor	%xmm8,%xmm0
-	pxor	%xmm3,%xmm11
-	pshufd	$0x4E,%xmm1,%xmm7
-	pxor	%xmm2,%xmm14
-	pshufd	$0x4E,%xmm6,%xmm8
-	pxor	%xmm5,%xmm10
-	pshufd	$0x4E,%xmm3,%xmm1
-	pxor	%xmm4,%xmm10
-	pshufd	$0x4E,%xmm4,%xmm6
-	pxor	%xmm4,%xmm11
-	pshufd	$0x4E,%xmm2,%xmm3
-	pxor	%xmm11,%xmm7
-	pshufd	$0x4E,%xmm5,%xmm2
-	pxor	%xmm12,%xmm8
-	pxor	%xmm1,%xmm10
-	pxor	%xmm14,%xmm6
-	pxor	%xmm3,%xmm13
-	movdqa	%xmm7,%xmm3
-	pxor	%xmm9,%xmm2
-	movdqa	%xmm13,%xmm5
-	movdqa	%xmm8,%xmm4
-	movdqa	%xmm2,%xmm1
-	movdqa	%xmm10,%xmm2
-	movdqa	-16(%r11),%xmm7
-	jnz	.Ldec_loop
-	movdqa	-32(%r11),%xmm7
-	jmp	.Ldec_loop
-.align	16
-.Ldec_done:
-	movdqa	0(%r11),%xmm7
-	movdqa	16(%r11),%xmm8
-	movdqa	%xmm2,%xmm9
-	psrlq	$1,%xmm2
-	movdqa	%xmm1,%xmm10
-	psrlq	$1,%xmm1
-	pxor	%xmm4,%xmm2
-	pxor	%xmm6,%xmm1
-	pand	%xmm7,%xmm2
-	pand	%xmm7,%xmm1
-	pxor	%xmm2,%xmm4
-	psllq	$1,%xmm2
-	pxor	%xmm1,%xmm6
-	psllq	$1,%xmm1
-	pxor	%xmm9,%xmm2
-	pxor	%xmm10,%xmm1
-	movdqa	%xmm5,%xmm9
-	psrlq	$1,%xmm5
-	movdqa	%xmm15,%xmm10
-	psrlq	$1,%xmm15
-	pxor	%xmm3,%xmm5
-	pxor	%xmm0,%xmm15
-	pand	%xmm7,%xmm5
-	pand	%xmm7,%xmm15
-	pxor	%xmm5,%xmm3
-	psllq	$1,%xmm5
-	pxor	%xmm15,%xmm0
-	psllq	$1,%xmm15
-	pxor	%xmm9,%xmm5
-	pxor	%xmm10,%xmm15
-	movdqa	32(%r11),%xmm7
-	movdqa	%xmm6,%xmm9
-	psrlq	$2,%xmm6
-	movdqa	%xmm1,%xmm10
-	psrlq	$2,%xmm1
-	pxor	%xmm4,%xmm6
-	pxor	%xmm2,%xmm1
-	pand	%xmm8,%xmm6
-	pand	%xmm8,%xmm1
-	pxor	%xmm6,%xmm4
-	psllq	$2,%xmm6
-	pxor	%xmm1,%xmm2
-	psllq	$2,%xmm1
-	pxor	%xmm9,%xmm6
-	pxor	%xmm10,%xmm1
-	movdqa	%xmm0,%xmm9
-	psrlq	$2,%xmm0
-	movdqa	%xmm15,%xmm10
-	psrlq	$2,%xmm15
-	pxor	%xmm3,%xmm0
-	pxor	%xmm5,%xmm15
-	pand	%xmm8,%xmm0
-	pand	%xmm8,%xmm15
-	pxor	%xmm0,%xmm3
-	psllq	$2,%xmm0
-	pxor	%xmm15,%xmm5
-	psllq	$2,%xmm15
-	pxor	%xmm9,%xmm0
-	pxor	%xmm10,%xmm15
-	movdqa	%xmm3,%xmm9
-	psrlq	$4,%xmm3
-	movdqa	%xmm5,%xmm10
-	psrlq	$4,%xmm5
-	pxor	%xmm4,%xmm3
-	pxor	%xmm2,%xmm5
-	pand	%xmm7,%xmm3
-	pand	%xmm7,%xmm5
-	pxor	%xmm3,%xmm4
-	psllq	$4,%xmm3
-	pxor	%xmm5,%xmm2
-	psllq	$4,%xmm5
-	pxor	%xmm9,%xmm3
-	pxor	%xmm10,%xmm5
-	movdqa	%xmm0,%xmm9
-	psrlq	$4,%xmm0
-	movdqa	%xmm15,%xmm10
-	psrlq	$4,%xmm15
-	pxor	%xmm6,%xmm0
-	pxor	%xmm1,%xmm15
-	pand	%xmm7,%xmm0
-	pand	%xmm7,%xmm15
-	pxor	%xmm0,%xmm6
-	psllq	$4,%xmm0
-	pxor	%xmm15,%xmm1
-	psllq	$4,%xmm15
-	pxor	%xmm9,%xmm0
-	pxor	%xmm10,%xmm15
-	movdqa	(%rax),%xmm7
-	pxor	%xmm7,%xmm5
-	pxor	%xmm7,%xmm3
-	pxor	%xmm7,%xmm1
-	pxor	%xmm7,%xmm6
-	pxor	%xmm7,%xmm2
-	pxor	%xmm7,%xmm4
-	pxor	%xmm7,%xmm15
-	pxor	%xmm7,%xmm0
-	.byte	0xf3,0xc3
-.cfi_endproc	
-.size	_bsaes_decrypt8,.-_bsaes_decrypt8
-.type	_bsaes_key_convert,@function
-.align	16
-_bsaes_key_convert:
-.cfi_startproc	
-	leaq	.Lmasks(%rip),%r11
-	movdqu	(%rcx),%xmm7
-	leaq	16(%rcx),%rcx
-	movdqa	0(%r11),%xmm0
-	movdqa	16(%r11),%xmm1
-	movdqa	32(%r11),%xmm2
-	movdqa	48(%r11),%xmm3
-	movdqa	64(%r11),%xmm4
-	pcmpeqd	%xmm5,%xmm5
-
-	movdqu	(%rcx),%xmm6
-	movdqa	%xmm7,(%rax)
-	leaq	16(%rax),%rax
-	decl	%r10d
-	jmp	.Lkey_loop
-.align	16
-.Lkey_loop:
-.byte	102,15,56,0,244
-
-	movdqa	%xmm0,%xmm8
-	movdqa	%xmm1,%xmm9
-
-	pand	%xmm6,%xmm8
-	pand	%xmm6,%xmm9
-	movdqa	%xmm2,%xmm10
-	pcmpeqb	%xmm0,%xmm8
-	psllq	$4,%xmm0
-	movdqa	%xmm3,%xmm11
-	pcmpeqb	%xmm1,%xmm9
-	psllq	$4,%xmm1
-
-	pand	%xmm6,%xmm10
-	pand	%xmm6,%xmm11
-	movdqa	%xmm0,%xmm12
-	pcmpeqb	%xmm2,%xmm10
-	psllq	$4,%xmm2
-	movdqa	%xmm1,%xmm13
-	pcmpeqb	%xmm3,%xmm11
-	psllq	$4,%xmm3
-
-	movdqa	%xmm2,%xmm14
-	movdqa	%xmm3,%xmm15
-	pxor	%xmm5,%xmm8
-	pxor	%xmm5,%xmm9
-
-	pand	%xmm6,%xmm12
-	pand	%xmm6,%xmm13
-	movdqa	%xmm8,0(%rax)
-	pcmpeqb	%xmm0,%xmm12
-	psrlq	$4,%xmm0
-	movdqa	%xmm9,16(%rax)
-	pcmpeqb	%xmm1,%xmm13
-	psrlq	$4,%xmm1
-	leaq	16(%rcx),%rcx
-
-	pand	%xmm6,%xmm14
-	pand	%xmm6,%xmm15
-	movdqa	%xmm10,32(%rax)
-	pcmpeqb	%xmm2,%xmm14
-	psrlq	$4,%xmm2
-	movdqa	%xmm11,48(%rax)
-	pcmpeqb	%xmm3,%xmm15
-	psrlq	$4,%xmm3
-	movdqu	(%rcx),%xmm6
-
-	pxor	%xmm5,%xmm13
-	pxor	%xmm5,%xmm14
-	movdqa	%xmm12,64(%rax)
-	movdqa	%xmm13,80(%rax)
-	movdqa	%xmm14,96(%rax)
-	movdqa	%xmm15,112(%rax)
-	leaq	128(%rax),%rax
-	decl	%r10d
-	jnz	.Lkey_loop
-
-	movdqa	80(%r11),%xmm7
-
-	.byte	0xf3,0xc3
-.cfi_endproc	
-.size	_bsaes_key_convert,.-_bsaes_key_convert
-
-.globl	bsaes_cbc_encrypt
-.type	bsaes_cbc_encrypt,@function
-.align	16
-bsaes_cbc_encrypt:
-.cfi_startproc	
-	cmpl	$0,%r9d
-	jne	asm_AES_cbc_encrypt
-	cmpq	$128,%rdx
-	jb	asm_AES_cbc_encrypt
-
-	movq	%rsp,%rax
-.Lcbc_dec_prologue:
-	pushq	%rbp
-.cfi_adjust_cfa_offset	8
-.cfi_offset	%rbp,-16
-	pushq	%rbx
-.cfi_adjust_cfa_offset	8
-.cfi_offset	%rbx,-24
-	pushq	%r12
-.cfi_adjust_cfa_offset	8
-.cfi_offset	%r12,-32
-	pushq	%r13
-.cfi_adjust_cfa_offset	8
-.cfi_offset	%r13,-40
-	pushq	%r14
-.cfi_adjust_cfa_offset	8
-.cfi_offset	%r14,-48
-	pushq	%r15
-.cfi_adjust_cfa_offset	8
-.cfi_offset	%r15,-56
-	leaq	-72(%rsp),%rsp
-.cfi_adjust_cfa_offset	0x48
-	movq	%rsp,%rbp
-.cfi_def_cfa_register	%rbp
-	movl	240(%rcx),%eax
-	movq	%rdi,%r12
-	movq	%rsi,%r13
-	movq	%rdx,%r14
-	movq	%rcx,%r15
-	movq	%r8,%rbx
-	shrq	$4,%r14
-
-	movl	%eax,%edx
-	shlq	$7,%rax
-	subq	$96,%rax
-	subq	%rax,%rsp
-
-	movq	%rsp,%rax
-	movq	%r15,%rcx
-	movl	%edx,%r10d
-	call	_bsaes_key_convert
-	pxor	(%rsp),%xmm7
-	movdqa	%xmm6,(%rax)
-	movdqa	%xmm7,(%rsp)
-
-	movdqu	(%rbx),%xmm14
-	subq	$8,%r14
-.Lcbc_dec_loop:
-	movdqu	0(%r12),%xmm15
-	movdqu	16(%r12),%xmm0
-	movdqu	32(%r12),%xmm1
-	movdqu	48(%r12),%xmm2
-	movdqu	64(%r12),%xmm3
-	movdqu	80(%r12),%xmm4
-	movq	%rsp,%rax
-	movdqu	96(%r12),%xmm5
-	movl	%edx,%r10d
-	movdqu	112(%r12),%xmm6
-	movdqa	%xmm14,32(%rbp)
-
-	call	_bsaes_decrypt8
-
-	pxor	32(%rbp),%xmm15
-	movdqu	0(%r12),%xmm7
-	movdqu	16(%r12),%xmm8
-	pxor	%xmm7,%xmm0
-	movdqu	32(%r12),%xmm9
-	pxor	%xmm8,%xmm5
-	movdqu	48(%r12),%xmm10
-	pxor	%xmm9,%xmm3
-	movdqu	64(%r12),%xmm11
-	pxor	%xmm10,%xmm1
-	movdqu	80(%r12),%xmm12
-	pxor	%xmm11,%xmm6
-	movdqu	96(%r12),%xmm13
-	pxor	%xmm12,%xmm2
-	movdqu	112(%r12),%xmm14
-	pxor	%xmm13,%xmm4
-	movdqu	%xmm15,0(%r13)
-	leaq	128(%r12),%r12
-	movdqu	%xmm0,16(%r13)
-	movdqu	%xmm5,32(%r13)
-	movdqu	%xmm3,48(%r13)
-	movdqu	%xmm1,64(%r13)
-	movdqu	%xmm6,80(%r13)
-	movdqu	%xmm2,96(%r13)
-	movdqu	%xmm4,112(%r13)
-	leaq	128(%r13),%r13
-	subq	$8,%r14
-	jnc	.Lcbc_dec_loop
-
-	addq	$8,%r14
-	jz	.Lcbc_dec_done
-
-	movdqu	0(%r12),%xmm15
-	movq	%rsp,%rax
-	movl	%edx,%r10d
-	cmpq	$2,%r14
-	jb	.Lcbc_dec_one
-	movdqu	16(%r12),%xmm0
-	je	.Lcbc_dec_two
-	movdqu	32(%r12),%xmm1
-	cmpq	$4,%r14
-	jb	.Lcbc_dec_three
-	movdqu	48(%r12),%xmm2
-	je	.Lcbc_dec_four
-	movdqu	64(%r12),%xmm3
-	cmpq	$6,%r14
-	jb	.Lcbc_dec_five
-	movdqu	80(%r12),%xmm4
-	je	.Lcbc_dec_six
-	movdqu	96(%r12),%xmm5
-	movdqa	%xmm14,32(%rbp)
-	call	_bsaes_decrypt8
-	pxor	32(%rbp),%xmm15
-	movdqu	0(%r12),%xmm7
-	movdqu	16(%r12),%xmm8
-	pxor	%xmm7,%xmm0
-	movdqu	32(%r12),%xmm9
-	pxor	%xmm8,%xmm5
-	movdqu	48(%r12),%xmm10
-	pxor	%xmm9,%xmm3
-	movdqu	64(%r12),%xmm11
-	pxor	%xmm10,%xmm1
-	movdqu	80(%r12),%xmm12
-	pxor	%xmm11,%xmm6
-	movdqu	96(%r12),%xmm14
-	pxor	%xmm12,%xmm2
-	movdqu	%xmm15,0(%r13)
-	movdqu	%xmm0,16(%r13)
-	movdqu	%xmm5,32(%r13)
-	movdqu	%xmm3,48(%r13)
-	movdqu	%xmm1,64(%r13)
-	movdqu	%xmm6,80(%r13)
-	movdqu	%xmm2,96(%r13)
-	jmp	.Lcbc_dec_done
-.align	16
-.Lcbc_dec_six:
-	movdqa	%xmm14,32(%rbp)
-	call	_bsaes_decrypt8
-	pxor	32(%rbp),%xmm15
-	movdqu	0(%r12),%xmm7
-	movdqu	16(%r12),%xmm8
-	pxor	%xmm7,%xmm0
-	movdqu	32(%r12),%xmm9
-	pxor	%xmm8,%xmm5
-	movdqu	48(%r12),%xmm10
-	pxor	%xmm9,%xmm3
-	movdqu	64(%r12),%xmm11
-	pxor	%xmm10,%xmm1
-	movdqu	80(%r12),%xmm14
-	pxor	%xmm11,%xmm6
-	movdqu	%xmm15,0(%r13)
-	movdqu	%xmm0,16(%r13)
-	movdqu	%xmm5,32(%r13)
-	movdqu	%xmm3,48(%r13)
-	movdqu	%xmm1,64(%r13)
-	movdqu	%xmm6,80(%r13)
-	jmp	.Lcbc_dec_done
-.align	16
-.Lcbc_dec_five:
-	movdqa	%xmm14,32(%rbp)
-	call	_bsaes_decrypt8
-	pxor	32(%rbp),%xmm15
-	movdqu	0(%r12),%xmm7
-	movdqu	16(%r12),%xmm8
-	pxor	%xmm7,%xmm0
-	movdqu	32(%r12),%xmm9
-	pxor	%xmm8,%xmm5
-	movdqu	48(%r12),%xmm10
-	pxor	%xmm9,%xmm3
-	movdqu	64(%r12),%xmm14
-	pxor	%xmm10,%xmm1
-	movdqu	%xmm15,0(%r13)
-	movdqu	%xmm0,16(%r13)
-	movdqu	%xmm5,32(%r13)
-	movdqu	%xmm3,48(%r13)
-	movdqu	%xmm1,64(%r13)
-	jmp	.Lcbc_dec_done
-.align	16
-.Lcbc_dec_four:
-	movdqa	%xmm14,32(%rbp)
-	call	_bsaes_decrypt8
-	pxor	32(%rbp),%xmm15
-	movdqu	0(%r12),%xmm7
-	movdqu	16(%r12),%xmm8
-	pxor	%xmm7,%xmm0
-	movdqu	32(%r12),%xmm9
-	pxor	%xmm8,%xmm5
-	movdqu	48(%r12),%xmm14
-	pxor	%xmm9,%xmm3
-	movdqu	%xmm15,0(%r13)
-	movdqu	%xmm0,16(%r13)
-	movdqu	%xmm5,32(%r13)
-	movdqu	%xmm3,48(%r13)
-	jmp	.Lcbc_dec_done
-.align	16
-.Lcbc_dec_three:
-	movdqa	%xmm14,32(%rbp)
-	call	_bsaes_decrypt8
-	pxor	32(%rbp),%xmm15
-	movdqu	0(%r12),%xmm7
-	movdqu	16(%r12),%xmm8
-	pxor	%xmm7,%xmm0
-	movdqu	32(%r12),%xmm14
-	pxor	%xmm8,%xmm5
-	movdqu	%xmm15,0(%r13)
-	movdqu	%xmm0,16(%r13)
-	movdqu	%xmm5,32(%r13)
-	jmp	.Lcbc_dec_done
-.align	16
-.Lcbc_dec_two:
-	movdqa	%xmm14,32(%rbp)
-	call	_bsaes_decrypt8
-	pxor	32(%rbp),%xmm15
-	movdqu	0(%r12),%xmm7
-	movdqu	16(%r12),%xmm14
-	pxor	%xmm7,%xmm0
-	movdqu	%xmm15,0(%r13)
-	movdqu	%xmm0,16(%r13)
-	jmp	.Lcbc_dec_done
-.align	16
-.Lcbc_dec_one:
-	leaq	(%r12),%rdi
-	leaq	32(%rbp),%rsi
-	leaq	(%r15),%rdx
-	call	asm_AES_decrypt
-	pxor	32(%rbp),%xmm14
-	movdqu	%xmm14,(%r13)
-	movdqa	%xmm15,%xmm14
-
-.Lcbc_dec_done:
-	movdqu	%xmm14,(%rbx)
-	leaq	(%rsp),%rax
-	pxor	%xmm0,%xmm0
-.Lcbc_dec_bzero:
-	movdqa	%xmm0,0(%rax)
-	movdqa	%xmm0,16(%rax)
-	leaq	32(%rax),%rax
-	cmpq	%rax,%rbp
-	ja	.Lcbc_dec_bzero
-
-	leaq	120(%rbp),%rax
-.cfi_def_cfa	%rax,8
-	movq	-48(%rax),%r15
-.cfi_restore	%r15
-	movq	-40(%rax),%r14
-.cfi_restore	%r14
-	movq	-32(%rax),%r13
-.cfi_restore	%r13
-	movq	-24(%rax),%r12
-.cfi_restore	%r12
-	movq	-16(%rax),%rbx
-.cfi_restore	%rbx
-	movq	-8(%rax),%rbp
-.cfi_restore	%rbp
-	leaq	(%rax),%rsp
-.cfi_def_cfa_register	%rsp
-.Lcbc_dec_epilogue:
-	.byte	0xf3,0xc3
-.cfi_endproc	
-.size	bsaes_cbc_encrypt,.-bsaes_cbc_encrypt
-
-.globl	bsaes_ctr32_encrypt_blocks
-.type	bsaes_ctr32_encrypt_blocks,@function
-.align	16
-bsaes_ctr32_encrypt_blocks:
-.cfi_startproc	
-	movq	%rsp,%rax
-.Lctr_enc_prologue:
-	pushq	%rbp
-.cfi_adjust_cfa_offset	8
-.cfi_offset	%rbp,-16
-	pushq	%rbx
-.cfi_adjust_cfa_offset	8
-.cfi_offset	%rbx,-24
-	pushq	%r12
-.cfi_adjust_cfa_offset	8
-.cfi_offset	%r12,-32
-	pushq	%r13
-.cfi_adjust_cfa_offset	8
-.cfi_offset	%r13,-40
-	pushq	%r14
-.cfi_adjust_cfa_offset	8
-.cfi_offset	%r14,-48
-	pushq	%r15
-.cfi_adjust_cfa_offset	8
-.cfi_offset	%r15,-56
-	leaq	-72(%rsp),%rsp
-.cfi_adjust_cfa_offset	0x48
-	movq	%rsp,%rbp
-.cfi_def_cfa_register	%rbp
-	movdqu	(%r8),%xmm0
-	movl	240(%rcx),%eax
-	movq	%rdi,%r12
-	movq	%rsi,%r13
-	movq	%rdx,%r14
-	movq	%rcx,%r15
-	movdqa	%xmm0,32(%rbp)
-	cmpq	$8,%rdx
-	jb	.Lctr_enc_short
-
-	movl	%eax,%ebx
-	shlq	$7,%rax
-	subq	$96,%rax
-	subq	%rax,%rsp
-
-	movq	%rsp,%rax
-	movq	%r15,%rcx
-	movl	%ebx,%r10d
-	call	_bsaes_key_convert
-	pxor	%xmm6,%xmm7
-	movdqa	%xmm7,(%rax)
-
-	movdqa	(%rsp),%xmm8
-	leaq	.LADD1(%rip),%r11
-	movdqa	32(%rbp),%xmm15
-	movdqa	-32(%r11),%xmm7
-.byte	102,68,15,56,0,199
-.byte	102,68,15,56,0,255
-	movdqa	%xmm8,(%rsp)
-	jmp	.Lctr_enc_loop
-.align	16
-.Lctr_enc_loop:
-	movdqa	%xmm15,32(%rbp)
-	movdqa	%xmm15,%xmm0
-	movdqa	%xmm15,%xmm1
-	paddd	0(%r11),%xmm0
-	movdqa	%xmm15,%xmm2
-	paddd	16(%r11),%xmm1
-	movdqa	%xmm15,%xmm3
-	paddd	32(%r11),%xmm2
-	movdqa	%xmm15,%xmm4
-	paddd	48(%r11),%xmm3
-	movdqa	%xmm15,%xmm5
-	paddd	64(%r11),%xmm4
-	movdqa	%xmm15,%xmm6
-	paddd	80(%r11),%xmm5
-	paddd	96(%r11),%xmm6
-
-
-
-	movdqa	(%rsp),%xmm8
-	leaq	16(%rsp),%rax
-	movdqa	-16(%r11),%xmm7
-	pxor	%xmm8,%xmm15
-	pxor	%xmm8,%xmm0
-	pxor	%xmm8,%xmm1
-	pxor	%xmm8,%xmm2
-.byte	102,68,15,56,0,255
-.byte	102,15,56,0,199
-	pxor	%xmm8,%xmm3
-	pxor	%xmm8,%xmm4
-.byte	102,15,56,0,207
-.byte	102,15,56,0,215
-	pxor	%xmm8,%xmm5
-	pxor	%xmm8,%xmm6
-.byte	102,15,56,0,223
-.byte	102,15,56,0,231
-.byte	102,15,56,0,239
-.byte	102,15,56,0,247
-	leaq	.LBS0(%rip),%r11
-	movl	%ebx,%r10d
-
-	call	_bsaes_encrypt8_bitslice
-
-	subq	$8,%r14
-	jc	.Lctr_enc_loop_done
-
-	movdqu	0(%r12),%xmm7
-	movdqu	16(%r12),%xmm8
-	movdqu	32(%r12),%xmm9
-	movdqu	48(%r12),%xmm10
-	movdqu	64(%r12),%xmm11
-	movdqu	80(%r12),%xmm12
-	movdqu	96(%r12),%xmm13
-	movdqu	112(%r12),%xmm14
-	leaq	128(%r12),%r12
-	pxor	%xmm15,%xmm7
-	movdqa	32(%rbp),%xmm15
-	pxor	%xmm8,%xmm0
-	movdqu	%xmm7,0(%r13)
-	pxor	%xmm9,%xmm3
-	movdqu	%xmm0,16(%r13)
-	pxor	%xmm10,%xmm5
-	movdqu	%xmm3,32(%r13)
-	pxor	%xmm11,%xmm2
-	movdqu	%xmm5,48(%r13)
-	pxor	%xmm12,%xmm6
-	movdqu	%xmm2,64(%r13)
-	pxor	%xmm13,%xmm1
-	movdqu	%xmm6,80(%r13)
-	pxor	%xmm14,%xmm4
-	movdqu	%xmm1,96(%r13)
-	leaq	.LADD1(%rip),%r11
-	movdqu	%xmm4,112(%r13)
-	leaq	128(%r13),%r13
-	paddd	112(%r11),%xmm15
-	jnz	.Lctr_enc_loop
-
-	jmp	.Lctr_enc_done
-.align	16
-.Lctr_enc_loop_done:
-	addq	$8,%r14
-	movdqu	0(%r12),%xmm7
-	pxor	%xmm7,%xmm15
-	movdqu	%xmm15,0(%r13)
-	cmpq	$2,%r14
-	jb	.Lctr_enc_done
-	movdqu	16(%r12),%xmm8
-	pxor	%xmm8,%xmm0
-	movdqu	%xmm0,16(%r13)
-	je	.Lctr_enc_done
-	movdqu	32(%r12),%xmm9
-	pxor	%xmm9,%xmm3
-	movdqu	%xmm3,32(%r13)
-	cmpq	$4,%r14
-	jb	.Lctr_enc_done
-	movdqu	48(%r12),%xmm10
-	pxor	%xmm10,%xmm5
-	movdqu	%xmm5,48(%r13)
-	je	.Lctr_enc_done
-	movdqu	64(%r12),%xmm11
-	pxor	%xmm11,%xmm2
-	movdqu	%xmm2,64(%r13)
-	cmpq	$6,%r14
-	jb	.Lctr_enc_done
-	movdqu	80(%r12),%xmm12
-	pxor	%xmm12,%xmm6
-	movdqu	%xmm6,80(%r13)
-	je	.Lctr_enc_done
-	movdqu	96(%r12),%xmm13
-	pxor	%xmm13,%xmm1
-	movdqu	%xmm1,96(%r13)
-	jmp	.Lctr_enc_done
-
-.align	16
-.Lctr_enc_short:
-	leaq	32(%rbp),%rdi
-	leaq	48(%rbp),%rsi
-	leaq	(%r15),%rdx
-	call	asm_AES_encrypt
-	movdqu	(%r12),%xmm0
-	leaq	16(%r12),%r12
-	movl	44(%rbp),%eax
-	bswapl	%eax
-	pxor	48(%rbp),%xmm0
-	incl	%eax
-	movdqu	%xmm0,(%r13)
-	bswapl	%eax
-	leaq	16(%r13),%r13
-	movl	%eax,44(%rsp)
-	decq	%r14
-	jnz	.Lctr_enc_short
-
-.Lctr_enc_done:
-	leaq	(%rsp),%rax
-	pxor	%xmm0,%xmm0
-.Lctr_enc_bzero:
-	movdqa	%xmm0,0(%rax)
-	movdqa	%xmm0,16(%rax)
-	leaq	32(%rax),%rax
-	cmpq	%rax,%rbp
-	ja	.Lctr_enc_bzero
-
-	leaq	120(%rbp),%rax
-.cfi_def_cfa	%rax,8
-	movq	-48(%rax),%r15
-.cfi_restore	%r15
-	movq	-40(%rax),%r14
-.cfi_restore	%r14
-	movq	-32(%rax),%r13
-.cfi_restore	%r13
-	movq	-24(%rax),%r12
-.cfi_restore	%r12
-	movq	-16(%rax),%rbx
-.cfi_restore	%rbx
-	movq	-8(%rax),%rbp
-.cfi_restore	%rbp
-	leaq	(%rax),%rsp
-.cfi_def_cfa_register	%rsp
-.Lctr_enc_epilogue:
-	.byte	0xf3,0xc3
-.cfi_endproc	
-.size	bsaes_ctr32_encrypt_blocks,.-bsaes_ctr32_encrypt_blocks
-.globl	bsaes_xts_encrypt
-.type	bsaes_xts_encrypt,@function
-.align	16
-bsaes_xts_encrypt:
-.cfi_startproc	
-	movq	%rsp,%rax
-.Lxts_enc_prologue:
-	pushq	%rbp
-.cfi_adjust_cfa_offset	8
-.cfi_offset	%rbp,-16
-	pushq	%rbx
-.cfi_adjust_cfa_offset	8
-.cfi_offset	%rbx,-24
-	pushq	%r12
-.cfi_adjust_cfa_offset	8
-.cfi_offset	%r12,-32
-	pushq	%r13
-.cfi_adjust_cfa_offset	8
-.cfi_offset	%r13,-40
-	pushq	%r14
-.cfi_adjust_cfa_offset	8
-.cfi_offset	%r14,-48
-	pushq	%r15
-.cfi_adjust_cfa_offset	8
-.cfi_offset	%r15,-56
-	leaq	-72(%rsp),%rsp
-.cfi_adjust_cfa_offset	0x48
-	movq	%rsp,%rbp
-.cfi_def_cfa_register	%rbp
-	movq	%rdi,%r12
-	movq	%rsi,%r13
-	movq	%rdx,%r14
-	movq	%rcx,%r15
-
-	leaq	(%r9),%rdi
-	leaq	32(%rbp),%rsi
-	leaq	(%r8),%rdx
-	call	asm_AES_encrypt
-
-	movl	240(%r15),%eax
-	movq	%r14,%rbx
-
-	movl	%eax,%edx
-	shlq	$7,%rax
-	subq	$96,%rax
-	subq	%rax,%rsp
-
-	movq	%rsp,%rax
-	movq	%r15,%rcx
-	movl	%edx,%r10d
-	call	_bsaes_key_convert
-	pxor	%xmm6,%xmm7
-	movdqa	%xmm7,(%rax)
-
-	andq	$-16,%r14
-	subq	$0x80,%rsp
-	movdqa	32(%rbp),%xmm6
-
-	pxor	%xmm14,%xmm14
-	movdqa	.Lxts_magic(%rip),%xmm12
-	pcmpgtd	%xmm6,%xmm14
-
-	subq	$0x80,%r14
-	jc	.Lxts_enc_short
-	jmp	.Lxts_enc_loop
-
-.align	16
-.Lxts_enc_loop:
-	pshufd	$0x13,%xmm14,%xmm13
-	pxor	%xmm14,%xmm14
-	movdqa	%xmm6,%xmm15
-	movdqa	%xmm6,0(%rsp)
-	paddq	%xmm6,%xmm6
-	pand	%xmm12,%xmm13
-	pcmpgtd	%xmm6,%xmm14
-	pxor	%xmm13,%xmm6
-	pshufd	$0x13,%xmm14,%xmm13
-	pxor	%xmm14,%xmm14
-	movdqa	%xmm6,%xmm0
-	movdqa	%xmm6,16(%rsp)
-	paddq	%xmm6,%xmm6
-	pand	%xmm12,%xmm13
-	pcmpgtd	%xmm6,%xmm14
-	pxor	%xmm13,%xmm6
-	movdqu	0(%r12),%xmm7
-	pshufd	$0x13,%xmm14,%xmm13
-	pxor	%xmm14,%xmm14
-	movdqa	%xmm6,%xmm1
-	movdqa	%xmm6,32(%rsp)
-	paddq	%xmm6,%xmm6
-	pand	%xmm12,%xmm13
-	pcmpgtd	%xmm6,%xmm14
-	pxor	%xmm13,%xmm6
-	movdqu	16(%r12),%xmm8
-	pxor	%xmm7,%xmm15
-	pshufd	$0x13,%xmm14,%xmm13
-	pxor	%xmm14,%xmm14
-	movdqa	%xmm6,%xmm2
-	movdqa	%xmm6,48(%rsp)
-	paddq	%xmm6,%xmm6
-	pand	%xmm12,%xmm13
-	pcmpgtd	%xmm6,%xmm14
-	pxor	%xmm13,%xmm6
-	movdqu	32(%r12),%xmm9
-	pxor	%xmm8,%xmm0
-	pshufd	$0x13,%xmm14,%xmm13
-	pxor	%xmm14,%xmm14
-	movdqa	%xmm6,%xmm3
-	movdqa	%xmm6,64(%rsp)
-	paddq	%xmm6,%xmm6
-	pand	%xmm12,%xmm13
-	pcmpgtd	%xmm6,%xmm14
-	pxor	%xmm13,%xmm6
-	movdqu	48(%r12),%xmm10
-	pxor	%xmm9,%xmm1
-	pshufd	$0x13,%xmm14,%xmm13
-	pxor	%xmm14,%xmm14
-	movdqa	%xmm6,%xmm4
-	movdqa	%xmm6,80(%rsp)
-	paddq	%xmm6,%xmm6
-	pand	%xmm12,%xmm13
-	pcmpgtd	%xmm6,%xmm14
-	pxor	%xmm13,%xmm6
-	movdqu	64(%r12),%xmm11
-	pxor	%xmm10,%xmm2
-	pshufd	$0x13,%xmm14,%xmm13
-	pxor	%xmm14,%xmm14
-	movdqa	%xmm6,%xmm5
-	movdqa	%xmm6,96(%rsp)
-	paddq	%xmm6,%xmm6
-	pand	%xmm12,%xmm13
-	pcmpgtd	%xmm6,%xmm14
-	pxor	%xmm13,%xmm6
-	movdqu	80(%r12),%xmm12
-	pxor	%xmm11,%xmm3
-	movdqu	96(%r12),%xmm13
-	pxor	%xmm12,%xmm4
-	movdqu	112(%r12),%xmm14
-	leaq	128(%r12),%r12
-	movdqa	%xmm6,112(%rsp)
-	pxor	%xmm13,%xmm5
-	leaq	128(%rsp),%rax
-	pxor	%xmm14,%xmm6
-	movl	%edx,%r10d
-
-	call	_bsaes_encrypt8
-
-	pxor	0(%rsp),%xmm15
-	pxor	16(%rsp),%xmm0
-	movdqu	%xmm15,0(%r13)
-	pxor	32(%rsp),%xmm3
-	movdqu	%xmm0,16(%r13)
-	pxor	48(%rsp),%xmm5
-	movdqu	%xmm3,32(%r13)
-	pxor	64(%rsp),%xmm2
-	movdqu	%xmm5,48(%r13)
-	pxor	80(%rsp),%xmm6
-	movdqu	%xmm2,64(%r13)
-	pxor	96(%rsp),%xmm1
-	movdqu	%xmm6,80(%r13)
-	pxor	112(%rsp),%xmm4
-	movdqu	%xmm1,96(%r13)
-	movdqu	%xmm4,112(%r13)
-	leaq	128(%r13),%r13
-
-	movdqa	112(%rsp),%xmm6
-	pxor	%xmm14,%xmm14
-	movdqa	.Lxts_magic(%rip),%xmm12
-	pcmpgtd	%xmm6,%xmm14
-	pshufd	$0x13,%xmm14,%xmm13
-	pxor	%xmm14,%xmm14
-	paddq	%xmm6,%xmm6
-	pand	%xmm12,%xmm13
-	pcmpgtd	%xmm6,%xmm14
-	pxor	%xmm13,%xmm6
-
-	subq	$0x80,%r14
-	jnc	.Lxts_enc_loop
-
-.Lxts_enc_short:
-	addq	$0x80,%r14
-	jz	.Lxts_enc_done
-	pshufd	$0x13,%xmm14,%xmm13
-	pxor	%xmm14,%xmm14
-	movdqa	%xmm6,%xmm15
-	movdqa	%xmm6,0(%rsp)
-	paddq	%xmm6,%xmm6
-	pand	%xmm12,%xmm13
-	pcmpgtd	%xmm6,%xmm14
-	pxor	%xmm13,%xmm6
-	pshufd	$0x13,%xmm14,%xmm13
-	pxor	%xmm14,%xmm14
-	movdqa	%xmm6,%xmm0
-	movdqa	%xmm6,16(%rsp)
-	paddq	%xmm6,%xmm6
-	pand	%xmm12,%xmm13
-	pcmpgtd	%xmm6,%xmm14
-	pxor	%xmm13,%xmm6
-	movdqu	0(%r12),%xmm7
-	cmpq	$16,%r14
-	je	.Lxts_enc_1
-	pshufd	$0x13,%xmm14,%xmm13
-	pxor	%xmm14,%xmm14
-	movdqa	%xmm6,%xmm1
-	movdqa	%xmm6,32(%rsp)
-	paddq	%xmm6,%xmm6
-	pand	%xmm12,%xmm13
-	pcmpgtd	%xmm6,%xmm14
-	pxor	%xmm13,%xmm6
-	movdqu	16(%r12),%xmm8
-	cmpq	$32,%r14
-	je	.Lxts_enc_2
-	pxor	%xmm7,%xmm15
-	pshufd	$0x13,%xmm14,%xmm13
-	pxor	%xmm14,%xmm14
-	movdqa	%xmm6,%xmm2
-	movdqa	%xmm6,48(%rsp)
-	paddq	%xmm6,%xmm6
-	pand	%xmm12,%xmm13
-	pcmpgtd	%xmm6,%xmm14
-	pxor	%xmm13,%xmm6
-	movdqu	32(%r12),%xmm9
-	cmpq	$48,%r14
-	je	.Lxts_enc_3
-	pxor	%xmm8,%xmm0
-	pshufd	$0x13,%xmm14,%xmm13
-	pxor	%xmm14,%xmm14
-	movdqa	%xmm6,%xmm3
-	movdqa	%xmm6,64(%rsp)
-	paddq	%xmm6,%xmm6
-	pand	%xmm12,%xmm13
-	pcmpgtd	%xmm6,%xmm14
-	pxor	%xmm13,%xmm6
-	movdqu	48(%r12),%xmm10
-	cmpq	$64,%r14
-	je	.Lxts_enc_4
-	pxor	%xmm9,%xmm1
-	pshufd	$0x13,%xmm14,%xmm13
-	pxor	%xmm14,%xmm14
-	movdqa	%xmm6,%xmm4
-	movdqa	%xmm6,80(%rsp)
-	paddq	%xmm6,%xmm6
-	pand	%xmm12,%xmm13
-	pcmpgtd	%xmm6,%xmm14
-	pxor	%xmm13,%xmm6
-	movdqu	64(%r12),%xmm11
-	cmpq	$80,%r14
-	je	.Lxts_enc_5
-	pxor	%xmm10,%xmm2
-	pshufd	$0x13,%xmm14,%xmm13
-	pxor	%xmm14,%xmm14
-	movdqa	%xmm6,%xmm5
-	movdqa	%xmm6,96(%rsp)
-	paddq	%xmm6,%xmm6
-	pand	%xmm12,%xmm13
-	pcmpgtd	%xmm6,%xmm14
-	pxor	%xmm13,%xmm6
-	movdqu	80(%r12),%xmm12
-	cmpq	$96,%r14
-	je	.Lxts_enc_6
-	pxor	%xmm11,%xmm3
-	movdqu	96(%r12),%xmm13
-	pxor	%xmm12,%xmm4
-	movdqa	%xmm6,112(%rsp)
-	leaq	112(%r12),%r12
-	pxor	%xmm13,%xmm5
-	leaq	128(%rsp),%rax
-	movl	%edx,%r10d
-
-	call	_bsaes_encrypt8
-
-	pxor	0(%rsp),%xmm15
-	pxor	16(%rsp),%xmm0
-	movdqu	%xmm15,0(%r13)
-	pxor	32(%rsp),%xmm3
-	movdqu	%xmm0,16(%r13)
-	pxor	48(%rsp),%xmm5
-	movdqu	%xmm3,32(%r13)
-	pxor	64(%rsp),%xmm2
-	movdqu	%xmm5,48(%r13)
-	pxor	80(%rsp),%xmm6
-	movdqu	%xmm2,64(%r13)
-	pxor	96(%rsp),%xmm1
-	movdqu	%xmm6,80(%r13)
-	movdqu	%xmm1,96(%r13)
-	leaq	112(%r13),%r13
-
-	movdqa	112(%rsp),%xmm6
-	jmp	.Lxts_enc_done
-.align	16
-.Lxts_enc_6:
-	pxor	%xmm11,%xmm3
-	leaq	96(%r12),%r12
-	pxor	%xmm12,%xmm4
-	leaq	128(%rsp),%rax
-	movl	%edx,%r10d
-
-	call	_bsaes_encrypt8
-
-	pxor	0(%rsp),%xmm15
-	pxor	16(%rsp),%xmm0
-	movdqu	%xmm15,0(%r13)
-	pxor	32(%rsp),%xmm3
-	movdqu	%xmm0,16(%r13)
-	pxor	48(%rsp),%xmm5
-	movdqu	%xmm3,32(%r13)
-	pxor	64(%rsp),%xmm2
-	movdqu	%xmm5,48(%r13)
-	pxor	80(%rsp),%xmm6
-	movdqu	%xmm2,64(%r13)
-	movdqu	%xmm6,80(%r13)
-	leaq	96(%r13),%r13
-
-	movdqa	96(%rsp),%xmm6
-	jmp	.Lxts_enc_done
-.align	16
-.Lxts_enc_5:
-	pxor	%xmm10,%xmm2
-	leaq	80(%r12),%r12
-	pxor	%xmm11,%xmm3
-	leaq	128(%rsp),%rax
-	movl	%edx,%r10d
-
-	call	_bsaes_encrypt8
-
-	pxor	0(%rsp),%xmm15
-	pxor	16(%rsp),%xmm0
-	movdqu	%xmm15,0(%r13)
-	pxor	32(%rsp),%xmm3
-	movdqu	%xmm0,16(%r13)
-	pxor	48(%rsp),%xmm5
-	movdqu	%xmm3,32(%r13)
-	pxor	64(%rsp),%xmm2
-	movdqu	%xmm5,48(%r13)
-	movdqu	%xmm2,64(%r13)
-	leaq	80(%r13),%r13
-
-	movdqa	80(%rsp),%xmm6
-	jmp	.Lxts_enc_done
-.align	16
-.Lxts_enc_4:
-	pxor	%xmm9,%xmm1
-	leaq	64(%r12),%r12
-	pxor	%xmm10,%xmm2
-	leaq	128(%rsp),%rax
-	movl	%edx,%r10d
-
-	call	_bsaes_encrypt8
-
-	pxor	0(%rsp),%xmm15
-	pxor	16(%rsp),%xmm0
-	movdqu	%xmm15,0(%r13)
-	pxor	32(%rsp),%xmm3
-	movdqu	%xmm0,16(%r13)
-	pxor	48(%rsp),%xmm5
-	movdqu	%xmm3,32(%r13)
-	movdqu	%xmm5,48(%r13)
-	leaq	64(%r13),%r13
-
-	movdqa	64(%rsp),%xmm6
-	jmp	.Lxts_enc_done
-.align	16
-.Lxts_enc_3:
-	pxor	%xmm8,%xmm0
-	leaq	48(%r12),%r12
-	pxor	%xmm9,%xmm1
-	leaq	128(%rsp),%rax
-	movl	%edx,%r10d
-
-	call	_bsaes_encrypt8
-
-	pxor	0(%rsp),%xmm15
-	pxor	16(%rsp),%xmm0
-	movdqu	%xmm15,0(%r13)
-	pxor	32(%rsp),%xmm3
-	movdqu	%xmm0,16(%r13)
-	movdqu	%xmm3,32(%r13)
-	leaq	48(%r13),%r13
-
-	movdqa	48(%rsp),%xmm6
-	jmp	.Lxts_enc_done
-.align	16
-.Lxts_enc_2:
-	pxor	%xmm7,%xmm15
-	leaq	32(%r12),%r12
-	pxor	%xmm8,%xmm0
-	leaq	128(%rsp),%rax
-	movl	%edx,%r10d
-
-	call	_bsaes_encrypt8
-
-	pxor	0(%rsp),%xmm15
-	pxor	16(%rsp),%xmm0
-	movdqu	%xmm15,0(%r13)
-	movdqu	%xmm0,16(%r13)
-	leaq	32(%r13),%r13
-
-	movdqa	32(%rsp),%xmm6
-	jmp	.Lxts_enc_done
-.align	16
-.Lxts_enc_1:
-	pxor	%xmm15,%xmm7
-	leaq	16(%r12),%r12
-	movdqa	%xmm7,32(%rbp)
-	leaq	32(%rbp),%rdi
-	leaq	32(%rbp),%rsi
-	leaq	(%r15),%rdx
-	call	asm_AES_encrypt
-	pxor	32(%rbp),%xmm15
-
-
-
-
-
-	movdqu	%xmm15,0(%r13)
-	leaq	16(%r13),%r13
-
-	movdqa	16(%rsp),%xmm6
-
-.Lxts_enc_done:
-	andl	$15,%ebx
-	jz	.Lxts_enc_ret
-	movq	%r13,%rdx
-
-.Lxts_enc_steal:
-	movzbl	(%r12),%eax
-	movzbl	-16(%rdx),%ecx
-	leaq	1(%r12),%r12
-	movb	%al,-16(%rdx)
-	movb	%cl,0(%rdx)
-	leaq	1(%rdx),%rdx
-	subl	$1,%ebx
-	jnz	.Lxts_enc_steal
-
-	movdqu	-16(%r13),%xmm15
-	leaq	32(%rbp),%rdi
-	pxor	%xmm6,%xmm15
-	leaq	32(%rbp),%rsi
-	movdqa	%xmm15,32(%rbp)
-	leaq	(%r15),%rdx
-	call	asm_AES_encrypt
-	pxor	32(%rbp),%xmm6
-	movdqu	%xmm6,-16(%r13)
-
-.Lxts_enc_ret:
-	leaq	(%rsp),%rax
-	pxor	%xmm0,%xmm0
-.Lxts_enc_bzero:
-	movdqa	%xmm0,0(%rax)
-	movdqa	%xmm0,16(%rax)
-	leaq	32(%rax),%rax
-	cmpq	%rax,%rbp
-	ja	.Lxts_enc_bzero
-
-	leaq	120(%rbp),%rax
-.cfi_def_cfa	%rax,8
-	movq	-48(%rax),%r15
-.cfi_restore	%r15
-	movq	-40(%rax),%r14
-.cfi_restore	%r14
-	movq	-32(%rax),%r13
-.cfi_restore	%r13
-	movq	-24(%rax),%r12
-.cfi_restore	%r12
-	movq	-16(%rax),%rbx
-.cfi_restore	%rbx
-	movq	-8(%rax),%rbp
-.cfi_restore	%rbp
-	leaq	(%rax),%rsp
-.cfi_def_cfa_register	%rsp
-.Lxts_enc_epilogue:
-	.byte	0xf3,0xc3
-.cfi_endproc	
-.size	bsaes_xts_encrypt,.-bsaes_xts_encrypt
-
-.globl	bsaes_xts_decrypt
-.type	bsaes_xts_decrypt,@function
-.align	16
-bsaes_xts_decrypt:
-.cfi_startproc	
-	movq	%rsp,%rax
-.Lxts_dec_prologue:
-	pushq	%rbp
-.cfi_adjust_cfa_offset	8
-.cfi_offset	%rbp,-16
-	pushq	%rbx
-.cfi_adjust_cfa_offset	8
-.cfi_offset	%rbx,-24
-	pushq	%r12
-.cfi_adjust_cfa_offset	8
-.cfi_offset	%r12,-32
-	pushq	%r13
-.cfi_adjust_cfa_offset	8
-.cfi_offset	%r13,-40
-	pushq	%r14
-.cfi_adjust_cfa_offset	8
-.cfi_offset	%r14,-48
-	pushq	%r15
-.cfi_adjust_cfa_offset	8
-.cfi_offset	%r15,-56
-	leaq	-72(%rsp),%rsp
-.cfi_adjust_cfa_offset	0x48
-	movq	%rsp,%rbp
-	movq	%rdi,%r12
-	movq	%rsi,%r13
-	movq	%rdx,%r14
-	movq	%rcx,%r15
-
-	leaq	(%r9),%rdi
-	leaq	32(%rbp),%rsi
-	leaq	(%r8),%rdx
-	call	asm_AES_encrypt
-
-	movl	240(%r15),%eax
-	movq	%r14,%rbx
-
-	movl	%eax,%edx
-	shlq	$7,%rax
-	subq	$96,%rax
-	subq	%rax,%rsp
-
-	movq	%rsp,%rax
-	movq	%r15,%rcx
-	movl	%edx,%r10d
-	call	_bsaes_key_convert
-	pxor	(%rsp),%xmm7
-	movdqa	%xmm6,(%rax)
-	movdqa	%xmm7,(%rsp)
-
-	xorl	%eax,%eax
-	andq	$-16,%r14
-	testl	$15,%ebx
-	setnz	%al
-	shlq	$4,%rax
-	subq	%rax,%r14
-
-	subq	$0x80,%rsp
-	movdqa	32(%rbp),%xmm6
-
-	pxor	%xmm14,%xmm14
-	movdqa	.Lxts_magic(%rip),%xmm12
-	pcmpgtd	%xmm6,%xmm14
-
-	subq	$0x80,%r14
-	jc	.Lxts_dec_short
-	jmp	.Lxts_dec_loop
-
-.align	16
-.Lxts_dec_loop:
-	pshufd	$0x13,%xmm14,%xmm13
-	pxor	%xmm14,%xmm14
-	movdqa	%xmm6,%xmm15
-	movdqa	%xmm6,0(%rsp)
-	paddq	%xmm6,%xmm6
-	pand	%xmm12,%xmm13
-	pcmpgtd	%xmm6,%xmm14
-	pxor	%xmm13,%xmm6
-	pshufd	$0x13,%xmm14,%xmm13
-	pxor	%xmm14,%xmm14
-	movdqa	%xmm6,%xmm0
-	movdqa	%xmm6,16(%rsp)
-	paddq	%xmm6,%xmm6
-	pand	%xmm12,%xmm13
-	pcmpgtd	%xmm6,%xmm14
-	pxor	%xmm13,%xmm6
-	movdqu	0(%r12),%xmm7
-	pshufd	$0x13,%xmm14,%xmm13
-	pxor	%xmm14,%xmm14
-	movdqa	%xmm6,%xmm1
-	movdqa	%xmm6,32(%rsp)
-	paddq	%xmm6,%xmm6
-	pand	%xmm12,%xmm13
-	pcmpgtd	%xmm6,%xmm14
-	pxor	%xmm13,%xmm6
-	movdqu	16(%r12),%xmm8
-	pxor	%xmm7,%xmm15
-	pshufd	$0x13,%xmm14,%xmm13
-	pxor	%xmm14,%xmm14
-	movdqa	%xmm6,%xmm2
-	movdqa	%xmm6,48(%rsp)
-	paddq	%xmm6,%xmm6
-	pand	%xmm12,%xmm13
-	pcmpgtd	%xmm6,%xmm14
-	pxor	%xmm13,%xmm6
-	movdqu	32(%r12),%xmm9
-	pxor	%xmm8,%xmm0
-	pshufd	$0x13,%xmm14,%xmm13
-	pxor	%xmm14,%xmm14
-	movdqa	%xmm6,%xmm3
-	movdqa	%xmm6,64(%rsp)
-	paddq	%xmm6,%xmm6
-	pand	%xmm12,%xmm13
-	pcmpgtd	%xmm6,%xmm14
-	pxor	%xmm13,%xmm6
-	movdqu	48(%r12),%xmm10
-	pxor	%xmm9,%xmm1
-	pshufd	$0x13,%xmm14,%xmm13
-	pxor	%xmm14,%xmm14
-	movdqa	%xmm6,%xmm4
-	movdqa	%xmm6,80(%rsp)
-	paddq	%xmm6,%xmm6
-	pand	%xmm12,%xmm13
-	pcmpgtd	%xmm6,%xmm14
-	pxor	%xmm13,%xmm6
-	movdqu	64(%r12),%xmm11
-	pxor	%xmm10,%xmm2
-	pshufd	$0x13,%xmm14,%xmm13
-	pxor	%xmm14,%xmm14
-	movdqa	%xmm6,%xmm5
-	movdqa	%xmm6,96(%rsp)
-	paddq	%xmm6,%xmm6
-	pand	%xmm12,%xmm13
-	pcmpgtd	%xmm6,%xmm14
-	pxor	%xmm13,%xmm6
-	movdqu	80(%r12),%xmm12
-	pxor	%xmm11,%xmm3
-	movdqu	96(%r12),%xmm13
-	pxor	%xmm12,%xmm4
-	movdqu	112(%r12),%xmm14
-	leaq	128(%r12),%r12
-	movdqa	%xmm6,112(%rsp)
-	pxor	%xmm13,%xmm5
-	leaq	128(%rsp),%rax
-	pxor	%xmm14,%xmm6
-	movl	%edx,%r10d
-
-	call	_bsaes_decrypt8
-
-	pxor	0(%rsp),%xmm15
-	pxor	16(%rsp),%xmm0
-	movdqu	%xmm15,0(%r13)
-	pxor	32(%rsp),%xmm5
-	movdqu	%xmm0,16(%r13)
-	pxor	48(%rsp),%xmm3
-	movdqu	%xmm5,32(%r13)
-	pxor	64(%rsp),%xmm1
-	movdqu	%xmm3,48(%r13)
-	pxor	80(%rsp),%xmm6
-	movdqu	%xmm1,64(%r13)
-	pxor	96(%rsp),%xmm2
-	movdqu	%xmm6,80(%r13)
-	pxor	112(%rsp),%xmm4
-	movdqu	%xmm2,96(%r13)
-	movdqu	%xmm4,112(%r13)
-	leaq	128(%r13),%r13
-
-	movdqa	112(%rsp),%xmm6
-	pxor	%xmm14,%xmm14
-	movdqa	.Lxts_magic(%rip),%xmm12
-	pcmpgtd	%xmm6,%xmm14
-	pshufd	$0x13,%xmm14,%xmm13
-	pxor	%xmm14,%xmm14
-	paddq	%xmm6,%xmm6
-	pand	%xmm12,%xmm13
-	pcmpgtd	%xmm6,%xmm14
-	pxor	%xmm13,%xmm6
-
-	subq	$0x80,%r14
-	jnc	.Lxts_dec_loop
-
-.Lxts_dec_short:
-	addq	$0x80,%r14
-	jz	.Lxts_dec_done
-	pshufd	$0x13,%xmm14,%xmm13
-	pxor	%xmm14,%xmm14
-	movdqa	%xmm6,%xmm15
-	movdqa	%xmm6,0(%rsp)
-	paddq	%xmm6,%xmm6
-	pand	%xmm12,%xmm13
-	pcmpgtd	%xmm6,%xmm14
-	pxor	%xmm13,%xmm6
-	pshufd	$0x13,%xmm14,%xmm13
-	pxor	%xmm14,%xmm14
-	movdqa	%xmm6,%xmm0
-	movdqa	%xmm6,16(%rsp)
-	paddq	%xmm6,%xmm6
-	pand	%xmm12,%xmm13
-	pcmpgtd	%xmm6,%xmm14
-	pxor	%xmm13,%xmm6
-	movdqu	0(%r12),%xmm7
-	cmpq	$16,%r14
-	je	.Lxts_dec_1
-	pshufd	$0x13,%xmm14,%xmm13
-	pxor	%xmm14,%xmm14
-	movdqa	%xmm6,%xmm1
-	movdqa	%xmm6,32(%rsp)
-	paddq	%xmm6,%xmm6
-	pand	%xmm12,%xmm13
-	pcmpgtd	%xmm6,%xmm14
-	pxor	%xmm13,%xmm6
-	movdqu	16(%r12),%xmm8
-	cmpq	$32,%r14
-	je	.Lxts_dec_2
-	pxor	%xmm7,%xmm15
-	pshufd	$0x13,%xmm14,%xmm13
-	pxor	%xmm14,%xmm14
-	movdqa	%xmm6,%xmm2
-	movdqa	%xmm6,48(%rsp)
-	paddq	%xmm6,%xmm6
-	pand	%xmm12,%xmm13
-	pcmpgtd	%xmm6,%xmm14
-	pxor	%xmm13,%xmm6
-	movdqu	32(%r12),%xmm9
-	cmpq	$48,%r14
-	je	.Lxts_dec_3
-	pxor	%xmm8,%xmm0
-	pshufd	$0x13,%xmm14,%xmm13
-	pxor	%xmm14,%xmm14
-	movdqa	%xmm6,%xmm3
-	movdqa	%xmm6,64(%rsp)
-	paddq	%xmm6,%xmm6
-	pand	%xmm12,%xmm13
-	pcmpgtd	%xmm6,%xmm14
-	pxor	%xmm13,%xmm6
-	movdqu	48(%r12),%xmm10
-	cmpq	$64,%r14
-	je	.Lxts_dec_4
-	pxor	%xmm9,%xmm1
-	pshufd	$0x13,%xmm14,%xmm13
-	pxor	%xmm14,%xmm14
-	movdqa	%xmm6,%xmm4
-	movdqa	%xmm6,80(%rsp)
-	paddq	%xmm6,%xmm6
-	pand	%xmm12,%xmm13
-	pcmpgtd	%xmm6,%xmm14
-	pxor	%xmm13,%xmm6
-	movdqu	64(%r12),%xmm11
-	cmpq	$80,%r14
-	je	.Lxts_dec_5
-	pxor	%xmm10,%xmm2
-	pshufd	$0x13,%xmm14,%xmm13
-	pxor	%xmm14,%xmm14
-	movdqa	%xmm6,%xmm5
-	movdqa	%xmm6,96(%rsp)
-	paddq	%xmm6,%xmm6
-	pand	%xmm12,%xmm13
-	pcmpgtd	%xmm6,%xmm14
-	pxor	%xmm13,%xmm6
-	movdqu	80(%r12),%xmm12
-	cmpq	$96,%r14
-	je	.Lxts_dec_6
-	pxor	%xmm11,%xmm3
-	movdqu	96(%r12),%xmm13
-	pxor	%xmm12,%xmm4
-	movdqa	%xmm6,112(%rsp)
-	leaq	112(%r12),%r12
-	pxor	%xmm13,%xmm5
-	leaq	128(%rsp),%rax
-	movl	%edx,%r10d
-
-	call	_bsaes_decrypt8
-
-	pxor	0(%rsp),%xmm15
-	pxor	16(%rsp),%xmm0
-	movdqu	%xmm15,0(%r13)
-	pxor	32(%rsp),%xmm5
-	movdqu	%xmm0,16(%r13)
-	pxor	48(%rsp),%xmm3
-	movdqu	%xmm5,32(%r13)
-	pxor	64(%rsp),%xmm1
-	movdqu	%xmm3,48(%r13)
-	pxor	80(%rsp),%xmm6
-	movdqu	%xmm1,64(%r13)
-	pxor	96(%rsp),%xmm2
-	movdqu	%xmm6,80(%r13)
-	movdqu	%xmm2,96(%r13)
-	leaq	112(%r13),%r13
-
-	movdqa	112(%rsp),%xmm6
-	jmp	.Lxts_dec_done
-.align	16
-.Lxts_dec_6:
-	pxor	%xmm11,%xmm3
-	leaq	96(%r12),%r12
-	pxor	%xmm12,%xmm4
-	leaq	128(%rsp),%rax
-	movl	%edx,%r10d
-
-	call	_bsaes_decrypt8
-
-	pxor	0(%rsp),%xmm15
-	pxor	16(%rsp),%xmm0
-	movdqu	%xmm15,0(%r13)
-	pxor	32(%rsp),%xmm5
-	movdqu	%xmm0,16(%r13)
-	pxor	48(%rsp),%xmm3
-	movdqu	%xmm5,32(%r13)
-	pxor	64(%rsp),%xmm1
-	movdqu	%xmm3,48(%r13)
-	pxor	80(%rsp),%xmm6
-	movdqu	%xmm1,64(%r13)
-	movdqu	%xmm6,80(%r13)
-	leaq	96(%r13),%r13
-
-	movdqa	96(%rsp),%xmm6
-	jmp	.Lxts_dec_done
-.align	16
-.Lxts_dec_5:
-	pxor	%xmm10,%xmm2
-	leaq	80(%r12),%r12
-	pxor	%xmm11,%xmm3
-	leaq	128(%rsp),%rax
-	movl	%edx,%r10d
-
-	call	_bsaes_decrypt8
-
-	pxor	0(%rsp),%xmm15
-	pxor	16(%rsp),%xmm0
-	movdqu	%xmm15,0(%r13)
-	pxor	32(%rsp),%xmm5
-	movdqu	%xmm0,16(%r13)
-	pxor	48(%rsp),%xmm3
-	movdqu	%xmm5,32(%r13)
-	pxor	64(%rsp),%xmm1
-	movdqu	%xmm3,48(%r13)
-	movdqu	%xmm1,64(%r13)
-	leaq	80(%r13),%r13
-
-	movdqa	80(%rsp),%xmm6
-	jmp	.Lxts_dec_done
-.align	16
-.Lxts_dec_4:
-	pxor	%xmm9,%xmm1
-	leaq	64(%r12),%r12
-	pxor	%xmm10,%xmm2
-	leaq	128(%rsp),%rax
-	movl	%edx,%r10d
-
-	call	_bsaes_decrypt8
-
-	pxor	0(%rsp),%xmm15
-	pxor	16(%rsp),%xmm0
-	movdqu	%xmm15,0(%r13)
-	pxor	32(%rsp),%xmm5
-	movdqu	%xmm0,16(%r13)
-	pxor	48(%rsp),%xmm3
-	movdqu	%xmm5,32(%r13)
-	movdqu	%xmm3,48(%r13)
-	leaq	64(%r13),%r13
-
-	movdqa	64(%rsp),%xmm6
-	jmp	.Lxts_dec_done
-.align	16
-.Lxts_dec_3:
-	pxor	%xmm8,%xmm0
-	leaq	48(%r12),%r12
-	pxor	%xmm9,%xmm1
-	leaq	128(%rsp),%rax
-	movl	%edx,%r10d
-
-	call	_bsaes_decrypt8
-
-	pxor	0(%rsp),%xmm15
-	pxor	16(%rsp),%xmm0
-	movdqu	%xmm15,0(%r13)
-	pxor	32(%rsp),%xmm5
-	movdqu	%xmm0,16(%r13)
-	movdqu	%xmm5,32(%r13)
-	leaq	48(%r13),%r13
-
-	movdqa	48(%rsp),%xmm6
-	jmp	.Lxts_dec_done
-.align	16
-.Lxts_dec_2:
-	pxor	%xmm7,%xmm15
-	leaq	32(%r12),%r12
-	pxor	%xmm8,%xmm0
-	leaq	128(%rsp),%rax
-	movl	%edx,%r10d
-
-	call	_bsaes_decrypt8
-
-	pxor	0(%rsp),%xmm15
-	pxor	16(%rsp),%xmm0
-	movdqu	%xmm15,0(%r13)
-	movdqu	%xmm0,16(%r13)
-	leaq	32(%r13),%r13
-
-	movdqa	32(%rsp),%xmm6
-	jmp	.Lxts_dec_done
-.align	16
-.Lxts_dec_1:
-	pxor	%xmm15,%xmm7
-	leaq	16(%r12),%r12
-	movdqa	%xmm7,32(%rbp)
-	leaq	32(%rbp),%rdi
-	leaq	32(%rbp),%rsi
-	leaq	(%r15),%rdx
-	call	asm_AES_decrypt
-	pxor	32(%rbp),%xmm15
-
-
-
-
-
-	movdqu	%xmm15,0(%r13)
-	leaq	16(%r13),%r13
-
-	movdqa	16(%rsp),%xmm6
-
-.Lxts_dec_done:
-	andl	$15,%ebx
-	jz	.Lxts_dec_ret
-
-	pxor	%xmm14,%xmm14
-	movdqa	.Lxts_magic(%rip),%xmm12
-	pcmpgtd	%xmm6,%xmm14
-	pshufd	$0x13,%xmm14,%xmm13
-	movdqa	%xmm6,%xmm5
-	paddq	%xmm6,%xmm6
-	pand	%xmm12,%xmm13
-	movdqu	(%r12),%xmm15
-	pxor	%xmm13,%xmm6
-
-	leaq	32(%rbp),%rdi
-	pxor	%xmm6,%xmm15
-	leaq	32(%rbp),%rsi
-	movdqa	%xmm15,32(%rbp)
-	leaq	(%r15),%rdx
-	call	asm_AES_decrypt
-	pxor	32(%rbp),%xmm6
-	movq	%r13,%rdx
-	movdqu	%xmm6,(%r13)
-
-.Lxts_dec_steal:
-	movzbl	16(%r12),%eax
-	movzbl	(%rdx),%ecx
-	leaq	1(%r12),%r12
-	movb	%al,(%rdx)
-	movb	%cl,16(%rdx)
-	leaq	1(%rdx),%rdx
-	subl	$1,%ebx
-	jnz	.Lxts_dec_steal
-
-	movdqu	(%r13),%xmm15
-	leaq	32(%rbp),%rdi
-	pxor	%xmm5,%xmm15
-	leaq	32(%rbp),%rsi
-	movdqa	%xmm15,32(%rbp)
-	leaq	(%r15),%rdx
-	call	asm_AES_decrypt
-	pxor	32(%rbp),%xmm5
-	movdqu	%xmm5,(%r13)
-
-.Lxts_dec_ret:
-	leaq	(%rsp),%rax
-	pxor	%xmm0,%xmm0
-.Lxts_dec_bzero:
-	movdqa	%xmm0,0(%rax)
-	movdqa	%xmm0,16(%rax)
-	leaq	32(%rax),%rax
-	cmpq	%rax,%rbp
-	ja	.Lxts_dec_bzero
-
-	leaq	120(%rbp),%rax
-.cfi_def_cfa	%rax,8
-	movq	-48(%rax),%r15
-.cfi_restore	%r15
-	movq	-40(%rax),%r14
-.cfi_restore	%r14
-	movq	-32(%rax),%r13
-.cfi_restore	%r13
-	movq	-24(%rax),%r12
-.cfi_restore	%r12
-	movq	-16(%rax),%rbx
-.cfi_restore	%rbx
-	movq	-8(%rax),%rbp
-.cfi_restore	%rbp
-	leaq	(%rax),%rsp
-.cfi_def_cfa_register	%rsp
-.Lxts_dec_epilogue:
-	.byte	0xf3,0xc3
-.cfi_endproc	
-.size	bsaes_xts_decrypt,.-bsaes_xts_decrypt
-.type	_bsaes_const,@object
-.align	64
-_bsaes_const:
-.LM0ISR:
-.quad	0x0a0e0206070b0f03, 0x0004080c0d010509
-.LISRM0:
-.quad	0x01040b0e0205080f, 0x0306090c00070a0d
-.LISR:
-.quad	0x0504070602010003, 0x0f0e0d0c080b0a09
-.LBS0:
-.quad	0x5555555555555555, 0x5555555555555555
-.LBS1:
-.quad	0x3333333333333333, 0x3333333333333333
-.LBS2:
-.quad	0x0f0f0f0f0f0f0f0f, 0x0f0f0f0f0f0f0f0f
-.LSR:
-.quad	0x0504070600030201, 0x0f0e0d0c0a09080b
-.LSRM0:
-.quad	0x0304090e00050a0f, 0x01060b0c0207080d
-.LM0SR:
-.quad	0x0a0e02060f03070b, 0x0004080c05090d01
-.LSWPUP:
-.quad	0x0706050403020100, 0x0c0d0e0f0b0a0908
-.LSWPUPM0SR:
-.quad	0x0a0d02060c03070b, 0x0004080f05090e01
-.LADD1:
-.quad	0x0000000000000000, 0x0000000100000000
-.LADD2:
-.quad	0x0000000000000000, 0x0000000200000000
-.LADD3:
-.quad	0x0000000000000000, 0x0000000300000000
-.LADD4:
-.quad	0x0000000000000000, 0x0000000400000000
-.LADD5:
-.quad	0x0000000000000000, 0x0000000500000000
-.LADD6:
-.quad	0x0000000000000000, 0x0000000600000000
-.LADD7:
-.quad	0x0000000000000000, 0x0000000700000000
-.LADD8:
-.quad	0x0000000000000000, 0x0000000800000000
-.Lxts_magic:
-.long	0x87,0,1,0
-.Lmasks:
-.quad	0x0101010101010101, 0x0101010101010101
-.quad	0x0202020202020202, 0x0202020202020202
-.quad	0x0404040404040404, 0x0404040404040404
-.quad	0x0808080808080808, 0x0808080808080808
-.LM0:
-.quad	0x02060a0e03070b0f, 0x0004080c0105090d
-.L63:
-.quad	0x6363636363636363, 0x6363636363636363
-.byte	66,105,116,45,115,108,105,99,101,100,32,65,69,83,32,102,111,114,32,120,56,54,95,54,52,47,83,83,83,69,51,44,32,69,109,105,108,105,97,32,75,195,164,115,112,101,114,44,32,80,101,116,101,114,32,83,99,104,119,97,98,101,44,32,65,110,100,121,32,80,111,108,121,97,107,111,118,0
-.align	64
-.size	_bsaes_const,.-_bsaes_const
diff --git a/deps/openssl/config/archs/solaris64-x86_64-gcc/asm/crypto/bn/rsaz-x86_64.s b/deps/openssl/config/archs/solaris64-x86_64-gcc/asm/crypto/bn/rsaz-x86_64.s
index f8e4a80588..7876e0b8f9 100644
--- a/deps/openssl/config/archs/solaris64-x86_64-gcc/asm/crypto/bn/rsaz-x86_64.s
+++ b/deps/openssl/config/archs/solaris64-x86_64-gcc/asm/crypto/bn/rsaz-x86_64.s
@@ -29,7 +29,7 @@ rsaz_512_sqr:
 	subq	$128+24,%rsp
 .cfi_adjust_cfa_offset	128+24
 .Lsqr_body:
-	movq	%rdx,%rbp
+.byte	102,72,15,110,202
 	movq	(%rsi),%rdx
 	movq	8(%rsi),%rax
 	movq	%rcx,128(%rsp)
@@ -44,6 +44,7 @@ rsaz_512_sqr:
 	movl	%r8d,128+8(%rsp)
 
 	movq	%rdx,%rbx
+	movq	%rax,%rbp
 	mulq	%rdx
 	movq	%rax,%r8
 	movq	16(%rsi),%rax
@@ -82,31 +83,29 @@ rsaz_512_sqr:
 	mulq	%rbx
 	addq	%rax,%r14
 	movq	%rbx,%rax
-	movq	%rdx,%r15
-	adcq	$0,%r15
+	adcq	$0,%rdx
 
+	xorq	%rcx,%rcx
 	addq	%r8,%r8
-	movq	%r9,%rcx
-	adcq	%r9,%r9
+	movq	%rdx,%r15
+	adcq	$0,%rcx
 
 	mulq	%rax
-	movq	%rax,(%rsp)
-	addq	%rdx,%r8
-	adcq	$0,%r9
+	addq	%r8,%rdx
+	adcq	$0,%rcx
 
-	movq	%r8,8(%rsp)
-	shrq	$63,%rcx
+	movq	%rax,(%rsp)
+	movq	%rdx,8(%rsp)
 
 
-	movq	8(%rsi),%r8
 	movq	16(%rsi),%rax
-	mulq	%r8
+	mulq	%rbp
 	addq	%rax,%r10
 	movq	24(%rsi),%rax
 	movq	%rdx,%rbx
 	adcq	$0,%rbx
 
-	mulq	%r8
+	mulq	%rbp
 	addq	%rax,%r11
 	movq	32(%rsi),%rax
 	adcq	$0,%rdx
@@ -114,7 +113,7 @@ rsaz_512_sqr:
 	movq	%rdx,%rbx
 	adcq	$0,%rbx
 
-	mulq	%r8
+	mulq	%rbp
 	addq	%rax,%r12
 	movq	40(%rsi),%rax
 	adcq	$0,%rdx
@@ -122,7 +121,7 @@ rsaz_512_sqr:
 	movq	%rdx,%rbx
 	adcq	$0,%rbx
 
-	mulq	%r8
+	mulq	%rbp
 	addq	%rax,%r13
 	movq	48(%rsi),%rax
 	adcq	$0,%rdx
@@ -130,7 +129,7 @@ rsaz_512_sqr:
 	movq	%rdx,%rbx
 	adcq	$0,%rbx
 
-	mulq	%r8
+	mulq	%rbp
 	addq	%rax,%r14
 	movq	56(%rsi),%rax
 	adcq	$0,%rdx
@@ -138,39 +137,39 @@ rsaz_512_sqr:
 	movq	%rdx,%rbx
 	adcq	$0,%rbx
 
-	mulq	%r8
+	mulq	%rbp
 	addq	%rax,%r15
-	movq	%r8,%rax
+	movq	%rbp,%rax
 	adcq	$0,%rdx
 	addq	%rbx,%r15
-	movq	%rdx,%r8
-	movq	%r10,%rdx
-	adcq	$0,%r8
+	adcq	$0,%rdx
 
-	addq	%rdx,%rdx
-	leaq	(%rcx,%r10,2),%r10
-	movq	%r11,%rbx
-	adcq	%r11,%r11
+	xorq	%rbx,%rbx
+	addq	%r9,%r9
+	movq	%rdx,%r8
+	adcq	%r10,%r10
+	adcq	$0,%rbx
 
 	mulq	%rax
+
+	addq	%rcx,%rax
+	movq	16(%rsi),%rbp
 	addq	%rax,%r9
+	movq	24(%rsi),%rax
 	adcq	%rdx,%r10
-	adcq	$0,%r11
+	adcq	$0,%rbx
 
 	movq	%r9,16(%rsp)
 	movq	%r10,24(%rsp)
-	shrq	$63,%rbx
 
 
-	movq	16(%rsi),%r9
-	movq	24(%rsi),%rax
-	mulq	%r9
+	mulq	%rbp
 	addq	%rax,%r12
 	movq	32(%rsi),%rax
 	movq	%rdx,%rcx
 	adcq	$0,%rcx
 
-	mulq	%r9
+	mulq	%rbp
 	addq	%rax,%r13
 	movq	40(%rsi),%rax
 	adcq	$0,%rdx
@@ -178,7 +177,7 @@ rsaz_512_sqr:
 	movq	%rdx,%rcx
 	adcq	$0,%rcx
 
-	mulq	%r9
+	mulq	%rbp
 	addq	%rax,%r14
 	movq	48(%rsi),%rax
 	adcq	$0,%rdx
@@ -186,9 +185,7 @@ rsaz_512_sqr:
 	movq	%rdx,%rcx
 	adcq	$0,%rcx
 
-	mulq	%r9
-	movq	%r12,%r10
-	leaq	(%rbx,%r12,2),%r12
+	mulq	%rbp
 	addq	%rax,%r15
 	movq	56(%rsi),%rax
 	adcq	$0,%rdx
@@ -196,36 +193,40 @@ rsaz_512_sqr:
 	movq	%rdx,%rcx
 	adcq	$0,%rcx
 
-	mulq	%r9
-	shrq	$63,%r10
+	mulq	%rbp
 	addq	%rax,%r8
-	movq	%r9,%rax
+	movq	%rbp,%rax
 	adcq	$0,%rdx
 	addq	%rcx,%r8
-	movq	%rdx,%r9
-	adcq	$0,%r9
+	adcq	$0,%rdx
 
-	movq	%r13,%rcx
-	leaq	(%r10,%r13,2),%r13
+	xorq	%rcx,%rcx
+	addq	%r11,%r11
+	movq	%rdx,%r9
+	adcq	%r12,%r12
+	adcq	$0,%rcx
 
 	mulq	%rax
+
+	addq	%rbx,%rax
+	movq	24(%rsi),%r10
 	addq	%rax,%r11
+	movq	32(%rsi),%rax
 	adcq	%rdx,%r12
-	adcq	$0,%r13
+	adcq	$0,%rcx
 
 	movq	%r11,32(%rsp)
 	movq	%r12,40(%rsp)
-	shrq	$63,%rcx
 
 
-	movq	24(%rsi),%r10
-	movq	32(%rsi),%rax
+	movq	%rax,%r11
 	mulq	%r10
 	addq	%rax,%r14
 	movq	40(%rsi),%rax
 	movq	%rdx,%rbx
 	adcq	$0,%rbx
 
+	movq	%rax,%r12
 	mulq	%r10
 	addq	%rax,%r15
 	movq	48(%rsi),%rax
@@ -234,9 +235,8 @@ rsaz_512_sqr:
 	movq	%rdx,%rbx
 	adcq	$0,%rbx
 
+	movq	%rax,%rbp
 	mulq	%r10
-	movq	%r14,%r12
-	leaq	(%rcx,%r14,2),%r14
 	addq	%rax,%r8
 	movq	56(%rsi),%rax
 	adcq	$0,%rdx
@@ -245,32 +245,33 @@ rsaz_512_sqr:
 	adcq	$0,%rbx
 
 	mulq	%r10
-	shrq	$63,%r12
 	addq	%rax,%r9
 	movq	%r10,%rax
 	adcq	$0,%rdx
 	addq	%rbx,%r9
-	movq	%rdx,%r10
-	adcq	$0,%r10
+	adcq	$0,%rdx
 
-	movq	%r15,%rbx
-	leaq	(%r12,%r15,2),%r15
+	xorq	%rbx,%rbx
+	addq	%r13,%r13
+	movq	%rdx,%r10
+	adcq	%r14,%r14
+	adcq	$0,%rbx
 
 	mulq	%rax
+
+	addq	%rcx,%rax
 	addq	%rax,%r13
+	movq	%r12,%rax
 	adcq	%rdx,%r14
-	adcq	$0,%r15
+	adcq	$0,%rbx
 
 	movq	%r13,48(%rsp)
 	movq	%r14,56(%rsp)
-	shrq	$63,%rbx
 
 
-	movq	32(%rsi),%r11
-	movq	40(%rsi),%rax
 	mulq	%r11
 	addq	%rax,%r8
-	movq	48(%rsi),%rax
+	movq	%rbp,%rax
 	movq	%rdx,%rcx
 	adcq	$0,%rcx
 
@@ -278,97 +279,99 @@ rsaz_512_sqr:
 	addq	%rax,%r9
 	movq	56(%rsi),%rax
 	adcq	$0,%rdx
-	movq	%r8,%r12
-	leaq	(%rbx,%r8,2),%r8
 	addq	%rcx,%r9
 	movq	%rdx,%rcx
 	adcq	$0,%rcx
 
+	movq	%rax,%r14
 	mulq	%r11
-	shrq	$63,%r12
 	addq	%rax,%r10
 	movq	%r11,%rax
 	adcq	$0,%rdx
 	addq	%rcx,%r10
-	movq	%rdx,%r11
-	adcq	$0,%r11
+	adcq	$0,%rdx
 
-	movq	%r9,%rcx
-	leaq	(%r12,%r9,2),%r9
+	xorq	%rcx,%rcx
+	addq	%r15,%r15
+	movq	%rdx,%r11
+	adcq	%r8,%r8
+	adcq	$0,%rcx
 
 	mulq	%rax
+
+	addq	%rbx,%rax
 	addq	%rax,%r15
+	movq	%rbp,%rax
 	adcq	%rdx,%r8
-	adcq	$0,%r9
+	adcq	$0,%rcx
 
 	movq	%r15,64(%rsp)
 	movq	%r8,72(%rsp)
-	shrq	$63,%rcx
 
 
-	movq	40(%rsi),%r12
-	movq	48(%rsi),%rax
 	mulq	%r12
 	addq	%rax,%r10
-	movq	56(%rsi),%rax
+	movq	%r14,%rax
 	movq	%rdx,%rbx
 	adcq	$0,%rbx
 
 	mulq	%r12
 	addq	%rax,%r11
 	movq	%r12,%rax
-	movq	%r10,%r15
-	leaq	(%rcx,%r10,2),%r10
 	adcq	$0,%rdx
-	shrq	$63,%r15
 	addq	%rbx,%r11
-	movq	%rdx,%r12
-	adcq	$0,%r12
+	adcq	$0,%rdx
 
-	movq	%r11,%rbx
-	leaq	(%r15,%r11,2),%r11
+	xorq	%rbx,%rbx
+	addq	%r9,%r9
+	movq	%rdx,%r12
+	adcq	%r10,%r10
+	adcq	$0,%rbx
 
 	mulq	%rax
+
+	addq	%rcx,%rax
 	addq	%rax,%r9
+	movq	%r14,%rax
 	adcq	%rdx,%r10
-	adcq	$0,%r11
+	adcq	$0,%rbx
 
 	movq	%r9,80(%rsp)
 	movq	%r10,88(%rsp)
 
 
-	movq	48(%rsi),%r13
-	movq	56(%rsi),%rax
-	mulq	%r13
+	mulq	%rbp
 	addq	%rax,%r12
-	movq	%r13,%rax
-	movq	%rdx,%r13
-	adcq	$0,%r13
+	movq	%rbp,%rax
+	adcq	$0,%rdx
 
-	xorq	%r14,%r14
-	shlq	$1,%rbx
+	xorq	%rcx,%rcx
+	addq	%r11,%r11
+	movq	%rdx,%r13
 	adcq	%r12,%r12
-	adcq	%r13,%r13
-	adcq	%r14,%r14
+	adcq	$0,%rcx
 
 	mulq	%rax
+
+	addq	%rbx,%rax
 	addq	%rax,%r11
+	movq	%r14,%rax
 	adcq	%rdx,%r12
-	adcq	$0,%r13
+	adcq	$0,%rcx
 
 	movq	%r11,96(%rsp)
 	movq	%r12,104(%rsp)
 
 
-	movq	56(%rsi),%rax
-	mulq	%rax
-	addq	%rax,%r13
-	adcq	$0,%rdx
+	xorq	%rbx,%rbx
+	addq	%r13,%r13
+	adcq	$0,%rbx
 
-	addq	%rdx,%r14
+	mulq	%rax
 
-	movq	%r13,112(%rsp)
-	movq	%r14,120(%rsp)
+	addq	%rcx,%rax
+	addq	%r13,%rax
+	adcq	%rbx,%rdx
 
 	movq	(%rsp),%r8
 	movq	8(%rsp),%r9
@@ -378,6 +381,10 @@ rsaz_512_sqr:
 	movq	40(%rsp),%r13
 	movq	48(%rsp),%r14
 	movq	56(%rsp),%r15
+.byte	102,72,15,126,205
+
+	movq	%rax,112(%rsp)
+	movq	%rdx,120(%rsp)
 
 	call	__rsaz_512_reduce
 
@@ -406,9 +413,9 @@ rsaz_512_sqr:
 .Loop_sqrx:
 	movl	%r8d,128+8(%rsp)
 .byte	102,72,15,110,199
-.byte	102,72,15,110,205
 
 	mulxq	%rax,%r8,%r9
+	movq	%rax,%rbx
 
 	mulxq	16(%rsi),%rcx,%r10
 	xorq	%rbp,%rbp
@@ -416,40 +423,39 @@ rsaz_512_sqr:
 	mulxq	24(%rsi),%rax,%r11
 	adcxq	%rcx,%r9
 
-	mulxq	32(%rsi),%rcx,%r12
+.byte	0xc4,0x62,0xf3,0xf6,0xa6,0x20,0x00,0x00,0x00
 	adcxq	%rax,%r10
 
-	mulxq	40(%rsi),%rax,%r13
+.byte	0xc4,0x62,0xfb,0xf6,0xae,0x28,0x00,0x00,0x00
 	adcxq	%rcx,%r11
 
-.byte	0xc4,0x62,0xf3,0xf6,0xb6,0x30,0x00,0x00,0x00
+	mulxq	48(%rsi),%rcx,%r14
 	adcxq	%rax,%r12
 	adcxq	%rcx,%r13
 
-.byte	0xc4,0x62,0xfb,0xf6,0xbe,0x38,0x00,0x00,0x00
+	mulxq	56(%rsi),%rax,%r15
 	adcxq	%rax,%r14
 	adcxq	%rbp,%r15
 
-	movq	%r9,%rcx
-	shldq	$1,%r8,%r9
-	shlq	$1,%r8
-
-	xorl	%ebp,%ebp
-	mulxq	%rdx,%rax,%rdx
-	adcxq	%rdx,%r8
-	movq	8(%rsi),%rdx
-	adcxq	%rbp,%r9
+	mulxq	%rdx,%rax,%rdi
+	movq	%rbx,%rdx
+	xorq	%rcx,%rcx
+	adoxq	%r8,%r8
+	adcxq	%rdi,%r8
+	adoxq	%rbp,%rcx
+	adcxq	%rbp,%rcx
 
 	movq	%rax,(%rsp)
 	movq	%r8,8(%rsp)
 
 
-	mulxq	16(%rsi),%rax,%rbx
+.byte	0xc4,0xe2,0xfb,0xf6,0x9e,0x10,0x00,0x00,0x00
 	adoxq	%rax,%r10
 	adcxq	%rbx,%r11
 
-.byte	0xc4,0x62,0xc3,0xf6,0x86,0x18,0x00,0x00,0x00
+	mulxq	24(%rsi),%rdi,%r8
 	adoxq	%rdi,%r11
+.byte	0x66
 	adcxq	%r8,%r12
 
 	mulxq	32(%rsi),%rax,%rbx
@@ -467,24 +473,25 @@ rsaz_512_sqr:
 .byte	0xc4,0x62,0xc3,0xf6,0x86,0x38,0x00,0x00,0x00
 	adoxq	%rdi,%r15
 	adcxq	%rbp,%r8
+	mulxq	%rdx,%rax,%rdi
 	adoxq	%rbp,%r8
+.byte	0x48,0x8b,0x96,0x10,0x00,0x00,0x00
 
-	movq	%r11,%rbx
-	shldq	$1,%r10,%r11
-	shldq	$1,%rcx,%r10
+	xorq	%rbx,%rbx
+	adoxq	%r9,%r9
 
-	xorl	%ebp,%ebp
-	mulxq	%rdx,%rax,%rcx
-	movq	16(%rsi),%rdx
+	adcxq	%rcx,%rax
+	adoxq	%r10,%r10
 	adcxq	%rax,%r9
-	adcxq	%rcx,%r10
-	adcxq	%rbp,%r11
+	adoxq	%rbp,%rbx
+	adcxq	%rdi,%r10
+	adcxq	%rbp,%rbx
 
 	movq	%r9,16(%rsp)
 .byte	0x4c,0x89,0x94,0x24,0x18,0x00,0x00,0x00
 
 
-.byte	0xc4,0x62,0xc3,0xf6,0x8e,0x18,0x00,0x00,0x00
+	mulxq	24(%rsi),%rdi,%r9
 	adoxq	%rdi,%r12
 	adcxq	%r9,%r13
 
@@ -492,7 +499,7 @@ rsaz_512_sqr:
 	adoxq	%rax,%r13
 	adcxq	%rcx,%r14
 
-	mulxq	40(%rsi),%rdi,%r9
+.byte	0xc4,0x62,0xc3,0xf6,0x8e,0x28,0x00,0x00,0x00
 	adoxq	%rdi,%r14
 	adcxq	%r9,%r15
 
@@ -500,27 +507,28 @@ rsaz_512_sqr:
 	adoxq	%rax,%r15
 	adcxq	%rcx,%r8
 
-.byte	0xc4,0x62,0xc3,0xf6,0x8e,0x38,0x00,0x00,0x00
+	mulxq	56(%rsi),%rdi,%r9
 	adoxq	%rdi,%r8
 	adcxq	%rbp,%r9
+	mulxq	%rdx,%rax,%rdi
 	adoxq	%rbp,%r9
+	movq	24(%rsi),%rdx
 
-	movq	%r13,%rcx
-	shldq	$1,%r12,%r13
-	shldq	$1,%rbx,%r12
+	xorq	%rcx,%rcx
+	adoxq	%r11,%r11
 
-	xorl	%ebp,%ebp
-	mulxq	%rdx,%rax,%rdx
+	adcxq	%rbx,%rax
+	adoxq	%r12,%r12
 	adcxq	%rax,%r11
-	adcxq	%rdx,%r12
-	movq	24(%rsi),%rdx
-	adcxq	%rbp,%r13
+	adoxq	%rbp,%rcx
+	adcxq	%rdi,%r12
+	adcxq	%rbp,%rcx
 
 	movq	%r11,32(%rsp)
-.byte	0x4c,0x89,0xa4,0x24,0x28,0x00,0x00,0x00
+	movq	%r12,40(%rsp)
 
 
-.byte	0xc4,0xe2,0xfb,0xf6,0x9e,0x20,0x00,0x00,0x00
+	mulxq	32(%rsi),%rax,%rbx
 	adoxq	%rax,%r14
 	adcxq	%rbx,%r15
 
@@ -535,25 +543,25 @@ rsaz_512_sqr:
 	mulxq	56(%rsi),%rdi,%r10
 	adoxq	%rdi,%r9
 	adcxq	%rbp,%r10
+	mulxq	%rdx,%rax,%rdi
 	adoxq	%rbp,%r10
+	movq	32(%rsi),%rdx
 
-.byte	0x66
-	movq	%r15,%rbx
-	shldq	$1,%r14,%r15
-	shldq	$1,%rcx,%r14
+	xorq	%rbx,%rbx
+	adoxq	%r13,%r13
 
-	xorl	%ebp,%ebp
-	mulxq	%rdx,%rax,%rdx
+	adcxq	%rcx,%rax
+	adoxq	%r14,%r14
 	adcxq	%rax,%r13
-	adcxq	%rdx,%r14
-	movq	32(%rsi),%rdx
-	adcxq	%rbp,%r15
+	adoxq	%rbp,%rbx
+	adcxq	%rdi,%r14
+	adcxq	%rbp,%rbx
 
 	movq	%r13,48(%rsp)
 	movq	%r14,56(%rsp)
 
 
-.byte	0xc4,0x62,0xc3,0xf6,0x9e,0x28,0x00,0x00,0x00
+	mulxq	40(%rsi),%rdi,%r11
 	adoxq	%rdi,%r8
 	adcxq	%r11,%r9
 
@@ -564,18 +572,19 @@ rsaz_512_sqr:
 	mulxq	56(%rsi),%rdi,%r11
 	adoxq	%rdi,%r10
 	adcxq	%rbp,%r11
+	mulxq	%rdx,%rax,%rdi
+	movq	40(%rsi),%rdx
 	adoxq	%rbp,%r11
 
-	movq	%r9,%rcx
-	shldq	$1,%r8,%r9
-	shldq	$1,%rbx,%r8
+	xorq	%rcx,%rcx
+	adoxq	%r15,%r15
 
-	xorl	%ebp,%ebp
-	mulxq	%rdx,%rax,%rdx
+	adcxq	%rbx,%rax
+	adoxq	%r8,%r8
 	adcxq	%rax,%r15
-	adcxq	%rdx,%r8
-	movq	40(%rsi),%rdx
-	adcxq	%rbp,%r9
+	adoxq	%rbp,%rcx
+	adcxq	%rdi,%r8
+	adcxq	%rbp,%rcx
 
 	movq	%r15,64(%rsp)
 	movq	%r8,72(%rsp)
@@ -588,18 +597,19 @@ rsaz_512_sqr:
 .byte	0xc4,0x62,0xc3,0xf6,0xa6,0x38,0x00,0x00,0x00
 	adoxq	%rdi,%r11
 	adcxq	%rbp,%r12
+	mulxq	%rdx,%rax,%rdi
 	adoxq	%rbp,%r12
+	movq	48(%rsi),%rdx
 
-	movq	%r11,%rbx
-	shldq	$1,%r10,%r11
-	shldq	$1,%rcx,%r10
+	xorq	%rbx,%rbx
+	adoxq	%r9,%r9
 
-	xorl	%ebp,%ebp
-	mulxq	%rdx,%rax,%rdx
+	adcxq	%rcx,%rax
+	adoxq	%r10,%r10
 	adcxq	%rax,%r9
-	adcxq	%rdx,%r10
-	movq	48(%rsi),%rdx
-	adcxq	%rbp,%r11
+	adcxq	%rdi,%r10
+	adoxq	%rbp,%rbx
+	adcxq	%rbp,%rbx
 
 	movq	%r9,80(%rsp)
 	movq	%r10,88(%rsp)
@@ -609,31 +619,31 @@ rsaz_512_sqr:
 	adoxq	%rax,%r12
 	adoxq	%rbp,%r13
 
-	xorq	%r14,%r14
-	shldq	$1,%r13,%r14
-	shldq	$1,%r12,%r13
-	shldq	$1,%rbx,%r12
+	mulxq	%rdx,%rax,%rdi
+	xorq	%rcx,%rcx
+	movq	56(%rsi),%rdx
+	adoxq	%r11,%r11
 
-	xorl	%ebp,%ebp
-	mulxq	%rdx,%rax,%rdx
+	adcxq	%rbx,%rax
+	adoxq	%r12,%r12
 	adcxq	%rax,%r11
-	adcxq	%rdx,%r12
-	movq	56(%rsi),%rdx
-	adcxq	%rbp,%r13
+	adoxq	%rbp,%rcx
+	adcxq	%rdi,%r12
+	adcxq	%rbp,%rcx
 
 .byte	0x4c,0x89,0x9c,0x24,0x60,0x00,0x00,0x00
 .byte	0x4c,0x89,0xa4,0x24,0x68,0x00,0x00,0x00
 
 
 	mulxq	%rdx,%rax,%rdx
-	adoxq	%rax,%r13
-	adoxq	%rbp,%rdx
+	xorq	%rbx,%rbx
+	adoxq	%r13,%r13
 
-.byte	0x66
-	addq	%rdx,%r14
+	adcxq	%rcx,%rax
+	adoxq	%rbp,%rbx
+	adcxq	%r13,%rax
+	adcxq	%rdx,%rbx
 
-	movq	%r13,112(%rsp)
-	movq	%r14,120(%rsp)
 .byte	102,72,15,126,199
 .byte	102,72,15,126,205
 
@@ -647,6 +657,9 @@ rsaz_512_sqr:
 	movq	48(%rsp),%r14
 	movq	56(%rsp),%r15
 
+	movq	%rax,112(%rsp)
+	movq	%rbx,120(%rsp)
+
 	call	__rsaz_512_reducex
 
 	addq	64(%rsp),%r8
@@ -1440,6 +1453,7 @@ rsaz_512_mul_by_one:
 .type	__rsaz_512_reduce,@function
 .align	32
 __rsaz_512_reduce:
+.cfi_startproc
 	movq	%r8,%rbx
 	imulq	128+8(%rsp),%rbx
 	movq	0(%rbp),%rax
@@ -1519,10 +1533,12 @@ __rsaz_512_reduce:
 	jne	.Lreduction_loop
 
 	.byte	0xf3,0xc3
+.cfi_endproc
 .size	__rsaz_512_reduce,.-__rsaz_512_reduce
 .type	__rsaz_512_reducex,@function
 .align	32
 __rsaz_512_reducex:
+.cfi_startproc
 
 	imulq	%r8,%rdx
 	xorq	%rsi,%rsi
@@ -1575,10 +1591,12 @@ __rsaz_512_reducex:
 	jne	.Lreduction_loopx
 
 	.byte	0xf3,0xc3
+.cfi_endproc
 .size	__rsaz_512_reducex,.-__rsaz_512_reducex
 .type	__rsaz_512_subtract,@function
 .align	32
 __rsaz_512_subtract:
+.cfi_startproc
 	movq	%r8,(%rdi)
 	movq	%r9,8(%rdi)
 	movq	%r10,16(%rdi)
@@ -1632,10 +1650,12 @@ __rsaz_512_subtract:
 	movq	%r15,56(%rdi)
 
 	.byte	0xf3,0xc3
+.cfi_endproc
 .size	__rsaz_512_subtract,.-__rsaz_512_subtract
 .type	__rsaz_512_mul,@function
 .align	32
 __rsaz_512_mul:
+.cfi_startproc
 	leaq	8(%rsp),%rdi
 
 	movq	(%rsi),%rax
@@ -1774,10 +1794,12 @@ __rsaz_512_mul:
 	movq	%r15,56(%rdi)
 
 	.byte	0xf3,0xc3
+.cfi_endproc
 .size	__rsaz_512_mul,.-__rsaz_512_mul
 .type	__rsaz_512_mulx,@function
 .align	32
 __rsaz_512_mulx:
+.cfi_startproc
 	mulxq	(%rsi),%rbx,%r8
 	movq	$-6,%rcx
 
@@ -1894,11 +1916,13 @@ __rsaz_512_mulx:
 	movq	%r15,8+64+56(%rsp)
 
 	.byte	0xf3,0xc3
+.cfi_endproc
 .size	__rsaz_512_mulx,.-__rsaz_512_mulx
 .globl	rsaz_512_scatter4
 .type	rsaz_512_scatter4,@function
 .align	16
 rsaz_512_scatter4:
+.cfi_startproc
 	leaq	(%rdi,%rdx,8),%rdi
 	movl	$8,%r9d
 	jmp	.Loop_scatter
@@ -1911,12 +1935,14 @@ rsaz_512_scatter4:
 	decl	%r9d
 	jnz	.Loop_scatter
 	.byte	0xf3,0xc3
+.cfi_endproc
 .size	rsaz_512_scatter4,.-rsaz_512_scatter4
 
 .globl	rsaz_512_gather4
 .type	rsaz_512_gather4,@function
 .align	16
 rsaz_512_gather4:
+.cfi_startproc
 	movd	%edx,%xmm8
 	movdqa	.Linc+16(%rip),%xmm1
 	movdqa	.Linc(%rip),%xmm0
@@ -1980,6 +2006,7 @@ rsaz_512_gather4:
 	jnz	.Loop_gather
 	.byte	0xf3,0xc3
 .LSEH_end_rsaz_512_gather4:
+.cfi_endproc
 .size	rsaz_512_gather4,.-rsaz_512_gather4
 
 .align	64
diff --git a/deps/openssl/config/archs/solaris64-x86_64-gcc/asm/crypto/bn/x86_64-mont5.s b/deps/openssl/config/archs/solaris64-x86_64-gcc/asm/crypto/bn/x86_64-mont5.s
index df4b6610a0..40a60a3c8f 100644
--- a/deps/openssl/config/archs/solaris64-x86_64-gcc/asm/crypto/bn/x86_64-mont5.s
+++ b/deps/openssl/config/archs/solaris64-x86_64-gcc/asm/crypto/bn/x86_64-mont5.s
@@ -550,6 +550,7 @@ bn_mul4x_mont_gather5:
 .type	mul4x_internal,@function
 .align	32
 mul4x_internal:
+.cfi_startproc
 	shlq	$5,%r9
 	movd	8(%rax),%xmm5
 	leaq	.Linc(%rip),%rax
@@ -1071,6 +1072,7 @@ mul4x_internal:
 	movq	16(%rbp),%r14
 	movq	24(%rbp),%r15
 	jmp	.Lsqr4x_sub_entry
+.cfi_endproc
 .size	mul4x_internal,.-mul4x_internal
 .globl	bn_power5
 .type	bn_power5,@function
@@ -1213,6 +1215,7 @@ bn_power5:
 .align	32
 bn_sqr8x_internal:
 __bn_sqr8x_internal:
+.cfi_startproc
 
 
 
@@ -1987,10 +1990,12 @@ __bn_sqr8x_reduction:
 	cmpq	%rdx,%rdi
 	jb	.L8x_reduction_loop
 	.byte	0xf3,0xc3
+.cfi_endproc
 .size	bn_sqr8x_internal,.-bn_sqr8x_internal
 .type	__bn_post4x_internal,@function
 .align	32
 __bn_post4x_internal:
+.cfi_startproc
 	movq	0(%rbp),%r12
 	leaq	(%rdi,%r9,1),%rbx
 	movq	%r9,%rcx
@@ -2041,15 +2046,18 @@ __bn_post4x_internal:
 	movq	%r9,%r10
 	negq	%r9
 	.byte	0xf3,0xc3
+.cfi_endproc
 .size	__bn_post4x_internal,.-__bn_post4x_internal
 .globl	bn_from_montgomery
 .type	bn_from_montgomery,@function
 .align	32
 bn_from_montgomery:
+.cfi_startproc
 	testl	$7,%r9d
 	jz	bn_from_mont8x
 	xorl	%eax,%eax
 	.byte	0xf3,0xc3
+.cfi_endproc
 .size	bn_from_montgomery,.-bn_from_montgomery
 
 .type	bn_from_mont8x,@function
@@ -2333,6 +2341,7 @@ bn_mulx4x_mont_gather5:
 .type	mulx4x_internal,@function
 .align	32
 mulx4x_internal:
+.cfi_startproc
 	movq	%r9,8(%rsp)
 	movq	%r9,%r10
 	negq	%r9
@@ -2751,6 +2760,7 @@ mulx4x_internal:
 	movq	16(%rbp),%r14
 	movq	24(%rbp),%r15
 	jmp	.Lsqrx4x_sub_entry
+.cfi_endproc
 .size	mulx4x_internal,.-mulx4x_internal
 .type	bn_powerx5,@function
 .align	32
@@ -3509,6 +3519,7 @@ __bn_sqrx8x_reduction:
 .size	bn_sqrx8x_internal,.-bn_sqrx8x_internal
 .align	32
 __bn_postx4x_internal:
+.cfi_startproc
 	movq	0(%rbp),%r12
 	movq	%rcx,%r10
 	movq	%rcx,%r9
@@ -3556,11 +3567,13 @@ __bn_postx4x_internal:
 	negq	%r9
 
 	.byte	0xf3,0xc3
+.cfi_endproc
 .size	__bn_postx4x_internal,.-__bn_postx4x_internal
 .globl	bn_get_bits5
 .type	bn_get_bits5,@function
 .align	16
 bn_get_bits5:
+.cfi_startproc
 	leaq	0(%rdi),%r10
 	leaq	1(%rdi),%r11
 	movl	%esi,%ecx
@@ -3574,12 +3587,14 @@ bn_get_bits5:
 	shrl	%cl,%eax
 	andl	$31,%eax
 	.byte	0xf3,0xc3
+.cfi_endproc
 .size	bn_get_bits5,.-bn_get_bits5
 
 .globl	bn_scatter5
 .type	bn_scatter5,@function
 .align	16
 bn_scatter5:
+.cfi_startproc
 	cmpl	$0,%esi
 	jz	.Lscatter_epilogue
 	leaq	(%rdx,%rcx,8),%rdx
@@ -3592,6 +3607,7 @@ bn_scatter5:
 	jnz	.Lscatter
 .Lscatter_epilogue:
 	.byte	0xf3,0xc3
+.cfi_endproc
 .size	bn_scatter5,.-bn_scatter5
 
 .globl	bn_gather5
@@ -3599,6 +3615,7 @@ bn_scatter5:
 .align	32
 bn_gather5:
 .LSEH_begin_bn_gather5:
+.cfi_startproc
 
 .byte	0x4c,0x8d,0x14,0x24
 .byte	0x48,0x81,0xec,0x08,0x01,0x00,0x00
@@ -3756,6 +3773,7 @@ bn_gather5:
 	leaq	(%r10),%rsp
 	.byte	0xf3,0xc3
 .LSEH_end_bn_gather5:
+.cfi_endproc
 .size	bn_gather5,.-bn_gather5
 .align	64
 .Linc:
diff --git a/deps/openssl/config/archs/solaris64-x86_64-gcc/asm/crypto/buildinf.h b/deps/openssl/config/archs/solaris64-x86_64-gcc/asm/crypto/buildinf.h
index cc89c88b1c..a8141d6c78 100644
--- a/deps/openssl/config/archs/solaris64-x86_64-gcc/asm/crypto/buildinf.h
+++ b/deps/openssl/config/archs/solaris64-x86_64-gcc/asm/crypto/buildinf.h
@@ -11,7 +11,7 @@
  */
 
 #define PLATFORM "platform: solaris64-x86_64-gcc"
-#define DATE "built on: Fri Sep 13 16:02:25 2019 UTC"
+#define DATE "built on: Wed Mar 18 21:10:00 2020 UTC"
 
 /*
  * Generate compiler_flags as an array of individual characters. This is a
@@ -36,10 +36,11 @@ static const char compiler_flags[] = {
     'A','S','M',' ','-','D','S','H','A','5','1','2','_','A','S','M',
     ' ','-','D','K','E','C','C','A','K','1','6','0','0','_','A','S',
     'M',' ','-','D','R','C','4','_','A','S','M',' ','-','D','M','D',
-    '5','_','A','S','M',' ','-','D','V','P','A','E','S','_','A','S',
-    'M',' ','-','D','G','H','A','S','H','_','A','S','M',' ','-','D',
-    'E','C','P','_','N','I','S','T','Z','2','5','6','_','A','S','M',
-    ' ','-','D','X','2','5','5','1','9','_','A','S','M',' ','-','D',
-    'P','O','L','Y','1','3','0','5','_','A','S','M',' ','-','D','N',
-    'D','E','B','U','G','\0'
+    '5','_','A','S','M',' ','-','D','A','E','S','N','I','_','A','S',
+    'M',' ','-','D','V','P','A','E','S','_','A','S','M',' ','-','D',
+    'G','H','A','S','H','_','A','S','M',' ','-','D','E','C','P','_',
+    'N','I','S','T','Z','2','5','6','_','A','S','M',' ','-','D','X',
+    '2','5','5','1','9','_','A','S','M',' ','-','D','P','O','L','Y',
+    '1','3','0','5','_','A','S','M',' ','-','D','N','D','E','B','U',
+    'G','\0'
 };
diff --git a/deps/openssl/config/archs/solaris64-x86_64-gcc/asm/crypto/camellia/cmll-x86_64.s b/deps/openssl/config/archs/solaris64-x86_64-gcc/asm/crypto/camellia/cmll-x86_64.s
index 405566b01c..eeb20dd229 100644
--- a/deps/openssl/config/archs/solaris64-x86_64-gcc/asm/crypto/camellia/cmll-x86_64.s
+++ b/deps/openssl/config/archs/solaris64-x86_64-gcc/asm/crypto/camellia/cmll-x86_64.s
@@ -5,11 +5,13 @@
 .type	Camellia_EncryptBlock,@function
 .align	16
 Camellia_EncryptBlock:
+.cfi_startproc
 	movl	$128,%eax
 	subl	%edi,%eax
 	movl	$3,%edi
 	adcl	$0,%edi
 	jmp	.Lenc_rounds
+.cfi_endproc
 .size	Camellia_EncryptBlock,.-Camellia_EncryptBlock
 
 .globl	Camellia_EncryptBlock_Rounds
@@ -83,6 +85,7 @@ Camellia_EncryptBlock_Rounds:
 .type	_x86_64_Camellia_encrypt,@function
 .align	16
 _x86_64_Camellia_encrypt:
+.cfi_startproc
 	xorl	0(%r14),%r9d
 	xorl	4(%r14),%r8d
 	xorl	8(%r14),%r11d
@@ -285,6 +288,7 @@ _x86_64_Camellia_encrypt:
 	movl	%edx,%r11d
 
 .byte	0xf3,0xc3
+.cfi_endproc
 .size	_x86_64_Camellia_encrypt,.-_x86_64_Camellia_encrypt
 
 
@@ -292,11 +296,13 @@ _x86_64_Camellia_encrypt:
 .type	Camellia_DecryptBlock,@function
 .align	16
 Camellia_DecryptBlock:
+.cfi_startproc
 	movl	$128,%eax
 	subl	%edi,%eax
 	movl	$3,%edi
 	adcl	$0,%edi
 	jmp	.Ldec_rounds
+.cfi_endproc
 .size	Camellia_DecryptBlock,.-Camellia_DecryptBlock
 
 .globl	Camellia_DecryptBlock_Rounds
@@ -370,6 +376,7 @@ Camellia_DecryptBlock_Rounds:
 .type	_x86_64_Camellia_decrypt,@function
 .align	16
 _x86_64_Camellia_decrypt:
+.cfi_startproc
 	xorl	0(%r14),%r9d
 	xorl	4(%r14),%r8d
 	xorl	8(%r14),%r11d
@@ -573,6 +580,7 @@ _x86_64_Camellia_decrypt:
 	movl	%ebx,%r11d
 
 .byte	0xf3,0xc3
+.cfi_endproc
 .size	_x86_64_Camellia_decrypt,.-_x86_64_Camellia_decrypt
 .globl	Camellia_Ekeygen
 .type	Camellia_Ekeygen,@function
diff --git a/deps/openssl/config/archs/solaris64-x86_64-gcc/asm/crypto/ec/ecp_nistz256-x86_64.s b/deps/openssl/config/archs/solaris64-x86_64-gcc/asm/crypto/ec/ecp_nistz256-x86_64.s
index 62b9ac6616..5c9e405041 100644
--- a/deps/openssl/config/archs/solaris64-x86_64-gcc/asm/crypto/ec/ecp_nistz256-x86_64.s
+++ b/deps/openssl/config/archs/solaris64-x86_64-gcc/asm/crypto/ec/ecp_nistz256-x86_64.s
@@ -3874,10 +3874,12 @@ ecp_nistz256_ord_sqr_montx:
 .type	ecp_nistz256_to_mont,@function
 .align	32
 ecp_nistz256_to_mont:
+.cfi_startproc
 	movl	$0x80100,%ecx
 	andl	OPENSSL_ia32cap_P+8(%rip),%ecx
 	leaq	.LRR(%rip),%rdx
 	jmp	.Lmul_mont
+.cfi_endproc
 .size	ecp_nistz256_to_mont,.-ecp_nistz256_to_mont
 
 
@@ -4821,6 +4823,7 @@ ecp_nistz256_from_mont:
 .type	ecp_nistz256_scatter_w5,@function
 .align	32
 ecp_nistz256_scatter_w5:
+.cfi_startproc
 	leal	-3(%rdx,%rdx,2),%edx
 	movdqa	0(%rsi),%xmm0
 	shll	$5,%edx
@@ -4837,6 +4840,7 @@ ecp_nistz256_scatter_w5:
 	movdqa	%xmm5,80(%rdi,%rdx,1)
 
 	.byte	0xf3,0xc3
+.cfi_endproc
 .size	ecp_nistz256_scatter_w5,.-ecp_nistz256_scatter_w5
 
 
@@ -4910,6 +4914,7 @@ ecp_nistz256_gather_w5:
 .type	ecp_nistz256_scatter_w7,@function
 .align	32
 ecp_nistz256_scatter_w7:
+.cfi_startproc
 	movdqu	0(%rsi),%xmm0
 	shll	$6,%edx
 	movdqu	16(%rsi),%xmm1
@@ -4921,6 +4926,7 @@ ecp_nistz256_scatter_w7:
 	movdqa	%xmm3,48(%rdi,%rdx,1)
 
 	.byte	0xf3,0xc3
+.cfi_endproc
 .size	ecp_nistz256_scatter_w7,.-ecp_nistz256_scatter_w7
 
 
@@ -5655,26 +5661,16 @@ ecp_nistz256_point_add:
 	orq	%r8,%r12
 	orq	%r9,%r12
 
-.byte	0x3e
-	jnz	.Ladd_proceedq
 .byte	102,73,15,126,208
 .byte	102,73,15,126,217
-	testq	%r8,%r8
-	jnz	.Ladd_proceedq
-	testq	%r9,%r9
-	jz	.Ladd_doubleq
 
-.byte	102,72,15,126,199
-	pxor	%xmm0,%xmm0
-	movdqu	%xmm0,0(%rdi)
-	movdqu	%xmm0,16(%rdi)
-	movdqu	%xmm0,32(%rdi)
-	movdqu	%xmm0,48(%rdi)
-	movdqu	%xmm0,64(%rdi)
-	movdqu	%xmm0,80(%rdi)
-	jmp	.Ladd_doneq
+	orq	%r8,%r12
+	orq	%r9,%r12
+
+
+.byte	0x3e
+	jnz	.Ladd_proceedq
 
-.align	32
 .Ladd_doubleq:
 .byte	102,72,15,126,206
 .byte	102,72,15,126,199
@@ -6774,26 +6770,16 @@ ecp_nistz256_point_addx:
 	orq	%r8,%r12
 	orq	%r9,%r12
 
-.byte	0x3e
-	jnz	.Ladd_proceedx
 .byte	102,73,15,126,208
 .byte	102,73,15,126,217
-	testq	%r8,%r8
-	jnz	.Ladd_proceedx
-	testq	%r9,%r9
-	jz	.Ladd_doublex
 
-.byte	102,72,15,126,199
-	pxor	%xmm0,%xmm0
-	movdqu	%xmm0,0(%rdi)
-	movdqu	%xmm0,16(%rdi)
-	movdqu	%xmm0,32(%rdi)
-	movdqu	%xmm0,48(%rdi)
-	movdqu	%xmm0,64(%rdi)
-	movdqu	%xmm0,80(%rdi)
-	jmp	.Ladd_donex
+	orq	%r8,%r12
+	orq	%r9,%r12
+
+
+.byte	0x3e
+	jnz	.Ladd_proceedx
 
-.align	32
 .Ladd_doublex:
 .byte	102,72,15,126,206
 .byte	102,72,15,126,199
diff --git a/deps/openssl/config/archs/solaris64-x86_64-gcc/asm/crypto/ec/x25519-x86_64.s b/deps/openssl/config/archs/solaris64-x86_64-gcc/asm/crypto/ec/x25519-x86_64.s
index 2a18eaee28..1788e568cd 100644
--- a/deps/openssl/config/archs/solaris64-x86_64-gcc/asm/crypto/ec/x25519-x86_64.s
+++ b/deps/openssl/config/archs/solaris64-x86_64-gcc/asm/crypto/ec/x25519-x86_64.s
@@ -400,12 +400,14 @@ x25519_fe51_mul121666:
 .type	x25519_fe64_eligible,@function
 .align	32
 x25519_fe64_eligible:
+.cfi_startproc
 	movl	OPENSSL_ia32cap_P+8(%rip),%ecx
 	xorl	%eax,%eax
 	andl	$0x80100,%ecx
 	cmpl	$0x80100,%ecx
 	cmovel	%ecx,%eax
 	.byte	0xf3,0xc3
+.cfi_endproc
 .size	x25519_fe64_eligible,.-x25519_fe64_eligible
 
 .globl	x25519_fe64_mul
@@ -648,6 +650,7 @@ x25519_fe64_sqr:
 .align	32
 x25519_fe64_mul121666:
 .Lfe64_mul121666_body:
+.cfi_startproc
 	movl	$121666,%edx
 	mulxq	0(%rsi),%r8,%rcx
 	mulxq	8(%rsi),%r9,%rax
@@ -676,6 +679,7 @@ x25519_fe64_mul121666:
 
 .Lfe64_mul121666_epilogue:
 	.byte	0xf3,0xc3
+.cfi_endproc
 .size	x25519_fe64_mul121666,.-x25519_fe64_mul121666
 
 .globl	x25519_fe64_add
@@ -683,6 +687,7 @@ x25519_fe64_mul121666:
 .align	32
 x25519_fe64_add:
 .Lfe64_add_body:
+.cfi_startproc
 	movq	0(%rsi),%r8
 	movq	8(%rsi),%r9
 	movq	16(%rsi),%r10
@@ -711,6 +716,7 @@ x25519_fe64_add:
 
 .Lfe64_add_epilogue:
 	.byte	0xf3,0xc3
+.cfi_endproc
 .size	x25519_fe64_add,.-x25519_fe64_add
 
 .globl	x25519_fe64_sub
@@ -718,6 +724,7 @@ x25519_fe64_add:
 .align	32
 x25519_fe64_sub:
 .Lfe64_sub_body:
+.cfi_startproc
 	movq	0(%rsi),%r8
 	movq	8(%rsi),%r9
 	movq	16(%rsi),%r10
@@ -746,6 +753,7 @@ x25519_fe64_sub:
 
 .Lfe64_sub_epilogue:
 	.byte	0xf3,0xc3
+.cfi_endproc
 .size	x25519_fe64_sub,.-x25519_fe64_sub
 
 .globl	x25519_fe64_tobytes
@@ -753,6 +761,7 @@ x25519_fe64_sub:
 .align	32
 x25519_fe64_tobytes:
 .Lfe64_to_body:
+.cfi_startproc
 	movq	0(%rsi),%r8
 	movq	8(%rsi),%r9
 	movq	16(%rsi),%r10
@@ -788,5 +797,6 @@ x25519_fe64_tobytes:
 
 .Lfe64_to_epilogue:
 	.byte	0xf3,0xc3
+.cfi_endproc
 .size	x25519_fe64_tobytes,.-x25519_fe64_tobytes
 .byte	88,50,53,53,49,57,32,112,114,105,109,105,116,105,118,101,115,32,102,111,114,32,120,56,54,95,54,52,44,32,67,82,89,80,84,79,71,65,77,83,32,98,121,32,60,97,112,112,114,111,64,111,112,101,110,115,115,108,46,111,114,103,62,0
diff --git a/deps/openssl/config/archs/solaris64-x86_64-gcc/asm/crypto/include/internal/bn_conf.h b/deps/openssl/config/archs/solaris64-x86_64-gcc/asm/crypto/include/internal/bn_conf.h
index 34bd8b78b4..5312ef5a7a 100644
--- a/deps/openssl/config/archs/solaris64-x86_64-gcc/asm/crypto/include/internal/bn_conf.h
+++ b/deps/openssl/config/archs/solaris64-x86_64-gcc/asm/crypto/include/internal/bn_conf.h
@@ -1,5 +1,5 @@
 /* WARNING: do not edit! */
-/* Generated by Makefile from crypto/include/internal/bn_conf.h.in */
+/* Generated by Makefile from include/crypto/bn_conf.h.in */
 /*
  * Copyright 2016 The OpenSSL Project Authors. All Rights Reserved.
  *
@@ -9,8 +9,8 @@
  * https://www.openssl.org/source/license.html
  */
 
-#ifndef HEADER_BN_CONF_H
-# define HEADER_BN_CONF_H
+#ifndef OSSL_CRYPTO_BN_CONF_H
+# define OSSL_CRYPTO_BN_CONF_H
 
 /*
  * The contents of this file are not used in the UEFI build, as
diff --git a/deps/openssl/config/archs/solaris64-x86_64-gcc/asm/crypto/include/internal/dso_conf.h b/deps/openssl/config/archs/solaris64-x86_64-gcc/asm/crypto/include/internal/dso_conf.h
index 252266ec2a..4b1167c3d8 100644
--- a/deps/openssl/config/archs/solaris64-x86_64-gcc/asm/crypto/include/internal/dso_conf.h
+++ b/deps/openssl/config/archs/solaris64-x86_64-gcc/asm/crypto/include/internal/dso_conf.h
@@ -1,5 +1,5 @@
 /* WARNING: do not edit! */
-/* Generated by Makefile from crypto/include/internal/dso_conf.h.in */
+/* Generated by Makefile from include/crypto/dso_conf.h.in */
 /*
  * Copyright 2016-2019 The OpenSSL Project Authors. All Rights Reserved.
  *
@@ -9,8 +9,8 @@
  * https://www.openssl.org/source/license.html
  */
 
-#ifndef HEADER_DSO_CONF_H
-# define HEADER_DSO_CONF_H
+#ifndef OSSL_CRYPTO_DSO_CONF_H
+# define OSSL_CRYPTO_DSO_CONF_H
 # define DSO_DLFCN
 # define HAVE_DLFCN_H
 # define DSO_EXTENSION ".so"
diff --git a/deps/openssl/config/archs/solaris64-x86_64-gcc/asm/crypto/modes/aesni-gcm-x86_64.s b/deps/openssl/config/archs/solaris64-x86_64-gcc/asm/crypto/modes/aesni-gcm-x86_64.s
index 6a7a9577c7..01d89630a4 100644
--- a/deps/openssl/config/archs/solaris64-x86_64-gcc/asm/crypto/modes/aesni-gcm-x86_64.s
+++ b/deps/openssl/config/archs/solaris64-x86_64-gcc/asm/crypto/modes/aesni-gcm-x86_64.s
@@ -3,6 +3,7 @@
 .type	_aesni_ctr32_ghash_6x,@function
 .align	32
 _aesni_ctr32_ghash_6x:
+.cfi_startproc
 	vmovdqu	32(%r11),%xmm2
 	subq	$6,%rdx
 	vpxor	%xmm4,%xmm4,%xmm4
@@ -310,6 +311,7 @@ _aesni_ctr32_ghash_6x:
 	vpxor	%xmm4,%xmm8,%xmm8
 
 	.byte	0xf3,0xc3
+.cfi_endproc
 .size	_aesni_ctr32_ghash_6x,.-_aesni_ctr32_ghash_6x
 .globl	aesni_gcm_decrypt
 .type	aesni_gcm_decrypt,@function
@@ -416,6 +418,7 @@ aesni_gcm_decrypt:
 .type	_aesni_ctr32_6x,@function
 .align	32
 _aesni_ctr32_6x:
+.cfi_startproc
 	vmovdqu	0-128(%rcx),%xmm4
 	vmovdqu	32(%r11),%xmm2
 	leaq	-1(%rbp),%r13
@@ -502,6 +505,7 @@ _aesni_ctr32_6x:
 	vpshufb	%xmm0,%xmm1,%xmm1
 	vpxor	%xmm4,%xmm14,%xmm14
 	jmp	.Loop_ctr32
+.cfi_endproc
 .size	_aesni_ctr32_6x,.-_aesni_ctr32_6x
 
 .globl	aesni_gcm_encrypt
diff --git a/deps/openssl/config/archs/solaris64-x86_64-gcc/asm/crypto/poly1305/poly1305-x86_64.s b/deps/openssl/config/archs/solaris64-x86_64-gcc/asm/crypto/poly1305/poly1305-x86_64.s
index deb4f74bfb..987a65aab3 100644
--- a/deps/openssl/config/archs/solaris64-x86_64-gcc/asm/crypto/poly1305/poly1305-x86_64.s
+++ b/deps/openssl/config/archs/solaris64-x86_64-gcc/asm/crypto/poly1305/poly1305-x86_64.s
@@ -12,6 +12,7 @@
 .type	poly1305_init,@function
 .align	32
 poly1305_init:
+.cfi_startproc
 	xorq	%rax,%rax
 	movq	%rax,0(%rdi)
 	movq	%rax,8(%rdi)
@@ -47,6 +48,7 @@ poly1305_init:
 	movl	$1,%eax
 .Lno_key:
 	.byte	0xf3,0xc3
+.cfi_endproc
 .size	poly1305_init,.-poly1305_init
 
 .type	poly1305_blocks,@function
@@ -167,6 +169,7 @@ poly1305_blocks:
 .type	poly1305_emit,@function
 .align	32
 poly1305_emit:
+.cfi_startproc
 .Lemit:
 	movq	0(%rdi),%r8
 	movq	8(%rdi),%r9
@@ -187,10 +190,12 @@ poly1305_emit:
 	movq	%rcx,8(%rsi)
 
 	.byte	0xf3,0xc3
+.cfi_endproc
 .size	poly1305_emit,.-poly1305_emit
 .type	__poly1305_block,@function
 .align	32
 __poly1305_block:
+.cfi_startproc
 	mulq	%r14
 	movq	%rax,%r9
 	movq	%r11,%rax
@@ -230,11 +235,13 @@ __poly1305_block:
 	adcq	$0,%rbx
 	adcq	$0,%rbp
 	.byte	0xf3,0xc3
+.cfi_endproc
 .size	__poly1305_block,.-__poly1305_block
 
 .type	__poly1305_init_avx,@function
 .align	32
 __poly1305_init_avx:
+.cfi_startproc
 	movq	%r11,%r14
 	movq	%r12,%rbx
 	xorq	%rbp,%rbp
@@ -392,6 +399,7 @@ __poly1305_init_avx:
 
 	leaq	-48-64(%rdi),%rdi
 	.byte	0xf3,0xc3
+.cfi_endproc
 .size	__poly1305_init_avx,.-__poly1305_init_avx
 
 .type	poly1305_blocks_avx,@function
@@ -1232,6 +1240,7 @@ poly1305_blocks_avx:
 .type	poly1305_emit_avx,@function
 .align	32
 poly1305_emit_avx:
+.cfi_startproc
 	cmpl	$0,20(%rdi)
 	je	.Lemit
 
@@ -1282,6 +1291,7 @@ poly1305_emit_avx:
 	movq	%rcx,8(%rsi)
 
 	.byte	0xf3,0xc3
+.cfi_endproc
 .size	poly1305_emit_avx,.-poly1305_emit_avx
 .type	poly1305_blocks_avx2,@function
 .align	32
@@ -2478,6 +2488,7 @@ poly1305_blocks_avx512:
 .type	poly1305_init_base2_44,@function
 .align	32
 poly1305_init_base2_44:
+.cfi_startproc
 	xorq	%rax,%rax
 	movq	%rax,0(%rdi)
 	movq	%rax,8(%rdi)
@@ -2511,10 +2522,12 @@ poly1305_init_base2_44:
 	movq	%r11,8(%rdx)
 	movl	$1,%eax
 	.byte	0xf3,0xc3
+.cfi_endproc
 .size	poly1305_init_base2_44,.-poly1305_init_base2_44
 .type	poly1305_blocks_vpmadd52,@function
 .align	32
 poly1305_blocks_vpmadd52:
+.cfi_startproc
 	shrq	$4,%rdx
 	jz	.Lno_data_vpmadd52
 
@@ -2621,10 +2634,12 @@ poly1305_blocks_vpmadd52:
 
 .Lno_data_vpmadd52:
 	.byte	0xf3,0xc3
+.cfi_endproc
 .size	poly1305_blocks_vpmadd52,.-poly1305_blocks_vpmadd52
 .type	poly1305_blocks_vpmadd52_4x,@function
 .align	32
 poly1305_blocks_vpmadd52_4x:
+.cfi_startproc
 	shrq	$4,%rdx
 	jz	.Lno_data_vpmadd52_4x
 
@@ -3049,10 +3064,12 @@ poly1305_blocks_vpmadd52_4x:
 
 .Lno_data_vpmadd52_4x:
 	.byte	0xf3,0xc3
+.cfi_endproc
 .size	poly1305_blocks_vpmadd52_4x,.-poly1305_blocks_vpmadd52_4x
 .type	poly1305_blocks_vpmadd52_8x,@function
 .align	32
 poly1305_blocks_vpmadd52_8x:
+.cfi_startproc
 	shrq	$4,%rdx
 	jz	.Lno_data_vpmadd52_8x
 
@@ -3393,10 +3410,12 @@ poly1305_blocks_vpmadd52_8x:
 
 .Lno_data_vpmadd52_8x:
 	.byte	0xf3,0xc3
+.cfi_endproc
 .size	poly1305_blocks_vpmadd52_8x,.-poly1305_blocks_vpmadd52_8x
 .type	poly1305_emit_base2_44,@function
 .align	32
 poly1305_emit_base2_44:
+.cfi_startproc
 	movq	0(%rdi),%r8
 	movq	8(%rdi),%r9
 	movq	16(%rdi),%r10
@@ -3427,6 +3446,7 @@ poly1305_emit_base2_44:
 	movq	%rcx,8(%rsi)
 
 	.byte	0xf3,0xc3
+.cfi_endproc
 .size	poly1305_emit_base2_44,.-poly1305_emit_base2_44
 .align	64
 .Lconst:
@@ -3465,6 +3485,7 @@ poly1305_emit_base2_44:
 .type	xor128_encrypt_n_pad,@function
 .align	16
 xor128_encrypt_n_pad:
+.cfi_startproc
 	subq	%rdx,%rsi
 	subq	%rdx,%rdi
 	movq	%rcx,%r10
@@ -3506,12 +3527,14 @@ xor128_encrypt_n_pad:
 .Ldone_enc:
 	movq	%rdx,%rax
 	.byte	0xf3,0xc3
+.cfi_endproc
 .size	xor128_encrypt_n_pad,.-xor128_encrypt_n_pad
 
 .globl	xor128_decrypt_n_pad
 .type	xor128_decrypt_n_pad,@function
 .align	16
 xor128_decrypt_n_pad:
+.cfi_startproc
 	subq	%rdx,%rsi
 	subq	%rdx,%rdi
 	movq	%rcx,%r10
@@ -3557,4 +3580,5 @@ xor128_decrypt_n_pad:
 .Ldone_dec:
 	movq	%rdx,%rax
 	.byte	0xf3,0xc3
+.cfi_endproc
 .size	xor128_decrypt_n_pad,.-xor128_decrypt_n_pad
diff --git a/deps/openssl/config/archs/solaris64-x86_64-gcc/asm/crypto/rc4/rc4-x86_64.s b/deps/openssl/config/archs/solaris64-x86_64-gcc/asm/crypto/rc4/rc4-x86_64.s
index fba70351d4..b97c757550 100644
--- a/deps/openssl/config/archs/solaris64-x86_64-gcc/asm/crypto/rc4/rc4-x86_64.s
+++ b/deps/openssl/config/archs/solaris64-x86_64-gcc/asm/crypto/rc4/rc4-x86_64.s
@@ -4,11 +4,12 @@
 .globl	RC4
 .type	RC4,@function
 .align	16
-RC4:	orq	%rsi,%rsi
+RC4:
+.cfi_startproc
+	orq	%rsi,%rsi
 	jne	.Lentry
 	.byte	0xf3,0xc3
 .Lentry:
-.cfi_startproc	
 	pushq	%rbx
 .cfi_adjust_cfa_offset	8
 .cfi_offset	%rbx,-16
@@ -533,6 +534,7 @@ RC4:	orq	%rsi,%rsi
 .type	RC4_set_key,@function
 .align	16
 RC4_set_key:
+.cfi_startproc
 	leaq	8(%rdi),%rdi
 	leaq	(%rdx,%rsi,1),%rdx
 	negq	%rsi
@@ -599,12 +601,14 @@ RC4_set_key:
 	movl	%eax,-8(%rdi)
 	movl	%eax,-4(%rdi)
 	.byte	0xf3,0xc3
+.cfi_endproc
 .size	RC4_set_key,.-RC4_set_key
 
 .globl	RC4_options
 .type	RC4_options,@function
 .align	16
 RC4_options:
+.cfi_startproc
 	leaq	.Lopts(%rip),%rax
 	movl	OPENSSL_ia32cap_P(%rip),%edx
 	btl	$20,%edx
@@ -617,6 +621,7 @@ RC4_options:
 	addq	$12,%rax
 .Ldone:
 	.byte	0xf3,0xc3
+.cfi_endproc
 .align	64
 .Lopts:
 .byte	114,99,52,40,56,120,44,105,110,116,41,0
diff --git a/deps/openssl/config/archs/solaris64-x86_64-gcc/asm/crypto/sha/keccak1600-x86_64.s b/deps/openssl/config/archs/solaris64-x86_64-gcc/asm/crypto/sha/keccak1600-x86_64.s
index e511f25035..09617d014b 100644
--- a/deps/openssl/config/archs/solaris64-x86_64-gcc/asm/crypto/sha/keccak1600-x86_64.s
+++ b/deps/openssl/config/archs/solaris64-x86_64-gcc/asm/crypto/sha/keccak1600-x86_64.s
@@ -3,6 +3,7 @@
 .type	__KeccakF1600,@function
 .align	32
 __KeccakF1600:
+.cfi_startproc
 	movq	60(%rdi),%rax
 	movq	68(%rdi),%rbx
 	movq	76(%rdi),%rcx
@@ -255,6 +256,7 @@ __KeccakF1600:
 
 	leaq	-192(%r15),%r15
 	.byte	0xf3,0xc3
+.cfi_endproc
 .size	__KeccakF1600,.-__KeccakF1600
 
 .type	KeccakF1600,@function
diff --git a/deps/openssl/config/archs/solaris64-x86_64-gcc/asm/crypto/sha/sha1-x86_64.s b/deps/openssl/config/archs/solaris64-x86_64-gcc/asm/crypto/sha/sha1-x86_64.s
index e436521a04..98541727e5 100644
--- a/deps/openssl/config/archs/solaris64-x86_64-gcc/asm/crypto/sha/sha1-x86_64.s
+++ b/deps/openssl/config/archs/solaris64-x86_64-gcc/asm/crypto/sha/sha1-x86_64.s
@@ -1421,8 +1421,8 @@ _shaext_shortcut:
 	pshufd	$27,%xmm1,%xmm1
 	movdqu	%xmm0,(%rdi)
 	movd	%xmm1,16(%rdi)
-.cfi_endproc	
 	.byte	0xf3,0xc3
+.cfi_endproc
 .size	sha1_block_data_order_shaext,.-sha1_block_data_order_shaext
 .type	sha1_block_data_order_ssse3,@function
 .align	16
diff --git a/deps/openssl/config/archs/solaris64-x86_64-gcc/asm/crypto/sha/sha256-x86_64.s b/deps/openssl/config/archs/solaris64-x86_64-gcc/asm/crypto/sha/sha256-x86_64.s
index 42b24df18e..9357385da3 100644
--- a/deps/openssl/config/archs/solaris64-x86_64-gcc/asm/crypto/sha/sha256-x86_64.s
+++ b/deps/openssl/config/archs/solaris64-x86_64-gcc/asm/crypto/sha/sha256-x86_64.s
@@ -1775,6 +1775,7 @@ K256:
 .align	64
 sha256_block_data_order_shaext:
 _shaext_shortcut:
+.cfi_startproc
 	leaq	K256+128(%rip),%rcx
 	movdqu	(%rdi),%xmm1
 	movdqu	16(%rdi),%xmm2
@@ -1977,6 +1978,7 @@ _shaext_shortcut:
 	movdqu	%xmm1,(%rdi)
 	movdqu	%xmm2,16(%rdi)
 	.byte	0xf3,0xc3
+.cfi_endproc
 .size	sha256_block_data_order_shaext,.-sha256_block_data_order_shaext
 .type	sha256_block_data_order_ssse3,@function
 .align	64
@@ -4238,7 +4240,15 @@ sha256_block_data_order_avx2:
 	vmovdqa	%ymm4,0(%rsp)
 	xorl	%r14d,%r14d
 	vmovdqa	%ymm5,32(%rsp)
+
+	movq	88(%rsp),%rdi
+.cfi_def_cfa	%rdi,8
 	leaq	-64(%rsp),%rsp
+
+
+
+	movq	%rdi,-8(%rsp)
+.cfi_escape	0x0f,0x05,0x77,0x78,0x06,0x23,0x08
 	movl	%ebx,%edi
 	vmovdqa	%ymm6,0(%rsp)
 	xorl	%ecx,%edi
@@ -4250,6 +4260,12 @@ sha256_block_data_order_avx2:
 .align	16
 .Lavx2_00_47:
 	leaq	-64(%rsp),%rsp
+.cfi_escape	0x0f,0x05,0x77,0x38,0x06,0x23,0x08
+
+	pushq	64-8(%rsp)
+.cfi_escape	0x0f,0x05,0x77,0x00,0x06,0x23,0x08
+	leaq	8(%rsp),%rsp
+.cfi_escape	0x0f,0x05,0x77,0x78,0x06,0x23,0x08
 	vpalignr	$4,%ymm0,%ymm1,%ymm4
 	addl	0+128(%rsp),%r11d
 	andl	%r8d,%r12d
@@ -4505,6 +4521,12 @@ sha256_block_data_order_avx2:
 	movl	%r9d,%r12d
 	vmovdqa	%ymm6,32(%rsp)
 	leaq	-64(%rsp),%rsp
+.cfi_escape	0x0f,0x05,0x77,0x38,0x06,0x23,0x08
+
+	pushq	64-8(%rsp)
+.cfi_escape	0x0f,0x05,0x77,0x00,0x06,0x23,0x08
+	leaq	8(%rsp),%rsp
+.cfi_escape	0x0f,0x05,0x77,0x78,0x06,0x23,0x08
 	vpalignr	$4,%ymm2,%ymm3,%ymm4
 	addl	0+128(%rsp),%r11d
 	andl	%r8d,%r12d
@@ -5380,6 +5402,8 @@ sha256_block_data_order_avx2:
 
 	leaq	448(%rsp),%rsp
 
+.cfi_escape	0x0f,0x06,0x77,0xd8,0x00,0x06,0x23,0x08
+
 	addl	0(%rdi),%eax
 	addl	4(%rdi),%ebx
 	addl	8(%rdi),%ecx
@@ -5405,9 +5429,11 @@ sha256_block_data_order_avx2:
 	jbe	.Loop_avx2
 	leaq	(%rsp),%rbp
 
+
+.cfi_escape	0x0f,0x06,0x76,0xd8,0x00,0x06,0x23,0x08
+
 .Ldone_avx2:
-	leaq	(%rbp),%rsp
-	movq	88(%rsp),%rsi
+	movq	88(%rbp),%rsi
 .cfi_def_cfa	%rsi,8
 	vzeroupper
 	movq	-48(%rsi),%r15
diff --git a/deps/openssl/config/archs/solaris64-x86_64-gcc/asm/crypto/sha/sha512-x86_64.s b/deps/openssl/config/archs/solaris64-x86_64-gcc/asm/crypto/sha/sha512-x86_64.s
index 5931a2a932..939f1ca71c 100644
--- a/deps/openssl/config/archs/solaris64-x86_64-gcc/asm/crypto/sha/sha512-x86_64.s
+++ b/deps/openssl/config/archs/solaris64-x86_64-gcc/asm/crypto/sha/sha512-x86_64.s
@@ -4165,7 +4165,15 @@ sha512_block_data_order_avx2:
 	vmovdqa	%ymm10,64(%rsp)
 	vpaddq	64(%rbp),%ymm6,%ymm10
 	vmovdqa	%ymm11,96(%rsp)
+
+	movq	152(%rsp),%rdi
+.cfi_def_cfa	%rdi,8
 	leaq	-128(%rsp),%rsp
+
+
+
+	movq	%rdi,-8(%rsp)
+.cfi_escape	0x0f,0x05,0x77,0x78,0x06,0x23,0x08
 	vpaddq	96(%rbp),%ymm7,%ymm11
 	vmovdqa	%ymm8,0(%rsp)
 	xorq	%r14,%r14
@@ -4181,6 +4189,12 @@ sha512_block_data_order_avx2:
 .align	16
 .Lavx2_00_47:
 	leaq	-128(%rsp),%rsp
+.cfi_escape	0x0f,0x06,0x77,0xf8,0x00,0x06,0x23,0x08
+
+	pushq	128-8(%rsp)
+.cfi_escape	0x0f,0x05,0x77,0x00,0x06,0x23,0x08
+	leaq	8(%rsp),%rsp
+.cfi_escape	0x0f,0x05,0x77,0x78,0x06,0x23,0x08
 	vpalignr	$8,%ymm0,%ymm1,%ymm8
 	addq	0+256(%rsp),%r11
 	andq	%r8,%r12
@@ -4474,6 +4488,12 @@ sha512_block_data_order_avx2:
 	movq	%r9,%r12
 	vmovdqa	%ymm10,96(%rsp)
 	leaq	-128(%rsp),%rsp
+.cfi_escape	0x0f,0x06,0x77,0xf8,0x00,0x06,0x23,0x08
+
+	pushq	128-8(%rsp)
+.cfi_escape	0x0f,0x05,0x77,0x00,0x06,0x23,0x08
+	leaq	8(%rsp),%rsp
+.cfi_escape	0x0f,0x05,0x77,0x78,0x06,0x23,0x08
 	vpalignr	$8,%ymm4,%ymm5,%ymm8
 	addq	0+256(%rsp),%r11
 	andq	%r8,%r12
@@ -5387,6 +5407,8 @@ sha512_block_data_order_avx2:
 
 	leaq	1152(%rsp),%rsp
 
+.cfi_escape	0x0f,0x06,0x77,0x98,0x01,0x06,0x23,0x08
+
 	addq	0(%rdi),%rax
 	addq	8(%rdi),%rbx
 	addq	16(%rdi),%rcx
@@ -5412,9 +5434,11 @@ sha512_block_data_order_avx2:
 	jbe	.Loop_avx2
 	leaq	(%rsp),%rbp
 
+
+.cfi_escape	0x0f,0x06,0x76,0x98,0x01,0x06,0x23,0x08
+
 .Ldone_avx2:
-	leaq	(%rbp),%rsp
-	movq	152(%rsp),%rsi
+	movq	152(%rbp),%rsi
 .cfi_def_cfa	%rsi,8
 	vzeroupper
 	movq	-48(%rsi),%r15
diff --git a/deps/openssl/config/archs/solaris64-x86_64-gcc/asm/crypto/x86_64cpuid.s b/deps/openssl/config/archs/solaris64-x86_64-gcc/asm/crypto/x86_64cpuid.s
index fd17eaaba4..9268ce8c9a 100644
--- a/deps/openssl/config/archs/solaris64-x86_64-gcc/asm/crypto/x86_64cpuid.s
+++ b/deps/openssl/config/archs/solaris64-x86_64-gcc/asm/crypto/x86_64cpuid.s
@@ -12,6 +12,7 @@
 .type	OPENSSL_atomic_add,@function
 .align	16
 OPENSSL_atomic_add:
+.cfi_startproc
 	movl	(%rdi),%eax
 .Lspin:	leaq	(%rsi,%rax,1),%r8
 .byte	0xf0
@@ -20,16 +21,19 @@ OPENSSL_atomic_add:
 	movl	%r8d,%eax
 .byte	0x48,0x98
 	.byte	0xf3,0xc3
+.cfi_endproc
 .size	OPENSSL_atomic_add,.-OPENSSL_atomic_add
 
 .globl	OPENSSL_rdtsc
 .type	OPENSSL_rdtsc,@function
 .align	16
 OPENSSL_rdtsc:
+.cfi_startproc
 	rdtsc
 	shlq	$32,%rdx
 	orq	%rdx,%rax
 	.byte	0xf3,0xc3
+.cfi_endproc
 .size	OPENSSL_rdtsc,.-OPENSSL_rdtsc
 
 .globl	OPENSSL_ia32_cpuid
@@ -205,6 +209,7 @@ OPENSSL_ia32_cpuid:
 .type	OPENSSL_cleanse,@function
 .align	16
 OPENSSL_cleanse:
+.cfi_startproc
 	xorq	%rax,%rax
 	cmpq	$15,%rsi
 	jae	.Lot
@@ -234,12 +239,14 @@ OPENSSL_cleanse:
 	cmpq	$0,%rsi
 	jne	.Little
 	.byte	0xf3,0xc3
+.cfi_endproc
 .size	OPENSSL_cleanse,.-OPENSSL_cleanse
 
 .globl	CRYPTO_memcmp
 .type	CRYPTO_memcmp,@function
 .align	16
 CRYPTO_memcmp:
+.cfi_startproc
 	xorq	%rax,%rax
 	xorq	%r10,%r10
 	cmpq	$0,%rdx
@@ -268,11 +275,13 @@ CRYPTO_memcmp:
 	shrq	$63,%rax
 .Lno_data:
 	.byte	0xf3,0xc3
+.cfi_endproc
 .size	CRYPTO_memcmp,.-CRYPTO_memcmp
 .globl	OPENSSL_wipe_cpu
 .type	OPENSSL_wipe_cpu,@function
 .align	16
 OPENSSL_wipe_cpu:
+.cfi_startproc
 	pxor	%xmm0,%xmm0
 	pxor	%xmm1,%xmm1
 	pxor	%xmm2,%xmm2
@@ -299,11 +308,13 @@ OPENSSL_wipe_cpu:
 	xorq	%r11,%r11
 	leaq	8(%rsp),%rax
 	.byte	0xf3,0xc3
+.cfi_endproc
 .size	OPENSSL_wipe_cpu,.-OPENSSL_wipe_cpu
 .globl	OPENSSL_instrument_bus
 .type	OPENSSL_instrument_bus,@function
 .align	16
 OPENSSL_instrument_bus:
+.cfi_startproc
 	movq	%rdi,%r10
 	movq	%rsi,%rcx
 	movq	%rsi,%r11
@@ -330,12 +341,14 @@ OPENSSL_instrument_bus:
 
 	movq	%r11,%rax
 	.byte	0xf3,0xc3
+.cfi_endproc
 .size	OPENSSL_instrument_bus,.-OPENSSL_instrument_bus
 
 .globl	OPENSSL_instrument_bus2
 .type	OPENSSL_instrument_bus2,@function
 .align	16
 OPENSSL_instrument_bus2:
+.cfi_startproc
 	movq	%rdi,%r10
 	movq	%rsi,%rcx
 	movq	%rdx,%r11
@@ -378,11 +391,13 @@ OPENSSL_instrument_bus2:
 	movq	8(%rsp),%rax
 	subq	%rcx,%rax
 	.byte	0xf3,0xc3
+.cfi_endproc
 .size	OPENSSL_instrument_bus2,.-OPENSSL_instrument_bus2
 .globl	OPENSSL_ia32_rdrand_bytes
 .type	OPENSSL_ia32_rdrand_bytes,@function
 .align	16
 OPENSSL_ia32_rdrand_bytes:
+.cfi_startproc
 	xorq	%rax,%rax
 	cmpq	$0,%rsi
 	je	.Ldone_rdrand_bytes
@@ -419,11 +434,13 @@ OPENSSL_ia32_rdrand_bytes:
 .Ldone_rdrand_bytes:
 	xorq	%r10,%r10
 	.byte	0xf3,0xc3
+.cfi_endproc
 .size	OPENSSL_ia32_rdrand_bytes,.-OPENSSL_ia32_rdrand_bytes
 .globl	OPENSSL_ia32_rdseed_bytes
 .type	OPENSSL_ia32_rdseed_bytes,@function
 .align	16
 OPENSSL_ia32_rdseed_bytes:
+.cfi_startproc
 	xorq	%rax,%rax
 	cmpq	$0,%rsi
 	je	.Ldone_rdseed_bytes
@@ -460,4 +477,5 @@ OPENSSL_ia32_rdseed_bytes:
 .Ldone_rdseed_bytes:
 	xorq	%r10,%r10
 	.byte	0xf3,0xc3
+.cfi_endproc
 .size	OPENSSL_ia32_rdseed_bytes,.-OPENSSL_ia32_rdseed_bytes
diff --git a/deps/openssl/config/archs/solaris64-x86_64-gcc/asm/include/openssl/opensslconf.h b/deps/openssl/config/archs/solaris64-x86_64-gcc/asm/include/openssl/opensslconf.h
index 913bb95a5a..14050a4534 100644
--- a/deps/openssl/config/archs/solaris64-x86_64-gcc/asm/include/openssl/opensslconf.h
+++ b/deps/openssl/config/archs/solaris64-x86_64-gcc/asm/include/openssl/opensslconf.h
@@ -96,9 +96,6 @@ extern "C" {
 #ifndef OPENSSL_NO_DYNAMIC_ENGINE
 # define OPENSSL_NO_DYNAMIC_ENGINE
 #endif
-#ifndef OPENSSL_NO_AFALGENG
-# define OPENSSL_NO_AFALGENG
-#endif
 
 
 /*
diff --git a/deps/openssl/config/archs/solaris64-x86_64-gcc/asm/include/progs.h b/deps/openssl/config/archs/solaris64-x86_64-gcc/asm/include/progs.h
index 9b3d270e20..308c65601b 100644
--- a/deps/openssl/config/archs/solaris64-x86_64-gcc/asm/include/progs.h
+++ b/deps/openssl/config/archs/solaris64-x86_64-gcc/asm/include/progs.h
@@ -2,7 +2,7 @@
  * WARNING: do not edit!
  * Generated by apps/progs.pl
  *
- * Copyright 1995-2019 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 1995-2020 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
diff --git a/deps/openssl/config/archs/solaris64-x86_64-gcc/asm/openssl-cl.gypi b/deps/openssl/config/archs/solaris64-x86_64-gcc/asm/openssl-cl.gypi
index ca28a8cbd3..863e9328e5 100644
--- a/deps/openssl/config/archs/solaris64-x86_64-gcc/asm/openssl-cl.gypi
+++ b/deps/openssl/config/archs/solaris64-x86_64-gcc/asm/openssl-cl.gypi
@@ -16,6 +16,7 @@
       'KECCAK1600_ASM',
       'RC4_ASM',
       'MD5_ASM',
+      'AESNI_ASM',
       'VPAES_ASM',
       'GHASH_ASM',
       'ECP_NISTZ256_ASM',
diff --git a/deps/openssl/config/archs/solaris64-x86_64-gcc/asm/openssl.gypi b/deps/openssl/config/archs/solaris64-x86_64-gcc/asm/openssl.gypi
index 0a3feb2ad5..6785731033 100644
--- a/deps/openssl/config/archs/solaris64-x86_64-gcc/asm/openssl.gypi
+++ b/deps/openssl/config/archs/solaris64-x86_64-gcc/asm/openssl.gypi
@@ -723,6 +723,7 @@
       'KECCAK1600_ASM',
       'RC4_ASM',
       'MD5_ASM',
+      'AESNI_ASM',
       'VPAES_ASM',
       'GHASH_ASM',
       'ECP_NISTZ256_ASM',
diff --git a/deps/openssl/config/archs/solaris64-x86_64-gcc/asm_avx2/configdata.pm b/deps/openssl/config/archs/solaris64-x86_64-gcc/asm_avx2/configdata.pm
index f10bb23242..6fb7716b83 100644
--- a/deps/openssl/config/archs/solaris64-x86_64-gcc/asm_avx2/configdata.pm
+++ b/deps/openssl/config/archs/solaris64-x86_64-gcc/asm_avx2/configdata.pm
@@ -48,14 +48,14 @@ our %config = (
   export_var_as_fn => "0",
   includes => [  ],
   lflags => [  ],
-  lib_defines => [ "OPENSSL_PIC", "OPENSSL_CPUID_OBJ", "OPENSSL_IA32_SSE2", "OPENSSL_BN_ASM_MONT", "OPENSSL_BN_ASM_MONT5", "OPENSSL_BN_ASM_GF2m", "SHA1_ASM", "SHA256_ASM", "SHA512_ASM", "KECCAK1600_ASM", "RC4_ASM", "MD5_ASM", "VPAES_ASM", "GHASH_ASM", "ECP_NISTZ256_ASM", "X25519_ASM", "POLY1305_ASM" ],
+  lib_defines => [ "OPENSSL_PIC", "OPENSSL_CPUID_OBJ", "OPENSSL_IA32_SSE2", "OPENSSL_BN_ASM_MONT", "OPENSSL_BN_ASM_MONT5", "OPENSSL_BN_ASM_GF2m", "SHA1_ASM", "SHA256_ASM", "SHA512_ASM", "KECCAK1600_ASM", "RC4_ASM", "MD5_ASM", "AESNI_ASM", "VPAES_ASM", "GHASH_ASM", "ECP_NISTZ256_ASM", "X25519_ASM", "POLY1305_ASM" ],
   libdir => "",
   major => "1",
   makedepprog => "\$(CROSS_COMPILE)../config/fake_gcc.pl",
   minor => "1.1",
   openssl_algorithm_defines => [ "OPENSSL_NO_COMP", "OPENSSL_NO_MD2", "OPENSSL_NO_RC5" ],
   openssl_api_defines => [  ],
-  openssl_other_defines => [ "OPENSSL_RAND_SEED_OS", "OPENSSL_NO_AFALGENG", "OPENSSL_NO_ASAN", "OPENSSL_NO_CRYPTO_MDEBUG", "OPENSSL_NO_CRYPTO_MDEBUG_BACKTRACE", "OPENSSL_NO_DEVCRYPTOENG", "OPENSSL_NO_EC_NISTP_64_GCC_128", "OPENSSL_NO_EGD", "OPENSSL_NO_EXTERNAL_TESTS", "OPENSSL_NO_FUZZ_AFL", "OPENSSL_NO_FUZZ_LIBFUZZER", "OPENSSL_NO_HEARTBEATS", "OPENSSL_NO_MSAN", "OPENSSL_NO_SCTP", "OPENSSL_NO_SSL3", "OPENSSL_NO_SSL3_METHOD", "OPENSSL_NO_UBSAN", "OPENSSL_NO_UNIT_TEST", "OPENSSL_NO_WEAK_SSL_CIPHERS", "OPENSSL_NO_DYNAMIC_ENGINE", "OPENSSL_NO_AFALGENG" ],
+  openssl_other_defines => [ "OPENSSL_RAND_SEED_OS", "OPENSSL_NO_AFALGENG", "OPENSSL_NO_ASAN", "OPENSSL_NO_CRYPTO_MDEBUG", "OPENSSL_NO_CRYPTO_MDEBUG_BACKTRACE", "OPENSSL_NO_DEVCRYPTOENG", "OPENSSL_NO_EC_NISTP_64_GCC_128", "OPENSSL_NO_EGD", "OPENSSL_NO_EXTERNAL_TESTS", "OPENSSL_NO_FUZZ_AFL", "OPENSSL_NO_FUZZ_LIBFUZZER", "OPENSSL_NO_HEARTBEATS", "OPENSSL_NO_MSAN", "OPENSSL_NO_SCTP", "OPENSSL_NO_SSL3", "OPENSSL_NO_SSL3_METHOD", "OPENSSL_NO_UBSAN", "OPENSSL_NO_UNIT_TEST", "OPENSSL_NO_WEAK_SSL_CIPHERS", "OPENSSL_NO_DYNAMIC_ENGINE" ],
   openssl_sys_defines => [  ],
   openssl_thread_defines => [ "OPENSSL_THREADS" ],
   openssldir => "",
@@ -111,8 +111,8 @@ our %config = (
   sourcedir => ".",
   target => "solaris64-x86_64-gcc",
   tdirs => [ "ossl_shim" ],
-  version => "1.1.1d",
-  version_num => "0x1010104fL",
+  version => "1.1.1e",
+  version_num => "0x1010105fL",
 );
 
 our %target = (
@@ -237,6 +237,7 @@ our @disablables = (
   "dgram",
   "dh",
   "dsa",
+  "dso",
   "dtls",
   "dynamic-engine",
   "ec",
@@ -354,8 +355,8 @@ our %unified_info = (
         {
             "" =>
                 [
-                    "crypto/include/internal/bn_conf.h",
-                    "crypto/include/internal/dso_conf.h",
+                    "include/crypto/bn_conf.h",
+                    "include/crypto/dso_conf.h",
                     "include/openssl/opensslconf.h",
                 ],
             "apps/asn1pars.o" =>
@@ -623,14 +624,6 @@ our %unified_info = (
                     "crypto/perlasm/cbc.pl",
                     "crypto/perlasm/x86asm.pl",
                 ],
-            "crypto/include/internal/bn_conf.h" =>
-                [
-                    "configdata.pm",
-                ],
-            "crypto/include/internal/dso_conf.h" =>
-                [
-                    "configdata.pm",
-                ],
             "crypto/rc4/rc4-586.s" =>
                 [
                     "crypto/perlasm/x86asm.pl",
@@ -706,6 +699,14 @@ our %unified_info = (
                 [
                     "libcrypto",
                 ],
+            "include/crypto/bn_conf.h" =>
+                [
+                    "configdata.pm",
+                ],
+            "include/crypto/dso_conf.h" =>
+                [
+                    "configdata.pm",
+                ],
             "include/openssl/opensslconf.h" =>
                 [
                     "configdata.pm",
@@ -1503,6 +1504,12 @@ our %unified_info = (
                     "libcrypto",
                     "test/libtestutil.a",
                 ],
+            "test/ssl_ctx_test" =>
+                [
+                    "libcrypto",
+                    "libssl",
+                    "test/libtestutil.a",
+                ],
             "test/ssl_test" =>
                 [
                     "libcrypto",
@@ -3257,7 +3264,6 @@ our %unified_info = (
                             "test/testutil/cb.o",
                             "test/testutil/driver.o",
                             "test/testutil/format_output.o",
-                            "test/testutil/init.o",
                             "test/testutil/main.o",
                             "test/testutil/output_helpers.o",
                             "test/testutil/random.o",
@@ -3265,6 +3271,7 @@ our %unified_info = (
                             "test/testutil/tap_bio.o",
                             "test/testutil/test_cleanup.o",
                             "test/testutil/tests.o",
+                            "test/testutil/testutil_init.o",
                         ],
                     "products" =>
                         {
@@ -3763,14 +3770,6 @@ our %unified_info = (
                 [
                     "crypto/ia64cpuid.S",
                 ],
-            "crypto/include/internal/bn_conf.h" =>
-                [
-                    "crypto/include/internal/bn_conf.h.in",
-                ],
-            "crypto/include/internal/dso_conf.h" =>
-                [
-                    "crypto/include/internal/dso_conf.h.in",
-                ],
             "crypto/md5/md5-586.s" =>
                 [
                     "crypto/md5/asm/md5-586.pl",
@@ -4211,6 +4210,14 @@ our %unified_info = (
                     "engines/asm/e_padlock-x86_64.pl",
                     "\$(PERLASM_SCHEME)",
                 ],
+            "include/crypto/bn_conf.h" =>
+                [
+                    "include/crypto/bn_conf.h.in",
+                ],
+            "include/crypto/dso_conf.h" =>
+                [
+                    "include/crypto/dso_conf.h.in",
+                ],
             "include/openssl/opensslconf.h" =>
                 [
                     "include/openssl/opensslconf.h.in",
@@ -4905,49 +4912,41 @@ our %unified_info = (
             "crypto/aes/aes_cbc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/aes/aes_cfb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/aes/aes_core.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/aes/aes_ecb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/aes/aes_ige.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/aes/aes_misc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/aes/aes_ofb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/aes/aes_wrap.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/aes/aesfx-sparcv9.o" =>
@@ -4957,25 +4956,21 @@ our %unified_info = (
             "crypto/aes/aesni-mb-x86_64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/aes/aesni-sha1-x86_64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/aes/aesni-sha256-x86_64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/aes/aesni-x86_64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/aes/aest4-sparcv9.o" =>
@@ -4993,13 +4988,11 @@ our %unified_info = (
             "crypto/aes/vpaes-x86_64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/aria/aria.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/arm64cpuid.o" =>
@@ -5013,613 +5006,511 @@ our %unified_info = (
             "crypto/asn1/a_bitstr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_d2i_fp.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_digest.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_dup.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_gentm.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_i2d_fp.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_int.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_mbstr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_object.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_octet.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_print.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_sign.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_strex.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_strnid.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_time.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_type.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_utctm.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_utf8.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_verify.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/ameth_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/asn1_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/asn1_gen.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/asn1_item_list.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/asn1_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/asn1_par.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/asn_mime.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/asn_moid.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/asn_mstbl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/asn_pack.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/bio_asn1.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/bio_ndef.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/d2i_pr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/d2i_pu.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/evp_asn1.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/f_int.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/f_string.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/i2d_pr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/i2d_pu.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/n_pkey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/nsseq.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/p5_pbe.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/p5_pbev2.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/p5_scrypt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/p8_pkey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/t_bitst.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/t_pkey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/t_spki.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/tasn_dec.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/tasn_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/tasn_fre.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/tasn_new.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/tasn_prn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/tasn_scn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/tasn_typ.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/tasn_utl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/x_algor.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/x_bignum.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/x_info.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/x_int64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/x_long.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/x_pkey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/x_sig.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/x_spki.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/x_val.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/async/arch/async_null.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/async/arch/async_posix.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/async/arch/async_win.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/async/async.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/async/async_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/async/async_wait.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bf/bf_cfb64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bf/bf_ecb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bf/bf_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bf/bf_ofb64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bf/bf_skey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/b_addr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/b_dump.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/b_print.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/b_sock.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/b_sock2.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bf_buff.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bf_lbuf.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bf_nbio.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bf_null.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bio_cb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bio_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bio_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bio_meth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bss_acpt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bss_bio.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bss_conn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bss_dgram.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bss_fd.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bss_file.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bss_log.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bss_mem.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bss_null.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bss_sock.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/blake2/blake2b.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/blake2/blake2s.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/blake2/m_blake2b.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/blake2/m_blake2s.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/armv4-gf2m.o" =>
@@ -5633,7 +5524,6 @@ our %unified_info = (
             "crypto/bn/asm/x86_64-gcc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn-mips.o" =>
@@ -5643,182 +5533,152 @@ our %unified_info = (
             "crypto/bn/bn_add.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_blind.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_const.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_ctx.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_depr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_dh.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_div.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_exp.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto",
                 ],
             "crypto/bn/bn_exp2.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_gcd.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_gf2m.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_intern.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_kron.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_mod.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_mont.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_mpi.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_mul.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_nist.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_prime.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_print.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_rand.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_recp.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_shift.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_sqr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_sqrt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_srp.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_word.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_x931p.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/mips-mont.o" =>
@@ -5828,19 +5688,16 @@ our %unified_info = (
             "crypto/bn/rsaz-avx2.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/rsaz-x86_64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/rsaz_exp.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/sparct4-mont.o" =>
@@ -5866,31 +5723,26 @@ our %unified_info = (
             "crypto/bn/x86_64-gf2m.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/x86_64-mont.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/x86_64-mont5.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/buffer/buf_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/buffer/buffer.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/buildinf.h" =>
@@ -5900,37 +5752,31 @@ our %unified_info = (
             "crypto/camellia/cmll-x86_64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/camellia/cmll_cfb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/camellia/cmll_ctr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/camellia/cmll_ecb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/camellia/cmll_misc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/camellia/cmll_ofb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/camellia/cmllt4-sparcv9.o" =>
@@ -5940,31 +5786,26 @@ our %unified_info = (
             "crypto/cast/c_cfb64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cast/c_ecb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cast/c_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cast/c_ofb64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cast/c_skey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/chacha/chacha-armv4.o" =>
@@ -5982,278 +5823,232 @@ our %unified_info = (
             "crypto/chacha/chacha-x86_64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cmac/cm_ameth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cmac/cm_pmeth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cmac/cmac.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_asn1.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_att.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_cd.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_dd.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_env.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_ess.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_io.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_kari.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_pwri.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_sd.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_smime.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/conf/conf_api.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/conf/conf_def.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/conf/conf_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/conf/conf_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/conf/conf_mall.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/conf/conf_mod.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/conf/conf_sap.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/conf/conf_ssl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cpt_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cryptlib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ct/ct_b64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ct/ct_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ct/ct_log.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ct/ct_oct.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ct/ct_policy.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ct/ct_prn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ct/ct_sct.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ct/ct_sct_ctx.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ct/ct_vfy.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ct/ct_x509v3.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ctype.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cversion.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto",
                 ],
             "crypto/des/cbc_cksm.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/cbc_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/cfb64ede.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/cfb64enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/cfb_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/des_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/dest4-sparcv9.o" =>
@@ -6263,301 +6058,251 @@ our %unified_info = (
             "crypto/des/ecb3_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/ecb_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/fcrypt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/fcrypt_b.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/ofb64ede.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/ofb64enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/ofb_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/pcbc_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/qud_cksm.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/rand_key.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/set_key.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/str2key.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/xcbc_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_ameth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_asn1.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_check.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_depr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_gen.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_kdf.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_key.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_meth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_pmeth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_prn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_rfc5114.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_rfc7919.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dsa/dsa_ameth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dsa/dsa_asn1.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dsa/dsa_depr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dsa/dsa_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dsa/dsa_gen.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dsa/dsa_key.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dsa/dsa_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dsa/dsa_meth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dsa/dsa_ossl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dsa/dsa_pmeth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dsa/dsa_prn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dsa/dsa_sign.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dsa/dsa_vrf.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dso/dso_dl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dso/dso_dlfcn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dso/dso_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dso/dso_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dso/dso_openssl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dso/dso_vms.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dso/dso_win32.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ebcdic.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/curve25519.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/curve448/arch_32/f_impl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto/ec/curve448/arch_32",
                     "crypto/ec/curve448",
@@ -6565,7 +6310,6 @@ our %unified_info = (
             "crypto/ec/curve448/curve448.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto/ec/curve448/arch_32",
                     "crypto/ec/curve448",
@@ -6573,7 +6317,6 @@ our %unified_info = (
             "crypto/ec/curve448/curve448_tables.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto/ec/curve448/arch_32",
                     "crypto/ec/curve448",
@@ -6581,7 +6324,6 @@ our %unified_info = (
             "crypto/ec/curve448/eddsa.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto/ec/curve448/arch_32",
                     "crypto/ec/curve448",
@@ -6589,7 +6331,6 @@ our %unified_info = (
             "crypto/ec/curve448/f_generic.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto/ec/curve448/arch_32",
                     "crypto/ec/curve448",
@@ -6597,7 +6338,6 @@ our %unified_info = (
             "crypto/ec/curve448/scalar.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto/ec/curve448/arch_32",
                     "crypto/ec/curve448",
@@ -6605,163 +6345,136 @@ our %unified_info = (
             "crypto/ec/ec2_oct.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec2_smpl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec_ameth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec_asn1.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec_check.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec_curve.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec_cvt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec_key.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec_kmeth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec_mult.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec_oct.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec_pmeth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec_print.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecdh_kdf.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecdh_ossl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecdsa_ossl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecdsa_sign.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecdsa_vrf.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/eck_prn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecp_mont.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecp_nist.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecp_nistp224.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecp_nistp256.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecp_nistp521.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecp_nistputil.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecp_nistz256-armv4.o" =>
@@ -6779,241 +6492,201 @@ our %unified_info = (
             "crypto/ec/ecp_nistz256-x86_64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecp_nistz256.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecp_oct.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecp_smpl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecx_meth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/x25519-x86_64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/eng_all.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/eng_cnf.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/eng_ctrl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/eng_dyn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/eng_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/eng_fat.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/eng_init.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/eng_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/eng_list.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/eng_openssl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/eng_pkey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/eng_rdrand.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/eng_table.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/tb_asnmth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/tb_cipher.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/tb_dh.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/tb_digest.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/tb_dsa.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/tb_eckey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/tb_pkmeth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/tb_rand.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/tb_rsa.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/err/err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/err/err_all.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/err/err_prn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/bio_b64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/bio_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/bio_md.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/bio_ok.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/c_allc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/c_alld.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/cmeth_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/digest.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/e_aes.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto",
                     "crypto/modes",
@@ -7021,21 +6694,18 @@ our %unified_info = (
             "crypto/evp/e_aes_cbc_hmac_sha1.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto/modes",
                 ],
             "crypto/evp/e_aes_cbc_hmac_sha256.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto/modes",
                 ],
             "crypto/evp/e_aria.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto",
                     "crypto/modes",
@@ -7043,13 +6713,11 @@ our %unified_info = (
             "crypto/evp/e_bf.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/e_camellia.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto",
                     "crypto/modes",
@@ -7057,81 +6725,68 @@ our %unified_info = (
             "crypto/evp/e_cast.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/e_chacha20_poly1305.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/e_des.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto",
                 ],
             "crypto/evp/e_des3.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto",
                 ],
             "crypto/evp/e_idea.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/e_null.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/e_old.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/e_rc2.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/e_rc4.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/e_rc4_hmac_md5.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/e_rc5.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/e_seed.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/e_sm4.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto",
                     "crypto/modes",
@@ -7139,328 +6794,267 @@ our %unified_info = (
             "crypto/evp/e_xcbc_d.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/encode.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/evp_cnf.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/evp_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/evp_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/evp_key.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/evp_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/evp_pbe.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/evp_pkey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/m_md2.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/m_md4.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/m_md5.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/m_md5_sha1.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/m_mdc2.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/m_null.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/m_ripemd.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/m_sha1.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/m_sha3.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto",
                 ],
             "crypto/evp/m_sigver.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/m_wp.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/names.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/p5_crpt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/p5_crpt2.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/p_dec.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/p_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/p_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/p_open.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/p_seal.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/p_sign.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/p_verify.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/pbe_scrypt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/pmeth_fn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/pmeth_gn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/pmeth_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ex_data.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/getenv.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/hmac/hm_ameth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/hmac/hm_pmeth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/hmac/hmac.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/idea/i_cbc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/idea/i_cfb64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/idea/i_ecb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/idea/i_ofb64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/idea/i_skey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
-            "crypto/include/internal/bn_conf.h" =>
-                [
-                    ".",
-                ],
-            "crypto/include/internal/dso_conf.h" =>
-                [
-                    ".",
-                ],
             "crypto/init.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/kdf/hkdf.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/kdf/kdf_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/kdf/scrypt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/kdf/tls1_prf.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/lhash/lh_stats.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/lhash/lhash.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/md4/md4_dgst.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/md4/md4_one.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/md5/md5-sparcv9.o" =>
@@ -7470,91 +7064,76 @@ our %unified_info = (
             "crypto/md5/md5-x86_64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/md5/md5_dgst.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/md5/md5_one.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/mdc2/mdc2_one.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/mdc2/mdc2dgst.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/mem.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/mem_dbg.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/mem_sec.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/modes/aesni-gcm-x86_64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/modes/cbc128.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/modes/ccm128.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/modes/cfb128.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/modes/ctr128.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/modes/cts128.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/modes/gcm128.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto",
                 ],
@@ -7573,7 +7152,6 @@ our %unified_info = (
             "crypto/modes/ghash-x86_64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/modes/ghashv8-armx.o" =>
@@ -7583,361 +7161,301 @@ our %unified_info = (
             "crypto/modes/ocb128.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/modes/ofb128.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/modes/wrap128.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/modes/xts128.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/o_dir.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/o_fips.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/o_fopen.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/o_init.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/o_str.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/o_time.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/objects/o_names.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/objects/obj_dat.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/objects/obj_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/objects/obj_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/objects/obj_xref.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ocsp/ocsp_asn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ocsp/ocsp_cl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ocsp/ocsp_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ocsp/ocsp_ext.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ocsp/ocsp_ht.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ocsp/ocsp_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ocsp/ocsp_prn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ocsp/ocsp_srv.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ocsp/ocsp_vfy.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ocsp/v3_ocsp.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pem/pem_all.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pem/pem_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pem/pem_info.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pem/pem_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pem/pem_oth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pem/pem_pk8.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pem/pem_pkey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pem/pem_sign.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pem/pem_x509.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pem/pem_xaux.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pem/pvkfmt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_add.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_asn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_attr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_crpt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_crt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_decr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_init.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_key.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_kiss.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_mutl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_npas.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_p8d.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_p8e.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_sbag.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_utl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/pk12err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs7/bio_pk7.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs7/pk7_asn1.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs7/pk7_attr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs7/pk7_doit.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs7/pk7_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs7/pk7_mime.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs7/pk7_smime.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs7/pkcs7err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/poly1305/poly1305-armv4.o" =>
@@ -7959,265 +7477,221 @@ our %unified_info = (
             "crypto/poly1305/poly1305-x86_64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/poly1305/poly1305.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/poly1305/poly1305_ameth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/poly1305/poly1305_pmeth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rand/drbg_ctr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rand/drbg_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rand/rand_egd.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rand/rand_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rand/rand_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rand/rand_unix.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rand/rand_vms.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rand/rand_win.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rand/randfile.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rc2/rc2_cbc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rc2/rc2_ecb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rc2/rc2_skey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rc2/rc2cfb64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rc2/rc2ofb64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rc4/rc4-md5-x86_64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rc4/rc4-x86_64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ripemd/rmd_dgst.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ripemd/rmd_one.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_ameth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_asn1.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_chk.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_crpt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_depr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_gen.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_meth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_mp.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_none.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_oaep.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_ossl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_pk1.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_pmeth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_prn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_pss.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_saos.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_sign.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_ssl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_x931.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_x931g.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/s390xcpuid.o" =>
@@ -8227,31 +7701,26 @@ our %unified_info = (
             "crypto/seed/seed.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/seed/seed_cbc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/seed/seed_cfb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/seed/seed_ecb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/seed/seed_ofb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sha/keccak1600-armv4.o" =>
@@ -8261,7 +7730,6 @@ our %unified_info = (
             "crypto/sha/keccak1600-x86_64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sha/sha1-armv4-large.o" =>
@@ -8275,7 +7743,6 @@ our %unified_info = (
             "crypto/sha/sha1-mb-x86_64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sha/sha1-mips.o" =>
@@ -8293,19 +7760,16 @@ our %unified_info = (
             "crypto/sha/sha1-x86_64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sha/sha1_one.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sha/sha1dgst.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sha/sha256-armv4.o" =>
@@ -8319,7 +7783,6 @@ our %unified_info = (
             "crypto/sha/sha256-mb-x86_64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sha/sha256-mips.o" =>
@@ -8337,13 +7800,11 @@ our %unified_info = (
             "crypto/sha/sha256-x86_64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sha/sha256.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sha/sha512-armv4.o" =>
@@ -8369,727 +7830,606 @@ our %unified_info = (
             "crypto/sha/sha512-x86_64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sha/sha512.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/siphash/siphash.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/siphash/siphash_ameth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/siphash/siphash_pmeth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sm2/sm2_crypt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sm2/sm2_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sm2/sm2_pmeth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sm2/sm2_sign.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sm3/m_sm3.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sm3/sm3.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sm4/sm4.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/srp/srp_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/srp/srp_vfy.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/stack/stack.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/store/loader_file.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/store/store_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/store/store_init.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/store/store_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/store/store_register.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/store/store_strings.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/threads_none.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/threads_pthread.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/threads_win.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ts/ts_asn1.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ts/ts_conf.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ts/ts_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ts/ts_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ts/ts_req_print.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ts/ts_req_utils.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ts/ts_rsp_print.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ts/ts_rsp_sign.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ts/ts_rsp_utils.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ts/ts_rsp_verify.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ts/ts_verify_ctx.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/txt_db/txt_db.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ui/ui_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ui/ui_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ui/ui_null.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ui/ui_openssl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ui/ui_util.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/uid.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/whrlpool/wp-x86_64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/whrlpool/wp_dgst.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/by_dir.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/by_file.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/t_crl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/t_req.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/t_x509.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_att.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_cmp.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_d2.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_def.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_ext.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_lu.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_meth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_obj.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_r2x.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_req.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_set.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_trs.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_txt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_v3.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_vfy.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_vpm.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509cset.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509name.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509rset.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509spki.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509type.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x_all.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x_attrib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x_crl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x_exten.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x_name.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x_pubkey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x_req.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x_x509.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x_x509a.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/pcy_cache.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/pcy_data.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/pcy_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/pcy_map.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/pcy_node.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/pcy_tree.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_addr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_admis.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_akey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_akeya.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_alt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_asid.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_bcons.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_bitst.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_conf.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_cpols.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_crld.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_enum.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_extku.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_genn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_ia5.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_info.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_int.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_ncons.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_pci.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_pcia.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_pcons.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_pku.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_pmaps.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_prn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_purp.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_skey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_sxnet.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_tlsf.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_utl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x86_64cpuid.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "engines/e_capi.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "engines/e_padlock-x86_64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "engines/e_padlock.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "fuzz/asn1.o" =>
@@ -9140,6 +8480,14 @@ our %unified_info = (
                 [
                     "include",
                 ],
+            "include/crypto/bn_conf.h" =>
+                [
+                    ".",
+                ],
+            "include/crypto/dso_conf.h" =>
+                [
+                    ".",
+                ],
             "include/openssl/opensslconf.h" =>
                 [
                     ".",
@@ -9384,7 +8732,6 @@ our %unified_info = (
                 [
                     ".",
                     "include",
-                    "crypto/include",
                 ],
             "test/asn1_string_table_test.o" =>
                 [
@@ -9710,7 +9057,6 @@ our %unified_info = (
                 [
                     ".",
                     "include",
-                    "crypto/include",
                 ],
             "test/cipher_overhead_test.o" =>
                 [
@@ -9756,7 +9102,6 @@ our %unified_info = (
             "test/ctype_internal_test.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "test/curve448_internal_test.o" =>
@@ -9822,7 +9167,6 @@ our %unified_info = (
                 [
                     "include",
                     "crypto/ec",
-                    "crypto/include",
                 ],
             "test/ecdsatest.o" =>
                 [
@@ -9847,7 +9191,6 @@ our %unified_info = (
             "test/evp_extra_test.o" =>
                 [
                     "include",
-                    "crypto/include",
                 ],
             "test/evp_test.o" =>
                 [
@@ -9945,7 +9288,6 @@ our %unified_info = (
                 [
                     ".",
                     "include",
-                    "crypto/include",
                 ],
             "test/rc2test.o" =>
                 [
@@ -9995,18 +9337,15 @@ our %unified_info = (
                 [
                     ".",
                     "include",
-                    "crypto/include",
                 ],
             "test/sm2_internal_test.o" =>
                 [
                     "include",
-                    "crypto/include",
                 ],
             "test/sm4_internal_test.o" =>
                 [
                     ".",
                     "include",
-                    "crypto/include",
                 ],
             "test/srptest.o" =>
                 [
@@ -10017,6 +9356,10 @@ our %unified_info = (
                     ".",
                     "include",
                 ],
+            "test/ssl_ctx_test.o" =>
+                [
+                    "include",
+                ],
             "test/ssl_test.o" =>
                 [
                     "include",
@@ -10080,10 +9423,6 @@ our %unified_info = (
                 [
                     "include",
                 ],
-            "test/testutil/init.o" =>
-                [
-                    "include",
-                ],
             "test/testutil/main.o" =>
                 [
                     "include",
@@ -10112,6 +9451,10 @@ our %unified_info = (
                 [
                     "include",
                 ],
+            "test/testutil/testutil_init.o" =>
+                [
+                    "include",
+                ],
             "test/threadstest.o" =>
                 [
                     "include",
@@ -10376,6 +9719,7 @@ our %unified_info = (
             "test/sm4_internal_test",
             "test/srptest",
             "test/ssl_cert_table_internal_test",
+            "test/ssl_ctx_test",
             "test/ssl_test",
             "test/ssl_test_ctx_test",
             "test/sslapitest",
@@ -15381,7 +14725,6 @@ our %unified_info = (
                     "test/testutil/cb.o",
                     "test/testutil/driver.o",
                     "test/testutil/format_output.o",
-                    "test/testutil/init.o",
                     "test/testutil/main.o",
                     "test/testutil/output_helpers.o",
                     "test/testutil/random.o",
@@ -15389,6 +14732,7 @@ our %unified_info = (
                     "test/testutil/tap_bio.o",
                     "test/testutil/test_cleanup.o",
                     "test/testutil/tests.o",
+                    "test/testutil/testutil_init.o",
                 ],
             "test/md2test" =>
                 [
@@ -15616,6 +14960,14 @@ our %unified_info = (
                 [
                     "test/ssl_cert_table_internal_test.c",
                 ],
+            "test/ssl_ctx_test" =>
+                [
+                    "test/ssl_ctx_test.o",
+                ],
+            "test/ssl_ctx_test.o" =>
+                [
+                    "test/ssl_ctx_test.c",
+                ],
             "test/ssl_test" =>
                 [
                     "test/handshake_helper.o",
@@ -15718,10 +15070,6 @@ our %unified_info = (
                 [
                     "test/testutil/format_output.c",
                 ],
-            "test/testutil/init.o" =>
-                [
-                    "test/testutil/init.c",
-                ],
             "test/testutil/main.o" =>
                 [
                     "test/testutil/main.c",
@@ -15750,6 +15098,10 @@ our %unified_info = (
                 [
                     "test/testutil/tests.c",
                 ],
+            "test/testutil/testutil_init.o" =>
+                [
+                    "test/testutil/testutil_init.c",
+                ],
             "test/threadstest" =>
                 [
                     "test/threadstest.o",
diff --git a/deps/openssl/config/archs/solaris64-x86_64-gcc/asm_avx2/crypto/aes/aes-x86_64.s b/deps/openssl/config/archs/solaris64-x86_64-gcc/asm_avx2/crypto/aes/aes-x86_64.s
deleted file mode 100644
index f0c1685fb9..0000000000
--- a/deps/openssl/config/archs/solaris64-x86_64-gcc/asm_avx2/crypto/aes/aes-x86_64.s
+++ /dev/null
@@ -1,2649 +0,0 @@
-.text	
-.type	_x86_64_AES_encrypt,@function
-.align	16
-_x86_64_AES_encrypt:
-	xorl	0(%r15),%eax
-	xorl	4(%r15),%ebx
-	xorl	8(%r15),%ecx
-	xorl	12(%r15),%edx
-
-	movl	240(%r15),%r13d
-	subl	$1,%r13d
-	jmp	.Lenc_loop
-.align	16
-.Lenc_loop:
-
-	movzbl	%al,%esi
-	movzbl	%bl,%edi
-	movzbl	%cl,%ebp
-	movl	0(%r14,%rsi,8),%r10d
-	movl	0(%r14,%rdi,8),%r11d
-	movl	0(%r14,%rbp,8),%r12d
-
-	movzbl	%bh,%esi
-	movzbl	%ch,%edi
-	movzbl	%dl,%ebp
-	xorl	3(%r14,%rsi,8),%r10d
-	xorl	3(%r14,%rdi,8),%r11d
-	movl	0(%r14,%rbp,8),%r8d
-
-	movzbl	%dh,%esi
-	shrl	$16,%ecx
-	movzbl	%ah,%ebp
-	xorl	3(%r14,%rsi,8),%r12d
-	shrl	$16,%edx
-	xorl	3(%r14,%rbp,8),%r8d
-
-	shrl	$16,%ebx
-	leaq	16(%r15),%r15
-	shrl	$16,%eax
-
-	movzbl	%cl,%esi
-	movzbl	%dl,%edi
-	movzbl	%al,%ebp
-	xorl	2(%r14,%rsi,8),%r10d
-	xorl	2(%r14,%rdi,8),%r11d
-	xorl	2(%r14,%rbp,8),%r12d
-
-	movzbl	%dh,%esi
-	movzbl	%ah,%edi
-	movzbl	%bl,%ebp
-	xorl	1(%r14,%rsi,8),%r10d
-	xorl	1(%r14,%rdi,8),%r11d
-	xorl	2(%r14,%rbp,8),%r8d
-
-	movl	12(%r15),%edx
-	movzbl	%bh,%edi
-	movzbl	%ch,%ebp
-	movl	0(%r15),%eax
-	xorl	1(%r14,%rdi,8),%r12d
-	xorl	1(%r14,%rbp,8),%r8d
-
-	movl	4(%r15),%ebx
-	movl	8(%r15),%ecx
-	xorl	%r10d,%eax
-	xorl	%r11d,%ebx
-	xorl	%r12d,%ecx
-	xorl	%r8d,%edx
-	subl	$1,%r13d
-	jnz	.Lenc_loop
-	movzbl	%al,%esi
-	movzbl	%bl,%edi
-	movzbl	%cl,%ebp
-	movzbl	2(%r14,%rsi,8),%r10d
-	movzbl	2(%r14,%rdi,8),%r11d
-	movzbl	2(%r14,%rbp,8),%r12d
-
-	movzbl	%dl,%esi
-	movzbl	%bh,%edi
-	movzbl	%ch,%ebp
-	movzbl	2(%r14,%rsi,8),%r8d
-	movl	0(%r14,%rdi,8),%edi
-	movl	0(%r14,%rbp,8),%ebp
-
-	andl	$0x0000ff00,%edi
-	andl	$0x0000ff00,%ebp
-
-	xorl	%edi,%r10d
-	xorl	%ebp,%r11d
-	shrl	$16,%ecx
-
-	movzbl	%dh,%esi
-	movzbl	%ah,%edi
-	shrl	$16,%edx
-	movl	0(%r14,%rsi,8),%esi
-	movl	0(%r14,%rdi,8),%edi
-
-	andl	$0x0000ff00,%esi
-	andl	$0x0000ff00,%edi
-	shrl	$16,%ebx
-	xorl	%esi,%r12d
-	xorl	%edi,%r8d
-	shrl	$16,%eax
-
-	movzbl	%cl,%esi
-	movzbl	%dl,%edi
-	movzbl	%al,%ebp
-	movl	0(%r14,%rsi,8),%esi
-	movl	0(%r14,%rdi,8),%edi
-	movl	0(%r14,%rbp,8),%ebp
-
-	andl	$0x00ff0000,%esi
-	andl	$0x00ff0000,%edi
-	andl	$0x00ff0000,%ebp
-
-	xorl	%esi,%r10d
-	xorl	%edi,%r11d
-	xorl	%ebp,%r12d
-
-	movzbl	%bl,%esi
-	movzbl	%dh,%edi
-	movzbl	%ah,%ebp
-	movl	0(%r14,%rsi,8),%esi
-	movl	2(%r14,%rdi,8),%edi
-	movl	2(%r14,%rbp,8),%ebp
-
-	andl	$0x00ff0000,%esi
-	andl	$0xff000000,%edi
-	andl	$0xff000000,%ebp
-
-	xorl	%esi,%r8d
-	xorl	%edi,%r10d
-	xorl	%ebp,%r11d
-
-	movzbl	%bh,%esi
-	movzbl	%ch,%edi
-	movl	16+12(%r15),%edx
-	movl	2(%r14,%rsi,8),%esi
-	movl	2(%r14,%rdi,8),%edi
-	movl	16+0(%r15),%eax
-
-	andl	$0xff000000,%esi
-	andl	$0xff000000,%edi
-
-	xorl	%esi,%r12d
-	xorl	%edi,%r8d
-
-	movl	16+4(%r15),%ebx
-	movl	16+8(%r15),%ecx
-	xorl	%r10d,%eax
-	xorl	%r11d,%ebx
-	xorl	%r12d,%ecx
-	xorl	%r8d,%edx
-.byte	0xf3,0xc3
-.size	_x86_64_AES_encrypt,.-_x86_64_AES_encrypt
-.type	_x86_64_AES_encrypt_compact,@function
-.align	16
-_x86_64_AES_encrypt_compact:
-.cfi_startproc	
-	leaq	128(%r14),%r8
-	movl	0-128(%r8),%edi
-	movl	32-128(%r8),%ebp
-	movl	64-128(%r8),%r10d
-	movl	96-128(%r8),%r11d
-	movl	128-128(%r8),%edi
-	movl	160-128(%r8),%ebp
-	movl	192-128(%r8),%r10d
-	movl	224-128(%r8),%r11d
-	jmp	.Lenc_loop_compact
-.align	16
-.Lenc_loop_compact:
-	xorl	0(%r15),%eax
-	xorl	4(%r15),%ebx
-	xorl	8(%r15),%ecx
-	xorl	12(%r15),%edx
-	leaq	16(%r15),%r15
-	movzbl	%al,%r10d
-	movzbl	%bl,%r11d
-	movzbl	%cl,%r12d
-	movzbl	%dl,%r8d
-	movzbl	%bh,%esi
-	movzbl	%ch,%edi
-	shrl	$16,%ecx
-	movzbl	%dh,%ebp
-	movzbl	(%r14,%r10,1),%r10d
-	movzbl	(%r14,%r11,1),%r11d
-	movzbl	(%r14,%r12,1),%r12d
-	movzbl	(%r14,%r8,1),%r8d
-
-	movzbl	(%r14,%rsi,1),%r9d
-	movzbl	%ah,%esi
-	movzbl	(%r14,%rdi,1),%r13d
-	movzbl	%cl,%edi
-	movzbl	(%r14,%rbp,1),%ebp
-	movzbl	(%r14,%rsi,1),%esi
-
-	shll	$8,%r9d
-	shrl	$16,%edx
-	shll	$8,%r13d
-	xorl	%r9d,%r10d
-	shrl	$16,%eax
-	movzbl	%dl,%r9d
-	shrl	$16,%ebx
-	xorl	%r13d,%r11d
-	shll	$8,%ebp
-	movzbl	%al,%r13d
-	movzbl	(%r14,%rdi,1),%edi
-	xorl	%ebp,%r12d
-
-	shll	$8,%esi
-	movzbl	%bl,%ebp
-	shll	$16,%edi
-	xorl	%esi,%r8d
-	movzbl	(%r14,%r9,1),%r9d
-	movzbl	%dh,%esi
-	movzbl	(%r14,%r13,1),%r13d
-	xorl	%edi,%r10d
-
-	shrl	$8,%ecx
-	movzbl	%ah,%edi
-	shll	$16,%r9d
-	shrl	$8,%ebx
-	shll	$16,%r13d
-	xorl	%r9d,%r11d
-	movzbl	(%r14,%rbp,1),%ebp
-	movzbl	(%r14,%rsi,1),%esi
-	movzbl	(%r14,%rdi,1),%edi
-	movzbl	(%r14,%rcx,1),%edx
-	movzbl	(%r14,%rbx,1),%ecx
-
-	shll	$16,%ebp
-	xorl	%r13d,%r12d
-	shll	$24,%esi
-	xorl	%ebp,%r8d
-	shll	$24,%edi
-	xorl	%esi,%r10d
-	shll	$24,%edx
-	xorl	%edi,%r11d
-	shll	$24,%ecx
-	movl	%r10d,%eax
-	movl	%r11d,%ebx
-	xorl	%r12d,%ecx
-	xorl	%r8d,%edx
-	cmpq	16(%rsp),%r15
-	je	.Lenc_compact_done
-	movl	$0x80808080,%r10d
-	movl	$0x80808080,%r11d
-	andl	%eax,%r10d
-	andl	%ebx,%r11d
-	movl	%r10d,%esi
-	movl	%r11d,%edi
-	shrl	$7,%r10d
-	leal	(%rax,%rax,1),%r8d
-	shrl	$7,%r11d
-	leal	(%rbx,%rbx,1),%r9d
-	subl	%r10d,%esi
-	subl	%r11d,%edi
-	andl	$0xfefefefe,%r8d
-	andl	$0xfefefefe,%r9d
-	andl	$0x1b1b1b1b,%esi
-	andl	$0x1b1b1b1b,%edi
-	movl	%eax,%r10d
-	movl	%ebx,%r11d
-	xorl	%esi,%r8d
-	xorl	%edi,%r9d
-
-	xorl	%r8d,%eax
-	xorl	%r9d,%ebx
-	movl	$0x80808080,%r12d
-	roll	$24,%eax
-	movl	$0x80808080,%ebp
-	roll	$24,%ebx
-	andl	%ecx,%r12d
-	andl	%edx,%ebp
-	xorl	%r8d,%eax
-	xorl	%r9d,%ebx
-	movl	%r12d,%esi
-	rorl	$16,%r10d
-	movl	%ebp,%edi
-	rorl	$16,%r11d
-	leal	(%rcx,%rcx,1),%r8d
-	shrl	$7,%r12d
-	xorl	%r10d,%eax
-	shrl	$7,%ebp
-	xorl	%r11d,%ebx
-	rorl	$8,%r10d
-	leal	(%rdx,%rdx,1),%r9d
-	rorl	$8,%r11d
-	subl	%r12d,%esi
-	subl	%ebp,%edi
-	xorl	%r10d,%eax
-	xorl	%r11d,%ebx
-
-	andl	$0xfefefefe,%r8d
-	andl	$0xfefefefe,%r9d
-	andl	$0x1b1b1b1b,%esi
-	andl	$0x1b1b1b1b,%edi
-	movl	%ecx,%r12d
-	movl	%edx,%ebp
-	xorl	%esi,%r8d
-	xorl	%edi,%r9d
-
-	rorl	$16,%r12d
-	xorl	%r8d,%ecx
-	rorl	$16,%ebp
-	xorl	%r9d,%edx
-	roll	$24,%ecx
-	movl	0(%r14),%esi
-	roll	$24,%edx
-	xorl	%r8d,%ecx
-	movl	64(%r14),%edi
-	xorl	%r9d,%edx
-	movl	128(%r14),%r8d
-	xorl	%r12d,%ecx
-	rorl	$8,%r12d
-	xorl	%ebp,%edx
-	rorl	$8,%ebp
-	xorl	%r12d,%ecx
-	movl	192(%r14),%r9d
-	xorl	%ebp,%edx
-	jmp	.Lenc_loop_compact
-.align	16
-.Lenc_compact_done:
-	xorl	0(%r15),%eax
-	xorl	4(%r15),%ebx
-	xorl	8(%r15),%ecx
-	xorl	12(%r15),%edx
-.byte	0xf3,0xc3
-.cfi_endproc	
-.size	_x86_64_AES_encrypt_compact,.-_x86_64_AES_encrypt_compact
-.globl	AES_encrypt
-.type	AES_encrypt,@function
-.align	16
-.globl	asm_AES_encrypt
-.hidden	asm_AES_encrypt
-asm_AES_encrypt:
-AES_encrypt:
-.cfi_startproc	
-	movq	%rsp,%rax
-.cfi_def_cfa_register	%rax
-	pushq	%rbx
-.cfi_offset	%rbx,-16
-	pushq	%rbp
-.cfi_offset	%rbp,-24
-	pushq	%r12
-.cfi_offset	%r12,-32
-	pushq	%r13
-.cfi_offset	%r13,-40
-	pushq	%r14
-.cfi_offset	%r14,-48
-	pushq	%r15
-.cfi_offset	%r15,-56
-
-
-	leaq	-63(%rdx),%rcx
-	andq	$-64,%rsp
-	subq	%rsp,%rcx
-	negq	%rcx
-	andq	$0x3c0,%rcx
-	subq	%rcx,%rsp
-	subq	$32,%rsp
-
-	movq	%rsi,16(%rsp)
-	movq	%rax,24(%rsp)
-.cfi_escape	0x0f,0x05,0x77,0x18,0x06,0x23,0x08
-.Lenc_prologue:
-
-	movq	%rdx,%r15
-	movl	240(%r15),%r13d
-
-	movl	0(%rdi),%eax
-	movl	4(%rdi),%ebx
-	movl	8(%rdi),%ecx
-	movl	12(%rdi),%edx
-
-	shll	$4,%r13d
-	leaq	(%r15,%r13,1),%rbp
-	movq	%r15,(%rsp)
-	movq	%rbp,8(%rsp)
-
-
-	leaq	.LAES_Te+2048(%rip),%r14
-	leaq	768(%rsp),%rbp
-	subq	%r14,%rbp
-	andq	$0x300,%rbp
-	leaq	(%r14,%rbp,1),%r14
-
-	call	_x86_64_AES_encrypt_compact
-
-	movq	16(%rsp),%r9
-	movq	24(%rsp),%rsi
-.cfi_def_cfa	%rsi,8
-	movl	%eax,0(%r9)
-	movl	%ebx,4(%r9)
-	movl	%ecx,8(%r9)
-	movl	%edx,12(%r9)
-
-	movq	-48(%rsi),%r15
-.cfi_restore	%r15
-	movq	-40(%rsi),%r14
-.cfi_restore	%r14
-	movq	-32(%rsi),%r13
-.cfi_restore	%r13
-	movq	-24(%rsi),%r12
-.cfi_restore	%r12
-	movq	-16(%rsi),%rbp
-.cfi_restore	%rbp
-	movq	-8(%rsi),%rbx
-.cfi_restore	%rbx
-	leaq	(%rsi),%rsp
-.cfi_def_cfa_register	%rsp
-.Lenc_epilogue:
-	.byte	0xf3,0xc3
-.cfi_endproc	
-.size	AES_encrypt,.-AES_encrypt
-.type	_x86_64_AES_decrypt,@function
-.align	16
-_x86_64_AES_decrypt:
-	xorl	0(%r15),%eax
-	xorl	4(%r15),%ebx
-	xorl	8(%r15),%ecx
-	xorl	12(%r15),%edx
-
-	movl	240(%r15),%r13d
-	subl	$1,%r13d
-	jmp	.Ldec_loop
-.align	16
-.Ldec_loop:
-
-	movzbl	%al,%esi
-	movzbl	%bl,%edi
-	movzbl	%cl,%ebp
-	movl	0(%r14,%rsi,8),%r10d
-	movl	0(%r14,%rdi,8),%r11d
-	movl	0(%r14,%rbp,8),%r12d
-
-	movzbl	%dh,%esi
-	movzbl	%ah,%edi
-	movzbl	%dl,%ebp
-	xorl	3(%r14,%rsi,8),%r10d
-	xorl	3(%r14,%rdi,8),%r11d
-	movl	0(%r14,%rbp,8),%r8d
-
-	movzbl	%bh,%esi
-	shrl	$16,%eax
-	movzbl	%ch,%ebp
-	xorl	3(%r14,%rsi,8),%r12d
-	shrl	$16,%edx
-	xorl	3(%r14,%rbp,8),%r8d
-
-	shrl	$16,%ebx
-	leaq	16(%r15),%r15
-	shrl	$16,%ecx
-
-	movzbl	%cl,%esi
-	movzbl	%dl,%edi
-	movzbl	%al,%ebp
-	xorl	2(%r14,%rsi,8),%r10d
-	xorl	2(%r14,%rdi,8),%r11d
-	xorl	2(%r14,%rbp,8),%r12d
-
-	movzbl	%bh,%esi
-	movzbl	%ch,%edi
-	movzbl	%bl,%ebp
-	xorl	1(%r14,%rsi,8),%r10d
-	xorl	1(%r14,%rdi,8),%r11d
-	xorl	2(%r14,%rbp,8),%r8d
-
-	movzbl	%dh,%esi
-	movl	12(%r15),%edx
-	movzbl	%ah,%ebp
-	xorl	1(%r14,%rsi,8),%r12d
-	movl	0(%r15),%eax
-	xorl	1(%r14,%rbp,8),%r8d
-
-	xorl	%r10d,%eax
-	movl	4(%r15),%ebx
-	movl	8(%r15),%ecx
-	xorl	%r12d,%ecx
-	xorl	%r11d,%ebx
-	xorl	%r8d,%edx
-	subl	$1,%r13d
-	jnz	.Ldec_loop
-	leaq	2048(%r14),%r14
-	movzbl	%al,%esi
-	movzbl	%bl,%edi
-	movzbl	%cl,%ebp
-	movzbl	(%r14,%rsi,1),%r10d
-	movzbl	(%r14,%rdi,1),%r11d
-	movzbl	(%r14,%rbp,1),%r12d
-
-	movzbl	%dl,%esi
-	movzbl	%dh,%edi
-	movzbl	%ah,%ebp
-	movzbl	(%r14,%rsi,1),%r8d
-	movzbl	(%r14,%rdi,1),%edi
-	movzbl	(%r14,%rbp,1),%ebp
-
-	shll	$8,%edi
-	shll	$8,%ebp
-
-	xorl	%edi,%r10d
-	xorl	%ebp,%r11d
-	shrl	$16,%edx
-
-	movzbl	%bh,%esi
-	movzbl	%ch,%edi
-	shrl	$16,%eax
-	movzbl	(%r14,%rsi,1),%esi
-	movzbl	(%r14,%rdi,1),%edi
-
-	shll	$8,%esi
-	shll	$8,%edi
-	shrl	$16,%ebx
-	xorl	%esi,%r12d
-	xorl	%edi,%r8d
-	shrl	$16,%ecx
-
-	movzbl	%cl,%esi
-	movzbl	%dl,%edi
-	movzbl	%al,%ebp
-	movzbl	(%r14,%rsi,1),%esi
-	movzbl	(%r14,%rdi,1),%edi
-	movzbl	(%r14,%rbp,1),%ebp
-
-	shll	$16,%esi
-	shll	$16,%edi
-	shll	$16,%ebp
-
-	xorl	%esi,%r10d
-	xorl	%edi,%r11d
-	xorl	%ebp,%r12d
-
-	movzbl	%bl,%esi
-	movzbl	%bh,%edi
-	movzbl	%ch,%ebp
-	movzbl	(%r14,%rsi,1),%esi
-	movzbl	(%r14,%rdi,1),%edi
-	movzbl	(%r14,%rbp,1),%ebp
-
-	shll	$16,%esi
-	shll	$24,%edi
-	shll	$24,%ebp
-
-	xorl	%esi,%r8d
-	xorl	%edi,%r10d
-	xorl	%ebp,%r11d
-
-	movzbl	%dh,%esi
-	movzbl	%ah,%edi
-	movl	16+12(%r15),%edx
-	movzbl	(%r14,%rsi,1),%esi
-	movzbl	(%r14,%rdi,1),%edi
-	movl	16+0(%r15),%eax
-
-	shll	$24,%esi
-	shll	$24,%edi
-
-	xorl	%esi,%r12d
-	xorl	%edi,%r8d
-
-	movl	16+4(%r15),%ebx
-	movl	16+8(%r15),%ecx
-	leaq	-2048(%r14),%r14
-	xorl	%r10d,%eax
-	xorl	%r11d,%ebx
-	xorl	%r12d,%ecx
-	xorl	%r8d,%edx
-.byte	0xf3,0xc3
-.size	_x86_64_AES_decrypt,.-_x86_64_AES_decrypt
-.type	_x86_64_AES_decrypt_compact,@function
-.align	16
-_x86_64_AES_decrypt_compact:
-.cfi_startproc	
-	leaq	128(%r14),%r8
-	movl	0-128(%r8),%edi
-	movl	32-128(%r8),%ebp
-	movl	64-128(%r8),%r10d
-	movl	96-128(%r8),%r11d
-	movl	128-128(%r8),%edi
-	movl	160-128(%r8),%ebp
-	movl	192-128(%r8),%r10d
-	movl	224-128(%r8),%r11d
-	jmp	.Ldec_loop_compact
-
-.align	16
-.Ldec_loop_compact:
-	xorl	0(%r15),%eax
-	xorl	4(%r15),%ebx
-	xorl	8(%r15),%ecx
-	xorl	12(%r15),%edx
-	leaq	16(%r15),%r15
-	movzbl	%al,%r10d
-	movzbl	%bl,%r11d
-	movzbl	%cl,%r12d
-	movzbl	%dl,%r8d
-	movzbl	%dh,%esi
-	movzbl	%ah,%edi
-	shrl	$16,%edx
-	movzbl	%bh,%ebp
-	movzbl	(%r14,%r10,1),%r10d
-	movzbl	(%r14,%r11,1),%r11d
-	movzbl	(%r14,%r12,1),%r12d
-	movzbl	(%r14,%r8,1),%r8d
-
-	movzbl	(%r14,%rsi,1),%r9d
-	movzbl	%ch,%esi
-	movzbl	(%r14,%rdi,1),%r13d
-	movzbl	(%r14,%rbp,1),%ebp
-	movzbl	(%r14,%rsi,1),%esi
-
-	shrl	$16,%ecx
-	shll	$8,%r13d
-	shll	$8,%r9d
-	movzbl	%cl,%edi
-	shrl	$16,%eax
-	xorl	%r9d,%r10d
-	shrl	$16,%ebx
-	movzbl	%dl,%r9d
-
-	shll	$8,%ebp
-	xorl	%r13d,%r11d
-	shll	$8,%esi
-	movzbl	%al,%r13d
-	movzbl	(%r14,%rdi,1),%edi
-	xorl	%ebp,%r12d
-	movzbl	%bl,%ebp
-
-	shll	$16,%edi
-	xorl	%esi,%r8d
-	movzbl	(%r14,%r9,1),%r9d
-	movzbl	%bh,%esi
-	movzbl	(%r14,%rbp,1),%ebp
-	xorl	%edi,%r10d
-	movzbl	(%r14,%r13,1),%r13d
-	movzbl	%ch,%edi
-
-	shll	$16,%ebp
-	shll	$16,%r9d
-	shll	$16,%r13d
-	xorl	%ebp,%r8d
-	movzbl	%dh,%ebp
-	xorl	%r9d,%r11d
-	shrl	$8,%eax
-	xorl	%r13d,%r12d
-
-	movzbl	(%r14,%rsi,1),%esi
-	movzbl	(%r14,%rdi,1),%ebx
-	movzbl	(%r14,%rbp,1),%ecx
-	movzbl	(%r14,%rax,1),%edx
-
-	movl	%r10d,%eax
-	shll	$24,%esi
-	shll	$24,%ebx
-	shll	$24,%ecx
-	xorl	%esi,%eax
-	shll	$24,%edx
-	xorl	%r11d,%ebx
-	xorl	%r12d,%ecx
-	xorl	%r8d,%edx
-	cmpq	16(%rsp),%r15
-	je	.Ldec_compact_done
-
-	movq	256+0(%r14),%rsi
-	shlq	$32,%rbx
-	shlq	$32,%rdx
-	movq	256+8(%r14),%rdi
-	orq	%rbx,%rax
-	orq	%rdx,%rcx
-	movq	256+16(%r14),%rbp
-	movq	%rsi,%r9
-	movq	%rsi,%r12
-	andq	%rax,%r9
-	andq	%rcx,%r12
-	movq	%r9,%rbx
-	movq	%r12,%rdx
-	shrq	$7,%r9
-	leaq	(%rax,%rax,1),%r8
-	shrq	$7,%r12
-	leaq	(%rcx,%rcx,1),%r11
-	subq	%r9,%rbx
-	subq	%r12,%rdx
-	andq	%rdi,%r8
-	andq	%rdi,%r11
-	andq	%rbp,%rbx
-	andq	%rbp,%rdx
-	xorq	%rbx,%r8
-	xorq	%rdx,%r11
-	movq	%rsi,%r10
-	movq	%rsi,%r13
-
-	andq	%r8,%r10
-	andq	%r11,%r13
-	movq	%r10,%rbx
-	movq	%r13,%rdx
-	shrq	$7,%r10
-	leaq	(%r8,%r8,1),%r9
-	shrq	$7,%r13
-	leaq	(%r11,%r11,1),%r12
-	subq	%r10,%rbx
-	subq	%r13,%rdx
-	andq	%rdi,%r9
-	andq	%rdi,%r12
-	andq	%rbp,%rbx
-	andq	%rbp,%rdx
-	xorq	%rbx,%r9
-	xorq	%rdx,%r12
-	movq	%rsi,%r10
-	movq	%rsi,%r13
-
-	andq	%r9,%r10
-	andq	%r12,%r13
-	movq	%r10,%rbx
-	movq	%r13,%rdx
-	shrq	$7,%r10
-	xorq	%rax,%r8
-	shrq	$7,%r13
-	xorq	%rcx,%r11
-	subq	%r10,%rbx
-	subq	%r13,%rdx
-	leaq	(%r9,%r9,1),%r10
-	leaq	(%r12,%r12,1),%r13
-	xorq	%rax,%r9
-	xorq	%rcx,%r12
-	andq	%rdi,%r10
-	andq	%rdi,%r13
-	andq	%rbp,%rbx
-	andq	%rbp,%rdx
-	xorq	%rbx,%r10
-	xorq	%rdx,%r13
-
-	xorq	%r10,%rax
-	xorq	%r13,%rcx
-	xorq	%r10,%r8
-	xorq	%r13,%r11
-	movq	%rax,%rbx
-	movq	%rcx,%rdx
-	xorq	%r10,%r9
-	shrq	$32,%rbx
-	xorq	%r13,%r12
-	shrq	$32,%rdx
-	xorq	%r8,%r10
-	roll	$8,%eax
-	xorq	%r11,%r13
-	roll	$8,%ecx
-	xorq	%r9,%r10
-	roll	$8,%ebx
-	xorq	%r12,%r13
-
-	roll	$8,%edx
-	xorl	%r10d,%eax
-	shrq	$32,%r10
-	xorl	%r13d,%ecx
-	shrq	$32,%r13
-	xorl	%r10d,%ebx
-	xorl	%r13d,%edx
-
-	movq	%r8,%r10
-	roll	$24,%r8d
-	movq	%r11,%r13
-	roll	$24,%r11d
-	shrq	$32,%r10
-	xorl	%r8d,%eax
-	shrq	$32,%r13
-	xorl	%r11d,%ecx
-	roll	$24,%r10d
-	movq	%r9,%r8
-	roll	$24,%r13d
-	movq	%r12,%r11
-	shrq	$32,%r8
-	xorl	%r10d,%ebx
-	shrq	$32,%r11
-	xorl	%r13d,%edx
-
-	movq	0(%r14),%rsi
-	roll	$16,%r9d
-	movq	64(%r14),%rdi
-	roll	$16,%r12d
-	movq	128(%r14),%rbp
-	roll	$16,%r8d
-	movq	192(%r14),%r10
-	xorl	%r9d,%eax
-	roll	$16,%r11d
-	xorl	%r12d,%ecx
-	movq	256(%r14),%r13
-	xorl	%r8d,%ebx
-	xorl	%r11d,%edx
-	jmp	.Ldec_loop_compact
-.align	16
-.Ldec_compact_done:
-	xorl	0(%r15),%eax
-	xorl	4(%r15),%ebx
-	xorl	8(%r15),%ecx
-	xorl	12(%r15),%edx
-.byte	0xf3,0xc3
-.cfi_endproc	
-.size	_x86_64_AES_decrypt_compact,.-_x86_64_AES_decrypt_compact
-.globl	AES_decrypt
-.type	AES_decrypt,@function
-.align	16
-.globl	asm_AES_decrypt
-.hidden	asm_AES_decrypt
-asm_AES_decrypt:
-AES_decrypt:
-.cfi_startproc	
-	movq	%rsp,%rax
-.cfi_def_cfa_register	%rax
-	pushq	%rbx
-.cfi_offset	%rbx,-16
-	pushq	%rbp
-.cfi_offset	%rbp,-24
-	pushq	%r12
-.cfi_offset	%r12,-32
-	pushq	%r13
-.cfi_offset	%r13,-40
-	pushq	%r14
-.cfi_offset	%r14,-48
-	pushq	%r15
-.cfi_offset	%r15,-56
-
-
-	leaq	-63(%rdx),%rcx
-	andq	$-64,%rsp
-	subq	%rsp,%rcx
-	negq	%rcx
-	andq	$0x3c0,%rcx
-	subq	%rcx,%rsp
-	subq	$32,%rsp
-
-	movq	%rsi,16(%rsp)
-	movq	%rax,24(%rsp)
-.cfi_escape	0x0f,0x05,0x77,0x18,0x06,0x23,0x08
-.Ldec_prologue:
-
-	movq	%rdx,%r15
-	movl	240(%r15),%r13d
-
-	movl	0(%rdi),%eax
-	movl	4(%rdi),%ebx
-	movl	8(%rdi),%ecx
-	movl	12(%rdi),%edx
-
-	shll	$4,%r13d
-	leaq	(%r15,%r13,1),%rbp
-	movq	%r15,(%rsp)
-	movq	%rbp,8(%rsp)
-
-
-	leaq	.LAES_Td+2048(%rip),%r14
-	leaq	768(%rsp),%rbp
-	subq	%r14,%rbp
-	andq	$0x300,%rbp
-	leaq	(%r14,%rbp,1),%r14
-	shrq	$3,%rbp
-	addq	%rbp,%r14
-
-	call	_x86_64_AES_decrypt_compact
-
-	movq	16(%rsp),%r9
-	movq	24(%rsp),%rsi
-.cfi_def_cfa	%rsi,8
-	movl	%eax,0(%r9)
-	movl	%ebx,4(%r9)
-	movl	%ecx,8(%r9)
-	movl	%edx,12(%r9)
-
-	movq	-48(%rsi),%r15
-.cfi_restore	%r15
-	movq	-40(%rsi),%r14
-.cfi_restore	%r14
-	movq	-32(%rsi),%r13
-.cfi_restore	%r13
-	movq	-24(%rsi),%r12
-.cfi_restore	%r12
-	movq	-16(%rsi),%rbp
-.cfi_restore	%rbp
-	movq	-8(%rsi),%rbx
-.cfi_restore	%rbx
-	leaq	(%rsi),%rsp
-.cfi_def_cfa_register	%rsp
-.Ldec_epilogue:
-	.byte	0xf3,0xc3
-.cfi_endproc	
-.size	AES_decrypt,.-AES_decrypt
-.globl	AES_set_encrypt_key
-.type	AES_set_encrypt_key,@function
-.align	16
-AES_set_encrypt_key:
-.cfi_startproc	
-	pushq	%rbx
-.cfi_adjust_cfa_offset	8
-.cfi_offset	%rbx,-16
-	pushq	%rbp
-.cfi_adjust_cfa_offset	8
-.cfi_offset	%rbp,-24
-	pushq	%r12
-.cfi_adjust_cfa_offset	8
-.cfi_offset	%r12,-32
-	pushq	%r13
-.cfi_adjust_cfa_offset	8
-.cfi_offset	%r13,-40
-	pushq	%r14
-.cfi_adjust_cfa_offset	8
-.cfi_offset	%r14,-48
-	pushq	%r15
-.cfi_adjust_cfa_offset	8
-.cfi_offset	%r15,-56
-	subq	$8,%rsp
-.cfi_adjust_cfa_offset	8
-.Lenc_key_prologue:
-
-	call	_x86_64_AES_set_encrypt_key
-
-	movq	40(%rsp),%rbp
-.cfi_restore	%rbp
-	movq	48(%rsp),%rbx
-.cfi_restore	%rbx
-	addq	$56,%rsp
-.cfi_adjust_cfa_offset	-56
-.Lenc_key_epilogue:
-	.byte	0xf3,0xc3
-.cfi_endproc	
-.size	AES_set_encrypt_key,.-AES_set_encrypt_key
-
-.type	_x86_64_AES_set_encrypt_key,@function
-.align	16
-_x86_64_AES_set_encrypt_key:
-.cfi_startproc	
-	movl	%esi,%ecx
-	movq	%rdi,%rsi
-	movq	%rdx,%rdi
-
-	testq	$-1,%rsi
-	jz	.Lbadpointer
-	testq	$-1,%rdi
-	jz	.Lbadpointer
-
-	leaq	.LAES_Te(%rip),%rbp
-	leaq	2048+128(%rbp),%rbp
-
-
-	movl	0-128(%rbp),%eax
-	movl	32-128(%rbp),%ebx
-	movl	64-128(%rbp),%r8d
-	movl	96-128(%rbp),%edx
-	movl	128-128(%rbp),%eax
-	movl	160-128(%rbp),%ebx
-	movl	192-128(%rbp),%r8d
-	movl	224-128(%rbp),%edx
-
-	cmpl	$128,%ecx
-	je	.L10rounds
-	cmpl	$192,%ecx
-	je	.L12rounds
-	cmpl	$256,%ecx
-	je	.L14rounds
-	movq	$-2,%rax
-	jmp	.Lexit
-
-.L10rounds:
-	movq	0(%rsi),%rax
-	movq	8(%rsi),%rdx
-	movq	%rax,0(%rdi)
-	movq	%rdx,8(%rdi)
-
-	shrq	$32,%rdx
-	xorl	%ecx,%ecx
-	jmp	.L10shortcut
-.align	4
-.L10loop:
-	movl	0(%rdi),%eax
-	movl	12(%rdi),%edx
-.L10shortcut:
-	movzbl	%dl,%esi
-	movzbl	-128(%rbp,%rsi,1),%ebx
-	movzbl	%dh,%esi
-	shll	$24,%ebx
-	xorl	%ebx,%eax
-
-	movzbl	-128(%rbp,%rsi,1),%ebx
-	shrl	$16,%edx
-	movzbl	%dl,%esi
-	xorl	%ebx,%eax
-
-	movzbl	-128(%rbp,%rsi,1),%ebx
-	movzbl	%dh,%esi
-	shll	$8,%ebx
-	xorl	%ebx,%eax
-
-	movzbl	-128(%rbp,%rsi,1),%ebx
-	shll	$16,%ebx
-	xorl	%ebx,%eax
-
-	xorl	1024-128(%rbp,%rcx,4),%eax
-	movl	%eax,16(%rdi)
-	xorl	4(%rdi),%eax
-	movl	%eax,20(%rdi)
-	xorl	8(%rdi),%eax
-	movl	%eax,24(%rdi)
-	xorl	12(%rdi),%eax
-	movl	%eax,28(%rdi)
-	addl	$1,%ecx
-	leaq	16(%rdi),%rdi
-	cmpl	$10,%ecx
-	jl	.L10loop
-
-	movl	$10,80(%rdi)
-	xorq	%rax,%rax
-	jmp	.Lexit
-
-.L12rounds:
-	movq	0(%rsi),%rax
-	movq	8(%rsi),%rbx
-	movq	16(%rsi),%rdx
-	movq	%rax,0(%rdi)
-	movq	%rbx,8(%rdi)
-	movq	%rdx,16(%rdi)
-
-	shrq	$32,%rdx
-	xorl	%ecx,%ecx
-	jmp	.L12shortcut
-.align	4
-.L12loop:
-	movl	0(%rdi),%eax
-	movl	20(%rdi),%edx
-.L12shortcut:
-	movzbl	%dl,%esi
-	movzbl	-128(%rbp,%rsi,1),%ebx
-	movzbl	%dh,%esi
-	shll	$24,%ebx
-	xorl	%ebx,%eax
-
-	movzbl	-128(%rbp,%rsi,1),%ebx
-	shrl	$16,%edx
-	movzbl	%dl,%esi
-	xorl	%ebx,%eax
-
-	movzbl	-128(%rbp,%rsi,1),%ebx
-	movzbl	%dh,%esi
-	shll	$8,%ebx
-	xorl	%ebx,%eax
-
-	movzbl	-128(%rbp,%rsi,1),%ebx
-	shll	$16,%ebx
-	xorl	%ebx,%eax
-
-	xorl	1024-128(%rbp,%rcx,4),%eax
-	movl	%eax,24(%rdi)
-	xorl	4(%rdi),%eax
-	movl	%eax,28(%rdi)
-	xorl	8(%rdi),%eax
-	movl	%eax,32(%rdi)
-	xorl	12(%rdi),%eax
-	movl	%eax,36(%rdi)
-
-	cmpl	$7,%ecx
-	je	.L12break
-	addl	$1,%ecx
-
-	xorl	16(%rdi),%eax
-	movl	%eax,40(%rdi)
-	xorl	20(%rdi),%eax
-	movl	%eax,44(%rdi)
-
-	leaq	24(%rdi),%rdi
-	jmp	.L12loop
-.L12break:
-	movl	$12,72(%rdi)
-	xorq	%rax,%rax
-	jmp	.Lexit
-
-.L14rounds:
-	movq	0(%rsi),%rax
-	movq	8(%rsi),%rbx
-	movq	16(%rsi),%rcx
-	movq	24(%rsi),%rdx
-	movq	%rax,0(%rdi)
-	movq	%rbx,8(%rdi)
-	movq	%rcx,16(%rdi)
-	movq	%rdx,24(%rdi)
-
-	shrq	$32,%rdx
-	xorl	%ecx,%ecx
-	jmp	.L14shortcut
-.align	4
-.L14loop:
-	movl	0(%rdi),%eax
-	movl	28(%rdi),%edx
-.L14shortcut:
-	movzbl	%dl,%esi
-	movzbl	-128(%rbp,%rsi,1),%ebx
-	movzbl	%dh,%esi
-	shll	$24,%ebx
-	xorl	%ebx,%eax
-
-	movzbl	-128(%rbp,%rsi,1),%ebx
-	shrl	$16,%edx
-	movzbl	%dl,%esi
-	xorl	%ebx,%eax
-
-	movzbl	-128(%rbp,%rsi,1),%ebx
-	movzbl	%dh,%esi
-	shll	$8,%ebx
-	xorl	%ebx,%eax
-
-	movzbl	-128(%rbp,%rsi,1),%ebx
-	shll	$16,%ebx
-	xorl	%ebx,%eax
-
-	xorl	1024-128(%rbp,%rcx,4),%eax
-	movl	%eax,32(%rdi)
-	xorl	4(%rdi),%eax
-	movl	%eax,36(%rdi)
-	xorl	8(%rdi),%eax
-	movl	%eax,40(%rdi)
-	xorl	12(%rdi),%eax
-	movl	%eax,44(%rdi)
-
-	cmpl	$6,%ecx
-	je	.L14break
-	addl	$1,%ecx
-
-	movl	%eax,%edx
-	movl	16(%rdi),%eax
-	movzbl	%dl,%esi
-	movzbl	-128(%rbp,%rsi,1),%ebx
-	movzbl	%dh,%esi
-	xorl	%ebx,%eax
-
-	movzbl	-128(%rbp,%rsi,1),%ebx
-	shrl	$16,%edx
-	shll	$8,%ebx
-	movzbl	%dl,%esi
-	xorl	%ebx,%eax
-
-	movzbl	-128(%rbp,%rsi,1),%ebx
-	movzbl	%dh,%esi
-	shll	$16,%ebx
-	xorl	%ebx,%eax
-
-	movzbl	-128(%rbp,%rsi,1),%ebx
-	shll	$24,%ebx
-	xorl	%ebx,%eax
-
-	movl	%eax,48(%rdi)
-	xorl	20(%rdi),%eax
-	movl	%eax,52(%rdi)
-	xorl	24(%rdi),%eax
-	movl	%eax,56(%rdi)
-	xorl	28(%rdi),%eax
-	movl	%eax,60(%rdi)
-
-	leaq	32(%rdi),%rdi
-	jmp	.L14loop
-.L14break:
-	movl	$14,48(%rdi)
-	xorq	%rax,%rax
-	jmp	.Lexit
-
-.Lbadpointer:
-	movq	$-1,%rax
-.Lexit:
-.byte	0xf3,0xc3
-.cfi_endproc	
-.size	_x86_64_AES_set_encrypt_key,.-_x86_64_AES_set_encrypt_key
-.globl	AES_set_decrypt_key
-.type	AES_set_decrypt_key,@function
-.align	16
-AES_set_decrypt_key:
-.cfi_startproc	
-	pushq	%rbx
-.cfi_adjust_cfa_offset	8
-.cfi_offset	%rbx,-16
-	pushq	%rbp
-.cfi_adjust_cfa_offset	8
-.cfi_offset	%rbp,-24
-	pushq	%r12
-.cfi_adjust_cfa_offset	8
-.cfi_offset	%r12,-32
-	pushq	%r13
-.cfi_adjust_cfa_offset	8
-.cfi_offset	%r13,-40
-	pushq	%r14
-.cfi_adjust_cfa_offset	8
-.cfi_offset	%r14,-48
-	pushq	%r15
-.cfi_adjust_cfa_offset	8
-.cfi_offset	%r15,-56
-	pushq	%rdx
-.cfi_adjust_cfa_offset	8
-.Ldec_key_prologue:
-
-	call	_x86_64_AES_set_encrypt_key
-	movq	(%rsp),%r8
-	cmpl	$0,%eax
-	jne	.Labort
-
-	movl	240(%r8),%r14d
-	xorq	%rdi,%rdi
-	leaq	(%rdi,%r14,4),%rcx
-	movq	%r8,%rsi
-	leaq	(%r8,%rcx,4),%rdi
-.align	4
-.Linvert:
-	movq	0(%rsi),%rax
-	movq	8(%rsi),%rbx
-	movq	0(%rdi),%rcx
-	movq	8(%rdi),%rdx
-	movq	%rax,0(%rdi)
-	movq	%rbx,8(%rdi)
-	movq	%rcx,0(%rsi)
-	movq	%rdx,8(%rsi)
-	leaq	16(%rsi),%rsi
-	leaq	-16(%rdi),%rdi
-	cmpq	%rsi,%rdi
-	jne	.Linvert
-
-	leaq	.LAES_Te+2048+1024(%rip),%rax
-
-	movq	40(%rax),%rsi
-	movq	48(%rax),%rdi
-	movq	56(%rax),%rbp
-
-	movq	%r8,%r15
-	subl	$1,%r14d
-.align	4
-.Lpermute:
-	leaq	16(%r15),%r15
-	movq	0(%r15),%rax
-	movq	8(%r15),%rcx
-	movq	%rsi,%r9
-	movq	%rsi,%r12
-	andq	%rax,%r9
-	andq	%rcx,%r12
-	movq	%r9,%rbx
-	movq	%r12,%rdx
-	shrq	$7,%r9
-	leaq	(%rax,%rax,1),%r8
-	shrq	$7,%r12
-	leaq	(%rcx,%rcx,1),%r11
-	subq	%r9,%rbx
-	subq	%r12,%rdx
-	andq	%rdi,%r8
-	andq	%rdi,%r11
-	andq	%rbp,%rbx
-	andq	%rbp,%rdx
-	xorq	%rbx,%r8
-	xorq	%rdx,%r11
-	movq	%rsi,%r10
-	movq	%rsi,%r13
-
-	andq	%r8,%r10
-	andq	%r11,%r13
-	movq	%r10,%rbx
-	movq	%r13,%rdx
-	shrq	$7,%r10
-	leaq	(%r8,%r8,1),%r9
-	shrq	$7,%r13
-	leaq	(%r11,%r11,1),%r12
-	subq	%r10,%rbx
-	subq	%r13,%rdx
-	andq	%rdi,%r9
-	andq	%rdi,%r12
-	andq	%rbp,%rbx
-	andq	%rbp,%rdx
-	xorq	%rbx,%r9
-	xorq	%rdx,%r12
-	movq	%rsi,%r10
-	movq	%rsi,%r13
-
-	andq	%r9,%r10
-	andq	%r12,%r13
-	movq	%r10,%rbx
-	movq	%r13,%rdx
-	shrq	$7,%r10
-	xorq	%rax,%r8
-	shrq	$7,%r13
-	xorq	%rcx,%r11
-	subq	%r10,%rbx
-	subq	%r13,%rdx
-	leaq	(%r9,%r9,1),%r10
-	leaq	(%r12,%r12,1),%r13
-	xorq	%rax,%r9
-	xorq	%rcx,%r12
-	andq	%rdi,%r10
-	andq	%rdi,%r13
-	andq	%rbp,%rbx
-	andq	%rbp,%rdx
-	xorq	%rbx,%r10
-	xorq	%rdx,%r13
-
-	xorq	%r10,%rax
-	xorq	%r13,%rcx
-	xorq	%r10,%r8
-	xorq	%r13,%r11
-	movq	%rax,%rbx
-	movq	%rcx,%rdx
-	xorq	%r10,%r9
-	shrq	$32,%rbx
-	xorq	%r13,%r12
-	shrq	$32,%rdx
-	xorq	%r8,%r10
-	roll	$8,%eax
-	xorq	%r11,%r13
-	roll	$8,%ecx
-	xorq	%r9,%r10
-	roll	$8,%ebx
-	xorq	%r12,%r13
-
-	roll	$8,%edx
-	xorl	%r10d,%eax
-	shrq	$32,%r10
-	xorl	%r13d,%ecx
-	shrq	$32,%r13
-	xorl	%r10d,%ebx
-	xorl	%r13d,%edx
-
-	movq	%r8,%r10
-	roll	$24,%r8d
-	movq	%r11,%r13
-	roll	$24,%r11d
-	shrq	$32,%r10
-	xorl	%r8d,%eax
-	shrq	$32,%r13
-	xorl	%r11d,%ecx
-	roll	$24,%r10d
-	movq	%r9,%r8
-	roll	$24,%r13d
-	movq	%r12,%r11
-	shrq	$32,%r8
-	xorl	%r10d,%ebx
-	shrq	$32,%r11
-	xorl	%r13d,%edx
-
-
-	roll	$16,%r9d
-
-	roll	$16,%r12d
-
-	roll	$16,%r8d
-
-	xorl	%r9d,%eax
-	roll	$16,%r11d
-	xorl	%r12d,%ecx
-
-	xorl	%r8d,%ebx
-	xorl	%r11d,%edx
-	movl	%eax,0(%r15)
-	movl	%ebx,4(%r15)
-	movl	%ecx,8(%r15)
-	movl	%edx,12(%r15)
-	subl	$1,%r14d
-	jnz	.Lpermute
-
-	xorq	%rax,%rax
-.Labort:
-	movq	8(%rsp),%r15
-.cfi_restore	%r15
-	movq	16(%rsp),%r14
-.cfi_restore	%r14
-	movq	24(%rsp),%r13
-.cfi_restore	%r13
-	movq	32(%rsp),%r12
-.cfi_restore	%r12
-	movq	40(%rsp),%rbp
-.cfi_restore	%rbp
-	movq	48(%rsp),%rbx
-.cfi_restore	%rbx
-	addq	$56,%rsp
-.cfi_adjust_cfa_offset	-56
-.Ldec_key_epilogue:
-	.byte	0xf3,0xc3
-.cfi_endproc	
-.size	AES_set_decrypt_key,.-AES_set_decrypt_key
-.globl	AES_cbc_encrypt
-.type	AES_cbc_encrypt,@function
-.align	16
-
-.globl	asm_AES_cbc_encrypt
-.hidden	asm_AES_cbc_encrypt
-asm_AES_cbc_encrypt:
-AES_cbc_encrypt:
-.cfi_startproc	
-	cmpq	$0,%rdx
-	je	.Lcbc_epilogue
-	pushfq
-
-
-.cfi_adjust_cfa_offset	8
-	pushq	%rbx
-.cfi_adjust_cfa_offset	8
-.cfi_offset	%rbx,-24
-	pushq	%rbp
-.cfi_adjust_cfa_offset	8
-.cfi_offset	%rbp,-32
-	pushq	%r12
-.cfi_adjust_cfa_offset	8
-.cfi_offset	%r12,-40
-	pushq	%r13
-.cfi_adjust_cfa_offset	8
-.cfi_offset	%r13,-48
-	pushq	%r14
-.cfi_adjust_cfa_offset	8
-.cfi_offset	%r14,-56
-	pushq	%r15
-.cfi_adjust_cfa_offset	8
-.cfi_offset	%r15,-64
-.Lcbc_prologue:
-
-	cld
-	movl	%r9d,%r9d
-
-	leaq	.LAES_Te(%rip),%r14
-	leaq	.LAES_Td(%rip),%r10
-	cmpq	$0,%r9
-	cmoveq	%r10,%r14
-
-.cfi_remember_state	
-	movl	OPENSSL_ia32cap_P(%rip),%r10d
-	cmpq	$512,%rdx
-	jb	.Lcbc_slow_prologue
-	testq	$15,%rdx
-	jnz	.Lcbc_slow_prologue
-	btl	$28,%r10d
-	jc	.Lcbc_slow_prologue
-
-
-	leaq	-88-248(%rsp),%r15
-	andq	$-64,%r15
-
-
-	movq	%r14,%r10
-	leaq	2304(%r14),%r11
-	movq	%r15,%r12
-	andq	$0xFFF,%r10
-	andq	$0xFFF,%r11
-	andq	$0xFFF,%r12
-
-	cmpq	%r11,%r12
-	jb	.Lcbc_te_break_out
-	subq	%r11,%r12
-	subq	%r12,%r15
-	jmp	.Lcbc_te_ok
-.Lcbc_te_break_out:
-	subq	%r10,%r12
-	andq	$0xFFF,%r12
-	addq	$320,%r12
-	subq	%r12,%r15
-.align	4
-.Lcbc_te_ok:
-
-	xchgq	%rsp,%r15
-.cfi_def_cfa_register	%r15
-
-	movq	%r15,16(%rsp)
-.cfi_escape	0x0f,0x05,0x77,0x10,0x06,0x23,0x40
-.Lcbc_fast_body:
-	movq	%rdi,24(%rsp)
-	movq	%rsi,32(%rsp)
-	movq	%rdx,40(%rsp)
-	movq	%rcx,48(%rsp)
-	movq	%r8,56(%rsp)
-	movl	$0,80+240(%rsp)
-	movq	%r8,%rbp
-	movq	%r9,%rbx
-	movq	%rsi,%r9
-	movq	%rdi,%r8
-	movq	%rcx,%r15
-
-	movl	240(%r15),%eax
-
-	movq	%r15,%r10
-	subq	%r14,%r10
-	andq	$0xfff,%r10
-	cmpq	$2304,%r10
-	jb	.Lcbc_do_ecopy
-	cmpq	$4096-248,%r10
-	jb	.Lcbc_skip_ecopy
-.align	4
-.Lcbc_do_ecopy:
-	movq	%r15,%rsi
-	leaq	80(%rsp),%rdi
-	leaq	80(%rsp),%r15
-	movl	$30,%ecx
-.long	0x90A548F3
-	movl	%eax,(%rdi)
-.Lcbc_skip_ecopy:
-	movq	%r15,0(%rsp)
-
-	movl	$18,%ecx
-.align	4
-.Lcbc_prefetch_te:
-	movq	0(%r14),%r10
-	movq	32(%r14),%r11
-	movq	64(%r14),%r12
-	movq	96(%r14),%r13
-	leaq	128(%r14),%r14
-	subl	$1,%ecx
-	jnz	.Lcbc_prefetch_te
-	leaq	-2304(%r14),%r14
-
-	cmpq	$0,%rbx
-	je	.LFAST_DECRYPT
-
-
-	movl	0(%rbp),%eax
-	movl	4(%rbp),%ebx
-	movl	8(%rbp),%ecx
-	movl	12(%rbp),%edx
-
-.align	4
-.Lcbc_fast_enc_loop:
-	xorl	0(%r8),%eax
-	xorl	4(%r8),%ebx
-	xorl	8(%r8),%ecx
-	xorl	12(%r8),%edx
-	movq	0(%rsp),%r15
-	movq	%r8,24(%rsp)
-
-	call	_x86_64_AES_encrypt
-
-	movq	24(%rsp),%r8
-	movq	40(%rsp),%r10
-	movl	%eax,0(%r9)
-	movl	%ebx,4(%r9)
-	movl	%ecx,8(%r9)
-	movl	%edx,12(%r9)
-
-	leaq	16(%r8),%r8
-	leaq	16(%r9),%r9
-	subq	$16,%r10
-	testq	$-16,%r10
-	movq	%r10,40(%rsp)
-	jnz	.Lcbc_fast_enc_loop
-	movq	56(%rsp),%rbp
-	movl	%eax,0(%rbp)
-	movl	%ebx,4(%rbp)
-	movl	%ecx,8(%rbp)
-	movl	%edx,12(%rbp)
-
-	jmp	.Lcbc_fast_cleanup
-
-
-.align	16
-.LFAST_DECRYPT:
-	cmpq	%r8,%r9
-	je	.Lcbc_fast_dec_in_place
-
-	movq	%rbp,64(%rsp)
-.align	4
-.Lcbc_fast_dec_loop:
-	movl	0(%r8),%eax
-	movl	4(%r8),%ebx
-	movl	8(%r8),%ecx
-	movl	12(%r8),%edx
-	movq	0(%rsp),%r15
-	movq	%r8,24(%rsp)
-
-	call	_x86_64_AES_decrypt
-
-	movq	64(%rsp),%rbp
-	movq	24(%rsp),%r8
-	movq	40(%rsp),%r10
-	xorl	0(%rbp),%eax
-	xorl	4(%rbp),%ebx
-	xorl	8(%rbp),%ecx
-	xorl	12(%rbp),%edx
-	movq	%r8,%rbp
-
-	subq	$16,%r10
-	movq	%r10,40(%rsp)
-	movq	%rbp,64(%rsp)
-
-	movl	%eax,0(%r9)
-	movl	%ebx,4(%r9)
-	movl	%ecx,8(%r9)
-	movl	%edx,12(%r9)
-
-	leaq	16(%r8),%r8
-	leaq	16(%r9),%r9
-	jnz	.Lcbc_fast_dec_loop
-	movq	56(%rsp),%r12
-	movq	0(%rbp),%r10
-	movq	8(%rbp),%r11
-	movq	%r10,0(%r12)
-	movq	%r11,8(%r12)
-	jmp	.Lcbc_fast_cleanup
-
-.align	16
-.Lcbc_fast_dec_in_place:
-	movq	0(%rbp),%r10
-	movq	8(%rbp),%r11
-	movq	%r10,0+64(%rsp)
-	movq	%r11,8+64(%rsp)
-.align	4
-.Lcbc_fast_dec_in_place_loop:
-	movl	0(%r8),%eax
-	movl	4(%r8),%ebx
-	movl	8(%r8),%ecx
-	movl	12(%r8),%edx
-	movq	0(%rsp),%r15
-	movq	%r8,24(%rsp)
-
-	call	_x86_64_AES_decrypt
-
-	movq	24(%rsp),%r8
-	movq	40(%rsp),%r10
-	xorl	0+64(%rsp),%eax
-	xorl	4+64(%rsp),%ebx
-	xorl	8+64(%rsp),%ecx
-	xorl	12+64(%rsp),%edx
-
-	movq	0(%r8),%r11
-	movq	8(%r8),%r12
-	subq	$16,%r10
-	jz	.Lcbc_fast_dec_in_place_done
-
-	movq	%r11,0+64(%rsp)
-	movq	%r12,8+64(%rsp)
-
-	movl	%eax,0(%r9)
-	movl	%ebx,4(%r9)
-	movl	%ecx,8(%r9)
-	movl	%edx,12(%r9)
-
-	leaq	16(%r8),%r8
-	leaq	16(%r9),%r9
-	movq	%r10,40(%rsp)
-	jmp	.Lcbc_fast_dec_in_place_loop
-.Lcbc_fast_dec_in_place_done:
-	movq	56(%rsp),%rdi
-	movq	%r11,0(%rdi)
-	movq	%r12,8(%rdi)
-
-	movl	%eax,0(%r9)
-	movl	%ebx,4(%r9)
-	movl	%ecx,8(%r9)
-	movl	%edx,12(%r9)
-
-.align	4
-.Lcbc_fast_cleanup:
-	cmpl	$0,80+240(%rsp)
-	leaq	80(%rsp),%rdi
-	je	.Lcbc_exit
-	movl	$30,%ecx
-	xorq	%rax,%rax
-.long	0x90AB48F3
-
-	jmp	.Lcbc_exit
-
-
-.align	16
-.Lcbc_slow_prologue:
-.cfi_restore_state	
-
-	leaq	-88(%rsp),%rbp
-	andq	$-64,%rbp
-
-	leaq	-88-63(%rcx),%r10
-	subq	%rbp,%r10
-	negq	%r10
-	andq	$0x3c0,%r10
-	subq	%r10,%rbp
-
-	xchgq	%rsp,%rbp
-.cfi_def_cfa_register	%rbp
-
-	movq	%rbp,16(%rsp)
-.cfi_escape	0x0f,0x05,0x77,0x10,0x06,0x23,0x40
-.Lcbc_slow_body:
-
-
-
-
-	movq	%r8,56(%rsp)
-	movq	%r8,%rbp
-	movq	%r9,%rbx
-	movq	%rsi,%r9
-	movq	%rdi,%r8
-	movq	%rcx,%r15
-	movq	%rdx,%r10
-
-	movl	240(%r15),%eax
-	movq	%r15,0(%rsp)
-	shll	$4,%eax
-	leaq	(%r15,%rax,1),%rax
-	movq	%rax,8(%rsp)
-
-
-	leaq	2048(%r14),%r14
-	leaq	768-8(%rsp),%rax
-	subq	%r14,%rax
-	andq	$0x300,%rax
-	leaq	(%r14,%rax,1),%r14
-
-	cmpq	$0,%rbx
-	je	.LSLOW_DECRYPT
-
-
-	testq	$-16,%r10
-	movl	0(%rbp),%eax
-	movl	4(%rbp),%ebx
-	movl	8(%rbp),%ecx
-	movl	12(%rbp),%edx
-	jz	.Lcbc_slow_enc_tail
-
-.align	4
-.Lcbc_slow_enc_loop:
-	xorl	0(%r8),%eax
-	xorl	4(%r8),%ebx
-	xorl	8(%r8),%ecx
-	xorl	12(%r8),%edx
-	movq	0(%rsp),%r15
-	movq	%r8,24(%rsp)
-	movq	%r9,32(%rsp)
-	movq	%r10,40(%rsp)
-
-	call	_x86_64_AES_encrypt_compact
-
-	movq	24(%rsp),%r8
-	movq	32(%rsp),%r9
-	movq	40(%rsp),%r10
-	movl	%eax,0(%r9)
-	movl	%ebx,4(%r9)
-	movl	%ecx,8(%r9)
-	movl	%edx,12(%r9)
-
-	leaq	16(%r8),%r8
-	leaq	16(%r9),%r9
-	subq	$16,%r10
-	testq	$-16,%r10
-	jnz	.Lcbc_slow_enc_loop
-	testq	$15,%r10
-	jnz	.Lcbc_slow_enc_tail
-	movq	56(%rsp),%rbp
-	movl	%eax,0(%rbp)
-	movl	%ebx,4(%rbp)
-	movl	%ecx,8(%rbp)
-	movl	%edx,12(%rbp)
-
-	jmp	.Lcbc_exit
-
-.align	4
-.Lcbc_slow_enc_tail:
-	movq	%rax,%r11
-	movq	%rcx,%r12
-	movq	%r10,%rcx
-	movq	%r8,%rsi
-	movq	%r9,%rdi
-.long	0x9066A4F3
-	movq	$16,%rcx
-	subq	%r10,%rcx
-	xorq	%rax,%rax
-.long	0x9066AAF3
-	movq	%r9,%r8
-	movq	$16,%r10
-	movq	%r11,%rax
-	movq	%r12,%rcx
-	jmp	.Lcbc_slow_enc_loop
-
-.align	16
-.LSLOW_DECRYPT:
-	shrq	$3,%rax
-	addq	%rax,%r14
-
-	movq	0(%rbp),%r11
-	movq	8(%rbp),%r12
-	movq	%r11,0+64(%rsp)
-	movq	%r12,8+64(%rsp)
-
-.align	4
-.Lcbc_slow_dec_loop:
-	movl	0(%r8),%eax
-	movl	4(%r8),%ebx
-	movl	8(%r8),%ecx
-	movl	12(%r8),%edx
-	movq	0(%rsp),%r15
-	movq	%r8,24(%rsp)
-	movq	%r9,32(%rsp)
-	movq	%r10,40(%rsp)
-
-	call	_x86_64_AES_decrypt_compact
-
-	movq	24(%rsp),%r8
-	movq	32(%rsp),%r9
-	movq	40(%rsp),%r10
-	xorl	0+64(%rsp),%eax
-	xorl	4+64(%rsp),%ebx
-	xorl	8+64(%rsp),%ecx
-	xorl	12+64(%rsp),%edx
-
-	movq	0(%r8),%r11
-	movq	8(%r8),%r12
-	subq	$16,%r10
-	jc	.Lcbc_slow_dec_partial
-	jz	.Lcbc_slow_dec_done
-
-	movq	%r11,0+64(%rsp)
-	movq	%r12,8+64(%rsp)
-
-	movl	%eax,0(%r9)
-	movl	%ebx,4(%r9)
-	movl	%ecx,8(%r9)
-	movl	%edx,12(%r9)
-
-	leaq	16(%r8),%r8
-	leaq	16(%r9),%r9
-	jmp	.Lcbc_slow_dec_loop
-.Lcbc_slow_dec_done:
-	movq	56(%rsp),%rdi
-	movq	%r11,0(%rdi)
-	movq	%r12,8(%rdi)
-
-	movl	%eax,0(%r9)
-	movl	%ebx,4(%r9)
-	movl	%ecx,8(%r9)
-	movl	%edx,12(%r9)
-
-	jmp	.Lcbc_exit
-
-.align	4
-.Lcbc_slow_dec_partial:
-	movq	56(%rsp),%rdi
-	movq	%r11,0(%rdi)
-	movq	%r12,8(%rdi)
-
-	movl	%eax,0+64(%rsp)
-	movl	%ebx,4+64(%rsp)
-	movl	%ecx,8+64(%rsp)
-	movl	%edx,12+64(%rsp)
-
-	movq	%r9,%rdi
-	leaq	64(%rsp),%rsi
-	leaq	16(%r10),%rcx
-.long	0x9066A4F3
-	jmp	.Lcbc_exit
-
-.align	16
-.Lcbc_exit:
-	movq	16(%rsp),%rsi
-.cfi_def_cfa	%rsi,64
-	movq	(%rsi),%r15
-.cfi_restore	%r15
-	movq	8(%rsi),%r14
-.cfi_restore	%r14
-	movq	16(%rsi),%r13
-.cfi_restore	%r13
-	movq	24(%rsi),%r12
-.cfi_restore	%r12
-	movq	32(%rsi),%rbp
-.cfi_restore	%rbp
-	movq	40(%rsi),%rbx
-.cfi_restore	%rbx
-	leaq	48(%rsi),%rsp
-.cfi_def_cfa	%rsp,16
-.Lcbc_popfq:
-	popfq
-
-
-.cfi_adjust_cfa_offset	-8
-.Lcbc_epilogue:
-	.byte	0xf3,0xc3
-.cfi_endproc	
-.size	AES_cbc_encrypt,.-AES_cbc_encrypt
-.align	64
-.LAES_Te:
-.long	0xa56363c6,0xa56363c6
-.long	0x847c7cf8,0x847c7cf8
-.long	0x997777ee,0x997777ee
-.long	0x8d7b7bf6,0x8d7b7bf6
-.long	0x0df2f2ff,0x0df2f2ff
-.long	0xbd6b6bd6,0xbd6b6bd6
-.long	0xb16f6fde,0xb16f6fde
-.long	0x54c5c591,0x54c5c591
-.long	0x50303060,0x50303060
-.long	0x03010102,0x03010102
-.long	0xa96767ce,0xa96767ce
-.long	0x7d2b2b56,0x7d2b2b56
-.long	0x19fefee7,0x19fefee7
-.long	0x62d7d7b5,0x62d7d7b5
-.long	0xe6abab4d,0xe6abab4d
-.long	0x9a7676ec,0x9a7676ec
-.long	0x45caca8f,0x45caca8f
-.long	0x9d82821f,0x9d82821f
-.long	0x40c9c989,0x40c9c989
-.long	0x877d7dfa,0x877d7dfa
-.long	0x15fafaef,0x15fafaef
-.long	0xeb5959b2,0xeb5959b2
-.long	0xc947478e,0xc947478e
-.long	0x0bf0f0fb,0x0bf0f0fb
-.long	0xecadad41,0xecadad41
-.long	0x67d4d4b3,0x67d4d4b3
-.long	0xfda2a25f,0xfda2a25f
-.long	0xeaafaf45,0xeaafaf45
-.long	0xbf9c9c23,0xbf9c9c23
-.long	0xf7a4a453,0xf7a4a453
-.long	0x967272e4,0x967272e4
-.long	0x5bc0c09b,0x5bc0c09b
-.long	0xc2b7b775,0xc2b7b775
-.long	0x1cfdfde1,0x1cfdfde1
-.long	0xae93933d,0xae93933d
-.long	0x6a26264c,0x6a26264c
-.long	0x5a36366c,0x5a36366c
-.long	0x413f3f7e,0x413f3f7e
-.long	0x02f7f7f5,0x02f7f7f5
-.long	0x4fcccc83,0x4fcccc83
-.long	0x5c343468,0x5c343468
-.long	0xf4a5a551,0xf4a5a551
-.long	0x34e5e5d1,0x34e5e5d1
-.long	0x08f1f1f9,0x08f1f1f9
-.long	0x937171e2,0x937171e2
-.long	0x73d8d8ab,0x73d8d8ab
-.long	0x53313162,0x53313162
-.long	0x3f15152a,0x3f15152a
-.long	0x0c040408,0x0c040408
-.long	0x52c7c795,0x52c7c795
-.long	0x65232346,0x65232346
-.long	0x5ec3c39d,0x5ec3c39d
-.long	0x28181830,0x28181830
-.long	0xa1969637,0xa1969637
-.long	0x0f05050a,0x0f05050a
-.long	0xb59a9a2f,0xb59a9a2f
-.long	0x0907070e,0x0907070e
-.long	0x36121224,0x36121224
-.long	0x9b80801b,0x9b80801b
-.long	0x3de2e2df,0x3de2e2df
-.long	0x26ebebcd,0x26ebebcd
-.long	0x6927274e,0x6927274e
-.long	0xcdb2b27f,0xcdb2b27f
-.long	0x9f7575ea,0x9f7575ea
-.long	0x1b090912,0x1b090912
-.long	0x9e83831d,0x9e83831d
-.long	0x742c2c58,0x742c2c58
-.long	0x2e1a1a34,0x2e1a1a34
-.long	0x2d1b1b36,0x2d1b1b36
-.long	0xb26e6edc,0xb26e6edc
-.long	0xee5a5ab4,0xee5a5ab4
-.long	0xfba0a05b,0xfba0a05b
-.long	0xf65252a4,0xf65252a4
-.long	0x4d3b3b76,0x4d3b3b76
-.long	0x61d6d6b7,0x61d6d6b7
-.long	0xceb3b37d,0xceb3b37d
-.long	0x7b292952,0x7b292952
-.long	0x3ee3e3dd,0x3ee3e3dd
-.long	0x712f2f5e,0x712f2f5e
-.long	0x97848413,0x97848413
-.long	0xf55353a6,0xf55353a6
-.long	0x68d1d1b9,0x68d1d1b9
-.long	0x00000000,0x00000000
-.long	0x2cededc1,0x2cededc1
-.long	0x60202040,0x60202040
-.long	0x1ffcfce3,0x1ffcfce3
-.long	0xc8b1b179,0xc8b1b179
-.long	0xed5b5bb6,0xed5b5bb6
-.long	0xbe6a6ad4,0xbe6a6ad4
-.long	0x46cbcb8d,0x46cbcb8d
-.long	0xd9bebe67,0xd9bebe67
-.long	0x4b393972,0x4b393972
-.long	0xde4a4a94,0xde4a4a94
-.long	0xd44c4c98,0xd44c4c98
-.long	0xe85858b0,0xe85858b0
-.long	0x4acfcf85,0x4acfcf85
-.long	0x6bd0d0bb,0x6bd0d0bb
-.long	0x2aefefc5,0x2aefefc5
-.long	0xe5aaaa4f,0xe5aaaa4f
-.long	0x16fbfbed,0x16fbfbed
-.long	0xc5434386,0xc5434386
-.long	0xd74d4d9a,0xd74d4d9a
-.long	0x55333366,0x55333366
-.long	0x94858511,0x94858511
-.long	0xcf45458a,0xcf45458a
-.long	0x10f9f9e9,0x10f9f9e9
-.long	0x06020204,0x06020204
-.long	0x817f7ffe,0x817f7ffe
-.long	0xf05050a0,0xf05050a0
-.long	0x443c3c78,0x443c3c78
-.long	0xba9f9f25,0xba9f9f25
-.long	0xe3a8a84b,0xe3a8a84b
-.long	0xf35151a2,0xf35151a2
-.long	0xfea3a35d,0xfea3a35d
-.long	0xc0404080,0xc0404080
-.long	0x8a8f8f05,0x8a8f8f05
-.long	0xad92923f,0xad92923f
-.long	0xbc9d9d21,0xbc9d9d21
-.long	0x48383870,0x48383870
-.long	0x04f5f5f1,0x04f5f5f1
-.long	0xdfbcbc63,0xdfbcbc63
-.long	0xc1b6b677,0xc1b6b677
-.long	0x75dadaaf,0x75dadaaf
-.long	0x63212142,0x63212142
-.long	0x30101020,0x30101020
-.long	0x1affffe5,0x1affffe5
-.long	0x0ef3f3fd,0x0ef3f3fd
-.long	0x6dd2d2bf,0x6dd2d2bf
-.long	0x4ccdcd81,0x4ccdcd81
-.long	0x140c0c18,0x140c0c18
-.long	0x35131326,0x35131326
-.long	0x2fececc3,0x2fececc3
-.long	0xe15f5fbe,0xe15f5fbe
-.long	0xa2979735,0xa2979735
-.long	0xcc444488,0xcc444488
-.long	0x3917172e,0x3917172e
-.long	0x57c4c493,0x57c4c493
-.long	0xf2a7a755,0xf2a7a755
-.long	0x827e7efc,0x827e7efc
-.long	0x473d3d7a,0x473d3d7a
-.long	0xac6464c8,0xac6464c8
-.long	0xe75d5dba,0xe75d5dba
-.long	0x2b191932,0x2b191932
-.long	0x957373e6,0x957373e6
-.long	0xa06060c0,0xa06060c0
-.long	0x98818119,0x98818119
-.long	0xd14f4f9e,0xd14f4f9e
-.long	0x7fdcdca3,0x7fdcdca3
-.long	0x66222244,0x66222244
-.long	0x7e2a2a54,0x7e2a2a54
-.long	0xab90903b,0xab90903b
-.long	0x8388880b,0x8388880b
-.long	0xca46468c,0xca46468c
-.long	0x29eeeec7,0x29eeeec7
-.long	0xd3b8b86b,0xd3b8b86b
-.long	0x3c141428,0x3c141428
-.long	0x79dedea7,0x79dedea7
-.long	0xe25e5ebc,0xe25e5ebc
-.long	0x1d0b0b16,0x1d0b0b16
-.long	0x76dbdbad,0x76dbdbad
-.long	0x3be0e0db,0x3be0e0db
-.long	0x56323264,0x56323264
-.long	0x4e3a3a74,0x4e3a3a74
-.long	0x1e0a0a14,0x1e0a0a14
-.long	0xdb494992,0xdb494992
-.long	0x0a06060c,0x0a06060c
-.long	0x6c242448,0x6c242448
-.long	0xe45c5cb8,0xe45c5cb8
-.long	0x5dc2c29f,0x5dc2c29f
-.long	0x6ed3d3bd,0x6ed3d3bd
-.long	0xefacac43,0xefacac43
-.long	0xa66262c4,0xa66262c4
-.long	0xa8919139,0xa8919139
-.long	0xa4959531,0xa4959531
-.long	0x37e4e4d3,0x37e4e4d3
-.long	0x8b7979f2,0x8b7979f2
-.long	0x32e7e7d5,0x32e7e7d5
-.long	0x43c8c88b,0x43c8c88b
-.long	0x5937376e,0x5937376e
-.long	0xb76d6dda,0xb76d6dda
-.long	0x8c8d8d01,0x8c8d8d01
-.long	0x64d5d5b1,0x64d5d5b1
-.long	0xd24e4e9c,0xd24e4e9c
-.long	0xe0a9a949,0xe0a9a949
-.long	0xb46c6cd8,0xb46c6cd8
-.long	0xfa5656ac,0xfa5656ac
-.long	0x07f4f4f3,0x07f4f4f3
-.long	0x25eaeacf,0x25eaeacf
-.long	0xaf6565ca,0xaf6565ca
-.long	0x8e7a7af4,0x8e7a7af4
-.long	0xe9aeae47,0xe9aeae47
-.long	0x18080810,0x18080810
-.long	0xd5baba6f,0xd5baba6f
-.long	0x887878f0,0x887878f0
-.long	0x6f25254a,0x6f25254a
-.long	0x722e2e5c,0x722e2e5c
-.long	0x241c1c38,0x241c1c38
-.long	0xf1a6a657,0xf1a6a657
-.long	0xc7b4b473,0xc7b4b473
-.long	0x51c6c697,0x51c6c697
-.long	0x23e8e8cb,0x23e8e8cb
-.long	0x7cdddda1,0x7cdddda1
-.long	0x9c7474e8,0x9c7474e8
-.long	0x211f1f3e,0x211f1f3e
-.long	0xdd4b4b96,0xdd4b4b96
-.long	0xdcbdbd61,0xdcbdbd61
-.long	0x868b8b0d,0x868b8b0d
-.long	0x858a8a0f,0x858a8a0f
-.long	0x907070e0,0x907070e0
-.long	0x423e3e7c,0x423e3e7c
-.long	0xc4b5b571,0xc4b5b571
-.long	0xaa6666cc,0xaa6666cc
-.long	0xd8484890,0xd8484890
-.long	0x05030306,0x05030306
-.long	0x01f6f6f7,0x01f6f6f7
-.long	0x120e0e1c,0x120e0e1c
-.long	0xa36161c2,0xa36161c2
-.long	0x5f35356a,0x5f35356a
-.long	0xf95757ae,0xf95757ae
-.long	0xd0b9b969,0xd0b9b969
-.long	0x91868617,0x91868617
-.long	0x58c1c199,0x58c1c199
-.long	0x271d1d3a,0x271d1d3a
-.long	0xb99e9e27,0xb99e9e27
-.long	0x38e1e1d9,0x38e1e1d9
-.long	0x13f8f8eb,0x13f8f8eb
-.long	0xb398982b,0xb398982b
-.long	0x33111122,0x33111122
-.long	0xbb6969d2,0xbb6969d2
-.long	0x70d9d9a9,0x70d9d9a9
-.long	0x898e8e07,0x898e8e07
-.long	0xa7949433,0xa7949433
-.long	0xb69b9b2d,0xb69b9b2d
-.long	0x221e1e3c,0x221e1e3c
-.long	0x92878715,0x92878715
-.long	0x20e9e9c9,0x20e9e9c9
-.long	0x49cece87,0x49cece87
-.long	0xff5555aa,0xff5555aa
-.long	0x78282850,0x78282850
-.long	0x7adfdfa5,0x7adfdfa5
-.long	0x8f8c8c03,0x8f8c8c03
-.long	0xf8a1a159,0xf8a1a159
-.long	0x80898909,0x80898909
-.long	0x170d0d1a,0x170d0d1a
-.long	0xdabfbf65,0xdabfbf65
-.long	0x31e6e6d7,0x31e6e6d7
-.long	0xc6424284,0xc6424284
-.long	0xb86868d0,0xb86868d0
-.long	0xc3414182,0xc3414182
-.long	0xb0999929,0xb0999929
-.long	0x772d2d5a,0x772d2d5a
-.long	0x110f0f1e,0x110f0f1e
-.long	0xcbb0b07b,0xcbb0b07b
-.long	0xfc5454a8,0xfc5454a8
-.long	0xd6bbbb6d,0xd6bbbb6d
-.long	0x3a16162c,0x3a16162c
-.byte	0x63,0x7c,0x77,0x7b,0xf2,0x6b,0x6f,0xc5
-.byte	0x30,0x01,0x67,0x2b,0xfe,0xd7,0xab,0x76
-.byte	0xca,0x82,0xc9,0x7d,0xfa,0x59,0x47,0xf0
-.byte	0xad,0xd4,0xa2,0xaf,0x9c,0xa4,0x72,0xc0
-.byte	0xb7,0xfd,0x93,0x26,0x36,0x3f,0xf7,0xcc
-.byte	0x34,0xa5,0xe5,0xf1,0x71,0xd8,0x31,0x15
-.byte	0x04,0xc7,0x23,0xc3,0x18,0x96,0x05,0x9a
-.byte	0x07,0x12,0x80,0xe2,0xeb,0x27,0xb2,0x75
-.byte	0x09,0x83,0x2c,0x1a,0x1b,0x6e,0x5a,0xa0
-.byte	0x52,0x3b,0xd6,0xb3,0x29,0xe3,0x2f,0x84
-.byte	0x53,0xd1,0x00,0xed,0x20,0xfc,0xb1,0x5b
-.byte	0x6a,0xcb,0xbe,0x39,0x4a,0x4c,0x58,0xcf
-.byte	0xd0,0xef,0xaa,0xfb,0x43,0x4d,0x33,0x85
-.byte	0x45,0xf9,0x02,0x7f,0x50,0x3c,0x9f,0xa8
-.byte	0x51,0xa3,0x40,0x8f,0x92,0x9d,0x38,0xf5
-.byte	0xbc,0xb6,0xda,0x21,0x10,0xff,0xf3,0xd2
-.byte	0xcd,0x0c,0x13,0xec,0x5f,0x97,0x44,0x17
-.byte	0xc4,0xa7,0x7e,0x3d,0x64,0x5d,0x19,0x73
-.byte	0x60,0x81,0x4f,0xdc,0x22,0x2a,0x90,0x88
-.byte	0x46,0xee,0xb8,0x14,0xde,0x5e,0x0b,0xdb
-.byte	0xe0,0x32,0x3a,0x0a,0x49,0x06,0x24,0x5c
-.byte	0xc2,0xd3,0xac,0x62,0x91,0x95,0xe4,0x79
-.byte	0xe7,0xc8,0x37,0x6d,0x8d,0xd5,0x4e,0xa9
-.byte	0x6c,0x56,0xf4,0xea,0x65,0x7a,0xae,0x08
-.byte	0xba,0x78,0x25,0x2e,0x1c,0xa6,0xb4,0xc6
-.byte	0xe8,0xdd,0x74,0x1f,0x4b,0xbd,0x8b,0x8a
-.byte	0x70,0x3e,0xb5,0x66,0x48,0x03,0xf6,0x0e
-.byte	0x61,0x35,0x57,0xb9,0x86,0xc1,0x1d,0x9e
-.byte	0xe1,0xf8,0x98,0x11,0x69,0xd9,0x8e,0x94
-.byte	0x9b,0x1e,0x87,0xe9,0xce,0x55,0x28,0xdf
-.byte	0x8c,0xa1,0x89,0x0d,0xbf,0xe6,0x42,0x68
-.byte	0x41,0x99,0x2d,0x0f,0xb0,0x54,0xbb,0x16
-.byte	0x63,0x7c,0x77,0x7b,0xf2,0x6b,0x6f,0xc5
-.byte	0x30,0x01,0x67,0x2b,0xfe,0xd7,0xab,0x76
-.byte	0xca,0x82,0xc9,0x7d,0xfa,0x59,0x47,0xf0
-.byte	0xad,0xd4,0xa2,0xaf,0x9c,0xa4,0x72,0xc0
-.byte	0xb7,0xfd,0x93,0x26,0x36,0x3f,0xf7,0xcc
-.byte	0x34,0xa5,0xe5,0xf1,0x71,0xd8,0x31,0x15
-.byte	0x04,0xc7,0x23,0xc3,0x18,0x96,0x05,0x9a
-.byte	0x07,0x12,0x80,0xe2,0xeb,0x27,0xb2,0x75
-.byte	0x09,0x83,0x2c,0x1a,0x1b,0x6e,0x5a,0xa0
-.byte	0x52,0x3b,0xd6,0xb3,0x29,0xe3,0x2f,0x84
-.byte	0x53,0xd1,0x00,0xed,0x20,0xfc,0xb1,0x5b
-.byte	0x6a,0xcb,0xbe,0x39,0x4a,0x4c,0x58,0xcf
-.byte	0xd0,0xef,0xaa,0xfb,0x43,0x4d,0x33,0x85
-.byte	0x45,0xf9,0x02,0x7f,0x50,0x3c,0x9f,0xa8
-.byte	0x51,0xa3,0x40,0x8f,0x92,0x9d,0x38,0xf5
-.byte	0xbc,0xb6,0xda,0x21,0x10,0xff,0xf3,0xd2
-.byte	0xcd,0x0c,0x13,0xec,0x5f,0x97,0x44,0x17
-.byte	0xc4,0xa7,0x7e,0x3d,0x64,0x5d,0x19,0x73
-.byte	0x60,0x81,0x4f,0xdc,0x22,0x2a,0x90,0x88
-.byte	0x46,0xee,0xb8,0x14,0xde,0x5e,0x0b,0xdb
-.byte	0xe0,0x32,0x3a,0x0a,0x49,0x06,0x24,0x5c
-.byte	0xc2,0xd3,0xac,0x62,0x91,0x95,0xe4,0x79
-.byte	0xe7,0xc8,0x37,0x6d,0x8d,0xd5,0x4e,0xa9
-.byte	0x6c,0x56,0xf4,0xea,0x65,0x7a,0xae,0x08
-.byte	0xba,0x78,0x25,0x2e,0x1c,0xa6,0xb4,0xc6
-.byte	0xe8,0xdd,0x74,0x1f,0x4b,0xbd,0x8b,0x8a
-.byte	0x70,0x3e,0xb5,0x66,0x48,0x03,0xf6,0x0e
-.byte	0x61,0x35,0x57,0xb9,0x86,0xc1,0x1d,0x9e
-.byte	0xe1,0xf8,0x98,0x11,0x69,0xd9,0x8e,0x94
-.byte	0x9b,0x1e,0x87,0xe9,0xce,0x55,0x28,0xdf
-.byte	0x8c,0xa1,0x89,0x0d,0xbf,0xe6,0x42,0x68
-.byte	0x41,0x99,0x2d,0x0f,0xb0,0x54,0xbb,0x16
-.byte	0x63,0x7c,0x77,0x7b,0xf2,0x6b,0x6f,0xc5
-.byte	0x30,0x01,0x67,0x2b,0xfe,0xd7,0xab,0x76
-.byte	0xca,0x82,0xc9,0x7d,0xfa,0x59,0x47,0xf0
-.byte	0xad,0xd4,0xa2,0xaf,0x9c,0xa4,0x72,0xc0
-.byte	0xb7,0xfd,0x93,0x26,0x36,0x3f,0xf7,0xcc
-.byte	0x34,0xa5,0xe5,0xf1,0x71,0xd8,0x31,0x15
-.byte	0x04,0xc7,0x23,0xc3,0x18,0x96,0x05,0x9a
-.byte	0x07,0x12,0x80,0xe2,0xeb,0x27,0xb2,0x75
-.byte	0x09,0x83,0x2c,0x1a,0x1b,0x6e,0x5a,0xa0
-.byte	0x52,0x3b,0xd6,0xb3,0x29,0xe3,0x2f,0x84
-.byte	0x53,0xd1,0x00,0xed,0x20,0xfc,0xb1,0x5b
-.byte	0x6a,0xcb,0xbe,0x39,0x4a,0x4c,0x58,0xcf
-.byte	0xd0,0xef,0xaa,0xfb,0x43,0x4d,0x33,0x85
-.byte	0x45,0xf9,0x02,0x7f,0x50,0x3c,0x9f,0xa8
-.byte	0x51,0xa3,0x40,0x8f,0x92,0x9d,0x38,0xf5
-.byte	0xbc,0xb6,0xda,0x21,0x10,0xff,0xf3,0xd2
-.byte	0xcd,0x0c,0x13,0xec,0x5f,0x97,0x44,0x17
-.byte	0xc4,0xa7,0x7e,0x3d,0x64,0x5d,0x19,0x73
-.byte	0x60,0x81,0x4f,0xdc,0x22,0x2a,0x90,0x88
-.byte	0x46,0xee,0xb8,0x14,0xde,0x5e,0x0b,0xdb
-.byte	0xe0,0x32,0x3a,0x0a,0x49,0x06,0x24,0x5c
-.byte	0xc2,0xd3,0xac,0x62,0x91,0x95,0xe4,0x79
-.byte	0xe7,0xc8,0x37,0x6d,0x8d,0xd5,0x4e,0xa9
-.byte	0x6c,0x56,0xf4,0xea,0x65,0x7a,0xae,0x08
-.byte	0xba,0x78,0x25,0x2e,0x1c,0xa6,0xb4,0xc6
-.byte	0xe8,0xdd,0x74,0x1f,0x4b,0xbd,0x8b,0x8a
-.byte	0x70,0x3e,0xb5,0x66,0x48,0x03,0xf6,0x0e
-.byte	0x61,0x35,0x57,0xb9,0x86,0xc1,0x1d,0x9e
-.byte	0xe1,0xf8,0x98,0x11,0x69,0xd9,0x8e,0x94
-.byte	0x9b,0x1e,0x87,0xe9,0xce,0x55,0x28,0xdf
-.byte	0x8c,0xa1,0x89,0x0d,0xbf,0xe6,0x42,0x68
-.byte	0x41,0x99,0x2d,0x0f,0xb0,0x54,0xbb,0x16
-.byte	0x63,0x7c,0x77,0x7b,0xf2,0x6b,0x6f,0xc5
-.byte	0x30,0x01,0x67,0x2b,0xfe,0xd7,0xab,0x76
-.byte	0xca,0x82,0xc9,0x7d,0xfa,0x59,0x47,0xf0
-.byte	0xad,0xd4,0xa2,0xaf,0x9c,0xa4,0x72,0xc0
-.byte	0xb7,0xfd,0x93,0x26,0x36,0x3f,0xf7,0xcc
-.byte	0x34,0xa5,0xe5,0xf1,0x71,0xd8,0x31,0x15
-.byte	0x04,0xc7,0x23,0xc3,0x18,0x96,0x05,0x9a
-.byte	0x07,0x12,0x80,0xe2,0xeb,0x27,0xb2,0x75
-.byte	0x09,0x83,0x2c,0x1a,0x1b,0x6e,0x5a,0xa0
-.byte	0x52,0x3b,0xd6,0xb3,0x29,0xe3,0x2f,0x84
-.byte	0x53,0xd1,0x00,0xed,0x20,0xfc,0xb1,0x5b
-.byte	0x6a,0xcb,0xbe,0x39,0x4a,0x4c,0x58,0xcf
-.byte	0xd0,0xef,0xaa,0xfb,0x43,0x4d,0x33,0x85
-.byte	0x45,0xf9,0x02,0x7f,0x50,0x3c,0x9f,0xa8
-.byte	0x51,0xa3,0x40,0x8f,0x92,0x9d,0x38,0xf5
-.byte	0xbc,0xb6,0xda,0x21,0x10,0xff,0xf3,0xd2
-.byte	0xcd,0x0c,0x13,0xec,0x5f,0x97,0x44,0x17
-.byte	0xc4,0xa7,0x7e,0x3d,0x64,0x5d,0x19,0x73
-.byte	0x60,0x81,0x4f,0xdc,0x22,0x2a,0x90,0x88
-.byte	0x46,0xee,0xb8,0x14,0xde,0x5e,0x0b,0xdb
-.byte	0xe0,0x32,0x3a,0x0a,0x49,0x06,0x24,0x5c
-.byte	0xc2,0xd3,0xac,0x62,0x91,0x95,0xe4,0x79
-.byte	0xe7,0xc8,0x37,0x6d,0x8d,0xd5,0x4e,0xa9
-.byte	0x6c,0x56,0xf4,0xea,0x65,0x7a,0xae,0x08
-.byte	0xba,0x78,0x25,0x2e,0x1c,0xa6,0xb4,0xc6
-.byte	0xe8,0xdd,0x74,0x1f,0x4b,0xbd,0x8b,0x8a
-.byte	0x70,0x3e,0xb5,0x66,0x48,0x03,0xf6,0x0e
-.byte	0x61,0x35,0x57,0xb9,0x86,0xc1,0x1d,0x9e
-.byte	0xe1,0xf8,0x98,0x11,0x69,0xd9,0x8e,0x94
-.byte	0x9b,0x1e,0x87,0xe9,0xce,0x55,0x28,0xdf
-.byte	0x8c,0xa1,0x89,0x0d,0xbf,0xe6,0x42,0x68
-.byte	0x41,0x99,0x2d,0x0f,0xb0,0x54,0xbb,0x16
-.long	0x00000001, 0x00000002, 0x00000004, 0x00000008
-.long	0x00000010, 0x00000020, 0x00000040, 0x00000080
-.long	0x0000001b, 0x00000036, 0x80808080, 0x80808080
-.long	0xfefefefe, 0xfefefefe, 0x1b1b1b1b, 0x1b1b1b1b
-.align	64
-.LAES_Td:
-.long	0x50a7f451,0x50a7f451
-.long	0x5365417e,0x5365417e
-.long	0xc3a4171a,0xc3a4171a
-.long	0x965e273a,0x965e273a
-.long	0xcb6bab3b,0xcb6bab3b
-.long	0xf1459d1f,0xf1459d1f
-.long	0xab58faac,0xab58faac
-.long	0x9303e34b,0x9303e34b
-.long	0x55fa3020,0x55fa3020
-.long	0xf66d76ad,0xf66d76ad
-.long	0x9176cc88,0x9176cc88
-.long	0x254c02f5,0x254c02f5
-.long	0xfcd7e54f,0xfcd7e54f
-.long	0xd7cb2ac5,0xd7cb2ac5
-.long	0x80443526,0x80443526
-.long	0x8fa362b5,0x8fa362b5
-.long	0x495ab1de,0x495ab1de
-.long	0x671bba25,0x671bba25
-.long	0x980eea45,0x980eea45
-.long	0xe1c0fe5d,0xe1c0fe5d
-.long	0x02752fc3,0x02752fc3
-.long	0x12f04c81,0x12f04c81
-.long	0xa397468d,0xa397468d
-.long	0xc6f9d36b,0xc6f9d36b
-.long	0xe75f8f03,0xe75f8f03
-.long	0x959c9215,0x959c9215
-.long	0xeb7a6dbf,0xeb7a6dbf
-.long	0xda595295,0xda595295
-.long	0x2d83bed4,0x2d83bed4
-.long	0xd3217458,0xd3217458
-.long	0x2969e049,0x2969e049
-.long	0x44c8c98e,0x44c8c98e
-.long	0x6a89c275,0x6a89c275
-.long	0x78798ef4,0x78798ef4
-.long	0x6b3e5899,0x6b3e5899
-.long	0xdd71b927,0xdd71b927
-.long	0xb64fe1be,0xb64fe1be
-.long	0x17ad88f0,0x17ad88f0
-.long	0x66ac20c9,0x66ac20c9
-.long	0xb43ace7d,0xb43ace7d
-.long	0x184adf63,0x184adf63
-.long	0x82311ae5,0x82311ae5
-.long	0x60335197,0x60335197
-.long	0x457f5362,0x457f5362
-.long	0xe07764b1,0xe07764b1
-.long	0x84ae6bbb,0x84ae6bbb
-.long	0x1ca081fe,0x1ca081fe
-.long	0x942b08f9,0x942b08f9
-.long	0x58684870,0x58684870
-.long	0x19fd458f,0x19fd458f
-.long	0x876cde94,0x876cde94
-.long	0xb7f87b52,0xb7f87b52
-.long	0x23d373ab,0x23d373ab
-.long	0xe2024b72,0xe2024b72
-.long	0x578f1fe3,0x578f1fe3
-.long	0x2aab5566,0x2aab5566
-.long	0x0728ebb2,0x0728ebb2
-.long	0x03c2b52f,0x03c2b52f
-.long	0x9a7bc586,0x9a7bc586
-.long	0xa50837d3,0xa50837d3
-.long	0xf2872830,0xf2872830
-.long	0xb2a5bf23,0xb2a5bf23
-.long	0xba6a0302,0xba6a0302
-.long	0x5c8216ed,0x5c8216ed
-.long	0x2b1ccf8a,0x2b1ccf8a
-.long	0x92b479a7,0x92b479a7
-.long	0xf0f207f3,0xf0f207f3
-.long	0xa1e2694e,0xa1e2694e
-.long	0xcdf4da65,0xcdf4da65
-.long	0xd5be0506,0xd5be0506
-.long	0x1f6234d1,0x1f6234d1
-.long	0x8afea6c4,0x8afea6c4
-.long	0x9d532e34,0x9d532e34
-.long	0xa055f3a2,0xa055f3a2
-.long	0x32e18a05,0x32e18a05
-.long	0x75ebf6a4,0x75ebf6a4
-.long	0x39ec830b,0x39ec830b
-.long	0xaaef6040,0xaaef6040
-.long	0x069f715e,0x069f715e
-.long	0x51106ebd,0x51106ebd
-.long	0xf98a213e,0xf98a213e
-.long	0x3d06dd96,0x3d06dd96
-.long	0xae053edd,0xae053edd
-.long	0x46bde64d,0x46bde64d
-.long	0xb58d5491,0xb58d5491
-.long	0x055dc471,0x055dc471
-.long	0x6fd40604,0x6fd40604
-.long	0xff155060,0xff155060
-.long	0x24fb9819,0x24fb9819
-.long	0x97e9bdd6,0x97e9bdd6
-.long	0xcc434089,0xcc434089
-.long	0x779ed967,0x779ed967
-.long	0xbd42e8b0,0xbd42e8b0
-.long	0x888b8907,0x888b8907
-.long	0x385b19e7,0x385b19e7
-.long	0xdbeec879,0xdbeec879
-.long	0x470a7ca1,0x470a7ca1
-.long	0xe90f427c,0xe90f427c
-.long	0xc91e84f8,0xc91e84f8
-.long	0x00000000,0x00000000
-.long	0x83868009,0x83868009
-.long	0x48ed2b32,0x48ed2b32
-.long	0xac70111e,0xac70111e
-.long	0x4e725a6c,0x4e725a6c
-.long	0xfbff0efd,0xfbff0efd
-.long	0x5638850f,0x5638850f
-.long	0x1ed5ae3d,0x1ed5ae3d
-.long	0x27392d36,0x27392d36
-.long	0x64d90f0a,0x64d90f0a
-.long	0x21a65c68,0x21a65c68
-.long	0xd1545b9b,0xd1545b9b
-.long	0x3a2e3624,0x3a2e3624
-.long	0xb1670a0c,0xb1670a0c
-.long	0x0fe75793,0x0fe75793
-.long	0xd296eeb4,0xd296eeb4
-.long	0x9e919b1b,0x9e919b1b
-.long	0x4fc5c080,0x4fc5c080
-.long	0xa220dc61,0xa220dc61
-.long	0x694b775a,0x694b775a
-.long	0x161a121c,0x161a121c
-.long	0x0aba93e2,0x0aba93e2
-.long	0xe52aa0c0,0xe52aa0c0
-.long	0x43e0223c,0x43e0223c
-.long	0x1d171b12,0x1d171b12
-.long	0x0b0d090e,0x0b0d090e
-.long	0xadc78bf2,0xadc78bf2
-.long	0xb9a8b62d,0xb9a8b62d
-.long	0xc8a91e14,0xc8a91e14
-.long	0x8519f157,0x8519f157
-.long	0x4c0775af,0x4c0775af
-.long	0xbbdd99ee,0xbbdd99ee
-.long	0xfd607fa3,0xfd607fa3
-.long	0x9f2601f7,0x9f2601f7
-.long	0xbcf5725c,0xbcf5725c
-.long	0xc53b6644,0xc53b6644
-.long	0x347efb5b,0x347efb5b
-.long	0x7629438b,0x7629438b
-.long	0xdcc623cb,0xdcc623cb
-.long	0x68fcedb6,0x68fcedb6
-.long	0x63f1e4b8,0x63f1e4b8
-.long	0xcadc31d7,0xcadc31d7
-.long	0x10856342,0x10856342
-.long	0x40229713,0x40229713
-.long	0x2011c684,0x2011c684
-.long	0x7d244a85,0x7d244a85
-.long	0xf83dbbd2,0xf83dbbd2
-.long	0x1132f9ae,0x1132f9ae
-.long	0x6da129c7,0x6da129c7
-.long	0x4b2f9e1d,0x4b2f9e1d
-.long	0xf330b2dc,0xf330b2dc
-.long	0xec52860d,0xec52860d
-.long	0xd0e3c177,0xd0e3c177
-.long	0x6c16b32b,0x6c16b32b
-.long	0x99b970a9,0x99b970a9
-.long	0xfa489411,0xfa489411
-.long	0x2264e947,0x2264e947
-.long	0xc48cfca8,0xc48cfca8
-.long	0x1a3ff0a0,0x1a3ff0a0
-.long	0xd82c7d56,0xd82c7d56
-.long	0xef903322,0xef903322
-.long	0xc74e4987,0xc74e4987
-.long	0xc1d138d9,0xc1d138d9
-.long	0xfea2ca8c,0xfea2ca8c
-.long	0x360bd498,0x360bd498
-.long	0xcf81f5a6,0xcf81f5a6
-.long	0x28de7aa5,0x28de7aa5
-.long	0x268eb7da,0x268eb7da
-.long	0xa4bfad3f,0xa4bfad3f
-.long	0xe49d3a2c,0xe49d3a2c
-.long	0x0d927850,0x0d927850
-.long	0x9bcc5f6a,0x9bcc5f6a
-.long	0x62467e54,0x62467e54
-.long	0xc2138df6,0xc2138df6
-.long	0xe8b8d890,0xe8b8d890
-.long	0x5ef7392e,0x5ef7392e
-.long	0xf5afc382,0xf5afc382
-.long	0xbe805d9f,0xbe805d9f
-.long	0x7c93d069,0x7c93d069
-.long	0xa92dd56f,0xa92dd56f
-.long	0xb31225cf,0xb31225cf
-.long	0x3b99acc8,0x3b99acc8
-.long	0xa77d1810,0xa77d1810
-.long	0x6e639ce8,0x6e639ce8
-.long	0x7bbb3bdb,0x7bbb3bdb
-.long	0x097826cd,0x097826cd
-.long	0xf418596e,0xf418596e
-.long	0x01b79aec,0x01b79aec
-.long	0xa89a4f83,0xa89a4f83
-.long	0x656e95e6,0x656e95e6
-.long	0x7ee6ffaa,0x7ee6ffaa
-.long	0x08cfbc21,0x08cfbc21
-.long	0xe6e815ef,0xe6e815ef
-.long	0xd99be7ba,0xd99be7ba
-.long	0xce366f4a,0xce366f4a
-.long	0xd4099fea,0xd4099fea
-.long	0xd67cb029,0xd67cb029
-.long	0xafb2a431,0xafb2a431
-.long	0x31233f2a,0x31233f2a
-.long	0x3094a5c6,0x3094a5c6
-.long	0xc066a235,0xc066a235
-.long	0x37bc4e74,0x37bc4e74
-.long	0xa6ca82fc,0xa6ca82fc
-.long	0xb0d090e0,0xb0d090e0
-.long	0x15d8a733,0x15d8a733
-.long	0x4a9804f1,0x4a9804f1
-.long	0xf7daec41,0xf7daec41
-.long	0x0e50cd7f,0x0e50cd7f
-.long	0x2ff69117,0x2ff69117
-.long	0x8dd64d76,0x8dd64d76
-.long	0x4db0ef43,0x4db0ef43
-.long	0x544daacc,0x544daacc
-.long	0xdf0496e4,0xdf0496e4
-.long	0xe3b5d19e,0xe3b5d19e
-.long	0x1b886a4c,0x1b886a4c
-.long	0xb81f2cc1,0xb81f2cc1
-.long	0x7f516546,0x7f516546
-.long	0x04ea5e9d,0x04ea5e9d
-.long	0x5d358c01,0x5d358c01
-.long	0x737487fa,0x737487fa
-.long	0x2e410bfb,0x2e410bfb
-.long	0x5a1d67b3,0x5a1d67b3
-.long	0x52d2db92,0x52d2db92
-.long	0x335610e9,0x335610e9
-.long	0x1347d66d,0x1347d66d
-.long	0x8c61d79a,0x8c61d79a
-.long	0x7a0ca137,0x7a0ca137
-.long	0x8e14f859,0x8e14f859
-.long	0x893c13eb,0x893c13eb
-.long	0xee27a9ce,0xee27a9ce
-.long	0x35c961b7,0x35c961b7
-.long	0xede51ce1,0xede51ce1
-.long	0x3cb1477a,0x3cb1477a
-.long	0x59dfd29c,0x59dfd29c
-.long	0x3f73f255,0x3f73f255
-.long	0x79ce1418,0x79ce1418
-.long	0xbf37c773,0xbf37c773
-.long	0xeacdf753,0xeacdf753
-.long	0x5baafd5f,0x5baafd5f
-.long	0x146f3ddf,0x146f3ddf
-.long	0x86db4478,0x86db4478
-.long	0x81f3afca,0x81f3afca
-.long	0x3ec468b9,0x3ec468b9
-.long	0x2c342438,0x2c342438
-.long	0x5f40a3c2,0x5f40a3c2
-.long	0x72c31d16,0x72c31d16
-.long	0x0c25e2bc,0x0c25e2bc
-.long	0x8b493c28,0x8b493c28
-.long	0x41950dff,0x41950dff
-.long	0x7101a839,0x7101a839
-.long	0xdeb30c08,0xdeb30c08
-.long	0x9ce4b4d8,0x9ce4b4d8
-.long	0x90c15664,0x90c15664
-.long	0x6184cb7b,0x6184cb7b
-.long	0x70b632d5,0x70b632d5
-.long	0x745c6c48,0x745c6c48
-.long	0x4257b8d0,0x4257b8d0
-.byte	0x52,0x09,0x6a,0xd5,0x30,0x36,0xa5,0x38
-.byte	0xbf,0x40,0xa3,0x9e,0x81,0xf3,0xd7,0xfb
-.byte	0x7c,0xe3,0x39,0x82,0x9b,0x2f,0xff,0x87
-.byte	0x34,0x8e,0x43,0x44,0xc4,0xde,0xe9,0xcb
-.byte	0x54,0x7b,0x94,0x32,0xa6,0xc2,0x23,0x3d
-.byte	0xee,0x4c,0x95,0x0b,0x42,0xfa,0xc3,0x4e
-.byte	0x08,0x2e,0xa1,0x66,0x28,0xd9,0x24,0xb2
-.byte	0x76,0x5b,0xa2,0x49,0x6d,0x8b,0xd1,0x25
-.byte	0x72,0xf8,0xf6,0x64,0x86,0x68,0x98,0x16
-.byte	0xd4,0xa4,0x5c,0xcc,0x5d,0x65,0xb6,0x92
-.byte	0x6c,0x70,0x48,0x50,0xfd,0xed,0xb9,0xda
-.byte	0x5e,0x15,0x46,0x57,0xa7,0x8d,0x9d,0x84
-.byte	0x90,0xd8,0xab,0x00,0x8c,0xbc,0xd3,0x0a
-.byte	0xf7,0xe4,0x58,0x05,0xb8,0xb3,0x45,0x06
-.byte	0xd0,0x2c,0x1e,0x8f,0xca,0x3f,0x0f,0x02
-.byte	0xc1,0xaf,0xbd,0x03,0x01,0x13,0x8a,0x6b
-.byte	0x3a,0x91,0x11,0x41,0x4f,0x67,0xdc,0xea
-.byte	0x97,0xf2,0xcf,0xce,0xf0,0xb4,0xe6,0x73
-.byte	0x96,0xac,0x74,0x22,0xe7,0xad,0x35,0x85
-.byte	0xe2,0xf9,0x37,0xe8,0x1c,0x75,0xdf,0x6e
-.byte	0x47,0xf1,0x1a,0x71,0x1d,0x29,0xc5,0x89
-.byte	0x6f,0xb7,0x62,0x0e,0xaa,0x18,0xbe,0x1b
-.byte	0xfc,0x56,0x3e,0x4b,0xc6,0xd2,0x79,0x20
-.byte	0x9a,0xdb,0xc0,0xfe,0x78,0xcd,0x5a,0xf4
-.byte	0x1f,0xdd,0xa8,0x33,0x88,0x07,0xc7,0x31
-.byte	0xb1,0x12,0x10,0x59,0x27,0x80,0xec,0x5f
-.byte	0x60,0x51,0x7f,0xa9,0x19,0xb5,0x4a,0x0d
-.byte	0x2d,0xe5,0x7a,0x9f,0x93,0xc9,0x9c,0xef
-.byte	0xa0,0xe0,0x3b,0x4d,0xae,0x2a,0xf5,0xb0
-.byte	0xc8,0xeb,0xbb,0x3c,0x83,0x53,0x99,0x61
-.byte	0x17,0x2b,0x04,0x7e,0xba,0x77,0xd6,0x26
-.byte	0xe1,0x69,0x14,0x63,0x55,0x21,0x0c,0x7d
-.long	0x80808080, 0x80808080, 0xfefefefe, 0xfefefefe
-.long	0x1b1b1b1b, 0x1b1b1b1b, 0, 0
-.byte	0x52,0x09,0x6a,0xd5,0x30,0x36,0xa5,0x38
-.byte	0xbf,0x40,0xa3,0x9e,0x81,0xf3,0xd7,0xfb
-.byte	0x7c,0xe3,0x39,0x82,0x9b,0x2f,0xff,0x87
-.byte	0x34,0x8e,0x43,0x44,0xc4,0xde,0xe9,0xcb
-.byte	0x54,0x7b,0x94,0x32,0xa6,0xc2,0x23,0x3d
-.byte	0xee,0x4c,0x95,0x0b,0x42,0xfa,0xc3,0x4e
-.byte	0x08,0x2e,0xa1,0x66,0x28,0xd9,0x24,0xb2
-.byte	0x76,0x5b,0xa2,0x49,0x6d,0x8b,0xd1,0x25
-.byte	0x72,0xf8,0xf6,0x64,0x86,0x68,0x98,0x16
-.byte	0xd4,0xa4,0x5c,0xcc,0x5d,0x65,0xb6,0x92
-.byte	0x6c,0x70,0x48,0x50,0xfd,0xed,0xb9,0xda
-.byte	0x5e,0x15,0x46,0x57,0xa7,0x8d,0x9d,0x84
-.byte	0x90,0xd8,0xab,0x00,0x8c,0xbc,0xd3,0x0a
-.byte	0xf7,0xe4,0x58,0x05,0xb8,0xb3,0x45,0x06
-.byte	0xd0,0x2c,0x1e,0x8f,0xca,0x3f,0x0f,0x02
-.byte	0xc1,0xaf,0xbd,0x03,0x01,0x13,0x8a,0x6b
-.byte	0x3a,0x91,0x11,0x41,0x4f,0x67,0xdc,0xea
-.byte	0x97,0xf2,0xcf,0xce,0xf0,0xb4,0xe6,0x73
-.byte	0x96,0xac,0x74,0x22,0xe7,0xad,0x35,0x85
-.byte	0xe2,0xf9,0x37,0xe8,0x1c,0x75,0xdf,0x6e
-.byte	0x47,0xf1,0x1a,0x71,0x1d,0x29,0xc5,0x89
-.byte	0x6f,0xb7,0x62,0x0e,0xaa,0x18,0xbe,0x1b
-.byte	0xfc,0x56,0x3e,0x4b,0xc6,0xd2,0x79,0x20
-.byte	0x9a,0xdb,0xc0,0xfe,0x78,0xcd,0x5a,0xf4
-.byte	0x1f,0xdd,0xa8,0x33,0x88,0x07,0xc7,0x31
-.byte	0xb1,0x12,0x10,0x59,0x27,0x80,0xec,0x5f
-.byte	0x60,0x51,0x7f,0xa9,0x19,0xb5,0x4a,0x0d
-.byte	0x2d,0xe5,0x7a,0x9f,0x93,0xc9,0x9c,0xef
-.byte	0xa0,0xe0,0x3b,0x4d,0xae,0x2a,0xf5,0xb0
-.byte	0xc8,0xeb,0xbb,0x3c,0x83,0x53,0x99,0x61
-.byte	0x17,0x2b,0x04,0x7e,0xba,0x77,0xd6,0x26
-.byte	0xe1,0x69,0x14,0x63,0x55,0x21,0x0c,0x7d
-.long	0x80808080, 0x80808080, 0xfefefefe, 0xfefefefe
-.long	0x1b1b1b1b, 0x1b1b1b1b, 0, 0
-.byte	0x52,0x09,0x6a,0xd5,0x30,0x36,0xa5,0x38
-.byte	0xbf,0x40,0xa3,0x9e,0x81,0xf3,0xd7,0xfb
-.byte	0x7c,0xe3,0x39,0x82,0x9b,0x2f,0xff,0x87
-.byte	0x34,0x8e,0x43,0x44,0xc4,0xde,0xe9,0xcb
-.byte	0x54,0x7b,0x94,0x32,0xa6,0xc2,0x23,0x3d
-.byte	0xee,0x4c,0x95,0x0b,0x42,0xfa,0xc3,0x4e
-.byte	0x08,0x2e,0xa1,0x66,0x28,0xd9,0x24,0xb2
-.byte	0x76,0x5b,0xa2,0x49,0x6d,0x8b,0xd1,0x25
-.byte	0x72,0xf8,0xf6,0x64,0x86,0x68,0x98,0x16
-.byte	0xd4,0xa4,0x5c,0xcc,0x5d,0x65,0xb6,0x92
-.byte	0x6c,0x70,0x48,0x50,0xfd,0xed,0xb9,0xda
-.byte	0x5e,0x15,0x46,0x57,0xa7,0x8d,0x9d,0x84
-.byte	0x90,0xd8,0xab,0x00,0x8c,0xbc,0xd3,0x0a
-.byte	0xf7,0xe4,0x58,0x05,0xb8,0xb3,0x45,0x06
-.byte	0xd0,0x2c,0x1e,0x8f,0xca,0x3f,0x0f,0x02
-.byte	0xc1,0xaf,0xbd,0x03,0x01,0x13,0x8a,0x6b
-.byte	0x3a,0x91,0x11,0x41,0x4f,0x67,0xdc,0xea
-.byte	0x97,0xf2,0xcf,0xce,0xf0,0xb4,0xe6,0x73
-.byte	0x96,0xac,0x74,0x22,0xe7,0xad,0x35,0x85
-.byte	0xe2,0xf9,0x37,0xe8,0x1c,0x75,0xdf,0x6e
-.byte	0x47,0xf1,0x1a,0x71,0x1d,0x29,0xc5,0x89
-.byte	0x6f,0xb7,0x62,0x0e,0xaa,0x18,0xbe,0x1b
-.byte	0xfc,0x56,0x3e,0x4b,0xc6,0xd2,0x79,0x20
-.byte	0x9a,0xdb,0xc0,0xfe,0x78,0xcd,0x5a,0xf4
-.byte	0x1f,0xdd,0xa8,0x33,0x88,0x07,0xc7,0x31
-.byte	0xb1,0x12,0x10,0x59,0x27,0x80,0xec,0x5f
-.byte	0x60,0x51,0x7f,0xa9,0x19,0xb5,0x4a,0x0d
-.byte	0x2d,0xe5,0x7a,0x9f,0x93,0xc9,0x9c,0xef
-.byte	0xa0,0xe0,0x3b,0x4d,0xae,0x2a,0xf5,0xb0
-.byte	0xc8,0xeb,0xbb,0x3c,0x83,0x53,0x99,0x61
-.byte	0x17,0x2b,0x04,0x7e,0xba,0x77,0xd6,0x26
-.byte	0xe1,0x69,0x14,0x63,0x55,0x21,0x0c,0x7d
-.long	0x80808080, 0x80808080, 0xfefefefe, 0xfefefefe
-.long	0x1b1b1b1b, 0x1b1b1b1b, 0, 0
-.byte	0x52,0x09,0x6a,0xd5,0x30,0x36,0xa5,0x38
-.byte	0xbf,0x40,0xa3,0x9e,0x81,0xf3,0xd7,0xfb
-.byte	0x7c,0xe3,0x39,0x82,0x9b,0x2f,0xff,0x87
-.byte	0x34,0x8e,0x43,0x44,0xc4,0xde,0xe9,0xcb
-.byte	0x54,0x7b,0x94,0x32,0xa6,0xc2,0x23,0x3d
-.byte	0xee,0x4c,0x95,0x0b,0x42,0xfa,0xc3,0x4e
-.byte	0x08,0x2e,0xa1,0x66,0x28,0xd9,0x24,0xb2
-.byte	0x76,0x5b,0xa2,0x49,0x6d,0x8b,0xd1,0x25
-.byte	0x72,0xf8,0xf6,0x64,0x86,0x68,0x98,0x16
-.byte	0xd4,0xa4,0x5c,0xcc,0x5d,0x65,0xb6,0x92
-.byte	0x6c,0x70,0x48,0x50,0xfd,0xed,0xb9,0xda
-.byte	0x5e,0x15,0x46,0x57,0xa7,0x8d,0x9d,0x84
-.byte	0x90,0xd8,0xab,0x00,0x8c,0xbc,0xd3,0x0a
-.byte	0xf7,0xe4,0x58,0x05,0xb8,0xb3,0x45,0x06
-.byte	0xd0,0x2c,0x1e,0x8f,0xca,0x3f,0x0f,0x02
-.byte	0xc1,0xaf,0xbd,0x03,0x01,0x13,0x8a,0x6b
-.byte	0x3a,0x91,0x11,0x41,0x4f,0x67,0xdc,0xea
-.byte	0x97,0xf2,0xcf,0xce,0xf0,0xb4,0xe6,0x73
-.byte	0x96,0xac,0x74,0x22,0xe7,0xad,0x35,0x85
-.byte	0xe2,0xf9,0x37,0xe8,0x1c,0x75,0xdf,0x6e
-.byte	0x47,0xf1,0x1a,0x71,0x1d,0x29,0xc5,0x89
-.byte	0x6f,0xb7,0x62,0x0e,0xaa,0x18,0xbe,0x1b
-.byte	0xfc,0x56,0x3e,0x4b,0xc6,0xd2,0x79,0x20
-.byte	0x9a,0xdb,0xc0,0xfe,0x78,0xcd,0x5a,0xf4
-.byte	0x1f,0xdd,0xa8,0x33,0x88,0x07,0xc7,0x31
-.byte	0xb1,0x12,0x10,0x59,0x27,0x80,0xec,0x5f
-.byte	0x60,0x51,0x7f,0xa9,0x19,0xb5,0x4a,0x0d
-.byte	0x2d,0xe5,0x7a,0x9f,0x93,0xc9,0x9c,0xef
-.byte	0xa0,0xe0,0x3b,0x4d,0xae,0x2a,0xf5,0xb0
-.byte	0xc8,0xeb,0xbb,0x3c,0x83,0x53,0x99,0x61
-.byte	0x17,0x2b,0x04,0x7e,0xba,0x77,0xd6,0x26
-.byte	0xe1,0x69,0x14,0x63,0x55,0x21,0x0c,0x7d
-.long	0x80808080, 0x80808080, 0xfefefefe, 0xfefefefe
-.long	0x1b1b1b1b, 0x1b1b1b1b, 0, 0
-.byte	65,69,83,32,102,111,114,32,120,56,54,95,54,52,44,32,67,82,89,80,84,79,71,65,77,83,32,98,121,32,60,97,112,112,114,111,64,111,112,101,110,115,115,108,46,111,114,103,62,0
-.align	64
diff --git a/deps/openssl/config/archs/solaris64-x86_64-gcc/asm_avx2/crypto/aes/aesni-sha1-x86_64.s b/deps/openssl/config/archs/solaris64-x86_64-gcc/asm_avx2/crypto/aes/aesni-sha1-x86_64.s
index 4d2dfe4489..978bd2b623 100644
--- a/deps/openssl/config/archs/solaris64-x86_64-gcc/asm_avx2/crypto/aes/aesni-sha1-x86_64.s
+++ b/deps/openssl/config/archs/solaris64-x86_64-gcc/asm_avx2/crypto/aes/aesni-sha1-x86_64.s
@@ -5,6 +5,7 @@
 .type	aesni_cbc_sha1_enc,@function
 .align	32
 aesni_cbc_sha1_enc:
+.cfi_startproc
 
 	movl	OPENSSL_ia32cap_P+0(%rip),%r10d
 	movq	OPENSSL_ia32cap_P+4(%rip),%r11
@@ -17,6 +18,7 @@ aesni_cbc_sha1_enc:
 	je	aesni_cbc_sha1_enc_avx
 	jmp	aesni_cbc_sha1_enc_ssse3
 	.byte	0xf3,0xc3
+.cfi_endproc
 .size	aesni_cbc_sha1_enc,.-aesni_cbc_sha1_enc
 .type	aesni_cbc_sha1_enc_ssse3,@function
 .align	32
@@ -2730,6 +2732,7 @@ K_XX_XX:
 .type	aesni_cbc_sha1_enc_shaext,@function
 .align	32
 aesni_cbc_sha1_enc_shaext:
+.cfi_startproc
 	movq	8(%rsp),%r10
 	movdqu	(%r9),%xmm8
 	movd	16(%r9),%xmm9
@@ -3028,4 +3031,5 @@ aesni_cbc_sha1_enc_shaext:
 	movdqu	%xmm8,(%r9)
 	movd	%xmm9,16(%r9)
 	.byte	0xf3,0xc3
+.cfi_endproc
 .size	aesni_cbc_sha1_enc_shaext,.-aesni_cbc_sha1_enc_shaext
diff --git a/deps/openssl/config/archs/solaris64-x86_64-gcc/asm_avx2/crypto/aes/aesni-sha256-x86_64.s b/deps/openssl/config/archs/solaris64-x86_64-gcc/asm_avx2/crypto/aes/aesni-sha256-x86_64.s
index 5a47b3ee51..dd09f1b290 100644
--- a/deps/openssl/config/archs/solaris64-x86_64-gcc/asm_avx2/crypto/aes/aesni-sha256-x86_64.s
+++ b/deps/openssl/config/archs/solaris64-x86_64-gcc/asm_avx2/crypto/aes/aesni-sha256-x86_64.s
@@ -5,6 +5,7 @@
 .type	aesni_cbc_sha256_enc,@function
 .align	16
 aesni_cbc_sha256_enc:
+.cfi_startproc
 	leaq	OPENSSL_ia32cap_P(%rip),%r11
 	movl	$1,%eax
 	cmpq	$0,%rdi
@@ -30,6 +31,7 @@ aesni_cbc_sha256_enc:
 	ud2
 .Lprobe:
 	.byte	0xf3,0xc3
+.cfi_endproc
 .size	aesni_cbc_sha256_enc,.-aesni_cbc_sha256_enc
 
 .align	64
@@ -2528,7 +2530,15 @@ aesni_cbc_sha256_enc_avx2:
 	vmovdqa	%ymm4,0(%rsp)
 	xorl	%r14d,%r14d
 	vmovdqa	%ymm5,32(%rsp)
+
+	movq	120(%rsp),%rsi
+.cfi_def_cfa	%rsi,8
 	leaq	-64(%rsp),%rsp
+
+
+
+	movq	%rsi,-8(%rsp)
+.cfi_escape	0x0f,0x05,0x77,0x78,0x06,0x23,0x08
 	movl	%ebx,%esi
 	vmovdqa	%ymm6,0(%rsp)
 	xorl	%ecx,%esi
@@ -2542,6 +2552,12 @@ aesni_cbc_sha256_enc_avx2:
 	vmovdqu	(%r13),%xmm9
 	vpinsrq	$0,%r13,%xmm15,%xmm15
 	leaq	-64(%rsp),%rsp
+.cfi_escape	0x0f,0x05,0x77,0x38,0x06,0x23,0x08
+
+	pushq	64-8(%rsp)
+.cfi_escape	0x0f,0x05,0x77,0x00,0x06,0x23,0x08
+	leaq	8(%rsp),%rsp
+.cfi_escape	0x0f,0x05,0x77,0x78,0x06,0x23,0x08
 	vpalignr	$4,%ymm0,%ymm1,%ymm4
 	addl	0+128(%rsp),%r11d
 	andl	%r8d,%r12d
@@ -2816,6 +2832,12 @@ aesni_cbc_sha256_enc_avx2:
 	movl	%r9d,%r12d
 	vmovdqa	%ymm6,32(%rsp)
 	leaq	-64(%rsp),%rsp
+.cfi_escape	0x0f,0x05,0x77,0x38,0x06,0x23,0x08
+
+	pushq	64-8(%rsp)
+.cfi_escape	0x0f,0x05,0x77,0x00,0x06,0x23,0x08
+	leaq	8(%rsp),%rsp
+.cfi_escape	0x0f,0x05,0x77,0x78,0x06,0x23,0x08
 	vpalignr	$4,%ymm2,%ymm3,%ymm4
 	addl	0+128(%rsp),%r11d
 	andl	%r8d,%r12d
@@ -4029,10 +4051,12 @@ aesni_cbc_sha256_enc_avx2:
 	jbe	.Loop_avx2
 	leaq	(%rsp),%rbp
 
+
+.cfi_escape	0x0f,0x06,0x76,0xf8,0x00,0x06,0x23,0x08
+
 .Ldone_avx2:
-	leaq	(%rbp),%rsp
-	movq	64+32(%rsp),%r8
-	movq	120(%rsp),%rsi
+	movq	64+32(%rbp),%r8
+	movq	64+56(%rbp),%rsi
 .cfi_def_cfa	%rsi,8
 	vmovdqu	%xmm8,(%r8)
 	vzeroall
@@ -4057,6 +4081,7 @@ aesni_cbc_sha256_enc_avx2:
 .type	aesni_cbc_sha256_enc_shaext,@function
 .align	32
 aesni_cbc_sha256_enc_shaext:
+.cfi_startproc
 	movq	8(%rsp),%r10
 	leaq	K256+128(%rip),%rax
 	movdqu	(%r9),%xmm1
@@ -4406,4 +4431,5 @@ aesni_cbc_sha256_enc_shaext:
 	movdqu	%xmm1,(%r9)
 	movdqu	%xmm2,16(%r9)
 	.byte	0xf3,0xc3
+.cfi_endproc
 .size	aesni_cbc_sha256_enc_shaext,.-aesni_cbc_sha256_enc_shaext
diff --git a/deps/openssl/config/archs/solaris64-x86_64-gcc/asm_avx2/crypto/aes/aesni-x86_64.s b/deps/openssl/config/archs/solaris64-x86_64-gcc/asm_avx2/crypto/aes/aesni-x86_64.s
index 2986a647c1..c1e791eff5 100644
--- a/deps/openssl/config/archs/solaris64-x86_64-gcc/asm_avx2/crypto/aes/aesni-x86_64.s
+++ b/deps/openssl/config/archs/solaris64-x86_64-gcc/asm_avx2/crypto/aes/aesni-x86_64.s
@@ -861,6 +861,7 @@ aesni_ecb_encrypt:
 .type	aesni_ccm64_encrypt_blocks,@function
 .align	16
 aesni_ccm64_encrypt_blocks:
+.cfi_startproc
 	movl	240(%rcx),%eax
 	movdqu	(%r8),%xmm6
 	movdqa	.Lincrement64(%rip),%xmm9
@@ -919,11 +920,13 @@ aesni_ccm64_encrypt_blocks:
 	pxor	%xmm8,%xmm8
 	pxor	%xmm6,%xmm6
 	.byte	0xf3,0xc3
+.cfi_endproc
 .size	aesni_ccm64_encrypt_blocks,.-aesni_ccm64_encrypt_blocks
 .globl	aesni_ccm64_decrypt_blocks
 .type	aesni_ccm64_decrypt_blocks,@function
 .align	16
 aesni_ccm64_decrypt_blocks:
+.cfi_startproc
 	movl	240(%rcx),%eax
 	movups	(%r8),%xmm6
 	movdqu	(%r9),%xmm3
@@ -1016,6 +1019,7 @@ aesni_ccm64_decrypt_blocks:
 	pxor	%xmm8,%xmm8
 	pxor	%xmm6,%xmm6
 	.byte	0xf3,0xc3
+.cfi_endproc
 .size	aesni_ccm64_decrypt_blocks,.-aesni_ccm64_decrypt_blocks
 .globl	aesni_ctr32_encrypt_blocks
 .type	aesni_ctr32_encrypt_blocks,@function
@@ -2790,6 +2794,7 @@ aesni_ocb_encrypt:
 .type	__ocb_encrypt6,@function
 .align	32
 __ocb_encrypt6:
+.cfi_startproc
 	pxor	%xmm9,%xmm15
 	movdqu	(%rbx,%r12,1),%xmm11
 	movdqa	%xmm10,%xmm12
@@ -2887,11 +2892,13 @@ __ocb_encrypt6:
 .byte	102,65,15,56,221,246
 .byte	102,65,15,56,221,255
 	.byte	0xf3,0xc3
+.cfi_endproc
 .size	__ocb_encrypt6,.-__ocb_encrypt6
 
 .type	__ocb_encrypt4,@function
 .align	32
 __ocb_encrypt4:
+.cfi_startproc
 	pxor	%xmm9,%xmm15
 	movdqu	(%rbx,%r12,1),%xmm11
 	movdqa	%xmm10,%xmm12
@@ -2956,11 +2963,13 @@ __ocb_encrypt4:
 .byte	102,65,15,56,221,228
 .byte	102,65,15,56,221,237
 	.byte	0xf3,0xc3
+.cfi_endproc
 .size	__ocb_encrypt4,.-__ocb_encrypt4
 
 .type	__ocb_encrypt1,@function
 .align	32
 __ocb_encrypt1:
+.cfi_startproc
 	pxor	%xmm15,%xmm7
 	pxor	%xmm9,%xmm7
 	pxor	%xmm2,%xmm8
@@ -2991,6 +3000,7 @@ __ocb_encrypt1:
 
 .byte	102,15,56,221,215
 	.byte	0xf3,0xc3
+.cfi_endproc
 .size	__ocb_encrypt1,.-__ocb_encrypt1
 
 .globl	aesni_ocb_decrypt
@@ -3233,6 +3243,7 @@ aesni_ocb_decrypt:
 .type	__ocb_decrypt6,@function
 .align	32
 __ocb_decrypt6:
+.cfi_startproc
 	pxor	%xmm9,%xmm15
 	movdqu	(%rbx,%r12,1),%xmm11
 	movdqa	%xmm10,%xmm12
@@ -3324,11 +3335,13 @@ __ocb_decrypt6:
 .byte	102,65,15,56,223,246
 .byte	102,65,15,56,223,255
 	.byte	0xf3,0xc3
+.cfi_endproc
 .size	__ocb_decrypt6,.-__ocb_decrypt6
 
 .type	__ocb_decrypt4,@function
 .align	32
 __ocb_decrypt4:
+.cfi_startproc
 	pxor	%xmm9,%xmm15
 	movdqu	(%rbx,%r12,1),%xmm11
 	movdqa	%xmm10,%xmm12
@@ -3389,11 +3402,13 @@ __ocb_decrypt4:
 .byte	102,65,15,56,223,228
 .byte	102,65,15,56,223,237
 	.byte	0xf3,0xc3
+.cfi_endproc
 .size	__ocb_decrypt4,.-__ocb_decrypt4
 
 .type	__ocb_decrypt1,@function
 .align	32
 __ocb_decrypt1:
+.cfi_startproc
 	pxor	%xmm15,%xmm7
 	pxor	%xmm9,%xmm7
 	pxor	%xmm7,%xmm2
@@ -3423,6 +3438,7 @@ __ocb_decrypt1:
 
 .byte	102,15,56,223,215
 	.byte	0xf3,0xc3
+.cfi_endproc
 .size	__ocb_decrypt1,.-__ocb_decrypt1
 .globl	aesni_cbc_encrypt
 .type	aesni_cbc_encrypt,@function
@@ -4361,7 +4377,6 @@ __aesni_set_encrypt_key:
 	addq	$8,%rsp
 .cfi_adjust_cfa_offset	-8
 	.byte	0xf3,0xc3
-.cfi_endproc	
 .LSEH_end_set_encrypt_key:
 
 .align	16
@@ -4432,6 +4447,7 @@ __aesni_set_encrypt_key:
 	shufps	$170,%xmm1,%xmm1
 	xorps	%xmm1,%xmm2
 	.byte	0xf3,0xc3
+.cfi_endproc
 .size	aesni_set_encrypt_key,.-aesni_set_encrypt_key
 .size	__aesni_set_encrypt_key,.-__aesni_set_encrypt_key
 .align	64
diff --git a/deps/openssl/config/archs/solaris64-x86_64-gcc/asm_avx2/crypto/aes/bsaes-x86_64.s b/deps/openssl/config/archs/solaris64-x86_64-gcc/asm_avx2/crypto/aes/bsaes-x86_64.s
deleted file mode 100644
index e1f3abadbc..0000000000
--- a/deps/openssl/config/archs/solaris64-x86_64-gcc/asm_avx2/crypto/aes/bsaes-x86_64.s
+++ /dev/null
@@ -1,2595 +0,0 @@
-.text	
-
-
-
-
-.type	_bsaes_encrypt8,@function
-.align	64
-_bsaes_encrypt8:
-.cfi_startproc	
-	leaq	.LBS0(%rip),%r11
-
-	movdqa	(%rax),%xmm8
-	leaq	16(%rax),%rax
-	movdqa	80(%r11),%xmm7
-	pxor	%xmm8,%xmm15
-	pxor	%xmm8,%xmm0
-	pxor	%xmm8,%xmm1
-	pxor	%xmm8,%xmm2
-.byte	102,68,15,56,0,255
-.byte	102,15,56,0,199
-	pxor	%xmm8,%xmm3
-	pxor	%xmm8,%xmm4
-.byte	102,15,56,0,207
-.byte	102,15,56,0,215
-	pxor	%xmm8,%xmm5
-	pxor	%xmm8,%xmm6
-.byte	102,15,56,0,223
-.byte	102,15,56,0,231
-.byte	102,15,56,0,239
-.byte	102,15,56,0,247
-_bsaes_encrypt8_bitslice:
-	movdqa	0(%r11),%xmm7
-	movdqa	16(%r11),%xmm8
-	movdqa	%xmm5,%xmm9
-	psrlq	$1,%xmm5
-	movdqa	%xmm3,%xmm10
-	psrlq	$1,%xmm3
-	pxor	%xmm6,%xmm5
-	pxor	%xmm4,%xmm3
-	pand	%xmm7,%xmm5
-	pand	%xmm7,%xmm3
-	pxor	%xmm5,%xmm6
-	psllq	$1,%xmm5
-	pxor	%xmm3,%xmm4
-	psllq	$1,%xmm3
-	pxor	%xmm9,%xmm5
-	pxor	%xmm10,%xmm3
-	movdqa	%xmm1,%xmm9
-	psrlq	$1,%xmm1
-	movdqa	%xmm15,%xmm10
-	psrlq	$1,%xmm15
-	pxor	%xmm2,%xmm1
-	pxor	%xmm0,%xmm15
-	pand	%xmm7,%xmm1
-	pand	%xmm7,%xmm15
-	pxor	%xmm1,%xmm2
-	psllq	$1,%xmm1
-	pxor	%xmm15,%xmm0
-	psllq	$1,%xmm15
-	pxor	%xmm9,%xmm1
-	pxor	%xmm10,%xmm15
-	movdqa	32(%r11),%xmm7
-	movdqa	%xmm4,%xmm9
-	psrlq	$2,%xmm4
-	movdqa	%xmm3,%xmm10
-	psrlq	$2,%xmm3
-	pxor	%xmm6,%xmm4
-	pxor	%xmm5,%xmm3
-	pand	%xmm8,%xmm4
-	pand	%xmm8,%xmm3
-	pxor	%xmm4,%xmm6
-	psllq	$2,%xmm4
-	pxor	%xmm3,%xmm5
-	psllq	$2,%xmm3
-	pxor	%xmm9,%xmm4
-	pxor	%xmm10,%xmm3
-	movdqa	%xmm0,%xmm9
-	psrlq	$2,%xmm0
-	movdqa	%xmm15,%xmm10
-	psrlq	$2,%xmm15
-	pxor	%xmm2,%xmm0
-	pxor	%xmm1,%xmm15
-	pand	%xmm8,%xmm0
-	pand	%xmm8,%xmm15
-	pxor	%xmm0,%xmm2
-	psllq	$2,%xmm0
-	pxor	%xmm15,%xmm1
-	psllq	$2,%xmm15
-	pxor	%xmm9,%xmm0
-	pxor	%xmm10,%xmm15
-	movdqa	%xmm2,%xmm9
-	psrlq	$4,%xmm2
-	movdqa	%xmm1,%xmm10
-	psrlq	$4,%xmm1
-	pxor	%xmm6,%xmm2
-	pxor	%xmm5,%xmm1
-	pand	%xmm7,%xmm2
-	pand	%xmm7,%xmm1
-	pxor	%xmm2,%xmm6
-	psllq	$4,%xmm2
-	pxor	%xmm1,%xmm5
-	psllq	$4,%xmm1
-	pxor	%xmm9,%xmm2
-	pxor	%xmm10,%xmm1
-	movdqa	%xmm0,%xmm9
-	psrlq	$4,%xmm0
-	movdqa	%xmm15,%xmm10
-	psrlq	$4,%xmm15
-	pxor	%xmm4,%xmm0
-	pxor	%xmm3,%xmm15
-	pand	%xmm7,%xmm0
-	pand	%xmm7,%xmm15
-	pxor	%xmm0,%xmm4
-	psllq	$4,%xmm0
-	pxor	%xmm15,%xmm3
-	psllq	$4,%xmm15
-	pxor	%xmm9,%xmm0
-	pxor	%xmm10,%xmm15
-	decl	%r10d
-	jmp	.Lenc_sbox
-.align	16
-.Lenc_loop:
-	pxor	0(%rax),%xmm15
-	pxor	16(%rax),%xmm0
-	pxor	32(%rax),%xmm1
-	pxor	48(%rax),%xmm2
-.byte	102,68,15,56,0,255
-.byte	102,15,56,0,199
-	pxor	64(%rax),%xmm3
-	pxor	80(%rax),%xmm4
-.byte	102,15,56,0,207
-.byte	102,15,56,0,215
-	pxor	96(%rax),%xmm5
-	pxor	112(%rax),%xmm6
-.byte	102,15,56,0,223
-.byte	102,15,56,0,231
-.byte	102,15,56,0,239
-.byte	102,15,56,0,247
-	leaq	128(%rax),%rax
-.Lenc_sbox:
-	pxor	%xmm5,%xmm4
-	pxor	%xmm0,%xmm1
-	pxor	%xmm15,%xmm2
-	pxor	%xmm1,%xmm5
-	pxor	%xmm15,%xmm4
-
-	pxor	%xmm2,%xmm5
-	pxor	%xmm6,%xmm2
-	pxor	%xmm4,%xmm6
-	pxor	%xmm3,%xmm2
-	pxor	%xmm4,%xmm3
-	pxor	%xmm0,%xmm2
-
-	pxor	%xmm6,%xmm1
-	pxor	%xmm4,%xmm0
-	movdqa	%xmm6,%xmm10
-	movdqa	%xmm0,%xmm9
-	movdqa	%xmm4,%xmm8
-	movdqa	%xmm1,%xmm12
-	movdqa	%xmm5,%xmm11
-
-	pxor	%xmm3,%xmm10
-	pxor	%xmm1,%xmm9
-	pxor	%xmm2,%xmm8
-	movdqa	%xmm10,%xmm13
-	pxor	%xmm3,%xmm12
-	movdqa	%xmm9,%xmm7
-	pxor	%xmm15,%xmm11
-	movdqa	%xmm10,%xmm14
-
-	por	%xmm8,%xmm9
-	por	%xmm11,%xmm10
-	pxor	%xmm7,%xmm14
-	pand	%xmm11,%xmm13
-	pxor	%xmm8,%xmm11
-	pand	%xmm8,%xmm7
-	pand	%xmm11,%xmm14
-	movdqa	%xmm2,%xmm11
-	pxor	%xmm15,%xmm11
-	pand	%xmm11,%xmm12
-	pxor	%xmm12,%xmm10
-	pxor	%xmm12,%xmm9
-	movdqa	%xmm6,%xmm12
-	movdqa	%xmm4,%xmm11
-	pxor	%xmm0,%xmm12
-	pxor	%xmm5,%xmm11
-	movdqa	%xmm12,%xmm8
-	pand	%xmm11,%xmm12
-	por	%xmm11,%xmm8
-	pxor	%xmm12,%xmm7
-	pxor	%xmm14,%xmm10
-	pxor	%xmm13,%xmm9
-	pxor	%xmm14,%xmm8
-	movdqa	%xmm1,%xmm11
-	pxor	%xmm13,%xmm7
-	movdqa	%xmm3,%xmm12
-	pxor	%xmm13,%xmm8
-	movdqa	%xmm0,%xmm13
-	pand	%xmm2,%xmm11
-	movdqa	%xmm6,%xmm14
-	pand	%xmm15,%xmm12
-	pand	%xmm4,%xmm13
-	por	%xmm5,%xmm14
-	pxor	%xmm11,%xmm10
-	pxor	%xmm12,%xmm9
-	pxor	%xmm13,%xmm8
-	pxor	%xmm14,%xmm7
-
-
-
-
-
-	movdqa	%xmm10,%xmm11
-	pand	%xmm8,%xmm10
-	pxor	%xmm9,%xmm11
-
-	movdqa	%xmm7,%xmm13
-	movdqa	%xmm11,%xmm14
-	pxor	%xmm10,%xmm13
-	pand	%xmm13,%xmm14
-
-	movdqa	%xmm8,%xmm12
-	pxor	%xmm9,%xmm14
-	pxor	%xmm7,%xmm12
-
-	pxor	%xmm9,%xmm10
-
-	pand	%xmm10,%xmm12
-
-	movdqa	%xmm13,%xmm9
-	pxor	%xmm7,%xmm12
-
-	pxor	%xmm12,%xmm9
-	pxor	%xmm12,%xmm8
-
-	pand	%xmm7,%xmm9
-
-	pxor	%xmm9,%xmm13
-	pxor	%xmm9,%xmm8
-
-	pand	%xmm14,%xmm13
-
-	pxor	%xmm11,%xmm13
-	movdqa	%xmm5,%xmm11
-	movdqa	%xmm4,%xmm7
-	movdqa	%xmm14,%xmm9
-	pxor	%xmm13,%xmm9
-	pand	%xmm5,%xmm9
-	pxor	%xmm4,%xmm5
-	pand	%xmm14,%xmm4
-	pand	%xmm13,%xmm5
-	pxor	%xmm4,%xmm5
-	pxor	%xmm9,%xmm4
-	pxor	%xmm15,%xmm11
-	pxor	%xmm2,%xmm7
-	pxor	%xmm12,%xmm14
-	pxor	%xmm8,%xmm13
-	movdqa	%xmm14,%xmm10
-	movdqa	%xmm12,%xmm9
-	pxor	%xmm13,%xmm10
-	pxor	%xmm8,%xmm9
-	pand	%xmm11,%xmm10
-	pand	%xmm15,%xmm9
-	pxor	%xmm7,%xmm11
-	pxor	%xmm2,%xmm15
-	pand	%xmm14,%xmm7
-	pand	%xmm12,%xmm2
-	pand	%xmm13,%xmm11
-	pand	%xmm8,%xmm15
-	pxor	%xmm11,%xmm7
-	pxor	%xmm2,%xmm15
-	pxor	%xmm10,%xmm11
-	pxor	%xmm9,%xmm2
-	pxor	%xmm11,%xmm5
-	pxor	%xmm11,%xmm15
-	pxor	%xmm7,%xmm4
-	pxor	%xmm7,%xmm2
-
-	movdqa	%xmm6,%xmm11
-	movdqa	%xmm0,%xmm7
-	pxor	%xmm3,%xmm11
-	pxor	%xmm1,%xmm7
-	movdqa	%xmm14,%xmm10
-	movdqa	%xmm12,%xmm9
-	pxor	%xmm13,%xmm10
-	pxor	%xmm8,%xmm9
-	pand	%xmm11,%xmm10
-	pand	%xmm3,%xmm9
-	pxor	%xmm7,%xmm11
-	pxor	%xmm1,%xmm3
-	pand	%xmm14,%xmm7
-	pand	%xmm12,%xmm1
-	pand	%xmm13,%xmm11
-	pand	%xmm8,%xmm3
-	pxor	%xmm11,%xmm7
-	pxor	%xmm1,%xmm3
-	pxor	%xmm10,%xmm11
-	pxor	%xmm9,%xmm1
-	pxor	%xmm12,%xmm14
-	pxor	%xmm8,%xmm13
-	movdqa	%xmm14,%xmm10
-	pxor	%xmm13,%xmm10
-	pand	%xmm6,%xmm10
-	pxor	%xmm0,%xmm6
-	pand	%xmm14,%xmm0
-	pand	%xmm13,%xmm6
-	pxor	%xmm0,%xmm6
-	pxor	%xmm10,%xmm0
-	pxor	%xmm11,%xmm6
-	pxor	%xmm11,%xmm3
-	pxor	%xmm7,%xmm0
-	pxor	%xmm7,%xmm1
-	pxor	%xmm15,%xmm6
-	pxor	%xmm5,%xmm0
-	pxor	%xmm6,%xmm3
-	pxor	%xmm15,%xmm5
-	pxor	%xmm0,%xmm15
-
-	pxor	%xmm4,%xmm0
-	pxor	%xmm1,%xmm4
-	pxor	%xmm2,%xmm1
-	pxor	%xmm4,%xmm2
-	pxor	%xmm4,%xmm3
-
-	pxor	%xmm2,%xmm5
-	decl	%r10d
-	jl	.Lenc_done
-	pshufd	$0x93,%xmm15,%xmm7
-	pshufd	$0x93,%xmm0,%xmm8
-	pxor	%xmm7,%xmm15
-	pshufd	$0x93,%xmm3,%xmm9
-	pxor	%xmm8,%xmm0
-	pshufd	$0x93,%xmm5,%xmm10
-	pxor	%xmm9,%xmm3
-	pshufd	$0x93,%xmm2,%xmm11
-	pxor	%xmm10,%xmm5
-	pshufd	$0x93,%xmm6,%xmm12
-	pxor	%xmm11,%xmm2
-	pshufd	$0x93,%xmm1,%xmm13
-	pxor	%xmm12,%xmm6
-	pshufd	$0x93,%xmm4,%xmm14
-	pxor	%xmm13,%xmm1
-	pxor	%xmm14,%xmm4
-
-	pxor	%xmm15,%xmm8
-	pxor	%xmm4,%xmm7
-	pxor	%xmm4,%xmm8
-	pshufd	$0x4E,%xmm15,%xmm15
-	pxor	%xmm0,%xmm9
-	pshufd	$0x4E,%xmm0,%xmm0
-	pxor	%xmm2,%xmm12
-	pxor	%xmm7,%xmm15
-	pxor	%xmm6,%xmm13
-	pxor	%xmm8,%xmm0
-	pxor	%xmm5,%xmm11
-	pshufd	$0x4E,%xmm2,%xmm7
-	pxor	%xmm1,%xmm14
-	pshufd	$0x4E,%xmm6,%xmm8
-	pxor	%xmm3,%xmm10
-	pshufd	$0x4E,%xmm5,%xmm2
-	pxor	%xmm4,%xmm10
-	pshufd	$0x4E,%xmm4,%xmm6
-	pxor	%xmm4,%xmm11
-	pshufd	$0x4E,%xmm1,%xmm5
-	pxor	%xmm11,%xmm7
-	pshufd	$0x4E,%xmm3,%xmm1
-	pxor	%xmm12,%xmm8
-	pxor	%xmm10,%xmm2
-	pxor	%xmm14,%xmm6
-	pxor	%xmm13,%xmm5
-	movdqa	%xmm7,%xmm3
-	pxor	%xmm9,%xmm1
-	movdqa	%xmm8,%xmm4
-	movdqa	48(%r11),%xmm7
-	jnz	.Lenc_loop
-	movdqa	64(%r11),%xmm7
-	jmp	.Lenc_loop
-.align	16
-.Lenc_done:
-	movdqa	0(%r11),%xmm7
-	movdqa	16(%r11),%xmm8
-	movdqa	%xmm1,%xmm9
-	psrlq	$1,%xmm1
-	movdqa	%xmm2,%xmm10
-	psrlq	$1,%xmm2
-	pxor	%xmm4,%xmm1
-	pxor	%xmm6,%xmm2
-	pand	%xmm7,%xmm1
-	pand	%xmm7,%xmm2
-	pxor	%xmm1,%xmm4
-	psllq	$1,%xmm1
-	pxor	%xmm2,%xmm6
-	psllq	$1,%xmm2
-	pxor	%xmm9,%xmm1
-	pxor	%xmm10,%xmm2
-	movdqa	%xmm3,%xmm9
-	psrlq	$1,%xmm3
-	movdqa	%xmm15,%xmm10
-	psrlq	$1,%xmm15
-	pxor	%xmm5,%xmm3
-	pxor	%xmm0,%xmm15
-	pand	%xmm7,%xmm3
-	pand	%xmm7,%xmm15
-	pxor	%xmm3,%xmm5
-	psllq	$1,%xmm3
-	pxor	%xmm15,%xmm0
-	psllq	$1,%xmm15
-	pxor	%xmm9,%xmm3
-	pxor	%xmm10,%xmm15
-	movdqa	32(%r11),%xmm7
-	movdqa	%xmm6,%xmm9
-	psrlq	$2,%xmm6
-	movdqa	%xmm2,%xmm10
-	psrlq	$2,%xmm2
-	pxor	%xmm4,%xmm6
-	pxor	%xmm1,%xmm2
-	pand	%xmm8,%xmm6
-	pand	%xmm8,%xmm2
-	pxor	%xmm6,%xmm4
-	psllq	$2,%xmm6
-	pxor	%xmm2,%xmm1
-	psllq	$2,%xmm2
-	pxor	%xmm9,%xmm6
-	pxor	%xmm10,%xmm2
-	movdqa	%xmm0,%xmm9
-	psrlq	$2,%xmm0
-	movdqa	%xmm15,%xmm10
-	psrlq	$2,%xmm15
-	pxor	%xmm5,%xmm0
-	pxor	%xmm3,%xmm15
-	pand	%xmm8,%xmm0
-	pand	%xmm8,%xmm15
-	pxor	%xmm0,%xmm5
-	psllq	$2,%xmm0
-	pxor	%xmm15,%xmm3
-	psllq	$2,%xmm15
-	pxor	%xmm9,%xmm0
-	pxor	%xmm10,%xmm15
-	movdqa	%xmm5,%xmm9
-	psrlq	$4,%xmm5
-	movdqa	%xmm3,%xmm10
-	psrlq	$4,%xmm3
-	pxor	%xmm4,%xmm5
-	pxor	%xmm1,%xmm3
-	pand	%xmm7,%xmm5
-	pand	%xmm7,%xmm3
-	pxor	%xmm5,%xmm4
-	psllq	$4,%xmm5
-	pxor	%xmm3,%xmm1
-	psllq	$4,%xmm3
-	pxor	%xmm9,%xmm5
-	pxor	%xmm10,%xmm3
-	movdqa	%xmm0,%xmm9
-	psrlq	$4,%xmm0
-	movdqa	%xmm15,%xmm10
-	psrlq	$4,%xmm15
-	pxor	%xmm6,%xmm0
-	pxor	%xmm2,%xmm15
-	pand	%xmm7,%xmm0
-	pand	%xmm7,%xmm15
-	pxor	%xmm0,%xmm6
-	psllq	$4,%xmm0
-	pxor	%xmm15,%xmm2
-	psllq	$4,%xmm15
-	pxor	%xmm9,%xmm0
-	pxor	%xmm10,%xmm15
-	movdqa	(%rax),%xmm7
-	pxor	%xmm7,%xmm3
-	pxor	%xmm7,%xmm5
-	pxor	%xmm7,%xmm2
-	pxor	%xmm7,%xmm6
-	pxor	%xmm7,%xmm1
-	pxor	%xmm7,%xmm4
-	pxor	%xmm7,%xmm15
-	pxor	%xmm7,%xmm0
-	.byte	0xf3,0xc3
-.cfi_endproc	
-.size	_bsaes_encrypt8,.-_bsaes_encrypt8
-
-.type	_bsaes_decrypt8,@function
-.align	64
-_bsaes_decrypt8:
-.cfi_startproc	
-	leaq	.LBS0(%rip),%r11
-
-	movdqa	(%rax),%xmm8
-	leaq	16(%rax),%rax
-	movdqa	-48(%r11),%xmm7
-	pxor	%xmm8,%xmm15
-	pxor	%xmm8,%xmm0
-	pxor	%xmm8,%xmm1
-	pxor	%xmm8,%xmm2
-.byte	102,68,15,56,0,255
-.byte	102,15,56,0,199
-	pxor	%xmm8,%xmm3
-	pxor	%xmm8,%xmm4
-.byte	102,15,56,0,207
-.byte	102,15,56,0,215
-	pxor	%xmm8,%xmm5
-	pxor	%xmm8,%xmm6
-.byte	102,15,56,0,223
-.byte	102,15,56,0,231
-.byte	102,15,56,0,239
-.byte	102,15,56,0,247
-	movdqa	0(%r11),%xmm7
-	movdqa	16(%r11),%xmm8
-	movdqa	%xmm5,%xmm9
-	psrlq	$1,%xmm5
-	movdqa	%xmm3,%xmm10
-	psrlq	$1,%xmm3
-	pxor	%xmm6,%xmm5
-	pxor	%xmm4,%xmm3
-	pand	%xmm7,%xmm5
-	pand	%xmm7,%xmm3
-	pxor	%xmm5,%xmm6
-	psllq	$1,%xmm5
-	pxor	%xmm3,%xmm4
-	psllq	$1,%xmm3
-	pxor	%xmm9,%xmm5
-	pxor	%xmm10,%xmm3
-	movdqa	%xmm1,%xmm9
-	psrlq	$1,%xmm1
-	movdqa	%xmm15,%xmm10
-	psrlq	$1,%xmm15
-	pxor	%xmm2,%xmm1
-	pxor	%xmm0,%xmm15
-	pand	%xmm7,%xmm1
-	pand	%xmm7,%xmm15
-	pxor	%xmm1,%xmm2
-	psllq	$1,%xmm1
-	pxor	%xmm15,%xmm0
-	psllq	$1,%xmm15
-	pxor	%xmm9,%xmm1
-	pxor	%xmm10,%xmm15
-	movdqa	32(%r11),%xmm7
-	movdqa	%xmm4,%xmm9
-	psrlq	$2,%xmm4
-	movdqa	%xmm3,%xmm10
-	psrlq	$2,%xmm3
-	pxor	%xmm6,%xmm4
-	pxor	%xmm5,%xmm3
-	pand	%xmm8,%xmm4
-	pand	%xmm8,%xmm3
-	pxor	%xmm4,%xmm6
-	psllq	$2,%xmm4
-	pxor	%xmm3,%xmm5
-	psllq	$2,%xmm3
-	pxor	%xmm9,%xmm4
-	pxor	%xmm10,%xmm3
-	movdqa	%xmm0,%xmm9
-	psrlq	$2,%xmm0
-	movdqa	%xmm15,%xmm10
-	psrlq	$2,%xmm15
-	pxor	%xmm2,%xmm0
-	pxor	%xmm1,%xmm15
-	pand	%xmm8,%xmm0
-	pand	%xmm8,%xmm15
-	pxor	%xmm0,%xmm2
-	psllq	$2,%xmm0
-	pxor	%xmm15,%xmm1
-	psllq	$2,%xmm15
-	pxor	%xmm9,%xmm0
-	pxor	%xmm10,%xmm15
-	movdqa	%xmm2,%xmm9
-	psrlq	$4,%xmm2
-	movdqa	%xmm1,%xmm10
-	psrlq	$4,%xmm1
-	pxor	%xmm6,%xmm2
-	pxor	%xmm5,%xmm1
-	pand	%xmm7,%xmm2
-	pand	%xmm7,%xmm1
-	pxor	%xmm2,%xmm6
-	psllq	$4,%xmm2
-	pxor	%xmm1,%xmm5
-	psllq	$4,%xmm1
-	pxor	%xmm9,%xmm2
-	pxor	%xmm10,%xmm1
-	movdqa	%xmm0,%xmm9
-	psrlq	$4,%xmm0
-	movdqa	%xmm15,%xmm10
-	psrlq	$4,%xmm15
-	pxor	%xmm4,%xmm0
-	pxor	%xmm3,%xmm15
-	pand	%xmm7,%xmm0
-	pand	%xmm7,%xmm15
-	pxor	%xmm0,%xmm4
-	psllq	$4,%xmm0
-	pxor	%xmm15,%xmm3
-	psllq	$4,%xmm15
-	pxor	%xmm9,%xmm0
-	pxor	%xmm10,%xmm15
-	decl	%r10d
-	jmp	.Ldec_sbox
-.align	16
-.Ldec_loop:
-	pxor	0(%rax),%xmm15
-	pxor	16(%rax),%xmm0
-	pxor	32(%rax),%xmm1
-	pxor	48(%rax),%xmm2
-.byte	102,68,15,56,0,255
-.byte	102,15,56,0,199
-	pxor	64(%rax),%xmm3
-	pxor	80(%rax),%xmm4
-.byte	102,15,56,0,207
-.byte	102,15,56,0,215
-	pxor	96(%rax),%xmm5
-	pxor	112(%rax),%xmm6
-.byte	102,15,56,0,223
-.byte	102,15,56,0,231
-.byte	102,15,56,0,239
-.byte	102,15,56,0,247
-	leaq	128(%rax),%rax
-.Ldec_sbox:
-	pxor	%xmm3,%xmm2
-
-	pxor	%xmm6,%xmm3
-	pxor	%xmm6,%xmm1
-	pxor	%xmm3,%xmm5
-	pxor	%xmm5,%xmm6
-	pxor	%xmm6,%xmm0
-
-	pxor	%xmm0,%xmm15
-	pxor	%xmm4,%xmm1
-	pxor	%xmm15,%xmm2
-	pxor	%xmm15,%xmm4
-	pxor	%xmm2,%xmm0
-	movdqa	%xmm2,%xmm10
-	movdqa	%xmm6,%xmm9
-	movdqa	%xmm0,%xmm8
-	movdqa	%xmm3,%xmm12
-	movdqa	%xmm4,%xmm11
-
-	pxor	%xmm15,%xmm10
-	pxor	%xmm3,%xmm9
-	pxor	%xmm5,%xmm8
-	movdqa	%xmm10,%xmm13
-	pxor	%xmm15,%xmm12
-	movdqa	%xmm9,%xmm7
-	pxor	%xmm1,%xmm11
-	movdqa	%xmm10,%xmm14
-
-	por	%xmm8,%xmm9
-	por	%xmm11,%xmm10
-	pxor	%xmm7,%xmm14
-	pand	%xmm11,%xmm13
-	pxor	%xmm8,%xmm11
-	pand	%xmm8,%xmm7
-	pand	%xmm11,%xmm14
-	movdqa	%xmm5,%xmm11
-	pxor	%xmm1,%xmm11
-	pand	%xmm11,%xmm12
-	pxor	%xmm12,%xmm10
-	pxor	%xmm12,%xmm9
-	movdqa	%xmm2,%xmm12
-	movdqa	%xmm0,%xmm11
-	pxor	%xmm6,%xmm12
-	pxor	%xmm4,%xmm11
-	movdqa	%xmm12,%xmm8
-	pand	%xmm11,%xmm12
-	por	%xmm11,%xmm8
-	pxor	%xmm12,%xmm7
-	pxor	%xmm14,%xmm10
-	pxor	%xmm13,%xmm9
-	pxor	%xmm14,%xmm8
-	movdqa	%xmm3,%xmm11
-	pxor	%xmm13,%xmm7
-	movdqa	%xmm15,%xmm12
-	pxor	%xmm13,%xmm8
-	movdqa	%xmm6,%xmm13
-	pand	%xmm5,%xmm11
-	movdqa	%xmm2,%xmm14
-	pand	%xmm1,%xmm12
-	pand	%xmm0,%xmm13
-	por	%xmm4,%xmm14
-	pxor	%xmm11,%xmm10
-	pxor	%xmm12,%xmm9
-	pxor	%xmm13,%xmm8
-	pxor	%xmm14,%xmm7
-
-
-
-
-
-	movdqa	%xmm10,%xmm11
-	pand	%xmm8,%xmm10
-	pxor	%xmm9,%xmm11
-
-	movdqa	%xmm7,%xmm13
-	movdqa	%xmm11,%xmm14
-	pxor	%xmm10,%xmm13
-	pand	%xmm13,%xmm14
-
-	movdqa	%xmm8,%xmm12
-	pxor	%xmm9,%xmm14
-	pxor	%xmm7,%xmm12
-
-	pxor	%xmm9,%xmm10
-
-	pand	%xmm10,%xmm12
-
-	movdqa	%xmm13,%xmm9
-	pxor	%xmm7,%xmm12
-
-	pxor	%xmm12,%xmm9
-	pxor	%xmm12,%xmm8
-
-	pand	%xmm7,%xmm9
-
-	pxor	%xmm9,%xmm13
-	pxor	%xmm9,%xmm8
-
-	pand	%xmm14,%xmm13
-
-	pxor	%xmm11,%xmm13
-	movdqa	%xmm4,%xmm11
-	movdqa	%xmm0,%xmm7
-	movdqa	%xmm14,%xmm9
-	pxor	%xmm13,%xmm9
-	pand	%xmm4,%xmm9
-	pxor	%xmm0,%xmm4
-	pand	%xmm14,%xmm0
-	pand	%xmm13,%xmm4
-	pxor	%xmm0,%xmm4
-	pxor	%xmm9,%xmm0
-	pxor	%xmm1,%xmm11
-	pxor	%xmm5,%xmm7
-	pxor	%xmm12,%xmm14
-	pxor	%xmm8,%xmm13
-	movdqa	%xmm14,%xmm10
-	movdqa	%xmm12,%xmm9
-	pxor	%xmm13,%xmm10
-	pxor	%xmm8,%xmm9
-	pand	%xmm11,%xmm10
-	pand	%xmm1,%xmm9
-	pxor	%xmm7,%xmm11
-	pxor	%xmm5,%xmm1
-	pand	%xmm14,%xmm7
-	pand	%xmm12,%xmm5
-	pand	%xmm13,%xmm11
-	pand	%xmm8,%xmm1
-	pxor	%xmm11,%xmm7
-	pxor	%xmm5,%xmm1
-	pxor	%xmm10,%xmm11
-	pxor	%xmm9,%xmm5
-	pxor	%xmm11,%xmm4
-	pxor	%xmm11,%xmm1
-	pxor	%xmm7,%xmm0
-	pxor	%xmm7,%xmm5
-
-	movdqa	%xmm2,%xmm11
-	movdqa	%xmm6,%xmm7
-	pxor	%xmm15,%xmm11
-	pxor	%xmm3,%xmm7
-	movdqa	%xmm14,%xmm10
-	movdqa	%xmm12,%xmm9
-	pxor	%xmm13,%xmm10
-	pxor	%xmm8,%xmm9
-	pand	%xmm11,%xmm10
-	pand	%xmm15,%xmm9
-	pxor	%xmm7,%xmm11
-	pxor	%xmm3,%xmm15
-	pand	%xmm14,%xmm7
-	pand	%xmm12,%xmm3
-	pand	%xmm13,%xmm11
-	pand	%xmm8,%xmm15
-	pxor	%xmm11,%xmm7
-	pxor	%xmm3,%xmm15
-	pxor	%xmm10,%xmm11
-	pxor	%xmm9,%xmm3
-	pxor	%xmm12,%xmm14
-	pxor	%xmm8,%xmm13
-	movdqa	%xmm14,%xmm10
-	pxor	%xmm13,%xmm10
-	pand	%xmm2,%xmm10
-	pxor	%xmm6,%xmm2
-	pand	%xmm14,%xmm6
-	pand	%xmm13,%xmm2
-	pxor	%xmm6,%xmm2
-	pxor	%xmm10,%xmm6
-	pxor	%xmm11,%xmm2
-	pxor	%xmm11,%xmm15
-	pxor	%xmm7,%xmm6
-	pxor	%xmm7,%xmm3
-	pxor	%xmm6,%xmm0
-	pxor	%xmm4,%xmm5
-
-	pxor	%xmm0,%xmm3
-	pxor	%xmm6,%xmm1
-	pxor	%xmm6,%xmm4
-	pxor	%xmm1,%xmm3
-	pxor	%xmm15,%xmm6
-	pxor	%xmm4,%xmm3
-	pxor	%xmm5,%xmm2
-	pxor	%xmm0,%xmm5
-	pxor	%xmm3,%xmm2
-
-	pxor	%xmm15,%xmm3
-	pxor	%xmm2,%xmm6
-	decl	%r10d
-	jl	.Ldec_done
-
-	pshufd	$0x4E,%xmm15,%xmm7
-	pshufd	$0x4E,%xmm2,%xmm13
-	pxor	%xmm15,%xmm7
-	pshufd	$0x4E,%xmm4,%xmm14
-	pxor	%xmm2,%xmm13
-	pshufd	$0x4E,%xmm0,%xmm8
-	pxor	%xmm4,%xmm14
-	pshufd	$0x4E,%xmm5,%xmm9
-	pxor	%xmm0,%xmm8
-	pshufd	$0x4E,%xmm3,%xmm10
-	pxor	%xmm5,%xmm9
-	pxor	%xmm13,%xmm15
-	pxor	%xmm13,%xmm0
-	pshufd	$0x4E,%xmm1,%xmm11
-	pxor	%xmm3,%xmm10
-	pxor	%xmm7,%xmm5
-	pxor	%xmm8,%xmm3
-	pshufd	$0x4E,%xmm6,%xmm12
-	pxor	%xmm1,%xmm11
-	pxor	%xmm14,%xmm0
-	pxor	%xmm9,%xmm1
-	pxor	%xmm6,%xmm12
-
-	pxor	%xmm14,%xmm5
-	pxor	%xmm13,%xmm3
-	pxor	%xmm13,%xmm1
-	pxor	%xmm10,%xmm6
-	pxor	%xmm11,%xmm2
-	pxor	%xmm14,%xmm1
-	pxor	%xmm14,%xmm6
-	pxor	%xmm12,%xmm4
-	pshufd	$0x93,%xmm15,%xmm7
-	pshufd	$0x93,%xmm0,%xmm8
-	pxor	%xmm7,%xmm15
-	pshufd	$0x93,%xmm5,%xmm9
-	pxor	%xmm8,%xmm0
-	pshufd	$0x93,%xmm3,%xmm10
-	pxor	%xmm9,%xmm5
-	pshufd	$0x93,%xmm1,%xmm11
-	pxor	%xmm10,%xmm3
-	pshufd	$0x93,%xmm6,%xmm12
-	pxor	%xmm11,%xmm1
-	pshufd	$0x93,%xmm2,%xmm13
-	pxor	%xmm12,%xmm6
-	pshufd	$0x93,%xmm4,%xmm14
-	pxor	%xmm13,%xmm2
-	pxor	%xmm14,%xmm4
-
-	pxor	%xmm15,%xmm8
-	pxor	%xmm4,%xmm7
-	pxor	%xmm4,%xmm8
-	pshufd	$0x4E,%xmm15,%xmm15
-	pxor	%xmm0,%xmm9
-	pshufd	$0x4E,%xmm0,%xmm0
-	pxor	%xmm1,%xmm12
-	pxor	%xmm7,%xmm15
-	pxor	%xmm6,%xmm13
-	pxor	%xmm8,%xmm0
-	pxor	%xmm3,%xmm11
-	pshufd	$0x4E,%xmm1,%xmm7
-	pxor	%xmm2,%xmm14
-	pshufd	$0x4E,%xmm6,%xmm8
-	pxor	%xmm5,%xmm10
-	pshufd	$0x4E,%xmm3,%xmm1
-	pxor	%xmm4,%xmm10
-	pshufd	$0x4E,%xmm4,%xmm6
-	pxor	%xmm4,%xmm11
-	pshufd	$0x4E,%xmm2,%xmm3
-	pxor	%xmm11,%xmm7
-	pshufd	$0x4E,%xmm5,%xmm2
-	pxor	%xmm12,%xmm8
-	pxor	%xmm1,%xmm10
-	pxor	%xmm14,%xmm6
-	pxor	%xmm3,%xmm13
-	movdqa	%xmm7,%xmm3
-	pxor	%xmm9,%xmm2
-	movdqa	%xmm13,%xmm5
-	movdqa	%xmm8,%xmm4
-	movdqa	%xmm2,%xmm1
-	movdqa	%xmm10,%xmm2
-	movdqa	-16(%r11),%xmm7
-	jnz	.Ldec_loop
-	movdqa	-32(%r11),%xmm7
-	jmp	.Ldec_loop
-.align	16
-.Ldec_done:
-	movdqa	0(%r11),%xmm7
-	movdqa	16(%r11),%xmm8
-	movdqa	%xmm2,%xmm9
-	psrlq	$1,%xmm2
-	movdqa	%xmm1,%xmm10
-	psrlq	$1,%xmm1
-	pxor	%xmm4,%xmm2
-	pxor	%xmm6,%xmm1
-	pand	%xmm7,%xmm2
-	pand	%xmm7,%xmm1
-	pxor	%xmm2,%xmm4
-	psllq	$1,%xmm2
-	pxor	%xmm1,%xmm6
-	psllq	$1,%xmm1
-	pxor	%xmm9,%xmm2
-	pxor	%xmm10,%xmm1
-	movdqa	%xmm5,%xmm9
-	psrlq	$1,%xmm5
-	movdqa	%xmm15,%xmm10
-	psrlq	$1,%xmm15
-	pxor	%xmm3,%xmm5
-	pxor	%xmm0,%xmm15
-	pand	%xmm7,%xmm5
-	pand	%xmm7,%xmm15
-	pxor	%xmm5,%xmm3
-	psllq	$1,%xmm5
-	pxor	%xmm15,%xmm0
-	psllq	$1,%xmm15
-	pxor	%xmm9,%xmm5
-	pxor	%xmm10,%xmm15
-	movdqa	32(%r11),%xmm7
-	movdqa	%xmm6,%xmm9
-	psrlq	$2,%xmm6
-	movdqa	%xmm1,%xmm10
-	psrlq	$2,%xmm1
-	pxor	%xmm4,%xmm6
-	pxor	%xmm2,%xmm1
-	pand	%xmm8,%xmm6
-	pand	%xmm8,%xmm1
-	pxor	%xmm6,%xmm4
-	psllq	$2,%xmm6
-	pxor	%xmm1,%xmm2
-	psllq	$2,%xmm1
-	pxor	%xmm9,%xmm6
-	pxor	%xmm10,%xmm1
-	movdqa	%xmm0,%xmm9
-	psrlq	$2,%xmm0
-	movdqa	%xmm15,%xmm10
-	psrlq	$2,%xmm15
-	pxor	%xmm3,%xmm0
-	pxor	%xmm5,%xmm15
-	pand	%xmm8,%xmm0
-	pand	%xmm8,%xmm15
-	pxor	%xmm0,%xmm3
-	psllq	$2,%xmm0
-	pxor	%xmm15,%xmm5
-	psllq	$2,%xmm15
-	pxor	%xmm9,%xmm0
-	pxor	%xmm10,%xmm15
-	movdqa	%xmm3,%xmm9
-	psrlq	$4,%xmm3
-	movdqa	%xmm5,%xmm10
-	psrlq	$4,%xmm5
-	pxor	%xmm4,%xmm3
-	pxor	%xmm2,%xmm5
-	pand	%xmm7,%xmm3
-	pand	%xmm7,%xmm5
-	pxor	%xmm3,%xmm4
-	psllq	$4,%xmm3
-	pxor	%xmm5,%xmm2
-	psllq	$4,%xmm5
-	pxor	%xmm9,%xmm3
-	pxor	%xmm10,%xmm5
-	movdqa	%xmm0,%xmm9
-	psrlq	$4,%xmm0
-	movdqa	%xmm15,%xmm10
-	psrlq	$4,%xmm15
-	pxor	%xmm6,%xmm0
-	pxor	%xmm1,%xmm15
-	pand	%xmm7,%xmm0
-	pand	%xmm7,%xmm15
-	pxor	%xmm0,%xmm6
-	psllq	$4,%xmm0
-	pxor	%xmm15,%xmm1
-	psllq	$4,%xmm15
-	pxor	%xmm9,%xmm0
-	pxor	%xmm10,%xmm15
-	movdqa	(%rax),%xmm7
-	pxor	%xmm7,%xmm5
-	pxor	%xmm7,%xmm3
-	pxor	%xmm7,%xmm1
-	pxor	%xmm7,%xmm6
-	pxor	%xmm7,%xmm2
-	pxor	%xmm7,%xmm4
-	pxor	%xmm7,%xmm15
-	pxor	%xmm7,%xmm0
-	.byte	0xf3,0xc3
-.cfi_endproc	
-.size	_bsaes_decrypt8,.-_bsaes_decrypt8
-.type	_bsaes_key_convert,@function
-.align	16
-_bsaes_key_convert:
-.cfi_startproc	
-	leaq	.Lmasks(%rip),%r11
-	movdqu	(%rcx),%xmm7
-	leaq	16(%rcx),%rcx
-	movdqa	0(%r11),%xmm0
-	movdqa	16(%r11),%xmm1
-	movdqa	32(%r11),%xmm2
-	movdqa	48(%r11),%xmm3
-	movdqa	64(%r11),%xmm4
-	pcmpeqd	%xmm5,%xmm5
-
-	movdqu	(%rcx),%xmm6
-	movdqa	%xmm7,(%rax)
-	leaq	16(%rax),%rax
-	decl	%r10d
-	jmp	.Lkey_loop
-.align	16
-.Lkey_loop:
-.byte	102,15,56,0,244
-
-	movdqa	%xmm0,%xmm8
-	movdqa	%xmm1,%xmm9
-
-	pand	%xmm6,%xmm8
-	pand	%xmm6,%xmm9
-	movdqa	%xmm2,%xmm10
-	pcmpeqb	%xmm0,%xmm8
-	psllq	$4,%xmm0
-	movdqa	%xmm3,%xmm11
-	pcmpeqb	%xmm1,%xmm9
-	psllq	$4,%xmm1
-
-	pand	%xmm6,%xmm10
-	pand	%xmm6,%xmm11
-	movdqa	%xmm0,%xmm12
-	pcmpeqb	%xmm2,%xmm10
-	psllq	$4,%xmm2
-	movdqa	%xmm1,%xmm13
-	pcmpeqb	%xmm3,%xmm11
-	psllq	$4,%xmm3
-
-	movdqa	%xmm2,%xmm14
-	movdqa	%xmm3,%xmm15
-	pxor	%xmm5,%xmm8
-	pxor	%xmm5,%xmm9
-
-	pand	%xmm6,%xmm12
-	pand	%xmm6,%xmm13
-	movdqa	%xmm8,0(%rax)
-	pcmpeqb	%xmm0,%xmm12
-	psrlq	$4,%xmm0
-	movdqa	%xmm9,16(%rax)
-	pcmpeqb	%xmm1,%xmm13
-	psrlq	$4,%xmm1
-	leaq	16(%rcx),%rcx
-
-	pand	%xmm6,%xmm14
-	pand	%xmm6,%xmm15
-	movdqa	%xmm10,32(%rax)
-	pcmpeqb	%xmm2,%xmm14
-	psrlq	$4,%xmm2
-	movdqa	%xmm11,48(%rax)
-	pcmpeqb	%xmm3,%xmm15
-	psrlq	$4,%xmm3
-	movdqu	(%rcx),%xmm6
-
-	pxor	%xmm5,%xmm13
-	pxor	%xmm5,%xmm14
-	movdqa	%xmm12,64(%rax)
-	movdqa	%xmm13,80(%rax)
-	movdqa	%xmm14,96(%rax)
-	movdqa	%xmm15,112(%rax)
-	leaq	128(%rax),%rax
-	decl	%r10d
-	jnz	.Lkey_loop
-
-	movdqa	80(%r11),%xmm7
-
-	.byte	0xf3,0xc3
-.cfi_endproc	
-.size	_bsaes_key_convert,.-_bsaes_key_convert
-
-.globl	bsaes_cbc_encrypt
-.type	bsaes_cbc_encrypt,@function
-.align	16
-bsaes_cbc_encrypt:
-.cfi_startproc	
-	cmpl	$0,%r9d
-	jne	asm_AES_cbc_encrypt
-	cmpq	$128,%rdx
-	jb	asm_AES_cbc_encrypt
-
-	movq	%rsp,%rax
-.Lcbc_dec_prologue:
-	pushq	%rbp
-.cfi_adjust_cfa_offset	8
-.cfi_offset	%rbp,-16
-	pushq	%rbx
-.cfi_adjust_cfa_offset	8
-.cfi_offset	%rbx,-24
-	pushq	%r12
-.cfi_adjust_cfa_offset	8
-.cfi_offset	%r12,-32
-	pushq	%r13
-.cfi_adjust_cfa_offset	8
-.cfi_offset	%r13,-40
-	pushq	%r14
-.cfi_adjust_cfa_offset	8
-.cfi_offset	%r14,-48
-	pushq	%r15
-.cfi_adjust_cfa_offset	8
-.cfi_offset	%r15,-56
-	leaq	-72(%rsp),%rsp
-.cfi_adjust_cfa_offset	0x48
-	movq	%rsp,%rbp
-.cfi_def_cfa_register	%rbp
-	movl	240(%rcx),%eax
-	movq	%rdi,%r12
-	movq	%rsi,%r13
-	movq	%rdx,%r14
-	movq	%rcx,%r15
-	movq	%r8,%rbx
-	shrq	$4,%r14
-
-	movl	%eax,%edx
-	shlq	$7,%rax
-	subq	$96,%rax
-	subq	%rax,%rsp
-
-	movq	%rsp,%rax
-	movq	%r15,%rcx
-	movl	%edx,%r10d
-	call	_bsaes_key_convert
-	pxor	(%rsp),%xmm7
-	movdqa	%xmm6,(%rax)
-	movdqa	%xmm7,(%rsp)
-
-	movdqu	(%rbx),%xmm14
-	subq	$8,%r14
-.Lcbc_dec_loop:
-	movdqu	0(%r12),%xmm15
-	movdqu	16(%r12),%xmm0
-	movdqu	32(%r12),%xmm1
-	movdqu	48(%r12),%xmm2
-	movdqu	64(%r12),%xmm3
-	movdqu	80(%r12),%xmm4
-	movq	%rsp,%rax
-	movdqu	96(%r12),%xmm5
-	movl	%edx,%r10d
-	movdqu	112(%r12),%xmm6
-	movdqa	%xmm14,32(%rbp)
-
-	call	_bsaes_decrypt8
-
-	pxor	32(%rbp),%xmm15
-	movdqu	0(%r12),%xmm7
-	movdqu	16(%r12),%xmm8
-	pxor	%xmm7,%xmm0
-	movdqu	32(%r12),%xmm9
-	pxor	%xmm8,%xmm5
-	movdqu	48(%r12),%xmm10
-	pxor	%xmm9,%xmm3
-	movdqu	64(%r12),%xmm11
-	pxor	%xmm10,%xmm1
-	movdqu	80(%r12),%xmm12
-	pxor	%xmm11,%xmm6
-	movdqu	96(%r12),%xmm13
-	pxor	%xmm12,%xmm2
-	movdqu	112(%r12),%xmm14
-	pxor	%xmm13,%xmm4
-	movdqu	%xmm15,0(%r13)
-	leaq	128(%r12),%r12
-	movdqu	%xmm0,16(%r13)
-	movdqu	%xmm5,32(%r13)
-	movdqu	%xmm3,48(%r13)
-	movdqu	%xmm1,64(%r13)
-	movdqu	%xmm6,80(%r13)
-	movdqu	%xmm2,96(%r13)
-	movdqu	%xmm4,112(%r13)
-	leaq	128(%r13),%r13
-	subq	$8,%r14
-	jnc	.Lcbc_dec_loop
-
-	addq	$8,%r14
-	jz	.Lcbc_dec_done
-
-	movdqu	0(%r12),%xmm15
-	movq	%rsp,%rax
-	movl	%edx,%r10d
-	cmpq	$2,%r14
-	jb	.Lcbc_dec_one
-	movdqu	16(%r12),%xmm0
-	je	.Lcbc_dec_two
-	movdqu	32(%r12),%xmm1
-	cmpq	$4,%r14
-	jb	.Lcbc_dec_three
-	movdqu	48(%r12),%xmm2
-	je	.Lcbc_dec_four
-	movdqu	64(%r12),%xmm3
-	cmpq	$6,%r14
-	jb	.Lcbc_dec_five
-	movdqu	80(%r12),%xmm4
-	je	.Lcbc_dec_six
-	movdqu	96(%r12),%xmm5
-	movdqa	%xmm14,32(%rbp)
-	call	_bsaes_decrypt8
-	pxor	32(%rbp),%xmm15
-	movdqu	0(%r12),%xmm7
-	movdqu	16(%r12),%xmm8
-	pxor	%xmm7,%xmm0
-	movdqu	32(%r12),%xmm9
-	pxor	%xmm8,%xmm5
-	movdqu	48(%r12),%xmm10
-	pxor	%xmm9,%xmm3
-	movdqu	64(%r12),%xmm11
-	pxor	%xmm10,%xmm1
-	movdqu	80(%r12),%xmm12
-	pxor	%xmm11,%xmm6
-	movdqu	96(%r12),%xmm14
-	pxor	%xmm12,%xmm2
-	movdqu	%xmm15,0(%r13)
-	movdqu	%xmm0,16(%r13)
-	movdqu	%xmm5,32(%r13)
-	movdqu	%xmm3,48(%r13)
-	movdqu	%xmm1,64(%r13)
-	movdqu	%xmm6,80(%r13)
-	movdqu	%xmm2,96(%r13)
-	jmp	.Lcbc_dec_done
-.align	16
-.Lcbc_dec_six:
-	movdqa	%xmm14,32(%rbp)
-	call	_bsaes_decrypt8
-	pxor	32(%rbp),%xmm15
-	movdqu	0(%r12),%xmm7
-	movdqu	16(%r12),%xmm8
-	pxor	%xmm7,%xmm0
-	movdqu	32(%r12),%xmm9
-	pxor	%xmm8,%xmm5
-	movdqu	48(%r12),%xmm10
-	pxor	%xmm9,%xmm3
-	movdqu	64(%r12),%xmm11
-	pxor	%xmm10,%xmm1
-	movdqu	80(%r12),%xmm14
-	pxor	%xmm11,%xmm6
-	movdqu	%xmm15,0(%r13)
-	movdqu	%xmm0,16(%r13)
-	movdqu	%xmm5,32(%r13)
-	movdqu	%xmm3,48(%r13)
-	movdqu	%xmm1,64(%r13)
-	movdqu	%xmm6,80(%r13)
-	jmp	.Lcbc_dec_done
-.align	16
-.Lcbc_dec_five:
-	movdqa	%xmm14,32(%rbp)
-	call	_bsaes_decrypt8
-	pxor	32(%rbp),%xmm15
-	movdqu	0(%r12),%xmm7
-	movdqu	16(%r12),%xmm8
-	pxor	%xmm7,%xmm0
-	movdqu	32(%r12),%xmm9
-	pxor	%xmm8,%xmm5
-	movdqu	48(%r12),%xmm10
-	pxor	%xmm9,%xmm3
-	movdqu	64(%r12),%xmm14
-	pxor	%xmm10,%xmm1
-	movdqu	%xmm15,0(%r13)
-	movdqu	%xmm0,16(%r13)
-	movdqu	%xmm5,32(%r13)
-	movdqu	%xmm3,48(%r13)
-	movdqu	%xmm1,64(%r13)
-	jmp	.Lcbc_dec_done
-.align	16
-.Lcbc_dec_four:
-	movdqa	%xmm14,32(%rbp)
-	call	_bsaes_decrypt8
-	pxor	32(%rbp),%xmm15
-	movdqu	0(%r12),%xmm7
-	movdqu	16(%r12),%xmm8
-	pxor	%xmm7,%xmm0
-	movdqu	32(%r12),%xmm9
-	pxor	%xmm8,%xmm5
-	movdqu	48(%r12),%xmm14
-	pxor	%xmm9,%xmm3
-	movdqu	%xmm15,0(%r13)
-	movdqu	%xmm0,16(%r13)
-	movdqu	%xmm5,32(%r13)
-	movdqu	%xmm3,48(%r13)
-	jmp	.Lcbc_dec_done
-.align	16
-.Lcbc_dec_three:
-	movdqa	%xmm14,32(%rbp)
-	call	_bsaes_decrypt8
-	pxor	32(%rbp),%xmm15
-	movdqu	0(%r12),%xmm7
-	movdqu	16(%r12),%xmm8
-	pxor	%xmm7,%xmm0
-	movdqu	32(%r12),%xmm14
-	pxor	%xmm8,%xmm5
-	movdqu	%xmm15,0(%r13)
-	movdqu	%xmm0,16(%r13)
-	movdqu	%xmm5,32(%r13)
-	jmp	.Lcbc_dec_done
-.align	16
-.Lcbc_dec_two:
-	movdqa	%xmm14,32(%rbp)
-	call	_bsaes_decrypt8
-	pxor	32(%rbp),%xmm15
-	movdqu	0(%r12),%xmm7
-	movdqu	16(%r12),%xmm14
-	pxor	%xmm7,%xmm0
-	movdqu	%xmm15,0(%r13)
-	movdqu	%xmm0,16(%r13)
-	jmp	.Lcbc_dec_done
-.align	16
-.Lcbc_dec_one:
-	leaq	(%r12),%rdi
-	leaq	32(%rbp),%rsi
-	leaq	(%r15),%rdx
-	call	asm_AES_decrypt
-	pxor	32(%rbp),%xmm14
-	movdqu	%xmm14,(%r13)
-	movdqa	%xmm15,%xmm14
-
-.Lcbc_dec_done:
-	movdqu	%xmm14,(%rbx)
-	leaq	(%rsp),%rax
-	pxor	%xmm0,%xmm0
-.Lcbc_dec_bzero:
-	movdqa	%xmm0,0(%rax)
-	movdqa	%xmm0,16(%rax)
-	leaq	32(%rax),%rax
-	cmpq	%rax,%rbp
-	ja	.Lcbc_dec_bzero
-
-	leaq	120(%rbp),%rax
-.cfi_def_cfa	%rax,8
-	movq	-48(%rax),%r15
-.cfi_restore	%r15
-	movq	-40(%rax),%r14
-.cfi_restore	%r14
-	movq	-32(%rax),%r13
-.cfi_restore	%r13
-	movq	-24(%rax),%r12
-.cfi_restore	%r12
-	movq	-16(%rax),%rbx
-.cfi_restore	%rbx
-	movq	-8(%rax),%rbp
-.cfi_restore	%rbp
-	leaq	(%rax),%rsp
-.cfi_def_cfa_register	%rsp
-.Lcbc_dec_epilogue:
-	.byte	0xf3,0xc3
-.cfi_endproc	
-.size	bsaes_cbc_encrypt,.-bsaes_cbc_encrypt
-
-.globl	bsaes_ctr32_encrypt_blocks
-.type	bsaes_ctr32_encrypt_blocks,@function
-.align	16
-bsaes_ctr32_encrypt_blocks:
-.cfi_startproc	
-	movq	%rsp,%rax
-.Lctr_enc_prologue:
-	pushq	%rbp
-.cfi_adjust_cfa_offset	8
-.cfi_offset	%rbp,-16
-	pushq	%rbx
-.cfi_adjust_cfa_offset	8
-.cfi_offset	%rbx,-24
-	pushq	%r12
-.cfi_adjust_cfa_offset	8
-.cfi_offset	%r12,-32
-	pushq	%r13
-.cfi_adjust_cfa_offset	8
-.cfi_offset	%r13,-40
-	pushq	%r14
-.cfi_adjust_cfa_offset	8
-.cfi_offset	%r14,-48
-	pushq	%r15
-.cfi_adjust_cfa_offset	8
-.cfi_offset	%r15,-56
-	leaq	-72(%rsp),%rsp
-.cfi_adjust_cfa_offset	0x48
-	movq	%rsp,%rbp
-.cfi_def_cfa_register	%rbp
-	movdqu	(%r8),%xmm0
-	movl	240(%rcx),%eax
-	movq	%rdi,%r12
-	movq	%rsi,%r13
-	movq	%rdx,%r14
-	movq	%rcx,%r15
-	movdqa	%xmm0,32(%rbp)
-	cmpq	$8,%rdx
-	jb	.Lctr_enc_short
-
-	movl	%eax,%ebx
-	shlq	$7,%rax
-	subq	$96,%rax
-	subq	%rax,%rsp
-
-	movq	%rsp,%rax
-	movq	%r15,%rcx
-	movl	%ebx,%r10d
-	call	_bsaes_key_convert
-	pxor	%xmm6,%xmm7
-	movdqa	%xmm7,(%rax)
-
-	movdqa	(%rsp),%xmm8
-	leaq	.LADD1(%rip),%r11
-	movdqa	32(%rbp),%xmm15
-	movdqa	-32(%r11),%xmm7
-.byte	102,68,15,56,0,199
-.byte	102,68,15,56,0,255
-	movdqa	%xmm8,(%rsp)
-	jmp	.Lctr_enc_loop
-.align	16
-.Lctr_enc_loop:
-	movdqa	%xmm15,32(%rbp)
-	movdqa	%xmm15,%xmm0
-	movdqa	%xmm15,%xmm1
-	paddd	0(%r11),%xmm0
-	movdqa	%xmm15,%xmm2
-	paddd	16(%r11),%xmm1
-	movdqa	%xmm15,%xmm3
-	paddd	32(%r11),%xmm2
-	movdqa	%xmm15,%xmm4
-	paddd	48(%r11),%xmm3
-	movdqa	%xmm15,%xmm5
-	paddd	64(%r11),%xmm4
-	movdqa	%xmm15,%xmm6
-	paddd	80(%r11),%xmm5
-	paddd	96(%r11),%xmm6
-
-
-
-	movdqa	(%rsp),%xmm8
-	leaq	16(%rsp),%rax
-	movdqa	-16(%r11),%xmm7
-	pxor	%xmm8,%xmm15
-	pxor	%xmm8,%xmm0
-	pxor	%xmm8,%xmm1
-	pxor	%xmm8,%xmm2
-.byte	102,68,15,56,0,255
-.byte	102,15,56,0,199
-	pxor	%xmm8,%xmm3
-	pxor	%xmm8,%xmm4
-.byte	102,15,56,0,207
-.byte	102,15,56,0,215
-	pxor	%xmm8,%xmm5
-	pxor	%xmm8,%xmm6
-.byte	102,15,56,0,223
-.byte	102,15,56,0,231
-.byte	102,15,56,0,239
-.byte	102,15,56,0,247
-	leaq	.LBS0(%rip),%r11
-	movl	%ebx,%r10d
-
-	call	_bsaes_encrypt8_bitslice
-
-	subq	$8,%r14
-	jc	.Lctr_enc_loop_done
-
-	movdqu	0(%r12),%xmm7
-	movdqu	16(%r12),%xmm8
-	movdqu	32(%r12),%xmm9
-	movdqu	48(%r12),%xmm10
-	movdqu	64(%r12),%xmm11
-	movdqu	80(%r12),%xmm12
-	movdqu	96(%r12),%xmm13
-	movdqu	112(%r12),%xmm14
-	leaq	128(%r12),%r12
-	pxor	%xmm15,%xmm7
-	movdqa	32(%rbp),%xmm15
-	pxor	%xmm8,%xmm0
-	movdqu	%xmm7,0(%r13)
-	pxor	%xmm9,%xmm3
-	movdqu	%xmm0,16(%r13)
-	pxor	%xmm10,%xmm5
-	movdqu	%xmm3,32(%r13)
-	pxor	%xmm11,%xmm2
-	movdqu	%xmm5,48(%r13)
-	pxor	%xmm12,%xmm6
-	movdqu	%xmm2,64(%r13)
-	pxor	%xmm13,%xmm1
-	movdqu	%xmm6,80(%r13)
-	pxor	%xmm14,%xmm4
-	movdqu	%xmm1,96(%r13)
-	leaq	.LADD1(%rip),%r11
-	movdqu	%xmm4,112(%r13)
-	leaq	128(%r13),%r13
-	paddd	112(%r11),%xmm15
-	jnz	.Lctr_enc_loop
-
-	jmp	.Lctr_enc_done
-.align	16
-.Lctr_enc_loop_done:
-	addq	$8,%r14
-	movdqu	0(%r12),%xmm7
-	pxor	%xmm7,%xmm15
-	movdqu	%xmm15,0(%r13)
-	cmpq	$2,%r14
-	jb	.Lctr_enc_done
-	movdqu	16(%r12),%xmm8
-	pxor	%xmm8,%xmm0
-	movdqu	%xmm0,16(%r13)
-	je	.Lctr_enc_done
-	movdqu	32(%r12),%xmm9
-	pxor	%xmm9,%xmm3
-	movdqu	%xmm3,32(%r13)
-	cmpq	$4,%r14
-	jb	.Lctr_enc_done
-	movdqu	48(%r12),%xmm10
-	pxor	%xmm10,%xmm5
-	movdqu	%xmm5,48(%r13)
-	je	.Lctr_enc_done
-	movdqu	64(%r12),%xmm11
-	pxor	%xmm11,%xmm2
-	movdqu	%xmm2,64(%r13)
-	cmpq	$6,%r14
-	jb	.Lctr_enc_done
-	movdqu	80(%r12),%xmm12
-	pxor	%xmm12,%xmm6
-	movdqu	%xmm6,80(%r13)
-	je	.Lctr_enc_done
-	movdqu	96(%r12),%xmm13
-	pxor	%xmm13,%xmm1
-	movdqu	%xmm1,96(%r13)
-	jmp	.Lctr_enc_done
-
-.align	16
-.Lctr_enc_short:
-	leaq	32(%rbp),%rdi
-	leaq	48(%rbp),%rsi
-	leaq	(%r15),%rdx
-	call	asm_AES_encrypt
-	movdqu	(%r12),%xmm0
-	leaq	16(%r12),%r12
-	movl	44(%rbp),%eax
-	bswapl	%eax
-	pxor	48(%rbp),%xmm0
-	incl	%eax
-	movdqu	%xmm0,(%r13)
-	bswapl	%eax
-	leaq	16(%r13),%r13
-	movl	%eax,44(%rsp)
-	decq	%r14
-	jnz	.Lctr_enc_short
-
-.Lctr_enc_done:
-	leaq	(%rsp),%rax
-	pxor	%xmm0,%xmm0
-.Lctr_enc_bzero:
-	movdqa	%xmm0,0(%rax)
-	movdqa	%xmm0,16(%rax)
-	leaq	32(%rax),%rax
-	cmpq	%rax,%rbp
-	ja	.Lctr_enc_bzero
-
-	leaq	120(%rbp),%rax
-.cfi_def_cfa	%rax,8
-	movq	-48(%rax),%r15
-.cfi_restore	%r15
-	movq	-40(%rax),%r14
-.cfi_restore	%r14
-	movq	-32(%rax),%r13
-.cfi_restore	%r13
-	movq	-24(%rax),%r12
-.cfi_restore	%r12
-	movq	-16(%rax),%rbx
-.cfi_restore	%rbx
-	movq	-8(%rax),%rbp
-.cfi_restore	%rbp
-	leaq	(%rax),%rsp
-.cfi_def_cfa_register	%rsp
-.Lctr_enc_epilogue:
-	.byte	0xf3,0xc3
-.cfi_endproc	
-.size	bsaes_ctr32_encrypt_blocks,.-bsaes_ctr32_encrypt_blocks
-.globl	bsaes_xts_encrypt
-.type	bsaes_xts_encrypt,@function
-.align	16
-bsaes_xts_encrypt:
-.cfi_startproc	
-	movq	%rsp,%rax
-.Lxts_enc_prologue:
-	pushq	%rbp
-.cfi_adjust_cfa_offset	8
-.cfi_offset	%rbp,-16
-	pushq	%rbx
-.cfi_adjust_cfa_offset	8
-.cfi_offset	%rbx,-24
-	pushq	%r12
-.cfi_adjust_cfa_offset	8
-.cfi_offset	%r12,-32
-	pushq	%r13
-.cfi_adjust_cfa_offset	8
-.cfi_offset	%r13,-40
-	pushq	%r14
-.cfi_adjust_cfa_offset	8
-.cfi_offset	%r14,-48
-	pushq	%r15
-.cfi_adjust_cfa_offset	8
-.cfi_offset	%r15,-56
-	leaq	-72(%rsp),%rsp
-.cfi_adjust_cfa_offset	0x48
-	movq	%rsp,%rbp
-.cfi_def_cfa_register	%rbp
-	movq	%rdi,%r12
-	movq	%rsi,%r13
-	movq	%rdx,%r14
-	movq	%rcx,%r15
-
-	leaq	(%r9),%rdi
-	leaq	32(%rbp),%rsi
-	leaq	(%r8),%rdx
-	call	asm_AES_encrypt
-
-	movl	240(%r15),%eax
-	movq	%r14,%rbx
-
-	movl	%eax,%edx
-	shlq	$7,%rax
-	subq	$96,%rax
-	subq	%rax,%rsp
-
-	movq	%rsp,%rax
-	movq	%r15,%rcx
-	movl	%edx,%r10d
-	call	_bsaes_key_convert
-	pxor	%xmm6,%xmm7
-	movdqa	%xmm7,(%rax)
-
-	andq	$-16,%r14
-	subq	$0x80,%rsp
-	movdqa	32(%rbp),%xmm6
-
-	pxor	%xmm14,%xmm14
-	movdqa	.Lxts_magic(%rip),%xmm12
-	pcmpgtd	%xmm6,%xmm14
-
-	subq	$0x80,%r14
-	jc	.Lxts_enc_short
-	jmp	.Lxts_enc_loop
-
-.align	16
-.Lxts_enc_loop:
-	pshufd	$0x13,%xmm14,%xmm13
-	pxor	%xmm14,%xmm14
-	movdqa	%xmm6,%xmm15
-	movdqa	%xmm6,0(%rsp)
-	paddq	%xmm6,%xmm6
-	pand	%xmm12,%xmm13
-	pcmpgtd	%xmm6,%xmm14
-	pxor	%xmm13,%xmm6
-	pshufd	$0x13,%xmm14,%xmm13
-	pxor	%xmm14,%xmm14
-	movdqa	%xmm6,%xmm0
-	movdqa	%xmm6,16(%rsp)
-	paddq	%xmm6,%xmm6
-	pand	%xmm12,%xmm13
-	pcmpgtd	%xmm6,%xmm14
-	pxor	%xmm13,%xmm6
-	movdqu	0(%r12),%xmm7
-	pshufd	$0x13,%xmm14,%xmm13
-	pxor	%xmm14,%xmm14
-	movdqa	%xmm6,%xmm1
-	movdqa	%xmm6,32(%rsp)
-	paddq	%xmm6,%xmm6
-	pand	%xmm12,%xmm13
-	pcmpgtd	%xmm6,%xmm14
-	pxor	%xmm13,%xmm6
-	movdqu	16(%r12),%xmm8
-	pxor	%xmm7,%xmm15
-	pshufd	$0x13,%xmm14,%xmm13
-	pxor	%xmm14,%xmm14
-	movdqa	%xmm6,%xmm2
-	movdqa	%xmm6,48(%rsp)
-	paddq	%xmm6,%xmm6
-	pand	%xmm12,%xmm13
-	pcmpgtd	%xmm6,%xmm14
-	pxor	%xmm13,%xmm6
-	movdqu	32(%r12),%xmm9
-	pxor	%xmm8,%xmm0
-	pshufd	$0x13,%xmm14,%xmm13
-	pxor	%xmm14,%xmm14
-	movdqa	%xmm6,%xmm3
-	movdqa	%xmm6,64(%rsp)
-	paddq	%xmm6,%xmm6
-	pand	%xmm12,%xmm13
-	pcmpgtd	%xmm6,%xmm14
-	pxor	%xmm13,%xmm6
-	movdqu	48(%r12),%xmm10
-	pxor	%xmm9,%xmm1
-	pshufd	$0x13,%xmm14,%xmm13
-	pxor	%xmm14,%xmm14
-	movdqa	%xmm6,%xmm4
-	movdqa	%xmm6,80(%rsp)
-	paddq	%xmm6,%xmm6
-	pand	%xmm12,%xmm13
-	pcmpgtd	%xmm6,%xmm14
-	pxor	%xmm13,%xmm6
-	movdqu	64(%r12),%xmm11
-	pxor	%xmm10,%xmm2
-	pshufd	$0x13,%xmm14,%xmm13
-	pxor	%xmm14,%xmm14
-	movdqa	%xmm6,%xmm5
-	movdqa	%xmm6,96(%rsp)
-	paddq	%xmm6,%xmm6
-	pand	%xmm12,%xmm13
-	pcmpgtd	%xmm6,%xmm14
-	pxor	%xmm13,%xmm6
-	movdqu	80(%r12),%xmm12
-	pxor	%xmm11,%xmm3
-	movdqu	96(%r12),%xmm13
-	pxor	%xmm12,%xmm4
-	movdqu	112(%r12),%xmm14
-	leaq	128(%r12),%r12
-	movdqa	%xmm6,112(%rsp)
-	pxor	%xmm13,%xmm5
-	leaq	128(%rsp),%rax
-	pxor	%xmm14,%xmm6
-	movl	%edx,%r10d
-
-	call	_bsaes_encrypt8
-
-	pxor	0(%rsp),%xmm15
-	pxor	16(%rsp),%xmm0
-	movdqu	%xmm15,0(%r13)
-	pxor	32(%rsp),%xmm3
-	movdqu	%xmm0,16(%r13)
-	pxor	48(%rsp),%xmm5
-	movdqu	%xmm3,32(%r13)
-	pxor	64(%rsp),%xmm2
-	movdqu	%xmm5,48(%r13)
-	pxor	80(%rsp),%xmm6
-	movdqu	%xmm2,64(%r13)
-	pxor	96(%rsp),%xmm1
-	movdqu	%xmm6,80(%r13)
-	pxor	112(%rsp),%xmm4
-	movdqu	%xmm1,96(%r13)
-	movdqu	%xmm4,112(%r13)
-	leaq	128(%r13),%r13
-
-	movdqa	112(%rsp),%xmm6
-	pxor	%xmm14,%xmm14
-	movdqa	.Lxts_magic(%rip),%xmm12
-	pcmpgtd	%xmm6,%xmm14
-	pshufd	$0x13,%xmm14,%xmm13
-	pxor	%xmm14,%xmm14
-	paddq	%xmm6,%xmm6
-	pand	%xmm12,%xmm13
-	pcmpgtd	%xmm6,%xmm14
-	pxor	%xmm13,%xmm6
-
-	subq	$0x80,%r14
-	jnc	.Lxts_enc_loop
-
-.Lxts_enc_short:
-	addq	$0x80,%r14
-	jz	.Lxts_enc_done
-	pshufd	$0x13,%xmm14,%xmm13
-	pxor	%xmm14,%xmm14
-	movdqa	%xmm6,%xmm15
-	movdqa	%xmm6,0(%rsp)
-	paddq	%xmm6,%xmm6
-	pand	%xmm12,%xmm13
-	pcmpgtd	%xmm6,%xmm14
-	pxor	%xmm13,%xmm6
-	pshufd	$0x13,%xmm14,%xmm13
-	pxor	%xmm14,%xmm14
-	movdqa	%xmm6,%xmm0
-	movdqa	%xmm6,16(%rsp)
-	paddq	%xmm6,%xmm6
-	pand	%xmm12,%xmm13
-	pcmpgtd	%xmm6,%xmm14
-	pxor	%xmm13,%xmm6
-	movdqu	0(%r12),%xmm7
-	cmpq	$16,%r14
-	je	.Lxts_enc_1
-	pshufd	$0x13,%xmm14,%xmm13
-	pxor	%xmm14,%xmm14
-	movdqa	%xmm6,%xmm1
-	movdqa	%xmm6,32(%rsp)
-	paddq	%xmm6,%xmm6
-	pand	%xmm12,%xmm13
-	pcmpgtd	%xmm6,%xmm14
-	pxor	%xmm13,%xmm6
-	movdqu	16(%r12),%xmm8
-	cmpq	$32,%r14
-	je	.Lxts_enc_2
-	pxor	%xmm7,%xmm15
-	pshufd	$0x13,%xmm14,%xmm13
-	pxor	%xmm14,%xmm14
-	movdqa	%xmm6,%xmm2
-	movdqa	%xmm6,48(%rsp)
-	paddq	%xmm6,%xmm6
-	pand	%xmm12,%xmm13
-	pcmpgtd	%xmm6,%xmm14
-	pxor	%xmm13,%xmm6
-	movdqu	32(%r12),%xmm9
-	cmpq	$48,%r14
-	je	.Lxts_enc_3
-	pxor	%xmm8,%xmm0
-	pshufd	$0x13,%xmm14,%xmm13
-	pxor	%xmm14,%xmm14
-	movdqa	%xmm6,%xmm3
-	movdqa	%xmm6,64(%rsp)
-	paddq	%xmm6,%xmm6
-	pand	%xmm12,%xmm13
-	pcmpgtd	%xmm6,%xmm14
-	pxor	%xmm13,%xmm6
-	movdqu	48(%r12),%xmm10
-	cmpq	$64,%r14
-	je	.Lxts_enc_4
-	pxor	%xmm9,%xmm1
-	pshufd	$0x13,%xmm14,%xmm13
-	pxor	%xmm14,%xmm14
-	movdqa	%xmm6,%xmm4
-	movdqa	%xmm6,80(%rsp)
-	paddq	%xmm6,%xmm6
-	pand	%xmm12,%xmm13
-	pcmpgtd	%xmm6,%xmm14
-	pxor	%xmm13,%xmm6
-	movdqu	64(%r12),%xmm11
-	cmpq	$80,%r14
-	je	.Lxts_enc_5
-	pxor	%xmm10,%xmm2
-	pshufd	$0x13,%xmm14,%xmm13
-	pxor	%xmm14,%xmm14
-	movdqa	%xmm6,%xmm5
-	movdqa	%xmm6,96(%rsp)
-	paddq	%xmm6,%xmm6
-	pand	%xmm12,%xmm13
-	pcmpgtd	%xmm6,%xmm14
-	pxor	%xmm13,%xmm6
-	movdqu	80(%r12),%xmm12
-	cmpq	$96,%r14
-	je	.Lxts_enc_6
-	pxor	%xmm11,%xmm3
-	movdqu	96(%r12),%xmm13
-	pxor	%xmm12,%xmm4
-	movdqa	%xmm6,112(%rsp)
-	leaq	112(%r12),%r12
-	pxor	%xmm13,%xmm5
-	leaq	128(%rsp),%rax
-	movl	%edx,%r10d
-
-	call	_bsaes_encrypt8
-
-	pxor	0(%rsp),%xmm15
-	pxor	16(%rsp),%xmm0
-	movdqu	%xmm15,0(%r13)
-	pxor	32(%rsp),%xmm3
-	movdqu	%xmm0,16(%r13)
-	pxor	48(%rsp),%xmm5
-	movdqu	%xmm3,32(%r13)
-	pxor	64(%rsp),%xmm2
-	movdqu	%xmm5,48(%r13)
-	pxor	80(%rsp),%xmm6
-	movdqu	%xmm2,64(%r13)
-	pxor	96(%rsp),%xmm1
-	movdqu	%xmm6,80(%r13)
-	movdqu	%xmm1,96(%r13)
-	leaq	112(%r13),%r13
-
-	movdqa	112(%rsp),%xmm6
-	jmp	.Lxts_enc_done
-.align	16
-.Lxts_enc_6:
-	pxor	%xmm11,%xmm3
-	leaq	96(%r12),%r12
-	pxor	%xmm12,%xmm4
-	leaq	128(%rsp),%rax
-	movl	%edx,%r10d
-
-	call	_bsaes_encrypt8
-
-	pxor	0(%rsp),%xmm15
-	pxor	16(%rsp),%xmm0
-	movdqu	%xmm15,0(%r13)
-	pxor	32(%rsp),%xmm3
-	movdqu	%xmm0,16(%r13)
-	pxor	48(%rsp),%xmm5
-	movdqu	%xmm3,32(%r13)
-	pxor	64(%rsp),%xmm2
-	movdqu	%xmm5,48(%r13)
-	pxor	80(%rsp),%xmm6
-	movdqu	%xmm2,64(%r13)
-	movdqu	%xmm6,80(%r13)
-	leaq	96(%r13),%r13
-
-	movdqa	96(%rsp),%xmm6
-	jmp	.Lxts_enc_done
-.align	16
-.Lxts_enc_5:
-	pxor	%xmm10,%xmm2
-	leaq	80(%r12),%r12
-	pxor	%xmm11,%xmm3
-	leaq	128(%rsp),%rax
-	movl	%edx,%r10d
-
-	call	_bsaes_encrypt8
-
-	pxor	0(%rsp),%xmm15
-	pxor	16(%rsp),%xmm0
-	movdqu	%xmm15,0(%r13)
-	pxor	32(%rsp),%xmm3
-	movdqu	%xmm0,16(%r13)
-	pxor	48(%rsp),%xmm5
-	movdqu	%xmm3,32(%r13)
-	pxor	64(%rsp),%xmm2
-	movdqu	%xmm5,48(%r13)
-	movdqu	%xmm2,64(%r13)
-	leaq	80(%r13),%r13
-
-	movdqa	80(%rsp),%xmm6
-	jmp	.Lxts_enc_done
-.align	16
-.Lxts_enc_4:
-	pxor	%xmm9,%xmm1
-	leaq	64(%r12),%r12
-	pxor	%xmm10,%xmm2
-	leaq	128(%rsp),%rax
-	movl	%edx,%r10d
-
-	call	_bsaes_encrypt8
-
-	pxor	0(%rsp),%xmm15
-	pxor	16(%rsp),%xmm0
-	movdqu	%xmm15,0(%r13)
-	pxor	32(%rsp),%xmm3
-	movdqu	%xmm0,16(%r13)
-	pxor	48(%rsp),%xmm5
-	movdqu	%xmm3,32(%r13)
-	movdqu	%xmm5,48(%r13)
-	leaq	64(%r13),%r13
-
-	movdqa	64(%rsp),%xmm6
-	jmp	.Lxts_enc_done
-.align	16
-.Lxts_enc_3:
-	pxor	%xmm8,%xmm0
-	leaq	48(%r12),%r12
-	pxor	%xmm9,%xmm1
-	leaq	128(%rsp),%rax
-	movl	%edx,%r10d
-
-	call	_bsaes_encrypt8
-
-	pxor	0(%rsp),%xmm15
-	pxor	16(%rsp),%xmm0
-	movdqu	%xmm15,0(%r13)
-	pxor	32(%rsp),%xmm3
-	movdqu	%xmm0,16(%r13)
-	movdqu	%xmm3,32(%r13)
-	leaq	48(%r13),%r13
-
-	movdqa	48(%rsp),%xmm6
-	jmp	.Lxts_enc_done
-.align	16
-.Lxts_enc_2:
-	pxor	%xmm7,%xmm15
-	leaq	32(%r12),%r12
-	pxor	%xmm8,%xmm0
-	leaq	128(%rsp),%rax
-	movl	%edx,%r10d
-
-	call	_bsaes_encrypt8
-
-	pxor	0(%rsp),%xmm15
-	pxor	16(%rsp),%xmm0
-	movdqu	%xmm15,0(%r13)
-	movdqu	%xmm0,16(%r13)
-	leaq	32(%r13),%r13
-
-	movdqa	32(%rsp),%xmm6
-	jmp	.Lxts_enc_done
-.align	16
-.Lxts_enc_1:
-	pxor	%xmm15,%xmm7
-	leaq	16(%r12),%r12
-	movdqa	%xmm7,32(%rbp)
-	leaq	32(%rbp),%rdi
-	leaq	32(%rbp),%rsi
-	leaq	(%r15),%rdx
-	call	asm_AES_encrypt
-	pxor	32(%rbp),%xmm15
-
-
-
-
-
-	movdqu	%xmm15,0(%r13)
-	leaq	16(%r13),%r13
-
-	movdqa	16(%rsp),%xmm6
-
-.Lxts_enc_done:
-	andl	$15,%ebx
-	jz	.Lxts_enc_ret
-	movq	%r13,%rdx
-
-.Lxts_enc_steal:
-	movzbl	(%r12),%eax
-	movzbl	-16(%rdx),%ecx
-	leaq	1(%r12),%r12
-	movb	%al,-16(%rdx)
-	movb	%cl,0(%rdx)
-	leaq	1(%rdx),%rdx
-	subl	$1,%ebx
-	jnz	.Lxts_enc_steal
-
-	movdqu	-16(%r13),%xmm15
-	leaq	32(%rbp),%rdi
-	pxor	%xmm6,%xmm15
-	leaq	32(%rbp),%rsi
-	movdqa	%xmm15,32(%rbp)
-	leaq	(%r15),%rdx
-	call	asm_AES_encrypt
-	pxor	32(%rbp),%xmm6
-	movdqu	%xmm6,-16(%r13)
-
-.Lxts_enc_ret:
-	leaq	(%rsp),%rax
-	pxor	%xmm0,%xmm0
-.Lxts_enc_bzero:
-	movdqa	%xmm0,0(%rax)
-	movdqa	%xmm0,16(%rax)
-	leaq	32(%rax),%rax
-	cmpq	%rax,%rbp
-	ja	.Lxts_enc_bzero
-
-	leaq	120(%rbp),%rax
-.cfi_def_cfa	%rax,8
-	movq	-48(%rax),%r15
-.cfi_restore	%r15
-	movq	-40(%rax),%r14
-.cfi_restore	%r14
-	movq	-32(%rax),%r13
-.cfi_restore	%r13
-	movq	-24(%rax),%r12
-.cfi_restore	%r12
-	movq	-16(%rax),%rbx
-.cfi_restore	%rbx
-	movq	-8(%rax),%rbp
-.cfi_restore	%rbp
-	leaq	(%rax),%rsp
-.cfi_def_cfa_register	%rsp
-.Lxts_enc_epilogue:
-	.byte	0xf3,0xc3
-.cfi_endproc	
-.size	bsaes_xts_encrypt,.-bsaes_xts_encrypt
-
-.globl	bsaes_xts_decrypt
-.type	bsaes_xts_decrypt,@function
-.align	16
-bsaes_xts_decrypt:
-.cfi_startproc	
-	movq	%rsp,%rax
-.Lxts_dec_prologue:
-	pushq	%rbp
-.cfi_adjust_cfa_offset	8
-.cfi_offset	%rbp,-16
-	pushq	%rbx
-.cfi_adjust_cfa_offset	8
-.cfi_offset	%rbx,-24
-	pushq	%r12
-.cfi_adjust_cfa_offset	8
-.cfi_offset	%r12,-32
-	pushq	%r13
-.cfi_adjust_cfa_offset	8
-.cfi_offset	%r13,-40
-	pushq	%r14
-.cfi_adjust_cfa_offset	8
-.cfi_offset	%r14,-48
-	pushq	%r15
-.cfi_adjust_cfa_offset	8
-.cfi_offset	%r15,-56
-	leaq	-72(%rsp),%rsp
-.cfi_adjust_cfa_offset	0x48
-	movq	%rsp,%rbp
-	movq	%rdi,%r12
-	movq	%rsi,%r13
-	movq	%rdx,%r14
-	movq	%rcx,%r15
-
-	leaq	(%r9),%rdi
-	leaq	32(%rbp),%rsi
-	leaq	(%r8),%rdx
-	call	asm_AES_encrypt
-
-	movl	240(%r15),%eax
-	movq	%r14,%rbx
-
-	movl	%eax,%edx
-	shlq	$7,%rax
-	subq	$96,%rax
-	subq	%rax,%rsp
-
-	movq	%rsp,%rax
-	movq	%r15,%rcx
-	movl	%edx,%r10d
-	call	_bsaes_key_convert
-	pxor	(%rsp),%xmm7
-	movdqa	%xmm6,(%rax)
-	movdqa	%xmm7,(%rsp)
-
-	xorl	%eax,%eax
-	andq	$-16,%r14
-	testl	$15,%ebx
-	setnz	%al
-	shlq	$4,%rax
-	subq	%rax,%r14
-
-	subq	$0x80,%rsp
-	movdqa	32(%rbp),%xmm6
-
-	pxor	%xmm14,%xmm14
-	movdqa	.Lxts_magic(%rip),%xmm12
-	pcmpgtd	%xmm6,%xmm14
-
-	subq	$0x80,%r14
-	jc	.Lxts_dec_short
-	jmp	.Lxts_dec_loop
-
-.align	16
-.Lxts_dec_loop:
-	pshufd	$0x13,%xmm14,%xmm13
-	pxor	%xmm14,%xmm14
-	movdqa	%xmm6,%xmm15
-	movdqa	%xmm6,0(%rsp)
-	paddq	%xmm6,%xmm6
-	pand	%xmm12,%xmm13
-	pcmpgtd	%xmm6,%xmm14
-	pxor	%xmm13,%xmm6
-	pshufd	$0x13,%xmm14,%xmm13
-	pxor	%xmm14,%xmm14
-	movdqa	%xmm6,%xmm0
-	movdqa	%xmm6,16(%rsp)
-	paddq	%xmm6,%xmm6
-	pand	%xmm12,%xmm13
-	pcmpgtd	%xmm6,%xmm14
-	pxor	%xmm13,%xmm6
-	movdqu	0(%r12),%xmm7
-	pshufd	$0x13,%xmm14,%xmm13
-	pxor	%xmm14,%xmm14
-	movdqa	%xmm6,%xmm1
-	movdqa	%xmm6,32(%rsp)
-	paddq	%xmm6,%xmm6
-	pand	%xmm12,%xmm13
-	pcmpgtd	%xmm6,%xmm14
-	pxor	%xmm13,%xmm6
-	movdqu	16(%r12),%xmm8
-	pxor	%xmm7,%xmm15
-	pshufd	$0x13,%xmm14,%xmm13
-	pxor	%xmm14,%xmm14
-	movdqa	%xmm6,%xmm2
-	movdqa	%xmm6,48(%rsp)
-	paddq	%xmm6,%xmm6
-	pand	%xmm12,%xmm13
-	pcmpgtd	%xmm6,%xmm14
-	pxor	%xmm13,%xmm6
-	movdqu	32(%r12),%xmm9
-	pxor	%xmm8,%xmm0
-	pshufd	$0x13,%xmm14,%xmm13
-	pxor	%xmm14,%xmm14
-	movdqa	%xmm6,%xmm3
-	movdqa	%xmm6,64(%rsp)
-	paddq	%xmm6,%xmm6
-	pand	%xmm12,%xmm13
-	pcmpgtd	%xmm6,%xmm14
-	pxor	%xmm13,%xmm6
-	movdqu	48(%r12),%xmm10
-	pxor	%xmm9,%xmm1
-	pshufd	$0x13,%xmm14,%xmm13
-	pxor	%xmm14,%xmm14
-	movdqa	%xmm6,%xmm4
-	movdqa	%xmm6,80(%rsp)
-	paddq	%xmm6,%xmm6
-	pand	%xmm12,%xmm13
-	pcmpgtd	%xmm6,%xmm14
-	pxor	%xmm13,%xmm6
-	movdqu	64(%r12),%xmm11
-	pxor	%xmm10,%xmm2
-	pshufd	$0x13,%xmm14,%xmm13
-	pxor	%xmm14,%xmm14
-	movdqa	%xmm6,%xmm5
-	movdqa	%xmm6,96(%rsp)
-	paddq	%xmm6,%xmm6
-	pand	%xmm12,%xmm13
-	pcmpgtd	%xmm6,%xmm14
-	pxor	%xmm13,%xmm6
-	movdqu	80(%r12),%xmm12
-	pxor	%xmm11,%xmm3
-	movdqu	96(%r12),%xmm13
-	pxor	%xmm12,%xmm4
-	movdqu	112(%r12),%xmm14
-	leaq	128(%r12),%r12
-	movdqa	%xmm6,112(%rsp)
-	pxor	%xmm13,%xmm5
-	leaq	128(%rsp),%rax
-	pxor	%xmm14,%xmm6
-	movl	%edx,%r10d
-
-	call	_bsaes_decrypt8
-
-	pxor	0(%rsp),%xmm15
-	pxor	16(%rsp),%xmm0
-	movdqu	%xmm15,0(%r13)
-	pxor	32(%rsp),%xmm5
-	movdqu	%xmm0,16(%r13)
-	pxor	48(%rsp),%xmm3
-	movdqu	%xmm5,32(%r13)
-	pxor	64(%rsp),%xmm1
-	movdqu	%xmm3,48(%r13)
-	pxor	80(%rsp),%xmm6
-	movdqu	%xmm1,64(%r13)
-	pxor	96(%rsp),%xmm2
-	movdqu	%xmm6,80(%r13)
-	pxor	112(%rsp),%xmm4
-	movdqu	%xmm2,96(%r13)
-	movdqu	%xmm4,112(%r13)
-	leaq	128(%r13),%r13
-
-	movdqa	112(%rsp),%xmm6
-	pxor	%xmm14,%xmm14
-	movdqa	.Lxts_magic(%rip),%xmm12
-	pcmpgtd	%xmm6,%xmm14
-	pshufd	$0x13,%xmm14,%xmm13
-	pxor	%xmm14,%xmm14
-	paddq	%xmm6,%xmm6
-	pand	%xmm12,%xmm13
-	pcmpgtd	%xmm6,%xmm14
-	pxor	%xmm13,%xmm6
-
-	subq	$0x80,%r14
-	jnc	.Lxts_dec_loop
-
-.Lxts_dec_short:
-	addq	$0x80,%r14
-	jz	.Lxts_dec_done
-	pshufd	$0x13,%xmm14,%xmm13
-	pxor	%xmm14,%xmm14
-	movdqa	%xmm6,%xmm15
-	movdqa	%xmm6,0(%rsp)
-	paddq	%xmm6,%xmm6
-	pand	%xmm12,%xmm13
-	pcmpgtd	%xmm6,%xmm14
-	pxor	%xmm13,%xmm6
-	pshufd	$0x13,%xmm14,%xmm13
-	pxor	%xmm14,%xmm14
-	movdqa	%xmm6,%xmm0
-	movdqa	%xmm6,16(%rsp)
-	paddq	%xmm6,%xmm6
-	pand	%xmm12,%xmm13
-	pcmpgtd	%xmm6,%xmm14
-	pxor	%xmm13,%xmm6
-	movdqu	0(%r12),%xmm7
-	cmpq	$16,%r14
-	je	.Lxts_dec_1
-	pshufd	$0x13,%xmm14,%xmm13
-	pxor	%xmm14,%xmm14
-	movdqa	%xmm6,%xmm1
-	movdqa	%xmm6,32(%rsp)
-	paddq	%xmm6,%xmm6
-	pand	%xmm12,%xmm13
-	pcmpgtd	%xmm6,%xmm14
-	pxor	%xmm13,%xmm6
-	movdqu	16(%r12),%xmm8
-	cmpq	$32,%r14
-	je	.Lxts_dec_2
-	pxor	%xmm7,%xmm15
-	pshufd	$0x13,%xmm14,%xmm13
-	pxor	%xmm14,%xmm14
-	movdqa	%xmm6,%xmm2
-	movdqa	%xmm6,48(%rsp)
-	paddq	%xmm6,%xmm6
-	pand	%xmm12,%xmm13
-	pcmpgtd	%xmm6,%xmm14
-	pxor	%xmm13,%xmm6
-	movdqu	32(%r12),%xmm9
-	cmpq	$48,%r14
-	je	.Lxts_dec_3
-	pxor	%xmm8,%xmm0
-	pshufd	$0x13,%xmm14,%xmm13
-	pxor	%xmm14,%xmm14
-	movdqa	%xmm6,%xmm3
-	movdqa	%xmm6,64(%rsp)
-	paddq	%xmm6,%xmm6
-	pand	%xmm12,%xmm13
-	pcmpgtd	%xmm6,%xmm14
-	pxor	%xmm13,%xmm6
-	movdqu	48(%r12),%xmm10
-	cmpq	$64,%r14
-	je	.Lxts_dec_4
-	pxor	%xmm9,%xmm1
-	pshufd	$0x13,%xmm14,%xmm13
-	pxor	%xmm14,%xmm14
-	movdqa	%xmm6,%xmm4
-	movdqa	%xmm6,80(%rsp)
-	paddq	%xmm6,%xmm6
-	pand	%xmm12,%xmm13
-	pcmpgtd	%xmm6,%xmm14
-	pxor	%xmm13,%xmm6
-	movdqu	64(%r12),%xmm11
-	cmpq	$80,%r14
-	je	.Lxts_dec_5
-	pxor	%xmm10,%xmm2
-	pshufd	$0x13,%xmm14,%xmm13
-	pxor	%xmm14,%xmm14
-	movdqa	%xmm6,%xmm5
-	movdqa	%xmm6,96(%rsp)
-	paddq	%xmm6,%xmm6
-	pand	%xmm12,%xmm13
-	pcmpgtd	%xmm6,%xmm14
-	pxor	%xmm13,%xmm6
-	movdqu	80(%r12),%xmm12
-	cmpq	$96,%r14
-	je	.Lxts_dec_6
-	pxor	%xmm11,%xmm3
-	movdqu	96(%r12),%xmm13
-	pxor	%xmm12,%xmm4
-	movdqa	%xmm6,112(%rsp)
-	leaq	112(%r12),%r12
-	pxor	%xmm13,%xmm5
-	leaq	128(%rsp),%rax
-	movl	%edx,%r10d
-
-	call	_bsaes_decrypt8
-
-	pxor	0(%rsp),%xmm15
-	pxor	16(%rsp),%xmm0
-	movdqu	%xmm15,0(%r13)
-	pxor	32(%rsp),%xmm5
-	movdqu	%xmm0,16(%r13)
-	pxor	48(%rsp),%xmm3
-	movdqu	%xmm5,32(%r13)
-	pxor	64(%rsp),%xmm1
-	movdqu	%xmm3,48(%r13)
-	pxor	80(%rsp),%xmm6
-	movdqu	%xmm1,64(%r13)
-	pxor	96(%rsp),%xmm2
-	movdqu	%xmm6,80(%r13)
-	movdqu	%xmm2,96(%r13)
-	leaq	112(%r13),%r13
-
-	movdqa	112(%rsp),%xmm6
-	jmp	.Lxts_dec_done
-.align	16
-.Lxts_dec_6:
-	pxor	%xmm11,%xmm3
-	leaq	96(%r12),%r12
-	pxor	%xmm12,%xmm4
-	leaq	128(%rsp),%rax
-	movl	%edx,%r10d
-
-	call	_bsaes_decrypt8
-
-	pxor	0(%rsp),%xmm15
-	pxor	16(%rsp),%xmm0
-	movdqu	%xmm15,0(%r13)
-	pxor	32(%rsp),%xmm5
-	movdqu	%xmm0,16(%r13)
-	pxor	48(%rsp),%xmm3
-	movdqu	%xmm5,32(%r13)
-	pxor	64(%rsp),%xmm1
-	movdqu	%xmm3,48(%r13)
-	pxor	80(%rsp),%xmm6
-	movdqu	%xmm1,64(%r13)
-	movdqu	%xmm6,80(%r13)
-	leaq	96(%r13),%r13
-
-	movdqa	96(%rsp),%xmm6
-	jmp	.Lxts_dec_done
-.align	16
-.Lxts_dec_5:
-	pxor	%xmm10,%xmm2
-	leaq	80(%r12),%r12
-	pxor	%xmm11,%xmm3
-	leaq	128(%rsp),%rax
-	movl	%edx,%r10d
-
-	call	_bsaes_decrypt8
-
-	pxor	0(%rsp),%xmm15
-	pxor	16(%rsp),%xmm0
-	movdqu	%xmm15,0(%r13)
-	pxor	32(%rsp),%xmm5
-	movdqu	%xmm0,16(%r13)
-	pxor	48(%rsp),%xmm3
-	movdqu	%xmm5,32(%r13)
-	pxor	64(%rsp),%xmm1
-	movdqu	%xmm3,48(%r13)
-	movdqu	%xmm1,64(%r13)
-	leaq	80(%r13),%r13
-
-	movdqa	80(%rsp),%xmm6
-	jmp	.Lxts_dec_done
-.align	16
-.Lxts_dec_4:
-	pxor	%xmm9,%xmm1
-	leaq	64(%r12),%r12
-	pxor	%xmm10,%xmm2
-	leaq	128(%rsp),%rax
-	movl	%edx,%r10d
-
-	call	_bsaes_decrypt8
-
-	pxor	0(%rsp),%xmm15
-	pxor	16(%rsp),%xmm0
-	movdqu	%xmm15,0(%r13)
-	pxor	32(%rsp),%xmm5
-	movdqu	%xmm0,16(%r13)
-	pxor	48(%rsp),%xmm3
-	movdqu	%xmm5,32(%r13)
-	movdqu	%xmm3,48(%r13)
-	leaq	64(%r13),%r13
-
-	movdqa	64(%rsp),%xmm6
-	jmp	.Lxts_dec_done
-.align	16
-.Lxts_dec_3:
-	pxor	%xmm8,%xmm0
-	leaq	48(%r12),%r12
-	pxor	%xmm9,%xmm1
-	leaq	128(%rsp),%rax
-	movl	%edx,%r10d
-
-	call	_bsaes_decrypt8
-
-	pxor	0(%rsp),%xmm15
-	pxor	16(%rsp),%xmm0
-	movdqu	%xmm15,0(%r13)
-	pxor	32(%rsp),%xmm5
-	movdqu	%xmm0,16(%r13)
-	movdqu	%xmm5,32(%r13)
-	leaq	48(%r13),%r13
-
-	movdqa	48(%rsp),%xmm6
-	jmp	.Lxts_dec_done
-.align	16
-.Lxts_dec_2:
-	pxor	%xmm7,%xmm15
-	leaq	32(%r12),%r12
-	pxor	%xmm8,%xmm0
-	leaq	128(%rsp),%rax
-	movl	%edx,%r10d
-
-	call	_bsaes_decrypt8
-
-	pxor	0(%rsp),%xmm15
-	pxor	16(%rsp),%xmm0
-	movdqu	%xmm15,0(%r13)
-	movdqu	%xmm0,16(%r13)
-	leaq	32(%r13),%r13
-
-	movdqa	32(%rsp),%xmm6
-	jmp	.Lxts_dec_done
-.align	16
-.Lxts_dec_1:
-	pxor	%xmm15,%xmm7
-	leaq	16(%r12),%r12
-	movdqa	%xmm7,32(%rbp)
-	leaq	32(%rbp),%rdi
-	leaq	32(%rbp),%rsi
-	leaq	(%r15),%rdx
-	call	asm_AES_decrypt
-	pxor	32(%rbp),%xmm15
-
-
-
-
-
-	movdqu	%xmm15,0(%r13)
-	leaq	16(%r13),%r13
-
-	movdqa	16(%rsp),%xmm6
-
-.Lxts_dec_done:
-	andl	$15,%ebx
-	jz	.Lxts_dec_ret
-
-	pxor	%xmm14,%xmm14
-	movdqa	.Lxts_magic(%rip),%xmm12
-	pcmpgtd	%xmm6,%xmm14
-	pshufd	$0x13,%xmm14,%xmm13
-	movdqa	%xmm6,%xmm5
-	paddq	%xmm6,%xmm6
-	pand	%xmm12,%xmm13
-	movdqu	(%r12),%xmm15
-	pxor	%xmm13,%xmm6
-
-	leaq	32(%rbp),%rdi
-	pxor	%xmm6,%xmm15
-	leaq	32(%rbp),%rsi
-	movdqa	%xmm15,32(%rbp)
-	leaq	(%r15),%rdx
-	call	asm_AES_decrypt
-	pxor	32(%rbp),%xmm6
-	movq	%r13,%rdx
-	movdqu	%xmm6,(%r13)
-
-.Lxts_dec_steal:
-	movzbl	16(%r12),%eax
-	movzbl	(%rdx),%ecx
-	leaq	1(%r12),%r12
-	movb	%al,(%rdx)
-	movb	%cl,16(%rdx)
-	leaq	1(%rdx),%rdx
-	subl	$1,%ebx
-	jnz	.Lxts_dec_steal
-
-	movdqu	(%r13),%xmm15
-	leaq	32(%rbp),%rdi
-	pxor	%xmm5,%xmm15
-	leaq	32(%rbp),%rsi
-	movdqa	%xmm15,32(%rbp)
-	leaq	(%r15),%rdx
-	call	asm_AES_decrypt
-	pxor	32(%rbp),%xmm5
-	movdqu	%xmm5,(%r13)
-
-.Lxts_dec_ret:
-	leaq	(%rsp),%rax
-	pxor	%xmm0,%xmm0
-.Lxts_dec_bzero:
-	movdqa	%xmm0,0(%rax)
-	movdqa	%xmm0,16(%rax)
-	leaq	32(%rax),%rax
-	cmpq	%rax,%rbp
-	ja	.Lxts_dec_bzero
-
-	leaq	120(%rbp),%rax
-.cfi_def_cfa	%rax,8
-	movq	-48(%rax),%r15
-.cfi_restore	%r15
-	movq	-40(%rax),%r14
-.cfi_restore	%r14
-	movq	-32(%rax),%r13
-.cfi_restore	%r13
-	movq	-24(%rax),%r12
-.cfi_restore	%r12
-	movq	-16(%rax),%rbx
-.cfi_restore	%rbx
-	movq	-8(%rax),%rbp
-.cfi_restore	%rbp
-	leaq	(%rax),%rsp
-.cfi_def_cfa_register	%rsp
-.Lxts_dec_epilogue:
-	.byte	0xf3,0xc3
-.cfi_endproc	
-.size	bsaes_xts_decrypt,.-bsaes_xts_decrypt
-.type	_bsaes_const,@object
-.align	64
-_bsaes_const:
-.LM0ISR:
-.quad	0x0a0e0206070b0f03, 0x0004080c0d010509
-.LISRM0:
-.quad	0x01040b0e0205080f, 0x0306090c00070a0d
-.LISR:
-.quad	0x0504070602010003, 0x0f0e0d0c080b0a09
-.LBS0:
-.quad	0x5555555555555555, 0x5555555555555555
-.LBS1:
-.quad	0x3333333333333333, 0x3333333333333333
-.LBS2:
-.quad	0x0f0f0f0f0f0f0f0f, 0x0f0f0f0f0f0f0f0f
-.LSR:
-.quad	0x0504070600030201, 0x0f0e0d0c0a09080b
-.LSRM0:
-.quad	0x0304090e00050a0f, 0x01060b0c0207080d
-.LM0SR:
-.quad	0x0a0e02060f03070b, 0x0004080c05090d01
-.LSWPUP:
-.quad	0x0706050403020100, 0x0c0d0e0f0b0a0908
-.LSWPUPM0SR:
-.quad	0x0a0d02060c03070b, 0x0004080f05090e01
-.LADD1:
-.quad	0x0000000000000000, 0x0000000100000000
-.LADD2:
-.quad	0x0000000000000000, 0x0000000200000000
-.LADD3:
-.quad	0x0000000000000000, 0x0000000300000000
-.LADD4:
-.quad	0x0000000000000000, 0x0000000400000000
-.LADD5:
-.quad	0x0000000000000000, 0x0000000500000000
-.LADD6:
-.quad	0x0000000000000000, 0x0000000600000000
-.LADD7:
-.quad	0x0000000000000000, 0x0000000700000000
-.LADD8:
-.quad	0x0000000000000000, 0x0000000800000000
-.Lxts_magic:
-.long	0x87,0,1,0
-.Lmasks:
-.quad	0x0101010101010101, 0x0101010101010101
-.quad	0x0202020202020202, 0x0202020202020202
-.quad	0x0404040404040404, 0x0404040404040404
-.quad	0x0808080808080808, 0x0808080808080808
-.LM0:
-.quad	0x02060a0e03070b0f, 0x0004080c0105090d
-.L63:
-.quad	0x6363636363636363, 0x6363636363636363
-.byte	66,105,116,45,115,108,105,99,101,100,32,65,69,83,32,102,111,114,32,120,56,54,95,54,52,47,83,83,83,69,51,44,32,69,109,105,108,105,97,32,75,195,164,115,112,101,114,44,32,80,101,116,101,114,32,83,99,104,119,97,98,101,44,32,65,110,100,121,32,80,111,108,121,97,107,111,118,0
-.align	64
-.size	_bsaes_const,.-_bsaes_const
diff --git a/deps/openssl/config/archs/solaris64-x86_64-gcc/asm_avx2/crypto/bn/rsaz-x86_64.s b/deps/openssl/config/archs/solaris64-x86_64-gcc/asm_avx2/crypto/bn/rsaz-x86_64.s
index f8e4a80588..7876e0b8f9 100644
--- a/deps/openssl/config/archs/solaris64-x86_64-gcc/asm_avx2/crypto/bn/rsaz-x86_64.s
+++ b/deps/openssl/config/archs/solaris64-x86_64-gcc/asm_avx2/crypto/bn/rsaz-x86_64.s
@@ -29,7 +29,7 @@ rsaz_512_sqr:
 	subq	$128+24,%rsp
 .cfi_adjust_cfa_offset	128+24
 .Lsqr_body:
-	movq	%rdx,%rbp
+.byte	102,72,15,110,202
 	movq	(%rsi),%rdx
 	movq	8(%rsi),%rax
 	movq	%rcx,128(%rsp)
@@ -44,6 +44,7 @@ rsaz_512_sqr:
 	movl	%r8d,128+8(%rsp)
 
 	movq	%rdx,%rbx
+	movq	%rax,%rbp
 	mulq	%rdx
 	movq	%rax,%r8
 	movq	16(%rsi),%rax
@@ -82,31 +83,29 @@ rsaz_512_sqr:
 	mulq	%rbx
 	addq	%rax,%r14
 	movq	%rbx,%rax
-	movq	%rdx,%r15
-	adcq	$0,%r15
+	adcq	$0,%rdx
 
+	xorq	%rcx,%rcx
 	addq	%r8,%r8
-	movq	%r9,%rcx
-	adcq	%r9,%r9
+	movq	%rdx,%r15
+	adcq	$0,%rcx
 
 	mulq	%rax
-	movq	%rax,(%rsp)
-	addq	%rdx,%r8
-	adcq	$0,%r9
+	addq	%r8,%rdx
+	adcq	$0,%rcx
 
-	movq	%r8,8(%rsp)
-	shrq	$63,%rcx
+	movq	%rax,(%rsp)
+	movq	%rdx,8(%rsp)
 
 
-	movq	8(%rsi),%r8
 	movq	16(%rsi),%rax
-	mulq	%r8
+	mulq	%rbp
 	addq	%rax,%r10
 	movq	24(%rsi),%rax
 	movq	%rdx,%rbx
 	adcq	$0,%rbx
 
-	mulq	%r8
+	mulq	%rbp
 	addq	%rax,%r11
 	movq	32(%rsi),%rax
 	adcq	$0,%rdx
@@ -114,7 +113,7 @@ rsaz_512_sqr:
 	movq	%rdx,%rbx
 	adcq	$0,%rbx
 
-	mulq	%r8
+	mulq	%rbp
 	addq	%rax,%r12
 	movq	40(%rsi),%rax
 	adcq	$0,%rdx
@@ -122,7 +121,7 @@ rsaz_512_sqr:
 	movq	%rdx,%rbx
 	adcq	$0,%rbx
 
-	mulq	%r8
+	mulq	%rbp
 	addq	%rax,%r13
 	movq	48(%rsi),%rax
 	adcq	$0,%rdx
@@ -130,7 +129,7 @@ rsaz_512_sqr:
 	movq	%rdx,%rbx
 	adcq	$0,%rbx
 
-	mulq	%r8
+	mulq	%rbp
 	addq	%rax,%r14
 	movq	56(%rsi),%rax
 	adcq	$0,%rdx
@@ -138,39 +137,39 @@ rsaz_512_sqr:
 	movq	%rdx,%rbx
 	adcq	$0,%rbx
 
-	mulq	%r8
+	mulq	%rbp
 	addq	%rax,%r15
-	movq	%r8,%rax
+	movq	%rbp,%rax
 	adcq	$0,%rdx
 	addq	%rbx,%r15
-	movq	%rdx,%r8
-	movq	%r10,%rdx
-	adcq	$0,%r8
+	adcq	$0,%rdx
 
-	addq	%rdx,%rdx
-	leaq	(%rcx,%r10,2),%r10
-	movq	%r11,%rbx
-	adcq	%r11,%r11
+	xorq	%rbx,%rbx
+	addq	%r9,%r9
+	movq	%rdx,%r8
+	adcq	%r10,%r10
+	adcq	$0,%rbx
 
 	mulq	%rax
+
+	addq	%rcx,%rax
+	movq	16(%rsi),%rbp
 	addq	%rax,%r9
+	movq	24(%rsi),%rax
 	adcq	%rdx,%r10
-	adcq	$0,%r11
+	adcq	$0,%rbx
 
 	movq	%r9,16(%rsp)
 	movq	%r10,24(%rsp)
-	shrq	$63,%rbx
 
 
-	movq	16(%rsi),%r9
-	movq	24(%rsi),%rax
-	mulq	%r9
+	mulq	%rbp
 	addq	%rax,%r12
 	movq	32(%rsi),%rax
 	movq	%rdx,%rcx
 	adcq	$0,%rcx
 
-	mulq	%r9
+	mulq	%rbp
 	addq	%rax,%r13
 	movq	40(%rsi),%rax
 	adcq	$0,%rdx
@@ -178,7 +177,7 @@ rsaz_512_sqr:
 	movq	%rdx,%rcx
 	adcq	$0,%rcx
 
-	mulq	%r9
+	mulq	%rbp
 	addq	%rax,%r14
 	movq	48(%rsi),%rax
 	adcq	$0,%rdx
@@ -186,9 +185,7 @@ rsaz_512_sqr:
 	movq	%rdx,%rcx
 	adcq	$0,%rcx
 
-	mulq	%r9
-	movq	%r12,%r10
-	leaq	(%rbx,%r12,2),%r12
+	mulq	%rbp
 	addq	%rax,%r15
 	movq	56(%rsi),%rax
 	adcq	$0,%rdx
@@ -196,36 +193,40 @@ rsaz_512_sqr:
 	movq	%rdx,%rcx
 	adcq	$0,%rcx
 
-	mulq	%r9
-	shrq	$63,%r10
+	mulq	%rbp
 	addq	%rax,%r8
-	movq	%r9,%rax
+	movq	%rbp,%rax
 	adcq	$0,%rdx
 	addq	%rcx,%r8
-	movq	%rdx,%r9
-	adcq	$0,%r9
+	adcq	$0,%rdx
 
-	movq	%r13,%rcx
-	leaq	(%r10,%r13,2),%r13
+	xorq	%rcx,%rcx
+	addq	%r11,%r11
+	movq	%rdx,%r9
+	adcq	%r12,%r12
+	adcq	$0,%rcx
 
 	mulq	%rax
+
+	addq	%rbx,%rax
+	movq	24(%rsi),%r10
 	addq	%rax,%r11
+	movq	32(%rsi),%rax
 	adcq	%rdx,%r12
-	adcq	$0,%r13
+	adcq	$0,%rcx
 
 	movq	%r11,32(%rsp)
 	movq	%r12,40(%rsp)
-	shrq	$63,%rcx
 
 
-	movq	24(%rsi),%r10
-	movq	32(%rsi),%rax
+	movq	%rax,%r11
 	mulq	%r10
 	addq	%rax,%r14
 	movq	40(%rsi),%rax
 	movq	%rdx,%rbx
 	adcq	$0,%rbx
 
+	movq	%rax,%r12
 	mulq	%r10
 	addq	%rax,%r15
 	movq	48(%rsi),%rax
@@ -234,9 +235,8 @@ rsaz_512_sqr:
 	movq	%rdx,%rbx
 	adcq	$0,%rbx
 
+	movq	%rax,%rbp
 	mulq	%r10
-	movq	%r14,%r12
-	leaq	(%rcx,%r14,2),%r14
 	addq	%rax,%r8
 	movq	56(%rsi),%rax
 	adcq	$0,%rdx
@@ -245,32 +245,33 @@ rsaz_512_sqr:
 	adcq	$0,%rbx
 
 	mulq	%r10
-	shrq	$63,%r12
 	addq	%rax,%r9
 	movq	%r10,%rax
 	adcq	$0,%rdx
 	addq	%rbx,%r9
-	movq	%rdx,%r10
-	adcq	$0,%r10
+	adcq	$0,%rdx
 
-	movq	%r15,%rbx
-	leaq	(%r12,%r15,2),%r15
+	xorq	%rbx,%rbx
+	addq	%r13,%r13
+	movq	%rdx,%r10
+	adcq	%r14,%r14
+	adcq	$0,%rbx
 
 	mulq	%rax
+
+	addq	%rcx,%rax
 	addq	%rax,%r13
+	movq	%r12,%rax
 	adcq	%rdx,%r14
-	adcq	$0,%r15
+	adcq	$0,%rbx
 
 	movq	%r13,48(%rsp)
 	movq	%r14,56(%rsp)
-	shrq	$63,%rbx
 
 
-	movq	32(%rsi),%r11
-	movq	40(%rsi),%rax
 	mulq	%r11
 	addq	%rax,%r8
-	movq	48(%rsi),%rax
+	movq	%rbp,%rax
 	movq	%rdx,%rcx
 	adcq	$0,%rcx
 
@@ -278,97 +279,99 @@ rsaz_512_sqr:
 	addq	%rax,%r9
 	movq	56(%rsi),%rax
 	adcq	$0,%rdx
-	movq	%r8,%r12
-	leaq	(%rbx,%r8,2),%r8
 	addq	%rcx,%r9
 	movq	%rdx,%rcx
 	adcq	$0,%rcx
 
+	movq	%rax,%r14
 	mulq	%r11
-	shrq	$63,%r12
 	addq	%rax,%r10
 	movq	%r11,%rax
 	adcq	$0,%rdx
 	addq	%rcx,%r10
-	movq	%rdx,%r11
-	adcq	$0,%r11
+	adcq	$0,%rdx
 
-	movq	%r9,%rcx
-	leaq	(%r12,%r9,2),%r9
+	xorq	%rcx,%rcx
+	addq	%r15,%r15
+	movq	%rdx,%r11
+	adcq	%r8,%r8
+	adcq	$0,%rcx
 
 	mulq	%rax
+
+	addq	%rbx,%rax
 	addq	%rax,%r15
+	movq	%rbp,%rax
 	adcq	%rdx,%r8
-	adcq	$0,%r9
+	adcq	$0,%rcx
 
 	movq	%r15,64(%rsp)
 	movq	%r8,72(%rsp)
-	shrq	$63,%rcx
 
 
-	movq	40(%rsi),%r12
-	movq	48(%rsi),%rax
 	mulq	%r12
 	addq	%rax,%r10
-	movq	56(%rsi),%rax
+	movq	%r14,%rax
 	movq	%rdx,%rbx
 	adcq	$0,%rbx
 
 	mulq	%r12
 	addq	%rax,%r11
 	movq	%r12,%rax
-	movq	%r10,%r15
-	leaq	(%rcx,%r10,2),%r10
 	adcq	$0,%rdx
-	shrq	$63,%r15
 	addq	%rbx,%r11
-	movq	%rdx,%r12
-	adcq	$0,%r12
+	adcq	$0,%rdx
 
-	movq	%r11,%rbx
-	leaq	(%r15,%r11,2),%r11
+	xorq	%rbx,%rbx
+	addq	%r9,%r9
+	movq	%rdx,%r12
+	adcq	%r10,%r10
+	adcq	$0,%rbx
 
 	mulq	%rax
+
+	addq	%rcx,%rax
 	addq	%rax,%r9
+	movq	%r14,%rax
 	adcq	%rdx,%r10
-	adcq	$0,%r11
+	adcq	$0,%rbx
 
 	movq	%r9,80(%rsp)
 	movq	%r10,88(%rsp)
 
 
-	movq	48(%rsi),%r13
-	movq	56(%rsi),%rax
-	mulq	%r13
+	mulq	%rbp
 	addq	%rax,%r12
-	movq	%r13,%rax
-	movq	%rdx,%r13
-	adcq	$0,%r13
+	movq	%rbp,%rax
+	adcq	$0,%rdx
 
-	xorq	%r14,%r14
-	shlq	$1,%rbx
+	xorq	%rcx,%rcx
+	addq	%r11,%r11
+	movq	%rdx,%r13
 	adcq	%r12,%r12
-	adcq	%r13,%r13
-	adcq	%r14,%r14
+	adcq	$0,%rcx
 
 	mulq	%rax
+
+	addq	%rbx,%rax
 	addq	%rax,%r11
+	movq	%r14,%rax
 	adcq	%rdx,%r12
-	adcq	$0,%r13
+	adcq	$0,%rcx
 
 	movq	%r11,96(%rsp)
 	movq	%r12,104(%rsp)
 
 
-	movq	56(%rsi),%rax
-	mulq	%rax
-	addq	%rax,%r13
-	adcq	$0,%rdx
+	xorq	%rbx,%rbx
+	addq	%r13,%r13
+	adcq	$0,%rbx
 
-	addq	%rdx,%r14
+	mulq	%rax
 
-	movq	%r13,112(%rsp)
-	movq	%r14,120(%rsp)
+	addq	%rcx,%rax
+	addq	%r13,%rax
+	adcq	%rbx,%rdx
 
 	movq	(%rsp),%r8
 	movq	8(%rsp),%r9
@@ -378,6 +381,10 @@ rsaz_512_sqr:
 	movq	40(%rsp),%r13
 	movq	48(%rsp),%r14
 	movq	56(%rsp),%r15
+.byte	102,72,15,126,205
+
+	movq	%rax,112(%rsp)
+	movq	%rdx,120(%rsp)
 
 	call	__rsaz_512_reduce
 
@@ -406,9 +413,9 @@ rsaz_512_sqr:
 .Loop_sqrx:
 	movl	%r8d,128+8(%rsp)
 .byte	102,72,15,110,199
-.byte	102,72,15,110,205
 
 	mulxq	%rax,%r8,%r9
+	movq	%rax,%rbx
 
 	mulxq	16(%rsi),%rcx,%r10
 	xorq	%rbp,%rbp
@@ -416,40 +423,39 @@ rsaz_512_sqr:
 	mulxq	24(%rsi),%rax,%r11
 	adcxq	%rcx,%r9
 
-	mulxq	32(%rsi),%rcx,%r12
+.byte	0xc4,0x62,0xf3,0xf6,0xa6,0x20,0x00,0x00,0x00
 	adcxq	%rax,%r10
 
-	mulxq	40(%rsi),%rax,%r13
+.byte	0xc4,0x62,0xfb,0xf6,0xae,0x28,0x00,0x00,0x00
 	adcxq	%rcx,%r11
 
-.byte	0xc4,0x62,0xf3,0xf6,0xb6,0x30,0x00,0x00,0x00
+	mulxq	48(%rsi),%rcx,%r14
 	adcxq	%rax,%r12
 	adcxq	%rcx,%r13
 
-.byte	0xc4,0x62,0xfb,0xf6,0xbe,0x38,0x00,0x00,0x00
+	mulxq	56(%rsi),%rax,%r15
 	adcxq	%rax,%r14
 	adcxq	%rbp,%r15
 
-	movq	%r9,%rcx
-	shldq	$1,%r8,%r9
-	shlq	$1,%r8
-
-	xorl	%ebp,%ebp
-	mulxq	%rdx,%rax,%rdx
-	adcxq	%rdx,%r8
-	movq	8(%rsi),%rdx
-	adcxq	%rbp,%r9
+	mulxq	%rdx,%rax,%rdi
+	movq	%rbx,%rdx
+	xorq	%rcx,%rcx
+	adoxq	%r8,%r8
+	adcxq	%rdi,%r8
+	adoxq	%rbp,%rcx
+	adcxq	%rbp,%rcx
 
 	movq	%rax,(%rsp)
 	movq	%r8,8(%rsp)
 
 
-	mulxq	16(%rsi),%rax,%rbx
+.byte	0xc4,0xe2,0xfb,0xf6,0x9e,0x10,0x00,0x00,0x00
 	adoxq	%rax,%r10
 	adcxq	%rbx,%r11
 
-.byte	0xc4,0x62,0xc3,0xf6,0x86,0x18,0x00,0x00,0x00
+	mulxq	24(%rsi),%rdi,%r8
 	adoxq	%rdi,%r11
+.byte	0x66
 	adcxq	%r8,%r12
 
 	mulxq	32(%rsi),%rax,%rbx
@@ -467,24 +473,25 @@ rsaz_512_sqr:
 .byte	0xc4,0x62,0xc3,0xf6,0x86,0x38,0x00,0x00,0x00
 	adoxq	%rdi,%r15
 	adcxq	%rbp,%r8
+	mulxq	%rdx,%rax,%rdi
 	adoxq	%rbp,%r8
+.byte	0x48,0x8b,0x96,0x10,0x00,0x00,0x00
 
-	movq	%r11,%rbx
-	shldq	$1,%r10,%r11
-	shldq	$1,%rcx,%r10
+	xorq	%rbx,%rbx
+	adoxq	%r9,%r9
 
-	xorl	%ebp,%ebp
-	mulxq	%rdx,%rax,%rcx
-	movq	16(%rsi),%rdx
+	adcxq	%rcx,%rax
+	adoxq	%r10,%r10
 	adcxq	%rax,%r9
-	adcxq	%rcx,%r10
-	adcxq	%rbp,%r11
+	adoxq	%rbp,%rbx
+	adcxq	%rdi,%r10
+	adcxq	%rbp,%rbx
 
 	movq	%r9,16(%rsp)
 .byte	0x4c,0x89,0x94,0x24,0x18,0x00,0x00,0x00
 
 
-.byte	0xc4,0x62,0xc3,0xf6,0x8e,0x18,0x00,0x00,0x00
+	mulxq	24(%rsi),%rdi,%r9
 	adoxq	%rdi,%r12
 	adcxq	%r9,%r13
 
@@ -492,7 +499,7 @@ rsaz_512_sqr:
 	adoxq	%rax,%r13
 	adcxq	%rcx,%r14
 
-	mulxq	40(%rsi),%rdi,%r9
+.byte	0xc4,0x62,0xc3,0xf6,0x8e,0x28,0x00,0x00,0x00
 	adoxq	%rdi,%r14
 	adcxq	%r9,%r15
 
@@ -500,27 +507,28 @@ rsaz_512_sqr:
 	adoxq	%rax,%r15
 	adcxq	%rcx,%r8
 
-.byte	0xc4,0x62,0xc3,0xf6,0x8e,0x38,0x00,0x00,0x00
+	mulxq	56(%rsi),%rdi,%r9
 	adoxq	%rdi,%r8
 	adcxq	%rbp,%r9
+	mulxq	%rdx,%rax,%rdi
 	adoxq	%rbp,%r9
+	movq	24(%rsi),%rdx
 
-	movq	%r13,%rcx
-	shldq	$1,%r12,%r13
-	shldq	$1,%rbx,%r12
+	xorq	%rcx,%rcx
+	adoxq	%r11,%r11
 
-	xorl	%ebp,%ebp
-	mulxq	%rdx,%rax,%rdx
+	adcxq	%rbx,%rax
+	adoxq	%r12,%r12
 	adcxq	%rax,%r11
-	adcxq	%rdx,%r12
-	movq	24(%rsi),%rdx
-	adcxq	%rbp,%r13
+	adoxq	%rbp,%rcx
+	adcxq	%rdi,%r12
+	adcxq	%rbp,%rcx
 
 	movq	%r11,32(%rsp)
-.byte	0x4c,0x89,0xa4,0x24,0x28,0x00,0x00,0x00
+	movq	%r12,40(%rsp)
 
 
-.byte	0xc4,0xe2,0xfb,0xf6,0x9e,0x20,0x00,0x00,0x00
+	mulxq	32(%rsi),%rax,%rbx
 	adoxq	%rax,%r14
 	adcxq	%rbx,%r15
 
@@ -535,25 +543,25 @@ rsaz_512_sqr:
 	mulxq	56(%rsi),%rdi,%r10
 	adoxq	%rdi,%r9
 	adcxq	%rbp,%r10
+	mulxq	%rdx,%rax,%rdi
 	adoxq	%rbp,%r10
+	movq	32(%rsi),%rdx
 
-.byte	0x66
-	movq	%r15,%rbx
-	shldq	$1,%r14,%r15
-	shldq	$1,%rcx,%r14
+	xorq	%rbx,%rbx
+	adoxq	%r13,%r13
 
-	xorl	%ebp,%ebp
-	mulxq	%rdx,%rax,%rdx
+	adcxq	%rcx,%rax
+	adoxq	%r14,%r14
 	adcxq	%rax,%r13
-	adcxq	%rdx,%r14
-	movq	32(%rsi),%rdx
-	adcxq	%rbp,%r15
+	adoxq	%rbp,%rbx
+	adcxq	%rdi,%r14
+	adcxq	%rbp,%rbx
 
 	movq	%r13,48(%rsp)
 	movq	%r14,56(%rsp)
 
 
-.byte	0xc4,0x62,0xc3,0xf6,0x9e,0x28,0x00,0x00,0x00
+	mulxq	40(%rsi),%rdi,%r11
 	adoxq	%rdi,%r8
 	adcxq	%r11,%r9
 
@@ -564,18 +572,19 @@ rsaz_512_sqr:
 	mulxq	56(%rsi),%rdi,%r11
 	adoxq	%rdi,%r10
 	adcxq	%rbp,%r11
+	mulxq	%rdx,%rax,%rdi
+	movq	40(%rsi),%rdx
 	adoxq	%rbp,%r11
 
-	movq	%r9,%rcx
-	shldq	$1,%r8,%r9
-	shldq	$1,%rbx,%r8
+	xorq	%rcx,%rcx
+	adoxq	%r15,%r15
 
-	xorl	%ebp,%ebp
-	mulxq	%rdx,%rax,%rdx
+	adcxq	%rbx,%rax
+	adoxq	%r8,%r8
 	adcxq	%rax,%r15
-	adcxq	%rdx,%r8
-	movq	40(%rsi),%rdx
-	adcxq	%rbp,%r9
+	adoxq	%rbp,%rcx
+	adcxq	%rdi,%r8
+	adcxq	%rbp,%rcx
 
 	movq	%r15,64(%rsp)
 	movq	%r8,72(%rsp)
@@ -588,18 +597,19 @@ rsaz_512_sqr:
 .byte	0xc4,0x62,0xc3,0xf6,0xa6,0x38,0x00,0x00,0x00
 	adoxq	%rdi,%r11
 	adcxq	%rbp,%r12
+	mulxq	%rdx,%rax,%rdi
 	adoxq	%rbp,%r12
+	movq	48(%rsi),%rdx
 
-	movq	%r11,%rbx
-	shldq	$1,%r10,%r11
-	shldq	$1,%rcx,%r10
+	xorq	%rbx,%rbx
+	adoxq	%r9,%r9
 
-	xorl	%ebp,%ebp
-	mulxq	%rdx,%rax,%rdx
+	adcxq	%rcx,%rax
+	adoxq	%r10,%r10
 	adcxq	%rax,%r9
-	adcxq	%rdx,%r10
-	movq	48(%rsi),%rdx
-	adcxq	%rbp,%r11
+	adcxq	%rdi,%r10
+	adoxq	%rbp,%rbx
+	adcxq	%rbp,%rbx
 
 	movq	%r9,80(%rsp)
 	movq	%r10,88(%rsp)
@@ -609,31 +619,31 @@ rsaz_512_sqr:
 	adoxq	%rax,%r12
 	adoxq	%rbp,%r13
 
-	xorq	%r14,%r14
-	shldq	$1,%r13,%r14
-	shldq	$1,%r12,%r13
-	shldq	$1,%rbx,%r12
+	mulxq	%rdx,%rax,%rdi
+	xorq	%rcx,%rcx
+	movq	56(%rsi),%rdx
+	adoxq	%r11,%r11
 
-	xorl	%ebp,%ebp
-	mulxq	%rdx,%rax,%rdx
+	adcxq	%rbx,%rax
+	adoxq	%r12,%r12
 	adcxq	%rax,%r11
-	adcxq	%rdx,%r12
-	movq	56(%rsi),%rdx
-	adcxq	%rbp,%r13
+	adoxq	%rbp,%rcx
+	adcxq	%rdi,%r12
+	adcxq	%rbp,%rcx
 
 .byte	0x4c,0x89,0x9c,0x24,0x60,0x00,0x00,0x00
 .byte	0x4c,0x89,0xa4,0x24,0x68,0x00,0x00,0x00
 
 
 	mulxq	%rdx,%rax,%rdx
-	adoxq	%rax,%r13
-	adoxq	%rbp,%rdx
+	xorq	%rbx,%rbx
+	adoxq	%r13,%r13
 
-.byte	0x66
-	addq	%rdx,%r14
+	adcxq	%rcx,%rax
+	adoxq	%rbp,%rbx
+	adcxq	%r13,%rax
+	adcxq	%rdx,%rbx
 
-	movq	%r13,112(%rsp)
-	movq	%r14,120(%rsp)
 .byte	102,72,15,126,199
 .byte	102,72,15,126,205
 
@@ -647,6 +657,9 @@ rsaz_512_sqr:
 	movq	48(%rsp),%r14
 	movq	56(%rsp),%r15
 
+	movq	%rax,112(%rsp)
+	movq	%rbx,120(%rsp)
+
 	call	__rsaz_512_reducex
 
 	addq	64(%rsp),%r8
@@ -1440,6 +1453,7 @@ rsaz_512_mul_by_one:
 .type	__rsaz_512_reduce,@function
 .align	32
 __rsaz_512_reduce:
+.cfi_startproc
 	movq	%r8,%rbx
 	imulq	128+8(%rsp),%rbx
 	movq	0(%rbp),%rax
@@ -1519,10 +1533,12 @@ __rsaz_512_reduce:
 	jne	.Lreduction_loop
 
 	.byte	0xf3,0xc3
+.cfi_endproc
 .size	__rsaz_512_reduce,.-__rsaz_512_reduce
 .type	__rsaz_512_reducex,@function
 .align	32
 __rsaz_512_reducex:
+.cfi_startproc
 
 	imulq	%r8,%rdx
 	xorq	%rsi,%rsi
@@ -1575,10 +1591,12 @@ __rsaz_512_reducex:
 	jne	.Lreduction_loopx
 
 	.byte	0xf3,0xc3
+.cfi_endproc
 .size	__rsaz_512_reducex,.-__rsaz_512_reducex
 .type	__rsaz_512_subtract,@function
 .align	32
 __rsaz_512_subtract:
+.cfi_startproc
 	movq	%r8,(%rdi)
 	movq	%r9,8(%rdi)
 	movq	%r10,16(%rdi)
@@ -1632,10 +1650,12 @@ __rsaz_512_subtract:
 	movq	%r15,56(%rdi)
 
 	.byte	0xf3,0xc3
+.cfi_endproc
 .size	__rsaz_512_subtract,.-__rsaz_512_subtract
 .type	__rsaz_512_mul,@function
 .align	32
 __rsaz_512_mul:
+.cfi_startproc
 	leaq	8(%rsp),%rdi
 
 	movq	(%rsi),%rax
@@ -1774,10 +1794,12 @@ __rsaz_512_mul:
 	movq	%r15,56(%rdi)
 
 	.byte	0xf3,0xc3
+.cfi_endproc
 .size	__rsaz_512_mul,.-__rsaz_512_mul
 .type	__rsaz_512_mulx,@function
 .align	32
 __rsaz_512_mulx:
+.cfi_startproc
 	mulxq	(%rsi),%rbx,%r8
 	movq	$-6,%rcx
 
@@ -1894,11 +1916,13 @@ __rsaz_512_mulx:
 	movq	%r15,8+64+56(%rsp)
 
 	.byte	0xf3,0xc3
+.cfi_endproc
 .size	__rsaz_512_mulx,.-__rsaz_512_mulx
 .globl	rsaz_512_scatter4
 .type	rsaz_512_scatter4,@function
 .align	16
 rsaz_512_scatter4:
+.cfi_startproc
 	leaq	(%rdi,%rdx,8),%rdi
 	movl	$8,%r9d
 	jmp	.Loop_scatter
@@ -1911,12 +1935,14 @@ rsaz_512_scatter4:
 	decl	%r9d
 	jnz	.Loop_scatter
 	.byte	0xf3,0xc3
+.cfi_endproc
 .size	rsaz_512_scatter4,.-rsaz_512_scatter4
 
 .globl	rsaz_512_gather4
 .type	rsaz_512_gather4,@function
 .align	16
 rsaz_512_gather4:
+.cfi_startproc
 	movd	%edx,%xmm8
 	movdqa	.Linc+16(%rip),%xmm1
 	movdqa	.Linc(%rip),%xmm0
@@ -1980,6 +2006,7 @@ rsaz_512_gather4:
 	jnz	.Loop_gather
 	.byte	0xf3,0xc3
 .LSEH_end_rsaz_512_gather4:
+.cfi_endproc
 .size	rsaz_512_gather4,.-rsaz_512_gather4
 
 .align	64
diff --git a/deps/openssl/config/archs/solaris64-x86_64-gcc/asm_avx2/crypto/bn/x86_64-mont5.s b/deps/openssl/config/archs/solaris64-x86_64-gcc/asm_avx2/crypto/bn/x86_64-mont5.s
index df4b6610a0..40a60a3c8f 100644
--- a/deps/openssl/config/archs/solaris64-x86_64-gcc/asm_avx2/crypto/bn/x86_64-mont5.s
+++ b/deps/openssl/config/archs/solaris64-x86_64-gcc/asm_avx2/crypto/bn/x86_64-mont5.s
@@ -550,6 +550,7 @@ bn_mul4x_mont_gather5:
 .type	mul4x_internal,@function
 .align	32
 mul4x_internal:
+.cfi_startproc
 	shlq	$5,%r9
 	movd	8(%rax),%xmm5
 	leaq	.Linc(%rip),%rax
@@ -1071,6 +1072,7 @@ mul4x_internal:
 	movq	16(%rbp),%r14
 	movq	24(%rbp),%r15
 	jmp	.Lsqr4x_sub_entry
+.cfi_endproc
 .size	mul4x_internal,.-mul4x_internal
 .globl	bn_power5
 .type	bn_power5,@function
@@ -1213,6 +1215,7 @@ bn_power5:
 .align	32
 bn_sqr8x_internal:
 __bn_sqr8x_internal:
+.cfi_startproc
 
 
 
@@ -1987,10 +1990,12 @@ __bn_sqr8x_reduction:
 	cmpq	%rdx,%rdi
 	jb	.L8x_reduction_loop
 	.byte	0xf3,0xc3
+.cfi_endproc
 .size	bn_sqr8x_internal,.-bn_sqr8x_internal
 .type	__bn_post4x_internal,@function
 .align	32
 __bn_post4x_internal:
+.cfi_startproc
 	movq	0(%rbp),%r12
 	leaq	(%rdi,%r9,1),%rbx
 	movq	%r9,%rcx
@@ -2041,15 +2046,18 @@ __bn_post4x_internal:
 	movq	%r9,%r10
 	negq	%r9
 	.byte	0xf3,0xc3
+.cfi_endproc
 .size	__bn_post4x_internal,.-__bn_post4x_internal
 .globl	bn_from_montgomery
 .type	bn_from_montgomery,@function
 .align	32
 bn_from_montgomery:
+.cfi_startproc
 	testl	$7,%r9d
 	jz	bn_from_mont8x
 	xorl	%eax,%eax
 	.byte	0xf3,0xc3
+.cfi_endproc
 .size	bn_from_montgomery,.-bn_from_montgomery
 
 .type	bn_from_mont8x,@function
@@ -2333,6 +2341,7 @@ bn_mulx4x_mont_gather5:
 .type	mulx4x_internal,@function
 .align	32
 mulx4x_internal:
+.cfi_startproc
 	movq	%r9,8(%rsp)
 	movq	%r9,%r10
 	negq	%r9
@@ -2751,6 +2760,7 @@ mulx4x_internal:
 	movq	16(%rbp),%r14
 	movq	24(%rbp),%r15
 	jmp	.Lsqrx4x_sub_entry
+.cfi_endproc
 .size	mulx4x_internal,.-mulx4x_internal
 .type	bn_powerx5,@function
 .align	32
@@ -3509,6 +3519,7 @@ __bn_sqrx8x_reduction:
 .size	bn_sqrx8x_internal,.-bn_sqrx8x_internal
 .align	32
 __bn_postx4x_internal:
+.cfi_startproc
 	movq	0(%rbp),%r12
 	movq	%rcx,%r10
 	movq	%rcx,%r9
@@ -3556,11 +3567,13 @@ __bn_postx4x_internal:
 	negq	%r9
 
 	.byte	0xf3,0xc3
+.cfi_endproc
 .size	__bn_postx4x_internal,.-__bn_postx4x_internal
 .globl	bn_get_bits5
 .type	bn_get_bits5,@function
 .align	16
 bn_get_bits5:
+.cfi_startproc
 	leaq	0(%rdi),%r10
 	leaq	1(%rdi),%r11
 	movl	%esi,%ecx
@@ -3574,12 +3587,14 @@ bn_get_bits5:
 	shrl	%cl,%eax
 	andl	$31,%eax
 	.byte	0xf3,0xc3
+.cfi_endproc
 .size	bn_get_bits5,.-bn_get_bits5
 
 .globl	bn_scatter5
 .type	bn_scatter5,@function
 .align	16
 bn_scatter5:
+.cfi_startproc
 	cmpl	$0,%esi
 	jz	.Lscatter_epilogue
 	leaq	(%rdx,%rcx,8),%rdx
@@ -3592,6 +3607,7 @@ bn_scatter5:
 	jnz	.Lscatter
 .Lscatter_epilogue:
 	.byte	0xf3,0xc3
+.cfi_endproc
 .size	bn_scatter5,.-bn_scatter5
 
 .globl	bn_gather5
@@ -3599,6 +3615,7 @@ bn_scatter5:
 .align	32
 bn_gather5:
 .LSEH_begin_bn_gather5:
+.cfi_startproc
 
 .byte	0x4c,0x8d,0x14,0x24
 .byte	0x48,0x81,0xec,0x08,0x01,0x00,0x00
@@ -3756,6 +3773,7 @@ bn_gather5:
 	leaq	(%r10),%rsp
 	.byte	0xf3,0xc3
 .LSEH_end_bn_gather5:
+.cfi_endproc
 .size	bn_gather5,.-bn_gather5
 .align	64
 .Linc:
diff --git a/deps/openssl/config/archs/solaris64-x86_64-gcc/asm_avx2/crypto/buildinf.h b/deps/openssl/config/archs/solaris64-x86_64-gcc/asm_avx2/crypto/buildinf.h
index c7f32e0bb8..2e41bb9b2c 100644
--- a/deps/openssl/config/archs/solaris64-x86_64-gcc/asm_avx2/crypto/buildinf.h
+++ b/deps/openssl/config/archs/solaris64-x86_64-gcc/asm_avx2/crypto/buildinf.h
@@ -11,7 +11,7 @@
  */
 
 #define PLATFORM "platform: solaris64-x86_64-gcc"
-#define DATE "built on: Fri Sep 13 16:02:40 2019 UTC"
+#define DATE "built on: Wed Mar 18 21:10:11 2020 UTC"
 
 /*
  * Generate compiler_flags as an array of individual characters. This is a
@@ -37,10 +37,11 @@ static const char compiler_flags[] = {
     '6','_','A','S','M',' ','-','D','S','H','A','5','1','2','_','A',
     'S','M',' ','-','D','K','E','C','C','A','K','1','6','0','0','_',
     'A','S','M',' ','-','D','R','C','4','_','A','S','M',' ','-','D',
-    'M','D','5','_','A','S','M',' ','-','D','V','P','A','E','S','_',
-    'A','S','M',' ','-','D','G','H','A','S','H','_','A','S','M',' ',
-    '-','D','E','C','P','_','N','I','S','T','Z','2','5','6','_','A',
-    'S','M',' ','-','D','X','2','5','5','1','9','_','A','S','M',' ',
-    '-','D','P','O','L','Y','1','3','0','5','_','A','S','M',' ','-',
-    'D','N','D','E','B','U','G','\0'
+    'M','D','5','_','A','S','M',' ','-','D','A','E','S','N','I','_',
+    'A','S','M',' ','-','D','V','P','A','E','S','_','A','S','M',' ',
+    '-','D','G','H','A','S','H','_','A','S','M',' ','-','D','E','C',
+    'P','_','N','I','S','T','Z','2','5','6','_','A','S','M',' ','-',
+    'D','X','2','5','5','1','9','_','A','S','M',' ','-','D','P','O',
+    'L','Y','1','3','0','5','_','A','S','M',' ','-','D','N','D','E',
+    'B','U','G','\0'
 };
diff --git a/deps/openssl/config/archs/solaris64-x86_64-gcc/asm_avx2/crypto/camellia/cmll-x86_64.s b/deps/openssl/config/archs/solaris64-x86_64-gcc/asm_avx2/crypto/camellia/cmll-x86_64.s
index 405566b01c..eeb20dd229 100644
--- a/deps/openssl/config/archs/solaris64-x86_64-gcc/asm_avx2/crypto/camellia/cmll-x86_64.s
+++ b/deps/openssl/config/archs/solaris64-x86_64-gcc/asm_avx2/crypto/camellia/cmll-x86_64.s
@@ -5,11 +5,13 @@
 .type	Camellia_EncryptBlock,@function
 .align	16
 Camellia_EncryptBlock:
+.cfi_startproc
 	movl	$128,%eax
 	subl	%edi,%eax
 	movl	$3,%edi
 	adcl	$0,%edi
 	jmp	.Lenc_rounds
+.cfi_endproc
 .size	Camellia_EncryptBlock,.-Camellia_EncryptBlock
 
 .globl	Camellia_EncryptBlock_Rounds
@@ -83,6 +85,7 @@ Camellia_EncryptBlock_Rounds:
 .type	_x86_64_Camellia_encrypt,@function
 .align	16
 _x86_64_Camellia_encrypt:
+.cfi_startproc
 	xorl	0(%r14),%r9d
 	xorl	4(%r14),%r8d
 	xorl	8(%r14),%r11d
@@ -285,6 +288,7 @@ _x86_64_Camellia_encrypt:
 	movl	%edx,%r11d
 
 .byte	0xf3,0xc3
+.cfi_endproc
 .size	_x86_64_Camellia_encrypt,.-_x86_64_Camellia_encrypt
 
 
@@ -292,11 +296,13 @@ _x86_64_Camellia_encrypt:
 .type	Camellia_DecryptBlock,@function
 .align	16
 Camellia_DecryptBlock:
+.cfi_startproc
 	movl	$128,%eax
 	subl	%edi,%eax
 	movl	$3,%edi
 	adcl	$0,%edi
 	jmp	.Ldec_rounds
+.cfi_endproc
 .size	Camellia_DecryptBlock,.-Camellia_DecryptBlock
 
 .globl	Camellia_DecryptBlock_Rounds
@@ -370,6 +376,7 @@ Camellia_DecryptBlock_Rounds:
 .type	_x86_64_Camellia_decrypt,@function
 .align	16
 _x86_64_Camellia_decrypt:
+.cfi_startproc
 	xorl	0(%r14),%r9d
 	xorl	4(%r14),%r8d
 	xorl	8(%r14),%r11d
@@ -573,6 +580,7 @@ _x86_64_Camellia_decrypt:
 	movl	%ebx,%r11d
 
 .byte	0xf3,0xc3
+.cfi_endproc
 .size	_x86_64_Camellia_decrypt,.-_x86_64_Camellia_decrypt
 .globl	Camellia_Ekeygen
 .type	Camellia_Ekeygen,@function
diff --git a/deps/openssl/config/archs/solaris64-x86_64-gcc/asm_avx2/crypto/ec/ecp_nistz256-x86_64.s b/deps/openssl/config/archs/solaris64-x86_64-gcc/asm_avx2/crypto/ec/ecp_nistz256-x86_64.s
index 62b9ac6616..5c9e405041 100644
--- a/deps/openssl/config/archs/solaris64-x86_64-gcc/asm_avx2/crypto/ec/ecp_nistz256-x86_64.s
+++ b/deps/openssl/config/archs/solaris64-x86_64-gcc/asm_avx2/crypto/ec/ecp_nistz256-x86_64.s
@@ -3874,10 +3874,12 @@ ecp_nistz256_ord_sqr_montx:
 .type	ecp_nistz256_to_mont,@function
 .align	32
 ecp_nistz256_to_mont:
+.cfi_startproc
 	movl	$0x80100,%ecx
 	andl	OPENSSL_ia32cap_P+8(%rip),%ecx
 	leaq	.LRR(%rip),%rdx
 	jmp	.Lmul_mont
+.cfi_endproc
 .size	ecp_nistz256_to_mont,.-ecp_nistz256_to_mont
 
 
@@ -4821,6 +4823,7 @@ ecp_nistz256_from_mont:
 .type	ecp_nistz256_scatter_w5,@function
 .align	32
 ecp_nistz256_scatter_w5:
+.cfi_startproc
 	leal	-3(%rdx,%rdx,2),%edx
 	movdqa	0(%rsi),%xmm0
 	shll	$5,%edx
@@ -4837,6 +4840,7 @@ ecp_nistz256_scatter_w5:
 	movdqa	%xmm5,80(%rdi,%rdx,1)
 
 	.byte	0xf3,0xc3
+.cfi_endproc
 .size	ecp_nistz256_scatter_w5,.-ecp_nistz256_scatter_w5
 
 
@@ -4910,6 +4914,7 @@ ecp_nistz256_gather_w5:
 .type	ecp_nistz256_scatter_w7,@function
 .align	32
 ecp_nistz256_scatter_w7:
+.cfi_startproc
 	movdqu	0(%rsi),%xmm0
 	shll	$6,%edx
 	movdqu	16(%rsi),%xmm1
@@ -4921,6 +4926,7 @@ ecp_nistz256_scatter_w7:
 	movdqa	%xmm3,48(%rdi,%rdx,1)
 
 	.byte	0xf3,0xc3
+.cfi_endproc
 .size	ecp_nistz256_scatter_w7,.-ecp_nistz256_scatter_w7
 
 
@@ -5655,26 +5661,16 @@ ecp_nistz256_point_add:
 	orq	%r8,%r12
 	orq	%r9,%r12
 
-.byte	0x3e
-	jnz	.Ladd_proceedq
 .byte	102,73,15,126,208
 .byte	102,73,15,126,217
-	testq	%r8,%r8
-	jnz	.Ladd_proceedq
-	testq	%r9,%r9
-	jz	.Ladd_doubleq
 
-.byte	102,72,15,126,199
-	pxor	%xmm0,%xmm0
-	movdqu	%xmm0,0(%rdi)
-	movdqu	%xmm0,16(%rdi)
-	movdqu	%xmm0,32(%rdi)
-	movdqu	%xmm0,48(%rdi)
-	movdqu	%xmm0,64(%rdi)
-	movdqu	%xmm0,80(%rdi)
-	jmp	.Ladd_doneq
+	orq	%r8,%r12
+	orq	%r9,%r12
+
+
+.byte	0x3e
+	jnz	.Ladd_proceedq
 
-.align	32
 .Ladd_doubleq:
 .byte	102,72,15,126,206
 .byte	102,72,15,126,199
@@ -6774,26 +6770,16 @@ ecp_nistz256_point_addx:
 	orq	%r8,%r12
 	orq	%r9,%r12
 
-.byte	0x3e
-	jnz	.Ladd_proceedx
 .byte	102,73,15,126,208
 .byte	102,73,15,126,217
-	testq	%r8,%r8
-	jnz	.Ladd_proceedx
-	testq	%r9,%r9
-	jz	.Ladd_doublex
 
-.byte	102,72,15,126,199
-	pxor	%xmm0,%xmm0
-	movdqu	%xmm0,0(%rdi)
-	movdqu	%xmm0,16(%rdi)
-	movdqu	%xmm0,32(%rdi)
-	movdqu	%xmm0,48(%rdi)
-	movdqu	%xmm0,64(%rdi)
-	movdqu	%xmm0,80(%rdi)
-	jmp	.Ladd_donex
+	orq	%r8,%r12
+	orq	%r9,%r12
+
+
+.byte	0x3e
+	jnz	.Ladd_proceedx
 
-.align	32
 .Ladd_doublex:
 .byte	102,72,15,126,206
 .byte	102,72,15,126,199
diff --git a/deps/openssl/config/archs/solaris64-x86_64-gcc/asm_avx2/crypto/ec/x25519-x86_64.s b/deps/openssl/config/archs/solaris64-x86_64-gcc/asm_avx2/crypto/ec/x25519-x86_64.s
index 2a18eaee28..1788e568cd 100644
--- a/deps/openssl/config/archs/solaris64-x86_64-gcc/asm_avx2/crypto/ec/x25519-x86_64.s
+++ b/deps/openssl/config/archs/solaris64-x86_64-gcc/asm_avx2/crypto/ec/x25519-x86_64.s
@@ -400,12 +400,14 @@ x25519_fe51_mul121666:
 .type	x25519_fe64_eligible,@function
 .align	32
 x25519_fe64_eligible:
+.cfi_startproc
 	movl	OPENSSL_ia32cap_P+8(%rip),%ecx
 	xorl	%eax,%eax
 	andl	$0x80100,%ecx
 	cmpl	$0x80100,%ecx
 	cmovel	%ecx,%eax
 	.byte	0xf3,0xc3
+.cfi_endproc
 .size	x25519_fe64_eligible,.-x25519_fe64_eligible
 
 .globl	x25519_fe64_mul
@@ -648,6 +650,7 @@ x25519_fe64_sqr:
 .align	32
 x25519_fe64_mul121666:
 .Lfe64_mul121666_body:
+.cfi_startproc
 	movl	$121666,%edx
 	mulxq	0(%rsi),%r8,%rcx
 	mulxq	8(%rsi),%r9,%rax
@@ -676,6 +679,7 @@ x25519_fe64_mul121666:
 
 .Lfe64_mul121666_epilogue:
 	.byte	0xf3,0xc3
+.cfi_endproc
 .size	x25519_fe64_mul121666,.-x25519_fe64_mul121666
 
 .globl	x25519_fe64_add
@@ -683,6 +687,7 @@ x25519_fe64_mul121666:
 .align	32
 x25519_fe64_add:
 .Lfe64_add_body:
+.cfi_startproc
 	movq	0(%rsi),%r8
 	movq	8(%rsi),%r9
 	movq	16(%rsi),%r10
@@ -711,6 +716,7 @@ x25519_fe64_add:
 
 .Lfe64_add_epilogue:
 	.byte	0xf3,0xc3
+.cfi_endproc
 .size	x25519_fe64_add,.-x25519_fe64_add
 
 .globl	x25519_fe64_sub
@@ -718,6 +724,7 @@ x25519_fe64_add:
 .align	32
 x25519_fe64_sub:
 .Lfe64_sub_body:
+.cfi_startproc
 	movq	0(%rsi),%r8
 	movq	8(%rsi),%r9
 	movq	16(%rsi),%r10
@@ -746,6 +753,7 @@ x25519_fe64_sub:
 
 .Lfe64_sub_epilogue:
 	.byte	0xf3,0xc3
+.cfi_endproc
 .size	x25519_fe64_sub,.-x25519_fe64_sub
 
 .globl	x25519_fe64_tobytes
@@ -753,6 +761,7 @@ x25519_fe64_sub:
 .align	32
 x25519_fe64_tobytes:
 .Lfe64_to_body:
+.cfi_startproc
 	movq	0(%rsi),%r8
 	movq	8(%rsi),%r9
 	movq	16(%rsi),%r10
@@ -788,5 +797,6 @@ x25519_fe64_tobytes:
 
 .Lfe64_to_epilogue:
 	.byte	0xf3,0xc3
+.cfi_endproc
 .size	x25519_fe64_tobytes,.-x25519_fe64_tobytes
 .byte	88,50,53,53,49,57,32,112,114,105,109,105,116,105,118,101,115,32,102,111,114,32,120,56,54,95,54,52,44,32,67,82,89,80,84,79,71,65,77,83,32,98,121,32,60,97,112,112,114,111,64,111,112,101,110,115,115,108,46,111,114,103,62,0
diff --git a/deps/openssl/config/archs/solaris64-x86_64-gcc/asm_avx2/crypto/include/internal/bn_conf.h b/deps/openssl/config/archs/solaris64-x86_64-gcc/asm_avx2/crypto/include/internal/bn_conf.h
index 34bd8b78b4..5312ef5a7a 100644
--- a/deps/openssl/config/archs/solaris64-x86_64-gcc/asm_avx2/crypto/include/internal/bn_conf.h
+++ b/deps/openssl/config/archs/solaris64-x86_64-gcc/asm_avx2/crypto/include/internal/bn_conf.h
@@ -1,5 +1,5 @@
 /* WARNING: do not edit! */
-/* Generated by Makefile from crypto/include/internal/bn_conf.h.in */
+/* Generated by Makefile from include/crypto/bn_conf.h.in */
 /*
  * Copyright 2016 The OpenSSL Project Authors. All Rights Reserved.
  *
@@ -9,8 +9,8 @@
  * https://www.openssl.org/source/license.html
  */
 
-#ifndef HEADER_BN_CONF_H
-# define HEADER_BN_CONF_H
+#ifndef OSSL_CRYPTO_BN_CONF_H
+# define OSSL_CRYPTO_BN_CONF_H
 
 /*
  * The contents of this file are not used in the UEFI build, as
diff --git a/deps/openssl/config/archs/solaris64-x86_64-gcc/asm_avx2/crypto/include/internal/dso_conf.h b/deps/openssl/config/archs/solaris64-x86_64-gcc/asm_avx2/crypto/include/internal/dso_conf.h
index 252266ec2a..4b1167c3d8 100644
--- a/deps/openssl/config/archs/solaris64-x86_64-gcc/asm_avx2/crypto/include/internal/dso_conf.h
+++ b/deps/openssl/config/archs/solaris64-x86_64-gcc/asm_avx2/crypto/include/internal/dso_conf.h
@@ -1,5 +1,5 @@
 /* WARNING: do not edit! */
-/* Generated by Makefile from crypto/include/internal/dso_conf.h.in */
+/* Generated by Makefile from include/crypto/dso_conf.h.in */
 /*
  * Copyright 2016-2019 The OpenSSL Project Authors. All Rights Reserved.
  *
@@ -9,8 +9,8 @@
  * https://www.openssl.org/source/license.html
  */
 
-#ifndef HEADER_DSO_CONF_H
-# define HEADER_DSO_CONF_H
+#ifndef OSSL_CRYPTO_DSO_CONF_H
+# define OSSL_CRYPTO_DSO_CONF_H
 # define DSO_DLFCN
 # define HAVE_DLFCN_H
 # define DSO_EXTENSION ".so"
diff --git a/deps/openssl/config/archs/solaris64-x86_64-gcc/asm_avx2/crypto/modes/aesni-gcm-x86_64.s b/deps/openssl/config/archs/solaris64-x86_64-gcc/asm_avx2/crypto/modes/aesni-gcm-x86_64.s
index 6a7a9577c7..01d89630a4 100644
--- a/deps/openssl/config/archs/solaris64-x86_64-gcc/asm_avx2/crypto/modes/aesni-gcm-x86_64.s
+++ b/deps/openssl/config/archs/solaris64-x86_64-gcc/asm_avx2/crypto/modes/aesni-gcm-x86_64.s
@@ -3,6 +3,7 @@
 .type	_aesni_ctr32_ghash_6x,@function
 .align	32
 _aesni_ctr32_ghash_6x:
+.cfi_startproc
 	vmovdqu	32(%r11),%xmm2
 	subq	$6,%rdx
 	vpxor	%xmm4,%xmm4,%xmm4
@@ -310,6 +311,7 @@ _aesni_ctr32_ghash_6x:
 	vpxor	%xmm4,%xmm8,%xmm8
 
 	.byte	0xf3,0xc3
+.cfi_endproc
 .size	_aesni_ctr32_ghash_6x,.-_aesni_ctr32_ghash_6x
 .globl	aesni_gcm_decrypt
 .type	aesni_gcm_decrypt,@function
@@ -416,6 +418,7 @@ aesni_gcm_decrypt:
 .type	_aesni_ctr32_6x,@function
 .align	32
 _aesni_ctr32_6x:
+.cfi_startproc
 	vmovdqu	0-128(%rcx),%xmm4
 	vmovdqu	32(%r11),%xmm2
 	leaq	-1(%rbp),%r13
@@ -502,6 +505,7 @@ _aesni_ctr32_6x:
 	vpshufb	%xmm0,%xmm1,%xmm1
 	vpxor	%xmm4,%xmm14,%xmm14
 	jmp	.Loop_ctr32
+.cfi_endproc
 .size	_aesni_ctr32_6x,.-_aesni_ctr32_6x
 
 .globl	aesni_gcm_encrypt
diff --git a/deps/openssl/config/archs/solaris64-x86_64-gcc/asm_avx2/crypto/poly1305/poly1305-x86_64.s b/deps/openssl/config/archs/solaris64-x86_64-gcc/asm_avx2/crypto/poly1305/poly1305-x86_64.s
index 6f4cac8d39..2636c52bbe 100644
--- a/deps/openssl/config/archs/solaris64-x86_64-gcc/asm_avx2/crypto/poly1305/poly1305-x86_64.s
+++ b/deps/openssl/config/archs/solaris64-x86_64-gcc/asm_avx2/crypto/poly1305/poly1305-x86_64.s
@@ -12,6 +12,7 @@
 .type	poly1305_init,@function
 .align	32
 poly1305_init:
+.cfi_startproc
 	xorq	%rax,%rax
 	movq	%rax,0(%rdi)
 	movq	%rax,8(%rdi)
@@ -42,6 +43,7 @@ poly1305_init:
 	movl	$1,%eax
 .Lno_key:
 	.byte	0xf3,0xc3
+.cfi_endproc
 .size	poly1305_init,.-poly1305_init
 
 .type	poly1305_blocks,@function
@@ -162,6 +164,7 @@ poly1305_blocks:
 .type	poly1305_emit,@function
 .align	32
 poly1305_emit:
+.cfi_startproc
 .Lemit:
 	movq	0(%rdi),%r8
 	movq	8(%rdi),%r9
@@ -182,10 +185,12 @@ poly1305_emit:
 	movq	%rcx,8(%rsi)
 
 	.byte	0xf3,0xc3
+.cfi_endproc
 .size	poly1305_emit,.-poly1305_emit
 .type	__poly1305_block,@function
 .align	32
 __poly1305_block:
+.cfi_startproc
 	mulq	%r14
 	movq	%rax,%r9
 	movq	%r11,%rax
@@ -225,11 +230,13 @@ __poly1305_block:
 	adcq	$0,%rbx
 	adcq	$0,%rbp
 	.byte	0xf3,0xc3
+.cfi_endproc
 .size	__poly1305_block,.-__poly1305_block
 
 .type	__poly1305_init_avx,@function
 .align	32
 __poly1305_init_avx:
+.cfi_startproc
 	movq	%r11,%r14
 	movq	%r12,%rbx
 	xorq	%rbp,%rbp
@@ -387,6 +394,7 @@ __poly1305_init_avx:
 
 	leaq	-48-64(%rdi),%rdi
 	.byte	0xf3,0xc3
+.cfi_endproc
 .size	__poly1305_init_avx,.-__poly1305_init_avx
 
 .type	poly1305_blocks_avx,@function
@@ -1227,6 +1235,7 @@ poly1305_blocks_avx:
 .type	poly1305_emit_avx,@function
 .align	32
 poly1305_emit_avx:
+.cfi_startproc
 	cmpl	$0,20(%rdi)
 	je	.Lemit
 
@@ -1277,6 +1286,7 @@ poly1305_emit_avx:
 	movq	%rcx,8(%rsi)
 
 	.byte	0xf3,0xc3
+.cfi_endproc
 .size	poly1305_emit_avx,.-poly1305_emit_avx
 .type	poly1305_blocks_avx2,@function
 .align	32
@@ -1959,6 +1969,7 @@ poly1305_blocks_avx2:
 .type	xor128_encrypt_n_pad,@function
 .align	16
 xor128_encrypt_n_pad:
+.cfi_startproc
 	subq	%rdx,%rsi
 	subq	%rdx,%rdi
 	movq	%rcx,%r10
@@ -2000,12 +2011,14 @@ xor128_encrypt_n_pad:
 .Ldone_enc:
 	movq	%rdx,%rax
 	.byte	0xf3,0xc3
+.cfi_endproc
 .size	xor128_encrypt_n_pad,.-xor128_encrypt_n_pad
 
 .globl	xor128_decrypt_n_pad
 .type	xor128_decrypt_n_pad,@function
 .align	16
 xor128_decrypt_n_pad:
+.cfi_startproc
 	subq	%rdx,%rsi
 	subq	%rdx,%rdi
 	movq	%rcx,%r10
@@ -2051,4 +2064,5 @@ xor128_decrypt_n_pad:
 .Ldone_dec:
 	movq	%rdx,%rax
 	.byte	0xf3,0xc3
+.cfi_endproc
 .size	xor128_decrypt_n_pad,.-xor128_decrypt_n_pad
diff --git a/deps/openssl/config/archs/solaris64-x86_64-gcc/asm_avx2/crypto/rc4/rc4-x86_64.s b/deps/openssl/config/archs/solaris64-x86_64-gcc/asm_avx2/crypto/rc4/rc4-x86_64.s
index fba70351d4..b97c757550 100644
--- a/deps/openssl/config/archs/solaris64-x86_64-gcc/asm_avx2/crypto/rc4/rc4-x86_64.s
+++ b/deps/openssl/config/archs/solaris64-x86_64-gcc/asm_avx2/crypto/rc4/rc4-x86_64.s
@@ -4,11 +4,12 @@
 .globl	RC4
 .type	RC4,@function
 .align	16
-RC4:	orq	%rsi,%rsi
+RC4:
+.cfi_startproc
+	orq	%rsi,%rsi
 	jne	.Lentry
 	.byte	0xf3,0xc3
 .Lentry:
-.cfi_startproc	
 	pushq	%rbx
 .cfi_adjust_cfa_offset	8
 .cfi_offset	%rbx,-16
@@ -533,6 +534,7 @@ RC4:	orq	%rsi,%rsi
 .type	RC4_set_key,@function
 .align	16
 RC4_set_key:
+.cfi_startproc
 	leaq	8(%rdi),%rdi
 	leaq	(%rdx,%rsi,1),%rdx
 	negq	%rsi
@@ -599,12 +601,14 @@ RC4_set_key:
 	movl	%eax,-8(%rdi)
 	movl	%eax,-4(%rdi)
 	.byte	0xf3,0xc3
+.cfi_endproc
 .size	RC4_set_key,.-RC4_set_key
 
 .globl	RC4_options
 .type	RC4_options,@function
 .align	16
 RC4_options:
+.cfi_startproc
 	leaq	.Lopts(%rip),%rax
 	movl	OPENSSL_ia32cap_P(%rip),%edx
 	btl	$20,%edx
@@ -617,6 +621,7 @@ RC4_options:
 	addq	$12,%rax
 .Ldone:
 	.byte	0xf3,0xc3
+.cfi_endproc
 .align	64
 .Lopts:
 .byte	114,99,52,40,56,120,44,105,110,116,41,0
diff --git a/deps/openssl/config/archs/solaris64-x86_64-gcc/asm_avx2/crypto/sha/keccak1600-x86_64.s b/deps/openssl/config/archs/solaris64-x86_64-gcc/asm_avx2/crypto/sha/keccak1600-x86_64.s
index e511f25035..09617d014b 100644
--- a/deps/openssl/config/archs/solaris64-x86_64-gcc/asm_avx2/crypto/sha/keccak1600-x86_64.s
+++ b/deps/openssl/config/archs/solaris64-x86_64-gcc/asm_avx2/crypto/sha/keccak1600-x86_64.s
@@ -3,6 +3,7 @@
 .type	__KeccakF1600,@function
 .align	32
 __KeccakF1600:
+.cfi_startproc
 	movq	60(%rdi),%rax
 	movq	68(%rdi),%rbx
 	movq	76(%rdi),%rcx
@@ -255,6 +256,7 @@ __KeccakF1600:
 
 	leaq	-192(%r15),%r15
 	.byte	0xf3,0xc3
+.cfi_endproc
 .size	__KeccakF1600,.-__KeccakF1600
 
 .type	KeccakF1600,@function
diff --git a/deps/openssl/config/archs/solaris64-x86_64-gcc/asm_avx2/crypto/sha/sha1-x86_64.s b/deps/openssl/config/archs/solaris64-x86_64-gcc/asm_avx2/crypto/sha/sha1-x86_64.s
index e436521a04..98541727e5 100644
--- a/deps/openssl/config/archs/solaris64-x86_64-gcc/asm_avx2/crypto/sha/sha1-x86_64.s
+++ b/deps/openssl/config/archs/solaris64-x86_64-gcc/asm_avx2/crypto/sha/sha1-x86_64.s
@@ -1421,8 +1421,8 @@ _shaext_shortcut:
 	pshufd	$27,%xmm1,%xmm1
 	movdqu	%xmm0,(%rdi)
 	movd	%xmm1,16(%rdi)
-.cfi_endproc	
 	.byte	0xf3,0xc3
+.cfi_endproc
 .size	sha1_block_data_order_shaext,.-sha1_block_data_order_shaext
 .type	sha1_block_data_order_ssse3,@function
 .align	16
diff --git a/deps/openssl/config/archs/solaris64-x86_64-gcc/asm_avx2/crypto/sha/sha256-x86_64.s b/deps/openssl/config/archs/solaris64-x86_64-gcc/asm_avx2/crypto/sha/sha256-x86_64.s
index 42b24df18e..9357385da3 100644
--- a/deps/openssl/config/archs/solaris64-x86_64-gcc/asm_avx2/crypto/sha/sha256-x86_64.s
+++ b/deps/openssl/config/archs/solaris64-x86_64-gcc/asm_avx2/crypto/sha/sha256-x86_64.s
@@ -1775,6 +1775,7 @@ K256:
 .align	64
 sha256_block_data_order_shaext:
 _shaext_shortcut:
+.cfi_startproc
 	leaq	K256+128(%rip),%rcx
 	movdqu	(%rdi),%xmm1
 	movdqu	16(%rdi),%xmm2
@@ -1977,6 +1978,7 @@ _shaext_shortcut:
 	movdqu	%xmm1,(%rdi)
 	movdqu	%xmm2,16(%rdi)
 	.byte	0xf3,0xc3
+.cfi_endproc
 .size	sha256_block_data_order_shaext,.-sha256_block_data_order_shaext
 .type	sha256_block_data_order_ssse3,@function
 .align	64
@@ -4238,7 +4240,15 @@ sha256_block_data_order_avx2:
 	vmovdqa	%ymm4,0(%rsp)
 	xorl	%r14d,%r14d
 	vmovdqa	%ymm5,32(%rsp)
+
+	movq	88(%rsp),%rdi
+.cfi_def_cfa	%rdi,8
 	leaq	-64(%rsp),%rsp
+
+
+
+	movq	%rdi,-8(%rsp)
+.cfi_escape	0x0f,0x05,0x77,0x78,0x06,0x23,0x08
 	movl	%ebx,%edi
 	vmovdqa	%ymm6,0(%rsp)
 	xorl	%ecx,%edi
@@ -4250,6 +4260,12 @@ sha256_block_data_order_avx2:
 .align	16
 .Lavx2_00_47:
 	leaq	-64(%rsp),%rsp
+.cfi_escape	0x0f,0x05,0x77,0x38,0x06,0x23,0x08
+
+	pushq	64-8(%rsp)
+.cfi_escape	0x0f,0x05,0x77,0x00,0x06,0x23,0x08
+	leaq	8(%rsp),%rsp
+.cfi_escape	0x0f,0x05,0x77,0x78,0x06,0x23,0x08
 	vpalignr	$4,%ymm0,%ymm1,%ymm4
 	addl	0+128(%rsp),%r11d
 	andl	%r8d,%r12d
@@ -4505,6 +4521,12 @@ sha256_block_data_order_avx2:
 	movl	%r9d,%r12d
 	vmovdqa	%ymm6,32(%rsp)
 	leaq	-64(%rsp),%rsp
+.cfi_escape	0x0f,0x05,0x77,0x38,0x06,0x23,0x08
+
+	pushq	64-8(%rsp)
+.cfi_escape	0x0f,0x05,0x77,0x00,0x06,0x23,0x08
+	leaq	8(%rsp),%rsp
+.cfi_escape	0x0f,0x05,0x77,0x78,0x06,0x23,0x08
 	vpalignr	$4,%ymm2,%ymm3,%ymm4
 	addl	0+128(%rsp),%r11d
 	andl	%r8d,%r12d
@@ -5380,6 +5402,8 @@ sha256_block_data_order_avx2:
 
 	leaq	448(%rsp),%rsp
 
+.cfi_escape	0x0f,0x06,0x77,0xd8,0x00,0x06,0x23,0x08
+
 	addl	0(%rdi),%eax
 	addl	4(%rdi),%ebx
 	addl	8(%rdi),%ecx
@@ -5405,9 +5429,11 @@ sha256_block_data_order_avx2:
 	jbe	.Loop_avx2
 	leaq	(%rsp),%rbp
 
+
+.cfi_escape	0x0f,0x06,0x76,0xd8,0x00,0x06,0x23,0x08
+
 .Ldone_avx2:
-	leaq	(%rbp),%rsp
-	movq	88(%rsp),%rsi
+	movq	88(%rbp),%rsi
 .cfi_def_cfa	%rsi,8
 	vzeroupper
 	movq	-48(%rsi),%r15
diff --git a/deps/openssl/config/archs/solaris64-x86_64-gcc/asm_avx2/crypto/sha/sha512-x86_64.s b/deps/openssl/config/archs/solaris64-x86_64-gcc/asm_avx2/crypto/sha/sha512-x86_64.s
index 5931a2a932..939f1ca71c 100644
--- a/deps/openssl/config/archs/solaris64-x86_64-gcc/asm_avx2/crypto/sha/sha512-x86_64.s
+++ b/deps/openssl/config/archs/solaris64-x86_64-gcc/asm_avx2/crypto/sha/sha512-x86_64.s
@@ -4165,7 +4165,15 @@ sha512_block_data_order_avx2:
 	vmovdqa	%ymm10,64(%rsp)
 	vpaddq	64(%rbp),%ymm6,%ymm10
 	vmovdqa	%ymm11,96(%rsp)
+
+	movq	152(%rsp),%rdi
+.cfi_def_cfa	%rdi,8
 	leaq	-128(%rsp),%rsp
+
+
+
+	movq	%rdi,-8(%rsp)
+.cfi_escape	0x0f,0x05,0x77,0x78,0x06,0x23,0x08
 	vpaddq	96(%rbp),%ymm7,%ymm11
 	vmovdqa	%ymm8,0(%rsp)
 	xorq	%r14,%r14
@@ -4181,6 +4189,12 @@ sha512_block_data_order_avx2:
 .align	16
 .Lavx2_00_47:
 	leaq	-128(%rsp),%rsp
+.cfi_escape	0x0f,0x06,0x77,0xf8,0x00,0x06,0x23,0x08
+
+	pushq	128-8(%rsp)
+.cfi_escape	0x0f,0x05,0x77,0x00,0x06,0x23,0x08
+	leaq	8(%rsp),%rsp
+.cfi_escape	0x0f,0x05,0x77,0x78,0x06,0x23,0x08
 	vpalignr	$8,%ymm0,%ymm1,%ymm8
 	addq	0+256(%rsp),%r11
 	andq	%r8,%r12
@@ -4474,6 +4488,12 @@ sha512_block_data_order_avx2:
 	movq	%r9,%r12
 	vmovdqa	%ymm10,96(%rsp)
 	leaq	-128(%rsp),%rsp
+.cfi_escape	0x0f,0x06,0x77,0xf8,0x00,0x06,0x23,0x08
+
+	pushq	128-8(%rsp)
+.cfi_escape	0x0f,0x05,0x77,0x00,0x06,0x23,0x08
+	leaq	8(%rsp),%rsp
+.cfi_escape	0x0f,0x05,0x77,0x78,0x06,0x23,0x08
 	vpalignr	$8,%ymm4,%ymm5,%ymm8
 	addq	0+256(%rsp),%r11
 	andq	%r8,%r12
@@ -5387,6 +5407,8 @@ sha512_block_data_order_avx2:
 
 	leaq	1152(%rsp),%rsp
 
+.cfi_escape	0x0f,0x06,0x77,0x98,0x01,0x06,0x23,0x08
+
 	addq	0(%rdi),%rax
 	addq	8(%rdi),%rbx
 	addq	16(%rdi),%rcx
@@ -5412,9 +5434,11 @@ sha512_block_data_order_avx2:
 	jbe	.Loop_avx2
 	leaq	(%rsp),%rbp
 
+
+.cfi_escape	0x0f,0x06,0x76,0x98,0x01,0x06,0x23,0x08
+
 .Ldone_avx2:
-	leaq	(%rbp),%rsp
-	movq	152(%rsp),%rsi
+	movq	152(%rbp),%rsi
 .cfi_def_cfa	%rsi,8
 	vzeroupper
 	movq	-48(%rsi),%r15
diff --git a/deps/openssl/config/archs/solaris64-x86_64-gcc/asm_avx2/crypto/x86_64cpuid.s b/deps/openssl/config/archs/solaris64-x86_64-gcc/asm_avx2/crypto/x86_64cpuid.s
index fd17eaaba4..9268ce8c9a 100644
--- a/deps/openssl/config/archs/solaris64-x86_64-gcc/asm_avx2/crypto/x86_64cpuid.s
+++ b/deps/openssl/config/archs/solaris64-x86_64-gcc/asm_avx2/crypto/x86_64cpuid.s
@@ -12,6 +12,7 @@
 .type	OPENSSL_atomic_add,@function
 .align	16
 OPENSSL_atomic_add:
+.cfi_startproc
 	movl	(%rdi),%eax
 .Lspin:	leaq	(%rsi,%rax,1),%r8
 .byte	0xf0
@@ -20,16 +21,19 @@ OPENSSL_atomic_add:
 	movl	%r8d,%eax
 .byte	0x48,0x98
 	.byte	0xf3,0xc3
+.cfi_endproc
 .size	OPENSSL_atomic_add,.-OPENSSL_atomic_add
 
 .globl	OPENSSL_rdtsc
 .type	OPENSSL_rdtsc,@function
 .align	16
 OPENSSL_rdtsc:
+.cfi_startproc
 	rdtsc
 	shlq	$32,%rdx
 	orq	%rdx,%rax
 	.byte	0xf3,0xc3
+.cfi_endproc
 .size	OPENSSL_rdtsc,.-OPENSSL_rdtsc
 
 .globl	OPENSSL_ia32_cpuid
@@ -205,6 +209,7 @@ OPENSSL_ia32_cpuid:
 .type	OPENSSL_cleanse,@function
 .align	16
 OPENSSL_cleanse:
+.cfi_startproc
 	xorq	%rax,%rax
 	cmpq	$15,%rsi
 	jae	.Lot
@@ -234,12 +239,14 @@ OPENSSL_cleanse:
 	cmpq	$0,%rsi
 	jne	.Little
 	.byte	0xf3,0xc3
+.cfi_endproc
 .size	OPENSSL_cleanse,.-OPENSSL_cleanse
 
 .globl	CRYPTO_memcmp
 .type	CRYPTO_memcmp,@function
 .align	16
 CRYPTO_memcmp:
+.cfi_startproc
 	xorq	%rax,%rax
 	xorq	%r10,%r10
 	cmpq	$0,%rdx
@@ -268,11 +275,13 @@ CRYPTO_memcmp:
 	shrq	$63,%rax
 .Lno_data:
 	.byte	0xf3,0xc3
+.cfi_endproc
 .size	CRYPTO_memcmp,.-CRYPTO_memcmp
 .globl	OPENSSL_wipe_cpu
 .type	OPENSSL_wipe_cpu,@function
 .align	16
 OPENSSL_wipe_cpu:
+.cfi_startproc
 	pxor	%xmm0,%xmm0
 	pxor	%xmm1,%xmm1
 	pxor	%xmm2,%xmm2
@@ -299,11 +308,13 @@ OPENSSL_wipe_cpu:
 	xorq	%r11,%r11
 	leaq	8(%rsp),%rax
 	.byte	0xf3,0xc3
+.cfi_endproc
 .size	OPENSSL_wipe_cpu,.-OPENSSL_wipe_cpu
 .globl	OPENSSL_instrument_bus
 .type	OPENSSL_instrument_bus,@function
 .align	16
 OPENSSL_instrument_bus:
+.cfi_startproc
 	movq	%rdi,%r10
 	movq	%rsi,%rcx
 	movq	%rsi,%r11
@@ -330,12 +341,14 @@ OPENSSL_instrument_bus:
 
 	movq	%r11,%rax
 	.byte	0xf3,0xc3
+.cfi_endproc
 .size	OPENSSL_instrument_bus,.-OPENSSL_instrument_bus
 
 .globl	OPENSSL_instrument_bus2
 .type	OPENSSL_instrument_bus2,@function
 .align	16
 OPENSSL_instrument_bus2:
+.cfi_startproc
 	movq	%rdi,%r10
 	movq	%rsi,%rcx
 	movq	%rdx,%r11
@@ -378,11 +391,13 @@ OPENSSL_instrument_bus2:
 	movq	8(%rsp),%rax
 	subq	%rcx,%rax
 	.byte	0xf3,0xc3
+.cfi_endproc
 .size	OPENSSL_instrument_bus2,.-OPENSSL_instrument_bus2
 .globl	OPENSSL_ia32_rdrand_bytes
 .type	OPENSSL_ia32_rdrand_bytes,@function
 .align	16
 OPENSSL_ia32_rdrand_bytes:
+.cfi_startproc
 	xorq	%rax,%rax
 	cmpq	$0,%rsi
 	je	.Ldone_rdrand_bytes
@@ -419,11 +434,13 @@ OPENSSL_ia32_rdrand_bytes:
 .Ldone_rdrand_bytes:
 	xorq	%r10,%r10
 	.byte	0xf3,0xc3
+.cfi_endproc
 .size	OPENSSL_ia32_rdrand_bytes,.-OPENSSL_ia32_rdrand_bytes
 .globl	OPENSSL_ia32_rdseed_bytes
 .type	OPENSSL_ia32_rdseed_bytes,@function
 .align	16
 OPENSSL_ia32_rdseed_bytes:
+.cfi_startproc
 	xorq	%rax,%rax
 	cmpq	$0,%rsi
 	je	.Ldone_rdseed_bytes
@@ -460,4 +477,5 @@ OPENSSL_ia32_rdseed_bytes:
 .Ldone_rdseed_bytes:
 	xorq	%r10,%r10
 	.byte	0xf3,0xc3
+.cfi_endproc
 .size	OPENSSL_ia32_rdseed_bytes,.-OPENSSL_ia32_rdseed_bytes
diff --git a/deps/openssl/config/archs/solaris64-x86_64-gcc/asm_avx2/include/openssl/opensslconf.h b/deps/openssl/config/archs/solaris64-x86_64-gcc/asm_avx2/include/openssl/opensslconf.h
index 913bb95a5a..14050a4534 100644
--- a/deps/openssl/config/archs/solaris64-x86_64-gcc/asm_avx2/include/openssl/opensslconf.h
+++ b/deps/openssl/config/archs/solaris64-x86_64-gcc/asm_avx2/include/openssl/opensslconf.h
@@ -96,9 +96,6 @@ extern "C" {
 #ifndef OPENSSL_NO_DYNAMIC_ENGINE
 # define OPENSSL_NO_DYNAMIC_ENGINE
 #endif
-#ifndef OPENSSL_NO_AFALGENG
-# define OPENSSL_NO_AFALGENG
-#endif
 
 
 /*
diff --git a/deps/openssl/config/archs/solaris64-x86_64-gcc/asm_avx2/include/progs.h b/deps/openssl/config/archs/solaris64-x86_64-gcc/asm_avx2/include/progs.h
index 9b3d270e20..308c65601b 100644
--- a/deps/openssl/config/archs/solaris64-x86_64-gcc/asm_avx2/include/progs.h
+++ b/deps/openssl/config/archs/solaris64-x86_64-gcc/asm_avx2/include/progs.h
@@ -2,7 +2,7 @@
  * WARNING: do not edit!
  * Generated by apps/progs.pl
  *
- * Copyright 1995-2019 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 1995-2020 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
diff --git a/deps/openssl/config/archs/solaris64-x86_64-gcc/asm_avx2/openssl-cl.gypi b/deps/openssl/config/archs/solaris64-x86_64-gcc/asm_avx2/openssl-cl.gypi
index ca28a8cbd3..863e9328e5 100644
--- a/deps/openssl/config/archs/solaris64-x86_64-gcc/asm_avx2/openssl-cl.gypi
+++ b/deps/openssl/config/archs/solaris64-x86_64-gcc/asm_avx2/openssl-cl.gypi
@@ -16,6 +16,7 @@
       'KECCAK1600_ASM',
       'RC4_ASM',
       'MD5_ASM',
+      'AESNI_ASM',
       'VPAES_ASM',
       'GHASH_ASM',
       'ECP_NISTZ256_ASM',
diff --git a/deps/openssl/config/archs/solaris64-x86_64-gcc/asm_avx2/openssl.gypi b/deps/openssl/config/archs/solaris64-x86_64-gcc/asm_avx2/openssl.gypi
index a634c66657..9dd6bd88a2 100644
--- a/deps/openssl/config/archs/solaris64-x86_64-gcc/asm_avx2/openssl.gypi
+++ b/deps/openssl/config/archs/solaris64-x86_64-gcc/asm_avx2/openssl.gypi
@@ -723,6 +723,7 @@
       'KECCAK1600_ASM',
       'RC4_ASM',
       'MD5_ASM',
+      'AESNI_ASM',
       'VPAES_ASM',
       'GHASH_ASM',
       'ECP_NISTZ256_ASM',
diff --git a/deps/openssl/config/archs/solaris64-x86_64-gcc/no-asm/configdata.pm b/deps/openssl/config/archs/solaris64-x86_64-gcc/no-asm/configdata.pm
index 50438e79f7..d398c0a8c3 100644
--- a/deps/openssl/config/archs/solaris64-x86_64-gcc/no-asm/configdata.pm
+++ b/deps/openssl/config/archs/solaris64-x86_64-gcc/no-asm/configdata.pm
@@ -54,7 +54,7 @@ our %config = (
   minor => "1.1",
   openssl_algorithm_defines => [ "OPENSSL_NO_COMP", "OPENSSL_NO_MD2", "OPENSSL_NO_RC5" ],
   openssl_api_defines => [  ],
-  openssl_other_defines => [ "OPENSSL_RAND_SEED_OS", "OPENSSL_NO_AFALGENG", "OPENSSL_NO_ASAN", "OPENSSL_NO_ASM", "OPENSSL_NO_CRYPTO_MDEBUG", "OPENSSL_NO_CRYPTO_MDEBUG_BACKTRACE", "OPENSSL_NO_DEVCRYPTOENG", "OPENSSL_NO_EC_NISTP_64_GCC_128", "OPENSSL_NO_EGD", "OPENSSL_NO_EXTERNAL_TESTS", "OPENSSL_NO_FUZZ_AFL", "OPENSSL_NO_FUZZ_LIBFUZZER", "OPENSSL_NO_HEARTBEATS", "OPENSSL_NO_MSAN", "OPENSSL_NO_SCTP", "OPENSSL_NO_SSL3", "OPENSSL_NO_SSL3_METHOD", "OPENSSL_NO_UBSAN", "OPENSSL_NO_UNIT_TEST", "OPENSSL_NO_WEAK_SSL_CIPHERS", "OPENSSL_NO_DYNAMIC_ENGINE", "OPENSSL_NO_AFALGENG" ],
+  openssl_other_defines => [ "OPENSSL_RAND_SEED_OS", "OPENSSL_NO_AFALGENG", "OPENSSL_NO_ASAN", "OPENSSL_NO_ASM", "OPENSSL_NO_CRYPTO_MDEBUG", "OPENSSL_NO_CRYPTO_MDEBUG_BACKTRACE", "OPENSSL_NO_DEVCRYPTOENG", "OPENSSL_NO_EC_NISTP_64_GCC_128", "OPENSSL_NO_EGD", "OPENSSL_NO_EXTERNAL_TESTS", "OPENSSL_NO_FUZZ_AFL", "OPENSSL_NO_FUZZ_LIBFUZZER", "OPENSSL_NO_HEARTBEATS", "OPENSSL_NO_MSAN", "OPENSSL_NO_SCTP", "OPENSSL_NO_SSL3", "OPENSSL_NO_SSL3_METHOD", "OPENSSL_NO_UBSAN", "OPENSSL_NO_UNIT_TEST", "OPENSSL_NO_WEAK_SSL_CIPHERS", "OPENSSL_NO_DYNAMIC_ENGINE" ],
   openssl_sys_defines => [  ],
   openssl_thread_defines => [ "OPENSSL_THREADS" ],
   openssldir => "",
@@ -110,8 +110,8 @@ our %config = (
   sourcedir => ".",
   target => "solaris64-x86_64-gcc",
   tdirs => [ "ossl_shim" ],
-  version => "1.1.1d",
-  version_num => "0x1010104fL",
+  version => "1.1.1e",
+  version_num => "0x1010105fL",
 );
 
 our %target = (
@@ -234,6 +234,7 @@ our @disablables = (
   "dgram",
   "dh",
   "dsa",
+  "dso",
   "dtls",
   "dynamic-engine",
   "ec",
@@ -352,8 +353,8 @@ our %unified_info = (
         {
             "" =>
                 [
-                    "crypto/include/internal/bn_conf.h",
-                    "crypto/include/internal/dso_conf.h",
+                    "include/crypto/bn_conf.h",
+                    "include/crypto/dso_conf.h",
                     "include/openssl/opensslconf.h",
                 ],
             "apps/asn1pars.o" =>
@@ -621,14 +622,6 @@ our %unified_info = (
                     "crypto/perlasm/cbc.pl",
                     "crypto/perlasm/x86asm.pl",
                 ],
-            "crypto/include/internal/bn_conf.h" =>
-                [
-                    "configdata.pm",
-                ],
-            "crypto/include/internal/dso_conf.h" =>
-                [
-                    "configdata.pm",
-                ],
             "crypto/rc4/rc4-586.s" =>
                 [
                     "crypto/perlasm/x86asm.pl",
@@ -704,6 +697,14 @@ our %unified_info = (
                 [
                     "libcrypto",
                 ],
+            "include/crypto/bn_conf.h" =>
+                [
+                    "configdata.pm",
+                ],
+            "include/crypto/dso_conf.h" =>
+                [
+                    "configdata.pm",
+                ],
             "include/openssl/opensslconf.h" =>
                 [
                     "configdata.pm",
@@ -1501,6 +1502,12 @@ our %unified_info = (
                     "libcrypto",
                     "test/libtestutil.a",
                 ],
+            "test/ssl_ctx_test" =>
+                [
+                    "libcrypto",
+                    "libssl",
+                    "test/libtestutil.a",
+                ],
             "test/ssl_test" =>
                 [
                     "libcrypto",
@@ -3219,7 +3226,6 @@ our %unified_info = (
                             "test/testutil/cb.o",
                             "test/testutil/driver.o",
                             "test/testutil/format_output.o",
-                            "test/testutil/init.o",
                             "test/testutil/main.o",
                             "test/testutil/output_helpers.o",
                             "test/testutil/random.o",
@@ -3227,6 +3233,7 @@ our %unified_info = (
                             "test/testutil/tap_bio.o",
                             "test/testutil/test_cleanup.o",
                             "test/testutil/tests.o",
+                            "test/testutil/testutil_init.o",
                         ],
                     "products" =>
                         {
@@ -3725,14 +3732,6 @@ our %unified_info = (
                 [
                     "crypto/ia64cpuid.S",
                 ],
-            "crypto/include/internal/bn_conf.h" =>
-                [
-                    "crypto/include/internal/bn_conf.h.in",
-                ],
-            "crypto/include/internal/dso_conf.h" =>
-                [
-                    "crypto/include/internal/dso_conf.h.in",
-                ],
             "crypto/md5/md5-586.s" =>
                 [
                     "crypto/md5/asm/md5-586.pl",
@@ -4173,6 +4172,14 @@ our %unified_info = (
                     "engines/asm/e_padlock-x86_64.pl",
                     "\$(PERLASM_SCHEME)",
                 ],
+            "include/crypto/bn_conf.h" =>
+                [
+                    "include/crypto/bn_conf.h.in",
+                ],
+            "include/crypto/dso_conf.h" =>
+                [
+                    "include/crypto/dso_conf.h.in",
+                ],
             "include/openssl/opensslconf.h" =>
                 [
                     "include/openssl/opensslconf.h.in",
@@ -4867,49 +4874,41 @@ our %unified_info = (
             "crypto/aes/aes_cbc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/aes/aes_cfb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/aes/aes_core.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/aes/aes_ecb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/aes/aes_ige.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/aes/aes_misc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/aes/aes_ofb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/aes/aes_wrap.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/aes/aesfx-sparcv9.o" =>
@@ -4931,7 +4930,6 @@ our %unified_info = (
             "crypto/aria/aria.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/arm64cpuid.o" =>
@@ -4945,613 +4943,511 @@ our %unified_info = (
             "crypto/asn1/a_bitstr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_d2i_fp.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_digest.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_dup.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_gentm.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_i2d_fp.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_int.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_mbstr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_object.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_octet.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_print.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_sign.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_strex.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_strnid.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_time.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_type.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_utctm.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_utf8.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/a_verify.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/ameth_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/asn1_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/asn1_gen.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/asn1_item_list.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/asn1_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/asn1_par.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/asn_mime.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/asn_moid.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/asn_mstbl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/asn_pack.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/bio_asn1.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/bio_ndef.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/d2i_pr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/d2i_pu.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/evp_asn1.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/f_int.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/f_string.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/i2d_pr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/i2d_pu.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/n_pkey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/nsseq.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/p5_pbe.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/p5_pbev2.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/p5_scrypt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/p8_pkey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/t_bitst.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/t_pkey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/t_spki.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/tasn_dec.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/tasn_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/tasn_fre.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/tasn_new.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/tasn_prn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/tasn_scn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/tasn_typ.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/tasn_utl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/x_algor.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/x_bignum.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/x_info.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/x_int64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/x_long.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/x_pkey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/x_sig.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/x_spki.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/asn1/x_val.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/async/arch/async_null.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/async/arch/async_posix.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/async/arch/async_win.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/async/async.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/async/async_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/async/async_wait.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bf/bf_cfb64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bf/bf_ecb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bf/bf_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bf/bf_ofb64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bf/bf_skey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/b_addr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/b_dump.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/b_print.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/b_sock.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/b_sock2.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bf_buff.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bf_lbuf.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bf_nbio.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bf_null.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bio_cb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bio_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bio_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bio_meth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bss_acpt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bss_bio.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bss_conn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bss_dgram.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bss_fd.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bss_file.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bss_log.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bss_mem.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bss_null.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bio/bss_sock.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/blake2/blake2b.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/blake2/blake2s.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/blake2/m_blake2b.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/blake2/m_blake2s.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/armv4-gf2m.o" =>
@@ -5569,188 +5465,157 @@ our %unified_info = (
             "crypto/bn/bn_add.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_asm.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_blind.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_const.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_ctx.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_depr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_dh.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_div.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_exp.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto",
                 ],
             "crypto/bn/bn_exp2.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_gcd.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_gf2m.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_intern.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_kron.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_mod.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_mont.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_mpi.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_mul.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_nist.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_prime.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_print.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_rand.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_recp.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_shift.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_sqr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_sqrt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_srp.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_word.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/bn_x931p.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/bn/mips-mont.o" =>
@@ -5780,13 +5645,11 @@ our %unified_info = (
             "crypto/buffer/buf_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/buffer/buffer.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/buildinf.h" =>
@@ -5796,43 +5659,36 @@ our %unified_info = (
             "crypto/camellia/camellia.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/camellia/cmll_cbc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/camellia/cmll_cfb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/camellia/cmll_ctr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/camellia/cmll_ecb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/camellia/cmll_misc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/camellia/cmll_ofb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/camellia/cmllt4-sparcv9.o" =>
@@ -5842,31 +5698,26 @@ our %unified_info = (
             "crypto/cast/c_cfb64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cast/c_ecb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cast/c_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cast/c_ofb64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cast/c_skey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/chacha/chacha-armv4.o" =>
@@ -5884,278 +5735,232 @@ our %unified_info = (
             "crypto/chacha/chacha_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cmac/cm_ameth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cmac/cm_pmeth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cmac/cmac.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_asn1.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_att.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_cd.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_dd.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_env.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_ess.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_io.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_kari.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_pwri.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_sd.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cms/cms_smime.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/conf/conf_api.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/conf/conf_def.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/conf/conf_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/conf/conf_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/conf/conf_mall.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/conf/conf_mod.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/conf/conf_sap.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/conf/conf_ssl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cpt_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cryptlib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ct/ct_b64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ct/ct_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ct/ct_log.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ct/ct_oct.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ct/ct_policy.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ct/ct_prn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ct/ct_sct.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ct/ct_sct_ctx.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ct/ct_vfy.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ct/ct_x509v3.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ctype.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/cversion.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto",
                 ],
             "crypto/des/cbc_cksm.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/cbc_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/cfb64ede.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/cfb64enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/cfb_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/des_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/dest4-sparcv9.o" =>
@@ -6165,301 +5970,251 @@ our %unified_info = (
             "crypto/des/ecb3_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/ecb_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/fcrypt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/fcrypt_b.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/ofb64ede.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/ofb64enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/ofb_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/pcbc_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/qud_cksm.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/rand_key.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/set_key.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/str2key.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/des/xcbc_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_ameth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_asn1.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_check.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_depr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_gen.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_kdf.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_key.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_meth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_pmeth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_prn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_rfc5114.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dh/dh_rfc7919.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dsa/dsa_ameth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dsa/dsa_asn1.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dsa/dsa_depr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dsa/dsa_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dsa/dsa_gen.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dsa/dsa_key.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dsa/dsa_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dsa/dsa_meth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dsa/dsa_ossl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dsa/dsa_pmeth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dsa/dsa_prn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dsa/dsa_sign.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dsa/dsa_vrf.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dso/dso_dl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dso/dso_dlfcn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dso/dso_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dso/dso_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dso/dso_openssl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dso/dso_vms.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/dso/dso_win32.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ebcdic.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/curve25519.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/curve448/arch_32/f_impl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto/ec/curve448/arch_32",
                     "crypto/ec/curve448",
@@ -6467,7 +6222,6 @@ our %unified_info = (
             "crypto/ec/curve448/curve448.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto/ec/curve448/arch_32",
                     "crypto/ec/curve448",
@@ -6475,7 +6229,6 @@ our %unified_info = (
             "crypto/ec/curve448/curve448_tables.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto/ec/curve448/arch_32",
                     "crypto/ec/curve448",
@@ -6483,7 +6236,6 @@ our %unified_info = (
             "crypto/ec/curve448/eddsa.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto/ec/curve448/arch_32",
                     "crypto/ec/curve448",
@@ -6491,7 +6243,6 @@ our %unified_info = (
             "crypto/ec/curve448/f_generic.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto/ec/curve448/arch_32",
                     "crypto/ec/curve448",
@@ -6499,7 +6250,6 @@ our %unified_info = (
             "crypto/ec/curve448/scalar.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto/ec/curve448/arch_32",
                     "crypto/ec/curve448",
@@ -6507,163 +6257,136 @@ our %unified_info = (
             "crypto/ec/ec2_oct.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec2_smpl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec_ameth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec_asn1.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec_check.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec_curve.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec_cvt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec_key.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec_kmeth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec_mult.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec_oct.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec_pmeth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ec_print.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecdh_kdf.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecdh_ossl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecdsa_ossl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecdsa_sign.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecdsa_vrf.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/eck_prn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecp_mont.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecp_nist.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecp_nistp224.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecp_nistp256.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecp_nistp521.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecp_nistputil.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecp_nistz256-armv4.o" =>
@@ -6681,223 +6404,186 @@ our %unified_info = (
             "crypto/ec/ecp_oct.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecp_smpl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ec/ecx_meth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/eng_all.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/eng_cnf.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/eng_ctrl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/eng_dyn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/eng_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/eng_fat.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/eng_init.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/eng_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/eng_list.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/eng_openssl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/eng_pkey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/eng_rdrand.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/eng_table.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/tb_asnmth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/tb_cipher.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/tb_dh.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/tb_digest.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/tb_dsa.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/tb_eckey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/tb_pkmeth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/tb_rand.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/engine/tb_rsa.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/err/err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/err/err_all.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/err/err_prn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/bio_b64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/bio_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/bio_md.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/bio_ok.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/c_allc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/c_alld.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/cmeth_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/digest.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/e_aes.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto",
                     "crypto/modes",
@@ -6905,21 +6591,18 @@ our %unified_info = (
             "crypto/evp/e_aes_cbc_hmac_sha1.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto/modes",
                 ],
             "crypto/evp/e_aes_cbc_hmac_sha256.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto/modes",
                 ],
             "crypto/evp/e_aria.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto",
                     "crypto/modes",
@@ -6927,13 +6610,11 @@ our %unified_info = (
             "crypto/evp/e_bf.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/e_camellia.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto",
                     "crypto/modes",
@@ -6941,81 +6622,68 @@ our %unified_info = (
             "crypto/evp/e_cast.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/e_chacha20_poly1305.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/e_des.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto",
                 ],
             "crypto/evp/e_des3.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto",
                 ],
             "crypto/evp/e_idea.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/e_null.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/e_old.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/e_rc2.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/e_rc4.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/e_rc4_hmac_md5.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/e_rc5.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/e_seed.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/e_sm4.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto",
                     "crypto/modes",
@@ -7023,328 +6691,267 @@ our %unified_info = (
             "crypto/evp/e_xcbc_d.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/encode.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/evp_cnf.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/evp_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/evp_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/evp_key.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/evp_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/evp_pbe.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/evp_pkey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/m_md2.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/m_md4.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/m_md5.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/m_md5_sha1.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/m_mdc2.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/m_null.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/m_ripemd.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/m_sha1.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/m_sha3.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto",
                 ],
             "crypto/evp/m_sigver.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/m_wp.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/names.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/p5_crpt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/p5_crpt2.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/p_dec.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/p_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/p_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/p_open.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/p_seal.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/p_sign.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/p_verify.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/pbe_scrypt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/pmeth_fn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/pmeth_gn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/evp/pmeth_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ex_data.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/getenv.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/hmac/hm_ameth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/hmac/hm_pmeth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/hmac/hmac.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/idea/i_cbc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/idea/i_cfb64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/idea/i_ecb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/idea/i_ofb64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/idea/i_skey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
-            "crypto/include/internal/bn_conf.h" =>
-                [
-                    ".",
-                ],
-            "crypto/include/internal/dso_conf.h" =>
-                [
-                    ".",
-                ],
             "crypto/init.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/kdf/hkdf.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/kdf/kdf_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/kdf/scrypt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/kdf/tls1_prf.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/lhash/lh_stats.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/lhash/lhash.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/md4/md4_dgst.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/md4/md4_one.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/md5/md5-sparcv9.o" =>
@@ -7354,85 +6961,71 @@ our %unified_info = (
             "crypto/md5/md5_dgst.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/md5/md5_one.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/mdc2/mdc2_one.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/mdc2/mdc2dgst.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/mem.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/mem_clr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/mem_dbg.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/mem_sec.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/modes/cbc128.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/modes/ccm128.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/modes/cfb128.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/modes/ctr128.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/modes/cts128.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/modes/gcm128.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                     "crypto",
                 ],
@@ -7455,361 +7048,301 @@ our %unified_info = (
             "crypto/modes/ocb128.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/modes/ofb128.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/modes/wrap128.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/modes/xts128.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/o_dir.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/o_fips.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/o_fopen.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/o_init.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/o_str.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/o_time.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/objects/o_names.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/objects/obj_dat.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/objects/obj_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/objects/obj_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/objects/obj_xref.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ocsp/ocsp_asn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ocsp/ocsp_cl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ocsp/ocsp_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ocsp/ocsp_ext.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ocsp/ocsp_ht.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ocsp/ocsp_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ocsp/ocsp_prn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ocsp/ocsp_srv.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ocsp/ocsp_vfy.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ocsp/v3_ocsp.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pem/pem_all.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pem/pem_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pem/pem_info.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pem/pem_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pem/pem_oth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pem/pem_pk8.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pem/pem_pkey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pem/pem_sign.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pem/pem_x509.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pem/pem_xaux.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pem/pvkfmt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_add.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_asn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_attr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_crpt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_crt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_decr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_init.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_key.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_kiss.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_mutl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_npas.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_p8d.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_p8e.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_sbag.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/p12_utl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs12/pk12err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs7/bio_pk7.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs7/pk7_asn1.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs7/pk7_attr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs7/pk7_doit.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs7/pk7_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs7/pk7_mime.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs7/pk7_smime.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/pkcs7/pkcs7err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/poly1305/poly1305-armv4.o" =>
@@ -7831,259 +7364,216 @@ our %unified_info = (
             "crypto/poly1305/poly1305.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/poly1305/poly1305_ameth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/poly1305/poly1305_pmeth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rand/drbg_ctr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rand/drbg_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rand/rand_egd.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rand/rand_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rand/rand_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rand/rand_unix.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rand/rand_vms.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rand/rand_win.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rand/randfile.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rc2/rc2_cbc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rc2/rc2_ecb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rc2/rc2_skey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rc2/rc2cfb64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rc2/rc2ofb64.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rc4/rc4_enc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rc4/rc4_skey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ripemd/rmd_dgst.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ripemd/rmd_one.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_ameth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_asn1.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_chk.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_crpt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_depr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_gen.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_meth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_mp.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_none.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_oaep.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_ossl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_pk1.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_pmeth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_prn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_pss.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_saos.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_sign.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_ssl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_x931.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/rsa/rsa_x931g.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/s390xcpuid.o" =>
@@ -8093,31 +7583,26 @@ our %unified_info = (
             "crypto/seed/seed.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/seed/seed_cbc.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/seed/seed_cfb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/seed/seed_ecb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/seed/seed_ofb.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sha/keccak1600-armv4.o" =>
@@ -8127,7 +7612,6 @@ our %unified_info = (
             "crypto/sha/keccak1600.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sha/sha1-armv4-large.o" =>
@@ -8153,13 +7637,11 @@ our %unified_info = (
             "crypto/sha/sha1_one.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sha/sha1dgst.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sha/sha256-armv4.o" =>
@@ -8185,7 +7667,6 @@ our %unified_info = (
             "crypto/sha/sha256.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sha/sha512-armv4.o" =>
@@ -8211,709 +7692,591 @@ our %unified_info = (
             "crypto/sha/sha512.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/siphash/siphash.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/siphash/siphash_ameth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/siphash/siphash_pmeth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sm2/sm2_crypt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sm2/sm2_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sm2/sm2_pmeth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sm2/sm2_sign.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sm3/m_sm3.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sm3/sm3.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/sm4/sm4.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/srp/srp_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/srp/srp_vfy.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/stack/stack.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/store/loader_file.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/store/store_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/store/store_init.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/store/store_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/store/store_register.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/store/store_strings.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/threads_none.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/threads_pthread.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/threads_win.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ts/ts_asn1.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ts/ts_conf.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ts/ts_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ts/ts_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ts/ts_req_print.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ts/ts_req_utils.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ts/ts_rsp_print.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ts/ts_rsp_sign.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ts/ts_rsp_utils.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ts/ts_rsp_verify.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ts/ts_verify_ctx.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/txt_db/txt_db.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ui/ui_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ui/ui_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ui/ui_null.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ui/ui_openssl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/ui/ui_util.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/uid.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/whrlpool/wp_block.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/whrlpool/wp_dgst.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/by_dir.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/by_file.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/t_crl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/t_req.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/t_x509.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_att.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_cmp.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_d2.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_def.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_ext.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_lu.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_meth.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_obj.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_r2x.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_req.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_set.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_trs.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_txt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_v3.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_vfy.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509_vpm.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509cset.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509name.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509rset.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509spki.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x509type.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x_all.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x_attrib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x_crl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x_exten.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x_name.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x_pubkey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x_req.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x_x509.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509/x_x509a.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/pcy_cache.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/pcy_data.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/pcy_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/pcy_map.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/pcy_node.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/pcy_tree.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_addr.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_admis.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_akey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_akeya.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_alt.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_asid.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_bcons.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_bitst.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_conf.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_cpols.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_crld.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_enum.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_extku.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_genn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_ia5.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_info.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_int.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_lib.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_ncons.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_pci.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_pcia.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_pcons.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_pku.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_pmaps.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_prn.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_purp.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_skey.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_sxnet.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_tlsf.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3_utl.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "crypto/x509v3/v3err.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "engines/e_capi.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "engines/e_padlock.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "fuzz/asn1.o" =>
@@ -8964,6 +8327,14 @@ our %unified_info = (
                 [
                     "include",
                 ],
+            "include/crypto/bn_conf.h" =>
+                [
+                    ".",
+                ],
+            "include/crypto/dso_conf.h" =>
+                [
+                    ".",
+                ],
             "include/openssl/opensslconf.h" =>
                 [
                     ".",
@@ -9208,7 +8579,6 @@ our %unified_info = (
                 [
                     ".",
                     "include",
-                    "crypto/include",
                 ],
             "test/asn1_string_table_test.o" =>
                 [
@@ -9534,7 +8904,6 @@ our %unified_info = (
                 [
                     ".",
                     "include",
-                    "crypto/include",
                 ],
             "test/cipher_overhead_test.o" =>
                 [
@@ -9580,7 +8949,6 @@ our %unified_info = (
             "test/ctype_internal_test.o" =>
                 [
                     ".",
-                    "crypto/include",
                     "include",
                 ],
             "test/curve448_internal_test.o" =>
@@ -9646,7 +9014,6 @@ our %unified_info = (
                 [
                     "include",
                     "crypto/ec",
-                    "crypto/include",
                 ],
             "test/ecdsatest.o" =>
                 [
@@ -9671,7 +9038,6 @@ our %unified_info = (
             "test/evp_extra_test.o" =>
                 [
                     "include",
-                    "crypto/include",
                 ],
             "test/evp_test.o" =>
                 [
@@ -9769,7 +9135,6 @@ our %unified_info = (
                 [
                     ".",
                     "include",
-                    "crypto/include",
                 ],
             "test/rc2test.o" =>
                 [
@@ -9819,18 +9184,15 @@ our %unified_info = (
                 [
                     ".",
                     "include",
-                    "crypto/include",
                 ],
             "test/sm2_internal_test.o" =>
                 [
                     "include",
-                    "crypto/include",
                 ],
             "test/sm4_internal_test.o" =>
                 [
                     ".",
                     "include",
-                    "crypto/include",
                 ],
             "test/srptest.o" =>
                 [
@@ -9841,6 +9203,10 @@ our %unified_info = (
                     ".",
                     "include",
                 ],
+            "test/ssl_ctx_test.o" =>
+                [
+                    "include",
+                ],
             "test/ssl_test.o" =>
                 [
                     "include",
@@ -9904,10 +9270,6 @@ our %unified_info = (
                 [
                     "include",
                 ],
-            "test/testutil/init.o" =>
-                [
-                    "include",
-                ],
             "test/testutil/main.o" =>
                 [
                     "include",
@@ -9936,6 +9298,10 @@ our %unified_info = (
                 [
                     "include",
                 ],
+            "test/testutil/testutil_init.o" =>
+                [
+                    "include",
+                ],
             "test/threadstest.o" =>
                 [
                     "include",
@@ -10200,6 +9566,7 @@ our %unified_info = (
             "test/sm4_internal_test",
             "test/srptest",
             "test/ssl_cert_table_internal_test",
+            "test/ssl_ctx_test",
             "test/ssl_test",
             "test/ssl_test_ctx_test",
             "test/sslapitest",
@@ -15090,7 +14457,6 @@ our %unified_info = (
                     "test/testutil/cb.o",
                     "test/testutil/driver.o",
                     "test/testutil/format_output.o",
-                    "test/testutil/init.o",
                     "test/testutil/main.o",
                     "test/testutil/output_helpers.o",
                     "test/testutil/random.o",
@@ -15098,6 +14464,7 @@ our %unified_info = (
                     "test/testutil/tap_bio.o",
                     "test/testutil/test_cleanup.o",
                     "test/testutil/tests.o",
+                    "test/testutil/testutil_init.o",
                 ],
             "test/md2test" =>
                 [
@@ -15325,6 +14692,14 @@ our %unified_info = (
                 [
                     "test/ssl_cert_table_internal_test.c",
                 ],
+            "test/ssl_ctx_test" =>
+                [
+                    "test/ssl_ctx_test.o",
+                ],
+            "test/ssl_ctx_test.o" =>
+                [
+                    "test/ssl_ctx_test.c",
+                ],
             "test/ssl_test" =>
                 [
                     "test/handshake_helper.o",
@@ -15427,10 +14802,6 @@ our %unified_info = (
                 [
                     "test/testutil/format_output.c",
                 ],
-            "test/testutil/init.o" =>
-                [
-                    "test/testutil/init.c",
-                ],
             "test/testutil/main.o" =>
                 [
                     "test/testutil/main.c",
@@ -15459,6 +14830,10 @@ our %unified_info = (
                 [
                     "test/testutil/tests.c",
                 ],
+            "test/testutil/testutil_init.o" =>
+                [
+                    "test/testutil/testutil_init.c",
+                ],
             "test/threadstest" =>
                 [
                     "test/threadstest.o",
diff --git a/deps/openssl/config/archs/solaris64-x86_64-gcc/no-asm/crypto/buildinf.h b/deps/openssl/config/archs/solaris64-x86_64-gcc/no-asm/crypto/buildinf.h
index ae3b2d62e6..c97a232237 100644
--- a/deps/openssl/config/archs/solaris64-x86_64-gcc/no-asm/crypto/buildinf.h
+++ b/deps/openssl/config/archs/solaris64-x86_64-gcc/no-asm/crypto/buildinf.h
@@ -11,7 +11,7 @@
  */
 
 #define PLATFORM "platform: solaris64-x86_64-gcc"
-#define DATE "built on: Fri Sep 13 16:02:54 2019 UTC"
+#define DATE "built on: Wed Mar 18 21:10:22 2020 UTC"
 
 /*
  * Generate compiler_flags as an array of individual characters. This is a
diff --git a/deps/openssl/config/archs/solaris64-x86_64-gcc/no-asm/crypto/include/internal/bn_conf.h b/deps/openssl/config/archs/solaris64-x86_64-gcc/no-asm/crypto/include/internal/bn_conf.h
index 34bd8b78b4..5312ef5a7a 100644
--- a/deps/openssl/config/archs/solaris64-x86_64-gcc/no-asm/crypto/include/internal/bn_conf.h
+++ b/deps/openssl/config/archs/solaris64-x86_64-gcc/no-asm/crypto/include/internal/bn_conf.h
@@ -1,5 +1,5 @@
 /* WARNING: do not edit! */
-/* Generated by Makefile from crypto/include/internal/bn_conf.h.in */
+/* Generated by Makefile from include/crypto/bn_conf.h.in */
 /*
  * Copyright 2016 The OpenSSL Project Authors. All Rights Reserved.
  *
@@ -9,8 +9,8 @@
  * https://www.openssl.org/source/license.html
  */
 
-#ifndef HEADER_BN_CONF_H
-# define HEADER_BN_CONF_H
+#ifndef OSSL_CRYPTO_BN_CONF_H
+# define OSSL_CRYPTO_BN_CONF_H
 
 /*
  * The contents of this file are not used in the UEFI build, as
diff --git a/deps/openssl/config/archs/solaris64-x86_64-gcc/no-asm/crypto/include/internal/dso_conf.h b/deps/openssl/config/archs/solaris64-x86_64-gcc/no-asm/crypto/include/internal/dso_conf.h
index 252266ec2a..4b1167c3d8 100644
--- a/deps/openssl/config/archs/solaris64-x86_64-gcc/no-asm/crypto/include/internal/dso_conf.h
+++ b/deps/openssl/config/archs/solaris64-x86_64-gcc/no-asm/crypto/include/internal/dso_conf.h
@@ -1,5 +1,5 @@
 /* WARNING: do not edit! */
-/* Generated by Makefile from crypto/include/internal/dso_conf.h.in */
+/* Generated by Makefile from include/crypto/dso_conf.h.in */
 /*
  * Copyright 2016-2019 The OpenSSL Project Authors. All Rights Reserved.
  *
@@ -9,8 +9,8 @@
  * https://www.openssl.org/source/license.html
  */
 
-#ifndef HEADER_DSO_CONF_H
-# define HEADER_DSO_CONF_H
+#ifndef OSSL_CRYPTO_DSO_CONF_H
+# define OSSL_CRYPTO_DSO_CONF_H
 # define DSO_DLFCN
 # define HAVE_DLFCN_H
 # define DSO_EXTENSION ".so"
diff --git a/deps/openssl/config/archs/solaris64-x86_64-gcc/no-asm/include/openssl/opensslconf.h b/deps/openssl/config/archs/solaris64-x86_64-gcc/no-asm/include/openssl/opensslconf.h
index 22c5ea87c4..31bdb87ddb 100644
--- a/deps/openssl/config/archs/solaris64-x86_64-gcc/no-asm/include/openssl/opensslconf.h
+++ b/deps/openssl/config/archs/solaris64-x86_64-gcc/no-asm/include/openssl/opensslconf.h
@@ -99,9 +99,6 @@ extern "C" {
 #ifndef OPENSSL_NO_DYNAMIC_ENGINE
 # define OPENSSL_NO_DYNAMIC_ENGINE
 #endif
-#ifndef OPENSSL_NO_AFALGENG
-# define OPENSSL_NO_AFALGENG
-#endif
 
 
 /*
diff --git a/deps/openssl/config/archs/solaris64-x86_64-gcc/no-asm/include/progs.h b/deps/openssl/config/archs/solaris64-x86_64-gcc/no-asm/include/progs.h
index 9b3d270e20..308c65601b 100644
--- a/deps/openssl/config/archs/solaris64-x86_64-gcc/no-asm/include/progs.h
+++ b/deps/openssl/config/archs/solaris64-x86_64-gcc/no-asm/include/progs.h
@@ -2,7 +2,7 @@
  * WARNING: do not edit!
  * Generated by apps/progs.pl
  *
- * Copyright 1995-2019 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 1995-2020 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